@zajno/common 1.4.17 → 1.4.18

package/coverage/lcov.info

@@ -2941,11 +2941,11 @@ BRH:0
 end_of_record
 TN:
 SF:src/validation/helpers.ts
-FN:4,createShouldBeEqualTo
-FN:5,(anonymous_1)
-FN:8,throwNotOk
-FN:14,validateObject
-FN:21,(anonymous_4)
+FN:9,createShouldBeEqualTo
+FN:10,(anonymous_1)
+FN:13,throwNotOk
+FN:19,validateObject
+FN:27,(anonymous_4)
 FNF:5
 FNH:0
 FNDA:0,createShouldBeEqualTo
@@ -2955,35 +2955,42 @@ FNDA:0,validateObject
 FNDA:0,(anonymous_4)
 DA:1,5
 DA:2,5
-DA:4,5
-DA:5,0
-DA:8,5
-DA:9,0
+DA:9,5
 DA:10,0
-DA:14,5
-DA:19,0
-DA:21,0
-DA:22,0
-DA:23,0
-DA:24,0
+DA:13,5
+DA:14,0
+DA:15,0
+DA:19,5
 DA:25,0
+DA:27,0
 DA:28,0
+DA:29,0
+DA:30,0
+DA:31,0
+DA:34,0
+DA:35,0
+DA:36,0
+DA:39,0
 DA:40,0
 DA:41,0
-DA:42,0
-DA:46,0
-LF:19
+DA:45,0
+LF:21
 LH:5
-BRDA:5,0,0,0
-BRDA:5,0,1,0
-BRDA:8,1,0,0
-BRDA:9,2,0,0
-BRDA:9,2,1,0
-BRDA:24,3,0,0
-BRDA:24,3,1,0
-BRDA:41,4,0,0
-BRDA:41,4,1,0
-BRF:9
+BRDA:10,0,0,0
+BRDA:10,0,1,0
+BRDA:13,1,0,0
+BRDA:14,2,0,0
+BRDA:14,2,1,0
+BRDA:22,3,0,0
+BRDA:30,4,0,0
+BRDA:30,4,1,0
+BRDA:35,5,0,0
+BRDA:35,5,1,0
+BRDA:35,6,0,0
+BRDA:35,6,1,0
+BRDA:40,7,0,0
+BRDA:40,7,1,0
+BRF:14
 BRH:0
 end_of_record
 TN:
@@ -3002,14 +3009,14 @@ BRH:0
 end_of_record
 TN:
 SF:src/validation/types.ts
-FN:11,(anonymous_0)
+FN:14,(anonymous_0)
 FNF:1
 FNH:1
 FNDA:2,(anonymous_0)
-DA:8,5
-DA:9,2
+DA:11,5
 DA:12,2
-DA:13,2
+DA:15,2
+DA:16,2
 LF:4
 LH:4
 BRF:0

package/lib/logger/file.d.ts

@@ -1,15 +1,16 @@
 import { ILogger } from './abstractions';
-import { Getter } from '../types';
 export declare class FileLoggerNode implements ILogger {
-    readonly fileName: Getter<string>;
+    readonly extraLogger: ILogger;
+    readonly instantFlush: boolean;
     private readonly _buffer;
-    constructor(fileName: Getter<string>, bufferMode?: boolean);
-    /** @example Path.resolve(__dirname, `../run.${new Date().toISOString()}.log`) */
-    private get logFilePath();
+    private _logFilePath;
+    constructor(extraLogger?: ILogger, instantFlush?: boolean);
+    setLogFilePath(path: string): this;
+    setLogName(name: string): this;
+    private append;
     log: (...args: any[]) => void;
-    warn(...args: any[]): void;
-    error(...args: any[]): void;
+    warn: (...args: any[]) => void;
+    error: (...args: any[]) => void;
     flush(): void;
-    private appendToFile;
 }
 //# sourceMappingURL=file.d.ts.map

package/lib/logger/file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../src/logger/file.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,qBAAa,cAAe,YAAW,OAAO;IAG9B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC;IAF7C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAW;gBAEd,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,UAAU,UAAQ;IAIjE,iFAAiF;IACjF,OAAO,KAAK,WAAW,GAA6C;IAEpE,GAAG,YAAa,GAAG,EAAE,UAEnB;IAEF,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAInB,KAAK,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE;IAIb,KAAK;IASZ,OAAO,CAAC,YAAY;CASvB"}
+{"version":3,"file":"file.d.ts","sourceRoot":"","sources":["../../src/logger/file.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAEzC,qBAAa,cAAe,YAAW,OAAO;IAI9B,QAAQ,CAAC,WAAW,EAAE,OAAO;IAAY,QAAQ,CAAC,YAAY;IAH1E,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAgB;IACxC,OAAO,CAAC,YAAY,CAAgB;gBAEf,WAAW,GAAE,OAAiB,EAAW,YAAY,UAAQ;IAIlF,cAAc,CAAC,IAAI,EAAE,MAAM;IAK3B,UAAU,CAAC,IAAI,EAAE,MAAM;IAMvB,OAAO,CAAC,MAAM;IAUd,GAAG,YAAa,GAAG,EAAE,UAGnB;IAEF,IAAI,YAAa,GAAG,EAAE,UAGpB;IAEF,KAAK,YAAa,GAAG,EAAE,UAGrB;IAEF,KAAK;CAaR"}

package/lib/logger/file.js

@@ -2,40 +2,62 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileLoggerNode = void 0;
 const tslib_1 = require("tslib");
+/* eslint-disable no-console */
+const Path = tslib_1.__importStar(require("path"));
 const FS = tslib_1.__importStar(require("fs"));
 const Util = tslib_1.__importStar(require("util"));
-const types_1 = require("../types");
 class FileLoggerNode {
-    constructor(fileName, bufferMode = false) {
-        this.fileName = fileName;
+    constructor(extraLogger = console, instantFlush = false) {
+        this.extraLogger = extraLogger;
+        this.instantFlush = instantFlush;
+        this._buffer = [];
+        this._logFilePath = null;
         this.log = (...args) => {
-            this.appendToFile(...args);
+            var _a;
+            (_a = this.extraLogger) === null || _a === void 0 ? void 0 : _a.log(...args);
+            this.append(...args);
         };
-        this._buffer = bufferMode ? [] : null;
+        this.warn = (...args) => {
+            var _a;
+            (_a = this.extraLogger) === null || _a === void 0 ? void 0 : _a.warn(...args);
+            this.append(...args);
+        };
+        this.error = (...args) => {
+            var _a;
+            (_a = this.extraLogger) === null || _a === void 0 ? void 0 : _a.error(...args);
+            this.append(...args);
+        };
+        this.setLogName('');
+    }
+    setLogFilePath(path) {
+        this._logFilePath = path;
+        return this;
     }
-    /** @example Path.resolve(__dirname, `../run.${new Date().toISOString()}.log`) */
-    get logFilePath() { return types_1.Getter.getValue(this.fileName); }
-    warn(...args) {
-        this.appendToFile(...args);
+    setLogName(name) {
+        const n = name ? `-${name}` : '';
+        this._logFilePath = Path.resolve(__dirname, `../run${n}.${new Date().toISOString()}.log`);
+        return this;
     }
-    error(...args) {
-        this.appendToFile(...args);
+    append(..._args) {
+        // @ts-ignore
+        const str = Util.format.apply(null, arguments) + '\n';
+        this._buffer.push(str);
+        if (this.instantFlush) {
+            this.flush();
+        }
     }
     flush() {
-        if (!this._buffer) {
+        if (!this._buffer.length) {
             return;
         }
-        FS.writeFileSync(this.logFilePath, this._buffer.join(''));
-        this._buffer.length = 0;
-    }
-    appendToFile(..._args) {
-        // @ts-ignore
-        const str = Util.format.apply(null, arguments) + '\n';
-        if (this._buffer) {
-            this._buffer.push(str);
+        try {
+            FS.appendFileSync(this._logFilePath, this._buffer.join(''));
+        }
+        catch (err) {
+            console.warn('Failed to flush file, error', err);
         }
-        else {
-            FS.appendFileSync(this.logFilePath, str);
+        finally {
+            this._buffer.length = 0;
         }
     }
 }

package/lib/logger/file.js.map

@@ -1 +1 @@
-{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/logger/file.ts"],"names":[],"mappings":";;;;AAAA,+CAAyB;AACzB,mDAA6B;AAE7B,oCAAkC;AAElC,MAAa,cAAc;IAGvB,YAAqB,QAAwB,EAAE,UAAU,GAAG,KAAK;QAA5C,aAAQ,GAAR,QAAQ,CAAgB;QAO7C,QAAG,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;YACrB,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,CAAC;QAC/B,CAAC,CAAC;QARE,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1C,CAAC;IAED,iFAAiF;IACjF,IAAY,WAAW,KAAK,OAAO,cAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAMpE,IAAI,CAAC,GAAG,IAAW;QACf,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,GAAG,IAAW;QAChB,IAAI,CAAC,YAAY,CAAC,GAAG,IAAI,CAAC,CAAC;IAC/B,CAAC;IAEM,KAAK;QACR,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACf,OAAO;SACV;QAED,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1D,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;IAC5B,CAAC;IAEO,YAAY,CAAC,GAAG,KAAY;QAChC,aAAa;QACb,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC;QACtD,IAAI,IAAI,CAAC,OAAO,EAAE;YACd,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC1B;aAAM;YACH,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;SAC5C;IACL,CAAC;CACJ;AAxCD,wCAwCC"}
+{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/logger/file.ts"],"names":[],"mappings":";;;;AACA,+BAA+B;AAC/B,mDAA6B;AAC7B,+CAAyB;AACzB,mDAA6B;AAI7B,MAAa,cAAc;IAIvB,YAAqB,cAAuB,OAAO,EAAW,eAAe,KAAK;QAA7D,gBAAW,GAAX,WAAW,CAAmB;QAAW,iBAAY,GAAZ,YAAY,CAAQ;QAHjE,YAAO,GAAa,EAAE,CAAC;QAChC,iBAAY,GAAW,IAAI,CAAC;QA2BpC,QAAG,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;;YACrB,MAAA,IAAI,CAAC,WAAW,0CAAE,GAAG,CAAC,GAAG,IAAI,EAAE;YAC/B,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;QACzB,CAAC,CAAC;QAEF,SAAI,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;;YACtB,MAAA,IAAI,CAAC,WAAW,0CAAE,IAAI,CAAC,GAAG,IAAI,EAAE;YAChC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;QACzB,CAAC,CAAC;QAEF,UAAK,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE;;YACvB,MAAA,IAAI,CAAC,WAAW,0CAAE,KAAK,CAAC,GAAG,IAAI,EAAE;YACjC,IAAI,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC;QACzB,CAAC,CAAC;QArCE,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC;IAED,cAAc,CAAC,IAAY;QACvB,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC;QACzB,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,IAAY;QACnB,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAC1F,OAAO,IAAI,CAAC;IAChB,CAAC;IAEO,MAAM,CAAC,GAAG,KAAY;QAC1B,aAAa;QACb,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,GAAG,IAAI,CAAC;QACtD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAEvB,IAAI,IAAI,CAAC,YAAY,EAAE;YACnB,IAAI,CAAC,KAAK,EAAE,CAAC;SAChB;IACL,CAAC;IAiBD,KAAK;QACD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACtB,OAAO;SACV;QAED,IAAI;YACA,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;SAC/D;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,CAAC,IAAI,CAAC,6BAA6B,EAAE,GAAG,CAAC,CAAC;SACpD;gBAAS;YACN,IAAI,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;SAC3B;IACL,CAAC;CACJ;AAzDD,wCAyDC"}

package/lib/validation/helpers.d.ts

@@ -1,10 +1,6 @@
-import { ValidatorFunction } from './types';
 import { ValidationErrors } from './ValidationErrors';
+import { ValidationConfig, ValidationResults, ValidatorFunction } from './types';
 export declare function createShouldBeEqualTo<T = string>(getter: () => T): ValidatorFunction<T>;
 export declare function throwNotOk(result: ValidationErrors, message?: string): void;
-export declare function validateObject<T>(obj: T, validators: {
-    [P in keyof T]?: ValidatorFunction<T[P]>;
-}): {
-    [P in keyof T]?: ValidationErrors;
-};
+export declare function validateObject<T, TErrors = ValidationErrors>(obj: T, validators: ValidationConfig<T, TErrors>, onlyTruethy?: boolean): ValidationResults<T, TErrors>;
 //# sourceMappingURL=helpers.d.ts.map

package/lib/validation/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/validation/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,wBAAgB,qBAAqB,CAAC,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAEvF;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,gBAAgB,EAAE,OAAO,SAAqB,QAIhF;AAED,wBAAgB,cAAc,CAAC,CAAC,EAC5B,GAAG,EAAE,CAAC,EACN,UAAU,EAAE;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CAAE,GACzD;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,gBAAgB;CAAE,CA8BvC"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/validation/helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EACH,gBAAgB,EAEhB,iBAAiB,EACjB,iBAAiB,EACpB,MAAM,SAAS,CAAC;AAEjB,wBAAgB,qBAAqB,CAAC,CAAC,GAAG,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAEvF;AAED,wBAAgB,UAAU,CAAC,MAAM,EAAE,gBAAgB,EAAE,OAAO,SAAqB,QAIhF;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,GAAG,gBAAgB,EACxD,GAAG,EAAE,CAAC,EACN,UAAU,EAAE,gBAAgB,CAAC,CAAC,EAAE,OAAO,CAAC,EACxC,WAAW,UAAQ,GACpB,iBAAiB,CAAC,CAAC,EAAE,OAAO,CAAC,CAuB/B"}

package/lib/validation/helpers.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateObject = exports.throwNotOk = exports.createShouldBeEqualTo = void 0;
-const types_1 = require("./types");
 const ValidationErrors_1 = require("./ValidationErrors");
+const types_1 = require("./types");
 function createShouldBeEqualTo(getter) {
     return (val) => getter() === val ? ValidationErrors_1.ValidationErrors.None : ValidationErrors_1.ValidationErrors.ShouldBeEqualTo;
 }
@@ -13,7 +13,7 @@ function throwNotOk(result, message = 'Validation error') {
     }
 }
 exports.throwNotOk = throwNotOk;
-function validateObject(obj, validators) {
+function validateObject(obj, validators, onlyTruethy = false) {
     const res = {};
     Object.keys(obj).forEach(k => {
         const kk = k;
@@ -22,15 +22,10 @@ function validateObject(obj, validators) {
             return;
         }
         const v = obj[k];
-        // let str: string;
-        // if (typeof v === 'number') {
-        //     str = v + '';
-        // }
-        // if (typeof v !== 'string') {
-        //     return; // skip non-strings
-        // }
-        // str = v;
-        const err = validator(v);
+        if (onlyTruethy && !v) {
+            return;
+        }
+        const err = validator(v, obj);
         if (err) {
             res[kk] = err;
         }

package/lib/validation/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/validation/helpers.ts"],"names":[],"mappings":";;;AAAA,mCAA6D;AAC7D,yDAAsD;AAEtD,SAAgB,qBAAqB,CAAa,MAAe;IAC7D,OAAO,CAAC,GAAM,EAAE,EAAE,CAAC,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,mCAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,mCAAgB,CAAC,eAAe,CAAC;AACnG,CAAC;AAFD,sDAEC;AAED,SAAgB,UAAU,CAAC,MAAwB,EAAE,OAAO,GAAG,kBAAkB;IAC7E,IAAI,MAAM,EAAE;QACR,MAAM,IAAI,uBAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KAC9C;AACL,CAAC;AAJD,gCAIC;AAED,SAAgB,cAAc,CAC1B,GAAM,EACN,UAAwD;IAGxD,MAAM,GAAG,GAA0C,EAAG,CAAC;IAEvD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACzB,MAAM,EAAE,GAAG,CAAY,CAAC;QACxB,MAAM,SAAS,GAAoC,UAAU,CAAC,EAAE,CAAC,CAAC;QAClE,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO;SACV;QAED,MAAM,CAAC,GAAG,GAAG,CAAC,CAAY,CAAC,CAAC;QAC5B,mBAAmB;QACnB,+BAA+B;QAC/B,oBAAoB;QACpB,IAAI;QAEJ,+BAA+B;QAC/B,kCAAkC;QAClC,IAAI;QAEJ,WAAW;QAEX,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;QACzB,IAAI,GAAG,EAAE;YACL,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC;SACjB;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACf,CAAC;AAjCD,wCAiCC"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../src/validation/helpers.ts"],"names":[],"mappings":";;;AAAA,yDAAsD;AACtD,mCAKiB;AAEjB,SAAgB,qBAAqB,CAAa,MAAe;IAC7D,OAAO,CAAC,GAAM,EAAE,EAAE,CAAC,MAAM,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,mCAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,mCAAgB,CAAC,eAAe,CAAC;AACnG,CAAC;AAFD,sDAEC;AAED,SAAgB,UAAU,CAAC,MAAwB,EAAE,OAAO,GAAG,kBAAkB;IAC7E,IAAI,MAAM,EAAE;QACR,MAAM,IAAI,uBAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;KAC9C;AACL,CAAC;AAJD,gCAIC;AAED,SAAgB,cAAc,CAC1B,GAAM,EACN,UAAwC,EACxC,WAAW,GAAG,KAAK;IAGnB,MAAM,GAAG,GAAkC,EAAG,CAAC;IAE/C,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACzB,MAAM,EAAE,GAAG,CAAY,CAAC;QACxB,MAAM,SAAS,GAAgD,UAAU,CAAC,EAAE,CAAC,CAAC;QAC9E,IAAI,CAAC,SAAS,EAAE;YACZ,OAAO;SACV;QAED,MAAM,CAAC,GAAG,GAAG,CAAC,CAAY,CAAC,CAAC;QAC5B,IAAI,WAAW,IAAI,CAAC,CAAC,EAAE;YACnB,OAAO;SACV;QAED,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;QAC9B,IAAI,GAAG,EAAE;YACL,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC;SACjB;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC;AACf,CAAC;AA3BD,wCA2BC"}

package/lib/validation/types.d.ts

@@ -1,6 +1,12 @@
 import { ValidationErrors } from './ValidationErrors';
-export declare type ValidatorFunction<T = string, TErrors = ValidationErrors> = (val: T) => TErrors;
-export declare type ValidatorFunctionAsync<T = string, TErrors = ValidationErrors> = (val: T) => Promise<TErrors>;
+export declare type ValidatorFunction<T = string, TErrors = ValidationErrors, TContext = any> = (val: T, ctx?: TContext) => TErrors;
+export declare type ValidatorFunctionAsync<T = string, TErrors = ValidationErrors, TContext = any> = (val: T, ctx?: TContext) => Promise<TErrors>;
+export declare type ValidationConfig<T, TErrors> = {
+    [P in keyof T]?: ValidatorFunction<T[P], TErrors, T>;
+};
+export declare type ValidationResults<T, TErrors> = {
+    [P in keyof T]?: TErrors;
+};
 export declare type WrapperFunction = (val: ValidatorFunction) => ValidatorFunction;
 export declare class ValidationError<TErrors = ValidationErrors> extends Error {
     readonly code: TErrors;

package/lib/validation/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/validation/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,oBAAY,iBAAiB,CAAC,CAAC,GAAG,MAAM,EAAE,OAAO,GAAG,gBAAgB,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC;AAC5F,oBAAY,sBAAsB,CAAC,CAAC,GAAG,MAAM,EAAE,OAAO,GAAG,gBAAgB,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAE1G,oBAAY,eAAe,GAAG,CAAC,GAAG,EAAE,iBAAiB,KAAK,iBAAiB,CAAC;AAE5E,qBAAa,eAAe,CAAC,OAAO,GAAG,gBAAgB,CAAE,SAAQ,KAAK;IAClE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAQ;gBAElB,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO;CAI7C"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/validation/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,oBAAY,iBAAiB,CAAC,CAAC,GAAG,MAAM,EAAE,OAAO,GAAG,gBAAgB,EAAE,QAAQ,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,QAAQ,KAAK,OAAO,CAAC;AAC5H,oBAAY,sBAAsB,CAAC,CAAC,GAAG,MAAM,EAAE,OAAO,GAAG,gBAAgB,EAAE,QAAQ,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,QAAQ,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAE1I,oBAAY,gBAAgB,CAAC,CAAC,EAAE,OAAO,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;CAAE,CAAC;AACpG,oBAAY,iBAAiB,CAAC,CAAC,EAAE,OAAO,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO;CAAE,CAAC;AAEzE,oBAAY,eAAe,GAAG,CAAC,GAAG,EAAE,iBAAiB,KAAK,iBAAiB,CAAC;AAE5E,qBAAa,eAAe,CAAC,OAAO,GAAG,gBAAgB,CAAE,SAAQ,KAAK;IAClE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAQ;gBAElB,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO;CAI7C"}

package/lib/validation/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/validation/types.ts"],"names":[],"mappings":";;;AAOA,MAAa,eAA4C,SAAQ,KAAK;IAGlE,YAAY,OAAe,EAAE,IAAa;QACtC,KAAK,CAAC,OAAO,CAAC,CAAC;QAHV,SAAI,GAAY,IAAI,CAAC;QAI1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;CACJ;AAPD,0CAOC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/validation/types.ts"],"names":[],"mappings":";;;AAUA,MAAa,eAA4C,SAAQ,KAAK;IAGlE,YAAY,OAAe,EAAE,IAAa;QACtC,KAAK,CAAC,OAAO,CAAC,CAAC;QAHV,SAAI,GAAY,IAAI,CAAC;QAI1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;CACJ;AAPD,0CAOC"}

package/lib/validation/wrappers.d.ts

@@ -1,8 +1,8 @@
 import { ValidatorFunction } from './types';
 import { ValidationErrors } from './ValidationErrors';
 export declare const Wrappers: {
-    required<T = string>(validator: ValidatorFunction<T, ValidationErrors>): ValidatorFunction<T, ValidationErrors>;
-    notRequired<T_1 = string>(validator: ValidatorFunction<T_1, ValidationErrors>): ValidatorFunction<T_1, ValidationErrors>;
-    thrower<T_2 = string>(validator: ValidatorFunction<T_2, ValidationErrors>): (val: T_2) => void;
+    required<T = string>(validator: ValidatorFunction<T, ValidationErrors, any>): ValidatorFunction<T, ValidationErrors, any>;
+    notRequired<T_1 = string>(validator: ValidatorFunction<T_1, ValidationErrors, any>): ValidatorFunction<T_1, ValidationErrors, any>;
+    thrower<T_2 = string>(validator: ValidatorFunction<T_2, ValidationErrors, any>): (val: T_2) => void;
 };
 //# sourceMappingURL=wrappers.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zajno/common",
-  "version": "1.4.17",
+  "version": "1.4.18",
   "description": "Zajno's re-usable utilities for JS/TS projects",
   "repository": {
     "type": "git",

package/src/logger/file.ts

@@ -1,46 +1,66 @@
+
+/* eslint-disable no-console */
+import * as Path from 'path';
 import * as FS from 'fs';
 import * as Util from 'util';
+
 import { ILogger } from './abstractions';
-import { Getter } from '../types';
 
 export class FileLoggerNode implements ILogger {
-    private readonly _buffer: string[];
+    private readonly _buffer: string[] = [];
+    private _logFilePath: string = null;
+
+    constructor(readonly extraLogger: ILogger = console, readonly instantFlush = false) {
+        this.setLogName('');
+    }
+
+    setLogFilePath(path: string) {
+        this._logFilePath = path;
+        return this;
+    }
 
-    constructor(readonly fileName: Getter<string>, bufferMode = false) {
-        this._buffer = bufferMode ? [] : null;
+    setLogName(name: string) {
+        const n = name ? `-${name}` : '';
+        this._logFilePath = Path.resolve(__dirname, `../run${n}.${new Date().toISOString()}.log`);
+        return this;
     }
 
-    /** @example Path.resolve(__dirname, `../run.${new Date().toISOString()}.log`) */
-    private get logFilePath() { return Getter.getValue(this.fileName); }
+    private append(..._args: any[]) {
+        // @ts-ignore
+        const str = Util.format.apply(null, arguments) + '\n';
+        this._buffer.push(str);
+
+        if (this.instantFlush) {
+            this.flush();
+        }
+    }
 
     log = (...args: any[]) => {
-        this.appendToFile(...args);
+        this.extraLogger?.log(...args);
+        this.append(...args);
     };
 
-    warn(...args: any[]) {
-        this.appendToFile(...args);
-    }
+    warn = (...args: any[]) => {
+        this.extraLogger?.warn(...args);
+        this.append(...args);
+    };
 
-    error(...args: any[]) {
-        this.appendToFile(...args);
-    }
+    error = (...args: any[]) => {
+        this.extraLogger?.error(...args);
+        this.append(...args);
+    };
 
-    public flush() {
-        if (!this._buffer) {
+    flush() {
+        if (!this._buffer.length) {
             return;
         }
 
-        FS.writeFileSync(this.logFilePath, this._buffer.join(''));
-        this._buffer.length = 0;
-    }
-
-    private appendToFile(..._args: any[]) {
-        // @ts-ignore
-        const str = Util.format.apply(null, arguments) + '\n';
-        if (this._buffer) {
-            this._buffer.push(str);
-        } else {
-            FS.appendFileSync(this.logFilePath, str);
+        try {
+            FS.appendFileSync(this._logFilePath, this._buffer.join(''));
+        } catch (err) {
+            console.warn('Failed to flush file, error', err);
+        } finally {
+            this._buffer.length = 0;
         }
     }
 }

package/src/validation/helpers.ts

@@ -1,5 +1,10 @@
-import { ValidationError, ValidatorFunction } from './types';
 import { ValidationErrors } from './ValidationErrors';
+import {
+    ValidationConfig,
+    ValidationError,
+    ValidationResults,
+    ValidatorFunction,
+} from './types';
 
 export function createShouldBeEqualTo<T = string>(getter: () => T): ValidatorFunction<T> {
     return (val: T) => getter() === val ? ValidationErrors.None : ValidationErrors.ShouldBeEqualTo;
@@ -11,33 +16,27 @@ export function throwNotOk(result: ValidationErrors, message = 'Validation error
     }
 }
 
-export function validateObject<T>(
+export function validateObject<T, TErrors = ValidationErrors>(
     obj: T,
-    validators: { [P in keyof T]?: ValidatorFunction<T[P]> },
-): { [P in keyof T]?: ValidationErrors } {
+    validators: ValidationConfig<T, TErrors>,
+    onlyTruethy = false,
+): ValidationResults<T, TErrors> {
 
-    const res: { [P in keyof T]?: ValidationErrors } = { };
+    const res: ValidationResults<T, TErrors> = { };
 
     Object.keys(obj).forEach(k => {
         const kk = k as keyof T;
-        const validator: ValidatorFunction<T[typeof kk]> = validators[kk];
+        const validator: ValidatorFunction<T[typeof kk], TErrors, T> = validators[kk];
         if (!validator) {
             return;
         }
 
         const v = obj[k as keyof T];
-        // let str: string;
-        // if (typeof v === 'number') {
-        //     str = v + '';
-        // }
-
-        // if (typeof v !== 'string') {
-        //     return; // skip non-strings
-        // }
-
-        // str = v;
+        if (onlyTruethy && !v) {
+            return;
+        }
 
-        const err = validator(v);
+        const err = validator(v, obj);
         if (err) {
             res[kk] = err;
         }
@@ -45,4 +44,3 @@ export function validateObject<T>(
 
     return res;
 }
-

package/src/validation/types.ts

@@ -1,7 +1,10 @@
 import { ValidationErrors } from './ValidationErrors';
 
-export type ValidatorFunction<T = string, TErrors = ValidationErrors> = (val: T) => TErrors;
-export type ValidatorFunctionAsync<T = string, TErrors = ValidationErrors> = (val: T) => Promise<TErrors>;
+export type ValidatorFunction<T = string, TErrors = ValidationErrors, TContext = any> = (val: T, ctx?: TContext) => TErrors;
+export type ValidatorFunctionAsync<T = string, TErrors = ValidationErrors, TContext = any> = (val: T, ctx?: TContext) => Promise<TErrors>;
+
+export type ValidationConfig<T, TErrors> = { [P in keyof T]?: ValidatorFunction<T[P], TErrors, T> };
+export type ValidationResults<T, TErrors> = { [P in keyof T]?: TErrors };
 
 export type WrapperFunction = (val: ValidatorFunction) => ValidatorFunction;