marko 6.0.91 → 6.0.93

package/dist/translator/index.js

@@ -1639,6 +1639,7 @@ function startSection(path5) {
       referencedClosures: void 0,
       referencedHoists: void 0,
       bindings: void 0,
+      domGetterBindings: /* @__PURE__ */ new Map(),
       hoisted: void 0,
       isHoistThrough: void 0,
       serializeReason: void 0,
@@ -2591,8 +2592,8 @@ var import_compiler13 = require("@marko/compiler");
 function normalizeStringExpression(parts) {
   const strs = [];
   const exprs = [];
-  let curStr = parts[0];
-  for (let i = 1; i < parts.length; i++) {
+  let curStr = "";
+  for (let i = 0; i < parts.length; i++) {
     let content = parts[i];
     if (typeof content === "object") {
       if (import_compiler13.types.isStringLiteral(content)) {
@@ -3276,14 +3277,17 @@ var [getHTMLSectionStatements] = createSectionState(
   "htmlScopeStatements",
   () => []
 );
-var [getHoistFunctionsIdsMap] = createSectionState("hoistFunctionsIdsMap", () => /* @__PURE__ */ new Map());
-function getHoistFunctionIdentifier(hoistedBinding) {
-  const idsMap = getHoistFunctionsIdsMap(hoistedBinding.section);
-  let identifier = idsMap.get(hoistedBinding);
+var [getBindingGetterIdMap] = createSectionState(
+  "bindingGetterIdMap",
+  () => /* @__PURE__ */ new Map()
+);
+function getBindingGetterIdentifier(binding) {
+  const idsMap = getBindingGetterIdMap(binding.section);
+  let identifier = idsMap.get(binding);
   if (!identifier) {
     idsMap.set(
-      hoistedBinding,
-      identifier = generateUidIdentifier(`get${hoistedBinding.name}`)
+      binding,
+      identifier = generateUidIdentifier(`get${binding.name}`)
     );
   }
   return identifier;
@@ -3392,7 +3396,8 @@ function getSignalFn(signal) {
   const isIntersection = Array.isArray(binding);
   const isBinding = binding && !isIntersection;
   const isValue = isBinding && binding.section === section;
-  if (isBinding && (signal.renderReferencedBindings || binding.aliases.size || binding.propertyAliases.size)) {
+  const assertsHoists = isValue && binding.hoists.size && !isOptimize();
+  if (isBinding && (signal.renderReferencedBindings || assertsHoists || binding.aliases.size || binding.propertyAliases.size)) {
     const valueParam = import_compiler22.types.identifier(binding.name);
     if (binding.loc) {
       valueParam.loc = binding.loc;
@@ -3465,6 +3470,13 @@ function getSignalFn(signal) {
         )
       );
     }
+    if (assertsHoists) {
+      signal.render.push(
+        import_compiler22.types.expressionStatement(
+          callRuntime("_assert_hoist", import_compiler22.types.identifier(binding.name))
+        )
+      );
+    }
   }
   for (const value of signal.values) {
     if (signalHasStatements(value.signal)) {
@@ -3740,6 +3752,7 @@ function getRegisterUID(section, name2) {
 function writeSignals(section) {
   const seen = /* @__PURE__ */ new Set();
   writeHoists(section);
+  writeDomGetters(section);
   for (const signal of getSignals(section).values()) {
     writeSignal(signal);
   }
@@ -3813,6 +3826,24 @@ function writeSignals(section) {
     (0, import_babel_utils15.getProgram)().node.body.push(...signalStatements);
   }
 }
+function writeDomGetters(section) {
+  for (const [binding, registerId] of section.domGetterBindings) {
+    (0, import_babel_utils15.getProgram)().node.body.push(
+      import_compiler22.types.variableDeclaration("const", [
+        import_compiler22.types.variableDeclarator(
+          getBindingGetterIdentifier(binding),
+          callRuntime(
+            "_el",
+            import_compiler22.types.stringLiteral(registerId),
+            import_compiler22.types.stringLiteral(
+              getAccessorPrefix().Getter + getScopeAccessorLiteral(binding).value
+            )
+          )
+        )
+      ])
+    );
+  }
+}
 function writeHoists(section) {
   forEach(section.hoisted, (binding) => {
     for (const hoistedBinding of binding.hoists.values()) {
@@ -3829,7 +3860,7 @@ function writeHoists(section) {
         }
         currentSection = parentSection;
       }
-      const hoistIdentifier = getHoistFunctionIdentifier(hoistedBinding);
+      const hoistIdentifier = getBindingGetterIdentifier(hoistedBinding);
       (0, import_babel_utils15.getProgram)().node.body.push(
         import_compiler22.types.variableDeclaration("const", [
           import_compiler22.types.variableDeclarator(
@@ -3967,66 +3998,6 @@ function writeHTMLResumeStatements(path5) {
       }
     }
   });
-  const sectionDynamicSubscribers = /* @__PURE__ */ new Set();
-  forEach(section.hoisted, (binding) => {
-    for (const hoistedBinding of binding.hoists.values()) {
-      if (hoistedBinding.downstreamExpressions.size) {
-        getHTMLSectionStatements(hoistedBinding.section).push(
-          import_compiler22.types.variableDeclaration("const", [
-            import_compiler22.types.variableDeclarator(
-              import_compiler22.types.identifier(hoistedBinding.name),
-              callRuntime(
-                "_hoist",
-                getScopeIdIdentifier(hoistedBinding.section),
-                import_compiler22.types.stringLiteral(
-                  getResumeRegisterId(
-                    hoistedBinding.section,
-                    hoistedBinding,
-                    "hoist"
-                  )
-                )
-              )
-            )
-          ])
-        );
-      }
-      let currentSection = section;
-      while (currentSection && currentSection !== hoistedBinding.section) {
-        const parentSection = currentSection.parent;
-        if (!currentSection.sectionAccessor && !sectionDynamicSubscribers.has(currentSection)) {
-          const subscribersIdentifier = generateUidIdentifier(
-            `${currentSection.name}__subscribers`
-          );
-          sectionDynamicSubscribers.add(currentSection);
-          getHTMLSectionStatements(parentSection).push(
-            import_compiler22.types.variableDeclaration("const", [
-              import_compiler22.types.variableDeclarator(
-                subscribersIdentifier,
-                import_compiler22.types.newExpression(import_compiler22.types.identifier("Set"), [])
-              )
-            ])
-          );
-          addWriteScopeBuilder(
-            currentSection,
-            (expr) => callRuntime("_subscribe", subscribersIdentifier, expr)
-          );
-          setSerializedValue(
-            parentSection,
-            getSectionInstancesAccessor(currentSection),
-            subscribersIdentifier
-          );
-        }
-        currentSection = parentSection;
-      }
-    }
-    if (binding.hoists.size && binding.type !== 0 /* dom */) {
-      setBindingSerializedValue(
-        section,
-        binding,
-        getDeclaredBindingExpression(binding)
-      );
-    }
-  });
   for (let i = allSignals.length; i--; ) {
     if (allSignals[i].effect.length) {
       const signalRefs = allSignals[i].referencedBindings;
@@ -4149,6 +4120,17 @@ function writeHTMLResumeStatements(path5) {
       ...additionalStatements
     );
   }
+  if (debug) {
+    forEach(section.bindings, (binding) => {
+      if (binding.hoists.size && binding.type !== 0 /* dom */) {
+        body.push(
+          import_compiler22.types.expressionStatement(
+            callRuntime("_assert_hoist", import_compiler22.types.identifier(binding.name))
+          )
+        );
+      }
+    });
+  }
   const returnIdentifier = getSectionReturnValueIdentifier(section);
   if (returnIdentifier !== void 0) {
     body.push(import_compiler22.types.returnStatement(returnIdentifier));
@@ -4166,9 +4148,19 @@ function replaceEffectNode(node) {
 function replaceBindingReadNode(node) {
   switch (node.type) {
     case "Identifier":
-    case "MemberExpression": {
+    case "MemberExpression":
+    case "OptionalMemberExpression": {
       return getReadReplacement(node);
     }
+    case "CallExpression": {
+      const { extra } = node.callee;
+      const binding = extra?.read?.binding;
+      if (binding?.type === 0 /* dom */) {
+        const replacement = createScopeReadExpression(extra.section, binding);
+        return isOptimize() ? replacement : callRuntime("_el_read", replacement);
+      }
+      break;
+    }
   }
 }
 var updateExpressions = /* @__PURE__ */ new WeakSet();
@@ -4508,6 +4500,70 @@ function getTemplateContentName() {
 }
 var html_default = {
   translate: {
+    enter() {
+      forEachSection((section) => {
+        const sectionDynamicSubscribers = /* @__PURE__ */ new Set();
+        forEach(section.hoisted, (binding) => {
+          for (const hoistedBinding of binding.hoists.values()) {
+            if (hoistedBinding.downstreamExpressions.size) {
+              getHTMLSectionStatements(hoistedBinding.section).push(
+                import_compiler24.types.variableDeclaration("const", [
+                  import_compiler24.types.variableDeclarator(
+                    import_compiler24.types.identifier(hoistedBinding.name),
+                    callRuntime(
+                      "_hoist",
+                      getScopeIdIdentifier(hoistedBinding.section),
+                      import_compiler24.types.stringLiteral(
+                        getResumeRegisterId(
+                          hoistedBinding.section,
+                          hoistedBinding,
+                          "hoist"
+                        )
+                      )
+                    )
+                  )
+                ])
+              );
+            }
+            let currentSection = section;
+            while (currentSection && currentSection !== hoistedBinding.section) {
+              const parentSection = currentSection.parent;
+              if (!currentSection.sectionAccessor && !sectionDynamicSubscribers.has(currentSection)) {
+                const subscribersIdentifier = generateUidIdentifier(
+                  `${currentSection.name}__subscribers`
+                );
+                sectionDynamicSubscribers.add(currentSection);
+                getHTMLSectionStatements(parentSection).push(
+                  import_compiler24.types.variableDeclaration("const", [
+                    import_compiler24.types.variableDeclarator(
+                      subscribersIdentifier,
+                      import_compiler24.types.newExpression(import_compiler24.types.identifier("Set"), [])
+                    )
+                  ])
+                );
+                addWriteScopeBuilder(
+                  currentSection,
+                  (expr) => callRuntime("_subscribe", subscribersIdentifier, expr)
+                );
+                setSerializedValue(
+                  parentSection,
+                  getSectionInstancesAccessor(currentSection),
+                  subscribersIdentifier
+                );
+              }
+              currentSection = parentSection;
+            }
+          }
+          if (binding.hoists.size && binding.type !== 0 /* dom */) {
+            setBindingSerializedValue(
+              section,
+              binding,
+              getDeclaredBindingExpression(binding)
+            );
+          }
+        });
+      });
+    },
     exit(program) {
       flushInto(program);
       writeHTMLResumeStatements(program);
@@ -4576,11 +4632,30 @@ function replaceNode(node, container) {
 function replaceBindingReadNode2(node) {
   switch (node.type) {
     case "Identifier":
-    case "MemberExpression": {
+    case "MemberExpression":
+    case "OptionalMemberExpression": {
       const { extra } = node;
       if (extra && !(extra.read && !extra.read.binding.declared || extra.binding && !extra.binding.declared)) {
         return getReadReplacement(node);
       }
+      break;
+    }
+    case "CallExpression": {
+      const binding = node.callee.extra?.read?.binding;
+      if (binding && (binding.type === 6 /* hoist */ || binding.type === 0 /* dom */)) {
+        return import_compiler24.types.callExpression(
+          import_compiler24.types.arrowFunctionExpression(
+            [import_compiler24.types.cloneNode(node.callee)],
+            node
+          ),
+          [
+            importRuntime(
+              binding.type === 0 /* dom */ ? "_el_read_error" : "_hoist_read_error"
+            )
+          ]
+        );
+      }
+      break;
     }
   }
 }
@@ -4781,20 +4856,19 @@ function getChangeHandler(tag, attr) {
       changeAttrName,
       withPreviousLocation(import_compiler25.types.identifier(changeHandlerId), attr.value)
     );
-  } else if (import_compiler25.types.isMemberExpression(attr.value)) {
+  } else if (import_compiler25.types.isMemberExpression(attr.value) || import_compiler25.types.isOptionalMemberExpression(attr.value)) {
     const prop = attr.value.property;
     if (!import_compiler25.types.isPrivateName(attr.value.property)) {
+      const memberObj = import_compiler25.types.cloneNode(attr.value.object);
+      const memberProp = prop.type === "Identifier" ? withPreviousLocation(import_compiler25.types.identifier(prop.name + "Change"), prop) : import_compiler25.types.binaryExpression(
+        "+",
+        import_compiler25.types.cloneNode(prop),
+        import_compiler25.types.stringLiteral("Change")
+      );
+      const computed = memberProp.type !== "Identifier";
       return import_compiler25.types.markoAttribute(
         changeAttrName,
-        import_compiler25.types.memberExpression(
-          import_compiler25.types.cloneNode(attr.value.object),
-          prop.type === "Identifier" ? withPreviousLocation(import_compiler25.types.identifier(prop.name + "Change"), prop) : import_compiler25.types.binaryExpression(
-            "+",
-            import_compiler25.types.cloneNode(prop),
-            import_compiler25.types.stringLiteral("Change")
-          ),
-          prop.type !== "Identifier"
-        )
+        attr.value.optional ? import_compiler25.types.optionalMemberExpression(memberObj, memberProp, computed, true) : import_compiler25.types.memberExpression(memberObj, memberProp, computed)
       );
     }
   }
@@ -5012,6 +5086,9 @@ var program_default = {
         program.skip();
         return;
       }
+      if (isOutputHTML()) {
+        html_default.translate.enter();
+      }
     },
     exit(program) {
       if (isOutputHTML()) {
@@ -5257,6 +5334,27 @@ function translateVar(tag, initialValue, kind = "const") {
     import_compiler29.types.variableDeclaration(kind, [import_compiler29.types.variableDeclarator(tagVar, initialValue)])
   );
 }
+function translateDomVar(tag, binding) {
+  if (binding && tag.node.var) {
+    const tagSection = getSection(tag);
+    const registerId = tagSection.domGetterBindings.get(binding);
+    if (registerId) {
+      tag.parentPath.unshiftContainer(
+        "body",
+        import_compiler29.types.variableDeclaration("const", [
+          import_compiler29.types.variableDeclarator(
+            tag.node.var,
+            callRuntime(
+              "_el",
+              getScopeIdIdentifier(tagSection),
+              import_compiler29.types.stringLiteral(registerId)
+            )
+          )
+        ])
+      );
+    }
+  }
+}
 function getDestructurePattern(id) {
   let cur = id;
   while (cur) {
@@ -5270,7 +5368,6 @@ function getDestructurePattern(id) {
 // src/translator/visitors/tag/native-tag.ts
 var kNativeTagBinding = Symbol("native tag binding");
 var kSkipEndTag = Symbol("skip native tag mark");
-var kGetterId = Symbol("node getter id");
 var kTagContentAttr = Symbol("tag could have dynamic content attribute");
 var htmlSelectArgs = /* @__PURE__ */ new WeakMap();
 var native_tag_default = {
@@ -5359,26 +5456,7 @@ var native_tag_default = {
           !!(node.var || hasEventHandlers),
           nodeBinding
         );
-        if (node.var) {
-          for (const ref of tag.scope.getBinding(node.var.name).referencePaths) {
-            const refSection = getOrCreateSection(ref);
-            setReferencesScope(ref);
-            if (isSameOrChildSection(tagSection, refSection)) {
-              addOwnerSerializeReason(refSection, tagSection, true);
-              if (!tagExtra[kGetterId] && !isInvokedFunction(ref)) {
-                tagExtra[kGetterId] = getRegisterUID(
-                  tagSection,
-                  nodeBinding.name
-                );
-              }
-            } else {
-              trackHoistedReference(
-                ref,
-                nodeBinding
-              );
-            }
-          }
-        }
+        trackDomVarReferences(tag, nodeBinding);
         addSerializeExpr(
           tagSection,
           push(attrExprExtras, tagExtra),
@@ -5399,17 +5477,7 @@ var native_tag_default = {
         if (tagExtra.tagNameNullable) {
           flushBefore(tag);
         }
-        if (tag.node.var) {
-          const getterId = tagExtra[kGetterId];
-          translateVar(
-            tag,
-            callRuntime(
-              "_el",
-              getterId && getScopeIdIdentifier(tagSection),
-              getterId && import_compiler30.types.stringLiteral(getterId)
-            )
-          );
-        }
+        translateDomVar(tag, nodeBinding);
         const visitAccessor = nodeBinding && getScopeAccessorLiteral(nodeBinding);
         write`<${tag.node.name}`;
         const usedAttrs = getUsedAttrs(tagName, tag.node);
@@ -5661,59 +5729,6 @@ var native_tag_default = {
         const tagDef = (0, import_babel_utils20.getTagDef)(tag);
         const write = writeTo(tag);
         const tagSection = getSection(tag);
-        if (tag.node.var) {
-          const varName = tag.node.var.name;
-          const varBinding = tag.scope.getBinding(varName);
-          const getterId = tagExtra[kGetterId];
-          let getterFnIdentifier;
-          if (getterId) {
-            getterFnIdentifier = generateUidIdentifier(`get_${varName}`);
-            (0, import_babel_utils20.getProgram)().node.body.push(
-              import_compiler30.types.variableDeclaration("const", [
-                import_compiler30.types.variableDeclarator(
-                  getterFnIdentifier,
-                  callRuntime(
-                    "_el",
-                    import_compiler30.types.stringLiteral(getterId),
-                    import_compiler30.types.stringLiteral(
-                      getAccessorPrefix().Getter + getScopeAccessorLiteral(nodeBinding).value
-                    )
-                  )
-                )
-              ])
-            );
-          }
-          for (const reference of varBinding.referencePaths) {
-            const referenceSection = getSection(reference);
-            if (isSameOrChildSection(tagSection, referenceSection)) {
-              if (isInvokedFunction(reference)) {
-                reference.parentPath.replaceWith(
-                  import_compiler30.types.expressionStatement(
-                    createScopeReadExpression(referenceSection, nodeBinding)
-                  )
-                );
-              } else if (getterFnIdentifier) {
-                reference.replaceWith(
-                  import_compiler30.types.callExpression(getterFnIdentifier, [
-                    getScopeExpression(referenceSection, getSection(tag))
-                  ])
-                );
-              } else {
-                reference.replaceWith(
-                  import_compiler30.types.expressionStatement(
-                    import_compiler30.types.memberExpression(
-                      getScopeExpression(tagSection, referenceSection),
-                      import_compiler30.types.stringLiteral(
-                        getAccessorPrefix().Getter + getScopeAccessorLiteral(nodeBinding).value
-                      ),
-                      true
-                    )
-                  )
-                );
-              }
-            }
-          }
-        }
         const visitAccessor = nodeBinding && getScopeAccessorLiteral(nodeBinding);
         if (visitAccessor) {
           visit(tag, 32 /* Get */);
@@ -7778,6 +7793,42 @@ function createBinding(name2, type, section, upstreamAlias, property, excludePro
   getBindings().add(binding);
   return binding;
 }
+function trackDomVarReferences(tag, binding) {
+  const tagVar = tag.node.var;
+  if (!tagVar) {
+    return;
+  }
+  if (!import_compiler35.types.isIdentifier(tagVar)) {
+    throw tag.get("var").buildCodeFrameError(
+      "Tag variables on native elements cannot be destructured."
+    );
+  }
+  const babelBinding = tag.scope.getBinding(tagVar.name);
+  const section = getOrCreateSection(tag);
+  if (babelBinding.constantViolations.length) {
+    throw babelBinding.constantViolations[0].buildCodeFrameError(
+      "Tag variables on native elements cannot be assigned to."
+    );
+  }
+  let registerId;
+  for (const ref of babelBinding.referencePaths) {
+    const refSection = getOrCreateSection(ref);
+    setReferencesScope(ref);
+    if (isSameOrChildSection(binding.section, refSection)) {
+      (ref.node.extra ??= {}).read = createRead(binding, void 0);
+      if (!isInvokedFunction(ref)) {
+        section.domGetterBindings.set(
+          binding,
+          registerId ??= getRegisterUID(section, binding.name)
+        );
+      }
+      addOwnerSerializeReason(refSection, section, true);
+    } else {
+      trackHoistedReference(ref, binding);
+    }
+  }
+  return binding;
+}
 function trackVarReferences(tag, type, upstreamAlias) {
   const tagVar = tag.node.var;
   if (tagVar) {
@@ -7897,20 +7948,35 @@ function trackHoistedReference(referencePath, binding) {
     hoistedBinding
   );
 }
+function isReferenceHoisted(bindingPath, reference) {
+  const tag = bindingPath.isMarkoTag() ? bindingPath : getMarkoRoot(bindingPath)?.parentPath;
+  if (!tag?.isMarkoTag()) {
+    return false;
+  }
+  const body = tag.parentPath;
+  let cur = reference;
+  while (cur) {
+    if (cur.parentPath === body) {
+      return +tag.key > +cur.key;
+    }
+    cur = cur.parentPath;
+  }
+  return true;
+}
 function trackReferencesForBinding(babelBinding, binding) {
   const { referencePaths, constantViolations } = babelBinding;
-  for (const referencePath of referencePaths) {
-    const referenceSection = getOrCreateSection(referencePath);
-    if (isSameOrChildSection(binding.section, referenceSection)) {
-      if (binding.type === 4 /* local */ && referenceSection === binding.section) {
-        continue;
-      }
-      trackReference(referencePath, binding);
-    } else {
-      trackHoistedReference(referencePath, binding);
+  for (const ref of referencePaths) {
+    const refSection = getOrCreateSection(ref);
+    if (isReferenceHoisted(babelBinding.path, ref)) {
+      trackHoistedReference(ref, binding);
+    } else if (binding.type !== 4 /* local */ || refSection !== binding.section) {
+      trackReference(ref, binding);
     }
   }
   for (const ref of constantViolations) {
+    if (isReferenceHoisted(babelBinding.path, ref)) {
+      throw ref.buildCodeFrameError("Cannot assign to hoisted tag variable.");
+    }
     if (ref.isUpdateExpression()) {
       trackAssignment(ref.get("argument"), binding);
     } else if (ref.isAssignmentExpression()) {
@@ -8077,7 +8143,8 @@ function trackReference(referencePath, binding) {
   let propPath = binding.name;
   while (true) {
     const { parent } = root;
-    if (!import_compiler35.types.isMemberExpression(parent)) break;
+    if (!import_compiler35.types.isMemberExpression(parent) && !import_compiler35.types.isOptionalMemberExpression(parent))
+      break;
     const prop = getMemberExpressionPropString(parent);
     if (prop === void 0) break;
     if (reference.upstreamAlias && reference.excludeProperties !== void 0 && !propsUtil.has(reference.excludeProperties, prop)) {
@@ -8675,10 +8742,23 @@ function getReadReplacement(node) {
   }
   if (binding) {
     if (node.type === "Identifier") {
-      if (binding.type === 6 /* hoist */) {
-        replacement = node.extra?.[kIsInvoked] ? import_compiler35.types.callExpression(getHoistFunctionIdentifier(binding), [
-          getScopeExpression(node.extra.section, binding.section)
-        ]) : import_compiler35.types.identifier(binding.name);
+      if (binding.type === 0 /* dom */) {
+        if (binding.section.domGetterBindings.has(binding) && isOutputDOM()) {
+          replacement = import_compiler35.types.callExpression(getBindingGetterIdentifier(binding), [
+            getScopeExpression(node.extra.section, binding.section)
+          ]);
+        }
+      } else if (binding.type === 6 /* hoist */) {
+        if (node.extra?.[kIsInvoked]) {
+          if (isOutputDOM()) {
+            replacement = import_compiler35.types.callExpression(
+              getBindingGetterIdentifier(binding),
+              [getScopeExpression(node.extra.section, binding.section)]
+            );
+          }
+        } else {
+          replacement = import_compiler35.types.identifier(binding.name);
+        }
       } else if (binding.name !== node.name) {
         node.name = binding.name;
       }
@@ -9373,7 +9453,6 @@ function templateElement(value, tail) {
 
 // src/translator/core/html-comment.ts
 var kNodeBinding = Symbol("comment tag binding");
-var kGetterId2 = Symbol("node getter id");
 var html_comment_default = {
   analyze(tag) {
     (0, import_babel_utils33.assertNoArgs)(tag);
@@ -9381,7 +9460,6 @@ var html_comment_default = {
     (0, import_babel_utils33.assertNoAttributes)(tag);
     const tagVar = tag.node.var;
     let needsBinding = false;
-    let needsGetter = false;
     if (tagVar) {
       if (!import_compiler43.types.isIdentifier(tagVar)) {
         throw tag.get("var").buildCodeFrameError(
@@ -9389,12 +9467,6 @@ var html_comment_default = {
         );
       }
       needsBinding = true;
-      for (const ref of tag.scope.getBinding(tagVar.name).referencePaths) {
-        if (!isInvokedFunction(ref)) {
-          needsGetter = true;
-          break;
-        }
-      }
     }
     const referenceNodes = [];
     for (const child of tag.get("body").get("body")) {
@@ -9415,9 +9487,7 @@ var html_comment_default = {
         0 /* dom */,
         tagSection
       );
-      if (needsGetter) {
-        tagExtra[kGetterId2] = getRegisterUID(tagSection, "comment");
-      }
+      trackDomVarReferences(tag, nodeBinding);
       addSerializeExpr(tagSection, !!tagVar || tagExtra, nodeBinding);
     }
     tag.skip();
@@ -9426,54 +9496,8 @@ var html_comment_default = {
     enter(tag) {
       const tagExtra = tag.node.extra;
       const nodeBinding = tagExtra[kNodeBinding];
-      const hasVar = !!tag.node.var;
-      if (hasVar) {
-        const getterId = tagExtra[kGetterId2];
-        if (isOutputHTML()) {
-          translateVar(
-            tag,
-            callRuntime(
-              "_el",
-              getterId && getScopeIdIdentifier(getSection(tag)),
-              getterId && import_compiler43.types.stringLiteral(getterId)
-            )
-          );
-        } else {
-          const varName = tag.node.var.name;
-          const references = tag.scope.getBinding(varName).referencePaths;
-          let getterFnIdentifier;
-          if (getterId) {
-            getterFnIdentifier = generateUidIdentifier(`get_${varName}`);
-            (0, import_babel_utils33.getProgram)().node.body.push(
-              import_compiler43.types.variableDeclaration("const", [
-                import_compiler43.types.variableDeclarator(
-                  getterFnIdentifier,
-                  callRuntime(
-                    "_el",
-                    import_compiler43.types.stringLiteral(getterId),
-                    getScopeAccessorLiteral(nodeBinding)
-                  )
-                )
-              ])
-            );
-          }
-          for (const reference of references) {
-            const referenceSection = getSection(reference);
-            if (isInvokedFunction(reference)) {
-              reference.parentPath.replaceWith(
-                import_compiler43.types.expressionStatement(
-                  createScopeReadExpression(referenceSection, nodeBinding)
-                )
-              );
-            } else if (getterFnIdentifier) {
-              reference.replaceWith(
-                import_compiler43.types.callExpression(getterFnIdentifier, [
-                  getScopeExpression(referenceSection, getSection(tag))
-                ])
-              );
-            }
-          }
-        }
+      if (isOutputHTML()) {
+        translateDomVar(tag, nodeBinding);
       }
       if (nodeBinding) {
         visit(tag, 32 /* Get */);
@@ -9545,7 +9569,6 @@ var html_comment_default = {
 var import_compiler44 = require("@marko/compiler");
 var import_babel_utils34 = require("@marko/compiler/babel-utils");
 var kNodeBinding2 = Symbol("script tag node binding");
-var kGetterId3 = Symbol("node getter id");
 var html_script_default = {
   analyze(tag) {
     (0, import_babel_utils34.assertNoArgs)(tag);
@@ -9627,25 +9650,12 @@ var html_script_default = {
           )
         );
       }
+      trackDomVarReferences(tag, nodeBinding);
       addSerializeExpr(
         tagSection,
         !!(node.var || hasEventHandlers),
         nodeBinding
       );
-      if (node.var) {
-        for (const ref of tag.scope.getBinding(node.var.name).referencePaths) {
-          const refSection = getOrCreateSection(ref);
-          setReferencesScope(ref);
-          if (isSameOrChildSection(tagSection, refSection)) {
-            addOwnerSerializeReason(refSection, tagSection, true);
-            if (!tagExtra[kGetterId3] && !isInvokedFunction(ref)) {
-              tagExtra[kGetterId3] = getRegisterUID(tagSection, "#script");
-            }
-          } else {
-            trackHoistedReference(ref, nodeBinding);
-          }
-        }
-      }
       addSerializeExpr(tagSection, push(exprExtras, tagExtra), nodeBinding);
     }
   },
@@ -9656,54 +9666,8 @@ var html_script_default = {
       const isHTML = isOutputHTML();
       const write = writeTo(tag);
       const tagSection = getSection(tag);
-      const hasVar = !!tag.node.var;
-      if (hasVar) {
-        const getterId = tagExtra[kGetterId3];
-        if (isHTML) {
-          translateVar(
-            tag,
-            callRuntime(
-              "_el",
-              getterId && getScopeIdIdentifier(tagSection),
-              getterId && import_compiler44.types.stringLiteral(getterId)
-            )
-          );
-        } else {
-          const varName = tag.node.var.name;
-          const references = tag.scope.getBinding(varName).referencePaths;
-          let getterFnIdentifier;
-          if (getterId) {
-            getterFnIdentifier = generateUidIdentifier(`get_${varName}`);
-            (0, import_babel_utils34.getProgram)().node.body.push(
-              import_compiler44.types.variableDeclaration("const", [
-                import_compiler44.types.variableDeclarator(
-                  getterFnIdentifier,
-                  callRuntime(
-                    "_el",
-                    import_compiler44.types.stringLiteral(getterId),
-                    getScopeAccessorLiteral(nodeBinding)
-                  )
-                )
-              ])
-            );
-          }
-          for (const reference of references) {
-            const referenceSection = getSection(reference);
-            if (isInvokedFunction(reference)) {
-              reference.parentPath.replaceWith(
-                import_compiler44.types.expressionStatement(
-                  createScopeReadExpression(referenceSection, nodeBinding)
-                )
-              );
-            } else if (getterFnIdentifier) {
-              reference.replaceWith(
-                import_compiler44.types.callExpression(getterFnIdentifier, [
-                  getScopeExpression(referenceSection, getSection(tag))
-                ])
-              );
-            }
-          }
-        }
+      if (isHTML) {
+        translateDomVar(tag, nodeBinding);
       }
       const visitAccessor = nodeBinding && getScopeAccessorLiteral(nodeBinding);
       if (visitAccessor) {
@@ -9850,7 +9814,7 @@ var html_script_default = {
       } else {
         const textLiteral = bodyToTextLiteral(tag.node.body);
         if (import_compiler44.types.isStringLiteral(textLiteral)) {
-          write`${textLiteral.value}`;
+          write`${textLiteral}`;
         } else {
           addStatement(
             "render",
@@ -9950,7 +9914,6 @@ function getUsedAttrs2(tag) {
 var import_compiler45 = require("@marko/compiler");
 var import_babel_utils35 = require("@marko/compiler/babel-utils");
 var kNodeBinding3 = Symbol("style tag node binding");
-var kGetterId4 = Symbol("node getter id");
 var html_style_default = {
   analyze(tag) {
     (0, import_babel_utils35.assertNoArgs)(tag);
@@ -10032,25 +9995,12 @@ var html_style_default = {
           )
         );
       }
+      trackDomVarReferences(tag, nodeBinding);
       addSerializeExpr(
         tagSection,
         !!(node.var || hasEventHandlers),
         nodeBinding
       );
-      if (node.var) {
-        for (const ref of tag.scope.getBinding(node.var.name).referencePaths) {
-          const refSection = getOrCreateSection(ref);
-          setReferencesScope(ref);
-          if (isSameOrChildSection(tagSection, refSection)) {
-            addOwnerSerializeReason(refSection, tagSection, true);
-            if (!tagExtra[kGetterId4] && !isInvokedFunction(ref)) {
-              tagExtra[kGetterId4] = getRegisterUID(tagSection, "#style");
-            }
-          } else {
-            trackHoistedReference(ref, nodeBinding);
-          }
-        }
-      }
       addSerializeExpr(tagSection, push(exprExtras, tagExtra), nodeBinding);
     }
   },
@@ -10061,54 +10011,8 @@ var html_style_default = {
       const isHTML = isOutputHTML();
       const write = writeTo(tag);
       const tagSection = getSection(tag);
-      const hasVar = !!tag.node.var;
-      if (hasVar) {
-        const getterId = tagExtra[kGetterId4];
-        if (isHTML) {
-          translateVar(
-            tag,
-            callRuntime(
-              "_el",
-              getterId && getScopeIdIdentifier(tagSection),
-              getterId && import_compiler45.types.stringLiteral(getterId)
-            )
-          );
-        } else {
-          const varName = tag.node.var.name;
-          const references = tag.scope.getBinding(varName).referencePaths;
-          let getterFnIdentifier;
-          if (getterId) {
-            getterFnIdentifier = generateUidIdentifier(`get_${varName}`);
-            (0, import_babel_utils35.getProgram)().node.body.push(
-              import_compiler45.types.variableDeclaration("const", [
-                import_compiler45.types.variableDeclarator(
-                  getterFnIdentifier,
-                  callRuntime(
-                    "_el",
-                    import_compiler45.types.stringLiteral(getterId),
-                    getScopeAccessorLiteral(nodeBinding)
-                  )
-                )
-              ])
-            );
-          }
-          for (const reference of references) {
-            const referenceSection = getSection(reference);
-            if (isInvokedFunction(reference)) {
-              reference.parentPath.replaceWith(
-                import_compiler45.types.expressionStatement(
-                  createScopeReadExpression(referenceSection, nodeBinding)
-                )
-              );
-            } else if (getterFnIdentifier) {
-              reference.replaceWith(
-                import_compiler45.types.callExpression(getterFnIdentifier, [
-                  getScopeExpression(referenceSection, getSection(tag))
-                ])
-              );
-            }
-          }
-        }
+      if (isHTML) {
+        translateDomVar(tag, nodeBinding);
       }
       const visitAccessor = nodeBinding && getScopeAccessorLiteral(nodeBinding);
       if (visitAccessor) {