marko 5.33.4 → 5.33.6

package/dist/runtime/vdom/VText.js

@@ -2,21 +2,21 @@
 var VNode = require("./VNode");
 
 function VText(value, ownerComponent) {
-  this.c__(-1 /* no children */, ownerComponent);
-  this.ct_ = value;
+  this.bT_(-1 /* no children */, ownerComponent);
+  this.cm_ = value;
 }
 
 VText.prototype = {
-  cs_: true,
+  cl_: true,
 
-  cb_: 3,
+  bV_: 3,
 
-  bo_: function (host) {
-    return (host.ownerDocument || host).createTextNode(this.ct_);
+  bl_: function (host) {
+    return (host.ownerDocument || host).createTextNode(this.cm_);
   },
 
-  bU_: function () {
-    return new VText(this.ct_);
+  bN_: function () {
+    return new VText(this.cm_);
   }
 };
 

package/dist/runtime/vdom/helpers/const-element.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var VElement = require("../vdom").bC_;
+var VElement = require("../vdom").bv_;
 var i = 0;
 
 module.exports = function (tagName, attrs, childCount) {
@@ -13,12 +13,12 @@ function ConstVElement(tagName, attrs, childCount) {
 
 ConstVElement.prototype = Object.create(VElement.prototype);
 ConstVElement.prototype.e = function (tagName, attrs, childCount) {
-  var child = this.bT_(
+  var child = this.bM_(
     new ConstVElement(tagName, attrs, childCount)
   );
 
   if (childCount === 0) {
-    return this.ck_();
+    return this.cd_();
   } else {
     return child;
   }

package/dist/runtime/vdom/hot-reload.js

@@ -44,7 +44,7 @@ exports.t = runtime.t = function (typeName) {
                 instance.P_(input, out);
               };
 
-              instance.cu_ = true;
+              instance.cn_ = true;
               instance.am_();
               instance._t_ = false;
 
@@ -78,7 +78,7 @@ registry._C_ = function (typeName, id) {
   if (instances) {
     instances.add(instance);
     instance.once("destroy", function () {
-      if (!instance.cu_) {
+      if (!instance.cn_) {
         instances.delete(instance);
       }
     });

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

@@ -80,8 +80,8 @@ function createFragmentNode(startNode, nextNode, parentNode) {
 
 function beginFragmentNode(startNode, parentNode) {
   var fragment = createFragmentNode(startNode, null, parentNode);
-  fragment.cv_ = function (nextNode) {
-    fragment.cv_ = null;
+  fragment.co_ = function (nextNode) {
+    fragment.co_ = null;
     insertBefore(
       fragment.endNode,
       nextNode,
@@ -92,4 +92,4 @@ function beginFragmentNode(startNode, parentNode) {
 }
 
 exports._h_ = createFragmentNode;
-exports.cw_ = beginFragmentNode;
+exports.cp_ = beginFragmentNode;

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

@@ -37,6 +37,6 @@ function removeChild(node) {
 
 exports.bc_ = insertBefore;
 exports.bd_ = insertAfter;
-exports.cr_ = nextSibling;
+exports.ck_ = nextSibling;
 exports.ay_ = firstChild;
 exports.be_ = removeChild;

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

@@ -8,11 +8,11 @@ var normalizeComponentKey = componentsUtil._R_;
 var domData = require("../../components/dom-data");
 var eventDelegation = require("../../components/event-delegation");
 var KeySequence = require("../../components/KeySequence");
-var VElement = require("../vdom").bC_;
+var VElement = require("../vdom").bv_;
 var fragment = require("./fragment");
 var helpers = require("./helpers");
-var virtualizeElement = VElement.cm_;
-var morphAttrs = VElement.cn_;
+var virtualizeElement = VElement.cf_;
+var morphAttrs = VElement.cg_;
 var keysByDOMNode = domData._G_;
 var componentByDOMNode = domData._l_;
 var vElementByDOMNode = domData._H_;
@@ -20,11 +20,11 @@ var detachedByDOMNode = domData.aT_;
 
 var insertBefore = helpers.bc_;
 var insertAfter = helpers.bd_;
-var nextSibling = helpers.cr_;
+var nextSibling = helpers.ck_;
 var firstChild = helpers.ay_;
 var removeChild = helpers.be_;
 var createFragmentNode = fragment._h_;
-var beginFragmentNode = fragment.cw_;
+var beginFragmentNode = fragment.cp_;
 
 var ELEMENT_NODE = 1;
 var TEXT_NODE = 3;
@@ -42,7 +42,7 @@ function isAutoKey(key) {
 }
 
 function compareNodeNames(fromEl, toEl) {
-  return fromEl.ch_ === toEl.ch_;
+  return fromEl.ca_ === toEl.ca_;
 }
 
 function caseInsensitiveCompare(a, b) {
@@ -73,12 +73,12 @@ function morphdom(fromNode, toNode, host, componentsContext) {
   ownerComponent,
   parentComponent)
   {
-    var realNode = vNode.bo_(host, parentEl.namespaceURI);
+    var realNode = vNode.bl_(host, parentEl.namespaceURI);
     insertBefore(realNode, referenceEl, parentEl);
 
     if (
-    vNode.cb_ === ELEMENT_NODE ||
-    vNode.cb_ === FRAGMENT_NODE)
+    vNode.bV_ === ELEMENT_NODE ||
+    vNode.bV_ === FRAGMENT_NODE)
     {
       if (key) {
         keysByDOMNode.set(realNode, key);
@@ -87,7 +87,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
         realNode;
       }
 
-      if (vNode.ch_ !== "textarea") {
+      if (vNode.ca_ !== "textarea") {
         morphChildren(realNode, vNode, parentComponent);
       }
 
@@ -161,9 +161,9 @@ function morphdom(fromNode, toNode, host, componentsContext) {
     var fromComponent;
 
     outer: while (curToNodeChild) {
-      toNextSibling = curToNodeChild.cr_;
-      curToNodeType = curToNodeChild.cb_;
-      curToNodeKey = curToNodeChild.ca_;
+      toNextSibling = curToNodeChild.ck_;
+      curToNodeType = curToNodeChild.bV_;
+      curToNodeKey = curToNodeChild.bU_;
 
       // Skip <!doctype>
       if (curFromNodeChild && curFromNodeChild.nodeType === DOCTYPE_NODE) {
@@ -282,7 +282,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
 
             if (
             curVFromNodeChild &&
-            curToNodeType === curVFromNodeChild.cb_ && (
+            curToNodeType === curVFromNodeChild.bV_ && (
             curToNodeType !== ELEMENT_NODE ||
             compareNodeNames(curToNodeChild, curVFromNodeChild)))
             {
@@ -327,11 +327,11 @@ function morphdom(fromNode, toNode, host, componentsContext) {
               curToNodeChild.aa_ ||
               caseInsensitiveCompare(
                 curFromNodeChild.nodeName,
-                curToNodeChild.ch_ || ""
+                curToNodeChild.ca_ || ""
               )))
               {
                 curVFromNodeChild = virtualizeElement(curFromNodeChild);
-                curVFromNodeChild.ch_ = curToNodeChild.ch_;
+                curVFromNodeChild.ca_ = curToNodeChild.ca_;
                 keysByDOMNode.set(curFromNodeChild, curToNodeKey);
                 referenceComponent.J_[curToNodeKey] =
                 curFromNodeChild;
@@ -351,7 +351,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
                 curFromNodeChild = fromNextSibling;
                 continue;
               } else if (
-              curToNodeChild.cb_ === FRAGMENT_NODE &&
+              curToNodeChild.bV_ === FRAGMENT_NODE &&
               curFromNodeChild.nodeType === COMMENT_NODE)
               {
                 var content = curFromNodeChild.nodeValue;
@@ -418,7 +418,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
 
               if (
               curVFromNodeChild &&
-              curToNodeType === curVFromNodeChild.cb_ && (
+              curToNodeType === curVFromNodeChild.bV_ && (
               curToNodeType !== ELEMENT_NODE ||
               compareNodeNames(curVFromNodeChild, curToNodeChild)))
               {
@@ -436,7 +436,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
 
                   if (
                   toNextSibling &&
-                  toNextSibling.ca_ === curFromNodeKey)
+                  toNextSibling.bU_ === curFromNodeKey)
                   {
                     // Single element swap
 
@@ -549,18 +549,18 @@ function morphdom(fromNode, toNode, host, componentsContext) {
 
                 if (
                 caseInsensitiveCompare(
-                  curVFromNodeChild.ch_,
-                  curToNodeChild.ch_
+                  curVFromNodeChild.ca_,
+                  curToNodeChild.ca_
                 ))
                 {
-                  curVFromNodeChild.ch_ = curToNodeChild.ch_;
+                  curVFromNodeChild.ca_ = curToNodeChild.ca_;
                 }
               } else {
                 // Skip over nodes that don't look like ours...
                 curFromNodeChild = fromNextSibling;
                 continue;
               }
-            } else if (curFromNodeKey = curVFromNodeChild.ca_) {
+            } else if (curFromNodeKey = curVFromNodeChild.bU_) {
               // We have a keyed element here but our target VDOM node
               // is not keyed so this not doesn't belong
               isCompatible = false;
@@ -587,7 +587,7 @@ function morphdom(fromNode, toNode, host, componentsContext) {
           {
             // Both nodes being compared are Text or Comment nodes
             isCompatible = true;
-            var curToNodeValue = curToNodeChild.ct_;
+            var curToNodeValue = curToNodeChild.cm_;
             var curFromNodeValue = curFromNodeChild.nodeValue;
             if (curFromNodeValue !== curToNodeValue) {
               if (
@@ -638,10 +638,10 @@ function morphdom(fromNode, toNode, host, componentsContext) {
     }
 
     // We have processed all of the "to nodes".
-    if (fromNode.cv_) {
+    if (fromNode.co_) {
       // If we are in an unfinished fragment, we have reached the end of the nodes
       // we were matching up and need to end the fragment
-      fromNode.cv_(curFromNodeChild);
+      fromNode.co_(curFromNodeChild);
     } else {
       // If curFromNodeChild is non-null then we still have some from nodes
       // left over that need to be removed
@@ -681,11 +681,11 @@ function morphdom(fromNode, toNode, host, componentsContext) {
   }
 
   function morphEl(fromEl, vFromEl, toEl, parentComponent) {
-    var nodeName = toEl.ch_;
-    var constId = toEl.cj_;
+    var nodeName = toEl.ca_;
+    var constId = toEl.cc_;
     vElementByDOMNode.set(fromEl, toEl);
 
-    if (constId !== undefined && vFromEl.cj_ === constId) {
+    if (constId !== undefined && vFromEl.cc_ === constId) {
       return;
     }
 
@@ -696,8 +696,8 @@ function morphdom(fromNode, toNode, host, componentsContext) {
     }
 
     if (nodeName === "textarea") {
-      if (toEl.ci_ !== vFromEl.ci_) {
-        fromEl.value = toEl.ci_;
+      if (toEl.cb_ !== vFromEl.cb_) {
+        fromEl.value = toEl.cb_;
       }
     } else {
       morphChildren(fromEl, toEl, parentComponent);

package/dist/runtime/vdom/vdom.js

@@ -11,7 +11,7 @@ var specialHtmlRegexp = /[&<]/;
 function virtualizeChildNodes(node, vdomParent, ownerComponent) {
   var curChild = node.firstChild;
   while (curChild) {
-    vdomParent.bT_(virtualize(curChild, ownerComponent));
+    vdomParent.bM_(virtualize(curChild, ownerComponent));
     curChild = curChild.nextSibling;
   }
 }
@@ -19,7 +19,7 @@ function virtualizeChildNodes(node, vdomParent, ownerComponent) {
 function virtualize(node, ownerComponent) {
   switch (node.nodeType) {
     case 1:
-      return VElement.cm_(node, virtualizeChildNodes, ownerComponent);
+      return VElement.cf_(node, virtualizeChildNodes, ownerComponent);
     case 3:
       return new VText(node.nodeValue, ownerComponent);
     case 11:
@@ -38,7 +38,7 @@ function virtualizeHTML(html, ownerComponent) {
   var curChild = parseHTML(html);
 
   while (curChild) {
-    vdomFragment.bT_(virtualize(curChild, ownerComponent));
+    vdomFragment.bM_(virtualize(curChild, ownerComponent));
     curChild = curChild.nextSibling;
   }
 
@@ -65,18 +65,18 @@ Node_prototype.t = function (value) {
     }
   }
 
-  this.bT_(vdomNode || new VText(value.toString()));
-  return this.ck_();
+  this.bM_(vdomNode || new VText(value.toString()));
+  return this.cd_();
 };
 
-Node_prototype.bY_ = function () {
-  return this.bT_(new VDocumentFragment());
+Node_prototype.bR_ = function () {
+  return this.bM_(new VDocumentFragment());
 };
 
-exports.bD_ = VDocumentFragment;
-exports.bC_ = VElement;
-exports.bE_ = VText;
-exports.bF_ = VComponent;
-exports.bG_ = VFragment;
-exports.cm_ = virtualize;
-exports.bH_ = virtualizeHTML;
+exports.bw_ = VDocumentFragment;
+exports.bv_ = VElement;
+exports.bx_ = VText;
+exports.by_ = VComponent;
+exports.bz_ = VFragment;
+exports.cf_ = virtualize;
+exports.bA_ = virtualizeHTML;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "5.33.4",
+  "version": "5.33.6",
   "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
   "keywords": [
     "front-end",
@@ -65,7 +65,7 @@
   },
   "dependencies": {
     "@marko/compiler": "^5.35.4",
-    "@marko/translator-default": "^5.32.3",
+    "@marko/translator-default": "^5.32.4",
     "app-module-path": "^2.2.0",
     "argly": "^1.2.0",
     "browser-refresh-client": "1.1.4",

package/src/runtime/helpers/tags-compat/dom-debug.js

@@ -1 +1 @@
-require("./runtime-dom.js").p(require("@marko/runtime-tags/debug/dom"));
+require("./runtime-dom.js").p(require("@marko/runtime-tags/debug/dom").compat);

package/src/runtime/helpers/tags-compat/dom-debug.mjs

@@ -1,3 +1,3 @@
-import api from "@marko/runtime-tags/debug/dom";
+import { compat } from "@marko/runtime-tags/debug/dom";
 import { p } from "./runtime-dom.js";
-p(api);
+p(compat);

package/src/runtime/helpers/tags-compat/dom.js

@@ -1 +1 @@
-require("./runtime-dom.js").p(require("@marko/runtime-tags/dom"));
+require("./runtime-dom.js").p(require("@marko/runtime-tags/dom").compat);

package/src/runtime/helpers/tags-compat/dom.mjs

@@ -1,3 +1,3 @@
-import api from "@marko/runtime-tags/dom";
+import { compat } from "@marko/runtime-tags/dom";
 import { p } from "./runtime-dom.js";
-p(api);
+p(compat);

package/src/runtime/helpers/tags-compat/html-debug.mjs

@@ -1,3 +1,3 @@
-import api from "@marko/runtime-tags/debug/html";
+import * as api from "@marko/runtime-tags/debug/html";
 import { p } from "./runtime-html.js";
 export const s = p(api);

package/src/runtime/helpers/tags-compat/html.mjs

@@ -1,3 +1,3 @@
-import api from "@marko/runtime-tags/html";
+import * as api from "@marko/runtime-tags/html";
 import { p } from "./runtime-html.js";
 export const s = p(api);

package/src/runtime/helpers/tags-compat/runtime-dom.js

@@ -10,71 +10,40 @@ const morphdom = require("../../vdom/morphdom");
 const { ___createFragmentNode } = require("../../vdom/morphdom/fragment");
 const dynamicTag = require("../dynamic-tag");
 
-exports.p = function ({
-  prepare,
-  runEffects,
-  patchConditionals,
-  createScopeWithRenderer,
-  queueEffect,
-  scopeLookup,
-  getRegisteredWithScope,
-  register,
-}) {
+exports.p = function (domCompat) {
   dynamicTag.___runtimeCompat = function tagsToVdom(
-    tagsRenderer,
+    renderer,
     renderBody,
     args,
   ) {
-    if (
-      tagsRenderer
-        ? tagsRenderer.___clone === undefined
-        : !Array.isArray(renderBody) && renderBody?.___clone === undefined
-    )
-      return tagsRenderer;
+    const tagsRenderer = domCompat.resolveRenderer(renderer || renderBody);
 
-    return (input, out) =>
-      TagsCompat(
-        { i: args ? args : input, r: tagsRenderer || renderBody },
-        out,
-      );
+    if (tagsRenderer) {
+      return (input, out) =>
+        TagsCompat({ i: args ? args : input, r: tagsRenderer }, out);
+    }
+
+    return renderer;
   };
 
   const TagsCompatId = "tags-compat";
   const TagsCompat = createRenderer(
     function (_, out, componentDef, component) {
-      let existing = false;
       const isHydrate =
         ___getComponentsContext(out).___globalContext.___isHydrate;
       const input = Array.isArray(_.i) ? _.i : [_.i];
-      const tagsRenderer = resolveRegistered(_.r);
-      const args = tagsRenderer.___args;
+      const tagsRenderer = domCompat.resolveRenderer(_.r);
+      const newNode = domCompat.render(
+        isHydrate,
+        out,
+        component,
+        tagsRenderer,
+        input,
+      );
 
-      component.effects = prepare(() => {
-        if (isHydrate) {
-          const scopeId = out.global.componentIdToScopeId[component.id];
-          component.scope = scopeLookup[scopeId];
-        }
-        if (!component.scope) {
-          component.scope = createScopeWithRenderer(
-            tagsRenderer /* out.global as context */,
-          );
-          for (const signal of tagsRenderer.___closureSignals) {
-            signal(component.scope, true);
-          }
-        } else {
-          args && args(component.scope, input, 1);
-          existing = true;
-        }
-        args && args(component.scope, input);
-      });
-      out.bf(out.___assignedKey, component, existing);
-      if (!existing) {
-        out.node({
-          ___actualize: () =>
-            component.scope.___startNode === component.scope.___endNode
-              ? component.scope.___startNode
-              : component.scope.___startNode.parentNode,
-        });
+      out.bf(out.___assignedKey, component, !newNode);
+      if (newNode) {
+        out.node({ ___actualize: () => newNode });
       }
       out.ef();
     },
@@ -94,12 +63,8 @@ exports.p = function ({
     _: TagsCompat,
     Component: defineComponent(
       {
-        onMount() {
-          runEffects(this.effects);
-        },
-        onUpdate() {
-          runEffects(this.effects);
-        },
+        onMount: domCompat.runComponentEffects,
+        onUpdate: domCompat.runComponentEffects,
       },
       TagsCompat,
     ),
@@ -114,7 +79,7 @@ exports.p = function ({
 
   const rendererCache = new WeakMap();
 
-  patchConditionals((conditional) => (...args) => {
+  domCompat.patchConditionals((conditional) => (...args) => {
     const signal = conditional(...args);
     const hasAttrs = args.length > 1;
     return (scope, renderer, clean) => {
@@ -124,17 +89,14 @@ exports.p = function ({
 
   function create5to6Renderer(renderer, hasAttrs) {
     let newRenderer = renderer;
-    if (renderer) {
+    if (renderer && typeof renderer !== "string") {
       const rendererFromAnywhere =
         renderer._ ||
         renderer.render ||
         (renderer.renderer && renderer.renderer.renderer) ||
         renderer.renderer;
-      const isMarko6 = rendererFromAnywhere
-        ? rendererFromAnywhere.___clone
-        : renderer.___clone;
 
-      if (typeof renderer !== "string" && !isMarko6) {
+      if (!domCompat.isRenderer(rendererFromAnywhere || renderer)) {
         newRenderer = rendererCache.get(renderer);
         if (!newRenderer) {
           const { Component } = renderer;
@@ -145,29 +107,28 @@ exports.p = function ({
               scopeId,
             ) {
               for (const customEvent of customEvents) {
-                customEvent[1] = resolveRegistered(customEvent[1]);
+                customEvent[1] = domCompat.resolveRenderer(customEvent[1]);
               }
 
               setCustomEvents.call(this, customEvents, scopeId);
             };
           }
-          newRenderer = {
-            ___setup(scope) {
+          newRenderer = domCompat.createRenderer(
+            (scope) => {
               if (!hasAttrs) {
                 renderAndMorph(scope, rendererFromAnywhere, renderer, {});
               }
             },
-            ___clone() {
+            () => {
               const realFragment = document.createDocumentFragment();
               ___createFragmentNode(null, null, realFragment);
               return realFragment;
             },
-            ___hasUserEffects: 1,
-            ___args(scope, input, clean) {
+            (scope, input, clean) => {
               if (clean) return;
               renderAndMorph(scope, rendererFromAnywhere, renderer, input);
             },
-          };
+          );
           rendererCache.set(renderer, newRenderer);
         }
       }
@@ -175,18 +136,18 @@ exports.p = function ({
     return newRenderer;
   }
 
-  register("@marko/tags-compat-5-to-6", create5to6Renderer);
+  domCompat.register("@marko/tags-compat-5-to-6", create5to6Renderer);
 
   function renderAndMorph(scope, renderer, renderBody, input) {
     const out = defaultCreateOut();
-    let rootNode = scope.___startNode.fragment;
+    let host = domCompat.getStartNode(scope);
+    let rootNode = host.fragment;
     if (!rootNode) {
       const component = (scope.marko5Component = ___componentLookup[scope.m5c]);
       rootNode = component.___rootNode;
-      scope.___startNode = rootNode.startNode;
-      scope.___endNode = rootNode.endNode;
+      host = rootNode.startNode;
+      domCompat.setScopeNodes(host, rootNode.endNode);
     }
-    const host = scope.___startNode;
     const existingComponent = scope.marko5Component;
     const componentsContext = ___getComponentsContext(out);
     const globalComponentsContext = componentsContext.___globalContext;
@@ -215,7 +176,7 @@ exports.p = function ({
       RenderBodyComponent({ renderBody, args: input }, out);
     }
 
-    queueEffect(scope, () => {
+    domCompat.queueEffect(scope, () => {
       const targetNode = out.___getOutput().___firstChild;
       morphdom(rootNode, targetNode, host, componentsContext);
       const componentDefs = componentsContext.___initComponents(
@@ -267,12 +228,4 @@ exports.p = function ({
     _: RenderBodyComponent,
     Component: defineComponent({}, RenderBodyComponent),
   }));
-
-  function resolveRegistered(renderer) {
-    if (!Array.isArray(renderer)) return renderer;
-
-    const [registerId, scopeId] = renderer;
-    const scope = scopeLookup[scopeId];
-    return getRegisteredWithScope(registerId, scope);
-  }
 };

package/src/runtime/helpers/tags-compat/runtime-html.js

@@ -94,7 +94,7 @@ exports.p = function (tagsAPI) {
         const out = defaultCreateOut();
         let customEvents;
 
-        out.global.streamData = tagsAPI.$_streamData;
+        out.global.streamData = tagsAPI.getStreamData();
 
         if (renderer5) {
           const normalizedInput = {};