fix: default export handler detection

matthiaaas · May 28, 2023 · 8e8a300 · 8e8a300
1 parent 93af59c
commit 8e8a300
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/src/router.ts b/src/router.ts
@@ -5,7 +5,7 @@ import type { ExpressLike, Options } from "./types"
 import config from "./config"
 
 import { generateRoutes, walkTree } from "./lib"
-import { getHandlers, getMethodKey, isCjs } from "./utils"
+import { getHandlers, getMethodKey } from "./utils"
 
 const CJS_MAIN_FILENAME =
   typeof require !== "undefined" && require.main?.filename
@@ -14,8 +14,6 @@ const PROJECT_DIRECTORY = CJS_MAIN_FILENAME
   ? path.dirname(CJS_MAIN_FILENAME)
   : process.cwd()
 
-const IS_CJS = isCjs()
-
 /**
  * Attach routes to an Express app or router instance
  *
@@ -53,10 +51,18 @@ const createRouter = async <T extends ExpressLike = ExpressLike>(
     }
 
     // wildcard default export route matching
-    if (IS_CJS && typeof exports.default.default !== "undefined") {
-      app.all.apply(app, [url, ...getHandlers(exports.default.default)])
-    } else if (!IS_CJS && typeof exports.default !== "undefined") {
-      app.all.apply(app, [url, ...getHandlers(exports.default)])
+    if (typeof exports.default !== "undefined") {
+      if (
+        typeof exports.default === "function" ||
+        Array.isArray(exports.default)
+      ) {
+        app.all.apply(app, [url, ...getHandlers(exports.default)])
+      } else if (
+        typeof exports.default === "object" &&
+        typeof exports.default.default !== "undefined"
+      ) {
+        app.all.apply(app, [url, ...getHandlers(exports.default.default)])
+      }
     }
   }
 

diff --git a/src/utils.ts b/src/utils.ts
@@ -5,7 +5,7 @@ import type { Route } from "./types"
 
 import config from "./config"
 
-export const isCjs = () => typeof module !== "undefined" && module?.exports
+export const isCjs = () => typeof module !== "undefined" && !!module?.exports
 
 /**
  * @param parsedFile