@marko/runtime-tags 0.1.2 → 0.1.4

package/dist/debug/dom.js

@@ -27,6 +27,7 @@ __export(dom_exports, {
   childClosures: () => childClosures,
   classAttr: () => classAttr,
   closure: () => closure,
+  compat: () => compat,
   conditional: () => conditional,
   conditionalOnlyChild: () => conditionalOnlyChild,
   createRenderer: () => createRenderer,
@@ -53,7 +54,6 @@ __export(dom_exports, {
   loopTo: () => loopTo,
   nextTagId: () => nextTagId,
   on: () => on,
-  patchConditionals: () => patchConditionals,
   prepare: () => prepare,
   props: () => props,
   queueEffect: () => queueEffect,
@@ -1408,4 +1408,65 @@ var ClientTemplate = class {
     );
   }
 };
-//# sourceMappingURL=dom.js.map
+
+// src/dom/compat.ts
+var compat = {
+  register,
+  patchConditionals,
+  queueEffect,
+  isRenderer(renderer) {
+    return renderer.___clone !== void 0;
+  },
+  getStartNode(scope) {
+    return scope.___startNode;
+  },
+  setScopeNodes(scope, startNode, endNode) {
+    scope.___startNode = startNode;
+    scope.___endNode = endNode;
+  },
+  runComponentEffects() {
+    runEffects(this.effects);
+  },
+  resolveRenderer(renderer) {
+    if (renderer && typeof renderer === "object") {
+      if (Array.isArray(renderer)) {
+        const [registerId, scopeId] = renderer;
+        const scope = scopeLookup[scopeId];
+        return getRegisteredWithScope(registerId, scope);
+      }
+      if (renderer.___clone) {
+        return renderer;
+      }
+    }
+  },
+  createRenderer(setup, clone, args) {
+    const renderer = createRenderer("", void 0, setup, void 0, 1, args);
+    renderer.___clone = clone;
+    return renderer;
+  },
+  render(isHydrate, out, component, renderer, input) {
+    const args = renderer.___args || noop;
+    let existing = false;
+    let scope = isHydrate ? component.scope = scopeLookup[out.global.componentIdToScopeId[component.id]] : component.scope;
+    component.effects = prepare(() => {
+      if (!scope) {
+        scope = component.scope = createScopeWithRenderer(renderer, out.global);
+        const closures = renderer.___closureSignals;
+        if (closures) {
+          for (const signal of closures) {
+            signal(component.scope, true);
+          }
+        }
+      } else {
+        args(scope, input, 1);
+        existing = true;
+      }
+      args(scope, input);
+    });
+    if (!existing) {
+      return scope.___startNode === scope.___endNode ? scope.___startNode : scope.___startNode.parentNode;
+    }
+  }
+};
+function noop() {
+}

package/dist/debug/dom.mjs

@@ -1333,6 +1333,68 @@ var ClientTemplate = class {
     );
   }
 };
+
+// src/dom/compat.ts
+var compat = {
+  register,
+  patchConditionals,
+  queueEffect,
+  isRenderer(renderer) {
+    return renderer.___clone !== void 0;
+  },
+  getStartNode(scope) {
+    return scope.___startNode;
+  },
+  setScopeNodes(scope, startNode, endNode) {
+    scope.___startNode = startNode;
+    scope.___endNode = endNode;
+  },
+  runComponentEffects() {
+    runEffects(this.effects);
+  },
+  resolveRenderer(renderer) {
+    if (renderer && typeof renderer === "object") {
+      if (Array.isArray(renderer)) {
+        const [registerId, scopeId] = renderer;
+        const scope = scopeLookup[scopeId];
+        return getRegisteredWithScope(registerId, scope);
+      }
+      if (renderer.___clone) {
+        return renderer;
+      }
+    }
+  },
+  createRenderer(setup, clone, args) {
+    const renderer = createRenderer("", void 0, setup, void 0, 1, args);
+    renderer.___clone = clone;
+    return renderer;
+  },
+  render(isHydrate, out, component, renderer, input) {
+    const args = renderer.___args || noop;
+    let existing = false;
+    let scope = isHydrate ? component.scope = scopeLookup[out.global.componentIdToScopeId[component.id]] : component.scope;
+    component.effects = prepare(() => {
+      if (!scope) {
+        scope = component.scope = createScopeWithRenderer(renderer, out.global);
+        const closures = renderer.___closureSignals;
+        if (closures) {
+          for (const signal of closures) {
+            signal(component.scope, true);
+          }
+        }
+      } else {
+        args(scope, input, 1);
+        existing = true;
+      }
+      args(scope, input);
+    });
+    if (!existing) {
+      return scope.___startNode === scope.___endNode ? scope.___startNode : scope.___startNode.parentNode;
+    }
+  }
+};
+function noop() {
+}
 export {
   attr,
   attrs,
@@ -1341,6 +1403,7 @@ export {
   childClosures,
   classAttr,
   closure,
+  compat,
   conditional,
   conditionalOnlyChild,
   createRenderer,
@@ -1367,7 +1430,6 @@ export {
   loopTo,
   nextTagId,
   on,
-  patchConditionals,
   prepare,
   props,
   queueEffect,
@@ -1385,4 +1447,3 @@ export {
   values,
   write
 };
-//# sourceMappingURL=dom.mjs.map

package/dist/debug/html.js

@@ -20,7 +20,6 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/html.ts
 var html_exports = {};
 __export(html_exports, {
-  $_streamData: () => $_streamData,
   attr: () => attr,
   attrs: () => attrs,
   classAttr: () => classAttr,
@@ -35,6 +34,7 @@ __export(html_exports, {
   escapeXML: () => escapeXML,
   fork: () => fork,
   getRegistryInfo: () => getRegistryInfo,
+  getStreamData: () => getStreamData,
   makeSerializable: () => makeSerializable,
   markResumeControlEnd: () => markResumeControlEnd,
   markResumeControlSingleNodeEnd: () => markResumeControlSingleNodeEnd,
@@ -690,6 +690,9 @@ var reorderRuntimeString = String(reorder_runtime_default).replace(
 );
 var $_buffer = null;
 var $_streamData = null;
+function getStreamData() {
+  return $_streamData;
+}
 function createRenderFn(renderer) {
   return (stream, input = {}, $global, streamState = {}) => {
     let remainingChildren = 1;
@@ -1285,7 +1288,6 @@ var ServerTemplate = class {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  $_streamData,
   attr,
   attrs,
   classAttr,
@@ -1300,6 +1302,7 @@ var ServerTemplate = class {
   escapeXML,
   fork,
   getRegistryInfo,
+  getStreamData,
   makeSerializable,
   markResumeControlEnd,
   markResumeControlSingleNodeEnd,
@@ -1320,4 +1323,3 @@ var ServerTemplate = class {
   writeEffect,
   writeScope
 });
-//# sourceMappingURL=html.js.map

package/dist/debug/html.mjs

@@ -631,6 +631,9 @@ var reorderRuntimeString = String(reorder_runtime_default).replace(
 );
 var $_buffer = null;
 var $_streamData = null;
+function getStreamData() {
+  return $_streamData;
+}
 function createRenderFn(renderer) {
   return (stream, input = {}, $global, streamState = {}) => {
     let remainingChildren = 1;
@@ -1225,7 +1228,6 @@ var ServerTemplate = class {
   }
 };
 export {
-  $_streamData,
   attr,
   attrs,
   classAttr,
@@ -1240,6 +1242,7 @@ export {
   escapeXML,
   fork,
   getRegistryInfo,
+  getStreamData,
   makeSerializable,
   markResumeControlEnd,
   markResumeControlSingleNodeEnd,
@@ -1260,4 +1263,3 @@ export {
   writeEffect,
   writeScope
 };
-//# sourceMappingURL=html.mjs.map

package/dist/dom/compat.d.ts

@@ -0,0 +1,16 @@
+import { patchConditionals } from "./control-flow";
+import { queueEffect } from "./queue";
+import { type Renderer } from "./renderer";
+import { register } from "./resume";
+export declare const compat: {
+    register: typeof register;
+    patchConditionals: typeof patchConditionals;
+    queueEffect: typeof queueEffect;
+    isRenderer(renderer: any): boolean;
+    getStartNode(scope: any): any;
+    setScopeNodes(scope: any, startNode: Node, endNode: Node): void;
+    runComponentEffects(this: any): void;
+    resolveRenderer(renderer: any): any;
+    createRenderer(setup: Renderer["___setup"], clone: Renderer["___clone"], args: Renderer["___args"]): Renderer;
+    render(isHydrate: boolean, out: any, component: any, renderer: Renderer, input: any): any;
+};

package/dist/dom.d.ts

@@ -1,4 +1,4 @@
-export { conditional, conditionalOnlyChild, inConditionalScope, loopOf, loopIn, loopTo, inLoopScope, patchConditionals, } from "./dom/control-flow";
+export { conditional, conditionalOnlyChild, inConditionalScope, loopOf, loopIn, loopTo, inLoopScope, } from "./dom/control-flow";
 export { data, html, attr, attrs, classAttr, styleAttr, props, lifecycle, } from "./dom/dom";
 export { resetAbortSignal, getAbortSignal } from "./dom/abort-signal";
 export { on } from "./dom/event";
@@ -9,3 +9,4 @@ export type { Scope } from "./common/types";
 export { createRenderer, dynamicTagAttrs, createScopeWithRenderer, } from "./dom/renderer";
 export { createTemplate } from "./dom/template";
 export { value, initValue, intersection, closure, dynamicClosure, dynamicSubscribers, childClosures, setTagVar, tagVarSignal, nextTagId, inChild, values, intersections, } from "./dom/signals";
+export { compat } from "./dom/compat";

package/dist/dom.js

@@ -24,6 +24,7 @@ __export(dom_exports, {
   childClosures: () => childClosures,
   classAttr: () => classAttr,
   closure: () => closure,
+  compat: () => compat,
   conditional: () => conditional,
   conditionalOnlyChild: () => conditionalOnlyChild,
   createRenderer: () => createRenderer,
@@ -50,7 +51,6 @@ __export(dom_exports, {
   loopTo: () => loopTo,
   nextTagId: () => nextTagId,
   on: () => on,
-  patchConditionals: () => patchConditionals,
   prepare: () => prepare,
   props: () => props,
   queueEffect: () => queueEffect,
@@ -73,26 +73,26 @@ module.exports = __toCommonJS(dom_exports);
 // src/dom/scope.ts
 function createScope($global) {
   let scope = {};
-  return scope.o = !0, scope.$global = $global, scope;
+  return scope.p = !0, scope.$global = $global, scope;
 }
 var emptyScope = createScope({});
 function getEmptyScope(marker) {
-  return emptyScope.a = emptyScope.c = marker, emptyScope;
+  return emptyScope.a = emptyScope.b = marker, emptyScope;
 }
 function write(scope, localIndex, value2) {
   return scope[localIndex] !== value2 ? (scope[localIndex] = value2, 1) : 0;
 }
 function binder(bind) {
   return (scope, value2) => {
-    scope.h ??= /* @__PURE__ */ new Map();
-    let bound = scope.h.get(value2);
-    return bound || (bound = bind(scope, value2), scope.h.set(value2, bound)), bound;
+    scope.i ??= /* @__PURE__ */ new Map();
+    let bound = scope.i.get(value2);
+    return bound || (bound = bind(scope, value2), scope.i.set(value2, bound)), bound;
   };
 }
 var bindRenderer = binder(
   (ownerScope, renderer) => renderer && {
     ...renderer,
-    i: ownerScope
+    j: ownerScope
   }
 ), bindFunction = binder(
   (boundScope, fn) => fn.length ? function(...args) {
@@ -102,38 +102,38 @@ var bindRenderer = binder(
   }
 );
 function destroyScope(scope) {
-  _destroyScope(scope), scope._?.f?.delete(scope);
-  let closureSignals = scope.p?.b;
+  _destroyScope(scope), scope._?.g?.delete(scope);
+  let closureSignals = scope.q?.c;
   if (closureSignals)
     for (let signal of closureSignals)
-      signal.g?.(scope);
+      signal.h?.(scope);
   return scope;
 }
 function _destroyScope(scope) {
-  let cleanup = scope.f;
+  let cleanup = scope.g;
   if (cleanup)
     for (let instance of cleanup)
       _destroyScope(instance);
-  let controllers = scope.j;
+  let controllers = scope.k;
   if (controllers)
     for (let ctrl of controllers.values())
       ctrl.abort();
 }
 function onDestroy(scope) {
   let parentScope = scope._;
-  for (; parentScope && !parentScope.f?.has(scope); )
-    (parentScope.f ||= /* @__PURE__ */ new Set()).add(scope), scope = parentScope, parentScope = scope._;
+  for (; parentScope && !parentScope.g?.has(scope); )
+    (parentScope.g ||= /* @__PURE__ */ new Set()).add(scope), scope = parentScope, parentScope = scope._;
 }
 function removeAndDestroyScope(scope) {
   destroyScope(scope);
-  let current = scope.a, stop = scope.c.nextSibling;
+  let current = scope.a, stop = scope.b.nextSibling;
   for (; current !== stop; ) {
     let next = current.nextSibling;
     current.remove(), current = next;
   }
 }
 function insertBefore(scope, parent, nextSibling) {
-  let current = scope.a, stop = scope.c.nextSibling;
+  let current = scope.a, stop = scope.b.nextSibling;
   for (; current !== stop; ) {
     let next = current.nextSibling;
     parent.insertBefore(current, nextSibling), current = next;
@@ -259,14 +259,14 @@ function isVoid(value2) {
 
 // src/dom/abort-signal.ts
 function resetAbortSignal(scope, id) {
-  let controllers = scope.j;
+  let controllers = scope.k;
   if (controllers) {
     let ctrl = controllers.get(id);
     ctrl && (ctrl.abort(), controllers.delete(id));
   }
 }
 function getAbortSignal(scope, id) {
-  let controllers = scope.j ??= /* @__PURE__ */ new Map(), controller = controllers.get(id);
+  let controllers = scope.k ??= /* @__PURE__ */ new Map(), controller = controllers.get(id);
   return controller || (onDestroy(scope), controllers.set(id, controller = new AbortController())), controller.signal;
 }
 
@@ -378,18 +378,18 @@ function walkInternal(walkCodes, scope, currentWalkIndex) {
 // src/dom/renderer.ts
 function createScopeWithRenderer(renderer, $global, ownerScope) {
   let newScope = createScope($global);
-  if (newScope._ = renderer.i || ownerScope, newScope.p = renderer, initRenderer(renderer, newScope), renderer.b)
-    for (let signal of renderer.b)
+  if (newScope._ = renderer.j || ownerScope, newScope.q = renderer, initRenderer(renderer, newScope), renderer.c)
+    for (let signal of renderer.c)
       signal.e?.(newScope);
   return newScope;
 }
 function initRenderer(renderer, scope) {
-  let dom = typeof renderer == "string" ? document.createElement(renderer) : renderer.q();
+  let dom = typeof renderer == "string" ? document.createElement(renderer) : renderer.f();
   return walk(
     dom.nodeType === 11 /* DocumentFragment */ ? dom.firstChild : dom,
-    renderer.k ?? " ",
+    renderer.l ?? " ",
     scope
-  ), scope.a = dom.nodeType === 11 /* DocumentFragment */ ? dom.firstChild : dom, scope.c = dom.nodeType === 11 /* DocumentFragment */ ? dom.lastChild : dom, renderer.l && renderer.l(scope), dom;
+  ), scope.a = dom.nodeType === 11 /* DocumentFragment */ ? dom.firstChild : dom, scope.b = dom.nodeType === 11 /* DocumentFragment */ ? dom.lastChild : dom, renderer.m && renderer.m(scope), dom;
 }
 function dynamicTagAttrs(nodeAccessor, renderBody, inputIsArgs) {
   return (scope, getAttrs, clean) => {
@@ -423,23 +423,23 @@ function dynamicTagAttrs(nodeAccessor, renderBody, inputIsArgs) {
 }
 function createRenderer(template, walks, setup, closureSignals, hasUserEffects = 0, args) {
   return {
-    m: template,
-    k: walks && /* @__PURE__ */ trimWalkString(walks),
-    l: setup,
-    q: _clone,
-    b: new Set(closureSignals),
+    n: template,
+    l: walks && /* @__PURE__ */ trimWalkString(walks),
+    m: setup,
+    f: _clone,
+    c: new Set(closureSignals),
     r: hasUserEffects,
-    n: void 0,
+    o: void 0,
     d: args,
-    i: void 0
+    j: void 0
   };
 }
 function _clone() {
-  let sourceNode = this.n;
+  let sourceNode = this.o;
   if (!sourceNode) {
-    let walks = this.k, ensureFragment = walks && walks.length < 4 && walks.charCodeAt(walks.length - 1) !== 32 /* Get */;
-    this.n = sourceNode = parse(
-      this.m,
+    let walks = this.l, ensureFragment = walks && walks.length < 4 && walks.charCodeAt(walks.length - 1) !== 32 /* Get */;
+    this.o = sourceNode = parse(
+      this.n,
       ensureFragment
     );
   }
@@ -484,7 +484,7 @@ function closure(ownerValueAccessor, fn, _getOwnerScope, intersection2, valueWit
       currentMark = scope[markAccessor] = (scope[markAccessor] ?? 0) + 1;
     else if (scope[markAccessor] === void 0) {
       ownerScope = getOwnerScope(scope), ownerValueAccessor2 = getOwnerValueAccessor(scope);
-      let ownerMark = ownerScope[ownerValueAccessor2 + "#" /* Mark */], ownerHasRun = ownerMark === void 0 ? !ownerScope.o : ownerMark === 0;
+      let ownerMark = ownerScope[ownerValueAccessor2 + "#" /* Mark */], ownerHasRun = ownerMark === void 0 ? !ownerScope.p : ownerMark === 0;
       scope[markAccessor] = (currentMark = ownerHasRun ? 1 : 2) - 1, clean = void 0;
     } else
       currentMark = scope[markAccessor]--, clean = scope[cleanAccessor] &&= clean;
@@ -506,7 +506,7 @@ function dynamicClosure(ownerValueAccessor, fn, _getOwnerScope, intersection2, v
         bindFunction(scope, signalFn)
       );
     },
-    g(scope) {
+    h(scope) {
       let ownerScope = getOwnerScope(scope), providerSubscriptionsAccessor = getOwnerValueAccessor(scope) + "*" /* Subscribers */;
       ownerScope[providerSubscriptionsAccessor]?.delete(
         bindFunction(scope, signalFn)
@@ -525,10 +525,10 @@ function childClosures(closureSignals, childAccessor) {
       for (let closureSignal of closureSignals)
         closureSignal.e?.(childScope);
     },
-    g(scope) {
+    h(scope) {
       let childScope = scope[childAccessor];
       for (let closureSignal of closureSignals)
-        closureSignal.g?.(childScope);
+        closureSignal.h?.(childScope);
     }
   });
 }
@@ -548,7 +548,7 @@ function setTagVar(scope, childAccessor, tagVarSignal2) {
   );
 }
 var tagVarSignal = (scope, value2, clean) => scope["/" /* TagVariable */]?.(value2, clean), renderBodyClosures = (renderBody, childScope, clean) => {
-  let signals = renderBody?.b;
+  let signals = renderBody?.c;
   if (signals)
     for (let signal of signals)
       signal(childScope, clean);
@@ -593,7 +593,7 @@ function inConditionalScope(signal, nodeAccessor) {
     let conditionalScope = scope[scopeAccessor];
     if (conditionalScope) {
       let conditionalRenderer = scope[rendererAccessor];
-      (!conditionalRenderer?.b || conditionalRenderer.b.has(signal)) && signal(conditionalScope, clean);
+      (!conditionalRenderer?.c || conditionalRenderer.c.has(signal)) && signal(conditionalScope, clean);
     }
   };
 }
@@ -649,7 +649,7 @@ function loopTo(nodeAccessor, renderer) {
   });
 }
 function loop(nodeAccessor, renderer, forEach) {
-  let loopScopeAccessor = nodeAccessor + "!" /* LoopScopeArray */, closureSignals = renderer.b, params = renderer.d;
+  let loopScopeAccessor = nodeAccessor + "!" /* LoopScopeArray */, closureSignals = renderer.c, params = renderer.d;
   return (scope, value2, clean) => {
     if (clean) {
       for (let childScope of scope[loopScopeAccessor]) {
@@ -679,7 +679,7 @@ function loop(nodeAccessor, renderer, forEach) {
       if (referenceIsMarker) {
         oldMap === emptyMarkerMap && getEmptyScope(referenceNode);
         let oldLastChild = oldArray[oldArray.length - 1];
-        afterReference = oldLastChild.c.nextSibling, parentNode = oldLastChild.a.parentNode;
+        afterReference = oldLastChild.b.nextSibling, parentNode = oldLastChild.a.parentNode;
       } else
         afterReference = null, parentNode = referenceNode;
       reconcile(parentNode, oldArray, newArray, afterReference);
@@ -729,7 +729,7 @@ function register(id, obj) {
 }
 function getRegisteredWithScope(registryId, scope) {
   let obj = registeredObjects.get(registryId);
-  return scope ? obj.m ? bindRenderer(scope, obj) : bindFunction(scope, obj) : obj;
+  return scope ? obj.n ? bindRenderer(scope, obj) : bindFunction(scope, obj) : obj;
 }
 var scopeLookup = {};
 function init(runtimeId = "M" /* DefaultRuntimeId */) {
@@ -765,7 +765,7 @@ function init(runtimeId = "M" /* DefaultRuntimeId */) {
         else if (token === "]" /* SectionEnd */) {
           if (scope[data2] = currentNode, scopeId < currentScopeId) {
             let currScope = scopeLookup[currentScopeId], currParent = currentNode.parentNode, startNode = currScope.a;
-            currParent !== startNode.parentNode && currParent.prepend(startNode), currScope.c = currentNode.previousSibling, currentScopeId = stack.pop();
+            currParent !== startNode.parentNode && currParent.prepend(startNode), currScope.b = currentNode.previousSibling, currentScopeId = stack.pop();
           }
         } else if (token === "|" /* SectionSingleNodesEnd */) {
           scope[parseInt(data2)] = currentNode;
@@ -776,7 +776,7 @@ function init(runtimeId = "M" /* DefaultRuntimeId */) {
             let childScope = getScope(childScopeIds[i]);
             for (; (currentNode = currentNode.previousSibling).nodeType === 8; )
               ;
-            childScope.a = childScope.c = currentNode;
+            childScope.a = childScope.b = currentNode;
           }
         }
       }
@@ -901,4 +901,54 @@ var createTemplate = (renderer, templateId) => register(templateId, new ClientTe
     );
   }
 };
-//# sourceMappingURL=dom.js.map
+
+// src/dom/compat.ts
+var compat = {
+  register,
+  patchConditionals,
+  queueEffect,
+  isRenderer(renderer) {
+    return renderer.f !== void 0;
+  },
+  getStartNode(scope) {
+    return scope.a;
+  },
+  setScopeNodes(scope, startNode, endNode) {
+    scope.a = startNode, scope.b = endNode;
+  },
+  runComponentEffects() {
+    runEffects(this.effects);
+  },
+  resolveRenderer(renderer) {
+    if (renderer && typeof renderer == "object") {
+      if (Array.isArray(renderer)) {
+        let [registerId, scopeId] = renderer, scope = scopeLookup[scopeId];
+        return getRegisteredWithScope(registerId, scope);
+      }
+      if (renderer.f)
+        return renderer;
+    }
+  },
+  createRenderer(setup, clone, args) {
+    let renderer = createRenderer("", void 0, setup, void 0, 1, args);
+    return renderer.f = clone, renderer;
+  },
+  render(isHydrate, out, component, renderer, input) {
+    let args = renderer.d || noop, existing = !1, scope = isHydrate ? component.scope = scopeLookup[out.global.componentIdToScopeId[component.id]] : component.scope;
+    if (component.effects = prepare(() => {
+      if (scope)
+        args(scope, input, 1), existing = !0;
+      else {
+        scope = component.scope = createScopeWithRenderer(renderer, out.global);
+        let closures = renderer.c;
+        if (closures)
+          for (let signal of closures)
+            signal(component.scope, !0);
+      }
+      args(scope, input);
+    }), !existing)
+      return scope.a === scope.b ? scope.a : scope.a.parentNode;
+  }
+};
+function noop() {
+}