fix createWithServerProps()

egomobile · Aug 14, 2023 · 2c25d50 · 2c25d50
1 parent fa22ac9
commit 2c25d50
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Change Log (@egomobile/next-utils)
 
-## 0.9.3
+## 0.9.4
 
 - **BREAKING CHANGE**: improve use of execution contextes of `EnhanceApiContext`
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@egomobile/next-utils",
-    "version": "0.9.3",
+    "version": "0.9.4",
     "description": "Handy utils and extensions for Next.js",
     "main": "lib/index.js",
     "engines": {
@@ -75,4 +75,4 @@
         "@egomobile/http-server": ">=0.63.1",
         "next": ">=13.0.0"
     }
-}
+}
diff --git a/src/middlewares/withServerProps.ts b/src/middlewares/withServerProps.ts
@@ -131,16 +131,6 @@ export function createWithServerProps<TContext = IWithServerPropsActionContext>(
         null;
 
     return (action?, options?) => {
-        if (!action) {
-            return wrapServerHandler(async () => {
-                return {
-                    "props": {}
-                };
-            }, {
-                "use": options?.use
-            });
-        }
-
         return wrapServerHandler(async (context) => {
             try {
                 const actionContext: IWithServerPropsActionContext = {
@@ -167,7 +157,12 @@ export function createWithServerProps<TContext = IWithServerPropsActionContext>(
                     };
                 }
 
-                const resultProps = await action(enhanceExecCtx.context as unknown as TContext);
+                let resultProps = await action?.(enhanceExecCtx.context as unknown as TContext);
+                if (!resultProps) {
+                    resultProps = {
+                        "props": {}
+                    };
+                }
 
                 return cloneObj(
                     deepmerge(