@putkoff/abstract-logger 0.0.16 → 0.0.17

package/dist/cjs/index.js

@@ -14488,25 +14488,68 @@ if (IS_NODE) {
 }
 /** Exported logger */
 const logger = nodeLogger;
+/**
+ * Normalizes inputs by treating "unknown" and empty values as null.
+ * Returns "unknown" ONLY if all inputs are invalid.
+ */
+function resolveValue(...values) {
+    let sawInput = false;
+    for (const value of values) {
+        if (value === undefined || value === null)
+            continue;
+        sawInput = true;
+        if (typeof value === "string") {
+            const v = value.trim();
+            if (!v || v.toLowerCase() === "unknown")
+                continue;
+            return value;
+        }
+        return value;
+    }
+    return sawInput ? "unknown" : "unknown";
+}
 /* ------------------------------------------------------------------ */
 /* Stack inspection                                                    */
 /* ------------------------------------------------------------------ */
+/* ------------------------------------------------------------------ */
+/* Stack inspection                                                    */
+/* ------------------------------------------------------------------ */
+function extractFile(frame) {
+    // file:///path/to/file.ts:line:col
+    const esmMatch = frame.match(/file:\/\/(.+?):\d+:\d+/);
+    if (esmMatch)
+        return esmMatch[1];
+    // (path/to/file.ts:line:col)
+    const cjsMatch = frame.match(/\((.+?):\d+:\d+\)/);
+    if (cjsMatch)
+        return cjsMatch[1];
+    // at path/to/file.ts:line:col
+    const bareMatch = frame.match(/at\s+(.+?):\d+:\d+/);
+    if (bareMatch)
+        return bareMatch[1];
+    return "unknown";
+}
 function getCallerInfo() {
     if (!IS_NODE) {
         return { functionName: "browser", file: "browser" };
     }
     const obj = {};
-    Error.captureStackTrace(obj, getCallerInfo);
+    Error.captureStackTrace(obj, getLogString);
     const stack = obj.stack?.split("\n") ?? [];
-    const frame = stack.find((line) => !line.includes("getLogString") &&
-        !line.includes("logger.ts"));
-    if (!frame)
+    const frame = stack
+        .slice(1)
+        .find((line) => !line.includes("node:internal") &&
+        !line.includes("processTicksAndRejections"));
+    if (!frame) {
         return { functionName: "unknown", file: "unknown" };
-    const fnMatch = frame.match(/at\s+([^\s(]+)/);
-    const fileMatch = frame.match(/\((.*?):\d+:\d+\)|at\s+(.*?):\d+:\d+/);
+    }
+    const fnMatch = frame.match(/at\s+async\s+([^\s(]+)/) ||
+        frame.match(/at\s+([^\s(]+)/);
     return {
-        functionName: fnMatch?.[1] ?? "anonymous",
-        file: fileMatch?.[1] || fileMatch?.[2] || "unknown",
+        functionName: fnMatch?.[1] && fnMatch[1] !== "Object.<anonymous>"
+            ? fnMatch[1]
+            : "unknown",
+        file: extractFile(frame),
     };
 }
 /* ------------------------------------------------------------------ */
@@ -14530,8 +14573,8 @@ function resolveLogger(candidate) {
 /* ------------------------------------------------------------------ */
 function getLogString(message, logType = null, details = null, function_name = null, file_location = null, consumerLogger = null) {
     let { functionName, file } = getCallerInfo();
-    function_name = functionName || function_name;
-    file_location = file || file_location;
+    function_name = resolveValue(functionName !== "unknown" ? functionName : null, function_name);
+    file_location = resolveValue(file !== "unknown" ? file : null, file_location);
     const emojiMap = {
         info: "ℹ️",
         warn: "⚠️",
@@ -14541,7 +14584,7 @@ function getLogString(message, logType = null, details = null, function_name = n
     logType = logType || "info";
     const emoji = emojiMap[logType] ?? "ℹ️";
     const timestamp = new Date().toISOString();
-    let line = `${emoji} [${timestamp}] [${function_name}] ${message} | ${file_location}`;
+    let line = `${emoji} [${timestamp}] [${function_name}] ${message}`;
     if (details !== null && details !== undefined) {
         try {
             const seen = new WeakSet();
@@ -14563,6 +14606,7 @@ function getLogString(message, logType = null, details = null, function_name = n
             line += ` | [unserializable details]`;
         }
     }
+    line += ` | ${file_location}`;
     /* ---------------- Browser ---------------- */
     if (IS_BROWSER) {
         console[logType === "error" ? "error" :
@@ -14599,4 +14643,5 @@ function getLogString(message, logType = null, details = null, function_name = n
 
 exports.getLogString = getLogString;
 exports.logger = logger;
+exports.resolveValue = resolveValue;
 //# sourceMappingURL=index.js.map