@marko/runtime-tags 0.3.42 → 0.3.43

package/dist/debug/html.js

@@ -35,7 +35,6 @@ __export(html_exports, {
   controllable_textarea_value: () => controllable_textarea_value,
   createRenderer: () => createRenderer,
   createTemplate: () => createTemplate,
-  debug: () => debug,
   dynamicTagArgs: () => dynamicTagArgs,
   dynamicTagInput: () => dynamicTagInput,
   ensureScopeWithId: () => ensureScopeWithId,
@@ -584,15 +583,12 @@ var Reference = class {
   assigns = "";
 };
 var DEBUG = /* @__PURE__ */ new WeakMap();
-function debug(obj, file, loc, vars) {
-  if (true) {
-    DEBUG.set(obj, {
-      file,
-      loc,
-      vars
-    });
-  }
-  return obj;
+function setDebugInfo(obj, file, loc, vars) {
+  DEBUG.set(obj, {
+    file,
+    loc,
+    vars
+  });
 }
 var Serializer = class {
   #state = new State();
@@ -1319,21 +1315,21 @@ function throwUnserializable(state, cause, ref = null, accessor = "") {
     let message = "Unable to serialize";
     let access = "";
     while (ref?.accessor) {
-      const debug2 = ref.parent?.debug;
-      if (debug2) {
-        const varLoc = debug2.vars?.[ref.accessor];
+      const debug = ref.parent?.debug;
+      if (debug) {
+        const varLoc = debug.vars?.[ref.accessor];
+        let debugAccess = ref.accessor;
+        let debugLoc = debug.loc;
         if (varLoc) {
           if (Array.isArray(varLoc)) {
-            message += ` "${varLoc[0]}" in ${debug2.file}:${varLoc[1]}`;
+            debugAccess = varLoc[0];
+            if (varLoc[1]) debugLoc = varLoc[1];
           } else {
-            message += ` "${ref.accessor}" in ${debug2.file}:${varLoc}`;
-          }
-        } else {
-          message += ` ${JSON.stringify(ref.accessor)} in ${debug2.file}`;
-          if (debug2.loc) {
-            message += `:${debug2.loc}`;
+            debugLoc = varLoc;
           }
         }
+        message += ` ${JSON.stringify(debugAccess)} in ${debug.file}`;
+        if (debugLoc) message += `:${debugLoc}`;
         break;
       }
       access = toAccess(ref.accessor) + access;
@@ -1729,7 +1725,7 @@ function resumeSingleNodeConditional(cb, scopeId, accessor, onlyChild) {
     )
   );
 }
-function writeScope(scopeId, partialScope) {
+var writeScope = (scopeId, partialScope) => {
   const { state } = $chunk.boundary;
   const { scopes } = state;
   let scope = scopes.get(scopeId);
@@ -1753,6 +1749,15 @@ function writeScope(scopeId, partialScope) {
     };
   }
   return scope;
+};
+if (true) {
+  writeScope = /* @__PURE__ */ ((writeScope2) => (scopeId, partialScope, file, loc, vars) => {
+    const scope = writeScope2(scopeId, partialScope);
+    if (file && loc !== void 0) {
+      setDebugInfo(scope, file, loc, vars);
+    }
+    return scope;
+  })(writeScope);
 }
 function writeExistingScope(scope) {
   return writeScope(scope[K_SCOPE_ID], scope);
@@ -2967,7 +2972,6 @@ function NOOP2() {
   controllable_textarea_value,
   createRenderer,
   createTemplate,
-  debug,
   dynamicTagArgs,
   dynamicTagInput,
   ensureScopeWithId,

package/dist/debug/html.mjs

@@ -502,15 +502,12 @@ var Reference = class {
   assigns = "";
 };
 var DEBUG = /* @__PURE__ */ new WeakMap();
-function debug(obj, file, loc, vars) {
-  if (true) {
-    DEBUG.set(obj, {
-      file,
-      loc,
-      vars
-    });
-  }
-  return obj;
+function setDebugInfo(obj, file, loc, vars) {
+  DEBUG.set(obj, {
+    file,
+    loc,
+    vars
+  });
 }
 var Serializer = class {
   #state = new State();
@@ -1237,21 +1234,21 @@ function throwUnserializable(state, cause, ref = null, accessor = "") {
     let message = "Unable to serialize";
     let access = "";
     while (ref?.accessor) {
-      const debug2 = ref.parent?.debug;
-      if (debug2) {
-        const varLoc = debug2.vars?.[ref.accessor];
+      const debug = ref.parent?.debug;
+      if (debug) {
+        const varLoc = debug.vars?.[ref.accessor];
+        let debugAccess = ref.accessor;
+        let debugLoc = debug.loc;
         if (varLoc) {
           if (Array.isArray(varLoc)) {
-            message += ` "${varLoc[0]}" in ${debug2.file}:${varLoc[1]}`;
+            debugAccess = varLoc[0];
+            if (varLoc[1]) debugLoc = varLoc[1];
           } else {
-            message += ` "${ref.accessor}" in ${debug2.file}:${varLoc}`;
-          }
-        } else {
-          message += ` ${JSON.stringify(ref.accessor)} in ${debug2.file}`;
-          if (debug2.loc) {
-            message += `:${debug2.loc}`;
+            debugLoc = varLoc;
           }
         }
+        message += ` ${JSON.stringify(debugAccess)} in ${debug.file}`;
+        if (debugLoc) message += `:${debugLoc}`;
         break;
       }
       access = toAccess(ref.accessor) + access;
@@ -1647,7 +1644,7 @@ function resumeSingleNodeConditional(cb, scopeId, accessor, onlyChild) {
     )
   );
 }
-function writeScope(scopeId, partialScope) {
+var writeScope = (scopeId, partialScope) => {
   const { state } = $chunk.boundary;
   const { scopes } = state;
   let scope = scopes.get(scopeId);
@@ -1671,6 +1668,15 @@ function writeScope(scopeId, partialScope) {
     };
   }
   return scope;
+};
+if (true) {
+  writeScope = /* @__PURE__ */ ((writeScope2) => (scopeId, partialScope, file, loc, vars) => {
+    const scope = writeScope2(scopeId, partialScope);
+    if (file && loc !== void 0) {
+      setDebugInfo(scope, file, loc, vars);
+    }
+    return scope;
+  })(writeScope);
 }
 function writeExistingScope(scope) {
   return writeScope(scope[K_SCOPE_ID], scope);
@@ -2884,7 +2890,6 @@ export {
   controllable_textarea_value,
   createRenderer,
   createTemplate,
-  debug,
   dynamicTagArgs,
   dynamicTagInput,
   ensureScopeWithId,

package/dist/html/serializer.d.ts

@@ -1,5 +1,5 @@
 import type { Boundary } from "./writer";
-export declare function debug(obj: WeakKey, file: string, loc: string | 0, vars?: Record<string, string>): WeakKey;
+export declare function setDebugInfo(obj: WeakKey, file: string, loc: string | 0, vars?: Record<string, string>): void;
 export declare class Serializer {
     #private;
     get flushed(): boolean;

package/dist/html/writer.d.ts

@@ -34,7 +34,8 @@ export declare function resumeForTo(to: number, from: number | Falsy, step: numb
 export declare function resumeSingleNodeForTo(to: number, from: number | Falsy, step: number | Falsy, cb: (index: number) => void, scopeId: number, accessor: Accessor, onlyChild?: 1): void;
 export declare function resumeConditional(cb: () => void | number, scopeId: number, accessor: Accessor): void;
 export declare function resumeSingleNodeConditional(cb: () => void | number, scopeId: number, accessor: Accessor, onlyChild?: 1): void;
-export declare function writeScope(scopeId: number, partialScope: PartialScope): ScopeInternals;
+declare let writeScope: (scopeId: number, partialScope: PartialScope) => ScopeInternals;
+export { writeScope };
 export declare function writeExistingScope(scope: ScopeInternals): ScopeInternals;
 export declare function ensureScopeWithId(scopeId: number): PartialScope;
 export declare function $global(): $Global & {
@@ -119,4 +120,3 @@ export declare function writeTrailers(html: string): void;
 type QueueCallback = (ticked: true) => void;
 export declare function queueTick(cb: QueueCallback): void;
 export declare function offTick(cb: QueueCallback): void;
-export {};

package/dist/html.d.ts

@@ -5,6 +5,5 @@ export { compat } from "./html/compat";
 export { escapeScript, escapeStyle, escapeXML, toString } from "./html/content";
 export { createRenderer, dynamicTagArgs, dynamicTagInput, } from "./html/dynamic-tag";
 export { forIn, forInBy, forOf, forOfBy, forTo, forToBy } from "./html/for";
-export { debug } from "./html/serializer";
 export { createTemplate } from "./html/template";
 export { $global, ensureScopeWithId, fork, getScopeById, markResumeNode, nextScopeId, nextTagId, nodeRef, peekNextScope, register, resumeClosestBranch, resumeConditional, resumeForIn, resumeForOf, resumeForTo, resumeSingleNodeConditional, resumeSingleNodeForIn, resumeSingleNodeForOf, resumeSingleNodeForTo, setTagVar, tryContent, write, writeEffect, writeExistingScope, writeScope, writeTrailers, } from "./html/writer";

package/dist/html.js

@@ -32,7 +32,6 @@ __export(html_exports, {
   controllable_textarea_value: () => controllable_textarea_value,
   createRenderer: () => createRenderer,
   createTemplate: () => createTemplate,
-  debug: () => debug,
   dynamicTagArgs: () => dynamicTagArgs,
   dynamicTagInput: () => dynamicTagInput,
   ensureScopeWithId: () => ensureScopeWithId,
@@ -437,9 +436,6 @@ var { hasOwnProperty } = {}, Generator = function* () {
   init = "";
   assigns = "";
 };
-function debug(obj, file, loc, vars) {
-  return obj;
-}
 var Serializer = class {
   #state = new State();
   get flushed() {
@@ -1164,13 +1160,13 @@ function resumeSingleNodeConditional(cb, scopeId, accessor, onlyChild) {
     )
   );
 }
-function writeScope(scopeId, partialScope) {
+var writeScope = (scopeId, partialScope) => {
   let { state } = $chunk.boundary, { scopes } = state, scope = scopes.get(scopeId);
   return state.needsMainRuntime = !0, scope ? Object.assign(scope, partialScope) : (scope = partialScope, scope[K_SCOPE_ID] = scopeId, state.scopes.set(scopeId, scope)), state.writeScopes ? state.writeScopes[scopeId] = scope : state.hasGlobals ? state.writeScopes = { [scopeId]: scope } : (state.hasGlobals = !0, state.writeScopes = {
     $: getFilteredGlobals(state.$global),
     [scopeId]: scope
   }), scope;
-}
+};
 function writeExistingScope(scope) {
   return writeScope(scope[K_SCOPE_ID], scope);
 }
@@ -1958,7 +1954,6 @@ function NOOP2() {
   controllable_textarea_value,
   createRenderer,
   createTemplate,
-  debug,
   dynamicTagArgs,
   dynamicTagInput,
   ensureScopeWithId,

package/dist/html.mjs

@@ -358,9 +358,6 @@ var { hasOwnProperty } = {}, Generator = function* () {
   init = "";
   assigns = "";
 };
-function debug(obj, file, loc, vars) {
-  return obj;
-}
 var Serializer = class {
   #state = new State();
   get flushed() {
@@ -1085,13 +1082,13 @@ function resumeSingleNodeConditional(cb, scopeId, accessor, onlyChild) {
     )
   );
 }
-function writeScope(scopeId, partialScope) {
+var writeScope = (scopeId, partialScope) => {
   let { state } = $chunk.boundary, { scopes } = state, scope = scopes.get(scopeId);
   return state.needsMainRuntime = !0, scope ? Object.assign(scope, partialScope) : (scope = partialScope, scope[K_SCOPE_ID] = scopeId, state.scopes.set(scopeId, scope)), state.writeScopes ? state.writeScopes[scopeId] = scope : state.hasGlobals ? state.writeScopes = { [scopeId]: scope } : (state.hasGlobals = !0, state.writeScopes = {
     $: getFilteredGlobals(state.$global),
     [scopeId]: scope
   }), scope;
-}
+};
 function writeExistingScope(scope) {
   return writeScope(scope[K_SCOPE_ID], scope);
 }
@@ -1878,7 +1875,6 @@ export {
   controllable_textarea_value,
   createRenderer,
   createTemplate,
-  debug,
   dynamicTagArgs,
   dynamicTagInput,
   ensureScopeWithId,

package/dist/translator/index.js

@@ -550,6 +550,15 @@ function toAccess(accessor) {
 var K_SCOPE_ID = Symbol("Scope ID");
 var kPendingContexts = Symbol("Pending Contexts");
 var branchIdKey = Symbol();
+if (false) {
+  writeScope = /* @__PURE__ */ ((writeScope2) => (scopeId, partialScope, file, loc, vars) => {
+    const scope = writeScope2(scopeId, partialScope);
+    if (file && loc !== void 0) {
+      setDebugInfo(scope, file, loc, vars);
+    }
+    return scope;
+  })(writeScope);
+}
 var tick = globalThis.setImmediate || globalThis.setTimeout || globalThis.queueMicrotask || ((cb) => Promise.resolve().then(cb));
 
 // src/html/attrs.ts
@@ -606,8 +615,11 @@ var K_TAGS_API_STATE = Symbol();
 
 // src/translator/util/to-property-name.ts
 var import_compiler3 = require("@marko/compiler");
+function isValidPropertyIdentifier(name2) {
+  return /^[a-z_$][a-z0-9_$]*$/i.test(name2);
+}
 function toPropertyName(name2) {
-  if (/^[a-z_$][a-z0-9_$]*$/i.test(name2)) {
+  if (isValidPropertyIdentifier(name2)) {
     return import_compiler3.types.identifier(name2);
   } else if (/^(?:0|[1-9][0-9]*)$/.test(name2)) {
     return import_compiler3.types.numericLiteral(parseInt(name2, 10));
@@ -1719,8 +1731,9 @@ var return_default = {
         const attrs2 = getKnownAttrValues(tag.node);
         flushBefore(tag);
         if (attrs2.valueChange) {
-          getSerializedScopeProperties(section).set(
-            import_compiler11.types.stringLiteral("@" /* TagVariableChange */),
+          setSerializedProperty(
+            section,
+            "@" /* TagVariableChange */,
             attrs2.valueChange
           );
         }
@@ -1843,10 +1856,10 @@ function createScopeReadPattern(section, referencedBindings) {
   const rootPattern = import_compiler13.types.objectPattern([]);
   let nestedPatterns;
   forEach(referencedBindings, (ref) => {
-    if (ref.name.includes("#")) return;
-    const propertyKey = getScopeAccessorLiteral(ref);
-    const propertyValue = import_compiler13.types.identifier(ref.name);
-    const isShorthand = propertyKey.value === propertyValue.name;
+    const propertyValue = ref.name;
+    if (!isValidPropertyIdentifier(propertyValue)) return;
+    const propertyKey = getScopeAccessor(ref);
+    const isShorthand = propertyKey === propertyValue;
     let pattern = rootPattern;
     if (ref.section !== section) {
       if (!nestedPatterns) nestedPatterns = [rootPattern];
@@ -1865,8 +1878,8 @@ function createScopeReadPattern(section, referencedBindings) {
     }
     pattern.properties.push(
       import_compiler13.types.objectProperty(
-        isShorthand ? propertyValue : propertyKey,
-        propertyValue,
+        toPropertyName(propertyKey),
+        import_compiler13.types.identifier(propertyValue),
         false,
         isShorthand
       )
@@ -1886,10 +1899,11 @@ function getScopeExpression(section, targetSection) {
   return scope;
 }
 function createScopeReadExpression(section, reference) {
+  const propName = toPropertyName(getScopeAccessor(reference));
   return import_compiler13.types.memberExpression(
     getScopeExpression(section, reference.section),
-    getScopeAccessorLiteral(reference),
-    true
+    propName,
+    propName.type !== "Identifier"
   );
 }
 
@@ -1996,6 +2010,9 @@ function setForceResumeScope(section) {
   _setForceResumeScope(section, true);
 }
 var [getSerializedScopeProperties] = createSectionState("serializedScopeProperties", () => /* @__PURE__ */ new Map());
+function setSerializedProperty(section, key, value) {
+  getSerializedScopeProperties(section).set(key, value);
+}
 var [getHTMLSectionStatements] = createSectionState(
   "htmlScopeStatements",
   () => []
@@ -2562,26 +2579,34 @@ function writeHTMLResumeStatements(path5) {
   forEach(section.assignments, (assignment) => {
     let currentSection = section;
     while (currentSection !== assignment.section) {
-      getSerializedScopeProperties(currentSection).set(
-        import_compiler17.types.stringLiteral("_"),
-        callRuntime(
-          "ensureScopeWithId",
-          getScopeIdIdentifier(currentSection = currentSection.parent)
-        )
-      );
+      const currentSerialized = getSerializedScopeProperties(currentSection);
+      currentSection = currentSection.parent;
+      if (!currentSerialized.has("_")) {
+        currentSerialized.set(
+          "_",
+          callRuntime(
+            "ensureScopeWithId",
+            getScopeIdIdentifier(currentSection)
+          )
+        );
+      }
     }
   });
   forEach(section.closures, (closure) => {
     if (isStatefulReferences(closure)) {
       let currentSection = section;
       while (currentSection !== closure.section) {
-        getSerializedScopeProperties(currentSection).set(
-          import_compiler17.types.stringLiteral("_"),
-          callRuntime(
-            "ensureScopeWithId",
-            getScopeIdIdentifier(currentSection = currentSection.parent)
-          )
-        );
+        const currentSerialized = getSerializedScopeProperties(currentSection);
+        currentSection = currentSection.parent;
+        if (!currentSerialized.has("_")) {
+          currentSerialized.set(
+            "_",
+            callRuntime(
+              "ensureScopeWithId",
+              getScopeIdIdentifier(currentSection)
+            )
+          );
+        }
       }
       setForceResumeScope(closure.section);
       const isImmediateOwner = section.parent?.id === closure.section.id;
@@ -2617,69 +2642,63 @@ function writeHTMLResumeStatements(path5) {
       );
     }
   }
-  const accessors = /* @__PURE__ */ new Set();
-  const additionalProperties = getSerializedScopeProperties(section);
+  const serializedLookup = getSerializedScopeProperties(section);
   const serializedProperties = [];
   forEach(section.bindings, (binding) => {
     if (binding.serialize && binding.type !== 0 /* dom */) {
-      const accessor = getScopeAccessorLiteral(binding);
+      const accessor = getScopeAccessor(binding);
+      serializedLookup.delete(accessor);
       serializedProperties.push(
-        import_compiler17.types.objectProperty(accessor, getDeclaredBindingExpression(binding))
+        toObjectProperty(accessor, getDeclaredBindingExpression(binding))
       );
-      accessors.add(accessor.value);
     }
   });
-  for (const [key, value] of additionalProperties) {
-    if (!accessors.has(key.value)) {
-      serializedProperties.push(
-        import_compiler17.types.objectProperty(key, value, !import_compiler17.types.isLiteral(key))
-      );
-      accessors.add(key.value);
-    }
+  for (const [key, value] of serializedLookup) {
+    serializedProperties.push(toObjectProperty(key, value));
   }
   if (serializedProperties.length || forceResumeScope(section)) {
-    let writeScope2 = callRuntime(
-      "writeScope",
+    const writeScopeArgs = [
       scopeIdIdentifier,
       import_compiler17.types.objectExpression(serializedProperties)
-    );
+    ];
     if (!isOptimize()) {
       let debugVars;
       forEach(section.bindings, (binding) => {
+        if (!binding.serialize || binding.type === 0 /* dom */) return;
         let root = binding;
         let access = "";
-        while (!root.loc && root.upstreamAlias) {
+        while (!(root.loc || root.declared) && root.upstreamAlias) {
           if (root.property !== void 0) {
             access = toAccess(root.property) + access;
           }
           root = root.upstreamAlias;
         }
-        if (root.loc) {
-          const locStr = import_compiler17.types.stringLiteral(
-            `${root.loc.start.line}:${root.loc.start.column + 1}`
-          );
-          (debugVars ||= []).push(
-            import_compiler17.types.objectProperty(
-              getScopeAccessorLiteral(binding),
-              root !== binding ? import_compiler17.types.arrayExpression([
-                import_compiler17.types.stringLiteral(root.name + access),
-                locStr
-              ]) : locStr
-            )
-          );
-        }
+        const locExpr = root.loc && import_compiler17.types.stringLiteral(
+          `${root.loc.start.line}:${root.loc.start.column + 1}`
+        );
+        (debugVars ||= []).push(
+          toObjectProperty(
+            getScopeAccessor(binding),
+            root !== binding ? import_compiler17.types.arrayExpression(
+              locExpr ? [import_compiler17.types.stringLiteral(root.name + access), locExpr] : [import_compiler17.types.stringLiteral(root.name + access)]
+            ) : locExpr || import_compiler17.types.numericLiteral(0)
+          )
+        );
       });
-      writeScope2 = callRuntime(
-        "debug",
-        writeScope2,
+      writeScopeArgs.push(
         import_compiler17.types.stringLiteral(path5.hub.file.opts.filenameRelative),
         section.loc && section.loc.start.line != null ? import_compiler17.types.stringLiteral(
           `${section.loc.start.line}:${section.loc.start.column + 1}`
-        ) : import_compiler17.types.numericLiteral(0),
-        debugVars && import_compiler17.types.objectExpression(debugVars)
+        ) : import_compiler17.types.numericLiteral(0)
       );
+      if (debugVars) {
+        writeScopeArgs.push(import_compiler17.types.objectExpression(debugVars));
+      }
     }
-    path5.pushContainer("body", import_compiler17.types.expressionStatement(writeScope2));
+    path5.pushContainer(
+      "body",
+      import_compiler17.types.expressionStatement(callRuntime("writeScope", ...writeScopeArgs))
+    );
   }
   const resumeClosestBranch2 = !section.isBranch && (section.hasAbortSignal || !!section.closures || !!find(section.bindings, (binding) => binding.type === 1 /* let */));
   if (resumeClosestBranch2) {
@@ -3819,6 +3838,12 @@ function getScopeAccessorLiteral(binding) {
     binding.name + (binding.type === 0 /* dom */ ? `/${binding.id}` : "")
   );
 }
+function getScopeAccessor(binding) {
+  if (isOptimize()) {
+    return binding.id + "";
+  }
+  return binding.name + (binding.type === 0 /* dom */ ? `/${binding.id}` : "");
+}
 function getReadReplacement(node) {
   const { extra } = node;
   if (!extra) return;
@@ -4580,8 +4605,9 @@ var native_tag_default = {
           for (const reference of references) {
             let currentSection = getSection(reference);
             while (currentSection !== section && currentSection.parent) {
-              getSerializedScopeProperties(currentSection).set(
-                import_compiler28.types.stringLiteral("_"),
+              setSerializedProperty(
+                currentSection,
+                "_",
                 callRuntime(
                   "ensureScopeWithId",
                   getScopeIdIdentifier(
@@ -5210,10 +5236,9 @@ var for_default = {
               )
             );
           }
-          getSerializedScopeProperties(tagSection).set(
-            import_compiler30.types.stringLiteral(
-              getScopeAccessorLiteral(nodeRef2).value + "(" /* LoopScopeMap */
-            ),
+          setSerializedProperty(
+            tagSection,
+            getScopeAccessor(nodeRef2) + "(" /* LoopScopeMap */,
             import_compiler30.types.conditionalExpression(
               import_compiler30.types.memberExpression(forScopesIdentifier, import_compiler30.types.identifier("size")),
               forScopesIdentifier,
@@ -6210,8 +6235,9 @@ var html_script_default = {
         for (const reference of references) {
           let currentSection = getSection(reference);
           while (currentSection !== section && currentSection.parent) {
-            getSerializedScopeProperties(currentSection).set(
-              import_compiler35.types.stringLiteral("_"),
+            setSerializedProperty(
+              currentSection,
+              "_",
               callRuntime(
                 "ensureScopeWithId",
                 getScopeIdIdentifier(currentSection = currentSection.parent)
@@ -6605,8 +6631,9 @@ var html_style_default = {
         for (const reference of references) {
           let currentSection = getSection(reference);
           while (currentSection !== section && currentSection.parent) {
-            getSerializedScopeProperties(currentSection).set(
-              import_compiler36.types.stringLiteral("_"),
+            setSerializedProperty(
+              currentSection,
+              "_",
               callRuntime(
                 "ensureScopeWithId",
                 getScopeIdIdentifier(currentSection = currentSection.parent)
@@ -7080,10 +7107,9 @@ var IfTag = {
             nextTag.insertBefore(statement);
           } else {
             if (isStateful) {
-              getSerializedScopeProperties(section).set(
-                import_compiler39.types.stringLiteral(
-                  getScopeAccessorLiteral(nodeRef2).value + "(" /* ConditionalRenderer */
-                ),
+              setSerializedProperty(
+                section,
+                getScopeAccessor(nodeRef2) + "(" /* ConditionalRenderer */,
                 ifBranchIdentifier
               );
               const cbNode = import_compiler39.types.arrowFunctionExpression(
@@ -7115,10 +7141,9 @@ var IfTag = {
                 ].filter(Boolean)
               )
             );
-            getSerializedScopeProperties(section).set(
-              import_compiler39.types.stringLiteral(
-                getScopeAccessorLiteral(nodeRef2).value + "!" /* ConditionalScope */
-              ),
+            setSerializedProperty(
+              section,
+              getScopeAccessor(nodeRef2) + "!" /* ConditionalScope */,
               callRuntime("getScopeById", ifScopeIdIdentifier)
             );
           }
@@ -7409,10 +7434,9 @@ var let_default = {
       } else {
         translateVar(tag, valueAttr.value);
         if (valueChangeAttr) {
-          getSerializedScopeProperties(section).set(
-            import_compiler40.types.stringLiteral(
-              getScopeAccessorLiteral(binding).value + "@" /* TagVariableChange */
-            ),
+          setSerializedProperty(
+            section,
+            getScopeAccessor(binding) + "@" /* TagVariableChange */,
             valueChangeAttr.value
           );
         }
@@ -8497,8 +8521,9 @@ function translateHTML(tag) {
         import_compiler52.types.variableDeclarator(peekScopeId, callRuntime("peekNextScope"))
       ])
     );
-    getSerializedScopeProperties(section).set(
-      getScopeAccessorLiteral(childScopeBinding),
+    setSerializedProperty(
+      section,
+      getScopeAccessor(childScopeBinding),
       callRuntime("writeExistingScope", peekScopeId)
     );
     if (tagVar) {
@@ -9099,10 +9124,11 @@ var dynamic_tag_default = {
     },
     exit(tag) {
       const { node } = tag;
-      const extra = node.extra;
-      const nodeRef2 = extra[kDOMBinding];
+      const tagExtra = node.extra;
+      const nodeRef2 = tagExtra[kDOMBinding];
       const section = getSection(tag);
-      const isClassAPI = extra.featureType === "class";
+      const isClassAPI = tagExtra.featureType === "class";
+      const tagNameReferences = node.name.extra?.referencedBindings;
       let tagExpression = node.name;
       if (import_compiler53.types.isStringLiteral(tagExpression)) {
         tagExpression = (0, import_babel_utils42.importDefault)(
@@ -9217,16 +9243,14 @@ var dynamic_tag_default = {
         } else {
           statements.push(import_compiler53.types.expressionStatement(dynamicTagExpr));
         }
-        getSerializedScopeProperties(section).set(
-          import_compiler53.types.stringLiteral(
-            getScopeAccessorLiteral(nodeRef2).value + "!" /* ConditionalScope */
-          ),
+        setSerializedProperty(
+          section,
+          getScopeAccessor(nodeRef2) + "!" /* ConditionalScope */,
           callRuntime("writeExistingScope", dynamicScopeIdentifier)
         );
-        getSerializedScopeProperties(section).set(
-          import_compiler53.types.stringLiteral(
-            getScopeAccessorLiteral(nodeRef2).value + "(" /* ConditionalRenderer */
-          ),
+        setSerializedProperty(
+          section,
+          getScopeAccessor(nodeRef2) + "(" /* ConditionalRenderer */,
           callRuntime(
             "normalizeDynamicRenderer",
             import_compiler53.types.isIdentifier(tagExpression) ? import_compiler53.types.identifier(tagExpression.name) : tagExpression
@@ -9250,7 +9274,7 @@ var dynamic_tag_default = {
         signal.hasDownstreamIntersections = () => true;
         addValue(
           section2,
-          node.name.extra?.referencedBindings,
+          tagNameReferences,
           signal,
           bodySection ? import_compiler53.types.logicalExpression(
             "||",
@@ -9262,7 +9286,7 @@ var dynamic_tag_default = {
         );
         if (tag.node.var) {
           const childScopeLiteral = import_compiler53.types.stringLiteral(
-            getScopeAccessorLiteral(extra[kDOMBinding]).value + "!" /* ConditionalScope */
+            getScopeAccessor(nodeRef2) + "!" /* ConditionalScope */
           );
           const source = initValue(
             // TODO: support destructuring
@@ -9307,7 +9331,7 @@ var dynamic_tag_default = {
           let added = false;
           addValue(
             section2,
-            node.extra?.referencedBindings,
+            tagExtra.referencedBindings,
             {
               get identifier() {
                 if (!added) {

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

@@ -67,6 +67,7 @@ export declare function dropReferences(node: t.Node | t.Node[]): void;
 export declare function getCanonicalBinding(binding?: Binding): Binding | undefined;
 export declare function getAllTagReferenceNodes(tag: t.MarkoTag, referenceNodes?: t.Node[]): t.Node[];
 export declare function getScopeAccessorLiteral(binding: Binding): t.StringLiteral | t.NumericLiteral;
+export declare function getScopeAccessor(binding: Binding): string;
 export declare function getReadReplacement(node: t.Identifier | t.MemberExpression): t.Node | undefined;
 export interface ReferencedExtra extends t.NodeExtra {
     section: Section;

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

@@ -35,7 +35,7 @@ export type Signal = {
 type closureSignalBuilder = (signal: Signal, render: t.Expression, intersection?: t.Expression) => t.Expression;
 export declare function setClosureSignalBuilder(tag: t.NodePath<t.MarkoTag>, builder: closureSignalBuilder): void;
 export declare function setForceResumeScope(section: Section): void;
-export declare const getSerializedScopeProperties: (section: Section) => Map<t.StringLiteral | t.NumericLiteral, t.Expression>;
+export declare function setSerializedProperty(section: Section, key: string, value: t.Expression): void;
 export declare const getHTMLSectionStatements: (section: Section) => t.Statement[];
 export declare function getSignal(section: Section, referencedBindings: ReferencedBindings, name?: string): Signal;
 export declare function initValue(binding: Binding, runtimeHelper?: "value" | "state"): Signal;

package/dist/translator/util/to-property-name.d.ts

@@ -1,4 +1,5 @@
 import { types as t } from "@marko/compiler";
+export declare function isValidPropertyIdentifier(name: string): boolean;
 export declare function toPropertyName(name: string): t.Identifier | t.StringLiteral | t.NumericLiteral;
 export declare function toObjectProperty(name: string, value: t.Expression): t.ObjectProperty;
 export declare function toMemberExpression(object: t.Expression, key: string): t.MemberExpression;

package/package.json

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