@spinajs/log 1.1.7 → 1.2.8

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([

package/lib/targets/FileTarget.js.map

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

package/lib/targets/LogTarget.d.ts

@@ -1,14 +1,19 @@
-import { ICommonTargetOptions } from './../types';
 import { SyncModule } from "@spinajs/di";
-import { LogVariable, ILogTargetData } from "../types";
+import { LogVariable, ILogEntry, ICommonTargetOptions, LogVariables, ILogRule, ITargetsOption } from "@spinajs/log-common";
+export interface ILogTargetDesc {
+    instance: LogTarget<ICommonTargetOptions>;
+    options?: ITargetsOption;
+    rule: ILogRule;
+}
 export declare abstract class LogTarget<T extends ICommonTargetOptions> extends SyncModule {
     protected Variables: LogVariable[];
     HasError: boolean;
-    Error: Error | null;
+    Error: Error | null | unknown;
     protected VariablesDictionary: Map<string, LogVariable>;
     protected LayoutRegexp: RegExp;
     protected Options: T;
     constructor(Variables: LogVariable[], options: T);
-    abstract write(data: ILogTargetData): Promise<void>;
-    protected format(customVars: {}, layout: string): string;
+    abstract write(data: ILogEntry): Promise<void>;
+    protected format(customVars: LogVariables | null, layout: string): string;
+    protected _format(vars: LogVariables, txt: string): string;
 }

package/lib/targets/LogTarget.js

@@ -8,14 +8,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LogTarget = void 0;
 const di_1 = require("@spinajs/di");
-const lodash_1 = __importDefault(require("lodash"));
-const types_1 = require("../types");
+const _ = require("lodash");
+const log_common_1 = require("@spinajs/log-common");
 let LogTarget = class LogTarget extends di_1.SyncModule {
     constructor(Variables, options) {
         super();
@@ -23,56 +20,61 @@ let LogTarget = class LogTarget extends di_1.SyncModule {
         this.HasError = false;
         this.Error = null;
         this.VariablesDictionary = new Map();
-        this.Variables.forEach(v => {
+        this.Variables.forEach((v) => {
             this.VariablesDictionary.set(v.Name, v);
         });
         this.LayoutRegexp = /\{((.*?)(:(.*?))?)\}/gm;
         if (options) {
-            this.Options = lodash_1.default.merge(lodash_1.default.merge(this.Options, {
+            this.Options = _.merge(_.merge(this.Options, {
                 enabled: true,
-                layout: "{datetime} {level} {message} {error} ({logger})"
+                layout: "{datetime} {level} {message} {error} ({logger})",
             }), options);
         }
     }
     format(customVars, layout) {
-        const self = this;
-        if (customVars.message) {
-            return _format(Object.assign(Object.assign({}, customVars), { message: _format(customVars, customVars.message) }), layout);
+        if (customVars === null || customVars === void 0 ? void 0 : customVars.message) {
+            return this._format(Object.assign(Object.assign({}, customVars), { message: this._format(customVars, customVars.message) }), layout);
         }
-        return _format(customVars, layout);
-        function _format(vars, txt) {
-            self.LayoutRegexp.lastIndex = 0;
-            const varMatch = [...txt.matchAll(self.LayoutRegexp)];
-            if (!varMatch) {
-                return "";
-            }
-            let result = txt;
-            varMatch.forEach(v => {
-                if (vars[v[2]]) {
-                    result = result.replace(v[0], vars[v[2]]);
+        return this._format(customVars, layout);
+    }
+    _format(vars, txt) {
+        this.LayoutRegexp.lastIndex = 0;
+        const varMatch = [...txt.matchAll(this.LayoutRegexp)];
+        if (!varMatch) {
+            return "";
+        }
+        let result = txt;
+        varMatch.forEach((v) => {
+            if (vars && vars[v[2]]) {
+                const fVar = vars[v[2]];
+                if (fVar instanceof Function) {
+                    result = result.replace(v[0], fVar());
                 }
                 else {
-                    const variable = self.VariablesDictionary.get(v[2]);
-                    if (variable) {
-                        // optional parameter eg. {env:PORT}
-                        if (v[3]) {
-                            result = result.replace(v[0], variable.Value(v[4]));
-                        }
-                        else {
-                            result = result.replace(v[0], variable.Value());
-                        }
+                    result = result.replace(v[0], fVar);
+                }
+            }
+            else {
+                const variable = this.VariablesDictionary.get(v[2]);
+                if (variable) {
+                    // optional parameter eg. {env:PORT}
+                    if (v[4]) {
+                        result = result.replace(v[0], variable.Value(v[4]));
                     }
                     else {
-                        result = result.replace(v[0], "");
+                        result = result.replace(v[0], variable.Value());
                     }
                 }
-            });
-            return result;
-        }
+                else {
+                    result = result.replace(v[0], "");
+                }
+            }
+        });
+        return result;
     }
 };
 LogTarget = __decorate([
-    (0, di_1.Inject)(Array.ofType(types_1.LogVariable)),
+    (0, di_1.Inject)(Array.ofType(log_common_1.LogVariable)),
     __metadata("design:paramtypes", [Array, Object])
 ], LogTarget);
 exports.LogTarget = LogTarget;

package/lib/targets/LogTarget.js.map

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

package/lib/targets/index.d.ts

@@ -1,3 +1,4 @@
+export * from "./BlackHoleTarget";
 export * from "./ColoredConsoleTarget";
 export * from "./FileTarget";
 export * from "./LogTarget";

package/lib/targets/index.js

@@ -10,6 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./BlackHoleTarget"), exports);
 __exportStar(require("./ColoredConsoleTarget"), exports);
 __exportStar(require("./FileTarget"), exports);
 __exportStar(require("./LogTarget"), exports);

package/lib/targets/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/targets/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yDAAuC;AACvC,+CAA6B;AAC7B,8CAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/targets/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oDAAkC;AAClC,yDAAuC;AACvC,+CAA6B;AAC7B,8CAA4B"}

package/lib/types.d.ts

@@ -45,13 +45,13 @@ export interface ITargetsOption {
 export interface ILogOptions {
     targets: ITargetsOption[];
     rules: ILogRule[];
-    variables: {};
+    variables: Record<string, unknown>;
 }
 export interface ICommonTargetOptions {
     /**
      * Message layout. You can use variables
      *
-     * Default message layout is: {datetime} {level} {message} ({logger})
+     * Default message layout is: datetime level message (logger)
      */
     layout: string;
     /**
@@ -67,8 +67,6 @@ export interface ICommonTargetOptions {
      */
     enabled: boolean;
 }
-export interface IBlackHoleTargetOptions extends ICommonTargetOptions {
-}
 export interface IColoredConsoleTargetOptions extends ICommonTargetOptions {
     /**
      * Color theme for console message. Best leave it for default.
@@ -134,12 +132,17 @@ export interface IFileTargetOptions extends ICommonTargetOptions {
         flushTimeout: number;
     };
 }
+export interface ILogStaticVariables {
+    error: Error | undefined;
+    level: string;
+    logger: string;
+    message: string;
+}
+export interface ILogVariable {
+    [key: string]: string | (() => string);
+}
 export interface ILogTargetData {
     Level: LogLevel;
-    Variables: {
-        error: Error | undefined;
-        level: string;
-        logger: string;
-        message: string;
-    };
+    Variables: LogVariables;
 }
+export declare type LogVariables = ILogStaticVariables & ILogVariable;

package/lib/types.js

@@ -13,14 +13,14 @@ var LogLevel;
     LogLevel[LogLevel["Trace"] = 0] = "Trace";
 })(LogLevel = exports.LogLevel || (exports.LogLevel = {}));
 exports.StrToLogLevel = {
-    "trace": LogLevel.Trace,
-    "debug": LogLevel.Debug,
-    "info": LogLevel.Info,
-    "success": LogLevel.Success,
-    "warn": LogLevel.Warn,
-    "error": LogLevel.Error,
-    "fatal": LogLevel.Fatal,
-    "security": LogLevel.Security
+    trace: LogLevel.Trace,
+    debug: LogLevel.Debug,
+    info: LogLevel.Info,
+    success: LogLevel.Success,
+    warn: LogLevel.Warn,
+    error: LogLevel.Error,
+    fatal: LogLevel.Fatal,
+    security: LogLevel.Security,
 };
 exports.LogLevelStrings = {
     [LogLevel.Debug]: "debug",

package/lib/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAAA,IAAY,QAgBX;AAhBD,WAAY,QAAQ;IAChB,iDAAc,CAAA;IAEd,yCAAS,CAAA;IAET,yCAAS,CAAA;IAET,uCAAQ,CAAA;IAER,6CAAW,CAAA;IAEX,uCAAQ,CAAA;IAER,yCAAS,CAAA;IAET,yCAAS,CAAA;AACb,CAAC,EAhBW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAgBnB;AAEY,QAAA,aAAa,GAAG;IACzB,OAAO,EAAE,QAAQ,CAAC,KAAK;IACvB,OAAO,EAAE,QAAQ,CAAC,KAAK;IACvB,MAAM,EAAE,QAAQ,CAAC,IAAI;IACrB,SAAS,EAAE,QAAQ,CAAC,OAAO;IAC3B,MAAM,EAAE,QAAQ,CAAC,IAAI;IACrB,OAAO,EAAE,QAAQ,CAAC,KAAK;IACvB,OAAO,EAAE,QAAQ,CAAC,KAAK;IACvB,UAAU,EAAE,QAAQ,CAAC,QAAQ;CAChC,CAAA;AAEY,QAAA,eAAe,GAAG;IAC3B,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO;IACzB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO;IACzB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO;IACzB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM;IACvB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,UAAU;IAC/B,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS;IAC7B,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO;IACzB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM;CAC1B,CAAC;AAEF,MAAsB,WAAW;CAGhC;AAHD,kCAGC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAAA,IAAY,QAgBX;AAhBD,WAAY,QAAQ;IAClB,iDAAc,CAAA;IAEd,yCAAS,CAAA;IAET,yCAAS,CAAA;IAET,uCAAQ,CAAA;IAER,6CAAW,CAAA;IAEX,uCAAQ,CAAA;IAER,yCAAS,CAAA;IAET,yCAAS,CAAA;AACX,CAAC,EAhBW,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAgBnB;AAEY,QAAA,aAAa,GAAG;IAC3B,KAAK,EAAE,QAAQ,CAAC,KAAK;IACrB,KAAK,EAAE,QAAQ,CAAC,KAAK;IACrB,IAAI,EAAE,QAAQ,CAAC,IAAI;IACnB,OAAO,EAAE,QAAQ,CAAC,OAAO;IACzB,IAAI,EAAE,QAAQ,CAAC,IAAI;IACnB,KAAK,EAAE,QAAQ,CAAC,KAAK;IACrB,KAAK,EAAE,QAAQ,CAAC,KAAK;IACrB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;CAC5B,CAAC;AAEW,QAAA,eAAe,GAAG;IAC7B,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO;IACzB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO;IACzB,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO;IACzB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM;IACvB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,UAAU;IAC/B,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS;IAC7B,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO;IACzB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM;CACxB,CAAC;AAEF,MAAsB,WAAW;CAGhC;AAHD,kCAGC"}

package/lib/variables/date.d.ts

@@ -1,4 +1,4 @@
-import { LogVariable } from "../types";
+import { LogVariable } from "@spinajs/log-common";
 export declare class DateTimeLogVariable extends LogVariable {
     get Name(): string;
     Value(option?: string): string;

package/lib/variables/date.js

@@ -12,8 +12,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TimeLogVariable = exports.DateLogVariable = exports.DateTimeLogVariable = void 0;
 const di_1 = require("@spinajs/di");
 const luxon_1 = require("luxon");
-const types_1 = require("../types");
-let DateTimeLogVariable = class DateTimeLogVariable extends types_1.LogVariable {
+const log_common_1 = require("@spinajs/log-common");
+let DateTimeLogVariable = class DateTimeLogVariable extends log_common_1.LogVariable {
     get Name() {
         return "datetime";
     }
@@ -22,10 +22,10 @@ let DateTimeLogVariable = class DateTimeLogVariable extends types_1.LogVariable
     }
 };
 DateTimeLogVariable = __decorate([
-    (0, di_1.Injectable)(types_1.LogVariable)
+    (0, di_1.Injectable)(log_common_1.LogVariable)
 ], DateTimeLogVariable);
 exports.DateTimeLogVariable = DateTimeLogVariable;
-let DateLogVariable = class DateLogVariable extends types_1.LogVariable {
+let DateLogVariable = class DateLogVariable extends log_common_1.LogVariable {
     constructor(format) {
         super();
         this.format = format;
@@ -38,11 +38,11 @@ let DateLogVariable = class DateLogVariable extends types_1.LogVariable {
     }
 };
 DateLogVariable = __decorate([
-    (0, di_1.Injectable)(types_1.LogVariable),
+    (0, di_1.Injectable)(log_common_1.LogVariable),
     __metadata("design:paramtypes", [String])
 ], DateLogVariable);
 exports.DateLogVariable = DateLogVariable;
-let TimeLogVariable = class TimeLogVariable extends types_1.LogVariable {
+let TimeLogVariable = class TimeLogVariable extends log_common_1.LogVariable {
     constructor(format) {
         super();
         this.format = format;
@@ -55,7 +55,7 @@ let TimeLogVariable = class TimeLogVariable extends types_1.LogVariable {
     }
 };
 TimeLogVariable = __decorate([
-    (0, di_1.Injectable)(types_1.LogVariable),
+    (0, di_1.Injectable)(log_common_1.LogVariable),
     __metadata("design:paramtypes", [String])
 ], TimeLogVariable);
 exports.TimeLogVariable = TimeLogVariable;

package/lib/variables/date.js.map

@@ -1 +1 @@
-{"version":3,"file":"date.js","sourceRoot":"","sources":["../../src/variables/date.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAyC;AACzC,iCAAiC;AACjC,oCAAuC;AAIvC,IAAa,mBAAmB,GAAhC,MAAa,mBAAoB,SAAQ,mBAAW;IAChD,IAAW,IAAI;QACX,OAAO,UAAU,CAAC;IACtB,CAAC;IACM,KAAK,CAAC,MAAe;QACxB,OAAO,gBAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,4BAA4B,CAAC,CAAC;IAC3E,CAAC;CAEJ,CAAA;AARY,mBAAmB;IAD/B,IAAA,eAAU,EAAC,mBAAW,CAAC;GACX,mBAAmB,CAQ/B;AARY,kDAAmB;AAYhC,IAAa,eAAe,GAA5B,MAAa,eAAgB,SAAQ,mBAAW;IAE5C,YAAsB,MAAe;QACjC,KAAK,EAAE,CAAC;QADU,WAAM,GAAN,MAAM,CAAS;IAErC,CAAC;IAED,IAAW,IAAI;QACX,OAAO,MAAM,CAAC;IAClB,CAAC;IACM,KAAK,CAAC,MAAe;QACxB,OAAO,gBAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,YAAY,CAAC,CAAC;IAC3D,CAAC;CAGJ,CAAA;AAdY,eAAe;IAD3B,IAAA,eAAU,EAAC,mBAAW,CAAC;;GACX,eAAe,CAc3B;AAdY,0CAAe;AAkB5B,IAAa,eAAe,GAA5B,MAAa,eAAgB,SAAQ,mBAAW;IAE5C,YAAsB,MAAe;QACjC,KAAK,EAAE,CAAC;QADU,WAAM,GAAN,MAAM,CAAS;IAErC,CAAC;IAED,IAAW,IAAI;QACX,OAAO,MAAM,CAAC;IAClB,CAAC;IACM,KAAK,CAAC,MAAe;QACxB,OAAO,gBAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,cAAc,CAAC,CAAC;IAC7D,CAAC;CAGJ,CAAA;AAdY,eAAe;IAD3B,IAAA,eAAU,EAAC,mBAAW,CAAC;;GACX,eAAe,CAc3B;AAdY,0CAAe"}
+{"version":3,"file":"date.js","sourceRoot":"","sources":["../../src/variables/date.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAyC;AACzC,iCAAiC;AACjC,oDAAkD;AAGlD,IAAa,mBAAmB,GAAhC,MAAa,mBAAoB,SAAQ,wBAAW;IAClD,IAAW,IAAI;QACb,OAAO,UAAU,CAAC;IACpB,CAAC;IACM,KAAK,CAAC,MAAe;QAC1B,OAAO,gBAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,4BAA4B,CAAC,CAAC;IACzE,CAAC;CACF,CAAA;AAPY,mBAAmB;IAD/B,IAAA,eAAU,EAAC,wBAAW,CAAC;GACX,mBAAmB,CAO/B;AAPY,kDAAmB;AAUhC,IAAa,eAAe,GAA5B,MAAa,eAAgB,SAAQ,wBAAW;IAC9C,YAAsB,MAAe;QACnC,KAAK,EAAE,CAAC;QADY,WAAM,GAAN,MAAM,CAAS;IAErC,CAAC;IAED,IAAW,IAAI;QACb,OAAO,MAAM,CAAC;IAChB,CAAC;IACM,KAAK,CAAC,MAAe;QAC1B,OAAO,gBAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,YAAY,CAAC,CAAC;IACzD,CAAC;CACF,CAAA;AAXY,eAAe;IAD3B,IAAA,eAAU,EAAC,wBAAW,CAAC;;GACX,eAAe,CAW3B;AAXY,0CAAe;AAc5B,IAAa,eAAe,GAA5B,MAAa,eAAgB,SAAQ,wBAAW;IAC9C,YAAsB,MAAe;QACnC,KAAK,EAAE,CAAC;QADY,WAAM,GAAN,MAAM,CAAS;IAErC,CAAC;IAED,IAAW,IAAI;QACb,OAAO,MAAM,CAAC;IAChB,CAAC;IACM,KAAK,CAAC,MAAe;QAC1B,OAAO,gBAAQ,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,cAAc,CAAC,CAAC;IAC3D,CAAC;CACF,CAAA;AAXY,eAAe;IAD3B,IAAA,eAAU,EAAC,wBAAW,CAAC;;GACX,eAAe,CAW3B;AAXY,0CAAe"}

package/lib/variables/env.d.ts

@@ -1,4 +1,4 @@
-import { LogVariable } from "../types";
+import { LogVariable } from "@spinajs/log-common";
 export declare class EnvVariable extends LogVariable {
     get Name(): string;
     Value(option: string): string;