marko 5.33.4 → 5.33.6

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

@@ -1 +1 @@
-"use strict";require("./runtime-dom.js").p(require("@marko/runtime-tags/debug/dom"));
+"use strict";require("./runtime-dom.js").p(require("@marko/runtime-tags/debug/dom").compat);

package/dist/runtime/helpers/tags-compat/dom-debug.mjs

@@ -1,3 +1,3 @@
-import api from "@marko/runtime-tags/debug/dom";
+import { compat } from "@marko/runtime-tags/debug/dom";
 import { p } from "./runtime-dom.js";
-p(api);
+p(compat);

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

@@ -1 +1 @@
-"use strict";require("./runtime-dom.js").p(require("@marko/runtime-tags/dom"));
+"use strict";require("./runtime-dom.js").p(require("@marko/runtime-tags/dom").compat);

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

@@ -1,3 +1,3 @@
-import api from "@marko/runtime-tags/dom";
+import { compat } from "@marko/runtime-tags/dom";
 import { p } from "./runtime-dom.js";
-p(api);
+p(compat);

package/dist/runtime/helpers/tags-compat/html-debug.mjs

@@ -1,3 +1,3 @@
-import api from "@marko/runtime-tags/debug/html";
+import * as api from "@marko/runtime-tags/debug/html";
 import { p } from "./runtime-html.js";
 export const s = p(api);

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

@@ -1,3 +1,3 @@
-import api from "@marko/runtime-tags/html";
+import * as api from "@marko/runtime-tags/html";
 import { p } from "./runtime-html.js";
 export const s = p(api);

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

@@ -10,71 +10,40 @@ const morphdom = require("../../vdom/morphdom");
 const { _h_ } = require("../../vdom/morphdom/fragment");
 const dynamicTag = require("../dynamic-tag");
 
-exports.p = function ({
-  prepare,
-  runEffects,
-  patchConditionals,
-  createScopeWithRenderer,
-  queueEffect,
-  scopeLookup,
-  getRegisteredWithScope,
-  register
-}) {
+exports.p = function (domCompat) {
   dynamicTag.bk_ = function tagsToVdom(
-  tagsRenderer,
+  renderer,
   renderBody,
   args)
   {
-    if (
-    tagsRenderer ?
-    tagsRenderer.bl_ === undefined :
-    !Array.isArray(renderBody) && renderBody?.bl_ === undefined)
-
-    return tagsRenderer;
-
-    return (input, out) =>
-    TagsCompat(
-      { i: args ? args : input, r: tagsRenderer || renderBody },
-      out
-    );
+    const tagsRenderer = domCompat.resolveRenderer(renderer || renderBody);
+
+    if (tagsRenderer) {
+      return (input, out) =>
+      TagsCompat({ i: args ? args : input, r: tagsRenderer }, out);
+    }
+
+    return renderer;
   };
 
   const TagsCompatId = "tags-compat";
   const TagsCompat = createRenderer(
     function (_, out, componentDef, component) {
-      let existing = false;
       const isHydrate =
       R_(out).o_._W_;
       const input = Array.isArray(_.i) ? _.i : [_.i];
-      const tagsRenderer = resolveRegistered(_.r);
-      const args = tagsRenderer.bm_;
+      const tagsRenderer = domCompat.resolveRenderer(_.r);
+      const newNode = domCompat.render(
+        isHydrate,
+        out,
+        component,
+        tagsRenderer,
+        input
+      );
 
-      component.effects = prepare(() => {
-        if (isHydrate) {
-          const scopeId = out.global.componentIdToScopeId[component.id];
-          component.scope = scopeLookup[scopeId];
-        }
-        if (!component.scope) {
-          component.scope = createScopeWithRenderer(
-            tagsRenderer /* out.global as context */
-          );
-          for (const signal of tagsRenderer.bn_) {
-            signal(component.scope, true);
-          }
-        } else {
-          args && args(component.scope, input, 1);
-          existing = true;
-        }
-        args && args(component.scope, input);
-      });
-      out.bf(out._Y_, component, existing);
-      if (!existing) {
-        out.node({
-          bo_: () =>
-          component.scope.bp_ === component.scope.bq_ ?
-          component.scope.bp_ :
-          component.scope.bp_.parentNode
-        });
+      out.bf(out._Y_, component, !newNode);
+      if (newNode) {
+        out.node({ bl_: () => newNode });
       }
       out.ef();
     },
@@ -94,12 +63,8 @@ exports.p = function ({
     _: TagsCompat,
     Component: defineComponent(
       {
-        onMount() {
-          runEffects(this.effects);
-        },
-        onUpdate() {
-          runEffects(this.effects);
-        }
+        onMount: domCompat.runComponentEffects,
+        onUpdate: domCompat.runComponentEffects
       },
       TagsCompat
     )
@@ -114,7 +79,7 @@ exports.p = function ({
 
   const rendererCache = new WeakMap();
 
-  patchConditionals((conditional) => (...args) => {
+  domCompat.patchConditionals((conditional) => (...args) => {
     const signal = conditional(...args);
     const hasAttrs = args.length > 1;
     return (scope, renderer, clean) => {
@@ -124,17 +89,14 @@ exports.p = function ({
 
   function create5to6Renderer(renderer, hasAttrs) {
     let newRenderer = renderer;
-    if (renderer) {
+    if (renderer && typeof renderer !== "string") {
       const rendererFromAnywhere =
       renderer._ ||
       renderer.render ||
       renderer.renderer && renderer.renderer.renderer ||
       renderer.renderer;
-      const isMarko6 = rendererFromAnywhere ?
-      rendererFromAnywhere.bl_ :
-      renderer.bl_;
 
-      if (typeof renderer !== "string" && !isMarko6) {
+      if (!domCompat.isRenderer(rendererFromAnywhere || renderer)) {
         newRenderer = rendererCache.get(renderer);
         if (!newRenderer) {
           const { Component } = renderer;
@@ -145,29 +107,28 @@ exports.p = function ({
             scopeId)
             {
               for (const customEvent of customEvents) {
-                customEvent[1] = resolveRegistered(customEvent[1]);
+                customEvent[1] = domCompat.resolveRenderer(customEvent[1]);
               }
 
               setCustomEvents.call(this, customEvents, scopeId);
             };
           }
-          newRenderer = {
-            br_(scope) {
+          newRenderer = domCompat.createRenderer(
+            (scope) => {
               if (!hasAttrs) {
                 renderAndMorph(scope, rendererFromAnywhere, renderer, {});
               }
             },
-            bl_() {
+            () => {
               const realFragment = document.createDocumentFragment();
               _h_(null, null, realFragment);
               return realFragment;
             },
-            bs_: 1,
-            bm_(scope, input, clean) {
+            (scope, input, clean) => {
               if (clean) return;
               renderAndMorph(scope, rendererFromAnywhere, renderer, input);
             }
-          };
+          );
           rendererCache.set(renderer, newRenderer);
         }
       }
@@ -175,18 +136,18 @@ exports.p = function ({
     return newRenderer;
   }
 
-  register("@marko/tags-compat-5-to-6", create5to6Renderer);
+  domCompat.register("@marko/tags-compat-5-to-6", create5to6Renderer);
 
   function renderAndMorph(scope, renderer, renderBody, input) {
     const out = defaultCreateOut();
-    let rootNode = scope.bp_.fragment;
+    let host = domCompat.getStartNode(scope);
+    let rootNode = host.fragment;
     if (!rootNode) {
       const component = scope.marko5Component = _i_[scope.m5c];
       rootNode = component._A_;
-      scope.bp_ = rootNode.startNode;
-      scope.bq_ = rootNode.endNode;
+      host = rootNode.startNode;
+      domCompat.setScopeNodes(host, rootNode.endNode);
     }
-    const host = scope.bp_;
     const existingComponent = scope.marko5Component;
     const componentsContext = R_(out);
     const globalComponentsContext = componentsContext.o_;
@@ -215,7 +176,7 @@ exports.p = function ({
       RenderBodyComponent({ renderBody, args: input }, out);
     }
 
-    queueEffect(scope, () => {
+    domCompat.queueEffect(scope, () => {
       const targetNode = out.af_().ay_;
       morphdom(rootNode, targetNode, host, componentsContext);
       const componentDefs = componentsContext.ad_(
@@ -267,12 +228,4 @@ exports.p = function ({
     _: RenderBodyComponent,
     Component: defineComponent({}, RenderBodyComponent)
   }));
-
-  function resolveRegistered(renderer) {
-    if (!Array.isArray(renderer)) return renderer;
-
-    const [registerId, scopeId] = renderer;
-    const scope = scopeLookup[scopeId];
-    return getRegisteredWithScope(registerId, scope);
-  }
 };

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

@@ -25,8 +25,8 @@ exports.p = function (tagsAPI) {
     return getRegistryInfo(this);
   };
 
-  const isMarko6 = (fn) => !!fn.bt_;
-  const isMarko5 = (fn) => !fn.bt_;
+  const isMarko6 = (fn) => !!fn.bm_;
+  const isMarko5 = (fn) => !fn.bm_;
 
   dynamicTag5.bk_ = function tagsToVdom(
   tagsRenderer,
@@ -94,7 +94,7 @@ exports.p = function (tagsAPI) {
         const out = defaultCreateOut();
         let customEvents;
 
-        out.global.streamData = tagsAPI.$_streamData;
+        out.global.streamData = tagsAPI.getStreamData();
 
         if (renderer5) {
           const normalizedInput = {};
@@ -148,7 +148,7 @@ exports.p = function (tagsAPI) {
       };
     },
     function createRenderer(renderFn) {
-      renderFn.bt_ = true;
+      renderFn.bm_ = true;
       return renderFn;
     }
   );

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.bn_;
 
 function noop() {}
 
@@ -104,7 +104,7 @@ function AsyncStream(global, writer, parentOut) {
   this._X_ = null;
   this._Y_ = null;
   this.b__ = null;
-  this.bv_ = false;
+  this.bo_ = false;
 }
 
 AsyncStream.DEFAULT_TIMEOUT = 10000;
@@ -125,11 +125,11 @@ AsyncStream.enableAsyncStackTrace = function () {
 var proto = AsyncStream.prototype = {
   constructor: AsyncStream,
   A_: typeof document === "object" && document,
-  bw_: true,
+  bp_: true,
 
   [Symbol.asyncIterator]() {
-    if (this.bx_) {
-      return this.bx_;
+    if (this.bq_) {
+      return this.bq_;
     }
 
     const originalWriter = this._state.writer;
@@ -190,7 +190,7 @@ var proto = AsyncStream.prototype = {
       };
     }
 
-    return this.bx_ = {
+    return this.bq_ = {
       next: iteratorNextFn,
       [Symbol.asyncIterator]() {
         return this;
@@ -235,7 +235,7 @@ var proto = AsyncStream.prototype = {
     return this._state.writer.toString();
   },
 
-  by_: function () {
+  br_: function () {
     this._result = this._result || new RenderResult(this);
     return this._result;
   },
@@ -286,7 +286,7 @@ var proto = AsyncStream.prototype = {
           }
 
           this._lastCount++;
-          newStream.bv_ = true;
+          newStream.bo_ = true;
         }
 
         name = options.name;
@@ -332,7 +332,7 @@ var proto = AsyncStream.prototype = {
     }
 
     if (state.events !== state.stream) {
-      state.events.emit("finish", this.by_());
+      state.events.emit("finish", this.br_());
     }
   },
 
@@ -404,7 +404,7 @@ var proto = AsyncStream.prototype = {
         parentOut._handleChildDone(this);
       }
     } else {
-      if (childOut.bv_) {
+      if (childOut.bo_) {
         this._lastCount--;
       }
 
@@ -445,7 +445,7 @@ var proto = AsyncStream.prototype = {
     var state = this._state;
 
     if (event === "finish" && state.finished === true) {
-      callback(this.by_());
+      callback(this.br_());
     } else if (event === "last") {
       this.onLast(callback);
     } else {
@@ -459,7 +459,7 @@ var proto = AsyncStream.prototype = {
     var state = this._state;
 
     if (event === "finish" && state.finished === true) {
-      callback(this.by_());
+      callback(this.br_());
     } else if (event === "last") {
       this.onLast(callback);
     } else {

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

@@ -1,7 +1,7 @@
 "use strict";
 var attrHelper = require("./attr");
-var notEmptyAttr = attrHelper.bz_;
-var isEmptyAttrValue = attrHelper.bA_;
+var notEmptyAttr = attrHelper.bs_;
+var isEmptyAttrValue = attrHelper.bt_;
 var classHelper = require("./class-attr");
 var styleHelper = require("./style-attr");
 

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

@@ -2,13 +2,13 @@
 
 var escapeQuoteHelpers = require("./escape-quotes");
 var escapeDoubleQuotes = escapeQuoteHelpers.m_;
-var escapeSingleQuotes = escapeQuoteHelpers.bB_;
+var escapeSingleQuotes = escapeQuoteHelpers.bu_;
 
 
 module.exports = maybeEmptyAttr;
 
-maybeEmptyAttr.bz_ = notEmptyAttr;
-maybeEmptyAttr.bA_ = isEmpty;
+maybeEmptyAttr.bs_ = notEmptyAttr;
+maybeEmptyAttr.bt_ = isEmpty;
 
 function maybeEmptyAttr(name, value) {
   if (isEmpty(value)) {

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

@@ -1,7 +1,7 @@
 "use strict";
 
 var escapeQuoteHelpers = require("./escape-quotes");
-var escapeSingleQuotes = escapeQuoteHelpers.bB_;
+var escapeSingleQuotes = escapeQuoteHelpers.bu_;
 var escapeDoubleQuotes = escapeQuoteHelpers.m_;
 var FLAG_WILL_RERENDER_IN_BROWSER = 1;
 // var FLAG_HAS_RENDER_BODY = 2;

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

@@ -6,7 +6,7 @@ exports.d = function (value) {
 
 exports.m_ = escapeDoubleQuotes;
 
-exports.bB_ = escapeSingleQuotes;
+exports.bu_ = escapeSingleQuotes;
 
 function escapeSingleQuotes(value, startPos) {
   return escapeQuote(value, startPos, "'", "'");

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

@@ -12,7 +12,7 @@ module.exports.x = function (value) {
   return escapeXML(value + "");
 };
 
-exports.bu_ = escapeXML;
+exports.bn_ = escapeXML;
 
 function escapeXML(str) {
   var len = str.length;

package/dist/runtime/renderable.js

@@ -73,7 +73,7 @@ module.exports = function (target, renderer) {
       }
 
       render(localData, out);
-      return out.by_();
+      return out.br_();
     },
 
     /**
@@ -160,7 +160,7 @@ module.exports = function (target, renderer) {
         finalData = {};
       }
 
-      if (out && out.bw_) {
+      if (out && out.bp_) {
         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.by_(), finalOut);
+          callback(null, finalOut.br_(), finalOut);
         }).
         once("error", callback);
       }