@contrail/util 1.1.11 → 1.1.13

package/lib/compression-util/compression.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decompressFromString = exports.compressIntoString = void 0;
+exports.compressIntoString = compressIntoString;
+exports.decompressFromString = decompressFromString;
 const fflate_1 = require("fflate");
 function compressIntoString(obj) {
     const jsonStr = JSON.stringify(obj === undefined ? null : obj);
@@ -12,7 +13,6 @@ function compressIntoString(obj) {
     const compressed = (0, fflate_1.compressSync)(buffer);
     return Buffer.from(compressed).toString('base64');
 }
-exports.compressIntoString = compressIntoString;
 function decompressFromString(str) {
     if (typeof Buffer === 'undefined') {
         console.warn('Buffer is not available. Decompression will be skipped. Returning original string.');
@@ -23,4 +23,3 @@ function decompressFromString(str) {
     const originalText = new TextDecoder().decode(decompressed);
     return JSON.parse(originalText);
 }
-exports.decompressFromString = decompressFromString;

package/lib/date-util/getIsoDatePart/getIsoDatePart.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getIsoDatePart = void 0;
+exports.getIsoDatePart = getIsoDatePart;
 function getIsoDatePart(date) {
     console.log('date 1: ', date.toISOString(), '\n\n\n\n\n\n\n\n');
     let d = new Date(date);
@@ -14,4 +14,3 @@ function getIsoDatePart(date) {
     }
     return [year, month, day].join('-');
 }
-exports.getIsoDatePart = getIsoDatePart;

package/lib/object-util/applyChangesIfEqual/applyChangesIfEqual.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.areItemPropertyValuesEqual = exports.determineChangesIfEqual = exports.applyChangesIfEqual = void 0;
+exports.applyChangesIfEqual = applyChangesIfEqual;
+exports.determineChangesIfEqual = determineChangesIfEqual;
+exports.areItemPropertyValuesEqual = areItemPropertyValuesEqual;
 const types_1 = require("@contrail/types");
 const compareDeep_1 = require("../compareDeep/compareDeep");
 function applyChangesIfEqual(target, priorSourceValues, newSourceValues, properties) {
@@ -9,7 +11,6 @@ function applyChangesIfEqual(target, priorSourceValues, newSourceValues, propert
         Object.assign(target, changes);
     }
 }
-exports.applyChangesIfEqual = applyChangesIfEqual;
 function determineChangesIfEqual(target, priorSourceValues, newSourceValues, properties) {
     const changes = {};
     for (const property of properties) {
@@ -26,7 +27,6 @@ function determineChangesIfEqual(target, priorSourceValues, newSourceValues, pro
     }
     return changes;
 }
-exports.determineChangesIfEqual = determineChangesIfEqual;
 function areItemPropertyValuesEqual(property, itemOne, itemTwo) {
     var _a, _b, _c, _d;
     const propertyKey = getPropertyKey(property);
@@ -45,7 +45,6 @@ function areItemPropertyValuesEqual(property, itemOne, itemTwo) {
     }
     return propertyValueOne === propertyValueTwo;
 }
-exports.areItemPropertyValuesEqual = areItemPropertyValuesEqual;
 function areSizeRangesEqual(sizeRangeOne, sizeRangeTwo) {
     var _a, _b;
     if (!sizeRangeOne && !sizeRangeTwo) {

package/lib/object-util/cloneDeep/cloneDeep.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cloneDeep = void 0;
+exports.cloneDeep = cloneDeep;
 function cloneDeep(obj) {
     if (obj === null || obj === undefined)
         return null;
@@ -13,4 +13,3 @@ function cloneDeep(obj) {
         return value;
     });
 }
-exports.cloneDeep = cloneDeep;

package/lib/object-util/compareDeep/compareDeep.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getObjectDiff = exports.getObjectDiffs = void 0;
+exports.getObjectDiffs = getObjectDiffs;
+exports.getObjectDiff = getObjectDiff;
 function getObjectDiffs(before, after, prefix) {
     const diffs = [];
     if (!before || !after) {
@@ -67,7 +68,6 @@ function getObjectDiffs(before, after, prefix) {
     });
     return diffs;
 }
-exports.getObjectDiffs = getObjectDiffs;
 function getObjectDiff(before, after, name) {
     const diff = {
         propertyName: name,
@@ -76,7 +76,6 @@ function getObjectDiff(before, after, name) {
     };
     return diff;
 }
-exports.getObjectDiff = getObjectDiff;
 function sortFunc(x, y) {
     const pre = ['string', 'number', 'bool'];
     if (typeof x !== typeof y)

package/lib/object-util/isObject/isObject.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isObject = void 0;
+exports.isObject = isObject;
 function isObject(item) {
     return item && typeof item === 'object' && !Array.isArray(item);
 }
-exports.isObject = isObject;

package/lib/object-util/mergeDeep/mergeDeep.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeDeep = void 0;
+exports.mergeDeep = mergeDeep;
 const isObject_1 = require("../isObject/isObject");
 function mergeDeep(target, ...sources) {
     if (!sources.length)
@@ -20,7 +20,6 @@ function mergeDeep(target, ...sources) {
     }
     return mergeDeep(target, ...sources);
 }
-exports.mergeDeep = mergeDeep;
 function isDate(object) {
     return object != null && object instanceof Date;
 }

package/lib/object-util/retainOnlyProperties/retainOnlyProperties.d.ts

@@ -1,8 +1,6 @@
 export declare function retainOnlyProperties<T extends Record<string, any>, K extends readonly string[]>(obj: T[], keysToKeep: K, options?: {
-    shouldDeleteInPlace?: boolean;
-    shouldSkipKeys?: readonly string[];
+    shouldDeleteInPlace: boolean;
 }): Array<Pick<T, K[number]>>;
 export declare function retainOnlyProperties<T extends Record<string, any>, K extends readonly string[]>(obj: T, keysToKeep: K, options?: {
-    shouldDeleteInPlace?: boolean;
-    shouldSkipKeys?: readonly string[];
+    shouldDeleteInPlace: boolean;
 }): Pick<T, K[number]>;

package/lib/object-util/retainOnlyProperties/retainOnlyProperties.js

@@ -1,13 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.retainOnlyProperties = void 0;
+exports.retainOnlyProperties = retainOnlyProperties;
 const object_util_1 = require("../object-util");
-function retainOnlyProperties(obj, keysToKeep, options = {
-    shouldDeleteInPlace: false,
-    shouldSkipKeys: [],
-}) {
+function retainOnlyProperties(obj, keysToKeep, options = { shouldDeleteInPlace: false }) {
     const keepSet = new Set(keysToKeep);
-    const skipSet = new Set(options.shouldSkipKeys || []);
     const shouldReturnAsIs = (value) => value === null || value === undefined || typeof value !== 'object' || value instanceof Date;
     const retain = (target) => {
         if (shouldReturnAsIs(target))
@@ -16,9 +12,6 @@ function retainOnlyProperties(obj, keysToKeep, options = {
             return target.map(retain);
         }
         for (const key in target) {
-            if (skipSet.has(key)) {
-                continue;
-            }
             if (!keepSet.has(key)) {
                 delete target[key];
             }
@@ -29,7 +22,5 @@ function retainOnlyProperties(obj, keysToKeep, options = {
         return target;
     };
     const objToModify = options.shouldDeleteInPlace ? obj : object_util_1.ObjectUtil.cloneDeep(obj);
-    const toRetain = retain(objToModify);
-    return toRetain;
+    return retain(objToModify);
 }
-exports.retainOnlyProperties = retainOnlyProperties;

package/lib/promise-util/promise-util.d.ts

@@ -1,4 +1,4 @@
 export declare class PromiseUtil {
-    static resolveInChunks(objects: Array<any>, chunksSize: number, asyncFunction: (chunk: any) => Promise<any>): Promise<any>;
-    static resolveInChunksAndLimit(objects: Array<any>, chunksSize: number, limitSize: number, asyncFunction: (chunk: any) => Promise<any>): Promise<any>;
+    static resolveInChunks<TInput, TOutput>(objects: Array<TInput>, chunksSize: number, asyncFunction: (chunk: TInput[]) => Promise<TOutput[]>): Promise<TOutput[]>;
+    static resolveInChunksAndLimit<TInput, TOutput>(objects: Array<TInput>, chunksSize: number, limitSize: number, asyncFunction: (chunk: TInput[]) => Promise<TOutput[]>): Promise<TOutput[]>;
 }

package/lib/promise-util/promise-util.js

@@ -14,24 +14,21 @@ const p_limit_1 = require("p-limit");
 const lodash_1 = require("lodash");
 class PromiseUtil {
     static resolveInChunks(objects, chunksSize, asyncFunction) {
-        const chunks = (0, lodash_1.chunk)(objects, chunksSize);
-        const promises = [];
-        for (const chunk of chunks) {
-            promises.push(asyncFunction(chunk));
-        }
-        return Promise.all(promises).then((chunkedResults) => chunkedResults.flat());
+        return __awaiter(this, void 0, void 0, function* () {
+            const chunks = (0, lodash_1.chunk)(objects, chunksSize);
+            const promises = chunks.map((chunk) => asyncFunction(chunk));
+            const chunkedResults = yield Promise.all(promises);
+            return chunkedResults.flat();
+        });
     }
     static resolveInChunksAndLimit(objects, chunksSize, limitSize, asyncFunction) {
-        const limit = (0, p_limit_1.default)(limitSize);
-        const chunks = (0, lodash_1.chunk)(objects, chunksSize);
-        const promises = [];
-        for (const chunk of chunks) {
-            const promise = limit(() => __awaiter(this, void 0, void 0, function* () {
-                return yield asyncFunction(chunk);
-            }));
-            promises.push(promise);
-        }
-        return Promise.all(promises).then((chunkedResults) => chunkedResults.flat());
+        return __awaiter(this, void 0, void 0, function* () {
+            const limit = (0, p_limit_1.default)(limitSize);
+            const chunks = (0, lodash_1.chunk)(objects, chunksSize);
+            const promises = chunks.map((chunk) => limit(() => __awaiter(this, void 0, void 0, function* () { return asyncFunction(chunk); })));
+            const chunkedResults = yield Promise.all(promises);
+            return chunkedResults.flat();
+        });
     }
 }
 exports.PromiseUtil = PromiseUtil;

package/lib/retry-util/retry-util.js

@@ -9,13 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.retry = void 0;
+exports.retry = retry;
 const DEFAULT_CONFIG = {
     maxRetries: 3,
     initialDelay: 1000,
 };
-function retry(fn, config = DEFAULT_CONFIG) {
-    return __awaiter(this, void 0, void 0, function* () {
+function retry(fn_1) {
+    return __awaiter(this, arguments, void 0, function* (fn, config = DEFAULT_CONFIG) {
         const { maxRetries, initialDelay, onRetryCallback } = Object.assign(Object.assign({}, DEFAULT_CONFIG), config);
         if (maxRetries < 1) {
             throw new Error('maxRetries must be at least 1');
@@ -39,4 +39,3 @@ function retry(fn, config = DEFAULT_CONFIG) {
         throw new Error('Max retries reached');
     });
 }
-exports.retry = retry;

package/lib/string-util/string-util.d.ts

@@ -3,8 +3,8 @@ export declare class StringUtil {
     static parseVariables(variableString: string, data: any, quoteStrings?: boolean): string;
     static convertToCamelCase(str: any): any;
     static convertToTitleCase(str: any): any;
-    static isString(value: any): boolean;
-    static isArray(value: any): boolean;
+    static isString(value: any): value is string | String;
+    static isArray(value: any): value is any[];
     static decodeEncodedString(encodedString: string): string;
     static getStringSizeInMB(str: string): number;
 }

package/lib/timer-util/timer-util.js

@@ -9,12 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.delay = exports.TimerManager = exports.Timer = exports.TimeUnit = void 0;
+exports.TimerManager = exports.Timer = exports.TimeUnit = void 0;
+exports.delay = delay;
 var TimeUnit;
 (function (TimeUnit) {
     TimeUnit["MILLISECOND"] = "ms";
     TimeUnit["SECOND"] = "s";
-})(TimeUnit = exports.TimeUnit || (exports.TimeUnit = {}));
+})(TimeUnit || (exports.TimeUnit = TimeUnit = {}));
 const MILLISECONDS_PER_TIME_UNIT = {
     [TimeUnit.MILLISECOND]: 1,
     [TimeUnit.SECOND]: 1000,
@@ -116,4 +117,3 @@ function delay(ms) {
         });
     });
 }
-exports.delay = delay;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/util",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "description": "General javascript utilities",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -16,12 +16,13 @@
   "license": "ISC",
   "devDependencies": {
     "@types/jest": "^23.3.14",
+    "@types/lodash": "^4.17.17",
     "jest": "^29.3.1",
     "prettier": "^3.2.5",
     "ts-jest": "^29.0.3",
     "tslint": "^5.11.0",
     "tslint-config-prettier": "^1.18.0",
-    "typescript": "^4.0.0"
+    "typescript": "^5.8.3"
   },
   "jest": {
     "moduleFileExtensions": [