@prosopo/logger 1.0.3 → 2.0.0

package/dist/tests/logger.unit.test.js

@@ -1,5 +1,9 @@
+import { stringifyBigInts } from "@prosopo/util";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { getLogger, stringifyBigInts } from "../logger.js";
+import { getLogger, parseDirectives, parseLogLevel, resolveLevel, setGlobalDirectives, } from "../logger.js";
+beforeEach(() => {
+    setGlobalDirectives("");
+});
 describe("unpackError", () => {
     let captured = [];
     beforeEach(() => {
@@ -56,7 +60,7 @@ describe("unpackError", () => {
     });
 });
 describe("stringifyBigInts", () => {
-    it("should strigify big int", () => {
+    it("should stringify big int", () => {
         const bigInt = BigInt(12345678901234567890n);
         const stringified = stringifyBigInts(bigInt);
         expect(stringified).toEqual(bigInt.toString());
@@ -101,4 +105,211 @@ describe("stringifyBigInts", () => {
         ]);
     });
 });
+describe("parseLogLevel", () => {
+    it("parses a bare level", () => {
+        expect(parseLogLevel("warn")).toBe("warn");
+    });
+    it("extracts the global level from a directive string", () => {
+        expect(parseLogLevel("warn,database=trace")).toBe("warn");
+    });
+    it("returns the fallback for a directives-only string", () => {
+        expect(parseLogLevel("database=trace", "info")).toBe("info");
+    });
+    it("returns the fallback for undefined", () => {
+        expect(parseLogLevel(undefined, "info")).toBe("info");
+    });
+});
+describe("parseDirectives", () => {
+    it("parses a bare level as the global default (empty-string key)", () => {
+        const directives = parseDirectives("debug");
+        expect(directives.get("")).toBe("debug");
+    });
+    it("parses scope=level pairs", () => {
+        const directives = parseDirectives("provider:db=debug,provider:api=trace");
+        expect(directives.get("provider:db")).toBe("debug");
+        expect(directives.get("provider:api")).toBe("trace");
+    });
+    it("ignores empty and invalid entries", () => {
+        const directives = parseDirectives(" , provider:db=debug , bogus=nope ");
+        expect(directives.get("provider:db")).toBe("debug");
+        expect(directives.has("bogus")).toBe(false);
+    });
+    it("ignores an empty-scope entry like '=debug' (only a bare level sets the global default)", () => {
+        const directives = parseDirectives("=debug");
+        expect(directives.has("")).toBe(false);
+    });
+    it("does not let an empty-scope entry override a real scope's level", () => {
+        const directives = parseDirectives("=debug,provider:db=warn");
+        expect(directives.has("")).toBe(false);
+        expect(directives.get("provider:db")).toBe("warn");
+    });
+    it("parses per-scope overrides", () => {
+        const d = parseDirectives("warn,database=trace");
+        expect(d.get("")).toBe("warn");
+        expect(d.get("database")).toBe("trace");
+    });
+    it("parses directives-only (no global default)", () => {
+        const d = parseDirectives("database=trace");
+        expect(d.has("")).toBe(false);
+        expect(d.get("database")).toBe("trace");
+    });
+});
+describe("resolveLevel", () => {
+    it("returns an exact scope match", () => {
+        const directives = parseDirectives("provider:db=debug");
+        expect(resolveLevel("provider:db", directives, "info")).toBe("debug");
+    });
+    it("returns the most specific matching prefix", () => {
+        const directives = parseDirectives("provider=warn,provider:db=debug");
+        expect(resolveLevel("provider:db:query", directives, "info")).toBe("debug");
+    });
+    it("falls back to the global default when no scope matches", () => {
+        const directives = parseDirectives("other=trace,error");
+        expect(resolveLevel("provider:db", directives, "info")).toBe("error");
+    });
+    it("falls back to the supplied fallback when nothing matches", () => {
+        const directives = parseDirectives("other=trace");
+        expect(resolveLevel("provider:db", directives, "info")).toBe("info");
+    });
+    it("matches the exact scope", () => {
+        const d = parseDirectives("warn,database:mongo=trace");
+        expect(resolveLevel("database:mongo", d, "info")).toBe("trace");
+    });
+    it("matches a prefix when exact scope has no entry", () => {
+        const d = parseDirectives("warn,database=debug");
+        expect(resolveLevel("database:mongo:queries", d, "info")).toBe("debug");
+    });
+    it("falls back to global default when no scope matches", () => {
+        const d = parseDirectives("warn,database=debug");
+        expect(resolveLevel("provider:request", d, "info")).toBe("warn");
+    });
+    it("returns fallback when directives are empty", () => {
+        const d = parseDirectives("");
+        expect(resolveLevel("any:scope", d, "info")).toBe("info");
+    });
+});
+describe("Logger.with subscope + directives", () => {
+    let captured = [];
+    beforeEach(() => {
+        captured = [];
+        const capture = (...args) => {
+            captured.push(String(args[0]));
+        };
+        vi.spyOn(console, "debug").mockImplementation(capture);
+        vi.spyOn(console, "info").mockImplementation(capture);
+    });
+    afterEach(() => {
+        vi.restoreAllMocks();
+        setGlobalDirectives("");
+    });
+    it("concatenates parent scope with subscope", () => {
+        setGlobalDirectives("parent:child=debug");
+        const child = getLogger("info", "parent").with({}, "child");
+        child.debug(() => ({ msg: "hello" }));
+        expect(captured.length).toBe(1);
+    });
+    it("uses the subscope directly when the parent scope is empty (no leading colon)", () => {
+        setGlobalDirectives("admin=debug");
+        const child = getLogger("info", "").with({}, "admin");
+        child.debug(() => ({ msg: "hello" }));
+        expect(captured.length).toBe(1);
+    });
+    it("re-resolves directives at print time rather than baking them in (no sticky level)", () => {
+        setGlobalDirectives("admin=debug");
+        const child = getLogger("info", "").with({}, "admin");
+        setGlobalDirectives("");
+        child.debug(() => ({ msg: "should be suppressed" }));
+        expect(captured.length).toBe(0);
+        child.info(() => ({ msg: "visible" }));
+        expect(captured.length).toBe(1);
+    });
+});
+describe("setGlobalDirectives", () => {
+    afterEach(() => {
+        setGlobalDirectives(process.env.PROSOPO_LOG_LEVEL ?? "");
+    });
+    it("affects an existing logger's filtering at emit time", () => {
+        const logger = getLogger("info", "test-scope");
+        const debugSpy = vi.spyOn(console, "debug").mockImplementation(() => { });
+        try {
+            setGlobalDirectives("warn");
+            logger.debug(() => ({ msg: "hidden" }));
+            expect(debugSpy).not.toHaveBeenCalled();
+            setGlobalDirectives("warn,test-scope=trace");
+            logger.debug(() => ({ msg: "shown" }));
+            expect(debugSpy).toHaveBeenCalledTimes(1);
+        }
+        finally {
+            debugSpy.mockRestore();
+        }
+    });
+});
+describe("emitted record", () => {
+    afterEach(() => {
+        setGlobalDirectives(process.env.PROSOPO_LOG_LEVEL ?? "");
+    });
+    it("uses the message level rather than the logger's configured level", () => {
+        setGlobalDirectives("trace");
+        const logger = getLogger("info", "record-scope");
+        const errorSpy = vi.spyOn(console, "error").mockImplementation(() => { });
+        try {
+            logger.error(() => ({ msg: "boom" }));
+            expect(errorSpy).toHaveBeenCalledTimes(1);
+            const output = errorSpy.mock.calls[0]?.[0];
+            expect(typeof output).toBe("string");
+            const record = JSON.parse(output);
+            expect(record.level).toBe("error");
+            expect(record.scope).toBe("record-scope");
+            expect(record.msg).toBe("boom");
+        }
+        finally {
+            errorSpy.mockRestore();
+        }
+    });
+});
+describe("Logger.with subscope", () => {
+    it("appends subscope to parent scope", () => {
+        const parent = getLogger("info", "provider");
+        const child = parent.with({}, "request");
+        expect(child.getScope()).toBe("provider:request");
+    });
+    it("does not produce a leading colon when parent scope is empty", () => {
+        const parent = getLogger("info", "");
+        const child = parent.with({}, "request");
+        expect(child.getScope()).toBe("request");
+    });
+    it("trims surrounding whitespace from the subscope", () => {
+        const parent = getLogger("info", "provider");
+        const child = parent.with({}, "  request  ");
+        expect(child.getScope()).toBe("provider:request");
+    });
+    it("treats a whitespace-only subscope as absent", () => {
+        const parent = getLogger("info", "provider");
+        const child = parent.with({}, "   ");
+        expect(child.getScope()).toBe("provider");
+    });
+    it("merges parent and child default data into emitted records", () => {
+        setGlobalDirectives("trace");
+        const parent = getLogger("info", "test").with({ requestId: "abc" });
+        const child = parent.with({ extra: 1 });
+        const infoSpy = vi.spyOn(console, "info").mockImplementation(() => { });
+        try {
+            child.info(() => ({ data: { perCall: true } }));
+            expect(infoSpy).toHaveBeenCalledTimes(1);
+            const output = infoSpy.mock.calls[0]?.[0];
+            expect(typeof output).toBe("string");
+            const record = JSON.parse(output);
+            expect(record.scope).toBe("test");
+            expect(record.data).toMatchObject({
+                requestId: "abc",
+                extra: 1,
+                perCall: true,
+            });
+        }
+        finally {
+            infoSpy.mockRestore();
+            setGlobalDirectives(process.env.PROSOPO_LOG_LEVEL ?? "");
+        }
+    });
+});
 //# sourceMappingURL=logger.unit.test.js.map

package/dist/tests/logger.unit.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.unit.test.js","sourceRoot":"","sources":["../../src/tests/logger.unit.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"logger.unit.test.js","sourceRoot":"","sources":["../../src/tests/logger.unit.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@prosopo/logger",
-	"version": "1.0.3",
+	"version": "2.0.0",
 	"description": "Prosopo logger library",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -28,11 +28,11 @@
 	"author": "Prosopo Limited",
 	"license": "Apache-2.0",
 	"dependencies": {
-		"@prosopo/util": "3.3.0",
+		"@prosopo/util": "3.3.2",
 		"zod": "3.23.8"
 	},
 	"devDependencies": {
-		"@prosopo/config": "3.3.1",
+		"@prosopo/config": "3.3.4",
 		"@types/node": "22.10.2",
 		"@vitest/coverage-v8": "3.2.4",
 		"concurrently": "9.0.1",
@@ -42,7 +42,7 @@
 		"tslib": "2.7.0",
 		"tsx": "4.20.3",
 		"typescript": "5.6.2",
-		"vite": "6.4.1",
+		"vite": "6.4.3",
 		"vitest": "3.2.4"
 	},
 	"repository": {

package/src/logger.ts

@@ -15,8 +15,6 @@
 import { stringifyBigInts } from "@prosopo/util";
 import { z } from "zod";
 
-export { stringifyBigInts };
-
 export type LogObject = object;
 export type LogRecord = {
 	err?: unknown;
@@ -37,11 +35,15 @@ export type Logger = {
 	fatal(fn: LogRecordFn): void;
 	log(level: LogLevel, fn: LogRecordFn): void;
 	/**
-	 * Creates a new logger instance which includes the given object in every log message. Akin to a child logger.
-	 * This is useful for adding context to log messages, such as user IDs, request IDs, etc.
-	 * @param obj An object to log, which will be added to every log message.
+	 * Creates a child logger with merged default data and an optional subscope appended to the
+	 * current scope (e.g. parent "database" + subscope "queries" → "database:queries").
+	 * The child's configured level is snapshotted at creation by resolving PROSOPO_LOG_LEVEL
+	 * directives for the new scope, falling back to the parent's level when no directive matches.
+	 * At emit time `print()` re-resolves directives for the scope, using the child's own configured
+	 * level (this snapshot) as the fallback — so later directive changes are honoured, but a direct
+	 * `setLogLevel()` on the child overrides the snapshot.
 	 */
-	with(obj: LogObject): Logger;
+	with(obj: LogObject, subscope?: string): Logger;
 	getPretty(): boolean;
 	setPretty(pretty: boolean): void;
 	getPrintStack(): boolean;
@@ -50,12 +52,14 @@ export type Logger = {
 	setFormat(format: Format): void;
 };
 
-export const InfoLevel = "info";
-export const DebugLevel = "debug";
-export const TraceLevel = "trace";
-export const WarnLevel = "warn";
-export const ErrorLevel = "error";
-export const FatalLevel = "fatal";
+// Level string constants are internal to this module; consumers use the
+// `LogLevel` enum/type or the string literals it parses.
+const InfoLevel = "info";
+const DebugLevel = "debug";
+const TraceLevel = "trace";
+const WarnLevel = "warn";
+const ErrorLevel = "error";
+const FatalLevel = "fatal";
 
 export const LogLevel = z.enum([
 	InfoLevel,
@@ -67,11 +71,7 @@ export const LogLevel = z.enum([
 ]);
 export type LogLevel = z.infer<typeof LogLevel>;
 
-export type LevelMap = {
-	[K in LogLevel]: number;
-};
-
-const logLevelMap: LevelMap = {
+const logLevelMap: Record<LogLevel, number> = {
 	[TraceLevel]: 0,
 	[DebugLevel]: 1,
 	[InfoLevel]: 2,
@@ -84,8 +84,97 @@ export function parseLogLevel(
 	level: string | undefined,
 	or: LogLevel = InfoLevel,
 ): LogLevel {
-	const result = LogLevel.safeParse(level);
-	return result.success ? result.data : or;
+	if (!level) return or;
+	// Handle directive strings like "warn,database=trace" — extract the bare global level.
+	for (const part of level.split(",")) {
+		const trimmed = part.trim();
+		if (trimmed && !trimmed.includes("=")) {
+			const parsed = LogLevel.safeParse(trimmed);
+			if (parsed.success) return parsed.data;
+		}
+	}
+	return or;
+}
+
+// ---------------------------------------------------------------------------
+// Directive-based filtering
+//
+// PROSOPO_LOG_LEVEL supports both a bare level and a comma-separated directive
+// string with optional per-scope overrides, e.g.:
+//   "warn"                         – global floor
+//   "warn,database=trace"          – global warn, database:* gets trace
+//   "database=trace,http=debug"    – per-scope only, no global default
+//
+// Scope segments are separated by ":" mirroring module paths, e.g.
+//   "provider:db=debug" matches any logger whose scope starts with "provider:db".
+// ---------------------------------------------------------------------------
+
+export type Directives = Map<string, LogLevel>;
+
+/**
+ * Parse a PROSOPO_LOG_LEVEL directive string into a scope→level map.
+ * An entry with an empty-string key represents the global default.
+ */
+export function parseDirectives(raw: string): Directives {
+	const map: Directives = new Map();
+	for (const part of raw.split(",")) {
+		const trimmed = part.trim();
+		if (!trimmed) continue;
+		const eqIdx = trimmed.indexOf("=");
+		if (eqIdx === -1) {
+			const parsed = LogLevel.safeParse(trimmed);
+			if (parsed.success) map.set("", parsed.data);
+		} else {
+			const scope = trimmed.slice(0, eqIdx).trim();
+			// Ignore entries with an empty scope (e.g. "=debug") — only a bare
+			// level (no "=") may set the global default.
+			if (!scope) continue;
+			const parsed = LogLevel.safeParse(trimmed.slice(eqIdx + 1).trim());
+			if (parsed.success) map.set(scope, parsed.data);
+		}
+	}
+	return map;
+}
+
+/**
+ * Find the most specific directive that matches the given scope.
+ * Walks from the full scope up to the empty-string global default.
+ * Returns the fallback if nothing matches.
+ */
+export function resolveLevel(
+	scope: string,
+	directives: Directives,
+	fallback: LogLevel,
+): LogLevel {
+	if (directives.has(scope)) return directives.get(scope) as LogLevel;
+	const parts = scope.split(":");
+	for (let i = parts.length - 1; i > 0; i--) {
+		const prefix = parts.slice(0, i).join(":");
+		if (directives.has(prefix)) return directives.get(prefix) as LogLevel;
+	}
+	if (directives.has("")) return directives.get("") as LogLevel;
+	return fallback;
+}
+
+let _globalDirectives: Directives | undefined;
+
+function getGlobalDirectives(): Directives {
+	if (!_globalDirectives) {
+		const raw =
+			typeof process !== "undefined"
+				? (process.env?.PROSOPO_LOG_LEVEL ?? "")
+				: "";
+		_globalDirectives = parseDirectives(raw);
+	}
+	return _globalDirectives;
+}
+
+/**
+ * Override the global directives at runtime (useful in tests or at app startup).
+ * Accepts the same directive string as PROSOPO_LOG_LEVEL.
+ */
+export function setGlobalDirectives(raw: string): void {
+	_globalDirectives = parseDirectives(raw);
 }
 
 // Create a new logger with the given level and scope
@@ -98,8 +187,8 @@ export function getLogger(logLevel: LogLevel, scope: string): Logger {
 const inBrowser =
 	typeof window !== "undefined" && typeof window.document !== "undefined";
 
-export const FormatJson = "json";
-export const FormatPlain = "plain";
+const FormatJson = "json";
+const FormatPlain = "plain";
 export const Format = z.enum([FormatJson, FormatPlain]);
 export type Format = z.infer<typeof Format>;
 
@@ -111,17 +200,15 @@ export class NativeLogger implements Logger {
 	// this provides utility for adding properties to every log message
 	private defaultData: LogObject | undefined;
 	private level: LogLevel;
-	private levelNum: number;
 	private pretty = 0; // pretty print indentation level - 0 = no pretty print, 2 = 2 spaces, etc
 	private printStack = false; // whether to print the stack trace in the log
 	private format: Format = FormatJson;
 
 	constructor(
 		private scope: string,
-		private levelMap: LevelMap = logLevelMap,
+		private levelMap: Record<LogLevel, number> = logLevelMap,
 	) {
 		this.level = InfoLevel; // default log level
-		this.levelNum = this.levelMap[this.level];
 	}
 
 	setFormat(format: Format): void {
@@ -135,9 +222,31 @@ export class NativeLogger implements Logger {
 		return this.format;
 	}
 
-	with(obj: LogObject): Logger {
-		const newLogger = new NativeLogger(this.scope);
-		newLogger.defaultData = { ...this.defaultData, ...obj };
+	with(obj: LogObject, subscope?: string): Logger {
+		// Trim so a whitespace-only subscope is treated as absent and the
+		// resulting scope matches the trimmed keys produced by parseDirectives().
+		const trimmedSubscope = subscope?.trim();
+		const newScope = trimmedSubscope
+			? this.scope
+				? `${this.scope}:${trimmedSubscope}`
+				: trimmedSubscope
+			: this.scope;
+		const newLogger = new NativeLogger(newScope, this.levelMap);
+		// Avoid allocating an empty defaultData object when scoping only
+		// (e.g. with({}, "subscope")). Reuse the parent reference when obj has no
+		// keys, and skip merging entirely when neither side has data.
+		const hasObjData = Object.keys(obj).length > 0;
+		if (hasObjData) {
+			newLogger.defaultData = { ...this.defaultData, ...obj };
+		} else if (this.defaultData) {
+			newLogger.defaultData = this.defaultData;
+		}
+		newLogger.setPretty(this.getPretty());
+		newLogger.setPrintStack(this.getPrintStack());
+		// Inherit the parent's configured level as the fallback only. Directives
+		// are applied dynamically at print time (see print()), so we must NOT bake
+		// the currently-resolved level in here — otherwise a directive active now
+		// would stick to this child even after setGlobalDirectives() clears it.
 		newLogger.setLogLevel(this.getLogLevel());
 		return newLogger;
 	}
@@ -164,7 +273,6 @@ export class NativeLogger implements Logger {
 
 	setLogLevel(level: LogLevel): void {
 		this.level = level;
-		this.levelNum = this.levelMap[level];
 	}
 
 	getLogLevel(): LogLevel {
@@ -212,8 +320,13 @@ export class NativeLogger implements Logger {
 		fn: LogRecordFn,
 		level: LogLevel,
 	): void {
-		if (this.levelMap[level] < this.levelNum) {
-			return; // skip logging if the level is below the current log level threshold
+		// Re-resolve at print time so directives set after construction are respected.
+		const effectiveLevelNum =
+			this.levelMap[
+				resolveLevel(this.scope, getGlobalDirectives(), this.level)
+			];
+		if (this.levelMap[level] < effectiveLevelNum) {
+			return; // skip logging if the level is below the effective threshold
 		}
 		const ts = new Date().toISOString();
 		// populate the log fields using the fn