marko 6.0.134 → 6.0.136

package/dist/translator/index.js

@@ -3626,7 +3626,13 @@ function getSignalFn(signal) {
                     ...getTranslatedExtraArgs(aliasSignal)
                   ])
                 ),
-                [createScopeReadExpression(binding)]
+                [
+                  binding.nullable ? import_compiler22.types.logicalExpression(
+                    "||",
+                    createScopeReadExpression(binding),
+                    import_compiler22.types.objectExpression([])
+                  ) : createScopeReadExpression(binding)
+                ]
               )
             )
           );
@@ -4399,23 +4405,20 @@ function replaceAssignedNode(node) {
       switch (node.left.type) {
         case "Identifier": {
           const { extra } = node.left;
-          if (isAssignedBindingExtra(extra)) {
-            return getBuildAssignment(extra)?.(
-              extra.section,
-              node.operator === "=" ? node.right : import_compiler22.types.binaryExpression(
-                node.operator.slice(
-                  0,
-                  -1
-                ),
-                createScopeReadExpression(
-                  extra.assignment,
-                  extra.section
-                ),
-                node.right
-              )
-            ) || extra?.assignment && withLeadingComment(node.right, getDebugName(extra.assignment));
-          }
-          break;
+          return isAssignedBindingExtra(extra) && getBuildAssignment(extra)?.(
+            extra.section,
+            node.operator === "=" ? node.right : import_compiler22.types.binaryExpression(
+              node.operator.slice(
+                0,
+                -1
+              ),
+              createScopeReadExpression(
+                extra.assignment,
+                extra.section
+              ),
+              node.right
+            )
+          ) || extra?.assignment && withLeadingComment(node.right, getDebugName(extra.assignment));
         }
         case "ArrayPattern":
         case "ObjectPattern": {
@@ -4443,7 +4446,7 @@ function replaceAssignedNode(node) {
               (params ||= []).push(import_compiler22.types.identifier(id.name));
             }
           });
-          if (assignments) {
+          if (assignments || params) {
             const resultId = generateUid("result");
             return import_compiler22.types.callExpression(
               import_compiler22.types.arrowFunctionExpression(
@@ -4454,7 +4457,7 @@ function replaceAssignedNode(node) {
                     node.left,
                     import_compiler22.types.identifier(resultId)
                   ),
-                  ...assignments,
+                  ...assignments || [],
                   import_compiler22.types.identifier(resultId)
                 ])
               ),
@@ -5583,34 +5586,77 @@ function translateVar(tag, initialValue, kind = "const") {
   if (!tagVar) {
     return;
   }
+  const tagSection = getOrCreateSection(tag);
   forEachIdentifierPath(tag.get("var"), (id) => {
-    const binding = id.node.extra?.binding;
-    if (!binding || !binding.upstreamAlias || !binding.assignmentSections || binding.property === void 0 || id.node === tagVar) {
-      return;
+    if (id.node === tagVar) return;
+    const idExtra = id.node.extra;
+    if (!idExtra) return;
+    const binding = idExtra.binding;
+    if (!binding?.upstreamAlias) return;
+    if (binding.assignmentSections && binding.property !== void 0) {
+      const changeName = binding.property + "Change";
+      const changeBinding = binding.upstreamAlias.propertyAliases.get(changeName);
+      if (changeBinding && changeName !== changeBinding.name) {
+        const pattern = getDestructurePattern(id);
+        if (pattern) {
+          pattern.unshiftContainer(
+            "properties",
+            import_compiler32.types.objectProperty(
+              import_compiler32.types.identifier(changeName),
+              import_compiler32.types.identifier(changeBinding.name)
+            )
+          );
+          const lastProperty = pattern.get("properties").at(-1);
+          if (lastProperty?.node.type === "RestElement") {
+            const restBinding = lastProperty.node.argument.extra?.binding;
+            if (restBinding) {
+              restBinding.excludeProperties = propsUtil.add(
+                restBinding.excludeProperties,
+                changeName
+              );
+            }
+          }
+        }
+      }
     }
-    const changeName = binding.property + "Change";
-    const changeBinding = binding.upstreamAlias.propertyAliases.get(changeName);
-    if (changeBinding && changeName !== changeBinding.name) {
-      const pattern = getDestructurePattern(id);
-      if (pattern) {
-        pattern.unshiftContainer(
-          "properties",
-          import_compiler32.types.objectProperty(
-            import_compiler32.types.identifier(changeName),
-            import_compiler32.types.identifier(changeBinding.name)
-          )
+    if (binding.section !== tagSection && binding.excludeProperties !== void 0 && getSerializeReason(binding.section, binding)) {
+      const restPath = id.parentPath;
+      if (restPath.type !== "RestElement") {
+        throw restPath.buildCodeFrameError(
+          "Invalid compiler state, found a rest binding outside of a rest element."
         );
-        const lastProperty = pattern.get("properties").at(-1);
-        if (lastProperty?.node.type === "RestElement") {
-          const restBinding = lastProperty.node.argument.extra?.binding;
-          if (restBinding) {
-            restBinding.excludeProperties = propsUtil.add(
-              restBinding.excludeProperties,
-              changeName
-            );
-          }
+      }
+      let curPath = tag.parentPath;
+      while (curPath) {
+        if (curPath.node.extra?.section === binding.section) {
+          const canonicalUpstreamAlias = getCanonicalBinding(
+            binding.upstreamAlias
+          );
+          const props = toArray(
+            binding.excludeProperties,
+            (name2) => import_compiler32.types.objectProperty(
+              toPropertyName(name2),
+              generateUidIdentifier(name2)
+            )
+          );
+          props.push(restPath.node);
+          curPath.insertBefore(
+            import_compiler32.types.variableDeclaration(kind, [
+              import_compiler32.types.variableDeclarator(
+                import_compiler32.types.objectPattern(props),
+                canonicalUpstreamAlias.nullable ? import_compiler32.types.logicalExpression(
+                  "||",
+                  getDeclaredBindingExpression(canonicalUpstreamAlias),
+                  import_compiler32.types.objectExpression([])
+                ) : getDeclaredBindingExpression(canonicalUpstreamAlias)
+              )
+            ])
+          );
+          break;
         }
+        curPath = curPath.parentPath;
       }
+      restPath.remove();
     }
   });
   tag.insertBefore(
@@ -8485,8 +8531,11 @@ var kIsInvoked = Symbol("hoist is invoked");
 var kBranchSerializeReason = Symbol("branch serialize reason");
 var [getBindings] = createProgramState(() => /* @__PURE__ */ new Set());
 var [getNextBindingId, setNextBindingId] = createProgramState(() => 0);
-function createBinding(name2, type, section, upstreamAlias, property, excludeProperties, loc = null, declared = false) {
+function createBinding(name2, type, refSection, upstreamAlias, property, excludeProperties, loc = null, refDeclared = false) {
   const id = getNextBindingId();
+  const section = upstreamAlias ? upstreamAlias.section : refSection;
+  const sameSection = refSection === section;
+  const declared = sameSection && refDeclared;
   const binding = {
     id,
     name: name2,
@@ -8507,7 +8556,7 @@ function createBinding(name2, type, section, upstreamAlias, property, excludePro
     scopeOffset: void 0,
     scopeAccessor: void 0,
     export: void 0,
-    nullable: excludeProperties === void 0,
+    nullable: !sameSection || excludeProperties === void 0,
     pruned: void 0
   };
   if (property) {
@@ -8581,6 +8630,7 @@ function trackDomVarReferences(tag, binding) {
 function trackVarReferences(tag, type, upstreamAlias) {
   const tagVar = tag.node.var;
   if (tagVar) {
+    const section = getOrCreateSection(tag);
     let canonicalUpstreamAlias = upstreamAlias && getCanonicalBinding(upstreamAlias);
     if (canonicalUpstreamAlias) {
       const { excludeProperties } = canonicalUpstreamAlias;
@@ -8591,7 +8641,7 @@ function trackVarReferences(tag, type, upstreamAlias) {
         tagVar,
         canonicalUpstreamAlias.type,
         tag.scope,
-        canonicalUpstreamAlias.section,
+        section,
         canonicalUpstreamAlias,
         void 0,
         excludeProperties
@@ -8602,7 +8652,7 @@ function trackVarReferences(tag, type, upstreamAlias) {
       tagVar,
       type,
       tag.scope,
-      getOrCreateSection(tag),
+      section,
       void 0,
       void 0,
       void 0
@@ -8761,6 +8811,7 @@ function trackAssignment(assignment, binding) {
     if (id.node.name === binding.name) {
       const idExtra = id.node.extra ??= {};
       idExtra.assignment = binding;
+      idExtra.section = section;
       binding.assignmentSections = sectionUtil.add(
         binding.assignmentSections,
         section

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

@@ -90,7 +90,7 @@ declare module "@marko/compiler/dist/types" {
     interface FunctionExpressionExtra extends FunctionExtra {
     }
 }
-export declare function createBinding(name: string, type: Binding["type"], section: Section, upstreamAlias?: Binding["upstreamAlias"], property?: string, excludeProperties?: Opt<string>, loc?: t.SourceLocation | null, declared?: boolean): Binding;
+export declare function createBinding(name: string, type: Binding["type"], refSection: Section, upstreamAlias?: Binding["upstreamAlias"], property?: string, excludeProperties?: Opt<string>, loc?: t.SourceLocation | null, refDeclared?: boolean): Binding;
 export declare function getOrCreatePropertyAlias(binding: Binding, property: string): Binding;
 export declare function trackDomVarReferences(tag: t.NodePath<t.MarkoTag>, binding: Binding): Binding | undefined;
 export declare function trackVarReferences(tag: t.NodePath<t.MarkoTag>, type: BindingType, upstreamAlias?: Binding["upstreamAlias"]): Binding | undefined;

package/package.json

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