lifecycleion 0.0.5 → 0.0.7

package/dist/lib/logger/index.d.cts

@@ -67,7 +67,9 @@ interface BeforeExitResult {
     action: 'proceed' | 'wait';
 }
 /**
- * Redaction function type
+ * Redaction function type.
+ *
+ * Values are stringified before they are passed to the redaction function.
  */
 type RedactFunction = (keyName: string, value: unknown) => unknown;
 /**

package/dist/lib/logger/index.d.ts

@@ -67,7 +67,9 @@ interface BeforeExitResult {
     action: 'proceed' | 'wait';
 }
 /**
- * Redaction function type
+ * Redaction function type.
+ *
+ * Values are stringified before they are passed to the redaction function.
  */
 type RedactFunction = (keyName: string, value: unknown) => unknown;
 /**

package/dist/lib/logger/index.js

@@ -892,16 +892,52 @@ function ms() {
 }
 
 // src/lib/internal/path-utils.ts
-var PATH_SEGMENT_PATTERN = /\w+|\[(\d+)\]/g;
+var PATH_SEGMENT_PATTERN = /(\w+)|\[(\d+)\]|\["((?:[^"\\]|\\.)*)"\]|\['((?:[^'\\]|\\.)*)'\]/y;
+function unescapeQuotedPathPart(value) {
+  return value.replace(/\\(["'\\])/g, "$1");
+}
 function getPathParts(path) {
-  return Array.from(
-    path.matchAll(PATH_SEGMENT_PATTERN),
-    (match) => match[1] ?? match[0]
-  );
+  const parts = [];
+  let index = 0;
+  while (index < path.length) {
+    if (path[index] === ".") {
+      index++;
+      if (index >= path.length) {
+        return null;
+      }
+    }
+    PATH_SEGMENT_PATTERN.lastIndex = index;
+    const match = PATH_SEGMENT_PATTERN.exec(path);
+    if (!match) {
+      return null;
+    }
+    if (match[1] !== void 0) {
+      parts.push(match[1]);
+    } else if (match[2] !== void 0) {
+      parts.push(match[2]);
+    } else if (match[3] !== void 0) {
+      parts.push(unescapeQuotedPathPart(match[3]));
+    } else if (match[4] !== void 0) {
+      parts.push(unescapeQuotedPathPart(match[4]));
+    }
+    index = PATH_SEGMENT_PATTERN.lastIndex;
+    if (index < path.length && path[index] !== "." && path[index] !== "[") {
+      return null;
+    }
+  }
+  return parts;
+}
+
+// src/lib/internal/stringify-template-value.ts
+function stringifyTemplateValue(value) {
+  if (typeof value === "string") {
+    return value;
+  }
+  return String(value);
 }
 
 // src/lib/curly-brackets.ts
-var PLACEHOLDER_PATTERN = /(?:\\)?{{(\s*\w+(?:\[\d+\])*(?:\.\w+(?:\[\d+\])*)*\s*)(?:\\)?\s*}}/g;
+var PLACEHOLDER_PATTERN = /(?:\\)?{{(\s*[^{}]+?\s*)(?:\\)?\s*}}/g;
 var CurlyBrackets = function(str = "", locals = {}, fallback = "(null)") {
   if (!str.includes("{{")) {
     return str;
@@ -929,6 +965,9 @@ CurlyBrackets.compileTemplate = function(str, fallback = "(null)") {
       }
       const key = p1.trim();
       const parts = getPathParts(key);
+      if (!parts || parts.length === 0) {
+        return match;
+      }
       let replacement = locals;
       for (const part of parts) {
         if (replacement !== void 0 && replacement !== null && typeof replacement === "object" && part in replacement) {
@@ -941,7 +980,7 @@ CurlyBrackets.compileTemplate = function(str, fallback = "(null)") {
       if (replacement === void 0 || replacement === null) {
         return fallback;
       }
-      return String(replacement);
+      return stringifyTemplateValue(replacement);
     });
   };
 };
@@ -1275,6 +1314,9 @@ var defaultRedactFunction = (_keyName, value) => {
 };
 function setNestedValue(obj, path, value) {
   const parts = getPathParts(path);
+  if (!parts || parts.length === 0) {
+    return;
+  }
   let current = obj;
   for (let i = 0; i < parts.length - 1; i++) {
     const part = parts[i];
@@ -1294,6 +1336,9 @@ function setNestedValue(obj, path, value) {
 }
 function getNestedValue(obj, path) {
   const parts = getPathParts(path);
+  if (!parts || parts.length === 0) {
+    return void 0;
+  }
   let current = obj;
   for (const part of parts) {
     if (current === void 0 || current === null || typeof current !== "object" || !(part in current)) {
@@ -1311,14 +1356,17 @@ function applyRedaction(params, redactedKeys, redactFunction) {
   const redactedParams = deepClone(params);
   for (const key of redactedKeys) {
     if (key.includes(".") || key.includes("[")) {
-      const value = getNestedValue(redactedParams, key);
+      const value = getNestedValue(params, key);
       if (value !== void 0) {
-        const redactedValue = redactFn(key, value);
+        const redactedValue = redactFn(key, stringifyTemplateValue(value));
         setNestedValue(redactedParams, key, redactedValue);
       }
     } else {
-      if (key in redactedParams) {
-        redactedParams[key] = redactFn(key, redactedParams[key]);
+      if (key in params) {
+        redactedParams[key] = redactFn(
+          key,
+          stringifyTemplateValue(params[key])
+        );
       }
     }
   }
@@ -2398,8 +2446,9 @@ var Logger = class _Logger extends EventEmitter {
     const params = options?.params;
     const tags = options?.tags;
     const redactedKeys = options?.redactedKeys;
-    const message = params ? CurlyBrackets(template, params) : template;
-    const redactedParams = params ? applyRedaction(params, redactedKeys, this.redactFunction) : void 0;
+    const redactedParams = params && redactedKeys && redactedKeys.length > 0 ? applyRedaction(params, redactedKeys, this.redactFunction) : void 0;
+    const messageParams = redactedParams ?? params;
+    const message = messageParams ? CurlyBrackets(template, messageParams) : template;
     const entry = {
       timestamp,
       type,