marko 6.0.133 → 6.0.135

package/dist/translator/index.js

@@ -1028,8 +1028,8 @@ var Sorted = class {
       return false;
     }
     for (let i = subLen; i--; ) {
-      const supIndex = this.findIndex(superset, subset[i]);
-      if (supIndex === -1 || supLen - supIndex <= i) return false;
+      const found = findIndexSorted(this.compare, superset, subset[i]);
+      if (found === -1 || supLen - found <= i) return false;
     }
     return true;
   }
@@ -3460,8 +3460,16 @@ function getBindingGetterIdentifier(binding) {
   return identifier;
 }
 function getSignal(section, referencedBindings, name2 = generateSignalName(referencedBindings)) {
-  if (!Array.isArray(referencedBindings) && referencedBindings?.type === 7 /* constant */) {
-    return getSignal(section, void 0);
+  if (referencedBindings && !Array.isArray(referencedBindings)) {
+    if (referencedBindings.type === 7 /* constant */) {
+      return getSignal(section, void 0);
+    }
+    if (referencedBindings.type !== 4 /* local */ && referencedBindings.section !== section) {
+      const canonicalReference = getCanonicalBinding(referencedBindings);
+      if (canonicalReference !== referencedBindings) {
+        return getSignal(section, canonicalReference);
+      }
+    }
   }
   const signals = getSignals(section);
   let signal = signals.get(referencedBindings);
@@ -3506,9 +3514,9 @@ function getSignal(section, referencedBindings, name2 = generateSignalName(refer
           scopeOffset && getScopeAccessorLiteral(scopeOffset, true)
         );
       };
-    } else if (referencedBindings.section !== section && bindingUtil.find(section.referencedClosures, referencedBindings)) {
+    } else if (referencedBindings.section !== section && sectionUtil.has(referencedBindings.closureSections, section)) {
       signal.build = () => {
-        const closure = getCanonicalBinding(referencedBindings);
+        const closure = referencedBindings;
         const render = getSignalFn(signal);
         const closureSignalBuilder = getClosureSignalBuilder(section);
         if (closureSignalBuilder && !isDynamicClosure(section, closure)) {
@@ -3690,7 +3698,7 @@ function getSignalFn(signal) {
       )
     );
   });
-  if (isValue && binding.sources && binding.type !== 4 /* local */) {
+  if (isValue && binding.sources) {
     let dynamicClosureArgs;
     let dynamicClosureSignalIdentifier;
     forEach(binding.closureSections, (closureSection) => {
@@ -4391,23 +4399,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": {
@@ -4435,7 +4440,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(
@@ -4446,7 +4451,7 @@ function replaceAssignedNode(node) {
                     node.left,
                     import_compiler22.types.identifier(resultId)
                   ),
-                  ...assignments,
+                  ...assignments || [],
                   import_compiler22.types.identifier(resultId)
                 ])
               ),
@@ -8477,8 +8482,10 @@ 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 declared = refDeclared && refSection === section;
   const binding = {
     id,
     name: name2,
@@ -8573,6 +8580,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;
@@ -8583,7 +8591,7 @@ function trackVarReferences(tag, type, upstreamAlias) {
         tagVar,
         canonicalUpstreamAlias.type,
         tag.scope,
-        canonicalUpstreamAlias.section,
+        section,
         canonicalUpstreamAlias,
         void 0,
         excludeProperties
@@ -8594,7 +8602,7 @@ function trackVarReferences(tag, type, upstreamAlias) {
       tagVar,
       type,
       tag.scope,
-      getOrCreateSection(tag),
+      section,
       void 0,
       void 0,
       void 0
@@ -9038,20 +9046,20 @@ function finalizeReferences() {
     );
     for (const { isEffect, section: section2 } of binding.reads) {
       if (section2 !== binding.section) {
-        const canonicalUpstreamAlias = getCanonicalBinding(binding);
-        canonicalUpstreamAlias.closureSections = sectionUtil.add(
-          canonicalUpstreamAlias.closureSections,
-          section2
-        );
         if (binding.type === 4 /* local */) {
           section2.referencedLocalClosures = bindingUtil.add(
             section2.referencedLocalClosures,
             binding
           );
         } else {
+          const canonicalUpstreamAlias = getCanonicalBinding(binding);
+          canonicalUpstreamAlias.closureSections = sectionUtil.add(
+            canonicalUpstreamAlias.closureSections,
+            section2
+          );
           section2.referencedClosures = bindingUtil.add(
             section2.referencedClosures,
-            binding
+            canonicalUpstreamAlias
           );
           addOwnerSerializeReason(
             section2,
@@ -10286,12 +10294,13 @@ var define_default = {
       dropNodes(getAllTagReferenceNodes(tag.node));
       return;
     }
-    trackParamsReferences(tagBody, 3 /* param */);
+    const paramsBinding = trackParamsReferences(tagBody, 3 /* param */);
     setTagDownstream(tag, varBinding);
     if (bodySection) {
       if (import_compiler43.types.isIdentifier(tag.node.var)) {
         const babelBinding = tag.scope.getBinding(tag.node.var.name);
         let allDirectReferences = true;
+        let allHaveInput = true;
         for (const ref of babelBinding.referencePaths) {
           if (isReferenceHoisted(babelBinding.path, ref)) {
             throw ref.buildCodeFrameError(
@@ -10300,12 +10309,18 @@ var define_default = {
           }
           if (ref.parent.type === "MarkoTag" && ref.parent.name === ref.node) {
             (ref.parent.extra ??= {}).defineBodySection = bodySection;
+            allHaveInput &&= !ref.parent.arguments?.length;
             dropNodes(ref.parent.name);
           } else {
+            allHaveInput = false;
             allDirectReferences = false;
           }
         }
         if (allDirectReferences) {
+          const inputAlias = allHaveInput && paramsBinding?.propertyAliases.get("0");
+          if (inputAlias) {
+            inputAlias.nullable = false;
+          }
           dropNodes(getAllTagReferenceNodes(tag.node));
           return;
         }

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.133",
+  "version": "6.0.135",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",