@digipair/engine 0.84.7 → 0.85.0

package/index.cjs.js

@@ -8174,13 +8174,7 @@ const applyTemplate = (value, context)=>{
     if (typeof value === 'string') {
         if (result.startsWith('NOEVAL:')) {
             result = value.substring(7);
-        } else {
-            const template = handlebars_min.exports.compile(value, {
-                noEscape: true
-            });
-            result = template(context);
-        }
-        if (result.startsWith('EVALUATE:')) {
+        } else if (result.startsWith('EVALUATE:')) {
             const path = result.replace(/^EVALUATE:/, '');
             result = feelin.evaluate(path, _extends({}, context, {
                 getTime: (time)=>new Date(time).getTime(),
@@ -8191,6 +8185,11 @@ const applyTemplate = (value, context)=>{
                 decodeURIComponent: (value)=>decodeURIComponent(value),
                 JSONparse: (value)=>JSON.parse(value)
             }));
+        } else {
+            const template = handlebars_min.exports.compile(value, {
+                noEscape: true
+            });
+            result = template(context);
         }
     } else if (typeof value === 'object' && Array.isArray(value)) {
         result = value.map((item)=>isPinsSettings(item) ? item : applyTemplate(item, context));

package/index.esm.js

@@ -23899,14 +23899,14 @@ function indent(str, spaces) {
         var match = parseIdentifier(input, i1, namePart) || namePart && parseAdditionalSymbol(input, i1) || maybeSpace && parseSpaces(input, i1);
         // match is required
         if (!match) {
-            return tokens = tokens1, nextMatch = nextMatch1, i = i1, {
+            return nextMatch = nextMatch1, tokens = tokens1, i = i1, {
                 v: nextMatch1
             };
         }
         var token = match.token, offset = match.offset;
         i1 += offset;
         if (token === " ") {
-            return tokens = tokens1, nextMatch = nextMatch1, i = i1, "continue";
+            return nextMatch = nextMatch1, tokens = tokens1, i = i1, "continue";
         }
         tokens1 = _to_consumable_array$1(tokens1).concat([
             token
@@ -23925,7 +23925,7 @@ function indent(str, spaces) {
         if (contextKeys.some(function(el) {
             return el.startsWith(name);
         })) {
-            return tokens = tokens1, nextMatch = nextMatch1, i = i1, "continue";
+            return nextMatch = nextMatch1, tokens = tokens1, i = i1, "continue";
         }
         if (dateTimeIdentifiers.some(function(el) {
             return el === name;
@@ -23944,9 +23944,9 @@ function indent(str, spaces) {
         if (dateTimeIdentifiers.some(function(el) {
             return el.startsWith(name);
         })) {
-            return tokens = tokens1, nextMatch = nextMatch1, i = i1, "continue";
+            return nextMatch = nextMatch1, tokens = tokens1, i = i1, "continue";
         }
-        return tokens = tokens1, nextMatch = nextMatch1, i = i1, {
+        return nextMatch = nextMatch1, tokens = tokens1, i = i1, {
             v: nextMatch1
         };
     };
@@ -27853,13 +27853,7 @@ const applyTemplate = (value, context)=>{
     if (typeof value === 'string') {
         if (result.startsWith('NOEVAL:')) {
             result = value.substring(7);
-        } else {
-            const template = handlebars_min.exports.compile(value, {
-                noEscape: true
-            });
-            result = template(context);
-        }
-        if (result.startsWith('EVALUATE:')) {
+        } else if (result.startsWith('EVALUATE:')) {
             const path = result.replace(/^EVALUATE:/, '');
             result = evaluate(path, _extends({}, context, {
                 getTime: (time)=>new Date(time).getTime(),
@@ -27870,6 +27864,11 @@ const applyTemplate = (value, context)=>{
                 decodeURIComponent: (value)=>decodeURIComponent(value),
                 JSONparse: (value)=>JSON.parse(value)
             }));
+        } else {
+            const template = handlebars_min.exports.compile(value, {
+                noEscape: true
+            });
+            result = template(context);
         }
     } else if (typeof value === 'object' && Array.isArray(value)) {
         result = value.map((item)=>isPinsSettings(item) ? item : applyTemplate(item, context));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digipair/engine",
-  "version": "0.84.7",
+  "version": "0.85.0",
   "keywords": [
     "digipair",
     "web",