@marko/runtime-tags 6.0.140 → 6.0.141

package/dist/debug/dom.js

@@ -604,6 +604,11 @@ function _closure(...closureSignals) {
 function _closure_get(valueAccessor, fn, getOwnerScope, resumeId) {
   if (false) valueAccessor = decodeAccessor(valueAccessor);
   const closureSignal = ((scope) => {
+    if (true) {
+      if (!(valueAccessor in (getOwnerScope ? getOwnerScope(scope) : scope["_" /* Owner */]))) {
+        throwUninitialized(valueAccessor);
+      }
+    }
     scope[closureSignal.___signalIndexAccessor] = closureSignal.___index;
     fn(scope);
     subscribeToScopeSet(
@@ -688,6 +693,16 @@ function _hoist(...path) {
 function _hoist_resume(id, ...path) {
   return _resume(id, _hoist(...path));
 }
+function throwUninitialized(name) {
+  try {
+    __UNINITIALIZED__;
+    let __UNINITIALIZED__;
+  } catch (err) {
+    err.message = err.message.replaceAll("__UNINITIALIZED__", name);
+    throw err;
+  }
+  throw new ReferenceError(`Cannot access '${name}' before initialization`);
+}
 
 // src/dom/walker.ts
 var walker = /* @__PURE__ */ document.createTreeWalker(document);
@@ -1421,8 +1436,9 @@ function _attrs_partial(scope, nodeAccessor, nextAttrs, skip) {
       el.removeAttribute(name);
     }
   }
-  for (const key in nextAttrs) {
-    if (!skip[key]) partial[key] = nextAttrs[key];
+  for (const name in nextAttrs) {
+    const key = isEventHandler(name) ? `on-${getEventHandlerName(name)}` : name;
+    if (!skip[key]) partial[key] = nextAttrs[name];
   }
   if (true) {
     assertExclusiveAttrs({ ...nextAttrs, ...skip });

package/dist/debug/dom.mjs

@@ -497,6 +497,11 @@ function _closure(...closureSignals) {
 function _closure_get(valueAccessor, fn, getOwnerScope, resumeId) {
   if (false) valueAccessor = decodeAccessor(valueAccessor);
   const closureSignal = ((scope) => {
+    if (true) {
+      if (!(valueAccessor in (getOwnerScope ? getOwnerScope(scope) : scope["_" /* Owner */]))) {
+        throwUninitialized(valueAccessor);
+      }
+    }
     scope[closureSignal.___signalIndexAccessor] = closureSignal.___index;
     fn(scope);
     subscribeToScopeSet(
@@ -581,6 +586,16 @@ function _hoist(...path) {
 function _hoist_resume(id, ...path) {
   return _resume(id, _hoist(...path));
 }
+function throwUninitialized(name) {
+  try {
+    __UNINITIALIZED__;
+    let __UNINITIALIZED__;
+  } catch (err) {
+    err.message = err.message.replaceAll("__UNINITIALIZED__", name);
+    throw err;
+  }
+  throw new ReferenceError(`Cannot access '${name}' before initialization`);
+}
 
 // src/dom/walker.ts
 var walker = /* @__PURE__ */ document.createTreeWalker(document);
@@ -1314,8 +1329,9 @@ function _attrs_partial(scope, nodeAccessor, nextAttrs, skip) {
       el.removeAttribute(name);
     }
   }
-  for (const key in nextAttrs) {
-    if (!skip[key]) partial[key] = nextAttrs[key];
+  for (const name in nextAttrs) {
+    const key = isEventHandler(name) ? `on-${getEventHandlerName(name)}` : name;
+    if (!skip[key]) partial[key] = nextAttrs[name];
   }
   if (true) {
     assertExclusiveAttrs({ ...nextAttrs, ...skip });

package/dist/debug/html.js

@@ -3060,8 +3060,9 @@ function _attrs_content(data, nodeAccessor, scopeId, tagName, serializeReason) {
 }
 function _attrs_partial(data, skip, nodeAccessor, scopeId, tagName) {
   const partial = {};
-  for (const key in data) {
-    if (!skip[key]) partial[key] = data[key];
+  for (const name in data) {
+    const key = isEventHandler(name) ? `on-${getEventHandlerName(name)}` : name;
+    if (!skip[key]) partial[key] = data[name];
   }
   return _attrs(partial, nodeAccessor, scopeId, tagName);
 }

package/dist/debug/html.mjs

@@ -2967,8 +2967,9 @@ function _attrs_content(data, nodeAccessor, scopeId, tagName, serializeReason) {
 }
 function _attrs_partial(data, skip, nodeAccessor, scopeId, tagName) {
   const partial = {};
-  for (const key in data) {
-    if (!skip[key]) partial[key] = data[key];
+  for (const name in data) {
+    const key = isEventHandler(name) ? `on-${getEventHandlerName(name)}` : name;
+    if (!skip[key]) partial[key] = data[name];
   }
   return _attrs(partial, nodeAccessor, scopeId, tagName);
 }

package/dist/dom.js

@@ -886,8 +886,10 @@ function _attrs_partial(scope, nodeAccessor, nextAttrs, skip) {
     let { name } = el.attributes.item(i);
     !skip[name] && !(nextAttrs && name in nextAttrs) && el.removeAttribute(name);
   }
-  for (let key in nextAttrs)
-    skip[key] || (partial[key] = nextAttrs[key]);
+  for (let name in nextAttrs) {
+    let key = isEventHandler(name) ? `on-${getEventHandlerName(name)}` : name;
+    skip[key] || (partial[key] = nextAttrs[name]);
+  }
   attrsInternal(scope, nodeAccessor, partial);
 }
 function _attrs_partial_content(scope, nodeAccessor, nextAttrs, skip) {

package/dist/dom.mjs

@@ -782,8 +782,10 @@ function _attrs_partial(scope, nodeAccessor, nextAttrs, skip) {
     let { name } = el.attributes.item(i);
     !skip[name] && !(nextAttrs && name in nextAttrs) && el.removeAttribute(name);
   }
-  for (let key in nextAttrs)
-    skip[key] || (partial[key] = nextAttrs[key]);
+  for (let name in nextAttrs) {
+    let key = isEventHandler(name) ? `on-${getEventHandlerName(name)}` : name;
+    skip[key] || (partial[key] = nextAttrs[name]);
+  }
   attrsInternal(scope, nodeAccessor, partial);
 }
 function _attrs_partial_content(scope, nodeAccessor, nextAttrs, skip) {

package/dist/html.js

@@ -1910,8 +1910,10 @@ function _attrs_content(data, nodeAccessor, scopeId, tagName, serializeReason) {
 }
 function _attrs_partial(data, skip, nodeAccessor, scopeId, tagName) {
   let partial = {};
-  for (let key in data)
-    skip[key] || (partial[key] = data[key]);
+  for (let name in data) {
+    let key = isEventHandler(name) ? `on-${getEventHandlerName(name)}` : name;
+    skip[key] || (partial[key] = data[name]);
+  }
   return _attrs(partial, nodeAccessor, scopeId, tagName);
 }
 function _attrs_partial_content(data, skip, nodeAccessor, scopeId, tagName, serializeReason) {

package/dist/html.mjs

@@ -1820,8 +1820,10 @@ function _attrs_content(data, nodeAccessor, scopeId, tagName, serializeReason) {
 }
 function _attrs_partial(data, skip, nodeAccessor, scopeId, tagName) {
   let partial = {};
-  for (let key in data)
-    skip[key] || (partial[key] = data[key]);
+  for (let name in data) {
+    let key = isEventHandler(name) ? `on-${getEventHandlerName(name)}` : name;
+    skip[key] || (partial[key] = data[name]);
+  }
   return _attrs(partial, nodeAccessor, scopeId, tagName);
 }
 function _attrs_partial_content(data, skip, nodeAccessor, scopeId, tagName, serializeReason) {

package/dist/translator/index.js

@@ -1762,6 +1762,7 @@ function startSection(path7) {
       upstreamExpression: void 0,
       downstreamBinding: void 0,
       hasAbortSignal: false,
+      readsOwner: false,
       isBranch: false
     };
     sections.push(section);
@@ -3754,6 +3755,9 @@ function getSignalFn(signal) {
       )
     );
   }
+  if (isValue && getSerializeReason(section, binding)) {
+    signal.hasSideEffect = true;
+  }
   if (!signal.hasSideEffect) {
     return import_compiler22.types.arrowFunctionExpression(
       isValue ? [scopeIdentifier, getSignalValueIdentifier(signal)] : [scopeIdentifier],
@@ -3933,6 +3937,7 @@ function getResumeRegisterId(section, referencedBindings, type) {
 }
 function writeSignals(section) {
   const seen = /* @__PURE__ */ new Set();
+  const written = /* @__PURE__ */ new Set();
   writeGetters(section);
   for (const signal of getSignals(section).values()) {
     writeSignal(signal);
@@ -4002,7 +4007,9 @@ function writeSignals(section) {
       signalStatements.push(signalDeclaration);
     }
     (0, import_babel_utils15.getProgram)().node.body.push(...signalStatements);
+    written.add(signal);
   }
+  return written;
 }
 function writeGetters(section) {
   forEach(section.bindings, (binding) => {
@@ -4295,7 +4302,7 @@ function writeHTMLResumeStatements(path7) {
   }
 }
 function getSetup(section) {
-  return section.hoistedTo ? getSignal(section, void 0).identifier : getSignals(section).get(void 0)?.identifier;
+  return section.hoistedTo ? getSignal(section, void 0) : getSignals(section).get(void 0);
 }
 function replaceRenderNode(node, signal) {
   return replaceAssignedNode(node) || replaceBindingReadNode(node, signal) || replaceRegisteredFunctionNode(node);
@@ -4512,21 +4519,8 @@ function getRegisteredFnExpression(node) {
 // src/translator/visitors/program/dom.ts
 var dom_default = {
   translate: {
-    exit(program) {
-      forEachSectionReverse(getSectionMeta);
+    enter(program) {
       const section = getSectionForBody(program);
-      const { walks, writes, decls } = getSectionMeta(section);
-      const domExports = program.node.extra.domExports;
-      const templateIdentifier = import_compiler23.types.identifier(domExports.template);
-      const walksIdentifier = import_compiler23.types.identifier(domExports.walks);
-      const setupIdentifier = import_compiler23.types.identifier(domExports.setup);
-      const inputBinding = program.node.params[0].extra?.binding;
-      const programInputSignal = inputBinding && !inputBinding.pruned ? initValue(inputBinding) : void 0;
-      let extraDecls = decls;
-      const styleFile = getStyleFile(program.hub.file);
-      if (styleFile) {
-        (0, import_babel_utils16.importDefault)(program.hub.file, styleFile);
-      }
       forEachSectionReverse((childSection) => {
         if (childSection !== section) {
           forEach(childSection.referencedClosures, (closure) => {
@@ -4550,11 +4544,32 @@ var dom_default = {
               }
             }
           });
+        }
+      });
+    },
+    exit(program) {
+      forEachSectionReverse(getSectionMeta);
+      const section = getSectionForBody(program);
+      const { walks, writes, decls } = getSectionMeta(section);
+      const domExports = program.node.extra.domExports;
+      const templateIdentifier = import_compiler23.types.identifier(domExports.template);
+      const walksIdentifier = import_compiler23.types.identifier(domExports.walks);
+      const setupIdentifier = import_compiler23.types.identifier(domExports.setup);
+      const inputBinding = program.node.params[0].extra?.binding;
+      const programInputSignal = inputBinding && !inputBinding.pruned ? initValue(inputBinding) : void 0;
+      let extraDecls = decls;
+      const styleFile = getStyleFile(program.hub.file);
+      if (styleFile) {
+        (0, import_babel_utils16.importDefault)(program.hub.file, styleFile);
+      }
+      forEachSectionReverse((childSection) => {
+        if (childSection !== section) {
           const tagParamsSignal = childSection.params && initValue(childSection.params);
           const tagParamsIdentifier = tagParamsSignal && signalHasStatements(tagParamsSignal) ? tagParamsSignal.identifier : void 0;
           const { walks: walks2, writes: writes2, decls: decls2 } = getSectionMeta(childSection);
           const setup = getSetup(childSection);
-          writeSignals(childSection);
+          const written = writeSignals(childSection);
+          const setupIdentifier2 = setup && written.has(setup) ? setup.identifier : void 0;
           if (!childSection.downstreamBinding || bindingHasProperty(
             childSection.downstreamBinding.binding,
             childSection.downstreamBinding.properties
@@ -4563,7 +4578,7 @@ var dom_default = {
               setBranchRendererArgs(childSection, [
                 writes2,
                 walks2,
-                setup,
+                setupIdentifier2,
                 tagParamsIdentifier
               ]);
             } else {
@@ -4573,7 +4588,7 @@ var dom_default = {
                 ...replaceNullishAndEmptyFunctionsWith0([
                   writes2,
                   walks2,
-                  setup,
+                  setupIdentifier2,
                   tagParamsIdentifier,
                   childSection.hoisted || childSection.isHoistThrough ? getSectionInstancesAccessorLiteral(childSection) : void 0
                 ])
@@ -5279,6 +5294,8 @@ var program_default = {
       }
       if (isOutputHTML()) {
         html_default.translate.enter();
+      } else {
+        dom_default.translate.enter(program);
       }
     },
     exit(program) {
@@ -6299,10 +6316,10 @@ function getUsedAttrs(tagName, tag) {
   const seen = {};
   const { attributes } = tag;
   const maybeStaticAttrs = /* @__PURE__ */ new Set();
+  const skipProps = /* @__PURE__ */ new Set();
   let spreadExpression;
   let skipExpression;
   let spreadProps;
-  let skipProps;
   let staticControllable;
   let staticContentAttr;
   let injectNonce = isInjectNonceTag(tagName);
@@ -6356,14 +6373,16 @@ function getUsedAttrs(tagName, tag) {
     if (staticControllable) {
       for (const attr of staticControllable.attrs) {
         if (attr) {
-          (skipProps ||= []).push(
-            toObjectProperty(attr.name, import_compiler32.types.numericLiteral(1))
-          );
+          skipProps.add(attr.name);
         }
       }
     }
     for (const { name: name2 } of staticAttrs) {
-      (skipProps ||= []).push(toObjectProperty(name2, import_compiler32.types.numericLiteral(1)));
+      if (isEventHandler(name2)) {
+        skipProps.add(`on-${getEventHandlerName(name2)}`);
+      } else {
+        skipProps.add(name2);
+      }
     }
     if (injectNonce) {
       injectNonce = false;
@@ -6379,8 +6398,13 @@ function getUsedAttrs(tagName, tag) {
     }
     spreadExpression = propsToExpression(spreadProps.reverse());
   }
-  if (skipProps) {
-    skipExpression = import_compiler32.types.objectExpression(skipProps);
+  if (skipProps.size) {
+    skipExpression = import_compiler32.types.objectExpression(
+      Array.from(
+        skipProps,
+        (name2) => toObjectProperty(name2, import_compiler32.types.numericLiteral(1))
+      )
+    );
   }
   return {
     injectNonce,
@@ -8576,6 +8600,7 @@ function trackDomVarReferences(tag, binding) {
       } : void 0
     );
     if (refSection !== binding.section) {
+      setReadsOwner(refSection, section);
       addOwnerSerializeReason(refSection, section, true);
     }
   }
@@ -9012,10 +9037,10 @@ function finalizeReferences() {
     const { name: name2, section } = binding;
     if (binding.type !== 0 /* dom */) {
       resolveBindingSources(binding);
-      forEach(
-        binding.assignmentSections,
-        (assignedSection) => addOwnerSerializeReason(assignedSection, section, true)
-      );
+      forEach(binding.assignmentSections, (assignedSection) => {
+        setReadsOwner(assignedSection, section);
+        addOwnerSerializeReason(assignedSection, section, true);
+      });
       if (find(section.bindings, ({ name: name3 }) => name3 === binding.name)) {
         binding.name = generateUid(name2);
       }
@@ -9063,6 +9088,7 @@ function finalizeReferences() {
             section2.referencedClosures,
             canonicalUpstreamAlias
           );
+          setReadsOwner(section2, canonicalUpstreamAlias.section);
           addOwnerSerializeReason(
             section2,
             canonicalUpstreamAlias.section,
@@ -9077,6 +9103,7 @@ function finalizeReferences() {
       addSerializeReason(section, true);
     }
     forEach(section.referencedHoists, (hoistedBinding) => {
+      setReadsOwner(section, hoistedBinding.section);
       addOwnerSerializeReason(section, hoistedBinding.section, true);
     });
     if (section.parent && section.isBranch && section.sectionAccessor && section.upstreamExpression) {
@@ -10052,6 +10079,13 @@ function addNumericPropertiesUntil(props, len) {
   }
   return result;
 }
+function setReadsOwner(from, to) {
+  let cur = from;
+  while (cur !== to && cur.parent) {
+    cur.readsOwner = true;
+    cur = cur.parent;
+  }
+}
 
 // src/translator/core/await.ts
 var kDOMBinding = Symbol("await tag dom binding");
@@ -12606,7 +12640,7 @@ var dynamic_tag_default = {
           knownTagTranslateDOM(
             tag,
             propTree,
-            (binding, preferedName) => getSignal(definedBodySection, binding, preferedName).identifier,
+            (binding, preferredName) => getSignal(definedBodySection, binding, preferredName).identifier,
             (section, childBinding) => {
               const signal = getSignal(definedBodySection, void 0);
               if (signalHasStatements(signal)) {
@@ -12624,6 +12658,22 @@ var dynamic_tag_default = {
                     )
                   )
                 );
+              } else if (definedBodySection.readsOwner) {
+                addStatement(
+                  "render",
+                  section,
+                  void 0,
+                  import_compiler62.types.expressionStatement(
+                    import_compiler62.types.assignmentExpression(
+                      "=",
+                      toMemberExpression(
+                        createScopeReadExpression(childBinding, section),
+                        getAccessorProp().Owner
+                      ),
+                      getScopeExpression(section, definedBodySection.parent)
+                    )
+                  )
+                );
               }
             }
           );

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

@@ -46,6 +46,7 @@ export interface Section {
         properties: Opt<string>;
     } | undefined;
     hasAbortSignal: boolean;
+    readsOwner: boolean;
     isBranch: boolean;
     content: null | {
         startType: ContentType;

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

@@ -45,10 +45,10 @@ export declare function addStatement(type: "render" | "effect", targetSection: S
 export declare function addValue(targetSection: Section, referencedBindings: ReferencedBindings, signal: Signal, value: t.Expression): void;
 export declare function getResumeRegisterId(section: Section, referencedBindings: string | ReferencedBindings, type?: string): string;
 export declare function getRegisterUID(section: Section, name: string): string;
-export declare function writeSignals(section: Section): void;
+export declare function writeSignals(section: Section): Set<Signal>;
 export declare function writeRegisteredFns(): void;
 export declare function addHTMLEffectCall(section: Section, referencedBindings?: ReferencedBindings): void;
 export declare function writeHTMLResumeStatements(path: t.NodePath<t.MarkoTagBody | t.Program>): void;
-export declare function getSetup(section: Section): t.Identifier | undefined;
+export declare function getSetup(section: Section): Signal | undefined;
 export declare function replaceRegisteredFunctionNode(node: t.Node): t.CallExpression | t.ClassPrivateProperty | t.ClassProperty | t.VariableDeclaration | t.Identifier | t.ObjectProperty | undefined;
 export {};

package/dist/translator/visitors/program/dom.d.ts

@@ -1,6 +1,7 @@
 import { types as t } from "@marko/compiler";
 declare const _default: {
     translate: {
+        enter(this: unknown, program: t.NodePath<t.Program>): void;
         exit(this: unknown, program: t.NodePath<t.Program>): void;
     };
 };

package/package.json

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