@nu-art/ts-common 0.201.21 → 0.201.23

package/core/module-manager.d.ts

@@ -9,6 +9,7 @@ export declare class ModuleManager extends Logger {
     protected modules: Module<any, any>[];
     static instance: ModuleManager;
     protected constructor();
+    private static resetForTests;
     filterModules<T>(filter: (module: Module) => boolean): T[];
     setConfig(config: object): this;
     addModulePack(modules: Module[]): this;

package/core/module-manager.js

@@ -38,6 +38,12 @@ class ModuleManager extends Logger_1.Logger {
         ModuleManager.instance = this;
         dispatcher_1.Dispatcher.modulesResolver = moduleResolver;
     }
+    // @ts-ignore
+    static resetForTests() {
+        _modules.length = 0;
+        // @ts-ignore
+        delete ModuleManager.instance;
+    }
     filterModules(filter) {
         return this.modules.filter(filter);
     }

package/mem-storage/MemStorage.js

@@ -22,7 +22,7 @@ class MemStorage {
         this.set = (key, value) => {
             // console.log(`-- ${this.cache.__myId} set: ${key.key} -> `, value);
             const currentValue = this.cache[key.key];
-            if ((0, tools_1.exists)(currentValue) && key.unique) {
+            if ((0, tools_1.exists)(currentValue) && key.unique && value !== currentValue) {
                 throw new exceptions_1.BadImplementationException(`Unique storage key is being overridden for key: ${key.key}
 			\ncurrent: ${(0, tools_1.__stringify)(currentValue)}
 			\nnew: ${(0, tools_1.__stringify)(value)}`);
@@ -58,9 +58,15 @@ class MemKey {
         });
         this.get = (value) => {
             // @ts-ignore
-            return asyncLocalStorage.getStore().get(this, value);
+            const memValue = asyncLocalStorage.getStore().get(this, value);
+            if (!(0, tools_1.exists)(memValue))
+                throw new exceptions_1.BadImplementationException(`Trying to access MemKey(${this.key}) before it was set!`);
+            return memValue;
         };
         this.set = (value) => {
+            // console.log(this.key, value);
+            if (!(0, tools_1.exists)(value))
+                throw new exceptions_1.BadImplementationException(`Cannot set MemKey(${this.key}) to undefined or null!`);
             // @ts-ignore
             return asyncLocalStorage.getStore().set(this, value);
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nu-art/ts-common",
-  "version": "0.201.21",
+  "version": "0.201.23",
   "description": "js and ts infra",
   "keywords": [
     "TacB0sS",

package/testing/consts.js

@@ -13,6 +13,7 @@ exports.expectFailAsync = exports.testSuiteTester = exports.testSuite_RunTest =
 const chai_1 = require("chai");
 const module_manager_1 = require("../core/module-manager");
 const tools_1 = require("../utils/tools");
+const MemStorage_1 = require("../mem-storage/MemStorage");
 class ModuleManagerTester extends module_manager_1.ModuleManager {
     constructor() {
         super();
@@ -30,7 +31,7 @@ const testSuiteTester = (testSuit, ...testcases) => {
             it(`${testSuit.label} - Preprocessing`, testSuit.preProcessor);
         }
         (testcases.length > 0 ? testcases : testSuit.testcases).forEach(testCase => {
-            testSuite_RunTest(testSuit, testCase);
+            new MemStorage_1.MemStorage().init(() => __awaiter(void 0, void 0, void 0, function* () { return testSuite_RunTest(testSuit, testCase); }));
         });
     });
 };

package/utils/array-tools.d.ts

@@ -92,3 +92,4 @@ export declare function asArray<T extends any>(toBeArray: T | T[]): T[];
 export declare function asOptionalArray<T extends any>(toBeArray?: T | T[]): T[] | undefined;
 export declare function lastElement<T extends any>(array: T[] | undefined): T | undefined;
 export declare function firstElement<T extends any>(array?: T[]): T | undefined;
+export declare function arrayIncludesAny<T extends any>(arr1: T[], arr2: T[]): boolean;

package/utils/array-tools.js

@@ -26,7 +26,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.firstElement = exports.lastElement = exports.asOptionalArray = exports.asArray = exports.generateArray = exports.toggleInArray = exports.groupArrayBy = exports.flatArray = exports.batchActionParallel = exports.batchAction = exports.sortArray = exports.reduceToMap = exports.arrayToMap = exports.filterFalsy = exports.filterInstances = exports.filterDuplicates = exports.findDuplicates = exports.filterAsync = exports.toggleElementInArray = exports.addItemToArrayAtIndex = exports.addItemToArray = exports.removeFromArrayByIndex = exports.removeFromArray = exports.removeItemFromArray = exports.filterInOut = void 0;
+exports.arrayIncludesAny = exports.firstElement = exports.lastElement = exports.asOptionalArray = exports.asArray = exports.generateArray = exports.toggleInArray = exports.groupArrayBy = exports.flatArray = exports.batchActionParallel = exports.batchAction = exports.sortArray = exports.reduceToMap = exports.arrayToMap = exports.filterFalsy = exports.filterInstances = exports.filterDuplicates = exports.findDuplicates = exports.filterAsync = exports.toggleElementInArray = exports.addItemToArrayAtIndex = exports.addItemToArray = exports.removeFromArrayByIndex = exports.removeFromArray = exports.removeItemFromArray = exports.filterInOut = void 0;
 const tools_1 = require("./tools");
 const object_tools_1 = require("./object-tools");
 function filterInOut(input, filter) {
@@ -265,3 +265,7 @@ function firstElement(array) {
     return array === null || array === void 0 ? void 0 : array[1];
 }
 exports.firstElement = firstElement;
+function arrayIncludesAny(arr1, arr2) {
+    return arr1.some(item => arr2.includes(item));
+}
+exports.arrayIncludesAny = arrayIncludesAny;

package/utils/merge-tools.js

@@ -25,6 +25,8 @@ function mergeObject(original, override) {
     if (original === override) {
         return override;
     }
+    if (!(0, tools_1.exists)(original))
+        return (0, object_tools_1.filterKeys)(override);
     const returnValue = (0, object_tools_1.deepClone)(original);
     return Object.keys(override).reduce((obj, key) => {
         obj[key] = merge(original[key], override[key]);
@@ -60,7 +62,7 @@ function merge(original, override) {
     if (!(0, tools_1.exists)(override))
         return undefined;
     if (!(0, tools_1.exists)(original))
-        return override;
+        return typeof override === 'object' ? (0, object_tools_1.filterKeys)(override) : override;
     if (typeof original !== typeof override || (typeof original === 'object' && typeof override === 'object' && Array.isArray(original) !== Array.isArray(override)))
         throw new exceptions_1.BadImplementationException(`trying to merge object of different types!! \\n Original: ${JSON.stringify(original)}\\n Override: ${JSON.stringify(override)}`);
     if (Array.isArray(original) && Array.isArray(override))

package/utils/object-tools.d.ts

@@ -10,4 +10,4 @@ export declare function cloneObj<T extends TS_Object>(obj: T): T;
 export declare function partialCompare<T extends any>(one?: T, two?: T, keysToFilterOut?: (keyof T)[]): boolean;
 export declare function compare<T extends any>(one?: T, two?: T, keys?: (keyof T)[]): boolean;
 export declare function assert<T>(message: string, expected: T, actual: T): void;
-export declare function filterKeys<T extends TS_Object = TS_Object>(obj: T, keys: keyof T | (keyof T)[], filter?: (k: keyof T, obj: T) => boolean): T;
+export declare function filterKeys<T extends TS_Object = TS_Object>(obj: T, keys?: keyof T | (keyof T)[], filter?: (k: keyof T, obj: T) => boolean): T;

package/utils/object-tools.js

@@ -19,6 +19,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.filterKeys = exports.assert = exports.compare = exports.partialCompare = exports.cloneObj = exports.cloneArr = exports._setTypedProp = exports._values = exports._keys = exports.deepClone = void 0;
 const exceptions_1 = require("../core/exceptions/exceptions");
+const array_tools_1 = require("./array-tools");
 function deepClone(obj) {
     if (typeof obj === 'string' || typeof obj === 'number' || typeof obj === 'boolean' || typeof obj === 'undefined' || obj === null)
         return obj;
@@ -110,13 +111,11 @@ function assert(message, expected, actual) {
         throw new exceptions_1.AssertionException(`Assertion Failed:\n  -- ${message}\n  -- Expected: ${JSON.stringify(expected)}\n  --   Actual: ${JSON.stringify(actual)}\n\n`);
 }
 exports.assert = assert;
-function filterKeys(obj, keys, filter = (k) => obj[k] === undefined || obj[k] === null) {
+function filterKeys(obj, keys = _keys(obj), filter = (k) => obj[k] === undefined || obj[k] === null) {
     if (typeof obj !== 'object' || obj === null) {
         throw new exceptions_1.BadImplementationException('Passed parameter for "obj" must be an object');
     }
-    if (!Array.isArray(keys))
-        keys = [keys];
-    keys.forEach(key => {
+    (0, array_tools_1.asArray)(keys).forEach(key => {
         if (filter(key, obj))
             delete obj[key];
     });

package/validator/type-validators.d.ts

@@ -11,6 +11,7 @@ type validatorObject<T> = {
 export declare const tsValidateUnionV3: <T extends unknown>(validatorObject: validatorObject<T>, mandatory?: boolean) => ((input?: T | undefined) => any)[];
 export declare const tsValidateArray: <T extends any[], I extends ArrayType<T> = ArrayType<T>>(validator: ValidatorTypeResolver<I>, mandatory?: boolean, minimumLength?: number) => Validator<I[]>;
 export declare const tsValidateString: (length?: number, mandatory?: boolean) => Validator<string>;
+export declare const tsValidateStringMinLength: (length: number, mandatory?: boolean) => Validator<string>;
 export declare const tsValidateNumber: (mandatory?: boolean) => Validator<number>;
 export declare const tsValidateEnum: (enumType: TypedMap<number | string>, mandatory?: boolean) => Validator<number | string>;
 export declare const tsValidateBoolean: (mandatory?: boolean) => Validator<boolean>;

package/validator/type-validators.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsValidator_ArrayOfObjectsByKey = exports.tsValidator_valueByKey = exports.tsValidateNonMandatoryObject = exports.tsValidateAudit = exports.tsValidateTimestamp = exports.tsValidateRegexp = exports.tsValidateRange = exports.tsValidateIsInRange = exports.tsValidateValue = exports.tsValidateBoolean = exports.tsValidateEnum = exports.tsValidateNumber = exports.tsValidateString = exports.tsValidateArray = exports.tsValidateUnionV3 = exports.tsValidateCustom = exports.tsValidateUnion = exports.tsValidateDynamicObject = void 0;
+exports.tsValidator_ArrayOfObjectsByKey = exports.tsValidator_valueByKey = exports.tsValidateNonMandatoryObject = exports.tsValidateAudit = exports.tsValidateTimestamp = exports.tsValidateRegexp = exports.tsValidateRange = exports.tsValidateIsInRange = exports.tsValidateValue = exports.tsValidateBoolean = exports.tsValidateEnum = exports.tsValidateNumber = exports.tsValidateStringMinLength = exports.tsValidateString = exports.tsValidateArray = exports.tsValidateUnionV3 = exports.tsValidateCustom = exports.tsValidateUnion = exports.tsValidateDynamicObject = void 0;
 const tools_1 = require("../utils/tools");
 const validator_core_1 = require("./validator-core");
 const date_time_tools_1 = require("../utils/date-time-tools");
@@ -85,6 +85,18 @@ const tsValidateString = (length = -1, mandatory = true) => {
         }];
 };
 exports.tsValidateString = tsValidateString;
+const tsValidateStringMinLength = (length, mandatory = true) => {
+    return [(0, validator_core_1.tsValidateExists)(mandatory),
+        (input) => {
+            // noinspection SuspiciousTypeOfGuard
+            if (typeof input !== 'string')
+                return `input is not a string`;
+            if (input.length >= length)
+                return;
+            return `input has less than ${length} chars`;
+        }];
+};
+exports.tsValidateStringMinLength = tsValidateStringMinLength;
 const tsValidateNumber = (mandatory = true) => {
     return [(0, validator_core_1.tsValidateExists)(mandatory),
         (input) => {

package/validator/validators.js

@@ -16,7 +16,7 @@ exports.tsValidateOptional = (0, validator_core_1.tsValidateExists)(false);
 exports.dbIdLength = 32;
 const tsValidateId = (length, mandatory = true) => (0, type_validators_1.tsValidateRegexp)(new RegExp(`^[0-9a-f]{${length}}$`), mandatory);
 exports.tsValidateId = tsValidateId;
-exports.tsValidateEmail = (0, type_validators_1.tsValidateRegexp)(/[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?/);
+exports.tsValidateEmail = (0, type_validators_1.tsValidateRegexp)(/[a-z0-9][a-z0-9!#$%&'*+/=?^_`{|}~\-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~\-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9_-]*[a-z0-9])?/);
 const tsValidateBucketUrl = (mandatory) => (0, type_validators_1.tsValidateRegexp)(/gs?:\/\/[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/, mandatory);
 exports.tsValidateBucketUrl = tsValidateBucketUrl;
 const tsValidateGeneralUrl = (mandatory) => (0, type_validators_1.tsValidateRegexp)(/[-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,4}\b([-a-zA-Z0-9@:%_\+.~#?&//=]*)/, mandatory);