marko 5.37.44 → 5.37.46

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

@@ -9,6 +9,8 @@ const defaultCreateOut = require("../../createOut");
 const morphdom = require("../../vdom/morphdom");
 const { _k_ } = require("../../vdom/morphdom/fragment");
 const dynamicTag = require("../dynamic-tag");
+const Component = require("../../components/Component");
+const noopRenderer = require("../serialize-noop").aJ_;
 
 exports.p = function (domCompat) {
   dynamicTag.bn_ = function tagsToVdom(
@@ -31,6 +33,19 @@ exports.p = function (domCompat) {
     return renderer;
   };
 
+  Component.prototype.bo_ =
+  Component.prototype.aD_;
+  Component.prototype.aD_ = function (customEvents, scopeId) {
+    for (const customEvent of customEvents) {
+      customEvent[1] = domCompat.resolveRegistered(
+        customEvent[1],
+        this.ak_
+      );
+    }
+
+    this.bo_(customEvents, scopeId);
+  };
+
   const TagsCompatId = "tags-compat";
   const TagsCompat = createRenderer(
     function (_, out, componentDef, component) {
@@ -40,7 +55,7 @@ exports.p = function (domCompat) {
 
       out.bf(out.aa_, component, !newNode);
       if (newNode) {
-        out.node({ bo_: () => newNode });
+        out.node({ bp_: () => newNode });
       }
       out.ef();
     },
@@ -68,13 +83,6 @@ exports.p = function (domCompat) {
     )
   }));
 
-  // (
-  //   nodeAccessor: Accessor,
-  //   dynamicTagAttrs?: IntersectionSignal,
-  //   intersection?: IntersectionSignal,
-  //   valueWithIntersection?: ValueSignal
-  // )
-
   const rendererCache = new WeakMap();
 
   domCompat.patchDynamicTag((dynamicTag) => (...args) => {
@@ -87,6 +95,10 @@ exports.p = function (domCompat) {
   function create5to6Renderer(renderer) {
     let newRenderer = renderer;
     if (renderer && typeof renderer !== "string") {
+      if (renderer === noopRenderer) {
+        return noopRenderer;
+      }
+
       const rendererFromAnywhere =
       renderer._ ||
       renderer.render ||
@@ -96,24 +108,6 @@ exports.p = function (domCompat) {
       if (!domCompat.isRenderer(rendererFromAnywhere || renderer)) {
         newRenderer = rendererCache.get(renderer);
         if (!newRenderer) {
-          const { Component } = renderer;
-          if (Component) {
-            const setCustomEvents = Component.prototype.aD_;
-            Component.prototype.aD_ = function (
-            customEvents,
-            scopeId)
-            {
-              const global = this.ak_;
-              for (const customEvent of customEvents) {
-                customEvent[1] = domCompat.resolveRegistered(
-                  customEvent[1],
-                  global
-                );
-              }
-
-              setCustomEvents.call(this, customEvents, scopeId);
-            };
-          }
           newRenderer = domCompat.createRenderer(
             (scope, input) =>
             renderAndMorph(scope, rendererFromAnywhere, renderer, input),
@@ -127,20 +121,20 @@ exports.p = function (domCompat) {
   }
 
   domCompat.registerRenderer(create5to6Renderer);
-  domCompat.init(require("../serialize-noop").aJ_);
+  domCompat.init(noopRenderer);
 
   function renderAndMorph(scope, renderer, renderBody, input) {
     const out = defaultCreateOut();
     let host = domCompat.getStartNode(scope);
     let rootNode = host.fragment;
     if (!rootNode) {
-      const component = scope.bp_ =
+      const component = scope.bq_ =
       _l_[scope.m5c];
       rootNode = component._E_;
       host = rootNode.startNode;
       domCompat.setScopeNodes(host, rootNode.endNode);
     }
-    const existingComponent = scope.bp_;
+    const existingComponent = scope.bq_;
     const componentsContext = S_(out);
     const globalComponentsContext = componentsContext.p_;
     let customEvents;
@@ -180,7 +174,7 @@ exports.p = function (domCompat) {
       component._E_ = rootNode;
       component.O_ = normalizedInput;
       component.W_ = customEvents;
-      scope.bp_ = component;
+      scope.bq_ = component;
     });
   }
 

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

@@ -79,7 +79,9 @@ exports.p = function (htmlCompat) {
     }
     return (input, ...args) => {
       const out = defaultCreateOut(htmlCompat.$global());
+      const branchId = htmlCompat.peekNextScopeId();
       let customEvents;
+      htmlCompat.nextScopeId();
 
       if (renderer5) {
         const normalizedInput = {};
@@ -107,7 +109,7 @@ exports.p = function (htmlCompat) {
       const component = componentsContext.b_[0];
       if (component) {
         component.s_.W_ = customEvents;
-        htmlCompat.writeSetScopeForComponent(component.id);
+        htmlCompat.writeSetScopeForComponent(branchId, component.id);
       }
 
       initComponentsTag({}, out);

package/dist/runtime/html/AsyncStream.js

@@ -9,7 +9,7 @@ var markoAttr = require("./helpers/data-marko");
 var escapeXmlHelper = require("./helpers/escape-xml");
 var StringWriter = require("./StringWriter");
 var escapeXmlOrNullish = escapeXmlHelper.x;
-var escapeXmlString = escapeXmlHelper.bq_;
+var escapeXmlString = escapeXmlHelper.br_;
 var missingSetTimeout = typeof setTimeout !== "function";
 
 function noop() {}
@@ -105,7 +105,7 @@ function AsyncStream(global, writer, parentOut) {
   this.a__ = null;
   this.aa_ = null;
   this.bc_ = null;
-  this.br_ = false;
+  this.bs_ = false;
 }
 
 AsyncStream.DEFAULT_TIMEOUT = 10000;
@@ -126,11 +126,11 @@ AsyncStream.enableAsyncStackTrace = function () {
 var proto = AsyncStream.prototype = {
   constructor: AsyncStream,
   B_: typeof document === "object" && document,
-  bs_: true,
+  bt_: true,
 
   [Symbol.asyncIterator]() {
-    if (this.bt_) {
-      return this.bt_;
+    if (this.bu_) {
+      return this.bu_;
     }
 
     const originalWriter = this._state.writer;
@@ -222,7 +222,7 @@ var proto = AsyncStream.prototype = {
       };
     }
 
-    return this.bt_ = {
+    return this.bu_ = {
       next: iteratorNextFn,
       return: iteratorReturnFn,
       throw: iteratorReturnFn,
@@ -345,7 +345,7 @@ var proto = AsyncStream.prototype = {
           }
 
           this._lastCount++;
-          newStream.br_ = true;
+          newStream.bs_ = true;
         }
 
         name = options.name;
@@ -465,7 +465,7 @@ var proto = AsyncStream.prototype = {
         parentOut._handleChildDone(this);
       }
     } else {
-      if (childOut.br_) {
+      if (childOut.bs_) {
         this._lastCount--;
       }
 

package/dist/runtime/html/helpers/_dynamic-attr.js

@@ -1,7 +1,7 @@
 "use strict";
 var attrHelper = require("./attr");
-var notEmptyAttr = attrHelper.bu_;
-var isEmptyAttrValue = attrHelper.bv_;
+var notEmptyAttr = attrHelper.bv_;
+var isEmptyAttrValue = attrHelper.bw_;
 var classHelper = require("./class-attr");
 var styleHelper = require("./style-attr");
 

package/dist/runtime/html/helpers/attr.js

@@ -5,8 +5,8 @@
 
 module.exports = attr;
 
-attr.bu_ = nonVoidAttr;
-attr.bv_ = isVoid;
+attr.bv_ = nonVoidAttr;
+attr.bw_ = isVoid;
 attr.a = attrAssignment;
 attr.d = escapeDoubleQuotedAttrValue;
 attr.s = escapeSingleQuotedAttrValue;

package/dist/runtime/html/helpers/escape-xml.js

@@ -18,4 +18,4 @@ module.exports.x = function (value) {
   return escape(value + "");
 };
 
-exports.bq_ = escape;
+exports.br_ = escape;

package/dist/runtime/renderable.js

@@ -160,7 +160,7 @@ module.exports = function (target, renderer) {
         finalData = {};
       }
 
-      if (out && out.bs_) {
+      if (out && out.bt_) {
         finalOut = out;
         shouldEnd = false;
         extend(out.global, globalData);

package/dist/runtime/vdom/AsyncVDOMBuilder.js

@@ -3,21 +3,21 @@ var RenderResult = require("../RenderResult");
 var attrsHelper = require("./helpers/attrs");
 var morphdom = require("./morphdom");
 var vdom = require("./vdom");
-var VElement = vdom.bw_;
-var VComment = vdom.bx_;
-var VDocumentFragment = vdom.by_;
-var VText = vdom.bz_;
-var VComponent = vdom.bA_;
-var VFragment = vdom.bB_;
-var virtualizeHTML = vdom.bC_;
+var VElement = vdom.bx_;
+var VComment = vdom.by_;
+var VDocumentFragment = vdom.bz_;
+var VText = vdom.bA_;
+var VComponent = vdom.bB_;
+var VFragment = vdom.bC_;
+var virtualizeHTML = vdom.bD_;
 
 var EVENT_UPDATE = "update";
 var EVENT_FINISH = "finish";
 
 function State(tree) {
-  this.bD_ = new EventEmitter();
-  this.bE_ = tree;
-  this.bF_ = false;
+  this.bE_ = new EventEmitter();
+  this.bF_ = tree;
+  this.bG_ = false;
 }
 
 function AsyncVDOMBuilder(globalData, parentNode, parentOut) {
@@ -33,18 +33,18 @@ function AsyncVDOMBuilder(globalData, parentNode, parentOut) {
     state = new State(parentNode);
   }
 
-  this.bG_ = 1;
-  this.bH_ = 0;
-  this.bI_ = null;
-  this.bJ_ = parentOut;
+  this.bH_ = 1;
+  this.bI_ = 0;
+  this.bJ_ = null;
+  this.bK_ = parentOut;
 
   this.data = {};
   this.z_ = state;
   this.ab_ = parentNode;
   this.global = globalData || {};
-  this.bK_ = [parentNode];
-  this.bL_ = false;
-  this.bM_ = undefined;
+  this.bL_ = [parentNode];
+  this.bM_ = false;
+  this.bN_ = undefined;
   this.b_ = null;
 
   this.a__ = null;
@@ -53,23 +53,23 @@ function AsyncVDOMBuilder(globalData, parentNode, parentOut) {
 }
 
 var proto = AsyncVDOMBuilder.prototype = {
-  bs_: true,
+  bt_: true,
   B_: typeof document === "object" && document,
 
   bc: function (component, key, ownerComponent) {
     var vComponent = new VComponent(component, key, ownerComponent);
-    return this.bN_(vComponent, 0, true);
+    return this.bO_(vComponent, 0, true);
   },
 
   bd_: function (component, key, ownerComponent) {
     var vComponent = new VComponent(component, key, ownerComponent, true);
-    this.bN_(vComponent, 0);
+    this.bO_(vComponent, 0);
   },
 
-  bN_: function (child, childCount, pushToStack) {
-    this.ab_.bO_(child);
+  bO_: function (child, childCount, pushToStack) {
+    this.ab_.bP_(child);
     if (pushToStack === true) {
-      this.bK_.push(child);
+      this.bL_.push(child);
       this.ab_ = child;
     }
     return childCount === 0 ? this : child;
@@ -85,7 +85,7 @@ var proto = AsyncVDOMBuilder.prototype = {
       flags,
       props
     );
-    return this.bN_(element, childCount);
+    return this.bO_(element, childCount);
   },
 
   bm_: function (tagName, attrs, key, componentDef, props) {
@@ -103,7 +103,7 @@ var proto = AsyncVDOMBuilder.prototype = {
   n: function (node, component) {
     // NOTE: We do a shallow clone since we assume the node is being reused
     //       and a node can only have one parent node.
-    var clone = node.bP_();
+    var clone = node.bQ_();
     this.node(clone);
     clone._M_ = component;
 
@@ -111,7 +111,7 @@ var proto = AsyncVDOMBuilder.prototype = {
   },
 
   node: function (node) {
-    this.ab_.bO_(node);
+    this.ab_.bP_(node);
     return this;
   },
 
@@ -130,7 +130,7 @@ var proto = AsyncVDOMBuilder.prototype = {
       text = text.toString();
     }
 
-    this.ab_.bO_(new VText(text, ownerComponent));
+    this.ab_.bP_(new VText(text, ownerComponent));
     return this;
   },
 
@@ -165,7 +165,7 @@ var proto = AsyncVDOMBuilder.prototype = {
       flags,
       props
     );
-    this.bN_(element, childCount, true);
+    this.bO_(element, childCount, true);
     return this;
   },
 
@@ -183,7 +183,7 @@ var proto = AsyncVDOMBuilder.prototype = {
 
   bf: function (key, component, preserve) {
     var fragment = new VFragment(key, component, preserve);
-    this.bN_(fragment, null, true);
+    this.bO_(fragment, null, true);
     return this;
   },
 
@@ -192,7 +192,7 @@ var proto = AsyncVDOMBuilder.prototype = {
   },
 
   endElement: function () {
-    var stack = this.bK_;
+    var stack = this.bL_;
     stack.pop();
     this.ab_ = stack[stack.length - 1];
   },
@@ -200,44 +200,44 @@ var proto = AsyncVDOMBuilder.prototype = {
   end: function () {
     this.ab_ = undefined;
 
-    var remaining = --this.bG_;
-    var parentOut = this.bJ_;
+    var remaining = --this.bH_;
+    var parentOut = this.bK_;
 
     if (remaining === 0) {
       if (parentOut) {
-        parentOut.bQ_();
+        parentOut.bR_();
       } else {
-        this.bR_();
+        this.bS_();
       }
-    } else if (remaining - this.bH_ === 0) {
-      this.bS_();
+    } else if (remaining - this.bI_ === 0) {
+      this.bT_();
     }
 
     return this;
   },
 
-  bQ_: function () {
-    var remaining = --this.bG_;
+  bR_: function () {
+    var remaining = --this.bH_;
 
     if (remaining === 0) {
-      var parentOut = this.bJ_;
+      var parentOut = this.bK_;
       if (parentOut) {
-        parentOut.bQ_();
+        parentOut.bR_();
       } else {
-        this.bR_();
+        this.bS_();
       }
-    } else if (remaining - this.bH_ === 0) {
-      this.bS_();
+    } else if (remaining - this.bI_ === 0) {
+      this.bT_();
     }
   },
 
-  bR_: function () {
+  bS_: function () {
     var state = this.z_;
-    state.bF_ = true;
-    state.bD_.emit(EVENT_FINISH, this.n_());
+    state.bG_ = true;
+    state.bE_.emit(EVENT_FINISH, this.n_());
   },
 
-  bS_: function () {
+  bT_: function () {
     var lastArray = this._last;
 
     var i = 0;
@@ -272,7 +272,7 @@ var proto = AsyncVDOMBuilder.prototype = {
   },
 
   beginAsync: function (options) {
-    if (this.bL_) {
+    if (this.bM_) {
       throw Error(
         "Tried to render async while in sync mode. Note: Client side await is not currently supported in re-renders (Issue: #942)."
       );
@@ -282,16 +282,16 @@ var proto = AsyncVDOMBuilder.prototype = {
 
     if (options) {
       if (options.last) {
-        this.bH_++;
+        this.bI_++;
       }
     }
 
-    this.bG_++;
+    this.bH_++;
 
-    var documentFragment = this.ab_.bT_();
+    var documentFragment = this.ab_.bU_();
     var asyncOut = new AsyncVDOMBuilder(this.global, documentFragment, this);
 
-    state.bD_.emit("beginAsync", {
+    state.bE_.emit("beginAsync", {
       out: asyncOut,
       parentOut: this
     });
@@ -304,7 +304,7 @@ var proto = AsyncVDOMBuilder.prototype = {
   },
 
   flush: function () {
-    var events = this.z_.bD_;
+    var events = this.z_.bE_;
 
     if (events.listenerCount(EVENT_UPDATE)) {
       events.emit(EVENT_UPDATE, new RenderResult(this));
@@ -312,22 +312,22 @@ var proto = AsyncVDOMBuilder.prototype = {
   },
 
   ah_: function () {
-    return this.z_.bE_;
+    return this.z_.bF_;
   },
 
   n_: function () {
-    return this.bU_ || (this.bU_ = new RenderResult(this));
+    return this.bV_ || (this.bV_ = new RenderResult(this));
   },
 
   on: function (event, callback) {
     var state = this.z_;
 
-    if (event === EVENT_FINISH && state.bF_) {
+    if (event === EVENT_FINISH && state.bG_) {
       callback(this.n_());
     } else if (event === "last") {
       this.onLast(callback);
     } else {
-      state.bD_.on(event, callback);
+      state.bE_.on(event, callback);
     }
 
     return this;
@@ -336,19 +336,19 @@ var proto = AsyncVDOMBuilder.prototype = {
   once: function (event, callback) {
     var state = this.z_;
 
-    if (event === EVENT_FINISH && state.bF_) {
+    if (event === EVENT_FINISH && state.bG_) {
       callback(this.n_());
     } else if (event === "last") {
       this.onLast(callback);
     } else {
-      state.bD_.once(event, callback);
+      state.bE_.once(event, callback);
     }
 
     return this;
   },
 
   emit: function (type, arg) {
-    var events = this.z_.bD_;
+    var events = this.z_.bE_;
     switch (arguments.length) {
       case 1:
         events.emit(type);
@@ -364,17 +364,17 @@ var proto = AsyncVDOMBuilder.prototype = {
   },
 
   removeListener: function () {
-    var events = this.z_.bD_;
+    var events = this.z_.bE_;
     events.removeListener.apply(events, arguments);
     return this;
   },
 
   sync: function () {
-    this.bL_ = true;
+    this.bM_ = true;
   },
 
   isSync: function () {
-    return this.bL_;
+    return this.bM_;
   },
 
   onLast: function (callback) {
@@ -390,12 +390,12 @@ var proto = AsyncVDOMBuilder.prototype = {
   },
 
   ag_: function (host) {
-    var node = this.bM_;
+    var node = this.bN_;
     if (!node) {
       var vdomTree = this.ah_();
 
       if (!host) host = this.B_;
-      this.bM_ = node = vdomTree.bo_(host, null);
+      this.bN_ = node = vdomTree.bp_(host, null);
       morphdom(node, vdomTree, host, this.b_);
     }
     return node;

package/dist/runtime/vdom/VComment.js

@@ -2,20 +2,20 @@
 var inherit = require("raptor-util/inherit");
 
 function VComment(value, ownerComponent) {
-  this.bV_(-1 /* no children */, ownerComponent);
-  this.bW_ = value;
+  this.bW_(-1 /* no children */, ownerComponent);
+  this.bX_ = value;
 }
 
 VComment.prototype = {
-  bX_: 8,
+  bY_: 8,
 
-  bo_: function (host) {
-    var nodeValue = this.bW_;
+  bp_: function (host) {
+    var nodeValue = this.bX_;
     return (host.ownerDocument || host).createComment(nodeValue);
   },
 
-  bP_: function () {
-    return new VComment(this.bW_);
+  bQ_: function () {
+    return new VComment(this.bX_);
   }
 };
 

package/dist/runtime/vdom/VComponent.js

@@ -2,14 +2,14 @@
 var VNode = require("./VNode");
 
 function VComponent(component, key, ownerComponent, preserve) {
-  this.bV_(null /* childCount */, ownerComponent);
-  this.bY_ = key;
+  this.bW_(null /* childCount */, ownerComponent);
+  this.bZ_ = key;
   this.s_ = component;
   this.ad_ = preserve;
 }
 
 VComponent.prototype = {
-  bX_: 2
+  bY_: 2
 };
 
 inherit(VComponent, VNode);

package/dist/runtime/vdom/VDocumentFragment.js

@@ -4,25 +4,25 @@ var VNode = require("./VNode");
 
 function VDocumentFragmentClone(other) {
   extend(this, other);
-  this.bZ_ = null;
   this.c__ = null;
+  this.ca_ = null;
 }
 
 function VDocumentFragment(out) {
-  this.bV_(null /* childCount */);
+  this.bW_(null /* childCount */);
   this.r_ = out;
 }
 
 VDocumentFragment.prototype = {
-  bX_: 11,
+  bY_: 11,
 
-  ca_: true,
+  cb_: true,
 
-  bP_: function () {
+  bQ_: function () {
     return new VDocumentFragmentClone(this);
   },
 
-  bo_: function (host) {
+  bp_: function (host) {
     return (host.ownerDocument || host).createDocumentFragment();
   }
 };