@contrail/util 1.0.26 → 1.0.28

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

@@ -10,19 +10,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,11 +35,15 @@ 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, ' ');
         return str.replace(/(?:^\w|[A-Z]|\b\w)/g, function (word, index) {
             return index === 0 ? word.toLowerCase() : word.toUpperCase();
         }).replace(/\s+/g, '');

package/package.json

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