marko 5.32.8 → 5.32.10

package/dist/core-tags/core/await/renderer.js

@@ -115,8 +115,14 @@ module.exports = function awaitTag(input, out) {
       nextId: 0
     });
 
-    var id = awaitInfo.id = input.name || clientReorderContext.nextId++;
-    var placeholderIdAttrValue = "afph" + id;
+    /** SHOULD MATCH THE reorder-renderer.js IMPLEMENTATION */
+    var reorderFunctionId =
+    out.global.runtimeId !== "M" ? "af" + out.global.runtimeId : "af";
+
+    var id = awaitInfo.id =
+    input.name ||
+    (out.global.componentIdPrefix || 0) + clientReorderContext.nextId++;
+    var placeholderIdAttrValue = reorderFunctionId + "ph" + id;
 
     if (placeholderRenderer) {
       out.write('<span id="' + placeholderIdAttrValue + '">');

package/dist/core-tags/core/await/reorderer-renderer.js

@@ -24,6 +24,10 @@ module.exports = function (input, out) {
     out.flush();
   }
 
+  /** SHOULD MATCH THE renderer.js IMPLEMENTATION */
+  var reorderFunctionId =
+  out.global.runtimeId !== "M" ? "af" + out.global.runtimeId : "af";
+
   var asyncOut = out.beginAsync({
     last: true,
     timeout: -1,
@@ -52,7 +56,7 @@ module.exports = function (input, out) {
         if (!global._afRuntime) {
           // Minified version of ./client-reorder-runtime.js
           asyncOut.script(
-            `function $af(d,a,e,l,g,h,k,b,f,c){c=$af;if(a&&!c[a])(c[a+="$"]||(c[a]=[])).push(d);else{e=document;l=e.getElementById("af"+d);g=e.getElementById("afph"+d);h=e.createDocumentFragment();k=l.childNodes;b=0;for(f=k.length;b<f;b++)h.appendChild(k.item(0));g&&g.parentNode.replaceChild(h,g);c[d]=1;if(a=c[d+"$"])for(b=0,f=a.length;b<f;b++)c(a[b])}}`
+            `function $${reorderFunctionId}(d,a,e,l,g,h,k,b,f,c){c=$${reorderFunctionId};if(a&&!c[a])(c[a+="$"]||(c[a]=[])).push(d);else{e=document;l=e.getElementById("${reorderFunctionId}"+d);g=e.getElementById("${reorderFunctionId}ph"+d);h=e.createDocumentFragment();k=l.childNodes;b=0;for(f=k.length;b<f;b++)h.appendChild(k.item(0));g&&g.parentNode.replaceChild(h,g);c[d]=1;if(a=c[d+"$"])for(b=0,f=a.length;b<f;b++)c(a[b])}}`
           );
           global._afRuntime = true;
         }
@@ -62,11 +66,11 @@ module.exports = function (input, out) {
             '<style nonce="' +
             escapeDoubleQuotes(global.cspNonce) +
             '">' +
-            "#af" +
+            `#${reorderFunctionId}` +
             awaitInfo.id +
             "{display:none;}" +
             "</style>" +
-            '<div id="af' +
+            `<div id="${reorderFunctionId}` +
             awaitInfo.id +
             '">' +
             result.toString() +
@@ -74,7 +78,7 @@ module.exports = function (input, out) {
           );
         } else {
           asyncOut.write(
-            '<div id="af' +
+            `<div id="${reorderFunctionId}` +
             awaitInfo.id +
             '" style="display:none">' +
             result.toString() +
@@ -83,7 +87,7 @@ module.exports = function (input, out) {
         }
 
         asyncOut.script(
-          "$af(" + (
+          `$${reorderFunctionId}(` + (
           typeof awaitInfo.id === "number" ?
           awaitInfo.id :
           '"' + awaitInfo.id + '"') + (

package/dist/runtime/helpers/attr-tag.js

@@ -0,0 +1,40 @@
+"use strict";
+
+var ownerInput;
+
+exports.r = function repeatedAttrTag(targetProperty, attrTagInput) {
+  var prev = ownerInput[targetProperty];
+  if (prev) {
+    prev.push(attrTagInput);
+  } else {
+    ownerInput[targetProperty] = [attrTagInput];
+  }
+};
+exports.a = function repeatableAttrTag(targetProperty, attrTagInput) {
+  var prev = ownerInput[targetProperty];
+  if (prev) {
+    if (Array.isArray(prev)) {
+      prev.push(attrTagInput);
+    } else {
+      ownerInput[targetProperty] = [prev, attrTagInput];
+    }
+  } else {
+    attrTagInput[Symbol.iterator] = selfIterator;
+    ownerInput[targetProperty] = attrTagInput;
+  }
+};
+
+exports.i = function attrTagInput(render, input) {
+  var prevOwnerInput = ownerInput;
+  ownerInput = input || {};
+  try {
+    ownerInput.renderBody = render();
+    return ownerInput;
+  } finally {
+    ownerInput = prevOwnerInput;
+  }
+};
+
+function* selfIterator() {
+  yield this;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "marko",
-    "version": "5.32.8",
+    "version": "5.32.10",
     "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
     "keywords": [
         "front-end",
@@ -64,8 +64,8 @@
         "build": "babel ./src --out-dir ./dist --delete-dir-on-start --copy-files --config-file ../../babel.config.js --env-name=production"
     },
     "dependencies": {
-        "@marko/compiler": "^5.34.6",
-        "@marko/translator-default": "^5.31.14",
+        "@marko/compiler": "^5.34.7",
+        "@marko/translator-default": "^5.31.15",
         "app-module-path": "^2.2.0",
         "argly": "^1.2.0",
         "browser-refresh-client": "1.1.4",

package/src/core-tags/core/await/renderer.js

@@ -115,8 +115,14 @@ module.exports = function awaitTag(input, out) {
         nextId: 0,
       });
 
-    var id = (awaitInfo.id = input.name || clientReorderContext.nextId++);
-    var placeholderIdAttrValue = "afph" + id;
+    /** SHOULD MATCH THE reorder-renderer.js IMPLEMENTATION */
+    var reorderFunctionId =
+      out.global.runtimeId !== "M" ? "af" + out.global.runtimeId : "af";
+
+    var id = (awaitInfo.id =
+      input.name ||
+      (out.global.componentIdPrefix || 0) + clientReorderContext.nextId++);
+    var placeholderIdAttrValue = reorderFunctionId + "ph" + id;
 
     if (placeholderRenderer) {
       out.write('<span id="' + placeholderIdAttrValue + '">');

package/src/core-tags/core/await/reorderer-renderer.js

@@ -24,6 +24,10 @@ module.exports = function (input, out) {
     out.flush();
   }
 
+  /** SHOULD MATCH THE renderer.js IMPLEMENTATION */
+  var reorderFunctionId =
+    out.global.runtimeId !== "M" ? "af" + out.global.runtimeId : "af";
+
   var asyncOut = out.beginAsync({
     last: true,
     timeout: -1,
@@ -52,7 +56,7 @@ module.exports = function (input, out) {
           if (!global._afRuntime) {
             // Minified version of ./client-reorder-runtime.js
             asyncOut.script(
-              `function $af(d,a,e,l,g,h,k,b,f,c){c=$af;if(a&&!c[a])(c[a+="$"]||(c[a]=[])).push(d);else{e=document;l=e.getElementById("af"+d);g=e.getElementById("afph"+d);h=e.createDocumentFragment();k=l.childNodes;b=0;for(f=k.length;b<f;b++)h.appendChild(k.item(0));g&&g.parentNode.replaceChild(h,g);c[d]=1;if(a=c[d+"$"])for(b=0,f=a.length;b<f;b++)c(a[b])}}`,
+              `function $${reorderFunctionId}(d,a,e,l,g,h,k,b,f,c){c=$${reorderFunctionId};if(a&&!c[a])(c[a+="$"]||(c[a]=[])).push(d);else{e=document;l=e.getElementById("${reorderFunctionId}"+d);g=e.getElementById("${reorderFunctionId}ph"+d);h=e.createDocumentFragment();k=l.childNodes;b=0;for(f=k.length;b<f;b++)h.appendChild(k.item(0));g&&g.parentNode.replaceChild(h,g);c[d]=1;if(a=c[d+"$"])for(b=0,f=a.length;b<f;b++)c(a[b])}}`,
             );
             global._afRuntime = true;
           }
@@ -62,11 +66,11 @@ module.exports = function (input, out) {
               '<style nonce="' +
                 escapeDoubleQuotes(global.cspNonce) +
                 '">' +
-                "#af" +
+                `#${reorderFunctionId}` +
                 awaitInfo.id +
                 "{display:none;}" +
                 "</style>" +
-                '<div id="af' +
+                `<div id="${reorderFunctionId}` +
                 awaitInfo.id +
                 '">' +
                 result.toString() +
@@ -74,7 +78,7 @@ module.exports = function (input, out) {
             );
           } else {
             asyncOut.write(
-              '<div id="af' +
+              `<div id="${reorderFunctionId}` +
                 awaitInfo.id +
                 '" style="display:none">' +
                 result.toString() +
@@ -83,7 +87,7 @@ module.exports = function (input, out) {
           }
 
           asyncOut.script(
-            "$af(" +
+            `$${reorderFunctionId}(` +
               (typeof awaitInfo.id === "number"
                 ? awaitInfo.id
                 : '"' + awaitInfo.id + '"') +

package/src/runtime/helpers/attr-tag.js

@@ -0,0 +1,40 @@
+"use strict";
+
+var ownerInput;
+
+exports.r = function repeatedAttrTag(targetProperty, attrTagInput) {
+  var prev = ownerInput[targetProperty];
+  if (prev) {
+    prev.push(attrTagInput);
+  } else {
+    ownerInput[targetProperty] = [attrTagInput];
+  }
+};
+exports.a = function repeatableAttrTag(targetProperty, attrTagInput) {
+  var prev = ownerInput[targetProperty];
+  if (prev) {
+    if (Array.isArray(prev)) {
+      prev.push(attrTagInput);
+    } else {
+      ownerInput[targetProperty] = [prev, attrTagInput];
+    }
+  } else {
+    attrTagInput[Symbol.iterator] = selfIterator;
+    ownerInput[targetProperty] = attrTagInput;
+  }
+};
+
+exports.i = function attrTagInput(render, input) {
+  var prevOwnerInput = ownerInput;
+  ownerInput = input || {};
+  try {
+    ownerInput.renderBody = render();
+    return ownerInput;
+  } finally {
+    ownerInput = prevOwnerInput;
+  }
+};
+
+function* selfIterator() {
+  yield this;
+}

package/dist/runtime/helpers/load-nested-tag.js

@@ -1,17 +0,0 @@
-"use strict";
-
-module.exports = function loadNestedTagHelper(targetProperty, isRepeated) {
-  return function (input, parent) {
-    // If we are nested tag then we do not have a renderer
-    if (isRepeated) {
-      var existingArray = parent[targetProperty];
-      if (existingArray) {
-        existingArray.push(input);
-      } else {
-        parent[targetProperty] = [input];
-      }
-    } else {
-      parent[targetProperty] = input;
-    }
-  };
-};

package/dist/runtime/helpers/self-iterator.js

@@ -1,3 +0,0 @@
-"use strict";module.exports = function* selfIterator() {
-  yield this;
-};

package/src/runtime/helpers/load-nested-tag.js

@@ -1,17 +0,0 @@
-"use strict";
-
-module.exports = function loadNestedTagHelper(targetProperty, isRepeated) {
-  return function (input, parent) {
-    // If we are nested tag then we do not have a renderer
-    if (isRepeated) {
-      var existingArray = parent[targetProperty];
-      if (existingArray) {
-        existingArray.push(input);
-      } else {
-        parent[targetProperty] = [input];
-      }
-    } else {
-      parent[targetProperty] = input;
-    }
-  };
-};

package/src/runtime/helpers/self-iterator.js

@@ -1,3 +0,0 @@
-module.exports = function* selfIterator() {
-  yield this;
-};