saasufy-components 3.19.0 → 3.20.0

package/collection-browser.js

@@ -260,7 +260,9 @@ class CollectionBrowser extends SocketConsumer {
     );
     let { fieldValues: viewParams } = convertStringToFieldParams(collectionViewParams);
     let viewPrimaryFields = collectionViewPrimaryFields ?
-      collectionViewPrimaryFields.split(',').map(fieldName => fieldName.trim()) : null;
+      collectionViewPrimaryFields.split(',').map(fieldName => fieldName.trim()) :
+      collectionViewPrimaryFields == null ?
+      null : [];
 
     if (this.collection) this.collection.destroy();
     this.isStale = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "saasufy-components",
-  "version": "3.19.0",
+  "version": "3.20.0",
   "description": "Components for Saasufy.",
   "main": "index.js",
   "scripts": {

package/utils.js

@@ -233,6 +233,7 @@ let templateFormatters = {
   computeId
 };
 
+let templateRawTagsRegExp = /{{{.*?}}}/gs;
 let templateTagsRegExp = /{{.*?}}/gs;
 
 function execExpression(expression, options) {
@@ -246,33 +247,49 @@ function execExpression(expression, options) {
   return (new Function(...args))(...keys.map(key => options[key]));
 }
 
+function getRenderOptions(data, socket) {
+  return {
+    ...templateFormatters,
+    uuid,
+    socket: socket ? {
+      state: socket.state,
+      pendingReconnect: socket.pendingReconnect,
+      connectAttempts: socket.connectAttempts,
+      authState: socket.authState,
+      authToken: socket.authToken
+    } : undefined,
+    ...data
+  };
+}
+
 export function renderTemplate(templateString, data, socket) {
-  return templateString.replace(templateTagsRegExp, (match) => {
-    let expString = match.slice(2, -2);
-    let options = {
-      ...templateFormatters,
-      uuid,
-      socket: socket ? {
-        state: socket.state,
-        pendingReconnect: socket.pendingReconnect,
-        connectAttempts: socket.connectAttempts,
-        authState: socket.authState,
-        authToken: socket.authToken
-      } : undefined,
-      ...data
-    };
-
-    try {
-      return toSafeHTML(
-        execExpression(
+  return templateString
+    .replace(templateRawTagsRegExp, (match) => {
+      let expString = match.slice(3, -3);
+      let options = getRenderOptions(data, socket);
+      try {
+        return execExpression(
           toExpression(expString),
           options
-        )
-      );
-    } catch (error) {
-      return match;
-    }
-  });
+        );
+      } catch (error) {
+        return match;
+      }
+    })
+    .replace(templateTagsRegExp, (match) => {
+      let expString = match.slice(2, -2);
+      let options = getRenderOptions(data, socket);
+      try {
+        return toSafeHTML(
+          execExpression(
+            toExpression(expString),
+            options
+          )
+        );
+      } catch (error) {
+        return match;
+      }
+    });
 }
 
 export function updateConsumerElements(consumers, value, template, sourceElementName) {