marko 5.35.21 → 5.35.22

package/dist/runtime/vdom/morphdom/index.js

@@ -1,10 +1,10 @@
 "use strict";
 var componentsUtil = require("@internal/components-util");
-var existingComponentLookup = componentsUtil._l_;
-var destroyNodeRecursive = componentsUtil._R_;
+var existingComponentLookup = componentsUtil._m_;
+var destroyNodeRecursive = componentsUtil._S_;
 var addComponentRootToKeyedElements =
-componentsUtil._m_;
-var normalizeComponentKey = componentsUtil._U_;
+componentsUtil._n_;
+var normalizeComponentKey = componentsUtil._V_;
 var domData = require("../../components/dom-data");
 var eventDelegation = require("../../components/event-delegation");
 var KeySequence = require("../../components/KeySequence");
@@ -13,17 +13,17 @@ var fragment = require("./fragment");
 var helpers = require("./helpers");
 var virtualizeElement = VElement.ck_;
 var morphAttrs = VElement.cl_;
-var keysByDOMNode = domData._n_;
-var componentByDOMNode = domData._p_;
-var vElementByDOMNode = domData._K_;
-var detachedByDOMNode = domData.aW_;
+var keysByDOMNode = domData._o_;
+var componentByDOMNode = domData._q_;
+var vElementByDOMNode = domData._L_;
+var detachedByDOMNode = domData.aX_;
 
-var insertBefore = helpers.bf_;
-var insertAfter = helpers.bg_;
+var insertBefore = helpers.bg_;
+var insertAfter = helpers.bh_;
 var nextSibling = helpers.cp_;
-var firstChild = helpers.aA_;
-var removeChild = helpers.bh_;
-var createFragmentNode = fragment._k_;
+var firstChild = helpers.aB_;
+var removeChild = helpers.bi_;
+var createFragmentNode = fragment._l_;
 var beginFragmentNode = fragment.ct_;
 
 var ELEMENT_NODE = 1;
@@ -51,7 +51,7 @@ function caseInsensitiveCompare(a, b) {
 
 function onNodeAdded(node, componentsContext) {
   if (node.nodeType === ELEMENT_NODE) {
-    eventDelegation.aV_(node, componentsContext);
+    eventDelegation.aW_(node, componentsContext);
   }
 }
 
@@ -61,8 +61,8 @@ function morphdom(fromNode, toNode, host, componentsContext) {
   var keySequences = Object.create(null);
 
   if (componentsContext) {
-    globalComponentsContext = componentsContext.p_;
-    isHydrate = globalComponentsContext._Z_;
+    globalComponentsContext = componentsContext.q_;
+    isHydrate = globalComponentsContext.a__;
   }
 
   function insertVirtualNodeBefore(
@@ -73,7 +73,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
   ownerComponent,
   parentComponent)
   {
-    var realNode = vNode.bo_(host, parentEl.namespaceURI);
+    var realNode = vNode.bp_(host, parentEl.namespaceURI);
     insertBefore(realNode, referenceEl, parentEl);
 
     if (
@@ -82,7 +82,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
     {
       if (key) {
         keysByDOMNode.set(realNode, key);
-        (isAutoKey(key) ? parentComponent : ownerComponent).K_[
+        (isAutoKey(key) ? parentComponent : ownerComponent).L_[
         key] =
         realNode;
       }
@@ -104,7 +104,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
   ownerComponent,
   parentComponent)
   {
-    var rootNode = component._E_ = insertBefore(
+    var rootNode = component._F_ = insertBefore(
       createFragmentNode(),
       referenceNode,
       referenceNodeParentEl
@@ -114,7 +114,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
     if (key && ownerComponent) {
       key = normalizeComponentKey(key, parentComponent.id);
       addComponentRootToKeyedElements(
-        ownerComponent.K_,
+        ownerComponent.L_,
         key,
         rootNode,
         component.id
@@ -126,7 +126,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
   }
 
   function morphComponent(component, vComponent) {
-    morphChildren(component._E_, vComponent, component);
+    morphChildren(component._F_, vComponent, component);
   }
 
   var detachedNodes = [];
@@ -147,7 +147,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
 
   function morphChildren(fromNode, toNode, parentComponent) {
     var curFromNodeChild = firstChild(fromNode);
-    var curToNodeChild = toNode.aA_;
+    var curToNodeChild = toNode.aB_;
 
     var curToNodeKey;
     var curFromNodeKey;
@@ -170,18 +170,18 @@ function morphdom(fromNode, toNode, host, componentsContext) {
         curFromNodeChild = nextSibling(curFromNodeChild);
       }
 
-      var ownerComponent = curToNodeChild._M_ || parentComponent;
+      var ownerComponent = curToNodeChild._N_ || parentComponent;
       var referenceComponent;
 
       if (curToNodeType === COMPONENT_NODE) {
-        var component = curToNodeChild.s_;
+        var component = curToNodeChild.t_;
         if (
         (matchingFromComponent = existingComponentLookup[component.id]) ===
         undefined)
         {
           if (isHydrate) {
             var rootNode = beginFragmentNode(curFromNodeChild, fromNode);
-            component._E_ = rootNode;
+            component._F_ = rootNode;
             componentByDOMNode.set(rootNode, component);
 
             if (ownerComponent && curToNodeKey) {
@@ -190,7 +190,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
                 parentComponent.id
               );
               addComponentRootToKeyedElements(
-                ownerComponent.K_,
+                ownerComponent.L_,
                 curToNodeKey,
                 rootNode,
                 component.id
@@ -214,17 +214,17 @@ function morphdom(fromNode, toNode, host, componentsContext) {
             );
           }
         } else {
-          if (matchingFromComponent._E_ !== curFromNodeChild) {
+          if (matchingFromComponent._F_ !== curFromNodeChild) {
             if (
             curFromNodeChild && (
             fromComponent = componentByDOMNode.get(curFromNodeChild)) &&
-            globalComponentsContext.q_[
+            globalComponentsContext.r_[
             fromComponent.id] ===
             undefined)
             {
               // The component associated with the current real DOM node was not rendered
               // so we should just remove it out of the real DOM by destroying it
-              curFromNodeChild = nextSibling(fromComponent._E_);
+              curFromNodeChild = nextSibling(fromComponent._F_);
               destroyComponent(fromComponent);
               continue;
             }
@@ -232,7 +232,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
             // We need to move the existing component into
             // the correct location
             insertBefore(
-              matchingFromComponent._E_,
+              matchingFromComponent._F_,
               curFromNodeChild,
               fromNode
             );
@@ -241,7 +241,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
             curFromNodeChild && nextSibling(curFromNodeChild);
           }
 
-          if (!curToNodeChild.ad_) {
+          if (!curToNodeChild.ae_) {
             morphComponent(component, curToNodeChild);
           }
         }
@@ -266,7 +266,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
         // up elements
         curToNodeKey = (
         keySequences[referenceComponent.id] || (
-        keySequences[referenceComponent.id] = new KeySequence())).aN_(
+        keySequences[referenceComponent.id] = new KeySequence())).aO_(
           curToNodeKey);
 
         if (curFromNodeChild) {
@@ -277,7 +277,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
 
         if (curFromNodeKey === curToNodeKey) {
           // Elements line up. Now we just have to make sure they are compatible
-          if (!curToNodeChild.ad_) {
+          if (!curToNodeChild.ae_) {
             // We just skip over the fromNode if it is preserved
 
             if (
@@ -316,7 +316,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
             }
           }
         } else {
-          matchingFromEl = referenceComponent.K_[curToNodeKey];
+          matchingFromEl = referenceComponent.L_[curToNodeKey];
           if (
           matchingFromEl === undefined ||
           matchingFromEl === curFromNodeChild)
@@ -324,7 +324,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
             if (isHydrate && curFromNodeChild) {
               if (
               curFromNodeChild.nodeType === ELEMENT_NODE && (
-              curToNodeChild.ad_ ||
+              curToNodeChild.ae_ ||
               caseInsensitiveCompare(
                 curFromNodeChild.nodeName,
                 curToNodeChild.cg_ || ""
@@ -333,10 +333,10 @@ function morphdom(fromNode, toNode, host, componentsContext) {
                 curVFromNodeChild = virtualizeElement(curFromNodeChild);
                 curVFromNodeChild.cg_ = curToNodeChild.cg_;
                 keysByDOMNode.set(curFromNodeChild, curToNodeKey);
-                referenceComponent.K_[curToNodeKey] =
+                referenceComponent.L_[curToNodeKey] =
                 curFromNodeChild;
 
-                if (curToNodeChild.ad_) {
+                if (curToNodeChild.ae_) {
                   vElementByDOMNode.set(curFromNodeChild, curVFromNodeChild);
                 } else {
                   morphEl(
@@ -383,11 +383,11 @@ function morphdom(fromNode, toNode, host, componentsContext) {
                   );
                   keysByDOMNode.set(fragment, curToNodeKey);
                   vElementByDOMNode.set(fragment, curToNodeChild);
-                  referenceComponent.K_[curToNodeKey] = fragment;
+                  referenceComponent.L_[curToNodeKey] = fragment;
                   removeChild(curFromNodeChild);
                   removeChild(endNode);
 
-                  if (!curToNodeChild.ad_) {
+                  if (!curToNodeChild.ae_) {
                     morphChildren(fragment, curToNodeChild, parentComponent);
                   }
 
@@ -412,7 +412,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
               detachedByDOMNode.set(matchingFromEl, undefined);
             }
 
-            if (!curToNodeChild.ad_) {
+            if (!curToNodeChild.ae_) {
               curVFromNodeChild = vElementByDOMNode.get(matchingFromEl);
 
               if (
@@ -526,7 +526,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
           curFromNodeChild = fromNextSibling;
 
           if (
-          !globalComponentsContext.q_[fromComponent.id])
+          !globalComponentsContext.r_[fromComponent.id])
           {
             destroyComponent(fromComponent);
           }
@@ -658,7 +658,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
         if (fromComponent = componentByDOMNode.get(curFromNodeChild)) {
           curFromNodeChild = fromNextSibling;
           if (
-          !globalComponentsContext.q_[fromComponent.id])
+          !globalComponentsContext.r_[fromComponent.id])
           {
             destroyComponent(fromComponent);
           }
@@ -674,7 +674,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
           referenceComponent = parentComponent;
         } else {
           referenceComponent =
-          curVFromNodeChild && curVFromNodeChild._M_;
+          curVFromNodeChild && curVFromNodeChild._N_;
         }
 
         detachNode(curFromNodeChild, fromNode, referenceComponent);
@@ -695,7 +695,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
 
     morphAttrs(fromEl, vFromEl, toEl);
 
-    if (toEl.ac_) {
+    if (toEl.ad_) {
       return;
     }
 
@@ -708,7 +708,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
     }
   } // END: morphEl(...)
 
-  morphChildren(fromNode, toNode, toNode.s_);
+  morphChildren(fromNode, toNode, toNode.t_);
 
   detachedNodes.forEach(function (node) {
     var detachedFromComponent = detachedByDOMNode.get(node);
@@ -725,7 +725,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
           detachedFromComponent !== true && detachedFromComponent
         );
 
-        if (eventDelegation.an_(node) != false) {
+        if (eventDelegation.ao_(node) != false) {
           removeChild(node);
         }
       }

package/helpers/README.md

@@ -0,0 +1,3 @@
+# Marko Helpers
+
+This directory contains helpers that were deprecated in Marko v3. Marko v4/5 no longer adds these helpers to every compiled template, but you can still import them if needed.

package/helpers/empty.js

@@ -0,0 +1,4 @@
+var notEmpty = require("./notEmpty");
+module.exports = function empty(o) {
+  return !notEmpty(o);
+};

package/helpers/notEmpty.js

@@ -0,0 +1,11 @@
+module.exports = function (o) {
+  if (o == null) {
+    return false;
+  } else if (Array.isArray(o)) {
+    return !!o.length;
+  } else if (o === "") {
+    return false;
+  }
+
+  return true;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "5.35.21",
+  "version": "5.35.22",
   "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
   "keywords": [
     "front-end",
@@ -47,6 +47,7 @@
     "dist",
     "docs",
     "src",
+    "helpers",
     "browser-refresh.js",
     "compiler-browser.marko",
     "compiler.js",

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

@@ -52,59 +52,16 @@ module.exports = function (input, out) {
     function handleAwait(awaitInfo) {
       let flushedScript = false;
       let flushedContent = false;
-      let flushedPlaceholder = false;
-      awaitInfo.parent.on("___toString", () => {
-        flushedPlaceholder = true;
-        if (!flushedScript && flushedContent) {
-          flushedScript = true;
-          asyncOut.script(
-            `$${reorderFunctionId}(` +
-              (typeof awaitInfo.id === "number"
-                ? awaitInfo.id
-                : '"' + awaitInfo.id + '"') +
-              (awaitInfo.after ? ',"' + awaitInfo.after + '"' : "") +
-              ")",
-          );
+      let flushedPlaceholder = awaitInfo.parent._state.finished;
+      if (flushedPlaceholder) {
+        if (awaitInfo.out._state.finished) {
+          writeResult(awaitInfo.out.___getResult());
+          return;
         }
-      });
-      awaitInfo.out
-        .on("___toString", out.emit.bind(out, "___toString"))
-        .on("finish", function (result) {
-          flushedContent = true;
-          if (!global._afRuntime) {
-            // Minified version of ./client-reorder-runtime.js
-            asyncOut.script(
-              `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;
-          }
-
-          if (global.cspNonce) {
-            asyncOut.write(
-              '<style nonce="' +
-                escapeDoubleQuotes(global.cspNonce) +
-                '">' +
-                `#${reorderFunctionId}` +
-                awaitInfo.id +
-                "{display:none;}" +
-                "</style>" +
-                `<div id="${reorderFunctionId}` +
-                awaitInfo.id +
-                '">' +
-                result.toString() +
-                "</div>",
-            );
-          } else {
-            asyncOut.write(
-              `<div id="${reorderFunctionId}` +
-                awaitInfo.id +
-                '" style="display:none">' +
-                result.toString() +
-                "</div>",
-            );
-          }
-
-          if (!flushedScript && flushedPlaceholder) {
+      } else {
+        awaitInfo.parent.on("___toString", () => {
+          flushedPlaceholder = true;
+          if (!flushedScript && flushedContent) {
             flushedScript = true;
             asyncOut.script(
               `$${reorderFunctionId}(` +
@@ -115,21 +72,74 @@ module.exports = function (input, out) {
                 ")",
             );
           }
+        });
+      }
 
-          awaitInfo.out.writer = asyncOut.writer;
-
-          out.emit("await:finish", awaitInfo);
-
-          out.flush();
-
-          if (--remaining === 0) {
-            asyncOut.end();
-            next();
-          }
-        })
+      awaitInfo.out
+        .on("___toString", out.emit.bind(out, "___toString"))
+        .on("finish", writeResult)
         .on("error", function (err) {
           asyncOut.error(err);
         });
+
+      function writeResult(result) {
+        flushedContent = true;
+        if (!global._afRuntime) {
+          // Minified version of ./client-reorder-runtime.js
+          asyncOut.script(
+            `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;
+        }
+
+        if (global.cspNonce) {
+          asyncOut.write(
+            '<style nonce="' +
+              escapeDoubleQuotes(global.cspNonce) +
+              '">' +
+              `#${reorderFunctionId}` +
+              awaitInfo.id +
+              "{display:none;}" +
+              "</style>" +
+              `<div id="${reorderFunctionId}` +
+              awaitInfo.id +
+              '">' +
+              result.toString() +
+              "</div>",
+          );
+        } else {
+          asyncOut.write(
+            `<div id="${reorderFunctionId}` +
+              awaitInfo.id +
+              '" style="display:none">' +
+              result.toString() +
+              "</div>",
+          );
+        }
+
+        if (!flushedScript && flushedPlaceholder) {
+          flushedScript = true;
+          asyncOut.script(
+            `$${reorderFunctionId}(` +
+              (typeof awaitInfo.id === "number"
+                ? awaitInfo.id
+                : '"' + awaitInfo.id + '"') +
+              (awaitInfo.after ? ',"' + awaitInfo.after + '"' : "") +
+              ")",
+          );
+        }
+
+        awaitInfo.out.writer = asyncOut.writer;
+
+        out.emit("await:finish", awaitInfo);
+
+        out.flush();
+
+        if (--remaining === 0) {
+          asyncOut.end();
+          next();
+        }
+      }
     }
 
     awaitContext.instances.forEach(handleAwait);