marko 6.0.129 → 6.0.131

package/dist/debug/html.js

@@ -3320,7 +3320,7 @@ var compat = {
       if (!compatRegistered) {
         const registered = getRegistered(this);
         if (registered) {
-          const scopeId = getScopeId(registered.scope);
+          const scopeId = registered.scope ? getScopeId(registered.scope) : void 0;
           if (scopeId !== void 0) {
             writeScopeToState(state, scopeId, {});
           }

package/dist/debug/html.mjs

@@ -3227,7 +3227,7 @@ var compat = {
       if (!compatRegistered) {
         const registered = getRegistered(this);
         if (registered) {
-          const scopeId = getScopeId(registered.scope);
+          const scopeId = registered.scope ? getScopeId(registered.scope) : void 0;
           if (scopeId !== void 0) {
             writeScopeToState(state, scopeId, {});
           }

package/dist/html.js

@@ -2094,7 +2094,7 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
       if (!compatRegistered) {
         let registered = getRegistered(this);
         if (registered) {
-          let scopeId = getScopeId(registered.scope);
+          let scopeId = registered.scope ? getScopeId(registered.scope) : void 0;
           scopeId !== void 0 && writeScopeToState(state, scopeId, {}), COMPAT_REGISTRY.set(
             this,
             compatRegistered = [registered.id, scopeId]

package/dist/html.mjs

@@ -2004,7 +2004,7 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
       if (!compatRegistered) {
         let registered = getRegistered(this);
         if (registered) {
-          let scopeId = getScopeId(registered.scope);
+          let scopeId = registered.scope ? getScopeId(registered.scope) : void 0;
           scopeId !== void 0 && writeScopeToState(state, scopeId, {}), COMPAT_REGISTRY.set(
             this,
             compatRegistered = [registered.id, scopeId]

package/dist/translator/index.js

@@ -2061,7 +2061,7 @@ function canIgnoreRegister(markoRoot, exprRoot) {
     markoRoot.isMarkoPlaceholder() || // bail within a server only statement
     markoRoot.isMarkoScriptlet() && (!markoRoot.node.static || markoRoot.node.target === "server") || // bail within the tag name
     markoRoot.isMarkoTag() && markoRoot.node.name == exprRoot.node || isMarkoAttribute(markoRoot) && (analyzeTagNameType(markoRoot.parentPath) === 0 /* NativeTag */ && // TODO: all native tag functions should avoid registration but right now change handlers require it.
-    /^on[A-Z-]/.test(markoRoot.node.name) || isCoreTagName(markoRoot.parentPath, "script") || isCoreTagName(markoRoot.parentPath, "lifecycle") || isCoreTagName(markoRoot.parentPath, "for"))
+    /^on[A-Z-]/.test(markoRoot.node.name) && !hasSpreadAttributeAfter(markoRoot) || isCoreTagName(markoRoot.parentPath, "script") || isCoreTagName(markoRoot.parentPath, "lifecycle") || isCoreTagName(markoRoot.parentPath, "for"))
   );
 }
 function getStaticDeclRefs(fnExtra, path7, refs = /* @__PURE__ */ new Set()) {
@@ -2110,6 +2110,13 @@ function shouldAlwaysRegister(markoRoot) {
   }
   return false;
 }
+function hasSpreadAttributeAfter(attr) {
+  const attrs = attr.parent.attributes;
+  for (let i = attr.key + 1; i < attrs.length; i++) {
+    if (attrs[i].type === "MarkoSpreadAttribute") return true;
+  }
+  return false;
+}
 function getTagFromMarkoRoot(markoRoot) {
   let cur = markoRoot;
   do {
@@ -3290,16 +3297,17 @@ function getScopeExpression(section, targetSection) {
   }
   return scope;
 }
-function createScopeReadExpression(reference, section) {
+function createScopeReadExpression(reference, section = reference.section) {
   const propName = toPropertyName(getScopeAccessor(reference));
-  const scope = section && reference.type !== 4 /* local */ ? getScopeExpression(section, reference.section) : scopeIdentifier;
   const expr = import_compiler19.types.memberExpression(
-    scope,
+    reference.type === 4 /* local */ ? scopeIdentifier : getScopeExpression(section, reference.section),
     propName,
     propName.type !== "Identifier"
   );
-  if (scope === scopeIdentifier) {
-    (expr.extra ??= {}).read = createRead(reference, void 0);
+  if (section === reference.section && reference.type !== 0 /* dom */) {
+    const exprExtra = expr.extra ??= {};
+    exprExtra.read = createRead(reference, void 0);
+    exprExtra.section = section;
   }
   return expr;
 }
@@ -3431,9 +3439,13 @@ function getSignal(section, referencedBindings, name2 = generateSignalName(refer
         renderReferencedBindings: void 0,
         effect: [],
         effectReferencedBindings: void 0,
-        subscribers: [],
         build: void 0,
-        export: !!exportName
+        export: !!exportName,
+        hasSideEffect: !!(referencedBindings && (Array.isArray(referencedBindings) || referencedBindings.type === 0 /* dom */ || referencedBindings.type === 1 /* let */ || referencedBindings.section !== section || referencedBindings.closureSections || referencedBindings.hoists.size)),
+        hasDynamicSubscribers: false,
+        extraArgs: void 0,
+        prependStatements: void 0,
+        buildAssignment: void 0
       }
     );
     if (isOutputHTML()) {
@@ -3678,7 +3690,6 @@ function getSignalFn(signal) {
   }
   if (signal.effect.length) {
     const effectIdentifier = import_compiler22.types.identifier(`${signal.identifier.name}__script`);
-    signal.hasSideEffect = true;
     signal.render.push(
       import_compiler22.types.expressionStatement(
         import_compiler22.types.callExpression(effectIdentifier, [scopeIdentifier])
@@ -3735,6 +3746,7 @@ function subscribe(references, subscriber) {
       if (binding.type !== 7 /* constant */) {
         const source = binding.property === void 0 && binding.excludeProperties === void 0 && binding.upstreamAlias || binding;
         const providerSignal = getSignal(subscriber.section, source);
+        providerSignal.hasSideEffect = true;
         providerSignal.intersection = push(
           providerSignal.intersection,
           subscriber
@@ -3897,12 +3909,6 @@ function writeSignals(section) {
       traverseReplace(value, "value", replaceRenderNode);
     }
     forEach(signal.intersection, writeSignal);
-    if (!signal.hasSideEffect) {
-      const binding = signal.referencedBindings;
-      if (binding && (signal.intersection || Array.isArray(binding) || binding.type === 1 /* let */ || binding.closureSections || binding.hoists.size || binding.section !== signal.section)) {
-        signal.hasSideEffect = true;
-      }
-    }
     let effectDeclarator;
     if (signal.effect.length) {
       traverseReplace(signal, "effect", replaceEffectNode);
@@ -6946,7 +6952,7 @@ function translateAttrs(tag, propTree, skip2, statements = [], contentKey = "con
   if (attrTagLookup) {
     for (const name2 in attrTagLookup) {
       const attrTagMeta = attrTagLookup[name2];
-      if (!seen.has(name2) && usesExport(templateExports, attrTagMeta.name)) {
+      if (!seen.has(attrTagMeta.name) && usesExport(templateExports, attrTagMeta.name)) {
         seen.add(attrTagMeta.name);
         if (attrTagMeta.dynamic) {
           statements.push(
@@ -6969,6 +6975,7 @@ function translateAttrs(tag, propTree, skip2, statements = [], contentKey = "con
       if (child.isMarkoTag()) {
         if ((0, import_babel_utils24.isAttributeTag)(child)) {
           const attrTagMeta = attrTagLookup[getTagName(child)];
+          if (skip2?.has(attrTagMeta.name)) continue;
           if (attrTagMeta.dynamic) {
             i = addDynamicAttrTagStatements(
               attrTags2,
@@ -7712,7 +7719,9 @@ function analyzeAttrs(rootTagExtra, section, tag, propTree, rootAttrExprs) {
     } else if (import_compiler37.types.isMarkoSpreadAttribute(attr)) {
       knownSpreadBinding = getSingleKnownSpreadBinding(attributes);
       if (knownSpreadBinding) {
-        dropRead(attr.value.extra);
+        if (!propTree.rest || propTree.rest.props) {
+          dropRead(attr.value.extra);
+        }
       } else {
         spreadReferenceNodes = [attr.value];
       }
@@ -7730,7 +7739,6 @@ function analyzeAttrs(rootTagExtra, section, tag, propTree, rootAttrExprs) {
         known[prop] = { value: propExtra };
         rootAttrExprs.add(propExtra);
         addRead(propExtra, propExtra, propBinding, section);
-        setBindingDownstream(propBinding, propExtra);
       }
     }
   } else if (spreadReferenceNodes) {
@@ -7753,14 +7761,15 @@ function analyzeAttrs(rootTagExtra, section, tag, propTree, rootAttrExprs) {
     );
   }
   if (propTree.rest) {
-    setBindingDownstream(
-      propTree.binding,
-      inputExpr.value = mergeReferences(
-        section,
-        tag.node,
-        unknownReferences.flat()
-      )
+    const restExtra = inputExpr.value = mergeReferences(
+      section,
+      tag.node,
+      unknownReferences.flat()
     );
+    setBindingDownstream(propTree.binding, restExtra);
+    if (knownSpreadBinding && !propTree.rest.props) {
+      addRead(restExtra, void 0, knownSpreadBinding, section);
+    }
   } else {
     unknownReferences.forEach(dropReferences);
   }
@@ -8178,7 +8187,9 @@ function writeAttrsToSignals(tag, propTree, importAlias, info) {
           createScopeReadExpression(info.childScopeBinding, info.tagSection),
           translatedProps
         ])
-      )
+      ),
+      void 0,
+      true
     );
   }
 }
@@ -8306,7 +8317,9 @@ function trackDomVarReferences(tag, binding) {
     const refSection = getOrCreateSection(ref);
     setReferencesScope(ref);
     if (isSameOrChildSection(binding.section, refSection)) {
-      (ref.node.extra ??= {}).read = createRead(binding, void 0);
+      const refExtra = ref.node.extra ??= {};
+      refExtra.read = createRead(binding, void 0);
+      refExtra.section = refSection;
       if (!isInvokedFunction(ref)) {
         section.domGetterBindings.set(
           binding,
@@ -9597,6 +9610,7 @@ function getAllSerializeReasonsForExtra(extra) {
     if (extra === (0, import_babel_utils26.getProgram)().node.extra?.returnValueExpr) {
       reason = true;
     } else {
+      serializeReasonCache.set(extra, false);
       forEach(extra.downstream, (binding) => {
         reason = mergeSerializeReasons(
           reason,
@@ -9604,7 +9618,9 @@ function getAllSerializeReasonsForExtra(extra) {
         );
       });
     }
-    serializeReasonCache.set(extra, reason || false);
+    if (reason) {
+      serializeReasonCache.set(extra, reason);
+    }
   }
   return reason;
 }
@@ -9614,6 +9630,9 @@ function getAllSerializeReasonsForBinding(binding) {
   if (reason === void 0) {
     reason = getSerializeReason(binding.section, binding);
     if (reason !== true) {
+      if (!reason) {
+        serializeReasonCache.set(binding, false);
+      }
       for (const expr of binding.downstreamExpressions) {
         reason = expr.isEffect || mergeSerializeReasons(reason, getAllSerializeReasonsForExtra(expr));
         if (reason === true) break;
@@ -9637,7 +9656,9 @@ function getAllSerializeReasonsForBinding(binding) {
         }
       }
     }
-    serializeReasonCache.set(binding, reason || false);
+    if (reason) {
+      serializeReasonCache.set(binding, reason);
+    }
   }
   return reason;
 }
@@ -10040,15 +10061,18 @@ var define_default = {
             }
           }
           if (hasDirectReferences) {
-            const signal = getSignal(node.body.extra.section, void 0);
-            signal.build = () => {
-              if (signalHasStatements(signal)) {
-                return callRuntime("_child_setup", getSignalFn(signal));
+            const bodySection = getSectionForBody(tag.get("body"));
+            if (bodySection) {
+              const signal = getSignal(bodySection, void 0);
+              signal.build = () => {
+                if (signalHasStatements(signal)) {
+                  return callRuntime("_child_setup", getSignalFn(signal));
+                }
+              };
+              if (allDirectReferences) {
+                tag.remove();
+                return;
               }
-            };
-            if (allDirectReferences) {
-              tag.remove();
-              return;
             }
           }
         }

package/dist/translator/util/scope-read.d.ts

@@ -3,4 +3,4 @@ import { type Binding, type ReferencedBindings } from "./references";
 import type { Section } from "./sections";
 export declare function createScopeReadPattern(section: Section, referencedBindings: ReferencedBindings): t.ObjectPattern;
 export declare function getScopeExpression(section: Section, targetSection: Section): t.Identifier | t.MemberExpression;
-export declare function createScopeReadExpression(reference: Binding, section?: Section | undefined): t.MemberExpression;
+export declare function createScopeReadExpression(reference: Binding, section?: Section): t.MemberExpression;

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

@@ -3,7 +3,7 @@ import { type AccessorPrefix, AccessorProp } from "../../common/types";
 import { type Opt } from "./optional";
 import { type Binding, type ReferencedBindings } from "./references";
 import { type Section } from "./sections";
-export type Signal = {
+export interface Signal {
     identifier: t.Identifier;
     referencedBindings: ReferencedBindings;
     section: Section;
@@ -18,13 +18,13 @@ export type Signal = {
     renderReferencedBindings: ReferencedBindings;
     effect: t.Statement[];
     effectReferencedBindings: ReferencedBindings;
-    hasDynamicSubscribers?: true;
-    hasSideEffect?: true;
+    hasDynamicSubscribers: boolean;
+    hasSideEffect: boolean;
     export: boolean;
-    extraArgs?: t.Expression[];
-    prependStatements?: t.Statement[];
-    buildAssignment?: (valueSection: Section, value: t.Expression) => t.Expression | undefined;
-};
+    extraArgs: t.Expression[] | undefined;
+    prependStatements: t.Statement[] | undefined;
+    buildAssignment: ((valueSection: Section, value: t.Expression) => t.Expression | undefined) | undefined;
+}
 type closureSignalBuilder = (closure: Binding, render: t.Expression) => t.Expression;
 export declare function setClosureSignalBuilder(tag: t.NodePath<t.MarkoTag>, builder: closureSignalBuilder): void;
 export declare const getTryHasPlaceholder: (section: Section) => true | undefined, setTryHasPlaceholder: (section: Section, value: true | undefined) => void;

package/package.json

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