@srfnstack/spliffy 0.9.0 → 0.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@srfnstack/spliffy",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "author": "snowbldr",
   "private": false,
   "homepage": "https://github.com/narcolepticsnowman/spliffy",

package/src/middleware.mjs

@@ -37,9 +37,7 @@ export const cloneMiddleware = (middleware) => {
  * @param middleware
  */
 export const validateMiddleware = (middleware) => {
-  if (Array.isArray(middleware)) {
-    validateMiddlewareArray(middleware)
-  } else if (typeof middleware === 'object') {
+  if (!Array.isArray(middleware) && typeof middleware === 'object') {
     for (const method in middleware) {
       // ensure methods are always available as uppercase
       const upMethod = method.toUpperCase()
@@ -47,7 +45,7 @@ export const validateMiddleware = (middleware) => {
       validateMiddlewareArray(middleware[upMethod])
     }
   } else {
-    throw new Error('Invalid middleware definition: ' + middleware)
+    validateMiddlewareArray(middleware)
   }
 }
 

package/src/routes.mjs

@@ -51,6 +51,14 @@ const importModules = async (config, dirPath, files) => Promise.all(
     .map(f => path.join(dirPath, f.name))
     .map(mwPath => import(`file://${mwPath}`)
       .then(module => ({ module, mwPath }))
+      .catch(e => {
+        // Hack to workaround https://github.com/nodejs/modules/issues/471
+        if (e instanceof SyntaxError) {
+          const newError = new SyntaxError(`${e.message}. In file: ${mwPath}`)
+          newError.stack = e.stack
+          throw newError
+        }
+      })
     ))
 
 const findRoutesInDir = async (name, filePath, urlPath, inheritedMiddleware, pathParameters, config) => {
@@ -106,10 +114,25 @@ const buildJSHandlerRoute = async (name, filePath, urlPath, inheritedMiddleware,
     filePath,
     handlers: {}
   }
-  const module = await import(`file://${filePath}`)
+  let module
+  try {
+    module = await import(`file://${filePath}`)
+  } catch (e) {
+    // Hack to workaround https://github.com/nodejs/modules/issues/471
+    if (e instanceof SyntaxError) {
+      const newError = new SyntaxError(`${e.message}. In file: ${filePath}`)
+      newError.stack = e.stack
+      throw newError
+    }
+  }
   const handlers = module.default
-
-  route.middleware = mergeMiddleware(handlers.middleware || [], inheritedMiddleware)
+  try {
+    route.middleware = mergeMiddleware(handlers.middleware || [], inheritedMiddleware)
+  } catch (e) {
+    const err = new Error(`Failed to load middleware for route: ${filePath}`)
+    err.stack += `\nCaused By: ${e.stack}`
+    throw err
+  }
   for (const method of Object.keys(handlers).filter(k => !ignoreHandlerFields[k])) {
     if (HTTP_METHODS.indexOf(method) === -1) {
       throw new Error(`Method: ${method} in file ${filePath} is not a valid http method. It must be one of: ${HTTP_METHODS}. Method names must be all uppercase.`)