marko 5.35.7 → 5.35.8

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

@@ -6,37 +6,28 @@ const createRenderer = require("../../components/renderer");
 const defaultCreateOut = require("../../createOut");
 const dynamicTag5 = require("../dynamic-tag");
 
-exports.p = function (tagsAPI) {
-  const {
-    patchDynamicTag,
-    createRenderFn,
-    fork,
-    write,
-    serializerRegister,
-    writeScope,
-    nextScopeId,
-    getRegistryInfo
-  } = tagsAPI;
-  const FN_TO_JSON = function () {
-    // TODO: this should instead return an object that contains getRegistryInfo
-    // then in the dom-compat, handle that object to lookup the function in the registry
-    // (we also need to do this for events)
-    return getRegistryInfo(this);
+exports.p = function (htmlCompat) {
+  const isMarko6 = (fn) => !!fn.bq_;
+  const isMarko5 = (fn) => !fn.bq_;
+  const writeHTML = (result) => {
+    const state = result.out._state;
+    const writer = state.writer;
+    state.events.emit("c_", writer);
+    htmlCompat.writeScript(writer._scripts);
+    htmlCompat.write(writer._content);
   };
 
-  const isMarko6 = (fn) => !!fn.bn_;
-  const isMarko5 = (fn) => !fn.bn_;
-
-  dynamicTag5.bl_ = function tagsToVdom(
+  dynamicTag5.bn_ = function tagsToVdom(
   tagsRenderer,
   renderBody,
   args)
   {
-    if (tagsRenderer ? isMarko5(tagsRenderer) : isMarko5(renderBody))
-    return tagsRenderer;
+    if (tagsRenderer ? isMarko5(tagsRenderer) : isMarko5(renderBody)) {
+      return tagsRenderer;
+    }
 
     if (!tagsRenderer && renderBody) {
-      renderBody.toJSON = FN_TO_JSON;
+      renderBody.toJSON = htmlCompat.toJSON;
     }
 
     return (input, out) =>
@@ -53,29 +44,9 @@ exports.p = function (tagsAPI) {
     function (_, out, componentDef, component) {
       const input = _.i;
       const tagsRenderer = _.r;
-      const renderFn = createRenderFn(tagsRenderer);
       const willRerender = componentDef._wrr;
-      const $global = out.global;
-      const streamData = $global.streamData = $global.streamData || {};
-
-      if (willRerender) {
-        $global.serializedGlobals = $global.serializedGlobals || {};
-        $global.serializedGlobals.componentIdToScopeId = true;
-        $global.componentIdToScopeId = $global.componentIdToScopeId || {};
-        $global.componentIdToScopeId[component.id] = streamData.scopeId || 0;
-      }
-
-      out.bf(out.a__, component, willRerender);
-      renderFn(
-        out.beginAsync(),
-        input,
-        {
-          ...$global,
-          componentIdToScopeId: undefined,
-          streamData: undefined
-        },
-        streamData
-      );
+      out.bf(out.aa_, component, willRerender);
+      htmlCompat.render(tagsRenderer, willRerender, out, component, input);
       out.ef();
     },
     // eslint-disable-next-line no-constant-condition
@@ -92,7 +63,7 @@ exports.p = function (tagsAPI) {
     {}
   );
 
-  patchDynamicTag(
+  htmlCompat.patchDynamicTag(
     function getRenderer(tag) {
       const renderer = tag._ || tag.renderBody || tag;
       if (isMarko6(renderer)) return renderer;
@@ -108,8 +79,6 @@ exports.p = function (tagsAPI) {
         const out = defaultCreateOut();
         let customEvents;
 
-        out.global.streamData = tagsAPI.getStreamData();
-
         if (renderer5) {
           const normalizedInput = {};
 
@@ -122,7 +91,7 @@ exports.p = function (tagsAPI) {
               (c === "-" ? "" : c.toLowerCase()) + key.slice(3),
               value]
               );
-              value.toJSON = FN_TO_JSON;
+              value.toJSON = htmlCompat.toJSON;
             } else {
               normalizedInput[key] = input[key];
             }
@@ -135,10 +104,8 @@ exports.p = function (tagsAPI) {
         const componentsContext = S_(out);
         const component = componentsContext.b_[0];
         if (component) {
-          component.s_.V_ = customEvents;
-          writeScope(nextScopeId(), {
-            m5c: component.id
-          });
+          component.s_.W_ = customEvents;
+          htmlCompat.writeSetScopeForComponent(component.id);
         }
 
         initComponentsTag({}, out);
@@ -147,7 +114,7 @@ exports.p = function (tagsAPI) {
         out.once("finish", (result) => {
           if (!async) {
             async = false;
-            write(result.toString());
+            writeHTML(result);
           }
         });
 
@@ -155,23 +122,15 @@ exports.p = function (tagsAPI) {
 
         if (async !== false) {
           async = true;
-          fork(out, (result) => {
-            write(result.toString());
-          });
+          htmlCompat.fork(out, writeHTML);
         }
       };
     },
     function createRenderer(renderFn) {
-      renderFn.bn_ = true;
+      renderFn.bq_ = true;
       return renderFn;
     }
   );
 
-  return function serialized5to6(renderer, id) {
-    return serializerRegister(
-      "@marko/tags-compat-5-to-6",
-      renderer,
-      serializerRegister(id, () => {})
-    );
-  };
+  return htmlCompat.registerRenderer;
 };

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.bo_;
+var escapeXmlString = escapeXmlHelper.br_;
 var missingSetTimeout = typeof setTimeout !== "function";
 
 function noop() {}
@@ -102,10 +102,10 @@ function AsyncStream(global, writer, parentOut) {
 
   this.b_ = null; // ComponentsContext
 
-  this._Z_ = null;
   this.a__ = null;
-  this.ba_ = null;
-  this.bp_ = false;
+  this.aa_ = null;
+  this.bc_ = null;
+  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,
-  bq_: true,
+  bt_: true,
 
   [Symbol.asyncIterator]() {
-    if (this.br_) {
-      return this.br_;
+    if (this.bu_) {
+      return this.bu_;
     }
 
     const originalWriter = this._state.writer;
@@ -191,7 +191,7 @@ var proto = AsyncStream.prototype = {
       };
     }
 
-    return this.br_ = {
+    return this.bu_ = {
       next: iteratorNextFn,
       [Symbol.asyncIterator]() {
         return this;
@@ -221,7 +221,7 @@ var proto = AsyncStream.prototype = {
     return this;
   },
 
-  ag_: function () {
+  ah_: function () {
     return this._state.writer.toString();
   },
 
@@ -229,14 +229,14 @@ var proto = AsyncStream.prototype = {
    * Legacy...
    */
   getOutput: function () {
-    return this.ag_();
+    return this.ah_();
   },
 
   toString: function () {
     return this._state.writer.toString();
   },
 
-  bs_: function () {
+  bv_: function () {
     this._result = this._result || new RenderResult(this);
     return this._result;
   },
@@ -287,7 +287,7 @@ var proto = AsyncStream.prototype = {
           }
 
           this._lastCount++;
-          newStream.bp_ = true;
+          newStream.bs_ = true;
         }
 
         name = options.name;
@@ -335,7 +335,7 @@ var proto = AsyncStream.prototype = {
     }
 
     if (state.events !== state.stream) {
-      state.events.emit("finish", this.bs_());
+      state.events.emit("finish", this.bv_());
     }
   },
 
@@ -407,7 +407,7 @@ var proto = AsyncStream.prototype = {
         parentOut._handleChildDone(this);
       }
     } else {
-      if (childOut.bp_) {
+      if (childOut.bs_) {
         this._lastCount--;
       }
 
@@ -448,7 +448,7 @@ var proto = AsyncStream.prototype = {
     var state = this._state;
 
     if (event === "finish" && state.finished === true) {
-      callback(this.bs_());
+      callback(this.bv_());
     } else if (event === "last") {
       this.onLast(callback);
     } else {
@@ -462,7 +462,7 @@ var proto = AsyncStream.prototype = {
     var state = this._state;
 
     if (event === "finish" && state.finished === true) {
-      callback(this.bs_());
+      callback(this.bv_());
     } else if (event === "last") {
       this.onLast(callback);
     } else {
@@ -587,7 +587,7 @@ var proto = AsyncStream.prototype = {
     return newOut;
   },
 
-  bk_: function (
+  bm_: function (
   tagName,
   elementAttrs,
   key,
@@ -626,7 +626,7 @@ var proto = AsyncStream.prototype = {
     this.write(str);
   },
 
-  bi_: function (
+  bk_: function (
   name,
   elementAttrs,
   key,
@@ -692,13 +692,13 @@ var proto = AsyncStream.prototype = {
     }
   },
 
-  af_: function (host) {
+  ag_: function (host) {
     var node = this._node;
 
     if (!node) {
       var nextEl;
       var fragment;
-      var html = this.ag_();
+      var html = this.ah_();
       if (!host) host = this.B_;
       var doc = host.ownerDocument || host;
 
@@ -725,6 +725,7 @@ var proto = AsyncStream.prototype = {
   },
 
   then: function (fn, fnErr) {
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
     var out = this;
     return new Promise(function (resolve, reject) {
       out.on("error", reject);
@@ -743,15 +744,15 @@ var proto = AsyncStream.prototype = {
   },
 
   c: function (componentDef, key, customEvents) {
-    this._Z_ = componentDef;
-    this.a__ = key;
-    this.ba_ = customEvents;
+    this.a__ = componentDef;
+    this.aa_ = key;
+    this.bc_ = customEvents;
   }
 };
 
 // alias:
 proto.w = proto.write;
-proto.bj_ = proto.endElement;
+proto.bl_ = 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._i_;
-const clearImmediate = immediate.ad_;
+const setImmediate = immediate._j_;
+const clearImmediate = immediate.ae_;
 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.bt_;
-var isEmptyAttrValue = attrHelper.bu_;
+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

@@ -2,13 +2,14 @@
 
 var escapeQuoteHelpers = require("./escape-quotes");
 var escapeDoubleQuotes = escapeQuoteHelpers.n_;
-var escapeSingleQuotes = escapeQuoteHelpers.bv_;
+var escapeSingleQuotes = escapeQuoteHelpers.by_;
+// eslint-disable-next-line no-constant-binary-expression
 
 
 module.exports = maybeEmptyAttr;
 
-maybeEmptyAttr.bt_ = notEmptyAttr;
-maybeEmptyAttr.bu_ = isEmpty;
+maybeEmptyAttr.bw_ = notEmptyAttr;
+maybeEmptyAttr.bx_ = isEmpty;
 
 function maybeEmptyAttr(name, value) {
   if (isEmpty(value)) {

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

@@ -1,5 +1,6 @@
 "use strict";
 
+// eslint-disable-next-line no-constant-binary-expression
 
 var dynamicAttrHelper = require("./_dynamic-attr");
 

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

@@ -1,7 +1,7 @@
 "use strict";
 
 var escapeQuoteHelpers = require("./escape-quotes");
-var escapeSingleQuotes = escapeQuoteHelpers.bv_;
+var escapeSingleQuotes = escapeQuoteHelpers.by_;
 var escapeDoubleQuotes = escapeQuoteHelpers.n_;
 var FLAG_WILL_RERENDER_IN_BROWSER = 1;
 // var FLAG_HAS_RENDER_BODY = 2;
@@ -15,7 +15,6 @@ module.exports = function dataMarko(out, componentDef, props, key) {
 
   if (willNotRerender) {
     if (props) {
-      // eslint-disable-next-line no-unused-vars
       for (var _ in props) {
         result +=
         " data-marko='" + escapeSingleQuotes(JSON.stringify(props)) + "'";
@@ -27,7 +26,7 @@ module.exports = function dataMarko(out, componentDef, props, key) {
       result +=
       ' data-marko-key="' +
       escapeDoubleQuotes(
-        componentDef.aL_(key) + " " + componentDef.id
+        componentDef.aN_(key) + " " + componentDef.id
       ) +
       '"';
     }

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

@@ -6,7 +6,7 @@ exports.d = function (value) {
 
 exports.n_ = escapeDoubleQuotes;
 
-exports.bv_ = escapeSingleQuotes;
+exports.by_ = escapeSingleQuotes;
 
 function escapeSingleQuotes(value, startPos) {
   return escapeQuote(value, startPos, "'", "'");

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

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

package/dist/runtime/html/helpers/merge-attrs.js

@@ -1,5 +1,6 @@
 "use strict";
 
+// eslint-disable-next-line no-constant-binary-expression
 
 var dynamicAttrHelper = require("./_dynamic-attr");
 

package/dist/runtime/html/index.js

@@ -21,7 +21,7 @@ function Template(typeName) {
 Template.prototype.stream = require("@internal/create-readable");
 
 var AsyncStream = require("./AsyncStream");
-require("../createOut").bc_(
+require("../createOut").be_(
   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")._i_;
+var setImmediate = require("@internal/set-immediate")._j_;
 var defaultCreateOut = require("./createOut");
 
 function safeRender(renderFunc, finalData, finalOut, shouldEnd) {
@@ -73,7 +73,7 @@ module.exports = function (target, renderer) {
       }
 
       render(localData, out);
-      return out.bs_();
+      return out.bv_();
     },
 
     /**
@@ -148,7 +148,7 @@ module.exports = function (target, renderer) {
       var finalData;
       var globalData;
       var render = renderFunc || this._;
-      var shouldBuffer = this._U_;
+      var shouldBuffer = this._V_;
       var shouldEnd = true;
 
       if (data) {
@@ -160,7 +160,7 @@ module.exports = function (target, renderer) {
         finalData = {};
       }
 
-      if (out && out.bq_) {
+      if (out && out.bt_) {
         finalOut = out;
         shouldEnd = false;
         extend(out.global, globalData);
@@ -179,7 +179,7 @@ module.exports = function (target, renderer) {
       if (callback) {
         finalOut.
         on("finish", function () {
-          callback(null, finalOut.bs_(), finalOut);
+          callback(null, finalOut.bv_(), finalOut);
         }).
         once("error", callback);
       }