@nu-art/ts-common 0.200.78 → 0.200.80

package/core/logger/LogClient_Browser.js

@@ -20,7 +20,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LogClient_Browser = void 0;
 const types_1 = require("./types");
 const LogClient_1 = require("./LogClient");
-const __1 = require("../..");
+const get_log_style_1 = require("../../tools/get-log-style");
 class LogClient_Browser_class extends LogClient_1.LogClient {
     constructor() {
         super(...arguments);
@@ -51,17 +51,17 @@ class LogClient_Browser_class extends LogClient_1.LogClient {
     getColor(level, bold) {
         switch (level) {
             case types_1.LogLevel.Verbose:
-                return (0, __1.getLogStyle)(this.style.base, this.style.verbose);
+                return (0, get_log_style_1.getLogStyle)(this.style.base, this.style.verbose);
             case types_1.LogLevel.Debug:
-                return (0, __1.getLogStyle)(this.style.base, this.style.debug);
+                return (0, get_log_style_1.getLogStyle)(this.style.base, this.style.debug);
             case types_1.LogLevel.Info:
-                return (0, __1.getLogStyle)(this.style.base, this.style.info);
+                return (0, get_log_style_1.getLogStyle)(this.style.base, this.style.info);
             case types_1.LogLevel.Warning:
-                return (0, __1.getLogStyle)(this.style.base, this.style.warning);
+                return (0, get_log_style_1.getLogStyle)(this.style.base, this.style.warning);
             case types_1.LogLevel.Error:
-                return (0, __1.getLogStyle)(this.style.base, this.style.error);
+                return (0, get_log_style_1.getLogStyle)(this.style.base, this.style.error);
             default:
-                return (0, __1.getLogStyle)({ 'color': '#000000' });
+                return (0, get_log_style_1.getLogStyle)({ 'color': '#000000' });
         }
     }
     logMessage(level, bold, prefix, toLog) {

package/core/module.d.ts

@@ -3,7 +3,9 @@
  */
 import { ModuleManager } from './module-manager';
 import { Logger } from './logger/Logger';
-import { LogLevel, TimerHandler, ValidatorTypeResolver } from '..';
+import { LogLevel } from './logger/types';
+import { ValidatorTypeResolver } from '../validator/validator-core';
+import { TimerHandler } from '../utils/date-time-tools';
 type _FinalConfig<Config = any> = Config & {
     minLogLevel?: LogLevel;
 };

package/core/module.js

@@ -21,7 +21,7 @@ exports.Module = void 0;
 const exceptions_1 = require("./exceptions");
 const merge_tools_1 = require("../utils/merge-tools");
 const Logger_1 = require("./logger/Logger");
-const __1 = require("..");
+const date_time_tools_1 = require("../utils/date-time-tools");
 class Module extends Logger_1.Logger {
     // noinspection TypeScriptAbstractClassConstructorCanBeMadeProtected
     constructor(tag) {
@@ -45,8 +45,8 @@ class Module extends Logger_1.Logger {
         this.name = this.name.replace('_Class', '');
     }
     debounce(handler, key, ms = 0) {
-        (0, __1._clearTimeout)(this.timeoutMap[key]);
-        this.timeoutMap[key] = (0, __1._setTimeout)(handler, ms);
+        (0, date_time_tools_1._clearTimeout)(this.timeoutMap[key]);
+        this.timeoutMap[key] = (0, date_time_tools_1._setTimeout)(handler, ms);
     }
     // // possibly to add
     // public async debounceSync(handler: TimerHandler, key: string, ms = 0) {
@@ -66,7 +66,7 @@ class Module extends Logger_1.Logger {
     throttle(handler, key, ms = 0) {
         if (this.timeoutMap[key])
             return;
-        this.timeoutMap[key] = (0, __1._setTimeout)(() => {
+        this.timeoutMap[key] = (0, date_time_tools_1._setTimeout)(() => {
             handler();
             delete this.timeoutMap[key];
         }, ms);

package/index.d.ts

@@ -15,7 +15,6 @@ export * from './core/logger/BeLogged';
 export * from './core/logger/Logger';
 export * from './core/logger/types';
 export * from './core/logger/LogClient';
-export * from './permissions/permission-group';
 export * from './tools/Replacer';
 export * from './tools/get-log-style';
 export * from './utils/queue';

package/index.js

@@ -48,7 +48,6 @@ __exportStar(require("./core/logger/BeLogged"), exports);
 __exportStar(require("./core/logger/Logger"), exports);
 __exportStar(require("./core/logger/types"), exports);
 __exportStar(require("./core/logger/LogClient"), exports);
-__exportStar(require("./permissions/permission-group"), exports);
 __exportStar(require("./tools/Replacer"), exports);
 __exportStar(require("./tools/get-log-style"), exports);
 __exportStar(require("./utils/queue"), exports);

package/modules/CliParamsModule.js

@@ -20,7 +20,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CliParamsModule = void 0;
 const module_1 = require("../core/module");
 const exceptions_1 = require("../core/exceptions");
-const __1 = require("..");
+const array_tools_1 = require("../utils/array-tools");
 class CliParamsModule_Class extends module_1.Module {
     constructor() {
         super(...arguments);
@@ -56,11 +56,11 @@ class CliParamsModule_Class extends module_1.Module {
     extractParam(param, argv) {
         if (param.isArray)
             return param.keys.reduce((values, key) => {
-                values.push(...(0, __1.filterInstances)(argv.map(arg => { var _a; return (_a = arg.match(new RegExp(`${key}=(.*)`))) === null || _a === void 0 ? void 0 : _a[1]; })));
+                values.push(...(0, array_tools_1.filterInstances)(argv.map(arg => { var _a; return (_a = arg.match(new RegExp(`${key}=(.*)`))) === null || _a === void 0 ? void 0 : _a[1]; })));
                 return values;
             }, []);
         const find = param.keys.map(key => argv.map(arg => { var _a; return (_a = arg.match(new RegExp(`${key}=(.*)`))) === null || _a === void 0 ? void 0 : _a[1]; }));
-        return (0, __1.flatArray)(find).find(k => k);
+        return (0, array_tools_1.flatArray)(find).find(k => k);
     }
     printFoundArgs(title, params, foundArgs) {
         if (params.length)

package/package.json

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

package/utils/merge-tools.js

@@ -18,12 +18,14 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.merge = exports.mergeArray = exports.mergeObject = void 0;
-const index_1 = require("../index");
+const object_tools_1 = require("./object-tools");
+const tools_1 = require("./tools");
+const exceptions_1 = require("../core/exceptions");
 function mergeObject(original, override) {
     if (original === override) {
         return override;
     }
-    const returnValue = (0, index_1.deepClone)(original);
+    const returnValue = (0, object_tools_1.deepClone)(original);
     return Object.keys(override).reduce((obj, key) => {
         obj[key] = merge(original[key], override[key]);
         if (obj[key] === undefined)
@@ -55,12 +57,12 @@ function mergeArray(original, override) {
 }
 exports.mergeArray = mergeArray;
 function merge(original, override) {
-    if (!(0, index_1.exists)(override))
+    if (!(0, tools_1.exists)(override))
         return undefined;
-    if (!(0, index_1.exists)(original))
+    if (!(0, tools_1.exists)(original))
         return override;
     if (typeof original !== typeof override || (typeof original === 'object' && typeof override === 'object' && Array.isArray(original) !== Array.isArray(override)))
-        throw new index_1.BadImplementationException(`trying to merge object of different types!! \\n Original: ${JSON.stringify(original)}\\n Override: ${JSON.stringify(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))
         return mergeArray(original, override);
     if (typeof original === 'object' && typeof override === 'object' && !Array.isArray(original) && !Array.isArray(override))

package/utils/object-tools.d.ts

@@ -1,4 +1,4 @@
-import { TS_Object } from '../index';
+import { TS_Object } from './types';
 export declare function deepClone<T>(obj: T): T;
 export declare function _keys<T extends {
     [k: string]: any;

package/utils/object-tools.js

@@ -18,7 +18,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 index_1 = require("../index");
+const exceptions_1 = require("../core/exceptions");
 function deepClone(obj) {
     if (typeof obj === 'string' || typeof obj === 'number' || typeof obj === 'boolean' || typeof obj === 'undefined' || obj === null)
         return obj;
@@ -74,7 +74,7 @@ function compare(one, two, keys) {
     if (one === null || two === null)
         return false;
     if (typeofOne === 'function')
-        throw new index_1.BadImplementationException('This compare meant to compare two POJOs.. nothing more');
+        throw new exceptions_1.BadImplementationException('This compare meant to compare two POJOs.. nothing more');
     if (typeofOne !== 'object')
         return one === two;
     if (Array.isArray(one) && Array.isArray(two)) {
@@ -107,12 +107,12 @@ function compare(one, two, keys) {
 exports.compare = compare;
 function assert(message, expected, actual) {
     if (!compare(expected, actual))
-        throw new index_1.AssertionException(`Assertion Failed:\n  -- ${message}\n  -- Expected: ${JSON.stringify(expected)}\n  --   Actual: ${JSON.stringify(actual)}\n\n`);
+        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) {
     if (typeof obj !== 'object' || obj === null) {
-        throw new index_1.BadImplementationException('Passed parameter for "obj" must be an object');
+        throw new exceptions_1.BadImplementationException('Passed parameter for "obj" must be an object');
     }
     if (!Array.isArray(keys))
         keys = [keys];

package/utils/queue.js

@@ -27,8 +27,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Queue = void 0;
-const index_1 = require("../index");
 const Logger_1 = require("../core/logger/Logger");
+const array_tools_1 = require("./array-tools");
 class Queue extends Logger_1.Logger {
     constructor(name) {
         super(name);
@@ -51,7 +51,7 @@ class Queue extends Logger_1.Logger {
         this.execute();
     }
     addItemImpl(toExecute, onCompleted, onError) {
-        (0, index_1.addItemToArray)(this.queue, (resolve) => __awaiter(this, void 0, void 0, function* () {
+        (0, array_tools_1.addItemToArray)(this.queue, (resolve) => __awaiter(this, void 0, void 0, function* () {
             this.running++;
             try {
                 const output = yield toExecute();
@@ -80,7 +80,7 @@ class Queue extends Logger_1.Logger {
         }
         for (let i = 0; this.running < this.parallelCount && i < this.queue.length; i++) {
             const toExecute = this.queue[0];
-            (0, index_1.removeItemFromArray)(this.queue, toExecute);
+            (0, array_tools_1.removeItemFromArray)(this.queue, toExecute);
             new Promise(toExecute.bind(this))
                 .then(this.ignore)
                 .catch(this.ignore);

package/utils/version-tools.js

@@ -18,7 +18,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.compareVersions = void 0;
-const index_1 = require("../index");
+const exceptions_1 = require("../core/exceptions");
 /**
  *
  * @param firstVersion a version
@@ -30,9 +30,9 @@ const index_1 = require("../index");
  */
 function compareVersions(firstVersion, secondVersion) {
     if (!firstVersion)
-        throw new index_1.BadImplementationException("First version is undefined");
+        throw new exceptions_1.BadImplementationException("First version is undefined");
     if (!secondVersion)
-        throw new index_1.BadImplementationException("Second version is undefined");
+        throw new exceptions_1.BadImplementationException("Second version is undefined");
     const firstVersionAsArray = firstVersion.split("\.");
     const secondVersionAsArray = secondVersion.split("\.");
     for (let i = 0; i < firstVersionAsArray.length; i++) {

package/validator/type-validators.d.ts

@@ -21,4 +21,7 @@ export declare const tsValidateRegexp: (regexp: RegExp, mandatory?: boolean) =>
 export declare const tsValidateTimestamp: (interval?: number, mandatory?: boolean) => Validator<number>;
 export declare const tsValidateAudit: (range?: RangeTimestamp) => (audit?: AuditBy) => any;
 export declare const tsValidateNonMandatoryObject: <T>(validator: ValidatorTypeResolver<T>) => ((input?: T | undefined) => any)[];
+export declare const tsValidator_valueByKey: <T extends unknown>(validatorObject: {
+    [k: string]: Validator<any> | import("./validator-core").TypeValidator<any>;
+}) => ValidatorTypeResolver<T>;
 export {};

package/validator/type-validators.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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_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;
 const tools_1 = require("../utils/tools");
 const validator_core_1 = require("./validator-core");
 const date_time_tools_1 = require("../utils/date-time-tools");
@@ -180,3 +180,9 @@ const tsValidateNonMandatoryObject = (validator) => {
         (input) => (0, validator_core_1.tsValidateResult)(input, validator)];
 };
 exports.tsValidateNonMandatoryObject = tsValidateNonMandatoryObject;
+const tsValidator_valueByKey = (validatorObject) => {
+    return (0, exports.tsValidateCustom)((value, parentObject) => {
+        return (0, validator_core_1.tsValidateResult)(value, validatorObject[parentObject.type]);
+    });
+};
+exports.tsValidator_valueByKey = tsValidator_valueByKey;

package/validator/validator-core.d.ts

@@ -29,6 +29,3 @@ export declare const tsValidateExists: (mandatory?: boolean) => ValidatorImpl<an
 export declare const tsValidate: <T extends unknown>(instance: T | undefined, _validator: ValidatorTypeResolver<T>, strict?: boolean) => any;
 export declare const tsValidateResult: <T extends unknown>(instance: T | undefined, _validator: ValidatorTypeResolver<T>, key?: keyof T | undefined, parentInstance?: any) => any;
 export declare const tsValidateObject: <T>(__validator: TypeValidator<object>, instance: T, path?: string) => InvalidResultObject<T> | undefined;
-export declare const tsValidator_valueByKey: <T extends unknown>(validatorObject: {
-    [k: string]: Validator<any> | TypeValidator<any>;
-}) => ValidatorTypeResolver<T>;

package/validator/validator-core.js

@@ -17,8 +17,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsValidator_valueByKey = exports.tsValidateObject = exports.tsValidateResult = exports.tsValidate = exports.tsValidateExists = exports.assertValidateMandatoryProperty = exports.ValidationException = void 0;
-const __1 = require("..");
+exports.tsValidateObject = exports.tsValidateResult = exports.tsValidate = exports.tsValidateExists = exports.assertValidateMandatoryProperty = exports.ValidationException = void 0;
 const exceptions_1 = require("../core/exceptions");
 const object_tools_1 = require("../utils/object-tools");
 class ValidationException extends exceptions_1.CustomException {
@@ -110,9 +109,3 @@ const tsValidateObject = (__validator, instance, path = '') => {
     return result;
 };
 exports.tsValidateObject = tsValidateObject;
-const tsValidator_valueByKey = (validatorObject) => {
-    return (0, __1.tsValidateCustom)((value, parentObject) => {
-        return (0, exports.tsValidateResult)(value, validatorObject[parentObject.type]);
-    });
-};
-exports.tsValidator_valueByKey = tsValidator_valueByKey;

package/permissions/permission-group.d.ts

@@ -1,8 +0,0 @@
-export declare class PermissionCategory<P extends number> {
-    readonly key: string;
-    readonly levels: string[];
-    readonly permissionsEnum: any;
-    readonly defaultValue: P;
-    constructor(key: string, permissionsEnum: any, defaultValue: P);
-    getClosestMatch(permission: number): string | undefined;
-}

package/permissions/permission-group.js

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PermissionCategory = void 0;
-/*
- * ts-common is the basic building blocks of our typescript projects
- *
- * Copyright (C) 2020 Adam van der Kruk aka TacB0sS
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-const index_1 = require("../index");
-class PermissionCategory {
-    constructor(key, permissionsEnum, defaultValue) {
-        this.key = key;
-        this.permissionsEnum = permissionsEnum;
-        this.defaultValue = defaultValue;
-        const _levels = Object.keys(permissionsEnum).filter(value => isNaN(parseInt(value)));
-        this.levels = (0, index_1.sortArray)(_levels, (_key) => permissionsEnum[_key]).reverse();
-    }
-    getClosestMatch(permission) {
-        return (0, index_1.deepClone)(this.levels).reverse().find(((level) => this.permissionsEnum[level] <= permission));
-    }
-}
-exports.PermissionCategory = PermissionCategory;