@putkoff/abstract-logger 0.0.16 → 0.0.18

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),
     };
 }
 /* ------------------------------------------------------------------ */
@@ -14528,24 +14571,44 @@ function resolveLogger(candidate) {
 /* ------------------------------------------------------------------ */
 /* UNIVERSAL getLogString (cannot crash)                               */
 /* ------------------------------------------------------------------ */
-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 getLogString(messageOrOptions, logType = null, details = null, function_name = null, file_location = null, consumerLogger = null) {
+    // ---------------- Normalize inputs ----------------
+    let opts;
+    if (typeof messageOrOptions === "object" && messageOrOptions !== null) {
+        // Dict-style
+        opts = messageOrOptions;
+    }
+    else {
+        // Positional-style
+        opts = {
+            message: messageOrOptions,
+            logType,
+            details,
+            function_name,
+            file_location,
+            consumerLogger,
+        };
+    }
+    let { message, logType: resolvedLogType, details: resolvedDetails, function_name: resolvedFunctionName, file_location: resolvedFileLocation, consumerLogger: resolvedLoggerInput, } = opts;
+    // ---------------- Resolve caller info ----------------
+    const { functionName, file } = getCallerInfo();
+    resolvedFunctionName = resolveValue(functionName !== "unknown" ? functionName : null, resolvedFunctionName);
+    resolvedFileLocation = resolveValue(file !== "unknown" ? file : null, resolvedFileLocation);
     const emojiMap = {
         info: "ℹ️",
         warn: "⚠️",
         error: "❌",
         debug: "🔍",
     };
-    logType = logType || "info";
-    const emoji = emojiMap[logType] ?? "ℹ️";
+    const finalLogType = resolvedLogType ?? "info";
+    const emoji = emojiMap[finalLogType] ?? "ℹ️";
     const timestamp = new Date().toISOString();
-    let line = `${emoji} [${timestamp}] [${function_name}] ${message} | ${file_location}`;
-    if (details !== null && details !== undefined) {
+    let line = `${emoji} [${timestamp}] [${resolvedFunctionName}] ${message}`;
+    // ---------------- Details serialization ----------------
+    if (resolvedDetails !== null && resolvedDetails !== undefined) {
         try {
             const seen = new WeakSet();
-            const safe = JSON.stringify(details, (key, value) => {
+            const safe = JSON.stringify(resolvedDetails, (key, value) => {
                 if (typeof value === "function")
                     return undefined;
                 if (typeof value === "bigint")
@@ -14563,21 +14626,26 @@ function getLogString(message, logType = null, details = null, function_name = n
             line += ` | [unserializable details]`;
         }
     }
-    /* ---------------- Browser ---------------- */
+    line += ` | ${resolvedFileLocation}`;
+    // ---------------- Browser ----------------
     if (IS_BROWSER) {
-        console[logType === "error" ? "error" :
-            logType === "warn" ? "warn" :
-                logType === "debug" ? "debug" : "log"](line);
+        console[finalLogType === "error"
+            ? "error"
+            : finalLogType === "warn"
+                ? "warn"
+                : finalLogType === "debug"
+                    ? "debug"
+                    : "log"](line);
         return line;
     }
-    /* ---------------- Node ---------------- */
-    const activeLogger = resolveLogger(consumerLogger);
+    // ---------------- Node ----------------
+    const activeLogger = resolveLogger(resolvedLoggerInput);
     if (!activeLogger) {
         console.log(line);
         return line;
     }
     try {
-        switch (logType) {
+        switch (finalLogType) {
             case "error":
                 activeLogger.error(line);
                 break;
@@ -14599,4 +14667,5 @@ function getLogString(message, logType = null, details = null, function_name = n
 
 exports.getLogString = getLogString;
 exports.logger = logger;
+exports.resolveValue = resolveValue;
 //# sourceMappingURL=index.js.map