marko 6.0.56 → 6.0.57

package/dist/translator/index.js

@@ -1880,13 +1880,9 @@ var function_default = {
 };
 function finalizeFunctionRegistry() {
   for (const [fnExtra, exprExtras] of getReferencesByFn()) {
-    const seenExtras = /* @__PURE__ */ new Set();
     let shouldRegister = false;
     for (const exprExtra of exprExtras) {
-      const refExtra = getCanonicalExtra(exprExtra);
-      if (seenExtras.has(refExtra)) continue;
-      seenExtras.add(refExtra);
-      if (couldSerializeDownstream(refExtra.downstream)) {
+      if (couldSerializeExtra(getCanonicalExtra(exprExtra))) {
         shouldRegister = true;
         break;
       }
@@ -1896,36 +1892,6 @@ function finalizeFunctionRegistry() {
     }
   }
 }
-function couldSerializeDownstream(downstream) {
-  if (downstream) {
-    return Array.isArray(downstream.bindings) ? downstream.bindings.some((binding) => couldSerializeBinding(binding)) : couldSerializeBinding(
-      downstream.bindings,
-      downstream.excludeProperties
-    );
-  }
-  return false;
-}
-function couldSerializeBinding(binding, excludeProperties) {
-  if (getBindingSerializeReason(binding.section, binding)) {
-    return true;
-  }
-  for (const expr of binding.downstreamExpressions) {
-    if (expr.isEffect || couldSerializeDownstream(expr.downstream)) {
-      return true;
-    }
-  }
-  for (const alias of binding.aliases) {
-    if (couldSerializeBinding(alias)) {
-      return true;
-    }
-  }
-  for (const [name2, propBinding] of binding.propertyAliases) {
-    if (!excludeProperties?.has(name2) && couldSerializeBinding(propBinding)) {
-      return true;
-    }
-  }
-  return false;
-}
 function canIgnoreRegister(markoRoot, exprRoot) {
   return (
     // bail within a placeholder
@@ -3151,6 +3117,7 @@ var return_default = {
       throw tag.get("name").buildCodeFrameError("The `return` tag requires a value.");
     }
     if (attrs2.valueChange) {
+      (attrs2.valueChange.extra ??= {}).isEffect = true;
       forceSectionSerialize(
         getOrCreateSection(tag),
         getAccessorProp().TagVariableChange
@@ -3569,7 +3536,7 @@ function getSignalFn(signal) {
   }
   if (isIntersection && signal.renderReferencedBindings) {
     signal.render.unshift(
-      import_compiler21.types.variableDeclaration("const", [
+      import_compiler21.types.variableDeclaration("let", [
         import_compiler21.types.variableDeclarator(
           createScopeReadPattern(section, signal.renderReferencedBindings),
           scopeIdentifier
@@ -5040,10 +5007,10 @@ function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAl
         void 0
       );
       if (lVal.left.extra?.binding) {
-        (lVal.right.extra ??= {}).downstream = {
-          bindings: lVal.left.extra.binding,
-          excludeProperties: void 0
-        };
+        setBindingDownstream(
+          lVal.left.extra.binding,
+          lVal.right.extra ??= {}
+        );
       }
       break;
   }
@@ -5147,17 +5114,6 @@ function finalizeReferences() {
       });
     }
   }
-  for (const [fn, reads] of readsByFn) {
-    fn.referencedBindingsInFunction = resolveReferencedBindings(
-      fn,
-      reads,
-      intersectionsBySection
-    );
-    forEach(
-      fn.referencedBindingsInFunction,
-      (binding) => forceBindingSerialize(binding.section, binding)
-    );
-  }
   for (const binding of bindings) {
     if (binding.type !== 0 /* dom */ && !binding.upstreamAlias) {
       pruneBinding(bindings, binding);
@@ -5417,6 +5373,19 @@ function finalizeReferences() {
     }
   });
   finalizeFunctionRegistry();
+  for (const [fn, reads] of readsByFn) {
+    fn.referencedBindingsInFunction = resolveReferencedBindings(
+      fn,
+      reads,
+      intersectionsBySection
+    );
+    if (fn.registerId) {
+      forEach(
+        fn.referencedBindingsInFunction,
+        (binding) => forceBindingSerialize(binding.section, binding)
+      );
+    }
+  }
   mergedReferences.clear();
   readsByExpression.clear();
   readsByFn.clear();
@@ -5437,8 +5406,13 @@ function getMaxOwnSourceOffset(intersection, section) {
   return scopeOffset;
 }
 var intersectionMeta = /* @__PURE__ */ new WeakMap();
-function setBindingValueExpr(binding, valueExpr) {
-  bindingValueExprs.set(binding, valueExpr || false);
+function setBindingDownstream(binding, expr) {
+  bindingValueExprs.set(binding, expr || false);
+  if (expr && expr !== true) {
+    forEach(expr, (expr2) => {
+      expr2.downstream = bindingUtil.add(expr2.downstream, binding);
+    });
+  }
 }
 var resolvedSources = /* @__PURE__ */ new WeakSet();
 var bindingValueExprs = /* @__PURE__ */ new WeakMap();
@@ -5805,6 +5779,50 @@ function getCanonicalExtra(extra) {
   }
   return extra;
 }
+var couldSerializeLookup = /* @__PURE__ */ new WeakMap();
+function couldSerializeExtra(extra) {
+  let couldSerialize = couldSerializeLookup.get(extra);
+  if (couldSerialize === void 0) {
+    couldSerializeLookup.set(
+      extra,
+      couldSerialize = extra === (0, import_babel_utils19.getProgram)().node.extra?.returnValueExpr || !!find(extra.downstream, couldSerializeBinding)
+    );
+  }
+  return couldSerialize;
+}
+function couldSerializeBinding(binding) {
+  let couldSerialize = couldSerializeLookup.get(binding);
+  if (couldSerialize === void 0) {
+    if (getBindingSerializeReason(binding.section, binding)) {
+      couldSerialize = true;
+    } else {
+      for (const expr of binding.downstreamExpressions) {
+        if (expr.isEffect || couldSerializeExtra(expr)) {
+          couldSerialize = true;
+          break;
+        }
+      }
+      if (!couldSerialize) {
+        for (const alias of binding.aliases) {
+          if (couldSerializeBinding(alias)) {
+            couldSerialize = true;
+            break;
+          }
+        }
+        if (!couldSerialize) {
+          for (const [, propBinding] of binding.propertyAliases) {
+            if (couldSerializeBinding(propBinding)) {
+              couldSerialize = true;
+              break;
+            }
+          }
+        }
+      }
+    }
+    couldSerializeLookup.set(binding, couldSerialize ??= false);
+  }
+  return couldSerialize;
+}
 function setCanonicalExtra(extra, merged) {
   extra.merged = merged;
 }
@@ -5851,7 +5869,7 @@ var await_default = {
     getOrCreateSection(tag);
     const paramsBinding = trackParamsReferences(tagBody, 3 /* param */);
     if (paramsBinding) {
-      setBindingValueExpr(paramsBinding, valueExtra);
+      setBindingDownstream(paramsBinding, valueExtra);
     }
     bodySection.upstreamExpression = valueAttr.value.extra;
   },
@@ -6045,11 +6063,7 @@ var const_default = {
     const binding = trackVarReferences(tag, 5 /* derived */, upstreamAlias);
     if (binding) {
       if (!valueExtra.nullable) binding.nullable = false;
-      setBindingValueExpr(binding, valueExtra);
-      valueExtra.downstream = {
-        bindings: binding,
-        excludeProperties: void 0
-      };
+      setBindingDownstream(binding, valueExtra);
     }
   },
   translate: {
@@ -7261,7 +7275,7 @@ var for_default = {
       getAllTagReferenceNodes(tag.node)
     );
     if (paramsBinding) {
-      setBindingValueExpr(paramsBinding, tagExtra);
+      setBindingDownstream(paramsBinding, tagExtra);
     }
     bodySection.sectionAccessor = {
       binding: nodeBinding,
@@ -7899,11 +7913,7 @@ var define_default = {
       getAllTagReferenceNodes(tag.node)
     );
     if (varBinding) {
-      setBindingValueExpr(varBinding, tagExtra);
-      tagExtra.downstream = {
-        bindings: varBinding,
-        excludeProperties: void 0
-      };
+      setBindingDownstream(varBinding, tagExtra);
     }
   },
   translate: {
@@ -9044,7 +9054,7 @@ var id_default = {
     }
     const binding = trackVarReferences(tag, 5 /* derived */);
     if (binding) {
-      setBindingValueExpr(binding, false);
+      setBindingDownstream(binding, false);
     }
   },
   translate: {
@@ -9497,7 +9507,7 @@ var let_default = {
     }
     const tagSection = getOrCreateSection(tag);
     const binding = trackVarReferences(tag, 1 /* let */);
-    setBindingValueExpr(
+    setBindingDownstream(
       binding,
       mergeReferences(tagSection, tag.node, [
         valueAttr?.value,
@@ -10646,7 +10656,7 @@ var custom_tag_default = {
         mergeReferences(section, tag.node, getAllTagReferenceNodes(tag.node));
         if (varBinding) {
           const varSerializeReason = (0, import_babel_utils49.getProgram)().node.extra.returnValueExpr;
-          setBindingValueExpr(varBinding, varSerializeReason);
+          setBindingDownstream(varBinding, varSerializeReason);
           addBindingSerializeReasonExpr(
             section,
             childScopeBinding,
@@ -10672,7 +10682,7 @@ var custom_tag_default = {
             childInputBinding,
             inputExpr
           );
-          setBindingValueExpr(varBinding, varSerializeReason);
+          setBindingDownstream(varBinding, varSerializeReason);
           addBindingSerializeReasonExpr(
             section,
             childScopeBinding,
@@ -10979,10 +10989,7 @@ function analyzeAttrs(rootTagExtra, section, tag, templateExport, rootAttrExprs,
       tag.node,
       getAllTagReferenceNodes(tag.node)
     );
-    extra.downstream = {
-      bindings: templateExport.binding,
-      excludeProperties: void 0
-    };
+    setBindingDownstream(templateExport.binding, extra);
     return;
   }
   const known = inputExpr.known = {};
@@ -11065,10 +11072,9 @@ function analyzeAttrs(rootTagExtra, section, tag, templateExport, rootAttrExprs,
         bindings = bindingUtil.add(bindings, templateExportAttr.binding);
       }
       if (bindings) {
-        groupExtra.downstream = {
-          bindings,
-          excludeProperties: void 0
-        };
+        forEach(bindings, (binding) => {
+          setBindingDownstream(binding, groupExtra);
+        });
       }
       for (const name2 of group) {
         known[attrTagLookup[name2].name] = groupKnownValue;
@@ -11094,10 +11100,10 @@ function analyzeAttrs(rootTagExtra, section, tag, templateExport, rootAttrExprs,
         continue;
       }
       seen.add(attr2.name);
-      (attr2.value.extra ??= {}).downstream = {
-        bindings: templateExportAttr.binding,
-        excludeProperties: void 0
-      };
+      setBindingDownstream(
+        templateExportAttr.binding,
+        attr2.value.extra ??= {}
+      );
     }
     if (spreadReferenceNodes) {
       spreadReferenceNodes.push(attr2.value);
@@ -11115,10 +11121,20 @@ function analyzeAttrs(rootTagExtra, section, tag, templateExport, rootAttrExprs,
       tag.node,
       spreadReferenceNodes
     );
-    extra.downstream = {
-      bindings: templateExport.binding,
-      excludeProperties: seen
-    };
+    let spreadBinding = templateExport.binding;
+    if (seen.size) {
+      spreadBinding = createBinding(
+        generateUid(`${getTagName(tag)}_attrs`),
+        spreadBinding.type,
+        spreadBinding.section,
+        spreadBinding,
+        void 0,
+        fromIter(seen),
+        spreadReferenceNodes[0].loc,
+        true
+      );
+    }
+    setBindingDownstream(spreadBinding, extra);
   }
 }
 function writeAttrsToExports(tag, templateExport, importAlias, info) {
@@ -11606,7 +11622,7 @@ var dynamic_tag_default = {
             ])
           );
           statements.push(
-            import_compiler57.types.variableDeclaration("const", [
+            import_compiler57.types.variableDeclaration("let", [
               import_compiler57.types.variableDeclarator(node.var, dynamicTagExpr)
             ]),
             import_compiler57.types.expressionStatement(

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

@@ -1,5 +1,5 @@
 import { types as t } from "@marko/compiler";
-import { type Many, type OneMany, type Opt, Sorted } from "./optional";
+import { type Many, type Opt, Sorted } from "./optional";
 import { type Section } from "./sections";
 declare const kIsInvoked: unique symbol;
 export declare const kBranchSerializeReason: unique symbol;
@@ -52,10 +52,7 @@ declare module "@marko/compiler/dist/types" {
     interface NodeExtra {
         section?: Section;
         referencedBindings?: ReferencedBindings;
-        downstream?: {
-            bindings: OneMany<Binding>;
-            excludeProperties: undefined | Set<string>;
-        };
+        downstream?: Opt<Binding>;
         binding?: Binding;
         assignment?: Binding;
         assignmentTo?: Binding;
@@ -89,7 +86,7 @@ export declare const intersectionMeta: WeakMap<Intersection, {
     id: number;
     scopeOffset: Binding | undefined;
 }>;
-export declare function setBindingValueExpr(binding: Binding, valueExpr: boolean | Opt<t.NodeExtra>): void;
+export declare function setBindingDownstream(binding: Binding, expr: boolean | Opt<t.NodeExtra>): void;
 export declare function createSources(state: Sources["state"], input: Sources["input"]): Sources;
 export declare function compareSources(a: Sources, b: Sources): number;
 export declare function mergeSources(a: undefined | Sources, b: undefined | Sources): Sources | undefined;
@@ -125,4 +122,6 @@ export interface RegisteredFnExtra extends ReferencedExtra {
 }
 export declare function isRegisteredFnExtra(extra: t.NodeExtra | undefined): extra is RegisteredFnExtra;
 export declare function getCanonicalExtra<T extends t.NodeExtra>(extra: T): T;
+export declare function couldSerializeExtra(extra: t.NodeExtra): boolean;
+export declare function couldSerializeBinding(binding: Binding): boolean;
 export {};

package/package.json

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