@dxos/log 0.8.3 → 0.8.4-main.1068cf700f

package/dist/lib/browser/index.mjs

@@ -1,106 +1,50 @@
-// packages/common/log/src/index.ts
+import {
+  LogLevel,
+  LogProcessorType,
+  gatherLogInfoFromScope,
+  getContextFromEntry,
+  getRelativeFilename,
+  levels,
+  logInfo,
+  shortLevelName,
+  shouldLog
+} from "./chunk-GPOFUMLO.mjs";
+import {
+  __export,
+  __reExport
+} from "./chunk-IEP6GGEX.mjs";
+
+// src/index.ts
+var index_exports = {};
+__export(index_exports, {
+  BROWSER_PROCESSOR: () => BROWSER_PROCESSOR,
+  DEBUG_PROCESSOR: () => DEBUG_PROCESSOR,
+  FILE_PROCESSOR: () => FILE_PROCESSOR,
+  LogLevel: () => LogLevel,
+  LogProcessorType: () => LogProcessorType,
+  createFileProcessor: () => createFileProcessor,
+  createLog: () => createLog,
+  dbg: () => dbg,
+  debug: () => debug,
+  gatherLogInfoFromScope: () => gatherLogInfoFromScope,
+  getContextFromEntry: () => getContextFromEntry,
+  getCurrentOwnershipScope: () => getCurrentOwnershipScope,
+  getRelativeFilename: () => getRelativeFilename,
+  levels: () => levels,
+  log: () => log,
+  logInfo: () => logInfo,
+  omit: () => omit,
+  parseFilter: () => parseFilter,
+  pick: () => pick,
+  shortLevelName: () => shortLevelName,
+  shouldLog: () => shouldLog
+});
 import omit from "lodash.omit";
 import { pick } from "@dxos/util";
 
-// packages/common/log/src/config.ts
-var LogLevel = /* @__PURE__ */ function(LogLevel2) {
-  LogLevel2[LogLevel2["TRACE"] = 5] = "TRACE";
-  LogLevel2[LogLevel2["DEBUG"] = 10] = "DEBUG";
-  LogLevel2[LogLevel2["VERBOSE"] = 11] = "VERBOSE";
-  LogLevel2[LogLevel2["INFO"] = 12] = "INFO";
-  LogLevel2[LogLevel2["WARN"] = 13] = "WARN";
-  LogLevel2[LogLevel2["ERROR"] = 14] = "ERROR";
-  return LogLevel2;
-}({});
-var levels = {
-  trace: 5,
-  debug: 10,
-  verbose: 11,
-  info: 12,
-  warn: 13,
-  error: 14
-};
-var shortLevelName = {
-  [5]: "T",
-  [10]: "D",
-  [11]: "V",
-  [12]: "I",
-  [13]: "W",
-  [14]: "E"
-};
-var LogProcessorType = /* @__PURE__ */ function(LogProcessorType2) {
-  LogProcessorType2["CONSOLE"] = "console";
-  LogProcessorType2["BROWSER"] = "browser";
-  LogProcessorType2["DEBUG"] = "debug";
-  return LogProcessorType2;
-}({});
-
-// packages/common/log/src/scope.ts
-var logInfoProperties = Symbol("logInfoProperties");
-var logInfo = (target, propertyKey, descriptor) => {
-  (target[logInfoProperties] ??= []).push(propertyKey);
-};
-var gatherLogInfoFromScope = (scope) => {
-  if (!scope) {
-    return {};
-  }
-  const res = {};
-  const prototype = Object.getPrototypeOf(scope);
-  const infoProps = prototype[logInfoProperties] ?? [];
-  for (const prop of infoProps) {
-    try {
-      res[prop] = typeof scope[prop] === "function" ? scope[prop]() : scope[prop];
-    } catch (err) {
-      res[prop] = err.message;
-    }
-  }
-  return res;
-};
-
-// packages/common/log/src/context.ts
-var matchFilter = (filter, level, path) => {
-  return level >= filter.level && (!filter.pattern || path.includes(filter.pattern));
-};
-var shouldLog = (entry, filters) => {
-  if (filters === void 0) {
-    return true;
-  } else {
-    return filters.some((filter) => matchFilter(filter, entry.level, entry.meta?.F ?? ""));
-  }
-};
-var getContextFromEntry = (entry) => {
-  let context;
-  if (entry.meta) {
-    const scopeInfo = gatherLogInfoFromScope(entry.meta.S);
-    if (Object.keys(scopeInfo).length > 0) {
-      context = Object.assign(context ?? {}, scopeInfo);
-    }
-  }
-  const entryContext = typeof entry.context === "function" ? entry.context() : entry.context;
-  if (entryContext) {
-    if (entryContext instanceof Error) {
-      const c = entryContext.context;
-      context = Object.assign(context ?? {}, {
-        error: entryContext.stack,
-        ...c
-      });
-    } else if (typeof entryContext === "object") {
-      context = Object.assign(context ?? {}, entryContext);
-    }
-  }
-  if (entry.error) {
-    const errorContext = entry.error.context;
-    context = Object.assign(context ?? {}, {
-      error: entry.error,
-      ...errorContext
-    });
-  }
-  return context && Object.keys(context).length > 0 ? context : void 0;
-};
-
-// packages/common/log/src/decorators.ts
-import chalk from "chalk";
+// src/decorators.ts
 import { inspect } from "@dxos/node-std/util";
+import chalk from "chalk";
 var nextPromiseId = 0;
 var createMethodLogDecorator = (log2) => (arg0, arg1, meta) => (target, propertyKey, descriptor) => {
   const method = descriptor.value;
@@ -197,53 +141,37 @@ var logAsyncResolved = (log2, methodName, resolvedValue, promiseId, startTime, c
 var logAsyncRejected = (log2, methodName, err, promiseId, startTime, combinedMeta) => {
   log2.info(`.${formatFunction(methodName)} \u21B2 \u{1F525} ${chalk.gray("reject")} ${formatPromise(promiseId)} ${formatTimeElapsed(startTime)} ${chalk.gray("=>")} ${err}`, {}, combinedMeta);
 };
-var greenCheck = typeof chalk.green === "function" ? chalk.green("\u2714") : "\u2714";
-var formatTimeElapsed = (startTime) => chalk.gray(`${(performance.now() - startTime).toFixed(0)}ms`);
 var COLOR_FUNCTION = [
   220,
   220,
   170
 ];
+var greenCheck = typeof chalk.green === "function" ? chalk.green("\u2714") : "\u2714";
+var formatTimeElapsed = (startTime) => chalk.gray(`${(performance.now() - startTime).toFixed(0)}ms`);
 var formatFunction = (name) => chalk.bold(chalk.rgb(...COLOR_FUNCTION)(name));
 var formatPromise = (id) => chalk.blue(`Promise#${id}`);
 
-// packages/common/log/src/options.ts
+// src/options.ts
 import defaultsDeep from "lodash.defaultsdeep";
 
-// packages/common/log/src/platform/browser/index.ts
-var loadOptions = (filepath) => {
-  try {
-    let dxlog;
-    if (typeof localStorage === "undefined") {
-      if (globalThis.localStorage_dxlog) {
-        dxlog = globalThis.localStorage_dxlog;
-      }
-    } else {
-      dxlog = localStorage.getItem("dxlog") ?? void 0;
-    }
-    if (!dxlog) {
-      return void 0;
-    }
-    return JSON.parse(dxlog);
-  } catch (err) {
-    console.info("can't parse dxlog config", err);
-    return void 0;
-  }
-};
-
-// packages/common/log/src/processors/console-stub.ts
-var CONSOLE_PROCESSOR = () => {
-};
+// src/platform/index.ts
+var platform_exports = {};
+__reExport(platform_exports, platform_star);
+import * as platform_star from "#platform";
 
-// packages/common/log/src/processors/debug-processor.ts
-import { inspect as inspect2 } from "@dxos/node-std/util";
-var DEBUG_PROCESSOR = (config, entry) => {
-  console.log(inspect2(entry, false, null, true));
-};
+// src/processors/index.ts
+var processors_exports = {};
+__export(processors_exports, {
+  BROWSER_PROCESSOR: () => BROWSER_PROCESSOR,
+  DEBUG_PROCESSOR: () => DEBUG_PROCESSOR,
+  FILE_PROCESSOR: () => FILE_PROCESSOR,
+  createFileProcessor: () => createFileProcessor,
+  getRelativeFilename: () => getRelativeFilename
+});
 
-// packages/common/log/src/processors/browser-processor.ts
+// src/processors/browser-processor.ts
 import { getDebugName, safariCheck } from "@dxos/util";
-var getRelativeFilename = (filename) => {
+var getRelativeFilename2 = (filename) => {
   const match = filename.match(/.+\/(packages\/.+\/.+)/);
   if (match) {
     const [, filePath] = match;
@@ -263,7 +191,7 @@ var APP_BROWSER_PROCESSOR = (config, entry) => {
   const LOG_BROWSER_CSS = [];
   let link = "";
   if (entry.meta) {
-    const filename = getRelativeFilename(entry.meta.F);
+    const filename = getRelativeFilename2(entry.meta.F);
     const filepath = `${LOG_BROWSER_PREFIX.replace(/\/$/, "")}/${filename}`;
     link = `${filepath}#L${entry.meta.L}`;
   }
@@ -274,11 +202,15 @@ var APP_BROWSER_PROCESSOR = (config, entry) => {
     const processPrefix = entry.meta.S?.hostSessionId ? "[worker] " : "";
     args.push(`%c${processPrefix}${scopeName}`, "color:#C026D3;font-weight:bold");
   }
-  args.push(entry.message);
+  if (entry.message) {
+    args.push(entry.message);
+  }
   const context = getContextFromEntry(entry);
   if (context) {
     if (Object.keys(context).length === 1 && "error" in context) {
       args.push(context.error);
+    } else if (Object.keys(context).length === 1 && "err" in context) {
+      args.push(context.err);
     } else {
       args.push(context);
     }
@@ -315,7 +247,7 @@ var TEST_BROWSER_PROCESSOR = (config, entry) => {
   }
   let path = "";
   if (entry.meta) {
-    path = `${getRelativeFilename(entry.meta.F)}:${entry.meta.L}`;
+    path = `${getRelativeFilename2(entry.meta.F)}:${entry.meta.L}`;
   }
   let args = [];
   const processPrefix = entry.meta?.S?.hostSessionId ? "[worker] " : "";
@@ -344,22 +276,20 @@ var TEST_BROWSER_PROCESSOR = (config, entry) => {
 };
 var BROWSER_PROCESSOR = CONFIG.useTestProcessor ? TEST_BROWSER_PROCESSOR : APP_BROWSER_PROCESSOR;
 
-// packages/common/log/src/processors/file-processor.ts
-import { appendFileSync, mkdirSync, openSync } from "@dxos/node-std/fs";
-import { dirname } from "@dxos/node-std/path";
-import { jsonlogify } from "@dxos/util";
+// src/processors/index.ts
+__reExport(processors_exports, console_processor_star);
+import * as console_processor_star from "#console-processor";
 
-// packages/common/log/src/processors/common.ts
-var getRelativeFilename2 = (filename) => {
-  const match = filename.match(/.+\/(packages\/.+\/.+)/);
-  if (match) {
-    const [, filePath] = match;
-    return filePath;
-  }
-  return filename;
+// src/processors/debug-processor.ts
+import { inspect as inspect2 } from "@dxos/node-std/util";
+var DEBUG_PROCESSOR = (config, entry) => {
+  console.log(inspect2(entry, false, null, true));
 };
 
-// packages/common/log/src/processors/file-processor.ts
+// src/processors/file-processor.ts
+import { appendFileSync, mkdirSync, openSync } from "@dxos/node-std/fs";
+import { dirname } from "@dxos/node-std/path";
+import { jsonlogify } from "@dxos/util";
 var EAGAIN_MAX_DURATION = 1e3;
 var createFileProcessor = ({ pathOrFd, levels: levels2, filters }) => {
   let fd;
@@ -384,7 +314,7 @@ var createFileProcessor = ({ pathOrFd, levels: levels2, filters }) => {
       timestamp: Date.now(),
       ...entry.meta ? {
         meta: {
-          file: getRelativeFilename2(entry.meta.F),
+          file: getRelativeFilename(entry.meta.F),
           line: entry.meta.L
         }
       } : {},
@@ -425,16 +355,17 @@ var FILE_PROCESSOR = createFileProcessor({
   ]
 });
 
-// packages/common/log/src/options.ts
+// src/options.ts
 var processors = {
-  [LogProcessorType.CONSOLE]: CONSOLE_PROCESSOR,
+  [LogProcessorType.CONSOLE]: processors_exports.CONSOLE_PROCESSOR,
   [LogProcessorType.BROWSER]: BROWSER_PROCESSOR,
   [LogProcessorType.DEBUG]: DEBUG_PROCESSOR
 };
-var IS_BROWSER = typeof window !== "undefined" || typeof navigator !== "undefined";
+var browser = (typeof window !== "undefined" || typeof navigator !== "undefined") && !(typeof process !== "undefined" && process?.env?.VITEST);
 var DEFAULT_PROCESSORS = [
-  IS_BROWSER ? BROWSER_PROCESSOR : CONSOLE_PROCESSOR
+  browser ? BROWSER_PROCESSOR : processors_exports.CONSOLE_PROCESSOR
 ];
+var parseLogLevel = (level, defValue = LogLevel.WARN) => levels[level.toLowerCase()] ?? defValue;
 var parseFilter = (filter) => {
   if (typeof filter === "number") {
     return [
@@ -443,7 +374,6 @@ var parseFilter = (filter) => {
       }
     ];
   }
-  const parseLogLevel = (level, defValue = LogLevel.WARN) => levels[level.toLowerCase()] ?? defValue;
   const lines = typeof filter === "string" ? filter.split(/,\s*/) : filter;
   return lines.map((filter2) => {
     const [pattern, level] = filter2.split(":");
@@ -455,54 +385,37 @@ var parseFilter = (filter) => {
     };
   });
 };
-var getConfig = (options) => {
-  const nodeOptions = "process" in globalThis ? {
+var createConfig = (options) => {
+  const envOptions = "process" in globalThis ? {
     file: process.env.LOG_CONFIG,
     filter: process.env.LOG_FILTER,
     processor: process.env.LOG_PROCESSOR
   } : void 0;
-  const mergedOptions = defaultsDeep({}, loadOptions(nodeOptions?.file), nodeOptions, options);
+  const mergedOptions = defaultsDeep({}, (0, platform_exports.loadOptions)(envOptions?.file), envOptions, options);
   return {
     options: mergedOptions,
     filters: parseFilter(mergedOptions.filter ?? LogLevel.INFO),
     captureFilters: parseFilter(mergedOptions.captureFilter ?? LogLevel.WARN),
     processors: mergedOptions.processor ? [
       processors[mergedOptions.processor]
-    ] : DEFAULT_PROCESSORS,
+    ] : [
+      ...DEFAULT_PROCESSORS
+    ],
     prefix: mergedOptions.prefix
   };
 };
 
-// packages/common/log/src/log.ts
+// src/log.ts
+var logCount = 0;
 var createLog = () => {
   const log2 = (...params) => processLog(LogLevel.DEBUG, ...params);
-  log2._config = getConfig();
+  Object.assign(log2, {
+    _id: `log-${++logCount}`,
+    _config: createConfig()
+  });
   Object.defineProperty(log2, "runtimeConfig", {
     get: () => log2._config
   });
-  log2.addProcessor = (processor) => {
-    if (DEFAULT_PROCESSORS.filter((p) => p === processor).length === 0) {
-      DEFAULT_PROCESSORS.push(processor);
-    }
-    if (log2._config.processors.filter((p) => p === processor).length === 0) {
-      log2._config.processors.push(processor);
-    }
-  };
-  log2.config = (options) => {
-    log2._config = getConfig(options);
-  };
-  log2.trace = (...params) => processLog(LogLevel.TRACE, ...params);
-  log2.debug = (...params) => processLog(LogLevel.DEBUG, ...params);
-  log2.verbose = (...params) => processLog(LogLevel.VERBOSE, ...params);
-  log2.info = (...params) => processLog(LogLevel.INFO, ...params);
-  log2.warn = (...params) => processLog(LogLevel.WARN, ...params);
-  log2.error = (...params) => processLog(LogLevel.ERROR, ...params);
-  log2.catch = (error, context, meta) => processLog(LogLevel.ERROR, error?.message ?? String(error), context, meta, error);
-  log2.break = () => log2.info("\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014\u2014");
-  log2.stack = (message, context, meta) => processLog(LogLevel.INFO, `${message ?? "Stack Dump"}
-${getFormattedStackTrace()}`, context, meta);
-  log2.method = createMethodLogDecorator(log2);
-  log2.func = createFunctionLogDecorator(log2);
   const processLog = (level, message, context = {}, meta, error) => {
     log2._config.processors.forEach((processor) => processor(log2._config, {
       level,
@@ -512,9 +425,50 @@ ${getFormattedStackTrace()}`, context, meta);
       error
     }));
   };
+  Object.assign(log2, {
+    /**
+    * Update config.
+    * NOTE: Preserves any processors that were already added to this logger instance
+    * unless an explicit processor option is provided.
+    */
+    config: ({ processor, ...options }) => {
+      const config = createConfig(options);
+      const processors2 = processor ? config.processors : log2._config.processors;
+      log2._config = {
+        ...config,
+        processors: processors2
+      };
+      return log2;
+    },
+    /**
+    * Adds a processor to the logger.
+    */
+    addProcessor: (processor) => {
+      if (log2._config.processors.filter((p) => p === processor).length === 0) {
+        log2._config.processors.push(processor);
+      }
+      return () => {
+        log2._config.processors = log2._config.processors.filter((p) => p !== processor);
+      };
+    },
+    trace: (...params) => processLog(LogLevel.TRACE, ...params),
+    debug: (...params) => processLog(LogLevel.DEBUG, ...params),
+    verbose: (...params) => processLog(LogLevel.VERBOSE, ...params),
+    info: (...params) => processLog(LogLevel.INFO, ...params),
+    warn: (...params) => processLog(LogLevel.WARN, ...params),
+    error: (...params) => processLog(LogLevel.ERROR, ...params),
+    catch: (error, context, meta) => processLog(LogLevel.ERROR, void 0, context, meta, error),
+    method: createMethodLogDecorator(log2),
+    function: createFunctionLogDecorator(log2),
+    break: () => log2.info("-".repeat(80)),
+    stack: (message, context, meta) => {
+      return processLog(LogLevel.INFO, `${message ?? "Stack Dump"}
+${getFormattedStackTrace()}`, context, meta);
+    }
+  });
   return log2;
 };
-var log = globalThis.dx_log ??= createLog();
+var log = globalThis.DX_LOG ??= createLog();
 var start = Date.now();
 var last = start;
 var debug = (label, args) => {
@@ -531,12 +485,28 @@ var debug = (label, args) => {
 };
 var getFormattedStackTrace = () => new Error().stack.split("\n").slice(3).join("\n");
 
-// packages/common/log/src/experimental/ownership.ts
+// src/index.ts
+__reExport(index_exports, processors_exports);
+
+// src/dbg.ts
+var dbg = (arg, meta) => {
+  if (meta?.A) {
+    console.log(`${meta.A[0]} =`, arg);
+  } else {
+    console.log(arg);
+  }
+  return arg;
+};
+
+// src/experimental/ownership.ts
 import { inspect as inspect3 } from "@dxos/node-std/util";
 var kOwnershipScope = Symbol("kOwnershipScope");
 var kCurrentOwnershipScope = Symbol("kCurrentOwnershipScope");
 var kDebugInfoProperties = Symbol("kDebugInfoProperties");
 var OwnershipScope = class {
+  constr;
+  parent;
+  instance;
   constructor(constr, parent) {
     this.constr = constr;
     this.parent = parent;
@@ -563,17 +533,18 @@ var OwnershipScope = class {
 var getCurrentOwnershipScope = (thisRef) => thisRef;
 export {
   BROWSER_PROCESSOR,
-  CONSOLE_PROCESSOR,
   DEBUG_PROCESSOR,
   FILE_PROCESSOR,
   LogLevel,
   LogProcessorType,
   createFileProcessor,
+  createLog,
+  dbg,
   debug,
   gatherLogInfoFromScope,
   getContextFromEntry,
   getCurrentOwnershipScope,
-  getRelativeFilename2 as getRelativeFilename,
+  getRelativeFilename,
   levels,
   log,
   logInfo,