@contrail/util 1.0.27 → 1.0.29

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

@@ -0,0 +1 @@
+export declare function replaceAllWithFunction(string: string, regEx: RegExp, replacerFunction: (matchedString: string) => string): string;

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

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.replaceAllWithFunction = void 0;
+function replaceAllWithFunction(string, regEx, replacerFunction) {
+    let match;
+    let newString = '';
+    let startIndex = 0;
+    while ((match = regEx.exec(string)) !== null) {
+        let matchedString = match[0];
+        let index = match.index;
+        const newValue = replacerFunction(matchedString);
+        newString += string.substring(startIndex, index);
+        newString += newValue;
+        startIndex += index + matchedString.length;
+    }
+    return newString;
+}
+exports.replaceAllWithFunction = replaceAllWithFunction;

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

@@ -1,3 +1,4 @@
+import { replaceAllWithFunction } from "./replaceAll/replaceAllWithFunction";
 export declare class StringUtil {
     static convertToHyphenCase(entityName: string, transformToLowerCase?: boolean): string;
     static parseVariables(variableString: string, data: any, quoteStrings?: boolean): string;
@@ -5,4 +6,5 @@ export declare class StringUtil {
     static convertToTitleCase(str: any): any;
     static isString(value: any): boolean;
     static isArray(value: any): boolean;
+    static replaceAllWithFunction: typeof replaceAllWithFunction;
 }

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StringUtil = void 0;
+const replaceAllWithFunction_1 = require("./replaceAll/replaceAllWithFunction");
 class StringUtil {
     static convertToHyphenCase(entityName, transformToLowerCase = true) {
         const slugName = entityName === null || entityName === void 0 ? void 0 : entityName.split(/(?=[A-Z])/).join('-');
@@ -10,19 +11,17 @@ 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('.');
+        const regExp = /\{([^}]+)\}/g;
+        const replacedString = variableString.replace(regExp, (match, group) => {
+            const variableLevels = group.split('.');
             let replacementValue = data;
             for (let i = 0; i < variableLevels.length; i++) {
-                replacementValue = replacementValue[variableLevels[i]];
+                if (replacementValue) {
+                    replacementValue = replacementValue[variableLevels[i]];
+                }
+                else {
+                    replacementValue = undefined;
+                }
             }
             if (quoteStrings && StringUtil.isString(replacementValue)) {
                 replacementValue = JSON.stringify(replacementValue);
@@ -37,9 +36,12 @@ class StringUtil {
                 }
                 replacementValue = '[' + replacementValue + ']';
             }
-            currentVariableString = currentVariableString.replace(match[0], replacementValue);
-        }
-        return currentVariableString;
+            if (Object.prototype.toString.call(replacementValue) === '[object Object]') {
+                replacementValue = JSON.stringify(replacementValue);
+            }
+            return replacementValue;
+        });
+        return replacedString;
     }
     static convertToCamelCase(str) {
         str = str.replace(/-/g, ' ');
@@ -60,3 +62,4 @@ class StringUtil {
     }
 }
 exports.StringUtil = StringUtil;
+StringUtil.replaceAllWithFunction = replaceAllWithFunction_1.replaceAllWithFunction;

package/package.json

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