@marko/runtime-tags 0.3.49 → 0.3.50

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);
@@ -1432,11 +1427,8 @@ function createBranch($global, renderer, parentScope, parentNode) {
   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;
@@ -1447,9 +1439,9 @@ function createBranch($global, renderer, parentScope, parentNode) {
   );
   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) => {
     ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
       template,
@@ -2002,11 +1994,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)
   )();

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);
@@ -1347,11 +1342,8 @@ function createBranch($global, renderer, parentScope, parentNode) {
   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;
@@ -1362,9 +1354,9 @@ function createBranch($global, renderer, parentScope, parentNode) {
   );
   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) => {
     ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
       template,
@@ -1917,11 +1909,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)
   )();

package/dist/dom/renderer.d.ts

@@ -10,7 +10,7 @@ export type Renderer = {
 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;

package/dist/dom.js

@@ -201,17 +201,17 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 var registeredValues = {}, Render = class {
   p = [];
   q = {};
-  C = {
+  B = {
     _: registeredValues
   };
   constructor(renders, runtimeId, renderId) {
-    this.D = renders, this.E = runtimeId, this.s = renderId, this.t = renders[renderId], this.u();
+    this.C = renders, this.D = runtimeId, this.s = renderId, this.t = renders[renderId], this.u();
   }
   w() {
     this.t.w(), this.u();
   }
   u() {
-    let data2 = this.t, serializeContext = this.C, scopeLookup = this.q, visits = data2.v, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map();
+    let data2 = this.t, serializeContext = this.B, scopeLookup = this.q, visits = data2.v, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map();
     if (visits.length) {
       let commentPrefixLen = data2.i.length, closestBranchMarkers = /* @__PURE__ */ new Map(), visitNodes = new Set(visits), lastEndNode;
       data2.v = [];
@@ -263,7 +263,7 @@ var registeredValues = {}, Render = class {
           let resumeData = resumes[i++];
           if (typeof resumeData == "function") {
             let scopes = resumeData(serializeContext), { $global } = scopeLookup;
-            $global || (scopeLookup.$global = $global = scopes.$ || {}, $global.runtimeId = this.E, $global.renderId = this.s, $global.g = 1e6);
+            $global || (scopeLookup.$global = $global = scopes.$ || {}, $global.runtimeId = this.D, $global.renderId = this.s, $global.g = 1e6);
             for (let scopeId in scopes)
               if (scopeId !== "$") {
                 let scope = scopes[scopeId], prevScope = scopeLookup[scopeId];
@@ -277,7 +277,7 @@ var registeredValues = {}, Render = class {
                   scope.c = branch, parentBranch && (branch.x = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch));
                 }
               }
-          } else i === len || typeof resumes[i] != "string" ? delete this.D[this.s] : registeredValues[resumes[i++]](
+          } else i === len || typeof resumes[i] != "string" ? delete this.C[this.s] : registeredValues[resumes[i++]](
             scopeLookup[resumeData],
             scopeLookup[resumeData]
           );
@@ -732,7 +732,7 @@ function destroyBranch(branch) {
   branch.x?.n?.delete(branch), destroyNestedBranches(branch);
 }
 function destroyNestedBranches(branch) {
-  branch.y = 1, branch.n?.forEach(destroyNestedBranches), branch.F?.forEach((scope) => {
+  branch.y = 1, branch.n?.forEach(destroyNestedBranches), branch.E?.forEach((scope) => {
     for (let id in scope.k)
       scope.k[id]?.abort();
   });
@@ -759,7 +759,7 @@ function queueRender(scope, signal, signalKey, value2, scopeKey = scope.d) {
     let render = {
       j: key,
       A: scope,
-      G: signal,
+      F: signal,
       z: value2
     }, i = pendingRenders.push(render) - 1;
     for (; i; ) {
@@ -812,7 +812,7 @@ function runRenders() {
       }
       pendingRenders[i] = item;
     }
-    render.A.c?.y || render.G(render.A, render.z);
+    render.A.c?.y || render.F(render.A, render.z);
   }
   finishPendingScopes();
 }
@@ -823,7 +823,7 @@ function resetAbortSignal(scope, id) {
   ctrl && (queueEffect(ctrl, abort), scope.k[id] = void 0);
 }
 function getAbortSignal(scope, id) {
-  return scope.c && (scope.c.F ||= /* @__PURE__ */ new Set()).add(scope), ((scope.k ||= {})[id] ||= new AbortController()).signal;
+  return scope.c && (scope.c.E ||= /* @__PURE__ */ new Set()).add(scope), ((scope.k ||= {})[id] ||= new AbortController()).signal;
 }
 function abort(ctrl) {
   ctrl.abort();
@@ -909,11 +909,6 @@ function longestIncreasingSubsequence(a) {
 
 // src/dom/walker.ts
 var walker = /* @__PURE__ */ document.createTreeWalker(document);
-function trimWalkString(walkString) {
-  let end = walkString.length;
-  for (; walkString.charCodeAt(--end) > 49 /* DynamicTagWithVar */; ) ;
-  return walkString.slice(0, end + 1);
-}
 function walk(startNode, walkCodes, branch) {
   walker.currentNode = startNode, walkInternal(0, walkCodes, branch);
 }
@@ -966,13 +961,14 @@ function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentSco
 }
 function createBranch($global, renderer, parentScope, parentNode) {
   let branch = createScope($global), parentBranch = parentScope?.c;
-  return branch._ = renderer.l || parentScope, branch.c = branch, parentBranch ? (branch.B = parentBranch.B + 1, branch.x = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch)) : branch.B = 1, renderer.o?.(
+  return branch._ = renderer.l || parentScope, branch.c = branch, parentBranch && (branch.x = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch)), renderer.o?.(
     branch,
     parentNode.namespaceURI
   ), branch;
 }
-function createContent(id, template, rawWalks, setup, getArgs, dynamicScopesAccessor) {
-  let args, walks = rawWalks ? /* @__PURE__ */ trimWalkString(rawWalks) : "", init2 = template ? (branch, ns) => {
+function createContent(id, template, walks, setup, getArgs, dynamicScopesAccessor) {
+  walks = walks ? walks.replace(/[^\0-1]+$/, "") : "";
+  let args, init2 = template ? (branch, ns) => {
     ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
       template,
       ns
@@ -1097,7 +1093,7 @@ function dynamicClosure(valueAccessor, fn, getOwnerScope) {
     if (subscribers)
       for (let subscriber of subscribers)
         subscriber.h || queueRender(subscriber, childSignal, -1);
-  }, subscribe = ownerSignal.H = (scope) => subscribeToScopeSet(
+  }, subscribe = ownerSignal.G = (scope) => subscribeToScopeSet(
     getOwnerScope ? getOwnerScope(scope) : scope._,
     subscribersAccessor,
     scope
@@ -1108,7 +1104,7 @@ function dynamicClosure(valueAccessor, fn, getOwnerScope) {
 }
 function registerDynamicClosure(registryId, valueAccessor, fn, getOwnerScope) {
   let signal = dynamicClosure(valueAccessor, fn, getOwnerScope);
-  return register(registryId, signal.H), signal;
+  return register(registryId, signal.G), signal;
 }
 function closure(valueAccessor, fn, getOwnerScope) {
   return (scope) => {
@@ -1333,11 +1329,11 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
 };
 
 // src/dom/template.ts
-var createTemplate = (id, template, rawWalks, setup, inputSignal) => {
+var createTemplate = (id, template, walks, setup, inputSignal) => {
   let renderer = createContent(
     id,
     template,
-    rawWalks,
+    walks,
     setup,
     inputSignal && (() => inputSignal)
   )();

package/dist/dom.mjs

@@ -119,17 +119,17 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 var registeredValues = {}, Render = class {
   p = [];
   q = {};
-  C = {
+  B = {
     _: registeredValues
   };
   constructor(renders, runtimeId, renderId) {
-    this.D = renders, this.E = runtimeId, this.s = renderId, this.t = renders[renderId], this.u();
+    this.C = renders, this.D = runtimeId, this.s = renderId, this.t = renders[renderId], this.u();
   }
   w() {
     this.t.w(), this.u();
   }
   u() {
-    let data2 = this.t, serializeContext = this.C, scopeLookup = this.q, visits = data2.v, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map();
+    let data2 = this.t, serializeContext = this.B, scopeLookup = this.q, visits = data2.v, branchIds = /* @__PURE__ */ new Set(), parentBranchIds = /* @__PURE__ */ new Map();
     if (visits.length) {
       let commentPrefixLen = data2.i.length, closestBranchMarkers = /* @__PURE__ */ new Map(), visitNodes = new Set(visits), lastEndNode;
       data2.v = [];
@@ -181,7 +181,7 @@ var registeredValues = {}, Render = class {
           let resumeData = resumes[i++];
           if (typeof resumeData == "function") {
             let scopes = resumeData(serializeContext), { $global } = scopeLookup;
-            $global || (scopeLookup.$global = $global = scopes.$ || {}, $global.runtimeId = this.E, $global.renderId = this.s, $global.g = 1e6);
+            $global || (scopeLookup.$global = $global = scopes.$ || {}, $global.runtimeId = this.D, $global.renderId = this.s, $global.g = 1e6);
             for (let scopeId in scopes)
               if (scopeId !== "$") {
                 let scope = scopes[scopeId], prevScope = scopeLookup[scopeId];
@@ -195,7 +195,7 @@ var registeredValues = {}, Render = class {
                   scope.c = branch, parentBranch && (branch.x = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch));
                 }
               }
-          } else i === len || typeof resumes[i] != "string" ? delete this.D[this.s] : registeredValues[resumes[i++]](
+          } else i === len || typeof resumes[i] != "string" ? delete this.C[this.s] : registeredValues[resumes[i++]](
             scopeLookup[resumeData],
             scopeLookup[resumeData]
           );
@@ -650,7 +650,7 @@ function destroyBranch(branch) {
   branch.x?.n?.delete(branch), destroyNestedBranches(branch);
 }
 function destroyNestedBranches(branch) {
-  branch.y = 1, branch.n?.forEach(destroyNestedBranches), branch.F?.forEach((scope) => {
+  branch.y = 1, branch.n?.forEach(destroyNestedBranches), branch.E?.forEach((scope) => {
     for (let id in scope.k)
       scope.k[id]?.abort();
   });
@@ -677,7 +677,7 @@ function queueRender(scope, signal, signalKey, value2, scopeKey = scope.d) {
     let render = {
       j: key,
       A: scope,
-      G: signal,
+      F: signal,
       z: value2
     }, i = pendingRenders.push(render) - 1;
     for (; i; ) {
@@ -730,7 +730,7 @@ function runRenders() {
       }
       pendingRenders[i] = item;
     }
-    render.A.c?.y || render.G(render.A, render.z);
+    render.A.c?.y || render.F(render.A, render.z);
   }
   finishPendingScopes();
 }
@@ -741,7 +741,7 @@ function resetAbortSignal(scope, id) {
   ctrl && (queueEffect(ctrl, abort), scope.k[id] = void 0);
 }
 function getAbortSignal(scope, id) {
-  return scope.c && (scope.c.F ||= /* @__PURE__ */ new Set()).add(scope), ((scope.k ||= {})[id] ||= new AbortController()).signal;
+  return scope.c && (scope.c.E ||= /* @__PURE__ */ new Set()).add(scope), ((scope.k ||= {})[id] ||= new AbortController()).signal;
 }
 function abort(ctrl) {
   ctrl.abort();
@@ -827,11 +827,6 @@ function longestIncreasingSubsequence(a) {
 
 // src/dom/walker.ts
 var walker = /* @__PURE__ */ document.createTreeWalker(document);
-function trimWalkString(walkString) {
-  let end = walkString.length;
-  for (; walkString.charCodeAt(--end) > 49 /* DynamicTagWithVar */; ) ;
-  return walkString.slice(0, end + 1);
-}
 function walk(startNode, walkCodes, branch) {
   walker.currentNode = startNode, walkInternal(0, walkCodes, branch);
 }
@@ -884,13 +879,14 @@ function createBranchWithTagNameOrRenderer($global, tagNameOrRenderer, parentSco
 }
 function createBranch($global, renderer, parentScope, parentNode) {
   let branch = createScope($global), parentBranch = parentScope?.c;
-  return branch._ = renderer.l || parentScope, branch.c = branch, parentBranch ? (branch.B = parentBranch.B + 1, branch.x = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch)) : branch.B = 1, renderer.o?.(
+  return branch._ = renderer.l || parentScope, branch.c = branch, parentBranch && (branch.x = parentBranch, (parentBranch.n ||= /* @__PURE__ */ new Set()).add(branch)), renderer.o?.(
     branch,
     parentNode.namespaceURI
   ), branch;
 }
-function createContent(id, template, rawWalks, setup, getArgs, dynamicScopesAccessor) {
-  let args, walks = rawWalks ? /* @__PURE__ */ trimWalkString(rawWalks) : "", init2 = template ? (branch, ns) => {
+function createContent(id, template, walks, setup, getArgs, dynamicScopesAccessor) {
+  walks = walks ? walks.replace(/[^\0-1]+$/, "") : "";
+  let args, init2 = template ? (branch, ns) => {
     ((cloneCache[ns] ||= {})[template] ||= createCloneableHTML(
       template,
       ns
@@ -1015,7 +1011,7 @@ function dynamicClosure(valueAccessor, fn, getOwnerScope) {
     if (subscribers)
       for (let subscriber of subscribers)
         subscriber.h || queueRender(subscriber, childSignal, -1);
-  }, subscribe = ownerSignal.H = (scope) => subscribeToScopeSet(
+  }, subscribe = ownerSignal.G = (scope) => subscribeToScopeSet(
     getOwnerScope ? getOwnerScope(scope) : scope._,
     subscribersAccessor,
     scope
@@ -1026,7 +1022,7 @@ function dynamicClosure(valueAccessor, fn, getOwnerScope) {
 }
 function registerDynamicClosure(registryId, valueAccessor, fn, getOwnerScope) {
   let signal = dynamicClosure(valueAccessor, fn, getOwnerScope);
-  return register(registryId, signal.H), signal;
+  return register(registryId, signal.G), signal;
 }
 function closure(valueAccessor, fn, getOwnerScope) {
   return (scope) => {
@@ -1251,11 +1247,11 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
 };
 
 // src/dom/template.ts
-var createTemplate = (id, template, rawWalks, setup, inputSignal) => {
+var createTemplate = (id, template, walks, setup, inputSignal) => {
   let renderer = createContent(
     id,
     template,
-    rawWalks,
+    walks,
     setup,
     inputSignal && (() => inputSignal)
   )();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/runtime-tags",
-  "version": "0.3.49",
+  "version": "0.3.50",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",

package/tag-types/script.d.marko

@@ -1,5 +1,5 @@
 /** File for types only, not actual implementation **/
 
 export interface Input {
-  value?(): void;
+  value?(): unknown;
 }