@x1-labs/logging 0.1.23 → 0.1.24

package/dist/format.d.ts

@@ -1,5 +1,9 @@
-import type { TransportSingleOptions } from 'pino';
+import type { DestinationStream } from 'pino';
 export type LogFormat = 'json' | 'logfmt' | 'pretty';
 export declare function resolveLogFormat(override?: LogFormat | boolean): LogFormat;
 export declare function resolveFlattenNestedObjects(): boolean;
-export declare function resolveTransport(format: LogFormat): TransportSingleOptions | undefined;
+export declare function resolveDestination(format: LogFormat): DestinationStream | undefined;
+export declare function resolveTransport(format: LogFormat): {
+    target: string;
+    options: Record<string, unknown>;
+} | undefined;

package/dist/format.js

@@ -1,8 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveLogFormat = resolveLogFormat;
 exports.resolveFlattenNestedObjects = resolveFlattenNestedObjects;
+exports.resolveDestination = resolveDestination;
 exports.resolveTransport = resolveTransport;
+const pino_pretty_1 = __importDefault(require("pino-pretty"));
 function resolveLogFormat(override) {
     if (override === true)
         return 'json';
@@ -23,6 +28,86 @@ function resolveFlattenNestedObjects() {
     const env = process.env.LOG_FLATTEN_NESTED?.toLowerCase();
     return !(env === 'false' || env === '0');
 }
+function stringifyLogfmt(data) {
+    let line = '';
+    for (const key in data) {
+        const raw = data[key];
+        let value;
+        if (raw == null) {
+            value = '';
+        }
+        else {
+            value = String(raw);
+        }
+        const hasNewlines = value.includes('\n') || value.includes('\r');
+        const needsQuoting = value.includes(' ') || value.includes('=');
+        const needsEscaping = value.includes('"') || value.includes('\\');
+        if (needsEscaping)
+            value = value.replace(/["\\]/g, '\\$&');
+        if (hasNewlines) {
+            value = value
+                .replace(/\r\n/g, '\\n')
+                .replace(/\n/g, '\\n')
+                .replace(/\r/g, '\\r');
+        }
+        if (needsQuoting || needsEscaping || hasNewlines)
+            value = '"' + value + '"';
+        if (value === '' && raw != null)
+            value = '""';
+        line += key + '=' + value + ' ';
+    }
+    return line.trimEnd();
+}
+function flattenObject(source, separator = '_', prefixes = []) {
+    const output = {};
+    for (const key in source) {
+        const value = source[key];
+        if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
+            Object.assign(output, flattenObject(value, separator, [...prefixes, key]));
+        }
+        else {
+            output[[...prefixes, key].join(separator)] = value;
+        }
+    }
+    return output;
+}
+function reorderKeys(obj) {
+    const { time, level, name, msg, ...rest } = obj;
+    return {
+        ...(time !== undefined && { time }),
+        ...(level !== undefined && { level }),
+        ...(name !== undefined && { name }),
+        ...(msg !== undefined && { msg }),
+        ...rest,
+    };
+}
+function createLogfmtStream(flattenNestedObjects) {
+    return {
+        write(chunk) {
+            try {
+                let obj = JSON.parse(chunk);
+                if (flattenNestedObjects) {
+                    obj = flattenObject(obj);
+                }
+                obj = reorderKeys(obj);
+                process.stdout.write(stringifyLogfmt(obj) + '\n');
+            }
+            catch {
+                process.stdout.write(chunk);
+            }
+        },
+    };
+}
+function resolveDestination(format) {
+    switch (format) {
+        case 'json':
+            return undefined;
+        case 'logfmt':
+            return createLogfmtStream(resolveFlattenNestedObjects());
+        case 'pretty':
+            return (0, pino_pretty_1.default)({ singleLine: true });
+    }
+}
 function resolveTransport(format) {
     switch (format) {
         case 'json':

package/dist/format.js.map

@@ -1 +1 @@
-{"version":3,"file":"format.js","sourceRoot":"","sources":["../src/format.ts"],"names":[],"mappings":";;AAUA,4CAYC;AAMD,kEAGC;AAMD,4CAiBC;AA5CD,SAAgB,gBAAgB,CAAC,QAA8B;IAE7D,IAAI,QAAQ,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC;IACrC,IAAI,QAAQ,KAAK,KAAK;QAAE,OAAO,QAAQ,CAAC;IACxC,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IAE5C,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE,WAAW,EAAE,CAAC;IACxD,IAAI,SAAS,KAAK,MAAM;QAAE,OAAO,MAAM,CAAC;IACxC,IAAI,SAAS,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC5C,IAAI,SAAS,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAE5C,OAAO,QAAQ,CAAC;AAClB,CAAC;AAMD,SAAgB,2BAA2B;IACzC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,kBAAkB,EAAE,WAAW,EAAE,CAAC;IAC1D,OAAO,CAAC,CAAC,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,GAAG,CAAC,CAAC;AAC3C,CAAC;AAMD,SAAgB,gBAAgB,CAC9B,MAAiB;IAEjB,QAAQ,MAAM,EAAE,CAAC;QACf,KAAK,MAAM;YACT,OAAO,SAAS,CAAC;QACnB,KAAK,QAAQ;YACX,OAAO;gBACL,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC;gBAChD,OAAO,EAAE,EAAE,oBAAoB,EAAE,2BAA2B,EAAE,EAAE;aACjE,CAAC;QACJ,KAAK,QAAQ;YACX,OAAO;gBACL,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC;gBACtC,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;aAC9B,CAAC;IACN,CAAC;AACH,CAAC"}
+{"version":3,"file":"format.js","sourceRoot":"","sources":["../src/format.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { resolveLogLevel } from './level';
 export { resolveBase } from './base';
-export { resolveLogFormat, resolveTransport } from './format';
+export { resolveLogFormat, resolveDestination, resolveTransport } from './format';
 export type { LogFormat } from './format';
 export { createLogger } from './logger';
 export type { CreateLoggerOptions } from './logger';

package/dist/index.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLogger = exports.resolveTransport = exports.resolveLogFormat = exports.resolveBase = exports.resolveLogLevel = void 0;
+exports.createLogger = exports.resolveTransport = exports.resolveDestination = exports.resolveLogFormat = exports.resolveBase = exports.resolveLogLevel = void 0;
 var level_1 = require("./level");
 Object.defineProperty(exports, "resolveLogLevel", { enumerable: true, get: function () { return level_1.resolveLogLevel; } });
 var base_1 = require("./base");
 Object.defineProperty(exports, "resolveBase", { enumerable: true, get: function () { return base_1.resolveBase; } });
 var format_1 = require("./format");
 Object.defineProperty(exports, "resolveLogFormat", { enumerable: true, get: function () { return format_1.resolveLogFormat; } });
+Object.defineProperty(exports, "resolveDestination", { enumerable: true, get: function () { return format_1.resolveDestination; } });
 Object.defineProperty(exports, "resolveTransport", { enumerable: true, get: function () { return format_1.resolveTransport; } });
 var logger_1 = require("./logger");
 Object.defineProperty(exports, "createLogger", { enumerable: true, get: function () { return logger_1.createLogger; } });

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,iCAA0C;AAAjC,wGAAA,eAAe,OAAA;AACxB,+BAAqC;AAA5B,mGAAA,WAAW,OAAA;AACpB,mCAA8D;AAArD,0GAAA,gBAAgB,OAAA;AAAE,0GAAA,gBAAgB,OAAA;AAE3C,mCAAwC;AAA/B,sGAAA,YAAY,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,iCAA0C;AAAjC,wGAAA,eAAe,OAAA;AACxB,+BAAqC;AAA5B,mGAAA,WAAW,OAAA;AACpB,mCAAkF;AAAzE,0GAAA,gBAAgB,OAAA;AAAE,4GAAA,kBAAkB,OAAA;AAAE,0GAAA,gBAAgB,OAAA;AAE/D,mCAAwC;AAA/B,sGAAA,YAAY,OAAA"}

package/dist/logger.js

@@ -11,7 +11,7 @@ const format_1 = require("./format");
 function createLogger(options = {}) {
     const level = (0, level_1.resolveLogLevel)(options.level);
     const format = (0, format_1.resolveLogFormat)(options.format ?? options.json);
-    const transport = (0, format_1.resolveTransport)(format);
+    const destination = (0, format_1.resolveDestination)(format);
     const base = (0, base_1.resolveBase)();
     const opts = {
         level,
@@ -25,9 +25,6 @@ function createLogger(options = {}) {
     if (options.name) {
         opts.name = options.name;
     }
-    if (transport) {
-        opts.transport = transport;
-    }
-    return (0, pino_1.default)(opts);
+    return destination ? (0, pino_1.default)(opts, destination) : (0, pino_1.default)(opts);
 }
 //# sourceMappingURL=logger.js.map

package/dist/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;AAiBA,oCAyBC;AA1CD,gDAAwB;AAExB,mCAA0C;AAC1C,iCAAqC;AACrC,qCAA8D;AAa9D,SAAgB,YAAY,CAAC,UAA+B,EAAE;IAC5D,MAAM,KAAK,GAAG,IAAA,uBAAe,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,IAAA,yBAAgB,EAAC,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,MAAM,SAAS,GAAG,IAAA,yBAAgB,EAAC,MAAM,CAAC,CAAC;IAC3C,MAAM,IAAI,GAAG,IAAA,kBAAW,GAAE,CAAC;IAE3B,MAAM,IAAI,GAAkB;QAC1B,KAAK;QACL,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvC,SAAS,EAAE,cAAI,CAAC,gBAAgB,CAAC,OAAO;QACxC,UAAU,EAAE;YACV,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;SACnD;QACD,GAAG,OAAO,CAAC,WAAW;KACvB,CAAC;IAEF,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC3B,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACd,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,OAAO,IAAA,cAAI,EAAC,IAAI,CAAC,CAAC;AACpB,CAAC"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;AAiBA,oCAsBC;AAvCD,gDAAwB;AAExB,mCAA0C;AAC1C,iCAAqC;AACrC,qCAAgE;AAahE,SAAgB,YAAY,CAAC,UAA+B,EAAE;IAC5D,MAAM,KAAK,GAAG,IAAA,uBAAe,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,IAAA,yBAAgB,EAAC,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,MAAM,WAAW,GAAG,IAAA,2BAAkB,EAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,IAAI,GAAG,IAAA,kBAAW,GAAE,CAAC;IAE3B,MAAM,IAAI,GAAkB;QAC1B,KAAK;QACL,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvC,SAAS,EAAE,cAAI,CAAC,gBAAgB,CAAC,OAAO;QACxC,UAAU,EAAE;YACV,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE,EAAE,CAAC;SACnD;QACD,GAAG,OAAO,CAAC,WAAW;KACvB,CAAC;IAEF,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC3B,CAAC;IAGD,OAAO,WAAW,CAAC,CAAC,CAAC,IAAA,cAAI,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,IAAA,cAAI,EAAC,IAAI,CAAC,CAAC;AAC5D,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@x1-labs/logging",
-  "version": "0.1.23",
+  "version": "0.1.24",
   "description": "Shared pino logging library",
   "main": "dist/index.js",
   "browser": "dist/index.browser.js",