@spinajs/log 1.1.9 → 1.2.7

package/lib/schemas/log.configuration.js

@@ -1,104 +1,102 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const CONFIGURATION_SCHEMA = {
-    "$id": "spinajs/log.configuration.schema.json",
-    "description": "Logger configuration option validation",
-    "type": "object",
-    "properties": {
-        "targets": {
-            "description": "Log target, where log messages should be written to, and their options",
-            "type": "array",
-            "minItems": 1,
-            "uniqueItems": true,
-            "items": {
-                "type": "object",
-                "properties": {
-                    "layout": {
-                        "type": "string"
+    $id: "spinajs/log.configuration.schema.json",
+    $configurationModule: "logger",
+    description: "Logger configuration option validation",
+    type: "object",
+    properties: {
+        targets: {
+            description: "Log target, where log messages should be written to, and their options",
+            type: "array",
+            minItems: 1,
+            uniqueItems: true,
+            items: {
+                type: "object",
+                properties: {
+                    layout: {
+                        type: "string",
                     },
-                    "name": {
-                        "type": "string"
+                    name: {
+                        type: "string",
                     },
-                    "type": {
-                        "type": "string"
+                    type: {
+                        type: "string",
                     },
-                    "theme": {
-                        "type": "object",
-                        "properties": {
-                            "security": {
-                                "type": "string"
+                    theme: {
+                        type: "object",
+                        properties: {
+                            security: {
+                                type: "string",
                             },
-                            "fatal": {
-                                "type": "string"
+                            fatal: {
+                                type: "string",
                             },
-                            "error": {
-                                "type": "string"
+                            error: {
+                                type: "string",
                             },
-                            "warn": {
-                                "type": "string"
+                            warn: {
+                                type: "string",
                             },
-                            "success": {
-                                "type": "string"
+                            success: {
+                                type: "string",
                             },
-                            "info": {
-                                "type": "string"
+                            info: {
+                                type: "string",
                             },
-                            "debug": {
-                                "type": "string"
+                            debug: {
+                                type: "string",
                             },
-                            "trace": {
-                                "type": "string"
-                            }
-                        }
+                            trace: {
+                                type: "string",
+                            },
+                        },
+                    },
+                    enabled: {
+                        type: "boolean",
                     },
-                    "enabled": {
-                        "type": "boolean"
+                    path: {
+                        type: "string",
                     },
-                    "path": {
-                        "type": "string"
+                    archivePath: {
+                        type: "string",
                     },
-                    "archivePath": {
-                        "type": "string"
+                    maxSize: {
+                        type: "integer",
+                        minimum: 10000,
                     },
-                    "maxSize": {
-                        "type": "integer",
-                        "minimum": 10000
+                    compress: {
+                        type: "boolean",
                     },
-                    "compress": {
-                        "type": "boolean"
+                    rotate: {
+                        type: "string",
                     },
-                    "rotate": {
-                        "type": "string"
+                    maxArchiveFiles: {
+                        type: "integer",
+                        minimum: 1,
                     },
-                    "maxArchiveFiles": {
-                        "type": "integer",
-                        "minimum": 1
+                    bufferSize: {
+                        type: "integer",
+                        minimum: 1000,
                     },
-                    "bufferSize": {
-                        "type": "integer",
-                        "minimum": 1000
-                    }
                 },
-                "required": [
-                    "name",
-                    "type"
-                ]
-            }
+                required: ["name", "type"],
+            },
         },
-        "rules": {
-            "description": "Log rules, what log should be write where",
-            "type": "array",
-            "minItems": 1,
-            "uniqueItems": true,
-            "items": {
-                "type": "object",
-                "properties": {
-                    "name": {
-                        "type": "string"
+        rules: {
+            description: "Log rules, what log should be write where",
+            type: "array",
+            minItems: 1,
+            uniqueItems: true,
+            items: {
+                type: "object",
+                properties: {
+                    name: {
+                        type: "string",
                     },
-                    "level": {
-                        "type": "string",
-                        "enum": [
+                    level: {
+                        type: "string",
+                        enum: [
                             "trace",
                             "debug",
                             "warn",
@@ -106,31 +104,27 @@ const CONFIGURATION_SCHEMA = {
                             "error",
                             "fatal",
                             "security",
-                            "success"
-                        ]
+                            "success",
+                        ],
                     },
-                    "target": {
-                        "oneOf": [
+                    target: {
+                        oneOf: [
                             {
-                                "type": "string"
+                                type: "string",
                             },
                             {
-                                "type": "array",
-                                "items": {
-                                    "type": "string"
-                                }
-                            }
-                        ]
-                    }
+                                type: "array",
+                                items: {
+                                    type: "string",
+                                },
+                            },
+                        ],
+                    },
                 },
-                "required": [
-                    "name",
-                    "level",
-                    "target"
-                ]
-            }
-        }
-    }
+                required: ["name", "level", "target"],
+            },
+        },
+    },
 };
 exports.default = CONFIGURATION_SCHEMA;
 //# sourceMappingURL=log.configuration.js.map

package/lib/schemas/log.configuration.js.map

@@ -1 +1 @@
-{"version":3,"file":"log.configuration.js","sourceRoot":"","sources":["../../src/schemas/log.configuration.ts"],"names":[],"mappings":";;AAAA,MAAM,oBAAoB,GAAG;IACzB,KAAK,EAAE,uCAAuC;IAC9C,aAAa,EAAE,wCAAwC;IACvD,MAAM,EAAE,QAAQ;IAChB,YAAY,EAAE;QACV,SAAS,EAAE;YACP,aAAa,EAAE,wEAAwE;YACvF,MAAM,EAAE,OAAO;YACf,UAAU,EAAE,CAAC;YACb,aAAa,EAAE,IAAI;YACnB,OAAO,EAAE;gBACL,MAAM,EAAE,QAAQ;gBAChB,YAAY,EAAE;oBACV,QAAQ,EAAE;wBACN,MAAM,EAAE,QAAQ;qBACnB;oBACD,MAAM,EAAE;wBACJ,MAAM,EAAE,QAAQ;qBACnB;oBACD,MAAM,EAAE;wBACJ,MAAM,EAAE,QAAQ;qBACnB;oBACD,OAAO,EAAE;wBACL,MAAM,EAAE,QAAQ;wBAChB,YAAY,EAAE;4BACV,UAAU,EAAE;gCACR,MAAM,EAAE,QAAQ;6BACnB;4BACD,OAAO,EAAE;gCACL,MAAM,EAAE,QAAQ;6BACnB;4BACD,OAAO,EAAE;gCACL,MAAM,EAAE,QAAQ;6BACnB;4BACD,MAAM,EAAE;gCACJ,MAAM,EAAE,QAAQ;6BACnB;4BACD,SAAS,EAAE;gCACP,MAAM,EAAE,QAAQ;6BACnB;4BACD,MAAM,EAAE;gCACJ,MAAM,EAAE,QAAQ;6BACnB;4BACD,OAAO,EAAE;gCACL,MAAM,EAAE,QAAQ;6BACnB;4BACD,OAAO,EAAE;gCACL,MAAM,EAAE,QAAQ;6BACnB;yBACJ;qBACJ;oBACD,SAAS,EAAE;wBACP,MAAM,EAAE,SAAS;qBACpB;oBACD,MAAM,EAAE;wBACJ,MAAM,EAAE,QAAQ;qBACnB;oBACD,aAAa,EAAE;wBACX,MAAM,EAAE,QAAQ;qBACnB;oBACD,SAAS,EAAE;wBACP,MAAM,EAAE,SAAS;wBACjB,SAAS,EAAE,KAAK;qBACnB;oBACD,UAAU,EAAE;wBACR,MAAM,EAAE,SAAS;qBACpB;oBACD,QAAQ,EAAE;wBACN,MAAM,EAAE,QAAQ;qBACnB;oBACD,iBAAiB,EAAE;wBACf,MAAM,EAAE,SAAS;wBACjB,SAAS,EAAE,CAAC;qBACf;oBACD,YAAY,EAAE;wBACV,MAAM,EAAE,SAAS;wBACjB,SAAS,EAAE,IAAI;qBAClB;iBACJ;gBACD,UAAU,EAAE;oBACR,MAAM;oBACN,MAAM;iBACT;aACJ;SACJ;QACD,OAAO,EAAE;YACL,aAAa,EAAE,2CAA2C;YAC1D,MAAM,EAAE,OAAO;YACf,UAAU,EAAE,CAAC;YACb,aAAa,EAAE,IAAI;YACnB,OAAO,EAAE;gBACL,MAAM,EAAE,QAAQ;gBAChB,YAAY,EAAE;oBACV,MAAM,EAAE;wBACJ,MAAM,EAAE,QAAQ;qBACnB;oBACD,OAAO,EAAE;wBACL,MAAM,EAAE,QAAQ;wBAChB,MAAM,EAAE;4BACJ,OAAO;4BACP,OAAO;4BACP,MAAM;4BACN,MAAM;4BACN,OAAO;4BACP,OAAO;4BACP,UAAU;4BACV,SAAS;yBACZ;qBACJ;oBACD,QAAQ,EAAE;wBACN,OAAO,EAAE;4BACL;gCACI,MAAM,EAAE,QAAQ;6BACnB;4BACD;gCACI,MAAM,EAAE,OAAO;gCACf,OAAO,EAAE;oCACL,MAAM,EAAE,QAAQ;iCACnB;6BACJ;yBACJ;qBACJ;iBACJ;gBACD,UAAU,EAAE;oBACR,MAAM;oBACN,OAAO;oBACP,QAAQ;iBACX;aACJ;SACJ;KACJ;CACJ,CAAA;AAED,kBAAe,oBAAoB,CAAC"}
+{"version":3,"file":"log.configuration.js","sourceRoot":"","sources":["../../src/schemas/log.configuration.ts"],"names":[],"mappings":";;AAAA,MAAM,oBAAoB,GAAG;IAC3B,GAAG,EAAE,uCAAuC;IAC5C,oBAAoB,EAAE,QAAQ;IAC9B,WAAW,EAAE,wCAAwC;IACrD,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,OAAO,EAAE;YACP,WAAW,EACT,wEAAwE;YAC1E,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,CAAC;YACX,WAAW,EAAE,IAAI;YACjB,KAAK,EAAE;gBACL,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,MAAM,EAAE;wBACN,IAAI,EAAE,QAAQ;qBACf;oBACD,IAAI,EAAE;wBACJ,IAAI,EAAE,QAAQ;qBACf;oBACD,IAAI,EAAE;wBACJ,IAAI,EAAE,QAAQ;qBACf;oBACD,KAAK,EAAE;wBACL,IAAI,EAAE,QAAQ;wBACd,UAAU,EAAE;4BACV,QAAQ,EAAE;gCACR,IAAI,EAAE,QAAQ;6BACf;4BACD,KAAK,EAAE;gCACL,IAAI,EAAE,QAAQ;6BACf;4BACD,KAAK,EAAE;gCACL,IAAI,EAAE,QAAQ;6BACf;4BACD,IAAI,EAAE;gCACJ,IAAI,EAAE,QAAQ;6BACf;4BACD,OAAO,EAAE;gCACP,IAAI,EAAE,QAAQ;6BACf;4BACD,IAAI,EAAE;gCACJ,IAAI,EAAE,QAAQ;6BACf;4BACD,KAAK,EAAE;gCACL,IAAI,EAAE,QAAQ;6BACf;4BACD,KAAK,EAAE;gCACL,IAAI,EAAE,QAAQ;6BACf;yBACF;qBACF;oBACD,OAAO,EAAE;wBACP,IAAI,EAAE,SAAS;qBAChB;oBACD,IAAI,EAAE;wBACJ,IAAI,EAAE,QAAQ;qBACf;oBACD,WAAW,EAAE;wBACX,IAAI,EAAE,QAAQ;qBACf;oBACD,OAAO,EAAE;wBACP,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE,KAAK;qBACf;oBACD,QAAQ,EAAE;wBACR,IAAI,EAAE,SAAS;qBAChB;oBACD,MAAM,EAAE;wBACN,IAAI,EAAE,QAAQ;qBACf;oBACD,eAAe,EAAE;wBACf,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE,CAAC;qBACX;oBACD,UAAU,EAAE;wBACV,IAAI,EAAE,SAAS;wBACf,OAAO,EAAE,IAAI;qBACd;iBACF;gBACD,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;aAC3B;SACF;QACD,KAAK,EAAE;YACL,WAAW,EAAE,2CAA2C;YACxD,IAAI,EAAE,OAAO;YACb,QAAQ,EAAE,CAAC;YACX,WAAW,EAAE,IAAI;YACjB,KAAK,EAAE;gBACL,IAAI,EAAE,QAAQ;gBACd,UAAU,EAAE;oBACV,IAAI,EAAE;wBACJ,IAAI,EAAE,QAAQ;qBACf;oBACD,KAAK,EAAE;wBACL,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE;4BACJ,OAAO;4BACP,OAAO;4BACP,MAAM;4BACN,MAAM;4BACN,OAAO;4BACP,OAAO;4BACP,UAAU;4BACV,SAAS;yBACV;qBACF;oBACD,MAAM,EAAE;wBACN,KAAK,EAAE;4BACL;gCACE,IAAI,EAAE,QAAQ;6BACf;4BACD;gCACE,IAAI,EAAE,OAAO;gCACb,KAAK,EAAE;oCACL,IAAI,EAAE,QAAQ;iCACf;6BACF;yBACF;qBACF;iBACF;gBACD,QAAQ,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC;aACtC;SACF;KACF;CACF,CAAC;AAEF,kBAAe,oBAAoB,CAAC"}

package/lib/targets/BlackHoleTarget.d.ts

@@ -1,8 +1,8 @@
-import { IBlackHoleTargetOptions } from './../types';
-import { LogTarget } from './LogTarget';
+import { ICommonTargetOptions } from "@spinajs/log-common";
+import { LogTarget } from "./LogTarget";
 /**
  * Empty writer, usefull for tests or when we dont want to get any messages
  */
-export declare class BlackHoleTarget extends LogTarget<IBlackHoleTargetOptions> {
+export declare class BlackHoleTarget extends LogTarget<ICommonTargetOptions> {
     write(): Promise<void>;
 }

package/lib/targets/BlackHoleTarget.js.map

@@ -1 +1 @@
-{"version":3,"file":"BlackHoleTarget.js","sourceRoot":"","sources":["../../src/targets/BlackHoleTarget.ts"],"names":[],"mappings":";;;;;;;;;AACA,oCAAoD;AACpD,2CAAwC;AAExC;;GAEG;AAGH,IAAa,eAAe,GAA5B,MAAa,eAAgB,SAAQ,qBAAkC;IAE5D,KAAK,CAAC,KAAK;QACd,OAAO;IACX,CAAC;CAEJ,CAAA;AANY,eAAe;IAF3B,IAAA,cAAS,GAAE;IACX,IAAA,eAAU,EAAC,iBAAiB,CAAC;GACjB,eAAe,CAM3B;AANY,0CAAe"}
+{"version":3,"file":"BlackHoleTarget.js","sourceRoot":"","sources":["../../src/targets/BlackHoleTarget.ts"],"names":[],"mappings":";;;;;;;;;AACA,oCAAoD;AACpD,2CAAwC;AAExC;;GAEG;AAGH,IAAa,eAAe,GAA5B,MAAa,eAAgB,SAAQ,qBAA+B;IAC3D,KAAK,CAAC,KAAK;QAChB,OAAO;IACT,CAAC;CACF,CAAA;AAJY,eAAe;IAF3B,IAAA,cAAS,GAAE;IACX,IAAA,eAAU,EAAC,iBAAiB,CAAC;GACjB,eAAe,CAI3B;AAJY,0CAAe"}

package/lib/targets/ColoredConsoleTarget.d.ts

@@ -1,6 +1,5 @@
-import { IColoredConsoleTargetOptions, ILogTargetData } from './../types';
-import { IContainer } from '@spinajs/di';
-import { LogTarget } from './LogTarget';
+import { IColoredConsoleTargetOptions, ILogEntry } from "@spinajs/log-common";
+import { LogTarget } from "./LogTarget";
 export declare const DEFAULT_THEME: {
     security: string[];
     fatal: string;
@@ -46,6 +45,6 @@ export declare class ColoredConsoleTarget extends LogTarget<IColoredConsoleTarge
             (message?: any, ...optionalParams: any[]): void;
         };
     };
-    resolve(_: IContainer): void;
-    write(data: ILogTargetData): Promise<void>;
+    resolve(): void;
+    write(data: ILogEntry): Promise<void>;
 }

package/lib/targets/ColoredConsoleTarget.js

@@ -7,21 +7,20 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ColoredConsoleTarget = exports.DEFAULT_THEME = void 0;
-const types_1 = require("./../types");
+const log_common_1 = require("@spinajs/log-common");
 const di_1 = require("@spinajs/di");
 const LogTarget_1 = require("./LogTarget");
 const __1 = require("..");
-// tslint:disable-next-line
-const colors = require('colors/safe');
+const colors = require("colors/safe");
 exports.DEFAULT_THEME = {
-    security: ['red', "bgBrightWhite"],
-    fatal: 'red',
-    error: 'brightRed',
-    warn: 'yellow',
-    success: 'green',
-    info: 'white',
-    debug: 'gray',
-    trace: 'gray',
+    security: ["red", "bgBrightWhite"],
+    fatal: "red",
+    error: "brightRed",
+    warn: "yellow",
+    success: "green",
+    info: "white",
+    debug: "gray",
+    trace: "gray",
 };
 let ColoredConsoleTarget = class ColoredConsoleTarget extends LogTarget_1.LogTarget {
     constructor() {
@@ -37,16 +36,21 @@ let ColoredConsoleTarget = class ColoredConsoleTarget extends LogTarget_1.LogTar
             [__1.LogLevel.Warn]: console.warn,
         };
     }
-    resolve(_) {
+    resolve() {
         var _a;
         colors.setTheme((_a = this.Options.theme) !== null && _a !== void 0 ? _a : exports.DEFAULT_THEME);
-        super.resolve(_);
+        super.resolve();
     }
     async write(data) {
         if (!this.Options.enabled) {
             return;
         }
-        this.StdConsoleCallbackMap[data.Level](colors[types_1.LogLevelStrings[data.Level]](this.format(data.Variables, this.Options.layout)));
+        this.StdConsoleCallbackMap[data.Level](
+        /**
+         * we are safe to call, disable eslint
+         */
+        /* eslint-disable */
+        colors[log_common_1.LogLevelStrings[data.Level]](this.format(data.Variables, this.Options.layout)));
     }
 };
 ColoredConsoleTarget = __decorate([

package/lib/targets/ColoredConsoleTarget.js.map

@@ -1 +1 @@
-{"version":3,"file":"ColoredConsoleTarget.js","sourceRoot":"","sources":["../../src/targets/ColoredConsoleTarget.ts"],"names":[],"mappings":";;;;;;;;;AAAA,sCAA2F;AAC3F,oCAAgE;AAChE,2CAAwC;AACxC,0BAA8B;AAE9B,2BAA2B;AAC3B,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;AAEzB,QAAA,aAAa,GAAG;IACzB,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,CAAC;IAClC,KAAK,EAAE,KAAK;IACZ,KAAK,EAAE,WAAW;IAClB,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;CAChB,CAAA;AAID,IAAa,oBAAoB,GAAjC,MAAa,oBAAqB,SAAQ,qBAAuC;IAAjF;;QAEc,0BAAqB,GAAG;YAC9B,CAAC,YAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;YAC/B,CAAC,YAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;YAC/B,CAAC,YAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,KAAK;YAElC,CAAC,YAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,GAAG;YAC5B,CAAC,YAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,GAAG;YAE/B,CAAC,YAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;YAC/B,CAAC,YAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;YAE/B,CAAC,YAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI;SAChC,CAAA;IAeL,CAAC;IAbU,OAAO,CAAC,CAAa;;QACxB,MAAM,CAAC,QAAQ,CAAC,MAAA,IAAI,CAAC,OAAO,CAAC,KAAK,mCAAI,qBAAa,CAAC,CAAC;QACrD,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACrB,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,IAAoB;QAEnC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACvB,OAAO;SACV;QAED,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAE,MAAc,CAAC,uBAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC3I,CAAC;CACJ,CAAA;AA7BY,oBAAoB;IAFhC,IAAA,cAAS,GAAE;IACX,IAAA,eAAU,EAAC,eAAe,CAAC;GACf,oBAAoB,CA6BhC;AA7BY,oDAAoB"}
+{"version":3,"file":"ColoredConsoleTarget.js","sourceRoot":"","sources":["../../src/targets/ColoredConsoleTarget.ts"],"names":[],"mappings":";;;;;;;;;AAAA,oDAI6B;AAC7B,oCAAoD;AACpD,2CAAwC;AACxC,0BAA8B;AAC9B,sCAAsC;AAEzB,QAAA,aAAa,GAAG;IAC3B,QAAQ,EAAE,CAAC,KAAK,EAAE,eAAe,CAAC;IAClC,KAAK,EAAE,KAAK;IACZ,KAAK,EAAE,WAAW;IAClB,IAAI,EAAE,QAAQ;IACd,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,OAAO;IACb,KAAK,EAAE,MAAM;IACb,KAAK,EAAE,MAAM;CACd,CAAC;AAIF,IAAa,oBAAoB,GAAjC,MAAa,oBAAqB,SAAQ,qBAAuC;IAAjF;;QACY,0BAAqB,GAAG;YAChC,CAAC,YAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;YAC/B,CAAC,YAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;YAC/B,CAAC,YAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,KAAK;YAElC,CAAC,YAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,GAAG;YAC5B,CAAC,YAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,GAAG;YAE/B,CAAC,YAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;YAC/B,CAAC,YAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,KAAK;YAE/B,CAAC,YAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,IAAI;SAC9B,CAAC;IAsBJ,CAAC;IApBQ,OAAO;;QACZ,MAAM,CAAC,QAAQ,CAAC,MAAA,IAAI,CAAC,OAAO,CAAC,KAAK,mCAAI,qBAAa,CAAC,CAAC;QACrD,KAAK,CAAC,OAAO,EAAE,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,KAAK,CAAC,IAAe;QAChC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACzB,OAAO;SACR;QAED,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC;QACpC;;WAEG;QACH,oBAAoB;QACnB,MAAc,CAAC,4BAAe,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAC1C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CACjD,CACF,CAAC;IACJ,CAAC;CACF,CAAA;AAnCY,oBAAoB;IAFhC,IAAA,cAAS,GAAE;IACX,IAAA,eAAU,EAAC,eAAe,CAAC;GACf,oBAAoB,CAmChC;AAnCY,oDAAoB"}

package/lib/targets/FileTarget.d.ts

@@ -1,6 +1,5 @@
-import { IContainer } from "@spinajs/di";
 import { LogTarget } from "./LogTarget";
-import { IFileTargetOptions, ILogTargetData } from "../types";
+import { IFileTargetOptions, ILogEntry } from "@spinajs/log-common";
 import { Job } from "node-schedule";
 export declare class FileTarget extends LogTarget<IFileTargetOptions> {
     protected LogDirPath: string;
@@ -15,8 +14,8 @@ export declare class FileTarget extends LogTarget<IFileTargetOptions> {
     protected CurrentFileSize: number;
     protected BufferSize: number;
     protected Buffer: any[];
-    resolve(_: IContainer): void;
-    write(data: ILogTargetData): Promise<void>;
+    resolve(): void;
+    write(data: ILogEntry): Promise<void>;
     protected archive(): void;
     protected flush(): void;
     private rotate;

package/lib/targets/FileTarget.js

@@ -1,68 +1,47 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
+/* eslint security/detect-non-literal-fs-filename:0 -- Safe as no value holds user input */
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileTarget = void 0;
 const di_1 = require("@spinajs/di");
 const LogTarget_1 = require("./LogTarget");
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
+const fs = require("fs");
+const path = require("path");
 const node_schedule_1 = require("node-schedule");
 const exceptions_1 = require("@spinajs/exceptions");
 const os_1 = require("os");
-const glob = __importStar(require("glob"));
-const zlib = __importStar(require("zlib"));
+const glob = require("glob");
+const zlib = require("zlib");
 let FileTarget = class FileTarget extends LogTarget_1.LogTarget {
     constructor() {
         super(...arguments);
         this.BufferSize = 0;
         this.Buffer = [];
     }
-    resolve(_) {
+    resolve() {
         this.Options.options = Object.assign({
             compress: true,
             maxSize: 1024 * 1024,
             maxArchiveFiles: 5,
             bufferSize: 8 * 1024,
-            flushTimeout: 10 * 1000
+            flushTimeout: 10 * 1000,
         }, this.Options.options);
         this.initialize();
         this.rotate();
         process.on("exit", () => {
             this.flush();
             if (this.LogFileDescriptor) {
-                fs_1.default.closeSync(this.LogFileDescriptor);
+                fs.closeSync(this.LogFileDescriptor);
             }
         });
-        super.resolve(_);
+        super.resolve();
     }
-    async write(data) {
+    write(data) {
         if (!this.Options.enabled) {
             return;
         }
@@ -78,60 +57,57 @@ let FileTarget = class FileTarget extends LogTarget_1.LogTarget {
         }
     }
     archive() {
-        const files = glob.sync(path_1.default.join(this.ArchiveDirPath, `archived_${this.LogBaseName}*{${this.LogFileExt},.gzip}`)).map(f => {
+        const files = glob
+            .sync(path.join(this.ArchiveDirPath, `archived_${this.LogBaseName}*{${this.LogFileExt},.gzip}`))
+            .map((f) => {
             return {
                 name: f,
-                stat: fs_1.default.statSync(f)
+                stat: fs.statSync(f),
             };
-        }).sort(x => x.stat.mtime.getTime());
+        })
+            .sort((x) => x.stat.mtime.getTime());
         const newestFile = files.length !== 0 ? files[files.length - 1].name : undefined;
-        const fIndex = newestFile ? parseInt(newestFile.substring(newestFile.lastIndexOf("_") + 1, newestFile.lastIndexOf("_") + 2), 10) + 1 : 1;
-        const archPath = path_1.default.join(this.ArchiveDirPath, `archived_${this.LogBaseName}_${fIndex}${this.LogFileExt}`);
-        try {
-            this.flush();
-            if (!fs_1.default.existsSync(this.LogPath)) {
-                return;
-            }
-            fs_1.default.closeSync(this.LogFileDescriptor);
-            fs_1.default.copyFileSync(this.LogPath, archPath);
-            fs_1.default.unlinkSync(this.LogPath);
-            this.initialize();
-            if (this.Options.options.compress) {
-                const zippedPath = path_1.default.join(this.ArchiveDirPath, `archived_${this.LogBaseName}_${fIndex}${this.LogFileExt}.gzip`);
-                const zip = zlib.createGzip();
-                const read = fs_1.default.createReadStream(archPath);
-                const write = fs_1.default.createWriteStream(zippedPath);
-                read.pipe(zip).pipe(write);
-                write.on("finish", () => {
-                    read.close();
-                    zip.close();
-                    write.close();
-                    fs_1.default.unlink(archPath, () => { return; });
+        const fIndex = newestFile
+            ? parseInt(newestFile.substring(newestFile.lastIndexOf("_") + 1, newestFile.lastIndexOf("_") + 2), 10) + 1
+            : 1;
+        const archPath = path.join(this.ArchiveDirPath, `archived_${this.LogBaseName}_${fIndex}${this.LogFileExt}`);
+        this.flush();
+        if (!fs.existsSync(this.LogPath)) {
+            return;
+        }
+        fs.closeSync(this.LogFileDescriptor);
+        fs.copyFileSync(this.LogPath, archPath);
+        fs.unlinkSync(this.LogPath);
+        this.initialize();
+        if (this.Options.options.compress) {
+            const zippedPath = path.join(this.ArchiveDirPath, `archived_${this.LogBaseName}_${fIndex}${this.LogFileExt}.gzip`);
+            const zip = zlib.createGzip();
+            const read = fs.createReadStream(archPath);
+            const write = fs.createWriteStream(zippedPath);
+            read.pipe(zip).pipe(write);
+            write.on("finish", () => {
+                read.close();
+                zip.close();
+                write.close();
+                fs.unlink(archPath, () => {
+                    return;
                 });
-            }
-            if (files.length >= this.Options.options.maxArchiveFiles) {
-                fs_1.default.unlink(files[0].name, () => { return; });
-            }
+            });
         }
-        catch (err) {
-            this.Error = err;
-            this.HasError = true;
+        if (files.length >= this.Options.options.maxArchiveFiles) {
+            fs.unlink(files[0].name, () => {
+                return;
+            });
         }
     }
     flush() {
         if (!this.LogFileDescriptor || this.HasError || this.BufferSize === 0) {
             return;
         }
-        try {
-            fs_1.default.writeFileSync(this.LogFileDescriptor, this.Buffer.join());
-            this.CurrentFileSize += this.BufferSize;
-            this.Buffer = [];
-            this.BufferSize = 0;
-        }
-        catch (err) {
-            this.HasError = true;
-            this.Error = err;
-        }
+        fs.writeFileSync(this.LogFileDescriptor, this.Buffer.join());
+        this.CurrentFileSize += this.BufferSize;
+        this.Buffer = [];
+        this.BufferSize = 0;
     }
     rotate() {
         if (this.Options.options.rotate) {
@@ -141,48 +117,44 @@ let FileTarget = class FileTarget extends LogTarget_1.LogTarget {
         }
     }
     initialize() {
-        try {
-            this.flush();
-            if (this.LogFileDescriptor >= 0) {
-                fs_1.default.closeSync(this.LogFileDescriptor);
-                this.LogFileDescriptor = 0;
-            }
-            this.CurrentFileSize = 0;
-            this.LogDirPath = this.format({}, path_1.default.dirname(path_1.default.resolve(this.Options.options.path)));
-            this.ArchiveDirPath = this.Options.options.archivePath ? this.format({}, path_1.default.resolve(this.Options.options.archivePath)) : this.LogDirPath;
-            this.LogFileName = this.format({}, path_1.default.basename(this.Options.options.path));
-            this.LogPath = path_1.default.join(this.LogDirPath, this.LogFileName);
-            const { name, ext } = path_1.default.parse(this.LogFileName);
-            this.LogFileExt = ext;
-            this.LogBaseName = name;
-            if (!this.LogDirPath) {
-                throw new exceptions_1.InvalidOption("Missing LogDirPath log option");
-            }
-            if (!fs_1.default.existsSync(this.LogDirPath)) {
-                fs_1.default.mkdirSync(this.LogDirPath);
-            }
-            if (this.ArchiveDirPath) {
-                if (!fs_1.default.existsSync(this.ArchiveDirPath)) {
-                    fs_1.default.mkdirSync(this.ArchiveDirPath);
-                }
-            }
-            if (fs_1.default.existsSync(this.LogPath)) {
-                const { size } = fs_1.default.statSync(this.LogPath);
-                this.CurrentFileSize = size;
-            }
-            this.LogFileDescriptor = fs_1.default.openSync(this.LogPath, "a");
-            if (this.Options.options.flushTimeout !== 0) {
-                setTimeout(() => {
-                    this.flush();
-                }, this.Options.options.flushTimeout);
+        this.flush();
+        if (this.LogFileDescriptor >= 0) {
+            fs.closeSync(this.LogFileDescriptor);
+            this.LogFileDescriptor = 0;
+        }
+        this.CurrentFileSize = 0;
+        this.LogDirPath = this.format(null, path.dirname(path.resolve(this.Options.options.path)));
+        this.ArchiveDirPath = this.Options.options.archivePath
+            ? this.format(null, path.resolve(this.Options.options.archivePath))
+            : this.LogDirPath;
+        this.LogFileName = this.format(null, path.basename(this.Options.options.path));
+        this.LogPath = path.join(this.LogDirPath, this.LogFileName);
+        const { name, ext } = path.parse(this.LogFileName);
+        this.LogFileExt = ext;
+        this.LogBaseName = name;
+        if (!this.LogDirPath) {
+            throw new exceptions_1.InvalidOption("Missing LogDirPath log option");
+        }
+        if (!fs.existsSync(this.LogDirPath)) {
+            fs.mkdirSync(this.LogDirPath);
+        }
+        if (this.ArchiveDirPath) {
+            if (!fs.existsSync(this.ArchiveDirPath)) {
+                fs.mkdirSync(this.ArchiveDirPath);
             }
-            this.HasError = false;
-            this.Error = null;
         }
-        catch (err) {
-            this.HasError = true;
-            this.Error = err;
+        if (fs.existsSync(this.LogPath)) {
+            const { size } = fs.statSync(this.LogPath);
+            this.CurrentFileSize = size;
+        }
+        this.LogFileDescriptor = fs.openSync(this.LogPath, "a");
+        if (this.Options.options.flushTimeout !== 0) {
+            setTimeout(() => {
+                this.flush();
+            }, this.Options.options.flushTimeout);
         }
+        this.HasError = false;
+        this.Error = null;
     }
 };
 FileTarget = __decorate([