@contrail/util 1.0.12 → 1.0.16

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

@@ -4,3 +4,4 @@ export interface ObjectDiff {
     newValue: any;
 }
 export declare function getObjectDiffs(before: any, after: any, prefix: string): ObjectDiff[];
+export declare function getObjectDiff(before: any, after: any, name: any): ObjectDiff;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getObjectDiffs = void 0;
+exports.getObjectDiff = exports.getObjectDiffs = void 0;
 function getObjectDiffs(before, after, prefix) {
     const diffs = [];
     if (!before || !after) {
@@ -18,30 +18,40 @@ function getObjectDiffs(before, after, prefix) {
         diffs.push(getObjectDiff(before[deletedProperty], null, prefix + deletedProperty));
     });
     commonProperties.forEach(commonProperty => {
-        if (typeof before[commonProperty] !== typeof after[commonProperty]) {
-            diffs.push(getObjectDiff(before[commonProperty], after[commonProperty], prefix + commonProperty));
+        const beforeVal = before[commonProperty];
+        const afterVal = after[commonProperty];
+        if (beforeVal === afterVal) {
+            return;
         }
-        else if (isObject(before[commonProperty])) {
-            if (isDate(before[commonProperty])) {
-                if (!datesEqual(before[commonProperty], after[commonProperty])) {
-                    diffs.push(getObjectDiff(before[commonProperty], after[commonProperty], prefix + commonProperty));
+        if (beforeVal === null || afterVal === null) {
+            diffs.push(getObjectDiff(beforeVal, afterVal, prefix + commonProperty));
+            return;
+        }
+        if (typeof beforeVal !== typeof afterVal) {
+            diffs.push(getObjectDiff(beforeVal, afterVal, prefix + commonProperty));
+            return;
+        }
+        if (isObject(beforeVal)) {
+            if (isDate(beforeVal)) {
+                if (!datesEqual(beforeVal, afterVal)) {
+                    diffs.push(getObjectDiff(beforeVal, afterVal, prefix + commonProperty));
                 }
             }
-            else if (Array.isArray(before[commonProperty])) {
-                const beforeArray = [...before[commonProperty]].sort(sortFunc);
-                const afterArray = [...after[commonProperty]].sort(sortFunc);
+            else if (Array.isArray(beforeVal)) {
+                const beforeArray = [...beforeVal].sort(sortFunc);
+                const afterArray = [...afterVal].sort(sortFunc);
                 if (JSON.stringify(beforeArray) !== JSON.stringify(afterArray)) {
-                    diffs.push(getObjectDiff(before[commonProperty], after[commonProperty], prefix + commonProperty));
+                    diffs.push(getObjectDiff(beforeVal, afterVal, prefix + commonProperty));
                 }
             }
             else {
-                const nestedObjectDiffs = getObjectDiffs(before[commonProperty], after[commonProperty], prefix + commonProperty + '.');
+                const nestedObjectDiffs = getObjectDiffs(beforeVal, afterVal, prefix + commonProperty + '.');
                 diffs.push(...nestedObjectDiffs);
             }
         }
         else {
-            if (before[commonProperty] !== after[commonProperty]) {
-                diffs.push(getObjectDiff(before[commonProperty], after[commonProperty], prefix + commonProperty));
+            if (beforeVal !== afterVal) {
+                diffs.push(getObjectDiff(beforeVal, afterVal, prefix + commonProperty));
             }
         }
     });
@@ -56,6 +66,7 @@ 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/compareDeep/mockData.d.ts

@@ -14,6 +14,14 @@ export declare const item1Assortment2: {
     dateProperty: Date;
     arrayProperty: string[];
 };
+export declare const item1Assortment3: {
+    id: string;
+    stringProperty: string;
+    intProperty: number;
+    boolProperty: boolean;
+    dateProperty: Date;
+    arrayProperty: any;
+};
 export declare const item2Assortment1: {
     id: string;
     stringProperty: string;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.item3Assortment2NestedChanges = exports.item3Assortment1 = exports.item2Assortment2DateChange = exports.item2Assortment2ArrayChange = exports.item2Assortment2ScalarChange = exports.item2Assortment1 = exports.item1Assortment2 = exports.item1Assortment1 = void 0;
+exports.item3Assortment2NestedChanges = exports.item3Assortment1 = exports.item2Assortment2DateChange = exports.item2Assortment2ArrayChange = exports.item2Assortment2ScalarChange = exports.item2Assortment1 = exports.item1Assortment3 = exports.item1Assortment2 = exports.item1Assortment1 = void 0;
 exports.item1Assortment1 = {
     id: 'id1',
     stringProperty: 'stringProperty1',
@@ -17,6 +17,14 @@ exports.item1Assortment2 = {
     dateProperty: new Date('12/22/1994'),
     arrayProperty: ['A', 'B', 'C'],
 };
+exports.item1Assortment3 = {
+    id: 'id1',
+    stringProperty: 'stringProperty1',
+    intProperty: 1,
+    boolProperty: false,
+    dateProperty: new Date('12/22/1994'),
+    arrayProperty: null,
+};
 exports.item2Assortment1 = {
     id: 'id2',
     stringProperty: 'stringProperty2',

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

@@ -1,3 +1,6 @@
 export declare class StringUtil {
     static convertToHyphenCase(entityName: string, transformToLowerCase?: boolean): string;
+    static parseVariables(variableString: string, data: any, quoteStrings?: boolean): string;
+    static isString(value: any): boolean;
+    static isArray(value: any): boolean;
 }

package/lib/string-util/string-util.js

@@ -9,5 +9,43 @@ class StringUtil {
         }
         return slugName;
     }
+    static parseVariables(variableString, data, quoteStrings = false) {
+        const regExp = /\{([^}]+)\}/;
+        let done = false;
+        let currentVariableString = variableString;
+        while (!done) {
+            const match = regExp.exec(currentVariableString);
+            if (!match) {
+                done = true;
+                break;
+            }
+            const variableLevels = match[1].split('.');
+            let replacementValue = data;
+            for (let i = 0; i < variableLevels.length; i++) {
+                replacementValue = replacementValue[variableLevels[i]];
+            }
+            if (quoteStrings && StringUtil.isString(replacementValue)) {
+                replacementValue = JSON.stringify(replacementValue);
+            }
+            if (StringUtil.isArray(replacementValue)) {
+                if (quoteStrings) {
+                    const newArray = [];
+                    for (const val of replacementValue) {
+                        newArray.push(JSON.stringify(val));
+                    }
+                    replacementValue = newArray;
+                }
+                replacementValue = '[' + replacementValue + ']';
+            }
+            currentVariableString = currentVariableString.replace(match[0], replacementValue);
+        }
+        return currentVariableString;
+    }
+    static isString(value) {
+        return typeof value === 'string' || value instanceof String;
+    }
+    static isArray(value) {
+        return Array.isArray(value);
+    }
 }
 exports.StringUtil = StringUtil;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/util",
-  "version": "1.0.12",
+  "version": "1.0.16",
   "description": "General javascript utilities",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",