@jaypie/express 1.0.13 → 1.0.15

package/dist/module.cjs

@@ -11,6 +11,7 @@ var serverlessExpress = require('@codegenie/serverless-express');
 const EXPRESS = {
   PATH: {
     ANY: "*",
+    ID: "/:id",
     ROOT: /^\/?$/,
   },
 };
@@ -167,14 +168,28 @@ function summarizeResponse(res, extras) {
 // Main
 //
 
-const expressHandler = (
-  handler,
-  { locals, name, setup = [], teardown = [], unavailable, validate } = {},
-) => {
+const expressHandler = (handler, options = {}) => {
+  // If handler is an object and options is a function, swap them
+  if (typeof handler === "object" && typeof options === "function") {
+    const temp = handler;
+    handler = options;
+    options = temp;
+  }
+
   //
   //
   // Validate
   //
+  /* eslint-disable no-autofix/prefer-const */
+  let {
+    locals,
+    name,
+    setup = [],
+    teardown = [],
+    unavailable,
+    validate,
+  } = options;
+  /* eslint-enable no-autofix/prefer-const */
   core.validate.function(handler);
   core.validate.optional.object(locals);
   setup = core.force.array(setup); // allows a single item

package/dist/module.esm.js

@@ -9,6 +9,7 @@ import { getCurrentInvoke } from '@codegenie/serverless-express';
 const EXPRESS = {
   PATH: {
     ANY: "*",
+    ID: "/:id",
     ROOT: /^\/?$/,
   },
 };
@@ -165,14 +166,28 @@ function summarizeResponse(res, extras) {
 // Main
 //
 
-const expressHandler = (
-  handler,
-  { locals, name, setup = [], teardown = [], unavailable, validate: validate$1 } = {},
-) => {
+const expressHandler = (handler, options = {}) => {
+  // If handler is an object and options is a function, swap them
+  if (typeof handler === "object" && typeof options === "function") {
+    const temp = handler;
+    handler = options;
+    options = temp;
+  }
+
   //
   //
   // Validate
   //
+  /* eslint-disable no-autofix/prefer-const */
+  let {
+    locals,
+    name,
+    setup = [],
+    teardown = [],
+    unavailable,
+    validate: validate$1,
+  } = options;
+  /* eslint-enable no-autofix/prefer-const */
   validate.function(handler);
   validate.optional.object(locals);
   setup = force.array(setup); // allows a single item

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jaypie/express",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "author": "Finlayson Studio",
   "type": "module",
   "exports": {
@@ -41,11 +41,11 @@
     "test:spec:supertest": "vitest run ./src/__tests__/supertest.spec.js"
   },
   "dependencies": {
-    "@codegenie/serverless-express": "^4.14.1",
-    "@jaypie/core": "^1.0.41"
+    "@codegenie/serverless-express": "^4.15.0",
+    "@jaypie/core": "^1.0.44"
   },
   "devDependencies": {
-    "@jaypie/testkit": "^1.0.20",
+    "@jaypie/testkit": "^1.0.29",
     "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "eslint": "^8.57.0",
@@ -59,6 +59,6 @@
     "rollup-plugin-auto-external": "^2.0.0",
     "sort-package-json": "^2.10.0",
     "supertest": "^7.0.0",
-    "vitest": "^1.6.0"
+    "vitest": "^2.1.3"
   }
 }

package/src/constants.js

@@ -6,6 +6,7 @@
 export const EXPRESS = {
   PATH: {
     ANY: "*",
+    ID: "/:id",
     ROOT: /^\/?$/,
   },
 };

package/src/expressHandler.js

@@ -18,14 +18,28 @@ import summarizeResponse from "./summarizeResponse.helper.js";
 // Main
 //
 
-const expressHandler = (
-  handler,
-  { locals, name, setup = [], teardown = [], unavailable, validate } = {},
-) => {
+const expressHandler = (handler, options = {}) => {
+  // If handler is an object and options is a function, swap them
+  if (typeof handler === "object" && typeof options === "function") {
+    const temp = handler;
+    handler = options;
+    options = temp;
+  }
+
   //
   //
   // Validate
   //
+  /* eslint-disable no-autofix/prefer-const */
+  let {
+    locals,
+    name,
+    setup = [],
+    teardown = [],
+    unavailable,
+    validate,
+  } = options;
+  /* eslint-enable no-autofix/prefer-const */
   validateIs.function(handler);
   validateIs.optional.object(locals);
   setup = force.array(setup); // allows a single item