@rife/logger 0.0.5-beta.11 → 0.0.5-beta.3

package/dist/index.d.ts

@@ -1,54 +1,56 @@
 import winston from 'winston';
 import 'winston-daily-rotate-file';
-export type { winston };
+export { winston };
 export declare const getNewTraceId: (size?: number | undefined) => string;
 export declare function runInTrace<T>(fn: (...args: any[]) => T): T;
 export declare function getTraceId(): any;
-export declare namespace Logger {
-    interface Options {
-        /**
-         * 输出日志到console
-         * 默认：development环境下输出，production环境下不输出
-         */
-        writeToConsole?: boolean;
-        /**
-         * 输出日志到文件
-         * 默认：development环境下输出，production环境下不输出
-         */
-        writeToFile?: boolean;
-        /**
-         * 输出日志的文件目录
-         * 默认：./logs/
-         */
-        dirname?: string;
-        /**
-         * 输出日志的文件名
-         * 默认：server
-         */
-        filename?: string;
-        /**
-         * 日志输出格式
-         */
-        format?: {
+export declare namespace Rife {
+    namespace Logger {
+        interface Options {
             /**
-             * 显示时间
-             * 默认：true
+             * 输出日志到console
+             * 默认：development环境下输出，production环境下不输出
              */
-            time?: boolean;
+            writeToConsole?: boolean;
             /**
-             * 显示traceId
-             * 默认：true
+             * 输出日志到文件
+             * 默认：development环境下输出，production环境下不输出
              */
-            traceId?: boolean;
-        };
+            writeToFile?: boolean;
+            /**
+             * 输出日志的文件目录
+             * 默认：./logs/
+             */
+            dirname?: string;
+            /**
+             * 输出日志的文件名
+             * 默认：server
+             */
+            filename?: string;
+            /**
+             * 日志输出格式
+             */
+            format?: {
+                /**
+                 * 显示时间
+                 * 默认：true
+                 */
+                time?: boolean;
+                /**
+                 * 显示traceId
+                 * 默认：true
+                 */
+                traceId?: boolean;
+            };
+        }
+    }
+    interface Logger {
+        info: winston.LeveledLogMethod;
+        warn: winston.LeveledLogMethod;
+        error: winston.LeveledLogMethod;
     }
 }
-export interface Logger {
-    info: winston.LeveledLogMethod;
-    warn: winston.LeveledLogMethod;
-    error: winston.LeveledLogMethod;
-    setMetaData: (data: any) => void;
-}
-export declare function createLogger(options?: Logger.Options): {
-    logger: Logger;
+export declare function createLogger(options?: Rife.Logger.Options): {
+    logger: Rife.Logger;
+    instance: winston.Logger;
 };

package/dist/index.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLogger = exports.getTraceId = exports.runInTrace = exports.getNewTraceId = void 0;
+exports.createLogger = exports.getTraceId = exports.runInTrace = exports.getNewTraceId = exports.winston = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const async_hooks_1 = require("async_hooks");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const nanoid_1 = require("nanoid");
 const winston_1 = tslib_1.__importDefault(require("winston"));
+exports.winston = winston_1.default;
 const safe_stable_stringify_1 = tslib_1.__importDefault(require("safe-stable-stringify"));
 require("winston-daily-rotate-file");
 const als = new async_hooks_1.AsyncLocalStorage();
@@ -98,7 +99,7 @@ function createLogger(options) {
     if (config.writeToConsole) {
         transports.push(new winston_1.default.transports.Console());
     }
-    const { combine, timestamp, colorize, errors, metadata, splat } = winston_1.default.format;
+    const { combine, timestamp, colorize, errors, metadata, splat, json } = winston_1.default.format;
     const timeFormat = isProd() ? 'YYYY-MM-DD HH:mm:ss.SSS' : 'HH:mm:ss.SSS';
     let format = [
         errors({ stack: true }),
@@ -114,18 +115,11 @@ function createLogger(options) {
         format: combine(...format),
         transports,
     });
-    const setMetaData = (data) => {
-        instance.defaultMeta = {
-            ...instance.defaultMeta,
-            ...data,
-        };
-    };
     const logger = {
         info: instance.info.bind(instance),
         warn: instance.warn.bind(instance),
         error: instance.error.bind(instance),
-        setMetaData,
     };
-    return { logger };
+    return { logger, instance };
 }
 exports.createLogger = createLogger;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rife/logger",
-  "version": "0.0.5-beta.11",
+  "version": "0.0.5-beta.3",
   "description": "",
   "main": "./dist/index.js",
   "types": "./src/index.ts",
@@ -11,11 +11,10 @@
   ],
   "dependencies": {
     "chalk": "4",
-    "nanoid": "^3.3.6",
-    "safe-stable-stringify": "^2.4.3",
-    "winston": "^3.9.0",
-    "winston-daily-rotate-file": "^4.7.1",
-    "@rife/config": "0.0.5-beta.11"
+    "nanoid": "^3.1.30",
+    "winston": "^3.3.3",
+    "winston-daily-rotate-file": "^4.5.5",
+    "@rife/config": "0.0.5-beta.3"
   },
   "scripts": {
     "dev": "infra dev",

package/src/index.ts

@@ -7,7 +7,7 @@ import winston from 'winston';
 import JSONStringify from 'safe-stable-stringify';
 import 'winston-daily-rotate-file';
 
-export type { winston };
+export { winston };
 
 const als = new AsyncLocalStorage<{ traceId: string } & any>();
 
@@ -79,59 +79,60 @@ const tracerFormat = (options: { writeToFile: boolean; format: { time: boolean }
         return `${timestamp}${trace}${level}${service}${message}${stack}`;
     });
 
-export namespace Logger {
-    export interface Options {
-        /**
-         * 输出日志到console
-         * 默认：development环境下输出，production环境下不输出
-         */
-        writeToConsole?: boolean;
-
-        /**
-         * 输出日志到文件
-         * 默认：development环境下输出，production环境下不输出
-         */
-        writeToFile?: boolean;
-
-        /**
-         * 输出日志的文件目录
-         * 默认：./logs/
-         */
-        dirname?: string;
-
-        /**
-         * 输出日志的文件名
-         * 默认：server
-         */
-        filename?: string;
-
-        /**
-         * 日志输出格式
-         */
-        format?: {
+export namespace Rife {
+    export namespace Logger {
+        export interface Options {
             /**
-             * 显示时间
-             * 默认：true
+             * 输出日志到console
+             * 默认：development环境下输出，production环境下不输出
              */
-            time?: boolean;
+            writeToConsole?: boolean;
 
             /**
-             * 显示traceId
-             * 默认：true
+             * 输出日志到文件
+             * 默认：development环境下输出，production环境下不输出
              */
-            traceId?: boolean;
-        };
+            writeToFile?: boolean;
+
+            /**
+             * 输出日志的文件目录
+             * 默认：./logs/
+             */
+            dirname?: string;
+
+            /**
+             * 输出日志的文件名
+             * 默认：server
+             */
+            filename?: string;
+
+            /**
+             * 日志输出格式
+             */
+            format?: {
+                /**
+                 * 显示时间
+                 * 默认：true
+                 */
+                time?: boolean;
+
+                /**
+                 * 显示traceId
+                 * 默认：true
+                 */
+                traceId?: boolean;
+            };
+        }
     }
-}
 
-export interface Logger {
-    info: winston.LeveledLogMethod;
-    warn: winston.LeveledLogMethod;
-    error: winston.LeveledLogMethod;
-    setMetaData: (data: any) => void;
+    export interface Logger {
+        info: winston.LeveledLogMethod;
+        warn: winston.LeveledLogMethod;
+        error: winston.LeveledLogMethod;
+    }
 }
 
-export function createLogger(options?: Logger.Options) {
+export function createLogger(options?: Rife.Logger.Options) {
     let transports: winston.transport[] = [];
     let config = {
         writeToConsole: options?.writeToConsole ?? isDev(),
@@ -159,7 +160,7 @@ export function createLogger(options?: Logger.Options) {
         transports.push(new winston.transports.Console());
     }
 
-    const { combine, timestamp, colorize, errors, metadata, splat } = winston.format;
+    const { combine, timestamp, colorize, errors, metadata, splat, json } = winston.format;
     const timeFormat = isProd() ? 'YYYY-MM-DD HH:mm:ss.SSS' : 'HH:mm:ss.SSS';
     let format: winston.Logform.Format[] = [
         errors({ stack: true }),
@@ -176,19 +177,11 @@ export function createLogger(options?: Logger.Options) {
         transports,
     });
 
-    const setMetaData = (data: any) => {
-        instance.defaultMeta = {
-            ...instance.defaultMeta,
-            ...data,
-        };
-    };
-
-    const logger: Logger = {
+    const logger: Rife.Logger = {
         info: instance.info.bind(instance),
         warn: instance.warn.bind(instance),
         error: instance.error.bind(instance),
-        setMetaData,
     };
 
-    return { logger };
+    return { logger, instance };
 }

package/dist/trace.js

@@ -1 +0,0 @@
-"use strict";