marko 5.35.21 → 5.35.22

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

@@ -52,24 +52,37 @@ module.exports = function (input, out) {
     function handleAwait(awaitInfo) {
       let flushedScript = false;
       let flushedContent = false;
-      let flushedPlaceholder = false;
-      awaitInfo.parent.on("c_", () => {
-        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.o_());
+          return;
         }
-      });
+      } else {
+        awaitInfo.parent.on("c_", () => {
+          flushedPlaceholder = true;
+          if (!flushedScript && flushedContent) {
+            flushedScript = true;
+            asyncOut.script(
+              `$${reorderFunctionId}(` + (
+              typeof awaitInfo.id === "number" ?
+              awaitInfo.id :
+              '"' + awaitInfo.id + '"') + (
+              awaitInfo.after ? ',"' + awaitInfo.after + '"' : "") +
+              ")"
+            );
+          }
+        });
+      }
+
       awaitInfo.out.
       on("c_", out.emit.bind(out, "c_")).
-      on("finish", function (result) {
+      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
@@ -126,10 +139,7 @@ module.exports = function (input, out) {
           asyncOut.end();
           next();
         }
-      }).
-      on("error", function (err) {
-        asyncOut.error(err);
-      });
+      }
     }
 
     awaitContext.instances.forEach(handleAwait);

package/dist/node_modules/@internal/components-beginComponent/index-browser.js

@@ -7,17 +7,17 @@ key,
 ownerComponentDef)
 {
   var componentId = component.id;
-  var componentDef = componentsContext.o_ = new ComponentDef(
+  var componentDef = componentsContext.p_ = new ComponentDef(
     component,
     componentId,
     componentsContext
   );
-  componentsContext.p_.q_[
+  componentsContext.q_.r_[
   componentId] =
   true;
   componentsContext.b_.push(componentDef);
 
-  var out = componentsContext.r_;
-  out.bc(component, key, ownerComponentDef && ownerComponentDef.s_);
+  var out = componentsContext.s_;
+  out.bc(component, key, ownerComponentDef && ownerComponentDef.t_);
   return componentDef;
 };

package/dist/node_modules/@internal/components-beginComponent/index.js

@@ -21,20 +21,20 @@ existingComponentDef)
   // widget.  It should be removed when the legacy compat layer is removed.
   var componentDef =
   existingComponentDef || (
-  componentsContext.o_ = new ComponentDef(
+  componentsContext.p_ = new ComponentDef(
     component,
     componentId,
     componentsContext
   ));
 
   var ownerIsRenderBoundary =
-  ownerComponentDef && ownerComponentDef.t_;
+  ownerComponentDef && ownerComponentDef.u_;
   var ownerWillRerender =
   ownerComponentDef &&
-  ownerComponentDef.u_ & FLAG_WILL_RERENDER_IN_BROWSER;
+  ownerComponentDef.v_ & FLAG_WILL_RERENDER_IN_BROWSER;
   // On the server
-  if (!componentsContext.v_ && ownerWillRerender) {
-    componentDef.u_ |= FLAG_WILL_RERENDER_IN_BROWSER;
+  if (!componentsContext.w_ && ownerWillRerender) {
+    componentDef.v_ |= FLAG_WILL_RERENDER_IN_BROWSER;
     componentDef._wrr = true;
     return componentDef;
   }
@@ -48,20 +48,20 @@ existingComponentDef)
 
   componentsContext.b_.push(componentDef);
 
-  let out = componentsContext.r_;
+  let out = componentsContext.s_;
   let runtimeId = out.global.runtimeId;
 
-  componentDef.t_ = true;
-  componentDef.w_ = componentsContext.v_;
+  componentDef.u_ = true;
+  componentDef.x_ = componentsContext.w_;
 
   if (isSplitComponent === false && out.global.noBrowserRerender !== true) {
-    componentDef.u_ |= FLAG_WILL_RERENDER_IN_BROWSER;
+    componentDef.v_ |= FLAG_WILL_RERENDER_IN_BROWSER;
     componentDef._wrr = true;
-    componentsContext.v_ = false;
+    componentsContext.w_ = false;
   }
 
   if (out.global.oldHydrateNoCreate === true) {
-    componentDef.u_ |= FLAG_OLD_HYDRATE_NO_CREATE;
+    componentDef.v_ |= FLAG_OLD_HYDRATE_NO_CREATE;
   }
 
   if ((ownerIsRenderBoundary || ownerWillRerender) && key != null) {

package/dist/node_modules/@internal/components-define-widget-legacy/index-browser.js

@@ -22,7 +22,7 @@ function noop() {}
 module.exports = function defineWidget(def, renderer) {
   def = def.Widget || def;
 
-  if (def.x_) {
+  if (def.y_) {
     return def;
   }
 
@@ -52,7 +52,7 @@ module.exports = function defineWidget(def, renderer) {
     BaseComponent.call(this, id, doc);
   }
 
-  if (!proto.x_) {
+  if (!proto.y_) {
     // Inherit from Component if they didn't already
     ComponentClass.prototype = Object.create(BaseComponent.prototype);
     for (var propName in proto) {
@@ -65,16 +65,16 @@ module.exports = function defineWidget(def, renderer) {
   // The same prototype will be used by our constructor after
   // we he have set up the prototype chain using the inherit function
   proto = Component.prototype = ComponentClass.prototype;
-  proto.y_ = true;
+  proto.z_ = true;
 
   proto.constructor = def.constructor = Component;
 
   Object.defineProperty(proto, "state", {
     get: function () {
-      var raw = this.z_ && this.z_.A_;
+      var raw = this.A_ && this.A_.B_;
 
       if (raw && !raw.toJSON) {
-        Object.defineProperty(this.z_.A_, "toJSON", stateToJSONDef);
+        Object.defineProperty(this.A_.B_, "toJSON", stateToJSONDef);
       }
 
       return raw;
@@ -104,7 +104,7 @@ module.exports = function defineWidget(def, renderer) {
 
 
 
-      return this.B_;
+      return this.C_;
     }
   });
 
@@ -122,37 +122,37 @@ module.exports = function defineWidget(def, renderer) {
 
 
 
-      return this.C_;
+      return this.D_;
     }
   });
 
   // get legacy methods
 
-  proto.D_ = proto.onRender;
+  proto.E_ = proto.onRender;
   Object.defineProperty(proto, "onRender", {
     get: noop,
     set: function (v) {
-      proto.D_ = v;
+      proto.E_ = v;
     }
   });
 
-  proto.E_ = proto.onUpdate;
+  proto.F_ = proto.onUpdate;
   Object.defineProperty(proto, "onUpdate", {
     get: function () {
       return modernMountOrUpdate;
     },
     set: function (v) {
-      proto.E_ = v;
+      proto.F_ = v;
     }
   });
 
-  proto.F_ = proto.onDestroy;
+  proto.G_ = proto.onDestroy;
   Object.defineProperty(proto, "onDestroy", {
     get: function () {
       return modernOnDestory;
     },
     set: function (v) {
-      proto.F_ = v;
+      proto.G_ = v;
     }
   });
 
@@ -161,13 +161,13 @@ module.exports = function defineWidget(def, renderer) {
   proto.onMount = modernMountOrUpdate;
 
   if (legacyInit) {
-    proto.G_ = legacyInit;
+    proto.H_ = legacyInit;
   }
 
   // convert legacy to modern
-  proto.H_ = proto.update;
+  proto.I_ = proto.update;
   proto.update = function () {
-    if (this.I_) {
+    if (this.J_) {
       // eslint-disable-next-line no-constant-condition
 
 
@@ -179,37 +179,37 @@ module.exports = function defineWidget(def, renderer) {
 
 
       this.destroy = modernOnDestory;
-      this.I_ = false;
+      this.J_ = false;
     }
-    this.J_ = true;
-    if (this.C_) {
+    this.K_ = true;
+    if (this.D_) {
       this.onBeforeUpdate && this.onBeforeUpdate();
     }
 
-    this.H_();
-    this.J_ = false;
+    this.I_();
+    this.K_ = false;
   };
 
   function modernMountOrUpdate() {
     // eslint-disable-next-line @typescript-eslint/no-this-alias
     var self = this;
-    var el = this.K_["@_wbind"];
-    var prevEl = this.C_;
+    var el = this.L_["@_wbind"];
+    var prevEl = this.D_;
 
     if (prevEl !== el) {
-      this.C_ = el;
+      this.D_ = el;
 
       if (prevEl) {
         this.onBeforeDestroy && this.onBeforeDestroy();
-        this.F_ && this.F_();
-        this.L_ = undefined;
+        this.G_ && this.G_();
+        this.M_ = undefined;
         this.removeAllListeners();
       }
 
       if (el) {
-        this.G_ && this.G_(this.widgetConfig || {});
-        this.D_ && this.D_({ firstRender: true });
-        this.L_ = legacyRender;
+        this.H_ && this.H_(this.widgetConfig || {});
+        this.E_ && this.E_({ firstRender: true });
+        this.M_ = legacyRender;
 
         // eslint-disable-next-line no-constant-condition
 
@@ -226,45 +226,45 @@ module.exports = function defineWidget(def, renderer) {
       }
     } else if (el) {
       if (prevEl) {
-        this.E_ && this.E_();
+        this.F_ && this.F_();
       }
 
-      if (this.M_) {
-        this.D_ &&
-        this.D_({ firstRender: false });
+      if (this.N_) {
+        this.E_ &&
+        this.E_({ firstRender: false });
       }
     }
 
-    this.N_ = this.O_;
-    this.O_ = null;
-    this.M_ = false;
+    this.O_ = this.P_;
+    this.P_ = null;
+    this.N_ = false;
   }
 
   function legacyRender() {
-    if (!this.J_) {
+    if (!this.K_) {
       this.onBeforeUpdate && this.onBeforeUpdate();
     }
 
-    this.M_ = true;
+    this.N_ = true;
   }
 
   function modernOnDestory() {
-    if (this.C_) {
+    if (this.D_) {
       this.onBeforeDestroy && this.onBeforeDestroy();
-      this.F_ && this.F_();
-      this.C_ = null;
+      this.G_ && this.G_();
+      this.D_ = null;
     }
   }
 
   // Set a flag on the constructor function to make it clear this is
   // a component so that we can short-circuit this work later
-  Component.x_ = true;
+  Component.y_ = true;
 
   function State() {
     BaseState.apply(this, arguments);
   }
   inherit(State, BaseState);
-  proto.P_ = State;
+  proto.Q_ = State;
 
   jQuery.patchComponent(
     window.$,
@@ -299,7 +299,7 @@ module.exports = function defineWidget(def, renderer) {
   if (renderer) {
     // Add the rendering related methods as statics on the
     // new component constructor function
-    Component.renderer = proto.Q_ = renderer;
+    Component.renderer = proto.R_ = renderer;
     Component.render = renderer.render;
     Component.renderSync = renderer.renderSync;
   }
@@ -322,7 +322,7 @@ module.exports = function defineWidget(def, renderer) {
       template = req(template);
     }
 
-    registry.r((template.default || template).R_, function () {
+    registry.r((template.default || template).S_, function () {
       return Component;
     });
   }

package/dist/node_modules/@internal/components-define-widget-legacy/index.js

@@ -1,11 +1,11 @@
 "use strict";module.exports = function defineWidget(def, renderer) {
-  if (def.x_) {
+  if (def.y_) {
     return def;
   }
 
   if (renderer) {
     return {
-      x_: true,
+      y_: true,
       _isWidget: true,
       renderer: renderer,
       render: renderer.render,
@@ -13,6 +13,6 @@
       template: renderer.template
     };
   } else {
-    return { x_: true, _isWidget: true };
+    return { y_: true, _isWidget: true };
   }
 };

package/dist/node_modules/@internal/components-endComponent/index.js

@@ -1,11 +1,11 @@
 "use strict";
 
 var ComponentsContext = require("../../../runtime/components/ComponentsContext");
-var getComponentsContext = ComponentsContext.S_;
+var getComponentsContext = ComponentsContext.T_;
 
 module.exports = function endComponent(out, componentDef) {
-  if (componentDef.t_) {
+  if (componentDef.u_) {
     out.w("<!--" + out.global.runtimeId + "/-->");
-    getComponentsContext(out).v_ = componentDef.w_;
+    getComponentsContext(out).w_ = componentDef.x_;
   }
 };

package/dist/node_modules/@internal/components-entry/index-browser.js

@@ -2,8 +2,8 @@
 var registry = require("@internal/components-registry");
 
 exports.getComponentForEl =
-require("@internal/components-util").T_;
-exports.init = registry.U_;
+require("@internal/components-util").U_;
+exports.init = registry.V_;
 exports.register = function (id, component) {
   registry.r(id, function () {
     return component;

package/dist/node_modules/@internal/components-entry/index.js

@@ -2,7 +2,7 @@
 require("../../../runtime/html/marko-namespace");
 
 var warp10 = require("warp10");
-var w10ToJSON = require("../../../runtime/helpers/serialize-noop").V_;
+var w10ToJSON = require("../../../runtime/helpers/serialize-noop").W_;
 var safeJSONRegExp = /<\/|\u2028|\u2029/g;
 var IGNORE_GLOBAL_TYPES = new Set(["undefined", "function", "symbol"]);
 var DEFAULT_RUNTIME_ID = "M";
@@ -67,16 +67,16 @@ function addComponentsFromContext(componentsContext, componentsToHydrate) {
   for (var i = 0; i < len; i++) {
     var componentDef = components[i];
     var id = componentDef.id;
-    var component = componentDef.s_;
-    var flags = componentDef.u_;
-    var isLegacy = componentDef.y_;
+    var component = componentDef.t_;
+    var flags = componentDef.v_;
+    var isLegacy = componentDef.z_;
 
     var state = component.state;
     var input = component.input || 0;
     var typeName = component.typeName;
-    var customEvents = component.W_;
-    var scope = component.X_;
-    var bubblingDomEvents = component.Y_;
+    var customEvents = component.X_;
+    var scope = component.Y_;
+    var bubblingDomEvents = component.Z_;
 
     var needsState;
     var serializedProps;
@@ -84,7 +84,7 @@ function addComponentsFromContext(componentsContext, componentsToHydrate) {
 
     if (isLegacy) {
       flags |= FLAG_IS_LEGACY;
-      renderBody = component.Z_;
+      renderBody = component.___;
 
       if (component.widgetConfig && isNotEmpty(component.widgetConfig)) {
         serializedProps = component.widgetConfig;
@@ -96,16 +96,16 @@ function addComponentsFromContext(componentsContext, componentsToHydrate) {
       !(flags & FLAG_WILL_RERENDER_IN_BROWSER) ||
       flags & FLAG_OLD_HYDRATE_NO_CREATE)
       {
-        component.z_ = undefined; // We don't use `delete` to avoid V8 deoptimization
-        component.O_ = undefined; // We don't use `delete` to avoid V8 deoptimization
+        component.A_ = undefined; // We don't use `delete` to avoid V8 deoptimization
+        component.P_ = undefined; // We don't use `delete` to avoid V8 deoptimization
         component.typeName = undefined;
         component.id = undefined;
-        component.W_ = undefined;
         component.X_ = undefined;
         component.Y_ = undefined;
-        component.___ = undefined;
+        component.Z_ = undefined;
         component._a_ = undefined;
         component._b_ = undefined;
+        component._c_ = undefined;
 
         needsState = true;
 
@@ -145,7 +145,7 @@ function addComponentsFromContext(componentsContext, componentsToHydrate) {
 
     var extra = {
       b: bubblingDomEvents,
-      d: componentDef._c_,
+      d: componentDef._d_,
       e: customEvents,
       f: flags || undefined,
       p: customEvents && scope, // Only serialize scope if we need to attach custom events
@@ -174,7 +174,7 @@ function addComponentsFromContext(componentsContext, componentsToHydrate) {
   components.length = 0;
 
   // Also add any components from nested contexts
-  var nestedContexts = componentsContext._d_;
+  var nestedContexts = componentsContext._e_;
   if (nestedContexts !== undefined) {
     nestedContexts.forEach(function (nestedContext) {
       addComponentsFromContext(nestedContext, componentsToHydrate);
@@ -186,7 +186,7 @@ function getInitComponentsData(out, componentDefs) {
   const len = componentDefs.length;
   const $global = out.global;
   const isLast = $global.d_;
-  const didSerializeComponents = $global._e_;
+  const didSerializeComponents = $global._f_;
   const prefix = $global.componentIdPrefix || $global.widgetIdPrefix;
 
   if (len === 0) {
@@ -199,7 +199,7 @@ function getInitComponentsData(out, componentDefs) {
 
   const TYPE_INDEX = 1;
   const typesLookup =
-  $global._f_ || ($global._f_ = new Map());
+  $global._g_ || ($global._g_ = new Map());
   let newTypes;
 
   for (let i = 0; i < len; i++) {
@@ -224,7 +224,7 @@ function getInitComponentsData(out, componentDefs) {
   let serializedGlobals;
 
   if (!didSerializeComponents) {
-    $global._e_ = true;
+    $global._f_ = true;
     serializedGlobals = getSerializedGlobals($global);
   }
 

package/dist/node_modules/@internal/components-entry-legacy/index-browser.js

@@ -1,13 +1,13 @@
 "use strict";var Component = require("../../../runtime/components/Component");
 var req = require("@internal/require");
 var getComponentForEl =
-require("@internal/components-util").T_;
+require("@internal/components-util").U_;
 
 // eslint-disable-next-line no-constant-binary-expression
 
 
 // expose legacy
-require("@internal/components-registry")._g_ = exports;
+require("@internal/components-registry")._h_ = exports;
 exports.load = function (typeName) {
   return exports.defineWidget(req(typeName));
 };
@@ -35,14 +35,14 @@ exports.getWidgetForEl = exports.get = function (elOrId) {
   return getComponentForEl(el);
 };
 exports.initWidgets =
-require("@internal/components-registry").U_;
+require("@internal/components-registry").V_;
 
 // monkey patch Widget
 if (Widget) {
   var WidgetProto = Widget.prototype;
   WidgetProto.setProps = function (newInput) {
-    this._h_ = true;
-    this._i_(newInput);
+    this._i_ = true;
+    this._j_(newInput);
   };
   WidgetProto.rerender = function (newInput) {
     if (newInput) {
@@ -71,6 +71,6 @@ RenderResult.prototype.getWidgets = function () {
   return RenderResult.prototype.getComponents.
   apply(this, arguments).
   filter(function (component) {
-    return component.y_;
+    return component.z_;
   });
 };