marko 5.39.16 → 5.39.18

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

@@ -13,6 +13,10 @@ var getComponentsContext = ComponentsContext.T_;
 var FLAG_WILL_RERENDER_IN_BROWSER = 1;
 // var FLAG_HAS_RENDER_BODY = 2;
 var IS_SERVER = typeof document === "undefined";
+// Heads a serialized class-method event reference on a Tags child's input;
+// tags-compat/runtime-dom.js revives it into a live handler on resume.
+// eslint-disable-next-line no-constant-condition
+var CLASS_EVENT_MARKER = "$C_e";
 
 /**
  * Helper to render a dynamic tag
@@ -90,7 +94,7 @@ customEvents)
 
       if (renderer) {
         out.c(componentDef, key, customEvents);
-        renderer(attrs, out);
+        renderer(addTagsEvents(attrs, componentDef, customEvents), out);
         out.ac_ = null;
       } else {
         var isFn = typeof render === "function";
@@ -157,6 +161,58 @@ function attrsToCamelCase(attrs) {
   return result;
 }
 
+// Fold a Class parent's `on-x(...)` bindings into `onX` input props for a Tags
+// child: a live handler in the browser, a resumable reference on the server.
+function addTagsEvents(attrs, componentDef, customEvents) {
+  var len = customEvents ? customEvents.length : 0;
+
+  if (len === 0) {
+    return attrs;
+  }
+
+  var result = attrs || {};
+  var event;
+
+  for (var i = len; i--;) {
+    event = customEvents[i];
+    var eventName = event[0];
+    var handler = event[1];
+    var extraArgs = event[3];
+    var prop = "on" + eventName.charAt(0).toUpperCase() + eventName.slice(1);
+
+    if (IS_SERVER) {
+      result[prop] =
+      typeof handler === "string" ?
+      extraArgs ?
+      [CLASS_EVENT_MARKER, componentDef.id, handler, extraArgs] :
+      [CLASS_EVENT_MARKER, componentDef.id, handler] :
+      undefined;
+    } else {
+      result[prop] = bindTagsEventHandler(
+        componentDef.s_,
+        handler,
+        extraArgs
+      );
+    }
+  }
+
+  return result;
+}
+
+function bindTagsEventHandler(component, handler, extraArgs) {
+  return function () {
+    var fn = typeof handler === "function" ? handler : component[handler];
+    if (extraArgs) {
+      var args = extraArgs.slice();
+      for (var i = 0; i < arguments.length; i++) {
+        args.push(arguments[i]);
+      }
+      return fn.apply(component, args);
+    }
+    return fn.apply(component, arguments);
+  };
+}
+
 function addEvents(componentDef, customEvents, props) {
   var len = customEvents ? customEvents.length : 0;
 
@@ -178,4 +234,6 @@ function addEvents(componentDef, customEvents, props) {
   }
 
   return result;
-}
+}
+
+module.exports.br_ = CLASS_EVENT_MARKER;

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

@@ -34,7 +34,27 @@ exports.p = function (domCompat) {
     return renderer;
   };
 
-  Component.prototype.br_ =
+  // Revive a serialized class-method event reference into a live handler, looked
+  // up lazily since a split parent may not be hydrated yet when the child resumes.
+  domCompat.setClassEventResolver(function (value, scope) {
+    if (Array.isArray(value) && value[0] === dynamicTag.br_) {
+      const componentId = value[1];
+      const method = value[2];
+      const extraArgs = value[3];
+      return function () {
+        const component =
+        _n_[componentId] || scope.bs_;
+        const args = extraArgs ? extraArgs.slice() : [];
+        for (let i = 0; i < arguments.length; i++) {
+          args.push(arguments[i]);
+        }
+        return component[method].apply(component, args);
+      };
+    }
+    return value;
+  });
+
+  Component.prototype.bt_ =
   Component.prototype.aG_;
   Component.prototype.aG_ = function (customEvents, scopeId) {
     for (const customEvent of customEvents) {
@@ -44,7 +64,7 @@ exports.p = function (domCompat) {
       );
     }
 
-    this.br_(customEvents, scopeId);
+    this.bt_(customEvents, scopeId);
   };
 
   const defDeserialize = ComponentDef._F_;
@@ -64,7 +84,7 @@ exports.p = function (domCompat) {
 
       out.bf("1", component, !newNode);
       if (newNode) {
-        out.node({ bs_: () => newNode });
+        out.node({ bu_: () => newNode });
       }
       out.ef();
     },
@@ -140,8 +160,8 @@ exports.p = function (domCompat) {
       // An inert/server only class child has no client instance in
       // ___componentLookup; once it has been re-rendered once it is tracked on
       // the scope instead.
-      const component = scope.bt_ =
-      _n_[scope.m5c] || scope.bt_;
+      const component = scope.bs_ =
+      _n_[scope.m5c] || scope.bs_;
       if (component) {
         rootNode = component._G_;
       } else {
@@ -158,7 +178,7 @@ exports.p = function (domCompat) {
       host = rootNode.startNode;
       domCompat.setScopeNodes(host, rootNode.startNode, rootNode.endNode);
     }
-    const existingComponent = scope.bt_;
+    const existingComponent = scope.bs_;
     const componentsContext = T_(out);
     const globalComponentsContext = componentsContext.p_;
     let customEvents;
@@ -198,7 +218,7 @@ exports.p = function (domCompat) {
       component._G_ = rootNode;
       component.P_ = normalizedInput;
       component.X_ = customEvents;
-      scope.bt_ = component;
+      scope.bs_ = component;
     });
   }
 

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

@@ -129,13 +129,16 @@ exports.p = function (htmlCompat) {
       const tagsRenderer = _.r;
       const willRerender = componentDef._wrr || htmlCompat.isInResumedBranch();
       out.bf("1", component, willRerender);
+      // A split parent won't re-feed the child a live handler at hydration, so
+      // register the child scope to let the resolver revive a bridged marker.
       htmlCompat.render(
         tagsRenderer,
         willRerender,
         out,
         component,
         input,
-        writers.tagsAPI
+        writers.tagsAPI,
+        !willRerender && hasBridgedClassEvent(input)
       );
       out.ef();
     },
@@ -240,6 +243,21 @@ exports.p = function (htmlCompat) {
   };
 };
 
+function hasBridgedClassEvent(input) {
+  if (input && typeof input === "object" && !Array.isArray(input)) {
+    for (const key in input) {
+      const value = input[key];
+      if (
+      Array.isArray(value) &&
+      value[0] === dynamicTag5.br_)
+      {
+        return true;
+      }
+    }
+  }
+  return false;
+}
+
 function concatScripts(a, b) {
   return a ? b ? a + ";" + b : a : b;
 }

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.bu_;
+var escapeXmlString = escapeXmlHelper.bv_;
 var missingSetTimeout = typeof setTimeout !== "function";
 
 function noop() {}
@@ -105,7 +105,7 @@ function AsyncStream(global, writer, parentOut) {
   this.ac_ = null;
   this.ad_ = null;
   this.bf_ = null;
-  this.bv_ = false;
+  this.bw_ = false;
 }
 
 AsyncStream.DEFAULT_TIMEOUT = 10000;
@@ -126,11 +126,11 @@ AsyncStream.enableAsyncStackTrace = function () {
 var proto = AsyncStream.prototype = {
   constructor: AsyncStream,
   C_: typeof document === "object" && document,
-  bw_: true,
+  bx_: true,
 
   [Symbol.asyncIterator]() {
-    if (this.bx_) {
-      return this.bx_;
+    if (this.by_) {
+      return this.by_;
     }
 
     const originalWriter = this._state.writer;
@@ -222,7 +222,7 @@ var proto = AsyncStream.prototype = {
       };
     }
 
-    return this.bx_ = {
+    return this.by_ = {
       next: iteratorNextFn,
       return: iteratorReturnFn,
       throw: iteratorReturnFn,
@@ -345,7 +345,7 @@ var proto = AsyncStream.prototype = {
           }
 
           this._lastCount++;
-          newStream.bv_ = true;
+          newStream.bw_ = true;
         }
 
         name = options.name;
@@ -465,7 +465,7 @@ var proto = AsyncStream.prototype = {
         parentOut._handleChildDone(this);
       }
     } else {
-      if (childOut.bv_) {
+      if (childOut.bw_) {
         this._lastCount--;
       }
 

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

@@ -1,7 +1,7 @@
 "use strict";
 var attrHelper = require("./attr");
-var notEmptyAttr = attrHelper.by_;
-var isEmptyAttrValue = attrHelper.bz_;
+var notEmptyAttr = attrHelper.bz_;
+var isEmptyAttrValue = attrHelper.bA_;
 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.by_ = nonVoidAttr;
-attr.bz_ = isVoid;
+attr.bz_ = nonVoidAttr;
+attr.bA_ = 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.bu_ = escape;
+exports.bv_ = escape;

package/dist/runtime/renderable.js

@@ -160,7 +160,7 @@ module.exports = function (target, renderer) {
         finalData = {};
       }
 
-      if (out && out.bw_) {
+      if (out && out.bx_) {
         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.bA_;
-var VComment = vdom.bB_;
-var VDocumentFragment = vdom.bC_;
-var VText = vdom.bD_;
-var VComponent = vdom.bE_;
-var VFragment = vdom.bF_;
-var virtualizeHTML = vdom.bG_;
+var VElement = vdom.bB_;
+var VComment = vdom.bC_;
+var VDocumentFragment = vdom.bD_;
+var VText = vdom.bE_;
+var VComponent = vdom.bF_;
+var VFragment = vdom.bG_;
+var virtualizeHTML = vdom.bH_;
 
 var EVENT_UPDATE = "update";
 var EVENT_FINISH = "finish";
 
 function State(tree) {
-  this.bH_ = new EventEmitter();
-  this.bI_ = tree;
-  this.bJ_ = false;
+  this.bI_ = new EventEmitter();
+  this.bJ_ = tree;
+  this.bK_ = false;
 }
 
 function AsyncVDOMBuilder(globalData, parentNode, parentOut) {
@@ -33,18 +33,18 @@ function AsyncVDOMBuilder(globalData, parentNode, parentOut) {
     state = new State(parentNode);
   }
 
-  this.bK_ = 1;
-  this.bL_ = 0;
-  this.bM_ = null;
-  this.bN_ = parentOut;
+  this.bL_ = 1;
+  this.bM_ = 0;
+  this.bN_ = null;
+  this.bO_ = parentOut;
 
   this.data = {};
   this.A_ = state;
   this.ae_ = parentNode;
   this.global = globalData || {};
-  this.bO_ = [parentNode];
-  this.bP_ = false;
-  this.bQ_ = undefined;
+  this.bP_ = [parentNode];
+  this.bQ_ = false;
+  this.bR_ = undefined;
   this.b_ = null;
 
   this.ac_ = null;
@@ -53,23 +53,23 @@ function AsyncVDOMBuilder(globalData, parentNode, parentOut) {
 }
 
 var proto = AsyncVDOMBuilder.prototype = {
-  bw_: true,
+  bx_: true,
   C_: typeof document === "object" && document,
 
   bc: function (component, key, ownerComponent) {
     var vComponent = new VComponent(component, key, ownerComponent);
-    return this.bR_(vComponent, 0, true);
+    return this.bS_(vComponent, 0, true);
   },
 
   bg_: function (component, key, ownerComponent) {
     var vComponent = new VComponent(component, key, ownerComponent, true);
-    this.bR_(vComponent, 0);
+    this.bS_(vComponent, 0);
   },
 
-  bR_: function (child, childCount, pushToStack) {
-    this.ae_.bS_(child);
+  bS_: function (child, childCount, pushToStack) {
+    this.ae_.bT_(child);
     if (pushToStack === true) {
-      this.bO_.push(child);
+      this.bP_.push(child);
       this.ae_ = child;
     }
     return childCount === 0 ? this : child;
@@ -85,7 +85,7 @@ var proto = AsyncVDOMBuilder.prototype = {
       flags,
       props
     );
-    return this.bR_(element, childCount);
+    return this.bS_(element, childCount);
   },
 
   bp_: 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.bT_();
+    var clone = node.bU_();
     this.node(clone);
     clone._P_ = component;
 
@@ -111,7 +111,7 @@ var proto = AsyncVDOMBuilder.prototype = {
   },
 
   node: function (node) {
-    this.ae_.bS_(node);
+    this.ae_.bT_(node);
     return this;
   },
 
@@ -130,7 +130,7 @@ var proto = AsyncVDOMBuilder.prototype = {
       text = text.toString();
     }
 
-    this.ae_.bS_(new VText(text, ownerComponent));
+    this.ae_.bT_(new VText(text, ownerComponent));
     return this;
   },
 
@@ -165,7 +165,7 @@ var proto = AsyncVDOMBuilder.prototype = {
       flags,
       props
     );
-    this.bR_(element, childCount, true);
+    this.bS_(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.bR_(fragment, null, true);
+    this.bS_(fragment, null, true);
     return this;
   },
 
@@ -192,7 +192,7 @@ var proto = AsyncVDOMBuilder.prototype = {
   },
 
   endElement: function () {
-    var stack = this.bO_;
+    var stack = this.bP_;
     stack.pop();
     this.ae_ = stack[stack.length - 1];
   },
@@ -200,44 +200,44 @@ var proto = AsyncVDOMBuilder.prototype = {
   end: function () {
     this.ae_ = undefined;
 
-    var remaining = --this.bK_;
-    var parentOut = this.bN_;
+    var remaining = --this.bL_;
+    var parentOut = this.bO_;
 
     if (remaining === 0) {
       if (parentOut) {
-        parentOut.bU_();
+        parentOut.bV_();
       } else {
-        this.bV_();
+        this.bW_();
       }
-    } else if (remaining - this.bL_ === 0) {
-      this.bW_();
+    } else if (remaining - this.bM_ === 0) {
+      this.bX_();
     }
 
     return this;
   },
 
-  bU_: function () {
-    var remaining = --this.bK_;
+  bV_: function () {
+    var remaining = --this.bL_;
 
     if (remaining === 0) {
-      var parentOut = this.bN_;
+      var parentOut = this.bO_;
       if (parentOut) {
-        parentOut.bU_();
+        parentOut.bV_();
       } else {
-        this.bV_();
+        this.bW_();
       }
-    } else if (remaining - this.bL_ === 0) {
-      this.bW_();
+    } else if (remaining - this.bM_ === 0) {
+      this.bX_();
     }
   },
 
-  bV_: function () {
+  bW_: function () {
     var state = this.A_;
-    state.bJ_ = true;
-    state.bH_.emit(EVENT_FINISH, this.n_());
+    state.bK_ = true;
+    state.bI_.emit(EVENT_FINISH, this.n_());
   },
 
-  bW_: function () {
+  bX_: function () {
     var lastArray = this._last;
 
     var i = 0;
@@ -272,7 +272,7 @@ var proto = AsyncVDOMBuilder.prototype = {
   },
 
   beginAsync: function (options) {
-    if (this.bP_) {
+    if (this.bQ_) {
       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.bL_++;
+        this.bM_++;
       }
     }
 
-    this.bK_++;
+    this.bL_++;
 
-    var documentFragment = this.ae_.bX_();
+    var documentFragment = this.ae_.bY_();
     var asyncOut = new AsyncVDOMBuilder(this.global, documentFragment, this);
 
-    state.bH_.emit("beginAsync", {
+    state.bI_.emit("beginAsync", {
       out: asyncOut,
       parentOut: this
     });
@@ -304,7 +304,7 @@ var proto = AsyncVDOMBuilder.prototype = {
   },
 
   flush: function () {
-    var events = this.A_.bH_;
+    var events = this.A_.bI_;
 
     if (events.listenerCount(EVENT_UPDATE)) {
       events.emit(EVENT_UPDATE, new RenderResult(this));
@@ -312,22 +312,22 @@ var proto = AsyncVDOMBuilder.prototype = {
   },
 
   ak_: function () {
-    return this.A_.bI_;
+    return this.A_.bJ_;
   },
 
   n_: function () {
-    return this.bY_ || (this.bY_ = new RenderResult(this));
+    return this.bZ_ || (this.bZ_ = new RenderResult(this));
   },
 
   on: function (event, callback) {
     var state = this.A_;
 
-    if (event === EVENT_FINISH && state.bJ_) {
+    if (event === EVENT_FINISH && state.bK_) {
       callback(this.n_());
     } else if (event === "last") {
       this.onLast(callback);
     } else {
-      state.bH_.on(event, callback);
+      state.bI_.on(event, callback);
     }
 
     return this;
@@ -336,19 +336,19 @@ var proto = AsyncVDOMBuilder.prototype = {
   once: function (event, callback) {
     var state = this.A_;
 
-    if (event === EVENT_FINISH && state.bJ_) {
+    if (event === EVENT_FINISH && state.bK_) {
       callback(this.n_());
     } else if (event === "last") {
       this.onLast(callback);
     } else {
-      state.bH_.once(event, callback);
+      state.bI_.once(event, callback);
     }
 
     return this;
   },
 
   emit: function (type, arg) {
-    var events = this.A_.bH_;
+    var events = this.A_.bI_;
     switch (arguments.length) {
       case 1:
         events.emit(type);
@@ -364,17 +364,17 @@ var proto = AsyncVDOMBuilder.prototype = {
   },
 
   removeListener: function () {
-    var events = this.A_.bH_;
+    var events = this.A_.bI_;
     events.removeListener.apply(events, arguments);
     return this;
   },
 
   sync: function () {
-    this.bP_ = true;
+    this.bQ_ = true;
   },
 
   isSync: function () {
-    return this.bP_;
+    return this.bQ_;
   },
 
   onLast: function (callback) {
@@ -390,12 +390,12 @@ var proto = AsyncVDOMBuilder.prototype = {
   },
 
   aj_: function (host) {
-    var node = this.bQ_;
+    var node = this.bR_;
     if (!node) {
       var vdomTree = this.ak_();
 
       if (!host) host = this.C_;
-      this.bQ_ = node = vdomTree.bs_(host, null);
+      this.bR_ = node = vdomTree.bu_(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.bZ_(-1 /* no children */, ownerComponent);
-  this.c__ = value;
+  this.c__(-1 /* no children */, ownerComponent);
+  this.ca_ = value;
 }
 
 VComment.prototype = {
-  ca_: 8,
+  cb_: 8,
 
-  bs_: function (host) {
-    var nodeValue = this.c__;
+  bu_: function (host) {
+    var nodeValue = this.ca_;
     return (host.ownerDocument || host).createComment(nodeValue);
   },
 
-  bT_: function () {
-    return new VComment(this.c__);
+  bU_: function () {
+    return new VComment(this.ca_);
   }
 };
 

package/dist/runtime/vdom/VComponent.js

@@ -2,14 +2,14 @@
 var VNode = require("./VNode");
 
 function VComponent(component, key, ownerComponent, preserve) {
-  this.bZ_(null /* childCount */, ownerComponent);
-  this.cb_ = key;
+  this.c__(null /* childCount */, ownerComponent);
+  this.cc_ = key;
   this.s_ = component;
   this.ag_ = preserve;
 }
 
 VComponent.prototype = {
-  ca_: 2
+  cb_: 2
 };
 
 inherit(VComponent, VNode);