marko 6.0.135 → 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)
+                ]
               )
             )
           );
@@ -5580,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,7 +8534,8 @@ var [getNextBindingId, setNextBindingId] = createProgramState(() => 0);
 function createBinding(name2, type, refSection, upstreamAlias, property, excludeProperties, loc = null, refDeclared = false) {
   const id = getNextBindingId();
   const section = upstreamAlias ? upstreamAlias.section : refSection;
-  const declared = refDeclared && refSection === section;
+  const sameSection = refSection === section;
+  const declared = sameSection && refDeclared;
   const binding = {
     id,
     name: name2,
@@ -8506,7 +8556,7 @@ function createBinding(name2, type, refSection, upstreamAlias, property, exclude
     scopeOffset: void 0,
     scopeAccessor: void 0,
     export: void 0,
-    nullable: excludeProperties === void 0,
+    nullable: !sameSection || excludeProperties === void 0,
     pruned: void 0
   };
   if (property) {
@@ -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/package.json

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