@marko/runtime-tags 0.3.49 → 0.3.51

package/dist/common/types.d.ts

@@ -5,7 +5,6 @@ export interface BranchScope extends Scope {
     ___startNode: ChildNode;
     ___endNode: ChildNode;
     ___parentBranch: BranchScope | undefined;
-    ___branchDepth: number;
     ___destroyed: 1 | undefined;
     ___abortScopes: Set<Scope> | undefined;
     ___branchScopes: Set<BranchScope> | undefined;

package/dist/debug/dom.js

@@ -1333,11 +1333,6 @@ function longestIncreasingSubsequence(a) {
 
 // src/dom/walker.ts
 var walker = /* @__PURE__ */ document.createTreeWalker(document);
-function trimWalkString(walkString) {
-  let end = walkString.length;
-  while (walkString.charCodeAt(--end) > 49 /* DynamicTagWithVar */) ;
-  return walkString.slice(0, end + 1);
-}
 function walk(startNode, walkCodes, branch) {
   walker.currentNode = startNode;
   walkInternal(0, walkCodes, branch);
@@ -1411,63 +1406,44 @@ function getDebugKey(index, node) {
 }
 
 // src/dom/renderer.ts
-function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentScope, parentNode) {
-  const branch = createBranch(
-    $global,
-    tagNameOrRenderer,
-    parentScope,
-    parentNode
-  );
-  if (typeof tagNameOrRenderer === "string") {
-    branch[true ? `#${tagNameOrRenderer}/0` : 0] = branch.___startNode = branch.___endNode = document.createElementNS(
-      tagNameOrRenderer === "svg" ? "http://www.w3.org/2000/svg" : tagNameOrRenderer === "math" ? "http://www.w3.org/1998/Math/MathML" : parentNode.namespaceURI,
-      tagNameOrRenderer
-    );
-  }
-  return branch;
-}
 function createBranch($global, renderer, parentScope, parentNode) {
   const branch = createScope($global);
   const parentBranch = parentScope?.___closestBranch;
   branch._ = renderer.___owner || parentScope;
   branch.___closestBranch = branch;
   if (parentBranch) {
-    branch.___branchDepth = parentBranch.___branchDepth + 1;
     branch.___parentBranch = parentBranch;
     (parentBranch.___branchScopes ||= /* @__PURE__ */ new Set()).add(branch);
-  } else {
-    branch.___branchDepth = 1;
   }
   if (true) {
     branch.___renderer = renderer;
   }
-  renderer.___init?.(
+  renderer.___clone?.(
     branch,
     parentNode.namespaceURI
   );
   return branch;
 }
-function createContent(id, template, rawWalks, setup, getArgs, dynamicScopesAccessor) {
+function createContent(id, template, walks, setup, getArgs, dynamicScopesAccessor) {
+  walks = walks ? walks.replace(/[^\0-1]+$/, "") : "";
   let args;
-  const walks = rawWalks ? /* @__PURE__ */ trimWalkString(rawWalks) : "";
-  const init2 = template ? (branch, ns) => {
+  const clone = template ? (branch, ns) => {
     ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
       template,
       ns
     ))(branch, walks);
-    setup && queueRender(branch, setup, -1);
   } : (branch) => {
     walk(
       branch.___startNode = branch.___endNode = new Text(),
       walks,
       branch
     );
-    setup && queueRender(branch, setup, -1);
   };
   return (owner) => {
     return {
       ___id: id,
-      ___init: init2,
+      ___clone: clone,
+      ___setup: setup,
       ___owner: owner,
       ___accessor: dynamicScopesAccessor,
       get ___args() {
@@ -1741,7 +1717,7 @@ function conditional(nodeAccessor, ...branches) {
         scope,
         nodeAccessor,
         branches[scope[branchAccessor] = newBranch],
-        createBranch
+        createAndSetupBranch
       );
     }
   };
@@ -1771,7 +1747,7 @@ var dynamicTag = function dynamicTag2(nodeAccessor, getContent, getTagVar, input
             scope[childScopeAccessor],
             true ? `#${normalizedRenderer}/0` : 0,
             content,
-            createBranch
+            createAndSetupBranch
           );
           if (content.___accessor) {
             subscribeToScopeSet(
@@ -1884,7 +1860,7 @@ function loop(nodeAccessor, renderer, forEach) {
     const newMap = scope[nodeAccessor + "(" /* LoopScopeMap */] = /* @__PURE__ */ new Map();
     const newArray = scope[nodeAccessor + "!" /* LoopScopeArray */] = [];
     forEach(value2, (key, args) => {
-      const branch = oldMap?.get(key) || createBranch(scope.$global, renderer, scope, parentNode);
+      const branch = oldMap?.get(key) || createAndSetupBranch(scope.$global, renderer, scope, parentNode);
       params?.(branch, args);
       newMap.set(key, branch);
       newArray.push(branch);
@@ -1904,6 +1880,28 @@ function loop(nodeAccessor, renderer, forEach) {
     reconcile(parentNode, oldArray, newArray, afterReference);
   };
 }
+function createAndSetupBranch($global, renderer, parentScope, parentNode) {
+  const branch = createBranch($global, renderer, parentScope, parentNode);
+  renderer.___setup && queueRender(branch, renderer.___setup, -1);
+  return branch;
+}
+function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentScope, parentNode) {
+  const branch = createBranch(
+    $global,
+    tagNameOrRenderer,
+    parentScope,
+    parentNode
+  );
+  if (typeof tagNameOrRenderer === "string") {
+    branch[true ? `#${tagNameOrRenderer}/0` : 0] = branch.___startNode = branch.___endNode = document.createElementNS(
+      tagNameOrRenderer === "svg" ? "http://www.w3.org/2000/svg" : tagNameOrRenderer === "math" ? "http://www.w3.org/1998/Math/MathML" : parentNode.namespaceURI,
+      tagNameOrRenderer
+    );
+  } else if (tagNameOrRenderer.___setup) {
+    queueRender(branch, tagNameOrRenderer.___setup, -1);
+  }
+  return branch;
+}
 function bySecondArg(_item, index) {
   return index;
 }
@@ -1926,7 +1924,7 @@ var compat = {
     register(RENDERER_REGISTER_ID, fn);
   },
   isRenderer(renderer) {
-    return renderer.___init;
+    return renderer.___clone;
   },
   getStartNode(branch) {
     return branch.___startNode;
@@ -1957,7 +1955,7 @@ var compat = {
   },
   createRenderer(args, clone) {
     const renderer = createRenderer(0, 0, 0, () => args);
-    renderer.___init = (branch) => {
+    renderer.___clone = (branch) => {
       const cloned = clone();
       branch.___startNode = cloned.startNode;
       branch.___endNode = cloned.endNode;
@@ -1990,6 +1988,7 @@ var compat = {
           renderer.___owner,
           document.body
         );
+        renderer.___setup && renderer.___setup(branch);
       } else {
         existing = true;
       }
@@ -2002,11 +2001,11 @@ var compat = {
 };
 
 // src/dom/template.ts
-var createTemplate = (id, template, rawWalks, setup, inputSignal) => {
+var createTemplate = (id, template, walks, setup, inputSignal) => {
   const renderer = createContent(
     id,
     template,
-    rawWalks,
+    walks,
     setup,
     inputSignal && (() => inputSignal)
   )();
@@ -2062,7 +2061,8 @@ function mount(input = {}, reference, position) {
       void 0,
       parentNode
     );
-    args?.(branch, input);
+    this.___setup && this.___setup(branch);
+    args && args(branch, input);
   });
   insertChildNodes(
     parentNode,

package/dist/debug/dom.mjs

@@ -1248,11 +1248,6 @@ function longestIncreasingSubsequence(a) {
 
 // src/dom/walker.ts
 var walker = /* @__PURE__ */ document.createTreeWalker(document);
-function trimWalkString(walkString) {
-  let end = walkString.length;
-  while (walkString.charCodeAt(--end) > 49 /* DynamicTagWithVar */) ;
-  return walkString.slice(0, end + 1);
-}
 function walk(startNode, walkCodes, branch) {
   walker.currentNode = startNode;
   walkInternal(0, walkCodes, branch);
@@ -1326,63 +1321,44 @@ function getDebugKey(index, node) {
 }
 
 // src/dom/renderer.ts
-function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentScope, parentNode) {
-  const branch = createBranch(
-    $global,
-    tagNameOrRenderer,
-    parentScope,
-    parentNode
-  );
-  if (typeof tagNameOrRenderer === "string") {
-    branch[true ? `#${tagNameOrRenderer}/0` : 0] = branch.___startNode = branch.___endNode = document.createElementNS(
-      tagNameOrRenderer === "svg" ? "http://www.w3.org/2000/svg" : tagNameOrRenderer === "math" ? "http://www.w3.org/1998/Math/MathML" : parentNode.namespaceURI,
-      tagNameOrRenderer
-    );
-  }
-  return branch;
-}
 function createBranch($global, renderer, parentScope, parentNode) {
   const branch = createScope($global);
   const parentBranch = parentScope?.___closestBranch;
   branch._ = renderer.___owner || parentScope;
   branch.___closestBranch = branch;
   if (parentBranch) {
-    branch.___branchDepth = parentBranch.___branchDepth + 1;
     branch.___parentBranch = parentBranch;
     (parentBranch.___branchScopes ||= /* @__PURE__ */ new Set()).add(branch);
-  } else {
-    branch.___branchDepth = 1;
   }
   if (true) {
     branch.___renderer = renderer;
   }
-  renderer.___init?.(
+  renderer.___clone?.(
     branch,
     parentNode.namespaceURI
   );
   return branch;
 }
-function createContent(id, template, rawWalks, setup, getArgs, dynamicScopesAccessor) {
+function createContent(id, template, walks, setup, getArgs, dynamicScopesAccessor) {
+  walks = walks ? walks.replace(/[^\0-1]+$/, "") : "";
   let args;
-  const walks = rawWalks ? /* @__PURE__ */ trimWalkString(rawWalks) : "";
-  const init2 = template ? (branch, ns) => {
+  const clone = template ? (branch, ns) => {
     ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
       template,
       ns
     ))(branch, walks);
-    setup && queueRender(branch, setup, -1);
   } : (branch) => {
     walk(
       branch.___startNode = branch.___endNode = new Text(),
       walks,
       branch
     );
-    setup && queueRender(branch, setup, -1);
   };
   return (owner) => {
     return {
       ___id: id,
-      ___init: init2,
+      ___clone: clone,
+      ___setup: setup,
       ___owner: owner,
       ___accessor: dynamicScopesAccessor,
       get ___args() {
@@ -1656,7 +1632,7 @@ function conditional(nodeAccessor, ...branches) {
         scope,
         nodeAccessor,
         branches[scope[branchAccessor] = newBranch],
-        createBranch
+        createAndSetupBranch
       );
     }
   };
@@ -1686,7 +1662,7 @@ var dynamicTag = function dynamicTag2(nodeAccessor, getContent, getTagVar, input
             scope[childScopeAccessor],
             true ? `#${normalizedRenderer}/0` : 0,
             content,
-            createBranch
+            createAndSetupBranch
           );
           if (content.___accessor) {
             subscribeToScopeSet(
@@ -1799,7 +1775,7 @@ function loop(nodeAccessor, renderer, forEach) {
     const newMap = scope[nodeAccessor + "(" /* LoopScopeMap */] = /* @__PURE__ */ new Map();
     const newArray = scope[nodeAccessor + "!" /* LoopScopeArray */] = [];
     forEach(value2, (key, args) => {
-      const branch = oldMap?.get(key) || createBranch(scope.$global, renderer, scope, parentNode);
+      const branch = oldMap?.get(key) || createAndSetupBranch(scope.$global, renderer, scope, parentNode);
       params?.(branch, args);
       newMap.set(key, branch);
       newArray.push(branch);
@@ -1819,6 +1795,28 @@ function loop(nodeAccessor, renderer, forEach) {
     reconcile(parentNode, oldArray, newArray, afterReference);
   };
 }
+function createAndSetupBranch($global, renderer, parentScope, parentNode) {
+  const branch = createBranch($global, renderer, parentScope, parentNode);
+  renderer.___setup && queueRender(branch, renderer.___setup, -1);
+  return branch;
+}
+function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentScope, parentNode) {
+  const branch = createBranch(
+    $global,
+    tagNameOrRenderer,
+    parentScope,
+    parentNode
+  );
+  if (typeof tagNameOrRenderer === "string") {
+    branch[true ? `#${tagNameOrRenderer}/0` : 0] = branch.___startNode = branch.___endNode = document.createElementNS(
+      tagNameOrRenderer === "svg" ? "http://www.w3.org/2000/svg" : tagNameOrRenderer === "math" ? "http://www.w3.org/1998/Math/MathML" : parentNode.namespaceURI,
+      tagNameOrRenderer
+    );
+  } else if (tagNameOrRenderer.___setup) {
+    queueRender(branch, tagNameOrRenderer.___setup, -1);
+  }
+  return branch;
+}
 function bySecondArg(_item, index) {
   return index;
 }
@@ -1841,7 +1839,7 @@ var compat = {
     register(RENDERER_REGISTER_ID, fn);
   },
   isRenderer(renderer) {
-    return renderer.___init;
+    return renderer.___clone;
   },
   getStartNode(branch) {
     return branch.___startNode;
@@ -1872,7 +1870,7 @@ var compat = {
   },
   createRenderer(args, clone) {
     const renderer = createRenderer(0, 0, 0, () => args);
-    renderer.___init = (branch) => {
+    renderer.___clone = (branch) => {
       const cloned = clone();
       branch.___startNode = cloned.startNode;
       branch.___endNode = cloned.endNode;
@@ -1905,6 +1903,7 @@ var compat = {
           renderer.___owner,
           document.body
         );
+        renderer.___setup && renderer.___setup(branch);
       } else {
         existing = true;
       }
@@ -1917,11 +1916,11 @@ var compat = {
 };
 
 // src/dom/template.ts
-var createTemplate = (id, template, rawWalks, setup, inputSignal) => {
+var createTemplate = (id, template, walks, setup, inputSignal) => {
   const renderer = createContent(
     id,
     template,
-    rawWalks,
+    walks,
     setup,
     inputSignal && (() => inputSignal)
   )();
@@ -1977,7 +1976,8 @@ function mount(input = {}, reference, position) {
       void 0,
       parentNode
     );
-    args?.(branch, input);
+    this.___setup && this.___setup(branch);
+    args && args(branch, input);
   });
   insertChildNodes(
     parentNode,

package/dist/dom/renderer.d.ts

@@ -2,15 +2,15 @@ import { type Accessor, type BranchScope, type Scope } from "../common/types";
 import type { Signal } from "./signals";
 export type Renderer = {
     ___id: string;
-    ___init: (branch: BranchScope, ns: string) => void;
+    ___setup: undefined | 0 | ((branch: BranchScope) => void);
+    ___clone: (branch: BranchScope, ns: string) => void;
     ___args: Signal<unknown> | undefined;
     ___owner: Scope | undefined;
     ___accessor: Accessor | undefined;
 };
 type SetupFn = (scope: Scope) => void;
-export declare function createBranchWithTagNameOrRenderer($global: Scope["$global"], tagNameOrRenderer: Renderer | string, parentScope: Scope, parentNode: ParentNode): BranchScope;
 export declare function createBranch($global: Scope["$global"], renderer: Renderer | string, parentScope: Scope | undefined, parentNode: ParentNode): BranchScope;
-export declare function createContent(id: string, template?: string | 0, rawWalks?: string | 0, setup?: SetupFn | 0, getArgs?: (() => Signal<unknown>) | 0, dynamicScopesAccessor?: Accessor): (owner?: Scope) => Renderer;
-export declare function registerContent(id: string, template?: string | 0, walks?: string | 0, setup?: SetupFn | 0, getArgs?: (() => Signal<unknown>) | 0, dynamicScopesAccessor?: Accessor): (owner?: Scope) => Renderer;
-export declare function createRenderer(template?: string | 0, walks?: string | 0, setup?: SetupFn | 0, getArgs?: (() => Signal<unknown>) | 0): Renderer;
+export declare function createContent(id: string, template: string | 0, walks?: string | 0, setup?: SetupFn | 0, getArgs?: (() => Signal<unknown>) | 0, dynamicScopesAccessor?: Accessor): (owner?: Scope) => Renderer;
+export declare function registerContent(id: string, template: string | 0, walks?: string | 0, setup?: SetupFn | 0, getArgs?: (() => Signal<unknown>) | 0, dynamicScopesAccessor?: Accessor): (owner?: Scope) => Renderer;
+export declare function createRenderer(template: string | 0, walks?: string | 0, setup?: SetupFn | 0, getArgs?: (() => Signal<unknown>) | 0): Renderer;
 export {};

package/dist/dom/template.d.ts

@@ -1,3 +1,3 @@
 import type { Scope, Template } from "../common/types";
 import type { Signal } from "./signals";
-export declare const createTemplate: (id: string, template?: string | 0, rawWalks?: string | 0, setup?: ((scope: Scope) => void) | 0, inputSignal?: Signal<unknown>) => Template;
+export declare const createTemplate: (id: string, template: string | 0, walks?: string | 0, setup?: ((scope: Scope) => void) | 0, inputSignal?: Signal<unknown>) => Template;

package/dist/dom/walker.d.ts

@@ -1,4 +1,3 @@
 import { type BranchScope } from "../common/types";
 export declare const walker: TreeWalker;
-export declare function trimWalkString(walkString: string): string;
 export declare function walk(startNode: Node, walkCodes: string, branch: BranchScope): void;