@jaypie/express 1.0.12 → 1.0.14

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
@@ -196,6 +211,11 @@ const expressHandler = (
     const libLogger = core.log.lib({
       lib: core.JAYPIE.LIB.EXPRESS,
     });
+    // Top-level, important details that run at the same level as the main logger
+    const log = core.log.lib({
+      level: core.log.level,
+      lib: core.JAYPIE.LIB.EXPRESS,
+    });
 
     // Update the public logger with the request ID
     const invokeUuid = getCurrentInvokeUuid();
@@ -205,15 +225,24 @@ const expressHandler = (
       // TODO: in theory this is redundant
       libLogger.tag({ invoke: invokeUuid });
       libLogger.tag({ shortInvoke: invokeUuid.slice(0, 8) });
+      log.tag({ invoke: invokeUuid });
+      log.tag({ shortInvoke: invokeUuid.slice(0, 8) });
     }
 
-    libLogger.trace("[jaypie] Express init");
+    if (!name) {
+      // If handler has a name, use it
+      if (handler.name) {
+        name = handler.name;
+      } else {
+        name = core.JAYPIE.UNKNOWN;
+      }
+    }
+    core.log.tag({ handler: name });
+    // TODO: in theory this is redundant
+    libLogger.tag({ handler: name });
+    log.tag({ handler: name });
 
-    // Top-level, important details that run at the same level as the main logger
-    const log = core.log.lib({
-      level: core.log.level,
-      lib: core.JAYPIE.LIB.EXPRESS,
-    });
+    libLogger.trace("[jaypie] Express init");
 
     // Set req.locals if it doesn't exist
     if (!req.locals) req.locals = {};

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
@@ -194,6 +209,11 @@ const expressHandler = (
     const libLogger = log.lib({
       lib: JAYPIE.LIB.EXPRESS,
     });
+    // Top-level, important details that run at the same level as the main logger
+    const log$1 = log.lib({
+      level: log.level,
+      lib: JAYPIE.LIB.EXPRESS,
+    });
 
     // Update the public logger with the request ID
     const invokeUuid = getCurrentInvokeUuid();
@@ -203,15 +223,24 @@ const expressHandler = (
       // TODO: in theory this is redundant
       libLogger.tag({ invoke: invokeUuid });
       libLogger.tag({ shortInvoke: invokeUuid.slice(0, 8) });
+      log$1.tag({ invoke: invokeUuid });
+      log$1.tag({ shortInvoke: invokeUuid.slice(0, 8) });
     }
 
-    libLogger.trace("[jaypie] Express init");
+    if (!name) {
+      // If handler has a name, use it
+      if (handler.name) {
+        name = handler.name;
+      } else {
+        name = JAYPIE.UNKNOWN;
+      }
+    }
+    log.tag({ handler: name });
+    // TODO: in theory this is redundant
+    libLogger.tag({ handler: name });
+    log$1.tag({ handler: name });
 
-    // Top-level, important details that run at the same level as the main logger
-    const log$1 = log.lib({
-      level: log.level,
-      lib: JAYPIE.LIB.EXPRESS,
-    });
+    libLogger.trace("[jaypie] Express init");
 
     // Set req.locals if it doesn't exist
     if (!req.locals) req.locals = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jaypie/express",
-  "version": "1.0.12",
+  "version": "1.0.14",
   "author": "Finlayson Studio",
   "type": "module",
   "exports": {
@@ -45,7 +45,7 @@
     "@jaypie/core": "^1.0.41"
   },
   "devDependencies": {
-    "@jaypie/testkit": "^1.0.19",
+    "@jaypie/testkit": "^1.0.20",
     "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "eslint": "^8.57.0",

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
@@ -47,6 +61,11 @@ const expressHandler = (
     const libLogger = publicLogger.lib({
       lib: JAYPIE.LIB.EXPRESS,
     });
+    // Top-level, important details that run at the same level as the main logger
+    const log = publicLogger.lib({
+      level: publicLogger.level,
+      lib: JAYPIE.LIB.EXPRESS,
+    });
 
     // Update the public logger with the request ID
     const invokeUuid = getCurrentInvokeUuid();
@@ -56,15 +75,24 @@ const expressHandler = (
       // TODO: in theory this is redundant
       libLogger.tag({ invoke: invokeUuid });
       libLogger.tag({ shortInvoke: invokeUuid.slice(0, 8) });
+      log.tag({ invoke: invokeUuid });
+      log.tag({ shortInvoke: invokeUuid.slice(0, 8) });
     }
 
-    libLogger.trace("[jaypie] Express init");
+    if (!name) {
+      // If handler has a name, use it
+      if (handler.name) {
+        name = handler.name;
+      } else {
+        name = JAYPIE.UNKNOWN;
+      }
+    }
+    publicLogger.tag({ handler: name });
+    // TODO: in theory this is redundant
+    libLogger.tag({ handler: name });
+    log.tag({ handler: name });
 
-    // Top-level, important details that run at the same level as the main logger
-    const log = publicLogger.lib({
-      level: publicLogger.level,
-      lib: JAYPIE.LIB.EXPRESS,
-    });
+    libLogger.trace("[jaypie] Express init");
 
     // Set req.locals if it doesn't exist
     if (!req.locals) req.locals = {};