marko 6.0.95 → 6.0.97

package/dist/debug/html.js

@@ -625,13 +625,15 @@ var KNOWN_OBJECTS = /* @__PURE__ */ new Map([
 var State = class {
   ids = 0;
   flush = 0;
+  registerInstanceId = 0;
   flushed = false;
   wroteUndefined = false;
   buf = [];
   refs = /* @__PURE__ */ new WeakMap();
   assigned = /* @__PURE__ */ new Set();
+  registered = [];
   boundary = void 0;
-  mutations = [];
+  mutated = [];
 };
 var Reference = class {
   constructor(parent, accessor, flush, pos = null, id = null) {
@@ -646,7 +648,7 @@ var Reference = class {
     this.pos = pos;
     this.id = id;
   }
-  init = "";
+  registered = null;
   assigns = null;
 };
 var DEBUG = /* @__PURE__ */ new WeakMap();
@@ -678,7 +680,7 @@ var Serializer = class {
   }
   writeCall(value, object, property, spread) {
     const state = this.#state;
-    state.mutations.push({
+    state.mutated.push({
       type: 0 /* call */,
       value,
       object,
@@ -689,7 +691,7 @@ var Serializer = class {
   }
   writeAssign(value, object, property) {
     const state = this.#state;
-    state.mutations.push({
+    state.mutated.push({
       type: 1 /* assign */,
       value,
       object,
@@ -697,13 +699,21 @@ var Serializer = class {
     });
     state.flushed = true;
   }
+  register(id, val, scope) {
+    return register(
+      id,
+      val,
+      scope,
+      scope ? ++this.#state.registerInstanceId : 0
+    );
+  }
 };
-function register(id, val, scope) {
+function register(id, val, scope, instanceId) {
   REGISTRY.set(val, {
     id,
     scope,
-    access: "_._" + toAccess(toObjectKey(id)),
-    getter: false
+    instanceId: instanceId ?? 0,
+    access: "_._" + toAccess(toObjectKey(id))
   });
   return val;
 }
@@ -714,7 +724,7 @@ function getRegistered(val) {
   }
 }
 function writeRoot(state, root) {
-  const { buf, assigned, mutations } = state;
+  const { buf } = state;
   const hadBuf = buf.length !== 0;
   let result = "";
   if (hadBuf) {
@@ -724,8 +734,8 @@ function writeRoot(state, root) {
     const rootRef = state.refs.get(root);
     if (rootRef) {
       const rootId = ensureId(state, rootRef);
-      if (assigned.size || mutations.length) {
-        assigned.delete(rootRef);
+      if (state.assigned.size || state.registered.length || state.mutated.length) {
+        state.assigned.delete(rootRef);
         writeAssigned(state);
         buf.push(
           "," + (rootRef.assigns ? assignsToString(rootRef.assigns, rootId) : rootId)
@@ -754,27 +764,30 @@ function writeRoot(state, root) {
 }
 function writeAssigned(state) {
   if (state.assigned.size) {
-    let inits = "";
-    let assigns = "";
-    for (const valueRef of state.assigned) {
-      if (valueRef.init) {
-        inits += "," + (valueRef.assigns ? assignsToString(valueRef.assigns, valueRef.init) : valueRef.init);
-        valueRef.init = "";
-      } else if (valueRef.assigns) {
-        assigns += "," + assignsToString(valueRef.assigns, valueRef.id);
-      }
-      valueRef.assigns = null;
-    }
-    if (assigns) {
-      state.buf.push(assigns);
-    }
-    if (inits) {
-      state.buf.push(inits);
+    let buf = "";
+    for (const ref of state.assigned) {
+      buf += "," + assignsToString(ref.assigns, ref.id);
+      ref.assigns = null;
     }
+    state.buf.push(buf);
     state.assigned = /* @__PURE__ */ new Set();
   }
-  if (state.mutations.length) {
-    for (const mutation of state.mutations) {
+  if (state.registered.length) {
+    let buf = "";
+    for (const ref of state.registered.sort(compareRegisteredReferences)) {
+      const scopeRef = state.refs.get(ref.registered.scope);
+      buf += "," + assignsToString(
+        ref.assigns,
+        ref.registered.access + "(" + (scopeRef ? ensureId(state, scopeRef) : ref.assigns[0]) + ")"
+      );
+      ref.assigns = null;
+      ref.registered = null;
+    }
+    state.buf.push(buf);
+    state.registered = [];
+  }
+  if (state.mutated.length) {
+    for (const mutation of state.mutated) {
       const hasSeen = state.refs.get(mutation.object)?.id;
       const objectStartIndex = state.buf.push(
         state.buf.length === 0 ? "" : ","
@@ -811,8 +824,8 @@ function writeAssigned(state) {
         state.buf.push(")");
       }
     }
-    state.mutations = [];
-    if (state.assigned.size) {
+    state.mutated = [];
+    if (state.assigned.size || state.registered.length) {
       writeAssigned(state);
     }
   }
@@ -841,17 +854,16 @@ function writeProp(state, val, parent, accessor) {
 function writeReferenceOr(state, write, val, parent, accessor) {
   let ref = state.refs.get(val);
   if (ref) {
-    if (ref.init) {
-      addAssignment(ref, ensureId(state, parent) + toAccess(accessor));
-      return false;
-    }
-    if (isCircular(parent, ref)) {
-      if (!ref.assigns) {
+    if (parent) {
+      if (ref.assigns) {
+        addAssignment(ref, ensureId(state, parent) + toAccess(accessor));
+        return false;
+      } else if (isCircular(parent, ref)) {
         ensureId(state, ref);
         state.assigned.add(ref);
+        addAssignment(ref, ensureId(state, parent) + toAccess(accessor));
+        return false;
       }
-      addAssignment(ref, ensureId(state, parent) + toAccess(accessor));
-      return false;
     }
     state.buf.push(ensureId(state, ref));
     return true;
@@ -870,55 +882,21 @@ function writeReferenceOr(state, write, val, parent, accessor) {
   state.refs.delete(val);
   return false;
 }
-function writeRegistered(state, val, parent, accessor, { access, scope, getter }) {
-  if (scope) {
-    const scopeRef = state.refs.get(scope);
+function writeRegistered(state, val, parent, accessor, registered) {
+  if (parent && registered.scope) {
     const fnRef = new Reference(
       parent,
       accessor,
       state.flush,
       state.buf.length
     );
+    fnRef.registered = registered;
     state.refs.set(val, fnRef);
-    if (getter) {
-      if (scopeRef) {
-        state.buf.push("()=>" + ensureId(state, scopeRef) + access);
-        return true;
-      }
-      state.buf.push("(s=>()=>s" + access + ")(");
-      writeProp(state, scope, parent, "");
-      state.buf.push(")");
-      const newScopeRef = state.refs.get(scope);
-      if (newScopeRef) ensureId(state, newScopeRef);
-      return true;
-    }
-    if (scopeRef) {
-      if (parent && (state.assigned.has(scopeRef) || isCircular(parent, scopeRef))) {
-        state.assigned.add(parent);
-        state.assigned.add(fnRef);
-        fnRef.init = access + "(" + ensureId(state, scopeRef) + ")";
-        addAssignment(fnRef, ensureId(state, parent) + toAccess(accessor));
-        return false;
-      }
-      state.buf.push(access + "(" + ensureId(state, scopeRef) + ")");
-    } else {
-      const pos = state.buf.push("") - 1;
-      const assigns = state.assigned.size;
-      writeProp(state, scope, parent, "");
-      const scopeRef2 = parent && state.refs.get(scope);
-      const scopeId = scopeRef2 && ensureId(state, scopeRef2);
-      if (scopeId && assigns !== state.assigned.size) {
-        state.assigned.add(parent);
-        state.assigned.add(fnRef);
-        fnRef.init = access + "(" + scopeId + ")";
-        addAssignment(fnRef, ensureId(state, parent) + toAccess(accessor));
-      } else {
-        state.buf[pos] = access + "(" + state.buf[pos];
-        state.buf.push(")");
-      }
-    }
+    state.registered.push(fnRef);
+    addAssignment(fnRef, ensureId(state, parent) + toAccess(accessor));
+    return !state.refs.has(registered.scope) && writeProp(state, registered.scope, null, "");
   } else {
-    state.buf.push(access);
+    state.buf.push(registered.access);
   }
   return true;
 }
@@ -1731,6 +1709,9 @@ function patchIteratorNext(proto) {
     return next.call(this, value);
   };
 }
+function compareRegisteredReferences(a, b) {
+  return a.registered.instanceId - b.registered.instanceId;
+}
 
 // src/html/writer.ts
 var $chunk;
@@ -1819,7 +1800,11 @@ function _var(parentScopeId, scopeOffsetAccessor, childScopeId, registryId) {
   );
 }
 function _resume(val, id, scopeId) {
-  return scopeId === void 0 ? register(id, val) : register(id, val, _scope_with_id(scopeId));
+  return scopeId === void 0 ? register(id, val) : $chunk.boundary.state.serializer.register(
+    id,
+    val,
+    _scope_with_id(scopeId)
+  );
 }
 function _id() {
   const state = $chunk.boundary.state;

package/dist/debug/html.mjs

@@ -533,13 +533,15 @@ var KNOWN_OBJECTS = /* @__PURE__ */ new Map([
 var State = class {
   ids = 0;
   flush = 0;
+  registerInstanceId = 0;
   flushed = false;
   wroteUndefined = false;
   buf = [];
   refs = /* @__PURE__ */ new WeakMap();
   assigned = /* @__PURE__ */ new Set();
+  registered = [];
   boundary = void 0;
-  mutations = [];
+  mutated = [];
 };
 var Reference = class {
   constructor(parent, accessor, flush, pos = null, id = null) {
@@ -554,7 +556,7 @@ var Reference = class {
     this.pos = pos;
     this.id = id;
   }
-  init = "";
+  registered = null;
   assigns = null;
 };
 var DEBUG = /* @__PURE__ */ new WeakMap();
@@ -586,7 +588,7 @@ var Serializer = class {
   }
   writeCall(value, object, property, spread) {
     const state = this.#state;
-    state.mutations.push({
+    state.mutated.push({
       type: 0 /* call */,
       value,
       object,
@@ -597,7 +599,7 @@ var Serializer = class {
   }
   writeAssign(value, object, property) {
     const state = this.#state;
-    state.mutations.push({
+    state.mutated.push({
       type: 1 /* assign */,
       value,
       object,
@@ -605,13 +607,21 @@ var Serializer = class {
     });
     state.flushed = true;
   }
+  register(id, val, scope) {
+    return register(
+      id,
+      val,
+      scope,
+      scope ? ++this.#state.registerInstanceId : 0
+    );
+  }
 };
-function register(id, val, scope) {
+function register(id, val, scope, instanceId) {
   REGISTRY.set(val, {
     id,
     scope,
-    access: "_._" + toAccess(toObjectKey(id)),
-    getter: false
+    instanceId: instanceId ?? 0,
+    access: "_._" + toAccess(toObjectKey(id))
   });
   return val;
 }
@@ -622,7 +632,7 @@ function getRegistered(val) {
   }
 }
 function writeRoot(state, root) {
-  const { buf, assigned, mutations } = state;
+  const { buf } = state;
   const hadBuf = buf.length !== 0;
   let result = "";
   if (hadBuf) {
@@ -632,8 +642,8 @@ function writeRoot(state, root) {
     const rootRef = state.refs.get(root);
     if (rootRef) {
       const rootId = ensureId(state, rootRef);
-      if (assigned.size || mutations.length) {
-        assigned.delete(rootRef);
+      if (state.assigned.size || state.registered.length || state.mutated.length) {
+        state.assigned.delete(rootRef);
         writeAssigned(state);
         buf.push(
           "," + (rootRef.assigns ? assignsToString(rootRef.assigns, rootId) : rootId)
@@ -662,27 +672,30 @@ function writeRoot(state, root) {
 }
 function writeAssigned(state) {
   if (state.assigned.size) {
-    let inits = "";
-    let assigns = "";
-    for (const valueRef of state.assigned) {
-      if (valueRef.init) {
-        inits += "," + (valueRef.assigns ? assignsToString(valueRef.assigns, valueRef.init) : valueRef.init);
-        valueRef.init = "";
-      } else if (valueRef.assigns) {
-        assigns += "," + assignsToString(valueRef.assigns, valueRef.id);
-      }
-      valueRef.assigns = null;
-    }
-    if (assigns) {
-      state.buf.push(assigns);
-    }
-    if (inits) {
-      state.buf.push(inits);
+    let buf = "";
+    for (const ref of state.assigned) {
+      buf += "," + assignsToString(ref.assigns, ref.id);
+      ref.assigns = null;
     }
+    state.buf.push(buf);
     state.assigned = /* @__PURE__ */ new Set();
   }
-  if (state.mutations.length) {
-    for (const mutation of state.mutations) {
+  if (state.registered.length) {
+    let buf = "";
+    for (const ref of state.registered.sort(compareRegisteredReferences)) {
+      const scopeRef = state.refs.get(ref.registered.scope);
+      buf += "," + assignsToString(
+        ref.assigns,
+        ref.registered.access + "(" + (scopeRef ? ensureId(state, scopeRef) : ref.assigns[0]) + ")"
+      );
+      ref.assigns = null;
+      ref.registered = null;
+    }
+    state.buf.push(buf);
+    state.registered = [];
+  }
+  if (state.mutated.length) {
+    for (const mutation of state.mutated) {
       const hasSeen = state.refs.get(mutation.object)?.id;
       const objectStartIndex = state.buf.push(
         state.buf.length === 0 ? "" : ","
@@ -719,8 +732,8 @@ function writeAssigned(state) {
         state.buf.push(")");
       }
     }
-    state.mutations = [];
-    if (state.assigned.size) {
+    state.mutated = [];
+    if (state.assigned.size || state.registered.length) {
       writeAssigned(state);
     }
   }
@@ -749,17 +762,16 @@ function writeProp(state, val, parent, accessor) {
 function writeReferenceOr(state, write, val, parent, accessor) {
   let ref = state.refs.get(val);
   if (ref) {
-    if (ref.init) {
-      addAssignment(ref, ensureId(state, parent) + toAccess(accessor));
-      return false;
-    }
-    if (isCircular(parent, ref)) {
-      if (!ref.assigns) {
+    if (parent) {
+      if (ref.assigns) {
+        addAssignment(ref, ensureId(state, parent) + toAccess(accessor));
+        return false;
+      } else if (isCircular(parent, ref)) {
         ensureId(state, ref);
         state.assigned.add(ref);
+        addAssignment(ref, ensureId(state, parent) + toAccess(accessor));
+        return false;
       }
-      addAssignment(ref, ensureId(state, parent) + toAccess(accessor));
-      return false;
     }
     state.buf.push(ensureId(state, ref));
     return true;
@@ -778,55 +790,21 @@ function writeReferenceOr(state, write, val, parent, accessor) {
   state.refs.delete(val);
   return false;
 }
-function writeRegistered(state, val, parent, accessor, { access, scope, getter }) {
-  if (scope) {
-    const scopeRef = state.refs.get(scope);
+function writeRegistered(state, val, parent, accessor, registered) {
+  if (parent && registered.scope) {
     const fnRef = new Reference(
       parent,
       accessor,
       state.flush,
       state.buf.length
     );
+    fnRef.registered = registered;
     state.refs.set(val, fnRef);
-    if (getter) {
-      if (scopeRef) {
-        state.buf.push("()=>" + ensureId(state, scopeRef) + access);
-        return true;
-      }
-      state.buf.push("(s=>()=>s" + access + ")(");
-      writeProp(state, scope, parent, "");
-      state.buf.push(")");
-      const newScopeRef = state.refs.get(scope);
-      if (newScopeRef) ensureId(state, newScopeRef);
-      return true;
-    }
-    if (scopeRef) {
-      if (parent && (state.assigned.has(scopeRef) || isCircular(parent, scopeRef))) {
-        state.assigned.add(parent);
-        state.assigned.add(fnRef);
-        fnRef.init = access + "(" + ensureId(state, scopeRef) + ")";
-        addAssignment(fnRef, ensureId(state, parent) + toAccess(accessor));
-        return false;
-      }
-      state.buf.push(access + "(" + ensureId(state, scopeRef) + ")");
-    } else {
-      const pos = state.buf.push("") - 1;
-      const assigns = state.assigned.size;
-      writeProp(state, scope, parent, "");
-      const scopeRef2 = parent && state.refs.get(scope);
-      const scopeId = scopeRef2 && ensureId(state, scopeRef2);
-      if (scopeId && assigns !== state.assigned.size) {
-        state.assigned.add(parent);
-        state.assigned.add(fnRef);
-        fnRef.init = access + "(" + scopeId + ")";
-        addAssignment(fnRef, ensureId(state, parent) + toAccess(accessor));
-      } else {
-        state.buf[pos] = access + "(" + state.buf[pos];
-        state.buf.push(")");
-      }
-    }
+    state.registered.push(fnRef);
+    addAssignment(fnRef, ensureId(state, parent) + toAccess(accessor));
+    return !state.refs.has(registered.scope) && writeProp(state, registered.scope, null, "");
   } else {
-    state.buf.push(access);
+    state.buf.push(registered.access);
   }
   return true;
 }
@@ -1639,6 +1617,9 @@ function patchIteratorNext(proto) {
     return next.call(this, value);
   };
 }
+function compareRegisteredReferences(a, b) {
+  return a.registered.instanceId - b.registered.instanceId;
+}
 
 // src/html/writer.ts
 var $chunk;
@@ -1727,7 +1708,11 @@ function _var(parentScopeId, scopeOffsetAccessor, childScopeId, registryId) {
   );
 }
 function _resume(val, id, scopeId) {
-  return scopeId === void 0 ? register(id, val) : register(id, val, _scope_with_id(scopeId));
+  return scopeId === void 0 ? register(id, val) : $chunk.boundary.state.serializer.register(
+    id,
+    val,
+    _scope_with_id(scopeId)
+  );
 }
 function _id() {
   const state = $chunk.boundary.state;

package/dist/html/serializer.d.ts

@@ -8,9 +8,9 @@ export declare class Serializer {
     symbol(id: string): symbol;
     writeCall(value: unknown, object: unknown, property?: string, spread?: boolean): void;
     writeAssign(value: unknown, object: unknown, property: string): void;
+    register<T extends WeakKey>(id: string, val: T, scope?: unknown): T;
 }
-export declare function register<T extends WeakKey>(id: string, val: T, scope?: unknown): T;
-export declare function registerGetter<T extends WeakKey>(accessor: string, val: T, scope?: unknown): T;
+export declare function register<T extends WeakKey>(id: string, val: T, scope?: unknown, instanceId?: number): T;
 export declare function getRegistered(val: WeakKey): {
     id: string;
     scope: unknown;

package/dist/html.js

@@ -453,13 +453,15 @@ var REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
 ]), State = class {
   ids = 0;
   flush = 0;
+  registerInstanceId = 0;
   flushed = !1;
   wroteUndefined = !1;
   buf = [];
   refs = /* @__PURE__ */ new WeakMap();
   assigned = /* @__PURE__ */ new Set();
+  registered = [];
   boundary = void 0;
-  mutations = [];
+  mutated = [];
 }, Reference = class {
   constructor(parent, accessor, flush, pos = null, id = null) {
     this.parent = parent;
@@ -469,7 +471,7 @@ var REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
     this.id = id;
     this.parent = parent, this.accessor = accessor, this.flush = flush, this.pos = pos, this.id = id;
   }
-  init = "";
+  registered = null;
   assigns = null;
 };
 var Serializer = class {
@@ -493,7 +495,7 @@ var Serializer = class {
   }
   writeCall(value, object, property, spread) {
     let state = this.#state;
-    state.mutations.push({
+    state.mutated.push({
       type: 0 /* call */,
       value,
       object,
@@ -503,20 +505,28 @@ var Serializer = class {
   }
   writeAssign(value, object, property) {
     let state = this.#state;
-    state.mutations.push({
+    state.mutated.push({
       type: 1 /* assign */,
       value,
       object,
       property
     }), state.flushed = !0;
   }
+  register(id, val, scope) {
+    return register(
+      id,
+      val,
+      scope,
+      scope ? ++this.#state.registerInstanceId : 0
+    );
+  }
 };
-function register(id, val, scope) {
+function register(id, val, scope, instanceId) {
   return REGISTRY.set(val, {
     id,
     scope,
-    access: "_._" + toAccess(toObjectKey(id)),
-    getter: !1
+    instanceId: instanceId ?? 0,
+    access: "_._" + toAccess(toObjectKey(id))
   }), val;
 }
 function getRegistered(val) {
@@ -525,12 +535,12 @@ function getRegistered(val) {
     return { id: registered.id, scope: registered.scope };
 }
 function writeRoot(state, root) {
-  let { buf, assigned, mutations } = state, hadBuf = buf.length !== 0, result = "";
+  let { buf } = state, hadBuf = buf.length !== 0, result = "";
   if (hadBuf && buf.push(","), writeProp(state, root, null, "")) {
     let rootRef = state.refs.get(root);
     if (rootRef) {
       let rootId = ensureId(state, rootRef);
-      (assigned.size || mutations.length) && (assigned.delete(rootRef), writeAssigned(state), buf.push(
+      (state.assigned.size || state.registered.length || state.mutated.length) && (state.assigned.delete(rootRef), writeAssigned(state), buf.push(
         "," + (rootRef.assigns ? assignsToString(rootRef.assigns, rootId) : rootId)
       ));
     }
@@ -543,13 +553,24 @@ function writeRoot(state, root) {
 }
 function writeAssigned(state) {
   if (state.assigned.size) {
-    let inits = "", assigns = "";
-    for (let valueRef of state.assigned)
-      valueRef.init ? (inits += "," + (valueRef.assigns ? assignsToString(valueRef.assigns, valueRef.init) : valueRef.init), valueRef.init = "") : valueRef.assigns && (assigns += "," + assignsToString(valueRef.assigns, valueRef.id)), valueRef.assigns = null;
-    assigns && state.buf.push(assigns), inits && state.buf.push(inits), state.assigned = /* @__PURE__ */ new Set();
+    let buf = "";
+    for (let ref of state.assigned)
+      buf += "," + assignsToString(ref.assigns, ref.id), ref.assigns = null;
+    state.buf.push(buf), state.assigned = /* @__PURE__ */ new Set();
   }
-  if (state.mutations.length) {
-    for (let mutation of state.mutations) {
+  if (state.registered.length) {
+    let buf = "";
+    for (let ref of state.registered.sort(compareRegisteredReferences)) {
+      let scopeRef = state.refs.get(ref.registered.scope);
+      buf += "," + assignsToString(
+        ref.assigns,
+        ref.registered.access + "(" + (scopeRef ? ensureId(state, scopeRef) : ref.assigns[0]) + ")"
+      ), ref.assigns = null, ref.registered = null;
+    }
+    state.buf.push(buf), state.registered = [];
+  }
+  if (state.mutated.length) {
+    for (let mutation of state.mutated) {
       let hasSeen = state.refs.get(mutation.object)?.id, objectStartIndex = state.buf.push(
         state.buf.length === 0 ? "" : ","
       );
@@ -568,7 +589,7 @@ function writeAssigned(state) {
         state.buf.push("void 0");
       isCall && state.buf.push(")");
     }
-    state.mutations = [], state.assigned.size && writeAssigned(state);
+    state.mutated = [], (state.assigned.size || state.registered.length) && writeAssigned(state);
   }
 }
 function writeProp(state, val, parent, accessor) {
@@ -593,41 +614,32 @@ function writeProp(state, val, parent, accessor) {
 }
 function writeReferenceOr(state, write, val, parent, accessor) {
   let ref = state.refs.get(val);
-  if (ref)
-    return ref.init ? (addAssignment(ref, ensureId(state, parent) + toAccess(accessor)), !1) : isCircular(parent, ref) ? (ref.assigns || (ensureId(state, ref), state.assigned.add(ref)), addAssignment(ref, ensureId(state, parent) + toAccess(accessor)), !1) : (state.buf.push(ensureId(state, ref)), !0);
+  if (ref) {
+    if (parent) {
+      if (ref.assigns)
+        return addAssignment(ref, ensureId(state, parent) + toAccess(accessor)), !1;
+      if (isCircular(parent, ref))
+        return ensureId(state, ref), state.assigned.add(ref), addAssignment(ref, ensureId(state, parent) + toAccess(accessor)), !1;
+    }
+    return state.buf.push(ensureId(state, ref)), !0;
+  }
   let registered = REGISTRY.get(val);
   return registered ? writeRegistered(state, val, parent, accessor, registered) : (state.refs.set(
     val,
     ref = new Reference(parent, accessor, state.flush, state.buf.length)
   ), write(state, val, ref) ? !0 : (state.refs.delete(val), !1));
 }
-function writeRegistered(state, val, parent, accessor, { access, scope, getter }) {
-  if (scope) {
-    let scopeRef = state.refs.get(scope), fnRef = new Reference(
+function writeRegistered(state, val, parent, accessor, registered) {
+  if (parent && registered.scope) {
+    let fnRef = new Reference(
       parent,
       accessor,
       state.flush,
       state.buf.length
     );
-    if (state.refs.set(val, fnRef), getter) {
-      if (scopeRef)
-        return state.buf.push("()=>" + ensureId(state, scopeRef) + access), !0;
-      state.buf.push("(s=>()=>s" + access + ")("), writeProp(state, scope, parent, ""), state.buf.push(")");
-      let newScopeRef = state.refs.get(scope);
-      return newScopeRef && ensureId(state, newScopeRef), !0;
-    }
-    if (scopeRef) {
-      if (parent && (state.assigned.has(scopeRef) || isCircular(parent, scopeRef)))
-        return state.assigned.add(parent), state.assigned.add(fnRef), fnRef.init = access + "(" + ensureId(state, scopeRef) + ")", addAssignment(fnRef, ensureId(state, parent) + toAccess(accessor)), !1;
-      state.buf.push(access + "(" + ensureId(state, scopeRef) + ")");
-    } else {
-      let pos = state.buf.push("") - 1, assigns = state.assigned.size;
-      writeProp(state, scope, parent, "");
-      let scopeRef2 = parent && state.refs.get(scope), scopeId = scopeRef2 && ensureId(state, scopeRef2);
-      scopeId && assigns !== state.assigned.size ? (state.assigned.add(parent), state.assigned.add(fnRef), fnRef.init = access + "(" + scopeId + ")", addAssignment(fnRef, ensureId(state, parent) + toAccess(accessor))) : (state.buf[pos] = access + "(" + state.buf[pos], state.buf.push(")"));
-    }
+    return fnRef.registered = registered, state.refs.set(val, fnRef), state.registered.push(fnRef), addAssignment(fnRef, ensureId(state, parent) + toAccess(accessor)), !state.refs.has(registered.scope) && writeProp(state, registered.scope, null, "");
   } else
-    state.buf.push(access);
+    state.buf.push(registered.access);
   return !0;
 }
 function writeString(state, val) {
@@ -1107,6 +1119,9 @@ function patchIteratorNext(proto) {
     return this[kTouchedIterator] = 1, next.call(this, value);
   };
 }
+function compareRegisteredReferences(a, b) {
+  return a.registered.instanceId - b.registered.instanceId;
+}
 
 // src/html/writer.ts
 var $chunk, NOOP = () => {
@@ -1165,7 +1180,11 @@ function _var(parentScopeId, scopeOffsetAccessor, childScopeId, registryId) {
   );
 }
 function _resume(val, id, scopeId) {
-  return scopeId === void 0 ? register(id, val) : register(id, val, _scope_with_id(scopeId));
+  return scopeId === void 0 ? register(id, val) : $chunk.boundary.state.serializer.register(
+    id,
+    val,
+    _scope_with_id(scopeId)
+  );
 }
 function _id() {
   let state = $chunk.boundary.state, { $global: $global2 } = state;

package/dist/html.mjs

@@ -364,13 +364,15 @@ var REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
 ]), State = class {
   ids = 0;
   flush = 0;
+  registerInstanceId = 0;
   flushed = !1;
   wroteUndefined = !1;
   buf = [];
   refs = /* @__PURE__ */ new WeakMap();
   assigned = /* @__PURE__ */ new Set();
+  registered = [];
   boundary = void 0;
-  mutations = [];
+  mutated = [];
 }, Reference = class {
   constructor(parent, accessor, flush, pos = null, id = null) {
     this.parent = parent;
@@ -380,7 +382,7 @@ var REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
     this.id = id;
     this.parent = parent, this.accessor = accessor, this.flush = flush, this.pos = pos, this.id = id;
   }
-  init = "";
+  registered = null;
   assigns = null;
 };
 var Serializer = class {
@@ -404,7 +406,7 @@ var Serializer = class {
   }
   writeCall(value, object, property, spread) {
     let state = this.#state;
-    state.mutations.push({
+    state.mutated.push({
       type: 0 /* call */,
       value,
       object,
@@ -414,20 +416,28 @@ var Serializer = class {
   }
   writeAssign(value, object, property) {
     let state = this.#state;
-    state.mutations.push({
+    state.mutated.push({
       type: 1 /* assign */,
       value,
       object,
       property
     }), state.flushed = !0;
   }
+  register(id, val, scope) {
+    return register(
+      id,
+      val,
+      scope,
+      scope ? ++this.#state.registerInstanceId : 0
+    );
+  }
 };
-function register(id, val, scope) {
+function register(id, val, scope, instanceId) {
   return REGISTRY.set(val, {
     id,
     scope,
-    access: "_._" + toAccess(toObjectKey(id)),
-    getter: !1
+    instanceId: instanceId ?? 0,
+    access: "_._" + toAccess(toObjectKey(id))
   }), val;
 }
 function getRegistered(val) {
@@ -436,12 +446,12 @@ function getRegistered(val) {
     return { id: registered.id, scope: registered.scope };
 }
 function writeRoot(state, root) {
-  let { buf, assigned, mutations } = state, hadBuf = buf.length !== 0, result = "";
+  let { buf } = state, hadBuf = buf.length !== 0, result = "";
   if (hadBuf && buf.push(","), writeProp(state, root, null, "")) {
     let rootRef = state.refs.get(root);
     if (rootRef) {
       let rootId = ensureId(state, rootRef);
-      (assigned.size || mutations.length) && (assigned.delete(rootRef), writeAssigned(state), buf.push(
+      (state.assigned.size || state.registered.length || state.mutated.length) && (state.assigned.delete(rootRef), writeAssigned(state), buf.push(
         "," + (rootRef.assigns ? assignsToString(rootRef.assigns, rootId) : rootId)
       ));
     }
@@ -454,13 +464,24 @@ function writeRoot(state, root) {
 }
 function writeAssigned(state) {
   if (state.assigned.size) {
-    let inits = "", assigns = "";
-    for (let valueRef of state.assigned)
-      valueRef.init ? (inits += "," + (valueRef.assigns ? assignsToString(valueRef.assigns, valueRef.init) : valueRef.init), valueRef.init = "") : valueRef.assigns && (assigns += "," + assignsToString(valueRef.assigns, valueRef.id)), valueRef.assigns = null;
-    assigns && state.buf.push(assigns), inits && state.buf.push(inits), state.assigned = /* @__PURE__ */ new Set();
+    let buf = "";
+    for (let ref of state.assigned)
+      buf += "," + assignsToString(ref.assigns, ref.id), ref.assigns = null;
+    state.buf.push(buf), state.assigned = /* @__PURE__ */ new Set();
   }
-  if (state.mutations.length) {
-    for (let mutation of state.mutations) {
+  if (state.registered.length) {
+    let buf = "";
+    for (let ref of state.registered.sort(compareRegisteredReferences)) {
+      let scopeRef = state.refs.get(ref.registered.scope);
+      buf += "," + assignsToString(
+        ref.assigns,
+        ref.registered.access + "(" + (scopeRef ? ensureId(state, scopeRef) : ref.assigns[0]) + ")"
+      ), ref.assigns = null, ref.registered = null;
+    }
+    state.buf.push(buf), state.registered = [];
+  }
+  if (state.mutated.length) {
+    for (let mutation of state.mutated) {
       let hasSeen = state.refs.get(mutation.object)?.id, objectStartIndex = state.buf.push(
         state.buf.length === 0 ? "" : ","
       );
@@ -479,7 +500,7 @@ function writeAssigned(state) {
         state.buf.push("void 0");
       isCall && state.buf.push(")");
     }
-    state.mutations = [], state.assigned.size && writeAssigned(state);
+    state.mutated = [], (state.assigned.size || state.registered.length) && writeAssigned(state);
   }
 }
 function writeProp(state, val, parent, accessor) {
@@ -504,41 +525,32 @@ function writeProp(state, val, parent, accessor) {
 }
 function writeReferenceOr(state, write, val, parent, accessor) {
   let ref = state.refs.get(val);
-  if (ref)
-    return ref.init ? (addAssignment(ref, ensureId(state, parent) + toAccess(accessor)), !1) : isCircular(parent, ref) ? (ref.assigns || (ensureId(state, ref), state.assigned.add(ref)), addAssignment(ref, ensureId(state, parent) + toAccess(accessor)), !1) : (state.buf.push(ensureId(state, ref)), !0);
+  if (ref) {
+    if (parent) {
+      if (ref.assigns)
+        return addAssignment(ref, ensureId(state, parent) + toAccess(accessor)), !1;
+      if (isCircular(parent, ref))
+        return ensureId(state, ref), state.assigned.add(ref), addAssignment(ref, ensureId(state, parent) + toAccess(accessor)), !1;
+    }
+    return state.buf.push(ensureId(state, ref)), !0;
+  }
   let registered = REGISTRY.get(val);
   return registered ? writeRegistered(state, val, parent, accessor, registered) : (state.refs.set(
     val,
     ref = new Reference(parent, accessor, state.flush, state.buf.length)
   ), write(state, val, ref) ? !0 : (state.refs.delete(val), !1));
 }
-function writeRegistered(state, val, parent, accessor, { access, scope, getter }) {
-  if (scope) {
-    let scopeRef = state.refs.get(scope), fnRef = new Reference(
+function writeRegistered(state, val, parent, accessor, registered) {
+  if (parent && registered.scope) {
+    let fnRef = new Reference(
       parent,
       accessor,
       state.flush,
       state.buf.length
     );
-    if (state.refs.set(val, fnRef), getter) {
-      if (scopeRef)
-        return state.buf.push("()=>" + ensureId(state, scopeRef) + access), !0;
-      state.buf.push("(s=>()=>s" + access + ")("), writeProp(state, scope, parent, ""), state.buf.push(")");
-      let newScopeRef = state.refs.get(scope);
-      return newScopeRef && ensureId(state, newScopeRef), !0;
-    }
-    if (scopeRef) {
-      if (parent && (state.assigned.has(scopeRef) || isCircular(parent, scopeRef)))
-        return state.assigned.add(parent), state.assigned.add(fnRef), fnRef.init = access + "(" + ensureId(state, scopeRef) + ")", addAssignment(fnRef, ensureId(state, parent) + toAccess(accessor)), !1;
-      state.buf.push(access + "(" + ensureId(state, scopeRef) + ")");
-    } else {
-      let pos = state.buf.push("") - 1, assigns = state.assigned.size;
-      writeProp(state, scope, parent, "");
-      let scopeRef2 = parent && state.refs.get(scope), scopeId = scopeRef2 && ensureId(state, scopeRef2);
-      scopeId && assigns !== state.assigned.size ? (state.assigned.add(parent), state.assigned.add(fnRef), fnRef.init = access + "(" + scopeId + ")", addAssignment(fnRef, ensureId(state, parent) + toAccess(accessor))) : (state.buf[pos] = access + "(" + state.buf[pos], state.buf.push(")"));
-    }
+    return fnRef.registered = registered, state.refs.set(val, fnRef), state.registered.push(fnRef), addAssignment(fnRef, ensureId(state, parent) + toAccess(accessor)), !state.refs.has(registered.scope) && writeProp(state, registered.scope, null, "");
   } else
-    state.buf.push(access);
+    state.buf.push(registered.access);
   return !0;
 }
 function writeString(state, val) {
@@ -1018,6 +1030,9 @@ function patchIteratorNext(proto) {
     return this[kTouchedIterator] = 1, next.call(this, value);
   };
 }
+function compareRegisteredReferences(a, b) {
+  return a.registered.instanceId - b.registered.instanceId;
+}
 
 // src/html/writer.ts
 var $chunk, NOOP = () => {
@@ -1076,7 +1091,11 @@ function _var(parentScopeId, scopeOffsetAccessor, childScopeId, registryId) {
   );
 }
 function _resume(val, id, scopeId) {
-  return scopeId === void 0 ? register(id, val) : register(id, val, _scope_with_id(scopeId));
+  return scopeId === void 0 ? register(id, val) : $chunk.boundary.state.serializer.register(
+    id,
+    val,
+    _scope_with_id(scopeId)
+  );
 }
 function _id() {
   let state = $chunk.boundary.state, { $global: $global2 } = state;

package/dist/translator/index.js

@@ -1641,6 +1641,7 @@ function startSection(path5) {
       bindings: void 0,
       domGetterBindings: /* @__PURE__ */ new Map(),
       hoisted: void 0,
+      hoistedTo: void 0,
       isHoistThrough: void 0,
       serializeReason: void 0,
       serializeReasons: /* @__PURE__ */ new Map(),
@@ -4137,7 +4138,7 @@ function writeHTMLResumeStatements(path5) {
   }
 }
 function getSetup(section) {
-  return getSignals(section).get(void 0)?.identifier;
+  return section.hoistedTo ? getSignal(section, void 0).identifier : getSignals(section).get(void 0)?.identifier;
 }
 function replaceRenderNode(node) {
   return replaceAssignedNode(node) || replaceBindingReadNode(node) || replaceRegisteredFunctionNode(node);
@@ -7930,6 +7931,7 @@ function trackHoistedReference(referencePath, binding) {
       )
     );
     section.hoisted = bindingUtil.add(section.hoisted, binding);
+    hoistSection.hoistedTo = bindingUtil.add(hoistSection.hoistedTo, binding);
     let currentSection = section.parent;
     while (currentSection && currentSection !== hoistSection) {
       currentSection.isHoistThrough = true;
@@ -7967,7 +7969,12 @@ function trackReferencesForBinding(babelBinding, binding) {
   const { referencePaths, constantViolations } = babelBinding;
   for (const ref of referencePaths) {
     const refSection = getOrCreateSection(ref);
-    if (isReferenceHoisted(babelBinding.path, ref)) {
+    const markoRoot = getMarkoRoot(ref);
+    if (markoRoot?.type === "MarkoAttribute" && markoRoot.parentPath === babelBinding.path) {
+      throw ref.buildCodeFrameError(
+        `Tag variable circular references are not supported.`
+      );
+    } else if (isReferenceHoisted(babelBinding.path, ref)) {
       trackHoistedReference(ref, binding);
     } else if (binding.type !== 4 /* local */ || refSection !== binding.section) {
       trackReference(ref, binding);
@@ -8810,14 +8817,38 @@ function getReadReplacement(node) {
       replacement = import_compiler35.types.identifier(binding.name);
     }
   } else if (read) {
-    replacement = toMemberExpression(
-      import_compiler35.types.identifier(read.binding.name),
-      Array.isArray(read.props) ? read.props[0] : read.props
-    );
-    if (Array.isArray(read.props)) {
-      for (let i = 1; i < read.props.length; i++) {
-        replacement = toMemberExpression(replacement, read.props[i]);
+    const props = read.props ? Array.isArray(read.props) ? read.props.slice() : [read.props] : [];
+    let curNode = node;
+    let curBinding = read.binding;
+    let replaceMember;
+    replacement = import_compiler35.types.identifier(read.binding.name);
+    while (props.length && (curNode.type === "MemberExpression" || curNode.type === "OptionalMemberExpression")) {
+      const prop = props.pop();
+      const memberProp = getMemberExpressionPropString(curNode);
+      if (memberProp !== prop) break;
+      replaceMember = curNode;
+      curNode = curNode.object;
+    }
+    for (const prop of props) {
+      if (curBinding) {
+        curBinding = curBinding.propertyAliases.get(prop);
+      }
+      replacement = toMemberExpression(
+        replacement,
+        prop,
+        !!curBinding?.nullable
+      );
+    }
+    if (replaceMember) {
+      if (read.binding.nullable && replaceMember.object.type !== replacement.type) {
+        replaceMember.type = "OptionalMemberExpression";
+        replaceMember.optional = true;
       }
+      replaceMember.object = withPreviousLocation(
+        replacement,
+        replaceMember.object
+      );
+      replacement = void 0;
     }
   }
   return replacement && withPreviousLocation(replacement, node);
@@ -8875,7 +8906,6 @@ function findClosestReference(from, refs) {
     const closest = findClosestUpstream(from, refs);
     if (closest) return closest;
   }
-  throw new Error("Unable to resolve closest binding reference.");
 }
 function findClosestUpstream(from, to) {
   let closest = from;
@@ -8885,14 +8915,32 @@ function findClosestUpstream(from, to) {
     }
   } while (closest = closest.upstreamAlias);
 }
+function getRootBindings(reads) {
+  let rootRefs;
+  let allBindings;
+  for (const { binding } of reads) {
+    allBindings = bindingUtil.add(allBindings, binding);
+  }
+  for (const { binding } of reads) {
+    let alias = binding.upstreamAlias;
+    while (alias) {
+      if (bindingUtil.has(allBindings, alias)) break;
+      alias = alias.upstreamAlias;
+    }
+    if (!alias) {
+      rootRefs = bindingUtil.add(rootRefs, binding);
+    }
+  }
+  return rootRefs;
+}
 function resolveReferencedBindings(expr, reads, intersectionsBySection) {
   let referencedBindings;
   if (Array.isArray(reads)) {
+    const rootBindings = getRootBindings(reads);
     for (const read of reads) {
       let { binding } = read;
-      if (read.node) {
-        const exprReference = (read.node.extra ??= {}).read ??= resolveExpressionReference(reads, binding, void 0);
-        ({ binding } = (read.node.extra ??= {}).read = exprReference);
+      if (read.node && read.node.extra?.assignmentTo !== binding) {
+        ({ binding } = (read.node.extra ??= {}).read ??= resolveExpressionReference(rootBindings, binding));
       }
       referencedBindings = bindingUtil.add(referencedBindings, binding);
     }
@@ -8920,38 +8968,29 @@ function resolveReferencedBindings(expr, reads, intersectionsBySection) {
   }
   return referencedBindings;
 }
-function resolveExpressionReference(reads, readBinding, readProps) {
-  const { upstreamAlias } = readBinding;
-  if (upstreamAlias && Array.isArray(reads)) {
-    const prop = getCanonicalProperty(readBinding);
-    const aliasProps = prop === void 0 ? readProps : push(readProps, prop);
-    for (const { binding } of reads) {
-      if (binding !== readBinding) {
-        let alias = upstreamAlias;
-        while (alias) {
-          if (binding === alias) {
-            return resolveExpressionReference(reads, alias, aliasProps);
-          }
-          alias = alias.upstreamAlias;
-        }
-      }
+function resolveExpressionReference(rootBindings, readBinding) {
+  const upstreamRoot = readBinding.upstreamAlias && findClosestReference(readBinding.upstreamAlias, rootBindings);
+  if (!upstreamRoot) {
+    return createRead(readBinding, void 0);
+  }
+  let curBinding = readBinding;
+  let props;
+  while (curBinding !== upstreamRoot) {
+    if (curBinding.property !== void 0) {
+      props = push(props, curBinding.property);
     }
+    curBinding = curBinding.upstreamAlias;
   }
-  return createRead(readBinding, readProps);
+  if (Array.isArray(props)) {
+    props.reverse();
+  }
+  return createRead(upstreamRoot, props);
 }
 function isSupersetSources(a, b) {
   if (!b.sources) return true;
   if (!a.sources) return false;
   return bindingUtil.isSuperset(a.sources.state, b.sources.state) && bindingUtil.isSuperset(a.sources.param, b.sources.param);
 }
-function getCanonicalProperty(binding) {
-  if (binding.property !== void 0) {
-    return binding.property;
-  }
-  if (binding.upstreamAlias && binding.excludeProperties === void 0) {
-    return binding.upstreamAlias.property;
-  }
-}
 function createRead(binding, props) {
   return { binding, props };
 }
@@ -11135,8 +11174,11 @@ var script_default = {
         const { value: value2 } = valueAttr;
         const isFunction2 = import_compiler52.types.isFunctionExpression(value2) || import_compiler52.types.isArrowFunctionExpression(value2);
         let inlineBody = null;
-        if (isFunction2 && !(value2.async || value2.generator)) {
-          if (import_compiler52.types.isBlockStatement(value2.body)) {
+        let referencesScope = false;
+        if (isFunction2) {
+          if (value2.async || value2.generator) {
+            referencesScope = traverseContains(value2, isScopeIdentifier);
+          } else if (import_compiler52.types.isBlockStatement(value2.body)) {
             let hasDeclaration = false;
             for (const child of value2.body.body) {
               if (import_compiler52.types.isDeclaration(child)) {
@@ -11154,7 +11196,7 @@ var script_default = {
           section,
           referencedBindings,
           inlineBody || import_compiler52.types.expressionStatement(
-            import_compiler52.types.callExpression(value2, isFunction2 ? [] : [scopeIdentifier])
+            import_compiler52.types.callExpression(value2, referencesScope ? [scopeIdentifier] : [])
           )
         );
       } else {

package/dist/translator/util/references.d.ts

@@ -112,7 +112,7 @@ export declare function getDebugName(binding: Binding): string;
 export declare function getDebugNames(refs: ReferencedBindings): string;
 export declare function getSectionInstancesAccessor(section: Section): string;
 export declare function getSectionInstancesAccessorLiteral(section: Section): t.StringLiteral | t.NumericLiteral | undefined;
-export declare function getReadReplacement(node: t.Identifier | t.MemberExpression | t.OptionalMemberExpression): t.Node | undefined;
+export declare function getReadReplacement(node: t.Identifier | t.MemberExpression | t.OptionalMemberExpression): t.Expression | undefined;
 export interface ReferencedExtra extends t.NodeExtra {
     section: Section;
 }

package/dist/translator/util/sections.d.ts

@@ -35,6 +35,7 @@ export interface Section {
     bindings: ReferencedBindings;
     domGetterBindings: Map<Binding, string>;
     hoisted: ReferencedBindings;
+    hoistedTo: ReferencedBindings;
     serializeReason: undefined | SerializeReason;
     serializeReasons: Map<symbol, SerializeReason>;
     paramReasonGroups: ParamSerializeReasonGroups | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.95",
+  "version": "6.0.97",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",