@marko/runtime-tags 0.1.9 → 0.1.10

package/dist/common/types.d.ts

@@ -19,20 +19,14 @@ export type Scope<T extends {
     [x: string | number]: any;
 } & T;
 export declare enum ResumeSymbol {
-    DefaultRuntimeId = "M",
     SectionStart = "[",
     SectionEnd = "]",
     SectionSingleNodesEnd = "|",
-    Node = "*",
-    PlaceholderStart = "",
-    PlaceholderEnd = "",
-    ReplacementId = "",
-    VarReorderRuntime = "$r"
+    Node = "*"
 }
 export declare enum AccessorChar {
     Dynamic = "?",
     Mark = "#",
-    Stale = "&",
     Subscribers = "*",
     LifecycleAbortController = "-",
     DynamicPlaceholderLastChild = "-",
@@ -41,7 +35,6 @@ export declare enum AccessorChar {
     ConditionalRenderer = "(",
     LoopScopeArray = "!",
     LoopScopeMap = "(",
-    LoopValue = ")",
     EventAttributes = "~"
 }
 export declare enum NodeType {

package/dist/debug/dom.js

@@ -1303,6 +1303,10 @@ function runBatch() {
   }
 }
 
+// src/common/meta.ts
+var DEFAULT_RUNTIME_ID = "M";
+var DEFAULT_RENDER_ID = "_";
+
 // src/dom/resume.ts
 var registeredValues = {};
 var Render = class {
@@ -1369,41 +1373,40 @@ var Render = class {
         }
       }
     }
-    const serializedScopes = data2.s;
-    if (serializedScopes) {
-      data2.s = [];
-      for (const deserializeScopes of serializedScopes) {
-        const scopes = deserializeScopes(serializeContext);
-        let { $global } = scopeLookup;
-        if (!$global) {
-          scopeLookup.$global = $global = scopes.$ || {};
-          $global.runtimeId = this.___runtimeId;
-          $global.renderId = this.___renderId;
-        }
-        for (const scopeId in scopes) {
-          if (scopeId !== "$") {
-            const scope = scopes[scopeId];
-            const prevScope = scopeLookup[scopeId];
-            scope.$global = $global;
-            if (prevScope !== scope) {
-              scopeLookup[scopeId] = Object.assign(scope, prevScope);
+    const resumes = data2.r;
+    if (resumes) {
+      data2.r = [];
+      const len = resumes.length;
+      let i = 0;
+      while (i < len) {
+        const resumeData = resumes[i++];
+        if (typeof resumeData === "function") {
+          const scopes = resumeData(serializeContext);
+          let { $global } = scopeLookup;
+          if (!$global) {
+            scopeLookup.$global = $global = scopes.$ || {};
+            $global.runtimeId = this.___runtimeId;
+            $global.renderId = this.___renderId;
+          }
+          for (const scopeId in scopes) {
+            if (scopeId !== "$") {
+              const scope = scopes[scopeId];
+              const prevScope = scopeLookup[scopeId];
+              scope.$global = $global;
+              if (prevScope !== scope) {
+                scopeLookup[scopeId] = Object.assign(scope, prevScope);
+              }
             }
           }
+        } else if (i === len || typeof resumes[i] !== "string") {
+          delete this.___renders[this.___renderId];
+        } else {
+          registeredValues[resumes[i++]](
+            scopeLookup[resumeData]
+          );
         }
       }
     }
-    const effects = data2.e;
-    if (effects) {
-      data2.e = [];
-      for (let i = 0; i < effects.length; i += 2) {
-        registeredValues[effects[i + 1]](
-          scopeLookup[effects[i]]
-        );
-      }
-    }
-    if (data2.d) {
-      delete this.___renders[this.___renderId];
-    }
   }
 };
 function register(id, obj) {
@@ -1430,7 +1433,7 @@ function getRegisteredWithScope(id, scope) {
   }
   return val;
 }
-function init(runtimeId = "M" /* DefaultRuntimeId */) {
+function init(runtimeId = DEFAULT_RUNTIME_ID) {
   if (true) {
     if (!runtimeId.match(/^[_$a-z][_$a-z0-9]*$/i)) {
       throw new Error(
@@ -1551,10 +1554,6 @@ var compat = {
 function noop() {
 }
 
-// src/common/meta.ts
-var DEFAULT_RUNTIME_ID = "M";
-var DEFAULT_RENDER_ID = "_";
-
 // src/dom/template.ts
 var createTemplate = (renderer, templateId) => register(templateId, new ClientTemplate(renderer));
 var ClientTemplate = class {

package/dist/debug/dom.mjs

@@ -1227,6 +1227,10 @@ function runBatch() {
   }
 }
 
+// src/common/meta.ts
+var DEFAULT_RUNTIME_ID = "M";
+var DEFAULT_RENDER_ID = "_";
+
 // src/dom/resume.ts
 var registeredValues = {};
 var Render = class {
@@ -1293,41 +1297,40 @@ var Render = class {
         }
       }
     }
-    const serializedScopes = data2.s;
-    if (serializedScopes) {
-      data2.s = [];
-      for (const deserializeScopes of serializedScopes) {
-        const scopes = deserializeScopes(serializeContext);
-        let { $global } = scopeLookup;
-        if (!$global) {
-          scopeLookup.$global = $global = scopes.$ || {};
-          $global.runtimeId = this.___runtimeId;
-          $global.renderId = this.___renderId;
-        }
-        for (const scopeId in scopes) {
-          if (scopeId !== "$") {
-            const scope = scopes[scopeId];
-            const prevScope = scopeLookup[scopeId];
-            scope.$global = $global;
-            if (prevScope !== scope) {
-              scopeLookup[scopeId] = Object.assign(scope, prevScope);
+    const resumes = data2.r;
+    if (resumes) {
+      data2.r = [];
+      const len = resumes.length;
+      let i = 0;
+      while (i < len) {
+        const resumeData = resumes[i++];
+        if (typeof resumeData === "function") {
+          const scopes = resumeData(serializeContext);
+          let { $global } = scopeLookup;
+          if (!$global) {
+            scopeLookup.$global = $global = scopes.$ || {};
+            $global.runtimeId = this.___runtimeId;
+            $global.renderId = this.___renderId;
+          }
+          for (const scopeId in scopes) {
+            if (scopeId !== "$") {
+              const scope = scopes[scopeId];
+              const prevScope = scopeLookup[scopeId];
+              scope.$global = $global;
+              if (prevScope !== scope) {
+                scopeLookup[scopeId] = Object.assign(scope, prevScope);
+              }
             }
           }
+        } else if (i === len || typeof resumes[i] !== "string") {
+          delete this.___renders[this.___renderId];
+        } else {
+          registeredValues[resumes[i++]](
+            scopeLookup[resumeData]
+          );
         }
       }
     }
-    const effects = data2.e;
-    if (effects) {
-      data2.e = [];
-      for (let i = 0; i < effects.length; i += 2) {
-        registeredValues[effects[i + 1]](
-          scopeLookup[effects[i]]
-        );
-      }
-    }
-    if (data2.d) {
-      delete this.___renders[this.___renderId];
-    }
   }
 };
 function register(id, obj) {
@@ -1354,7 +1357,7 @@ function getRegisteredWithScope(id, scope) {
   }
   return val;
 }
-function init(runtimeId = "M" /* DefaultRuntimeId */) {
+function init(runtimeId = DEFAULT_RUNTIME_ID) {
   if (true) {
     if (!runtimeId.match(/^[_$a-z][_$a-z0-9]*$/i)) {
       throw new Error(
@@ -1475,10 +1478,6 @@ var compat = {
 function noop() {
 }
 
-// src/common/meta.ts
-var DEFAULT_RUNTIME_ID = "M";
-var DEFAULT_RENDER_ID = "_";
-
 // src/dom/template.ts
 var createTemplate = (renderer, templateId) => register(templateId, new ClientTemplate(renderer));
 var ClientTemplate = class {

package/dist/debug/html.js

@@ -199,12 +199,12 @@ runtime.x = (op, id, node, start, placeholderCallback) => {
     // repurpose "op" for callbacks ...carefully
     placeholderCallback = placeholder.c;
     (op = runtime.j[id]) &&
-      (placeholder.c = () => placeholderCallback() + op());
+      (placeholder.c = () => placeholderCallback() + op(runtime));
 
     if (node.attributes.c) placeholder.c();
   }
 };
-})` : `(e=>{let t,i,r,l,o={},a=(e,t)=>{e.replaceWith(...t.childNodes),t.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,n,c,p,b)=>{"#"==d?(o[n]=i).i++:c==r&&t(),"T"==c.tagName&&(n=c.getAttribute(e.i))&&((p=e.l["^"+n])?i=o[n]={i:0,c(t=e.l[n]||l||c){for(;t.parentNode!==p.parentNode;)t=t.parentNode;for(;t!=r;(r=p.nextSibling).remove());a(p,c)}}:(t=()=>{l=c.previousSibling,a(e.l[n],c),--p.i||p.c()},p=i=o[n],r=c.nextElementSibling||t()),b=i.c,(d=e.j[n])&&(i.c=()=>b()+d()),c.attributes.c&&i.c())}})`;
+})` : `(e=>{let i,t,r,l,d={},n=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(o,a,c,p,b)=>{"#"==o?(d[a]=t).i++:c==r&&i(),"T"==c.tagName&&(a=c.getAttribute(e.i))&&((p=e.l["^"+a])?t=d[a]={i:0,c(i=e.l[a]||l||c){for(;i.parentNode!==p.parentNode;)i=i.parentNode;for(;i!=r;(r=p.nextSibling).remove());n(p,c)}}:(i=()=>{l=c.previousSibling,n(e.l[a],c),--p.i||p.c()},p=t=d[a],r=c.nextElementSibling||i()),b=t.c,(o=e.j[a])&&(t.c=()=>b()+o(e)),c.attributes.c&&t.c())}})`;
 
 // src/html/serializer.ts
 var { hasOwnProperty } = {};
@@ -481,6 +481,9 @@ var Reference = class {
 };
 var Serializer = class {
   #state = new State();
+  get flushed() {
+    return this.#state.flushed;
+  }
   stringify(val, boundary) {
     try {
       this.#state.flushed = false;
@@ -490,8 +493,13 @@ var Serializer = class {
       this.#flush();
     }
   }
-  get flushed() {
-    return this.#state.flushed;
+  nextId() {
+    return nextId(this.#state);
+  }
+  symbol(id) {
+    const symbol = Symbol();
+    this.#state.refs.set(symbol, new Reference(null, null, 0, null, id));
+    return symbol;
   }
   #flush() {
     this.#state.flush++;
@@ -1278,12 +1286,15 @@ function assignId(state, ref) {
   return ref.id + "=" + accessPrevValue;
 }
 function nextRefAccess(state) {
+  return "_." + nextId(state);
+}
+function nextId(state) {
   const encodeChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789";
   const encodeLen = encodeChars.length;
   const encodeStartLen = encodeLen - 11;
   let index = state.ids++;
   let mod = index % encodeStartLen;
-  let id = "_." + encodeChars[mod];
+  let id = encodeChars[mod];
   index = (index - mod) / encodeStartLen;
   while (index > 0) {
     mod = index % encodeLen;
@@ -1534,8 +1545,7 @@ var State2 = class {
   needsMainRuntime = false;
   hasMainRuntime = false;
   hasReorderRuntime = false;
-  hasWrittenScopes = false;
-  hasWrittenEffects = false;
+  hasWrittenResume = false;
   serializer = new Serializer();
   writeReorders = null;
   scopes = /* @__PURE__ */ new Map();
@@ -1719,31 +1729,31 @@ function prepareChunk(chunk) {
       WALKER_RUNTIME_CODE + '("' + $global.runtimeId + '")("' + $global.renderId + '")'
     );
   }
+  let resumes = "";
   if (state.writeScopes || serializer.flushed) {
-    const serialized = state.serializer.stringify(
-      state.writeScopes || {},
-      boundary
-    );
-    let script = runtimePrefix + ".s" /* Scopes */;
+    resumes = state.serializer.stringify(state.writeScopes || {}, boundary);
     state.writeScopes = null;
-    if (state.hasWrittenScopes) {
-      script += ".push(" + serialized + ")";
-    } else {
-      state.hasWrittenScopes = true;
-      script += "=[" + serialized + "]";
-    }
-    scripts = concatScripts(scripts, script);
   }
   if (effects) {
-    let script = runtimePrefix + ".e" /* Effects */;
     hasWalk = true;
-    if (state.hasWrittenEffects) {
-      script += ".push(" + effects + ")";
+    resumes = resumes ? resumes + "," + effects : effects;
+  }
+  if (boundary.done && (resumes || state.hasWrittenResume)) {
+    resumes = resumes ? resumes + ",0" : "0";
+  }
+  if (resumes) {
+    if (state.hasWrittenResume) {
+      scripts = concatScripts(
+        scripts,
+        runtimePrefix + ".r.push(" + resumes + ")"
+      );
     } else {
-      state.hasWrittenEffects = true;
-      script += "=[" + effects + "]";
+      state.hasWrittenResume = true;
+      scripts = concatScripts(
+        scripts,
+        runtimePrefix + ".r=[" + resumes + "]"
+      );
     }
-    scripts = concatScripts(scripts, script);
   }
   if (state.writeReorders) {
     hasWalk = true;
@@ -1783,29 +1793,26 @@ function prepareChunk(chunk) {
         }
       }
       if (reorderEffects) {
-        if (!state.hasWrittenEffects) {
-          state.hasWrittenEffects = true;
+        if (!state.hasWrittenResume) {
+          state.hasWrittenResume = true;
           scripts = concatScripts(
             scripts,
-            runtimePrefix + ".e=[]"
+            runtimePrefix + ".r=[]"
           );
         }
         reorderScripts = concatScripts(
           reorderScripts,
-          runtimePrefix + ".e.push(" + reorderEffects + ")"
+          "_.push(" + reorderEffects + ")"
         );
       }
       scripts = concatScripts(
         scripts,
-        reorderScripts && runtimePrefix + ".j." + reorderId + "=()=>{" + reorderScripts + "}"
+        reorderScripts && runtimePrefix + ".j." + reorderId + "=_=>{" + reorderScripts + "}"
       );
       html += "<t " + (isSync ? "c " : "") + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
     }
     state.writeReorders = null;
   }
-  if (state.needsMainRuntime && boundary.done) {
-    scripts = concatScripts(scripts, runtimePrefix + ".d=1");
-  }
   if (hasWalk) {
     scripts = concatScripts(scripts, runtimePrefix + ".w()");
   }

package/dist/debug/html.mjs

@@ -144,12 +144,12 @@ runtime.x = (op, id, node, start, placeholderCallback) => {
     // repurpose "op" for callbacks ...carefully
     placeholderCallback = placeholder.c;
     (op = runtime.j[id]) &&
-      (placeholder.c = () => placeholderCallback() + op());
+      (placeholder.c = () => placeholderCallback() + op(runtime));
 
     if (node.attributes.c) placeholder.c();
   }
 };
-})` : `(e=>{let t,i,r,l,o={},a=(e,t)=>{e.replaceWith(...t.childNodes),t.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,n,c,p,b)=>{"#"==d?(o[n]=i).i++:c==r&&t(),"T"==c.tagName&&(n=c.getAttribute(e.i))&&((p=e.l["^"+n])?i=o[n]={i:0,c(t=e.l[n]||l||c){for(;t.parentNode!==p.parentNode;)t=t.parentNode;for(;t!=r;(r=p.nextSibling).remove());a(p,c)}}:(t=()=>{l=c.previousSibling,a(e.l[n],c),--p.i||p.c()},p=i=o[n],r=c.nextElementSibling||t()),b=i.c,(d=e.j[n])&&(i.c=()=>b()+d()),c.attributes.c&&i.c())}})`;
+})` : `(e=>{let i,t,r,l,d={},n=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(o,a,c,p,b)=>{"#"==o?(d[a]=t).i++:c==r&&i(),"T"==c.tagName&&(a=c.getAttribute(e.i))&&((p=e.l["^"+a])?t=d[a]={i:0,c(i=e.l[a]||l||c){for(;i.parentNode!==p.parentNode;)i=i.parentNode;for(;i!=r;(r=p.nextSibling).remove());n(p,c)}}:(i=()=>{l=c.previousSibling,n(e.l[a],c),--p.i||p.c()},p=t=d[a],r=c.nextElementSibling||i()),b=t.c,(o=e.j[a])&&(t.c=()=>b()+o(e)),c.attributes.c&&t.c())}})`;
 
 // src/html/serializer.ts
 var { hasOwnProperty } = {};
@@ -426,6 +426,9 @@ var Reference = class {
 };
 var Serializer = class {
   #state = new State();
+  get flushed() {
+    return this.#state.flushed;
+  }
   stringify(val, boundary) {
     try {
       this.#state.flushed = false;
@@ -435,8 +438,13 @@ var Serializer = class {
       this.#flush();
     }
   }
-  get flushed() {
-    return this.#state.flushed;
+  nextId() {
+    return nextId(this.#state);
+  }
+  symbol(id) {
+    const symbol = Symbol();
+    this.#state.refs.set(symbol, new Reference(null, null, 0, null, id));
+    return symbol;
   }
   #flush() {
     this.#state.flush++;
@@ -1223,12 +1231,15 @@ function assignId(state, ref) {
   return ref.id + "=" + accessPrevValue;
 }
 function nextRefAccess(state) {
+  return "_." + nextId(state);
+}
+function nextId(state) {
   const encodeChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789";
   const encodeLen = encodeChars.length;
   const encodeStartLen = encodeLen - 11;
   let index = state.ids++;
   let mod = index % encodeStartLen;
-  let id = "_." + encodeChars[mod];
+  let id = encodeChars[mod];
   index = (index - mod) / encodeStartLen;
   while (index > 0) {
     mod = index % encodeLen;
@@ -1479,8 +1490,7 @@ var State2 = class {
   needsMainRuntime = false;
   hasMainRuntime = false;
   hasReorderRuntime = false;
-  hasWrittenScopes = false;
-  hasWrittenEffects = false;
+  hasWrittenResume = false;
   serializer = new Serializer();
   writeReorders = null;
   scopes = /* @__PURE__ */ new Map();
@@ -1664,31 +1674,31 @@ function prepareChunk(chunk) {
       WALKER_RUNTIME_CODE + '("' + $global.runtimeId + '")("' + $global.renderId + '")'
     );
   }
+  let resumes = "";
   if (state.writeScopes || serializer.flushed) {
-    const serialized = state.serializer.stringify(
-      state.writeScopes || {},
-      boundary
-    );
-    let script = runtimePrefix + ".s" /* Scopes */;
+    resumes = state.serializer.stringify(state.writeScopes || {}, boundary);
     state.writeScopes = null;
-    if (state.hasWrittenScopes) {
-      script += ".push(" + serialized + ")";
-    } else {
-      state.hasWrittenScopes = true;
-      script += "=[" + serialized + "]";
-    }
-    scripts = concatScripts(scripts, script);
   }
   if (effects) {
-    let script = runtimePrefix + ".e" /* Effects */;
     hasWalk = true;
-    if (state.hasWrittenEffects) {
-      script += ".push(" + effects + ")";
+    resumes = resumes ? resumes + "," + effects : effects;
+  }
+  if (boundary.done && (resumes || state.hasWrittenResume)) {
+    resumes = resumes ? resumes + ",0" : "0";
+  }
+  if (resumes) {
+    if (state.hasWrittenResume) {
+      scripts = concatScripts(
+        scripts,
+        runtimePrefix + ".r.push(" + resumes + ")"
+      );
     } else {
-      state.hasWrittenEffects = true;
-      script += "=[" + effects + "]";
+      state.hasWrittenResume = true;
+      scripts = concatScripts(
+        scripts,
+        runtimePrefix + ".r=[" + resumes + "]"
+      );
     }
-    scripts = concatScripts(scripts, script);
   }
   if (state.writeReorders) {
     hasWalk = true;
@@ -1728,29 +1738,26 @@ function prepareChunk(chunk) {
         }
       }
       if (reorderEffects) {
-        if (!state.hasWrittenEffects) {
-          state.hasWrittenEffects = true;
+        if (!state.hasWrittenResume) {
+          state.hasWrittenResume = true;
           scripts = concatScripts(
             scripts,
-            runtimePrefix + ".e=[]"
+            runtimePrefix + ".r=[]"
           );
         }
         reorderScripts = concatScripts(
           reorderScripts,
-          runtimePrefix + ".e.push(" + reorderEffects + ")"
+          "_.push(" + reorderEffects + ")"
         );
       }
       scripts = concatScripts(
         scripts,
-        reorderScripts && runtimePrefix + ".j." + reorderId + "=()=>{" + reorderScripts + "}"
+        reorderScripts && runtimePrefix + ".j." + reorderId + "=_=>{" + reorderScripts + "}"
       );
       html += "<t " + (isSync ? "c " : "") + state.commentPrefix + "=" + reorderId + ">" + reorderHTML + "</t>";
     }
     state.writeReorders = null;
   }
-  if (state.needsMainRuntime && boundary.done) {
-    scripts = concatScripts(scripts, runtimePrefix + ".d=1");
-  }
   if (hasWalk) {
     scripts = concatScripts(scripts, runtimePrefix + ".w()");
   }

package/dist/dom/resume.d.ts

@@ -1,9 +1,9 @@
-import { ResumeSymbol, type Scope } from "../common/types";
+import { type Scope } from "../common/types";
 import type { Renderer } from "./renderer";
 import type { IntersectionSignal, ValueSignal } from "./signals";
 export declare function register<T>(id: string, obj: T): T;
 export declare function registerBoundSignal<T extends ValueSignal>(id: string, signal: T): T;
 export declare function registerRenderer(id: string, renderer: Renderer): Renderer;
 export declare function getRegisteredWithScope(id: string, scope?: Scope): unknown;
-export declare function init(runtimeId?: ResumeSymbol): void;
+export declare function init(runtimeId?: string): void;
 export declare function registerSubscriber(id: string, signal: IntersectionSignal): IntersectionSignal;