@dxos/log 0.8.4-main.fffef41 → 0.8.4-staging.ac66bdf99f

package/dist/lib/node-esm/index.mjs

@@ -1,123 +1,53 @@
 import { createRequire } from 'node:module';const require = createRequire(import.meta.url);
+import {
+  LogEntry,
+  LogLevel,
+  LogProcessorType,
+  gatherLogInfoFromScope,
+  getContextFromEntry,
+  getRelativeFilename,
+  levels,
+  logInfo,
+  shortLevelName,
+  shouldLog
+} from "./chunk-KOTHKRYW.mjs";
+import {
+  __export,
+  __reExport
+} from "./chunk-2SZHAWBN.mjs";
 
 // src/index.ts
-import omit from "lodash.omit";
-import { pick } from "@dxos/util";
-
-// 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 = {
-  "*": 5,
-  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;
-})({});
-
-// 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 = (typeof prototype === "object" && prototype !== null ? 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;
-};
-
-// src/context.ts
-var matchFilter = (filter, level, path) => {
-  if (filter.pattern?.startsWith("-")) {
-    if (path?.includes(filter.pattern.slice(1))) {
-      if (level >= filter.level) {
-        return false;
-      }
-    }
-  } else {
-    if (filter.pattern?.length) {
-      if (path?.includes(filter.pattern)) {
-        return level >= filter.level;
-      }
-    } else {
-      if (level >= filter.level) {
-        return true;
-      }
-    }
-  }
-};
-var shouldLog = (entry, filters) => {
-  if (filters === void 0) {
-    return false;
-  }
-  const results = filters.map((filter) => matchFilter(filter, entry.level, entry.meta?.F)).filter((result) => result !== void 0);
-  return results.length > 0 && !results.some((results2) => results2 === false);
-};
-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) {
-    context = Object.assign(context ?? {}, {
-      error: entry.error
-    });
-  }
-  return context && Object.keys(context).length > 0 ? context : void 0;
-};
+var index_exports = {};
+__export(index_exports, {
+  BROWSER_PROCESSOR: () => BROWSER_PROCESSOR,
+  DEBUG_PROCESSOR: () => DEBUG_PROCESSOR,
+  FILE_PROCESSOR: () => FILE_PROCESSOR,
+  LogBuffer: () => LogBuffer,
+  LogEntry: () => LogEntry,
+  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, pick } from "@dxos/util";
 
 // src/decorators.ts
-import { inspect } from "node:util";
 import chalk from "chalk";
+import { inspect } from "node:util";
 var nextPromiseId = 0;
 var createMethodLogDecorator = (log2) => (arg0, arg1, meta) => (target, propertyKey, descriptor) => {
   const method = descriptor.value;
@@ -227,142 +157,23 @@ var formatPromise = (id) => chalk.blue(`Promise#${id}`);
 // src/options.ts
 import defaultsDeep from "lodash.defaultsdeep";
 
-// src/platform/node/index.ts
-import fs from "node:fs";
-import yaml from "js-yaml";
-var loadOptions = (filepath) => {
-  if (filepath) {
-    try {
-      const text = fs.readFileSync(filepath, "utf-8");
-      if (text) {
-        return yaml.load(text);
-      }
-    } catch (err) {
-      console.warn(`Invalid log file: ${filepath}`);
-    }
-  }
-};
-
-// src/processors/console-processor.ts
-import { inspect as inspect2 } from "node:util";
-import chalk2 from "chalk";
-import { getPrototypeSpecificInstanceId, pickBy } from "@dxos/util";
-
-// src/processors/common.ts
-var getRelativeFilename = (filename) => {
-  const match = filename.match(/.+\/(packages\/.+\/.+)/);
-  if (match) {
-    const [, filePath] = match;
-    return filePath;
-  }
-  return filename;
-};
-
-// src/processors/console-processor.ts
-var LEVEL_COLORS = {
-  [LogLevel.TRACE]: "gray",
-  [LogLevel.DEBUG]: "gray",
-  [LogLevel.VERBOSE]: "gray",
-  [LogLevel.INFO]: "white",
-  [LogLevel.WARN]: "yellow",
-  [LogLevel.ERROR]: "red"
-};
-var truncate = (text, length = 0, right = false) => {
-  const str = text && length ? right ? text.slice(-length) : text.substring(0, length) : text ?? "";
-  return right ? str.padStart(length, " ") : str.padEnd(length, " ");
-};
-var DEFAULT_FORMATTER = (config, { path, line, level, message, context, error, scope }) => {
-  const column = config.options?.formatter?.column;
-  const filepath = path !== void 0 && line !== void 0 ? chalk2.grey(`${path}:${line}`) : void 0;
-  let instance;
-  if (scope) {
-    const prototype = Object.getPrototypeOf(scope);
-    if (prototype !== null) {
-      const id = getPrototypeSpecificInstanceId(scope);
-      instance = chalk2.magentaBright(`${prototype.constructor.name}#${id}`);
-    }
-  }
-  const formattedTimestamp = config.options?.formatter?.timestamp ? (/* @__PURE__ */ new Date()).toISOString() : void 0;
-  const formattedLevel = chalk2[LEVEL_COLORS[level]](column ? shortLevelName[level] : LogLevel[level]);
-  const padding = column && filepath ? "".padStart(column - filepath.length) : void 0;
-  return config.options?.formatter?.timestampFirst ? [
-    formattedTimestamp,
-    filepath,
-    padding,
-    formattedLevel,
-    instance,
-    message,
-    context,
-    error
-  ] : [
-    // NOTE: File path must come fist for console hyperlinks.
-    // Must not truncate for terminal output.
-    filepath,
-    padding,
-    formattedTimestamp,
-    formattedLevel,
-    instance,
-    message,
-    context,
-    error
-  ];
-};
-var SHORT_FORMATTER = (config, { path, level, message }) => {
-  return [
-    chalk2.grey(truncate(path, 16, true)),
-    chalk2[LEVEL_COLORS[level]](shortLevelName[level]),
-    message
-  ];
-};
-var formatter = DEFAULT_FORMATTER;
-var CONSOLE_PROCESSOR = (config, entry) => {
-  const { level, message, meta, error } = entry;
-  if (!shouldLog(entry, config.filters)) {
-    return;
-  }
-  const parts = {
-    level,
-    message,
-    error,
-    path: void 0,
-    line: void 0,
-    scope: void 0,
-    context: void 0
-  };
-  if (meta) {
-    parts.path = getRelativeFilename(meta.F);
-    parts.line = meta.L;
-    parts.scope = meta.S;
-  }
-  const context = getContextFromEntry(entry);
-  if (context) {
-    parts.context = inspect2(pickBy(context, (value) => value !== void 0), {
-      depth: config.options.depth,
-      colors: true,
-      maxArrayLength: 8,
-      sorted: false
-    });
-  }
-  const line = formatter(config, parts).filter(Boolean).join(" ");
-  console.log(line);
-};
+// src/platform/index.ts
+var platform_exports = {};
+__reExport(platform_exports, platform_star);
+import * as platform_star from "#platform";
 
-// src/processors/debug-processor.ts
-import { inspect as inspect3 } from "node:util";
-var DEBUG_PROCESSOR = (config, entry) => {
-  console.log(inspect3(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
+});
 
 // src/processors/browser-processor.ts
-import { getDebugName, safariCheck } from "@dxos/util";
-var getRelativeFilename2 = (filename) => {
-  const match = filename.match(/.+\/(packages\/.+\/.+)/);
-  if (match) {
-    const [, filePath] = match;
-    return filePath;
-  }
-  return filename;
-};
+import { safariCheck } from "@dxos/util";
 var CONFIG = {
   useTestProcessor: false,
   printFileLinks: false
@@ -373,18 +184,20 @@ var APP_BROWSER_PROCESSOR = (config, entry) => {
   }
   const LOG_BROWSER_PREFIX = config.prefix ?? "https://vscode.dev/github.com/dxos/dxos/blob/main/";
   const LOG_BROWSER_CSS = [];
+  const { filename, line: lineNumber, context: scopeDebugName } = entry.computedMeta;
   let link = "";
-  if (entry.meta) {
-    const filename = getRelativeFilename2(entry.meta.F);
+  if (filename !== void 0 && lineNumber !== void 0) {
     const filepath = `${LOG_BROWSER_PREFIX.replace(/\/$/, "")}/${filename}`;
-    link = `${filepath}#L${entry.meta.L}`;
+    link = `${filepath}#L${lineNumber}`;
   }
   let args = [];
-  if (entry.meta?.S) {
-    const scope = entry.meta?.S;
-    const scopeName = scope.name || getDebugName(scope);
-    const processPrefix = entry.meta.S?.hostSessionId ? "[worker] " : "";
-    args.push(`%c${processPrefix}${scopeName}`, "color:#C026D3;font-weight:bold");
+  const scope = entry.meta?.S;
+  if (scope) {
+    const scopeName = scope.name || scopeDebugName;
+    if (scopeName) {
+      const processPrefix = scope.hostSessionId ? "[worker] " : "";
+      args.push(`%c${processPrefix}${scopeName}`, "color:#C026D3;font-weight:bold");
+    }
   }
   if (entry.message) {
     args.push(entry.message);
@@ -392,9 +205,9 @@ var APP_BROWSER_PROCESSOR = (config, entry) => {
   const context = getContextFromEntry(entry);
   if (context) {
     if (Object.keys(context).length === 1 && "error" in context) {
-      args.push(context.error);
+      args.push(unwrapEffectError(context.error));
     } else if (Object.keys(context).length === 1 && "err" in context) {
-      args.push(context.err);
+      args.push(unwrapEffectError(context.err));
     } else {
       args.push(context);
     }
@@ -429,10 +242,8 @@ var TEST_BROWSER_PROCESSOR = (config, entry) => {
   if (!shouldLog(entry, config.filters)) {
     return;
   }
-  let path = "";
-  if (entry.meta) {
-    path = `${getRelativeFilename2(entry.meta.F)}:${entry.meta.L}`;
-  }
+  const { filename, line: lineNumber } = entry.computedMeta;
+  const path = filename !== void 0 && lineNumber !== void 0 ? `${filename}:${lineNumber}` : "";
   let args = [];
   const processPrefix = entry.meta?.S?.hostSessionId ? "[worker] " : "";
   args.push(`${processPrefix}${entry.message}`);
@@ -459,11 +270,27 @@ var TEST_BROWSER_PROCESSOR = (config, entry) => {
   }
 };
 var BROWSER_PROCESSOR = CONFIG.useTestProcessor ? TEST_BROWSER_PROCESSOR : APP_BROWSER_PROCESSOR;
+var originalSymbol = /* @__PURE__ */ Symbol.for("effect/OriginalAnnotation");
+var unwrapEffectError = (error) => {
+  if (typeof error === "object" && error !== null && originalSymbol in error) {
+    return error[originalSymbol];
+  }
+  return error;
+};
+
+// src/processors/index.ts
+__reExport(processors_exports, console_processor_star);
+import * as console_processor_star from "#console-processor";
+
+// src/processors/debug-processor.ts
+import { inspect as inspect2 } from "node:util";
+var DEBUG_PROCESSOR = (config, entry) => {
+  console.log(inspect2(entry, false, null, true));
+};
 
 // src/processors/file-processor.ts
 import { appendFileSync, mkdirSync, openSync } from "node:fs";
 import { dirname } from "node:path";
-import { jsonlogify } from "@dxos/util";
 var EAGAIN_MAX_DURATION = 1e3;
 var createFileProcessor = ({ pathOrFd, levels: levels2, filters }) => {
   let fd;
@@ -484,15 +311,12 @@ var createFileProcessor = ({ pathOrFd, levels: levels2, filters }) => {
       fd = openSync(pathOrFd, "a");
     }
     const record = {
-      ...entry,
-      timestamp: Date.now(),
-      ...entry.meta ? {
-        meta: {
-          file: getRelativeFilename(entry.meta.F),
-          line: entry.meta.L
-        }
-      } : {},
-      context: jsonlogify(getContextFromEntry(entry))
+      level: entry.level,
+      message: entry.message,
+      timestamp: entry.timestamp,
+      meta: entry.computedMeta,
+      context: entry.computedContext,
+      error: entry.computedError
     };
     let retryTS = 0;
     while (true) {
@@ -531,13 +355,13 @@ var FILE_PROCESSOR = createFileProcessor({
 
 // src/options.ts
 var processors = {
-  [LogProcessorType.CONSOLE]: CONSOLE_PROCESSOR,
+  [LogProcessorType.CONSOLE]: processors_exports.CONSOLE_PROCESSOR,
   [LogProcessorType.BROWSER]: BROWSER_PROCESSOR,
   [LogProcessorType.DEBUG]: DEBUG_PROCESSOR
 };
-var browser = typeof window !== "undefined" || typeof navigator !== "undefined";
+var browser = (typeof window !== "undefined" || typeof navigator !== "undefined") && !(typeof process !== "undefined" && process?.env?.VITEST);
 var DEFAULT_PROCESSORS = [
-  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) => {
@@ -565,7 +389,7 @@ var createConfig = (options) => {
     filter: process.env.LOG_FILTER,
     processor: process.env.LOG_PROCESSOR
   } : void 0;
-  const mergedOptions = defaultsDeep({}, loadOptions(envOptions?.file), envOptions, options);
+  const mergedOptions = defaultsDeep({}, (0, platform_exports.loadOptions)(envOptions?.file), envOptions, options);
   return {
     options: mergedOptions,
     filters: parseFilter(mergedOptions.filter ?? LogLevel.INFO),
@@ -591,13 +415,14 @@ var createLog = () => {
     get: () => log2._config
   });
   const processLog = (level, message, context = {}, meta, error) => {
-    log2._config.processors.forEach((processor) => processor(log2._config, {
+    const entry = new LogEntry({
       level,
       message,
       context,
       meta,
       error
-    }));
+    });
+    log2._config.processors.forEach((processor) => processor(log2._config, entry));
   };
   Object.assign(log2, {
     /**
@@ -605,7 +430,7 @@ var createLog = () => {
     * NOTE: Preserves any processors that were already added to this logger instance
     * unless an explicit processor option is provided.
     */
-    config: ({ processor, ...options }) => {
+    config: ({ processor, ...options } = {}) => {
       const config = createConfig(options);
       const processors2 = processor ? config.processors : log2._config.processors;
       log2._config = {
@@ -659,11 +484,88 @@ var debug = (label, args) => {
 };
 var getFormattedStackTrace = () => new Error().stack.split("\n").slice(3).join("\n");
 
+// 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/log-buffer.ts
+import { CircularBuffer } from "@dxos/util";
+var DEFAULT_BUFFER_SIZE = 2e3;
+var MAX_CONTEXT_LENGTH = 500;
+var LogBuffer = class {
+  _buffer;
+  constructor(size = DEFAULT_BUFFER_SIZE) {
+    this._buffer = new CircularBuffer(size);
+  }
+  /**
+  * Log processor that can be registered with `log.runtimeConfig.processors`.
+  * Captures every level except TRACE (does not apply `shouldLog` / filter; use for full debug dumps).
+  */
+  logProcessor = (_config, entry) => {
+    if (entry.level <= LogLevel.TRACE) {
+      return;
+    }
+    const { filename, line, context: scopeName } = entry.computedMeta;
+    const record = {
+      t: new Date(entry.timestamp).toISOString(),
+      l: shortLevelName[entry.level] ?? "?",
+      m: entry.message ?? ""
+    };
+    if (filename !== void 0) {
+      record.f = filename;
+    }
+    if (line !== void 0) {
+      record.n = line;
+    }
+    if (scopeName !== void 0) {
+      record.o = scopeName;
+    }
+    if (entry.computedError !== void 0) {
+      record.e = entry.computedError;
+    }
+    const computedContext = entry.computedContext;
+    if (Object.keys(computedContext).length > 0) {
+      try {
+        let json = JSON.stringify(computedContext);
+        if (json.length > MAX_CONTEXT_LENGTH) {
+          json = json.slice(0, MAX_CONTEXT_LENGTH);
+        }
+        record.c = json;
+      } catch {
+      }
+    }
+    this._buffer.push(record);
+  };
+  /** Number of entries currently in the buffer. */
+  get size() {
+    return this._buffer.elementCount;
+  }
+  /** Discard all buffered entries. */
+  clear() {
+    this._buffer.clear();
+  }
+  /** Serialize buffer contents as NDJSON (newline-delimited JSON). */
+  serialize() {
+    const lines = [];
+    for (const record of this._buffer) {
+      lines.push(JSON.stringify(record));
+    }
+    return lines.join("\n");
+  }
+};
+
 // src/experimental/ownership.ts
-import { inspect as inspect4 } from "node:util";
-var kOwnershipScope = Symbol("kOwnershipScope");
-var kCurrentOwnershipScope = Symbol("kCurrentOwnershipScope");
-var kDebugInfoProperties = Symbol("kDebugInfoProperties");
+import { inspect as inspect3 } from "node:util";
+var kDebugInfoProperties = /* @__PURE__ */ Symbol("kDebugInfoProperties");
 var OwnershipScope = class {
   constr;
   parent;
@@ -683,7 +585,7 @@ var OwnershipScope = class {
     }
     return info;
   }
-  [inspect4.custom]() {
+  [inspect3.custom]() {
     return {
       className: this.constr.name,
       info: this.getInfo(),
@@ -694,15 +596,15 @@ var OwnershipScope = class {
 var getCurrentOwnershipScope = (thisRef) => thisRef;
 export {
   BROWSER_PROCESSOR,
-  CONSOLE_PROCESSOR,
   DEBUG_PROCESSOR,
-  DEFAULT_FORMATTER,
   FILE_PROCESSOR,
+  LogBuffer,
+  LogEntry,
   LogLevel,
   LogProcessorType,
-  SHORT_FORMATTER,
   createFileProcessor,
   createLog,
+  dbg,
   debug,
   gatherLogInfoFromScope,
   getContextFromEntry,
@@ -715,7 +617,6 @@ export {
   parseFilter,
   pick,
   shortLevelName,
-  shouldLog,
-  truncate
+  shouldLog
 };
 //# sourceMappingURL=index.mjs.map