marko 5.37.47 → 5.37.49

package/dist/runtime/helpers/_change-case.js

@@ -6,7 +6,7 @@ var dashToCamelLookup = Object.create(null);
 /**
  * Helper for converting camelCase to dash-case.
  */
-exports.bi_ = function camelToDashCase(name) {
+exports.bj_ = function camelToDashCase(name) {
   var nameDashed = camelToDashLookup[name];
   if (!nameDashed) {
     nameDashed = camelToDashLookup[name] = name.
@@ -24,7 +24,7 @@ exports.bi_ = function camelToDashCase(name) {
 /**
  * Helper for converting dash-case to camelCase.
  */
-exports.bj_ = function dashToCamelCase(name) {
+exports.bk_ = function dashToCamelCase(name) {
   var nameCamel = dashToCamelLookup[name];
   if (!nameCamel) {
     nameCamel = dashToCamelLookup[name] = name.replace(

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

@@ -5,7 +5,7 @@
 var ComponentDef = require("../components/ComponentDef");
 var ComponentsContext = require("../components/ComponentsContext");
 var serializeNOOP = require("../helpers/serialize-noop");
-var w10NOOP = serializeNOOP.aJ_;
+var w10NOOP = serializeNOOP.aK_;
 var w10ToJSON = serializeNOOP.V_;
 var changeCase = require("./_change-case");
 var getComponentsContext = ComponentsContext.S_;
@@ -37,7 +37,7 @@ customEvents)
     var component = componentDef && componentDef.s_;
     if (typeof tag === "string") {
       if (renderBody) {
-        out.bk_(
+        out.bl_(
           tag,
           attrs,
           key,
@@ -45,9 +45,9 @@ customEvents)
           addEvents(componentDef, customEvents, props)
         );
         renderBody(out);
-        out.bl_();
+        out.bm_();
       } else {
-        out.bm_(
+        out.bn_(
           tag,
           attrs,
           key,
@@ -79,8 +79,8 @@ customEvents)
 
 
 
-      if (dynamicTag.bn_) {
-        renderer = dynamicTag.bn_(
+      if (dynamicTag.bo_) {
+        renderer = dynamicTag.bo_(
           renderer,
           render,
           args,
@@ -91,7 +91,7 @@ customEvents)
       if (renderer) {
         out.c(componentDef, key, customEvents);
         renderer(attrs, out);
-        out.a__ = null;
+        out.aa_ = null;
       } else {
         var isFn = typeof render === "function";
 
@@ -115,7 +115,7 @@ customEvents)
             var globalContext = componentsContext.p_;
             componentsContext.o_ = new ComponentDef(
               component,
-              parentComponentDef.id + "-" + parentComponentDef.aN_(key),
+              parentComponentDef.id + "-" + parentComponentDef.aO_(key),
               globalContext
             );
             render.toJSON = w10ToJSON;
@@ -151,7 +151,7 @@ function attrsToCamelCase(attrs) {
   var result = {};
 
   for (var key in attrs) {
-    result[changeCase.bj_(key)] = attrs[key];
+    result[changeCase.bk_(key)] = attrs[key];
   }
 
   return result;

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

@@ -16,5 +16,5 @@ customEvents)
     input,
     out
   );
-  out.a__ = null;
+  out.aa_ = null;
 };

package/dist/runtime/helpers/serialize-noop.js

@@ -1,5 +1,5 @@
 "use strict";var w10NOOP = require("warp10/constants").NOOP;
-exports.aJ_ = w10NOOP;
+exports.aK_ = w10NOOP;
 exports.V_ = function () {
   return w10NOOP;
 };

package/dist/runtime/helpers/style-value.js

@@ -32,7 +32,7 @@ module.exports = function styleHelper(style) {
             value += "px";
           }
 
-          styles += sep + changeCase.bi_(name) + ":" + value;
+          styles += sep + changeCase.bj_(name) + ":" + value;
           sep = ";";
         }
       }

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

@@ -1,4 +1,4 @@
-"use strict";const { _l_ } = require("@internal/components-util");
+"use strict";const { _m_ } = require("@internal/components-util");
 const {
   S_
 } = require("../../components/ComponentsContext");
@@ -7,13 +7,13 @@ const { r: registerComponent } = require("../../components/registry");
 const createRenderer = require("../../components/renderer");
 const defaultCreateOut = require("../../createOut");
 const morphdom = require("../../vdom/morphdom");
-const { _k_ } = require("../../vdom/morphdom/fragment");
+const { _l_ } = require("../../vdom/morphdom/fragment");
 const dynamicTag = require("../dynamic-tag");
 const Component = require("../../components/Component");
-const noopRenderer = require("../serialize-noop").aJ_;
+const noopRenderer = require("../serialize-noop").aK_;
 
 exports.p = function (domCompat) {
-  dynamicTag.bn_ = function tagsToVdom(
+  dynamicTag.bo_ = function tagsToVdom(
   renderer,
   renderBody,
   args,
@@ -33,17 +33,17 @@ exports.p = function (domCompat) {
     return renderer;
   };
 
-  Component.prototype.bo_ =
-  Component.prototype.aD_;
-  Component.prototype.aD_ = function (customEvents, scopeId) {
+  Component.prototype.bp_ =
+  Component.prototype.aE_;
+  Component.prototype.aE_ = function (customEvents, scopeId) {
     for (const customEvent of customEvents) {
       customEvent[1] = domCompat.resolveRegistered(
         customEvent[1],
-        this.ak_
+        this.al_
       );
     }
 
-    this.bo_(customEvents, scopeId);
+    this.bp_(customEvents, scopeId);
   };
 
   const TagsCompatId = "tags-compat";
@@ -53,9 +53,9 @@ exports.p = function (domCompat) {
       const tagsRenderer = domCompat.resolveRegistered(_.r, global);
       const newNode = domCompat.render(out, component, tagsRenderer, input);
 
-      out.bf(out.aa_, component, !newNode);
+      out.bf("1", component, !newNode);
       if (newNode) {
-        out.node({ bp_: () => newNode });
+        out.node({ bq_: () => newNode });
       }
       out.ef();
     },
@@ -111,7 +111,7 @@ exports.p = function (domCompat) {
           newRenderer = domCompat.createRenderer(
             (scope, input) =>
             renderAndMorph(scope, rendererFromAnywhere, renderer, input),
-            () => _k_()
+            () => _l_()
           );
           rendererCache.set(renderer, newRenderer);
         }
@@ -124,22 +124,22 @@ exports.p = function (domCompat) {
   domCompat.init(noopRenderer);
 
   function renderAndMorph(scope, renderer, renderBody, input) {
-    const out = defaultCreateOut();
+    const out = defaultCreateOut(scope.$global);
     let host = domCompat.getStartNode(scope);
     let rootNode = host.fragment;
     if (!rootNode) {
-      const component = scope.bq_ =
-      _l_[scope.m5c];
-      rootNode = component._E_;
+      const component = scope.br_ =
+      _m_[scope.m5c];
+      rootNode = component._F_;
       host = rootNode.startNode;
-      domCompat.setScopeNodes(host, rootNode.endNode);
+      domCompat.setScopeNodes(host, rootNode.startNode, rootNode.endNode);
     }
-    const existingComponent = scope.bq_;
+    const existingComponent = scope.br_;
     const componentsContext = S_(out);
     const globalComponentsContext = componentsContext.p_;
     let customEvents;
     let normalizedInput;
-    globalComponentsContext.az_ = existingComponent;
+    globalComponentsContext.aA_ = existingComponent;
     out.sync();
     if (renderer) {
       const [rawInput] = input;
@@ -165,16 +165,16 @@ exports.p = function (domCompat) {
     }
 
     domCompat.queueEffect(scope, () => {
-      const targetNode = out.ah_().aA_;
+      const targetNode = out.ai_().aB_;
       morphdom(rootNode, targetNode, host, componentsContext);
-      const componentDefs = componentsContext.af_(
+      const componentDefs = componentsContext.ag_(
         getRootNode(host)
       );
       const component = componentDefs[0].s_;
-      component._E_ = rootNode;
+      component._F_ = rootNode;
       component.O_ = normalizedInput;
       component.W_ = customEvents;
-      scope.bq_ = component;
+      scope.br_ = component;
     });
   }
 

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

@@ -1,4 +1,7 @@
-"use strict";const initComponentsTag = require("../../../core-tags/components/init-components-tag");
+"use strict";const {
+  _g_,
+  __
+} = require("@internal/components-entry");
 const {
   S_
 } = require("../../components/ComponentsContext");
@@ -7,17 +10,58 @@ const defaultCreateOut = require("../../createOut");
 const dynamicTag5 = require("../dynamic-tag");
 
 exports.p = function (htmlCompat) {
+  const writersByGlobal = new WeakMap();
   const isMarko6 = (fn) => htmlCompat.isTagsAPI(fn);
   const isMarko5 = (fn) => !isMarko6(fn);
-  const writeHTML = (result) => {
-    const state = result.out._state;
-    const writer = state.writer;
-    state.events.emit("c_", writer);
-    htmlCompat.writeScript(writer._scripts);
+  const writeClassAPIResultToTagsAPI = (result) => {
+    const { writer } = result.out._state;
     htmlCompat.write(writer._content);
+    htmlCompat.writeScript(writer._script);
+    writer._content = writer._scripts = "";
   };
+  const flushScripts = ($global, flushDefs) => {
+    const writers = writersByGlobal.get($global);
+    if (!writers) return "";
 
-  dynamicTag5.bn_ = function tagsToVdom(
+    const { classAPI, tagsAPI } = writers;
+    let scripts = "";
+    let componentDefs = flushDefs;
+
+    if (classAPI.length) {
+      componentDefs = flushDefs ? flushDefs.concat(classAPI) : classAPI;
+      writers.classAPI = [];
+    }
+
+    if (componentDefs) {
+      scripts = _g_($global, componentDefs);
+    }
+
+    if (tagsAPI.length) {
+      const [chunk] = tagsAPI;
+      for (let i = 1; i < tagsAPI.length; i++) {
+        chunk.append(tagsAPI[i]);
+      }
+
+      if (!chunk.boundary.done) {
+        throw new Error(
+          "Cannot serialize promise across tags/class compat layer."
+        );
+      }
+
+      scripts = concatScripts(chunk.flushScript().scripts, scripts);
+      writers.tagsAPI = [];
+    }
+
+    return scripts;
+  };
+
+  htmlCompat.onFlush((chunk) => {
+    chunk.render(() => {
+      chunk.writeScript(flushScripts(chunk.boundary.state.$global));
+    });
+  });
+
+  dynamicTag5.bo_ = function tagsToVdom(
   tagsRenderer,
   renderBody,
   args)
@@ -42,11 +86,33 @@ exports.p = function (htmlCompat) {
   const TagsCompatId = "tags-compat";
   const TagsCompat = createRenderer(
     function (_, out, componentDef, component) {
+      // class to tags
+      const $global = out.global;
+      let writers = writersByGlobal.get($global);
+      if (!writers) {
+        writersByGlobal.set($global, writers = { classAPI: [], tagsAPI: [] });
+        out.prependListener("c_", (writer) => {
+          const defs = writer._data?.componentDefs;
+          const scripts = flushScripts($global, defs);
+          if (scripts) {
+            if (defs) writer._data.componentDefs = undefined;
+            writer.script(scripts);
+          }
+        });
+      }
+
       const input = _.i;
       const tagsRenderer = _.r;
-      const willRerender = componentDef._wrr;
-      out.bf(out.aa_, component, willRerender);
-      htmlCompat.render(tagsRenderer, willRerender, out, component, input);
+      const willRerender = componentDef._wrr || htmlCompat.isInResumedBranch();
+      out.bf("1", component, willRerender);
+      htmlCompat.render(
+        tagsRenderer,
+        willRerender,
+        out,
+        component,
+        input,
+        writers.tagsAPI
+      );
       out.ef();
     },
     // eslint-disable-next-line no-constant-condition
@@ -64,8 +130,9 @@ exports.p = function (htmlCompat) {
   );
 
   htmlCompat.patchDynamicTag(function getRenderer(scopeId, accessor, tag) {
-    const renderer = tag._ || tag.renderBody || tag;
-    if (isMarko6(renderer)) return renderer;
+    if (!tag || isMarko6(tag._ || tag.content || tag)) {
+      return tag;
+    }
 
     const renderer5 =
     tag._ ||
@@ -78,16 +145,24 @@ exports.p = function (htmlCompat) {
       htmlCompat.registerRenderBody(renderBody5);
     }
     return (input, ...args) => {
-      const out = defaultCreateOut(htmlCompat.$global());
-      const branchId = htmlCompat.peekNextScopeId();
+      // tags to class
+      const $global = htmlCompat.$global();
+      htmlCompat.ensureState($global);
+      let writers = writersByGlobal.get($global);
+      if (!writers) {
+        writersByGlobal.set($global, writers = { classAPI: [], tagsAPI: [] });
+      }
+
+      const out = defaultCreateOut($global);
+      const branchId = htmlCompat.nextScopeId();
       let customEvents;
-      htmlCompat.nextScopeId();
 
       if (renderer5) {
-        const normalizedInput = {};
+        const originalInput = input;
+        input = {};
 
-        for (const key in input) {
-          const value = input[key];
+        for (const key in originalInput) {
+          const value = originalInput[key];
           if (/^on[-A-Z]/.test(key)) {
             if (typeof value === "function") {
               (customEvents || (customEvents = [])).push([
@@ -97,28 +172,37 @@ exports.p = function (htmlCompat) {
               value.toJSON = htmlCompat.toJSON;
             }
           } else {
-            normalizedInput[key === "content" ? "renderBody" : key] = value;
+            input[key === "content" ? "renderBody" : key] = value;
           }
         }
-        renderer5(normalizedInput, out);
+      }
+
+      if (renderer5) {
+        renderer5(input, out);
       } else {
         renderBody5(out, input, ...args);
       }
 
       const componentsContext = S_(out);
-      const component = componentsContext.b_[0];
-      if (component) {
-        component.s_.W_ = customEvents;
-        htmlCompat.writeSetScopeForComponent(branchId, component.id);
+      const componentDef = componentsContext.b_[0];
+      if (componentDef) {
+        componentDef.s_.W_ = customEvents;
+        componentDef._wrr = true;
+        componentDef.u_ |= 1; // FLAG_WILL_RERENDER_IN_BROWSER
+        htmlCompat.writeSetScopeForComponent(branchId, componentDef.id);
       }
 
-      initComponentsTag({}, out);
-
       let async;
       out.once("finish", (result) => {
+        if (result.out.b_) {
+          __(
+            result.out.b_,
+            writers.classAPI
+          );
+        }
         if (!async) {
           async = false;
-          writeHTML(result);
+          writeClassAPIResultToTagsAPI(result);
         }
       });
 
@@ -126,10 +210,14 @@ exports.p = function (htmlCompat) {
 
       if (async !== false) {
         async = true;
-        htmlCompat.fork(scopeId, accessor, out, writeHTML);
+        htmlCompat.fork(scopeId, accessor, out, writeClassAPIResultToTagsAPI);
       }
     };
   });
 
   return htmlCompat.registerRenderer;
-};
+};
+
+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.br_;
+var escapeXmlString = escapeXmlHelper.bs_;
 var missingSetTimeout = typeof setTimeout !== "function";
 
 function noop() {}
@@ -102,10 +102,10 @@ function AsyncStream(global, writer, parentOut) {
 
   this.b_ = null; // ComponentsContext
 
-  this.a__ = null;
   this.aa_ = null;
-  this.bc_ = null;
-  this.bs_ = false;
+  this.ab_ = null;
+  this.bd_ = null;
+  this.bt_ = false;
 }
 
 AsyncStream.DEFAULT_TIMEOUT = 10000;
@@ -126,11 +126,11 @@ AsyncStream.enableAsyncStackTrace = function () {
 var proto = AsyncStream.prototype = {
   constructor: AsyncStream,
   B_: typeof document === "object" && document,
-  bt_: true,
+  bu_: true,
 
   [Symbol.asyncIterator]() {
-    if (this.bu_) {
-      return this.bu_;
+    if (this.bv_) {
+      return this.bv_;
     }
 
     const originalWriter = this._state.writer;
@@ -222,7 +222,7 @@ var proto = AsyncStream.prototype = {
       };
     }
 
-    return this.bu_ = {
+    return this.bv_ = {
       next: iteratorNextFn,
       return: iteratorReturnFn,
       throw: iteratorReturnFn,
@@ -279,7 +279,7 @@ var proto = AsyncStream.prototype = {
     return this;
   },
 
-  ah_: function () {
+  ai_: function () {
     return this._state.writer.toString();
   },
 
@@ -287,7 +287,7 @@ var proto = AsyncStream.prototype = {
    * Legacy...
    */
   getOutput: function () {
-    return this.ah_();
+    return this.ai_();
   },
 
   toString: function () {
@@ -345,7 +345,7 @@ var proto = AsyncStream.prototype = {
           }
 
           this._lastCount++;
-          newStream.bs_ = true;
+          newStream.bt_ = true;
         }
 
         name = options.name;
@@ -465,7 +465,7 @@ var proto = AsyncStream.prototype = {
         parentOut._handleChildDone(this);
       }
     } else {
-      if (childOut.bs_) {
+      if (childOut.bt_) {
         this._lastCount--;
       }
 
@@ -645,7 +645,7 @@ var proto = AsyncStream.prototype = {
     return newOut;
   },
 
-  bm_: function (
+  bn_: function (
   tagName,
   elementAttrs,
   key,
@@ -684,7 +684,7 @@ var proto = AsyncStream.prototype = {
     this.write(str);
   },
 
-  bk_: function (
+  bl_: function (
   name,
   elementAttrs,
   key,
@@ -750,13 +750,13 @@ var proto = AsyncStream.prototype = {
     }
   },
 
-  ag_: function (host) {
+  ah_: function (host) {
     var node = this._node;
 
     if (!node) {
       var nextEl;
       var fragment;
-      var html = this.ah_();
+      var html = this.ai_();
       if (!host) host = this.B_;
       var doc = host.ownerDocument || host;
 
@@ -802,15 +802,15 @@ var proto = AsyncStream.prototype = {
   },
 
   c: function (componentDef, key, customEvents) {
-    this.a__ = componentDef;
-    this.aa_ = key;
-    this.bc_ = customEvents;
+    this.aa_ = componentDef;
+    this.ab_ = key;
+    this.bd_ = customEvents;
   }
 };
 
 // alias:
 proto.w = proto.write;
-proto.bl_ = proto.endElement;
+proto.bm_ = proto.endElement;
 
 module.exports = AsyncStream;
 

package/dist/runtime/html/BufferedWriter.js

@@ -1,8 +1,8 @@
 "use strict";
 
 const immediate = require("@internal/set-immediate");
-const setImmediate = immediate._j_;
-const clearImmediate = immediate.ae_;
+const setImmediate = immediate._k_;
+const clearImmediate = immediate.af_;
 const StringWriter = require("./StringWriter");
 
 /**

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

@@ -1,7 +1,7 @@
 "use strict";
 var attrHelper = require("./attr");
-var notEmptyAttr = attrHelper.bv_;
-var isEmptyAttrValue = attrHelper.bw_;
+var notEmptyAttr = attrHelper.bw_;
+var isEmptyAttrValue = attrHelper.bx_;
 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.bv_ = nonVoidAttr;
-attr.bw_ = isVoid;
+attr.bw_ = nonVoidAttr;
+attr.bx_ = isVoid;
 attr.a = attrAssignment;
 attr.d = escapeDoubleQuotedAttrValue;
 attr.s = escapeSingleQuotedAttrValue;

package/dist/runtime/html/helpers/data-marko.js

@@ -26,7 +26,7 @@ module.exports = function dataMarko(out, componentDef, props, key) {
       result +=
       ' data-marko-key="' +
       escapeDoubleQuotes(
-        componentDef.aN_(key) + " " + componentDef.id
+        componentDef.aO_(key) + " " + componentDef.id
       ) +
       '"';
     }

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

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

package/dist/runtime/html/index.js

@@ -19,7 +19,7 @@ function Template(typeName) {
 Template.prototype.stream = require("@internal/create-readable");
 
 var AsyncStream = require("./AsyncStream");
-require("../createOut").be_(
+require("../createOut").bf_(
   Template.prototype.createOut = function createOut(
   globalData,
   writer,

package/dist/runtime/renderable.js

@@ -1,7 +1,7 @@
 "use strict";
 
 var extend = require("raptor-util/extend");
-var setImmediate = require("@internal/set-immediate")._j_;
+var setImmediate = require("@internal/set-immediate")._k_;
 var defaultCreateOut = require("./createOut");
 
 function safeRender(renderFunc, finalData, finalOut, shouldEnd) {
@@ -148,7 +148,7 @@ module.exports = function (target, renderer) {
       var finalData;
       var globalData;
       var render = renderFunc || this._;
-      var shouldBuffer = this._V_;
+      var shouldBuffer = this._W_;
       var shouldEnd = true;
 
       if (data) {
@@ -160,7 +160,7 @@ module.exports = function (target, renderer) {
         finalData = {};
       }
 
-      if (out && out.bt_) {
+      if (out && out.bu_) {
         finalOut = out;
         shouldEnd = false;
         extend(out.global, globalData);