marko 6.0.84 → 6.0.85

package/dist/translator/index.js

@@ -2660,10 +2660,7 @@ function withLeadingComment(node, value) {
 
 // src/translator/util/serialize-guard.ts
 function getSerializeGuard(reason, optional) {
-  return !reason ? import_compiler14.types.numericLiteral(0) : reason === true || reason.state ? optional ? void 0 : reason === true ? import_compiler14.types.numericLiteral(1) : withLeadingComment(
-    import_compiler14.types.numericLiteral(1),
-    mapToString(reason.state, ", ", getDebugName)
-  ) : getInputSerializeReasonGuard(reason);
+  return !reason ? import_compiler14.types.numericLiteral(0) : reason === true || reason.state ? optional ? void 0 : reason === true ? import_compiler14.types.numericLiteral(1) : withLeadingComment(import_compiler14.types.numericLiteral(1), getDebugNames(reason.state)) : getInputSerializeReasonGuard(reason);
 }
 function getSerializeGuardForAny(reasons, optional) {
   if (!reasons || reasons === true) {
@@ -2675,10 +2672,7 @@ function getSerializeGuardForAny(reasons, optional) {
   let expr;
   for (const reason of reasons) {
     if (reason.state) {
-      return optional ? void 0 : withLeadingComment(
-        import_compiler14.types.numericLiteral(1),
-        mapToString(reason.state, ", ", getDebugName)
-      );
+      return optional ? void 0 : withLeadingComment(import_compiler14.types.numericLiteral(1), getDebugNames(reason.state));
     }
     const guard = getSerializeGuard(reason, false);
     expr = expr ? import_compiler14.types.logicalExpression("||", expr, guard) : guard;
@@ -2699,7 +2693,7 @@ function getExprIfSerialized(reason, expr) {
       serializeIdentifier,
       withLeadingComment(
         import_compiler14.types.numericLiteral(getParamReasonGroupIndex(section, reasons)),
-        mapToString(reasons, ", ", getDebugName)
+        getDebugNames(reasons)
       )
     ) : serializeIdentifier;
     orExpr = orExpr ? import_compiler14.types.logicalExpression("||", orExpr, guard) : guard;
@@ -2717,7 +2711,7 @@ function getInputSerializeReasonGuard(reason) {
       serializeIdentifier,
       withLeadingComment(
         import_compiler14.types.numericLiteral(getParamReasonGroupIndex(section, reasons)),
-        mapToString(reasons, ", ", getDebugName)
+        getDebugNames(reasons)
       )
     ) : serializeIdentifier;
     expr = expr ? import_compiler14.types.logicalExpression("||", expr, guard) : guard;
@@ -3354,20 +3348,15 @@ function initValue(binding, isLet = false) {
   const signal = getSignal(section, binding);
   signal.build = () => {
     const fn = getSignalFn(signal);
-    const isParamBinding = !binding.upstreamAlias && (binding.type === 3 /* param */ || binding.type === 4 /* local */ || binding.type === 2 /* input */);
-    const isNakedAlias = binding.upstreamAlias && binding.property === void 0 && binding.excludeProperties === void 0;
-    const needsGuard = !isNakedAlias && (binding.closureSections || binding.downstreamExpressions.size || fn.type === "ArrowFunctionExpression" && fn.body.body.length > 0);
-    const needsCache = needsGuard || signal.intersection;
-    const needsMarks = isParamBinding || signal.intersection;
-    if (needsCache || needsMarks || binding.hoists.size) {
-      return callRuntime(
-        isLet ? "_let" : "_const",
-        getScopeAccessorLiteral(binding, isLet),
-        fn
-      );
-    } else {
+    const isDirectAlias = binding.upstreamAlias && binding.property === void 0 && binding.excludeProperties === void 0;
+    if (isDirectAlias || !signalHasStatements(signal)) {
       return fn;
     }
+    return callRuntime(
+      isLet ? "_let" : "_const",
+      getScopeAccessorLiteral(binding, isLet),
+      fn
+    );
   };
   signal.valueAccessor = getScopeAccessorLiteral(binding);
   for (const alias of binding.aliases) {
@@ -3379,12 +3368,12 @@ function initValue(binding, isLet = false) {
   return signal;
 }
 function signalHasStatements(signal) {
-  if (signal.render.length || signal.effect.length || signal.values.length || signal.intersection) {
+  if (signal.extraArgs || signal.render.length || signal.effect.length || signal.values.length || signal.intersection) {
     return true;
   }
   const binding = signal.referencedBindings;
   if (binding) {
-    if (!Array.isArray(binding) && binding.section === signal.section && (binding.aliases.size || binding.propertyAliases.size)) {
+    if (!Array.isArray(binding) && (binding.closureSections || binding.type === 0 /* dom */ || binding.section === signal.section && (binding.hoists.size || binding.aliases.size || binding.propertyAliases.size))) {
       return true;
     }
   } else if (signal.section.referencedClosures) {
@@ -3411,7 +3400,7 @@ function getSignalFn(signal) {
   if (isValue) {
     for (const alias of binding.aliases) {
       const aliasSignal = getSignal(alias.section, alias);
-      if (aliasSignal.render.length || aliasSignal.values.length || aliasSignal.effect.length) {
+      if (signalHasStatements(aliasSignal)) {
         if (alias.excludeProperties !== void 0) {
           const props = [];
           const aliasId = import_compiler22.types.identifier(alias.name);
@@ -3474,8 +3463,7 @@ function getSignalFn(signal) {
     }
   }
   for (const value of signal.values) {
-    const valSignal = value.signal;
-    if (!valSignal.referencedBindings || Array.isArray(valSignal.referencedBindings) || !valSignal.referencedBindings.upstreamAlias || valSignal.referencedBindings.property !== void 0 || valSignal.referencedBindings.excludeProperties !== void 0 || valSignal.effect.length || valSignal.render.length || valSignal.values.length) {
+    if (signalHasStatements(value.signal)) {
       signal.render.push(
         import_compiler22.types.expressionStatement(
           import_compiler22.types.callExpression(value.signal.identifier, [
@@ -3486,7 +3474,14 @@ function getSignalFn(signal) {
         )
       );
     } else {
-      signal.render.push(import_compiler22.types.expressionStatement(value.value));
+      signal.render.push(
+        import_compiler22.types.expressionStatement(
+          withLeadingComment(
+            value.value,
+            getDebugNames(value.signal.referencedBindings)
+          )
+        )
+      );
     }
   }
   forEach(signal.intersection, (intersection) => {
@@ -3782,15 +3777,7 @@ function writeSignals(section) {
       );
     }
     let value = signal.build();
-    if (!value) {
-      return;
-    }
-    if (
-      // It's possible for aliases to render nothing
-      // if they're only consumed in effects/closures.
-      // This ignores writing out those signals in that case.
-      signal.referencedBindings && !Array.isArray(signal.referencedBindings) && signal.referencedBindings.upstreamAlias && signal.referencedBindings.property === void 0 && signal.referencedBindings.excludeProperties === void 0 && import_compiler22.types.isFunction(value) && import_compiler22.types.isBlockStatement(value.body) && !value.body.body.length
-    ) {
+    if (!value || !signal.register && import_compiler22.types.isFunction(value) && import_compiler22.types.isBlockStatement(value.body) && !value.body.body.length) {
       return;
     }
     if (import_compiler22.types.isCallExpression(value)) {
@@ -4189,12 +4176,15 @@ function replaceAssignedNode(node) {
     case "UpdateExpression": {
       const { extra } = node.argument;
       if (isAssignedBindingExtra(extra)) {
-        const buildAssignment = getBuildAssignment(extra);
-        if (buildAssignment) {
+        const builtAssignment = getBuildAssignment(extra)?.(
+          extra.section,
+          node
+        );
+        if (builtAssignment) {
           if (!node.prefix) {
             node.prefix = true;
             const replacement = import_compiler22.types.sequenceExpression([
-              buildAssignment(extra.section, node),
+              builtAssignment,
               import_compiler22.types.binaryExpression(
                 node.operator === "++" ? "-" : "+",
                 node.argument,
@@ -4204,7 +4194,7 @@ function replaceAssignedNode(node) {
             updateExpressions.add(replacement);
             return replacement;
           }
-          return buildAssignment(extra.section, node);
+          return builtAssignment;
         }
       }
       break;
@@ -4214,27 +4204,20 @@ function replaceAssignedNode(node) {
         case "Identifier": {
           const { extra } = node.left;
           if (isAssignedBindingExtra(extra)) {
-            const buildAssignment = getBuildAssignment(extra);
-            if (buildAssignment) {
-              if (bindingUtil.has(
+            return getBuildAssignment(extra)?.(
+              extra.section,
+              bindingUtil.has(
                 extra.fnExtra?.referencedBindingsInFunction,
                 extra.assignment
-              )) {
-                return buildAssignment(extra.section, node);
-              } else {
-                return buildAssignment(
-                  extra.section,
-                  node.operator === "=" ? node.right : import_compiler22.types.binaryExpression(
-                    node.operator.slice(
-                      0,
-                      -1
-                    ),
-                    node.left,
-                    node.right
-                  )
-                );
-              }
-            }
+              ) ? node : node.operator === "=" ? node.right : import_compiler22.types.binaryExpression(
+                node.operator.slice(
+                  0,
+                  -1
+                ),
+                node.left,
+                node.right
+              )
+            ) || extra?.assignment && withLeadingComment(node.right, getDebugName(extra.assignment));
           }
           break;
         }
@@ -4247,18 +4230,27 @@ function replaceAssignedNode(node) {
             if (isAssignedBindingExtra(extra)) {
               const buildAssignment = getBuildAssignment(extra);
               if (buildAssignment) {
-                if (!bindingUtil.has(
-                  extra.fnExtra?.referencedBindingsInFunction,
-                  extra.assignment
-                )) {
-                  id.name = generateUid(id.name);
-                  (params ||= []).push(import_compiler22.types.identifier(id.name));
-                }
-                (assignments ||= []).push(
-                  buildAssignment(extra.section, import_compiler22.types.identifier(id.name))
+                const uid = generateUid(id.name);
+                const builtAssignment = buildAssignment(
+                  extra.section,
+                  import_compiler22.types.identifier(uid)
                 );
+                if (builtAssignment) {
+                  if (!bindingUtil.has(
+                    extra.fnExtra?.referencedBindingsInFunction,
+                    extra.assignment
+                  )) {
+                    id.name = uid;
+                  }
+                  (params ||= []).push(import_compiler22.types.identifier(uid));
+                  (assignments ||= []).push(builtAssignment);
+                  return;
+                }
               }
             }
+            if (extra?.assignment) {
+              (params ||= []).push(import_compiler22.types.identifier(id.name));
+            }
           });
           if (assignments) {
             const resultId = generateUid("result");
@@ -4370,22 +4362,25 @@ var dom_default = {
         if (childSection !== section) {
           forEach(childSection.referencedClosures, (closure) => {
             const closureSignal = getSignal(childSection, closure);
-            addStatement(
-              "render",
-              childSection,
-              void 0,
-              import_compiler23.types.expressionStatement(
-                import_compiler23.types.callExpression(
-                  isDynamicClosure(childSection, closure) ? closureSignal.identifier : import_compiler23.types.memberExpression(
-                    closureSignal.identifier,
-                    import_compiler23.types.identifier("_")
-                  ),
-                  [scopeIdentifier]
+            if (signalHasStatements(closureSignal)) {
+              addStatement(
+                "render",
+                childSection,
+                void 0,
+                import_compiler23.types.expressionStatement(
+                  import_compiler23.types.callExpression(
+                    isDynamicClosure(childSection, closure) ? closureSignal.identifier : import_compiler23.types.memberExpression(
+                      closureSignal.identifier,
+                      import_compiler23.types.identifier("_")
+                    ),
+                    [scopeIdentifier]
+                  )
                 )
-              )
-            );
+              );
+            }
           });
           const tagParamsSignal = childSection.params && initValue(childSection.params);
+          const tagParamsIdentifier = tagParamsSignal && signalHasStatements(tagParamsSignal) ? tagParamsSignal.identifier : void 0;
           const { walks: walks2, writes: writes2, setup: setup2, decls: decls2 } = getSectionMeta(childSection);
           writeSignals(childSection);
           if (!childSection.downstreamBinding || bindingHasDownstreamExpressions(childSection.downstreamBinding)) {
@@ -4395,7 +4390,7 @@ var dom_default = {
                 writes2,
                 walks2,
                 setup2,
-                tagParamsSignal?.identifier
+                tagParamsIdentifier
               ])
             ) : callRuntime(
               getSectionRegisterReasons(childSection) ? "_content_resume" : "_content",
@@ -4404,30 +4399,33 @@ var dom_default = {
                 writes2,
                 walks2,
                 setup2,
-                tagParamsSignal?.identifier,
+                tagParamsIdentifier,
                 childSection.hoisted || childSection.isHoistThrough ? getSectionInstancesAccessorLiteral(childSection) : void 0
               ])
             );
             if (childSection.referencedLocalClosures) {
-              renderer = callRuntime(
-                "_content_closures",
-                renderer,
-                import_compiler23.types.objectExpression(
-                  toArray(childSection.referencedLocalClosures, (closure) => {
-                    const expr = getSignalFn(getSignal(childSection, closure));
-                    const key = toPropertyName(getScopeAccessor(closure));
-                    if (import_compiler23.types.isFunction(expr) && import_compiler23.types.isBlockStatement(expr.body)) {
-                      return import_compiler23.types.objectMethod(
-                        "method",
-                        key,
-                        expr.params,
-                        expr.body
-                      );
-                    }
-                    return import_compiler23.types.objectProperty(key, expr);
-                  })
-                )
-              );
+              const objProps = [];
+              forEach(childSection.referencedLocalClosures, (closure) => {
+                const closureSignal = getSignal(childSection, closure);
+                const key = toPropertyName(getScopeAccessor(closure));
+                if (signalHasStatements(closureSignal)) {
+                  const expr = getSignalFn(closureSignal);
+                  if (import_compiler23.types.isFunction(expr) && import_compiler23.types.isBlockStatement(expr.body)) {
+                    objProps.push(
+                      import_compiler23.types.objectMethod("method", key, expr.params, expr.body)
+                    );
+                  } else {
+                    objProps.push(import_compiler23.types.objectProperty(key, expr));
+                  }
+                }
+              });
+              if (objProps.length) {
+                renderer = callRuntime(
+                  "_content_closures",
+                  renderer,
+                  import_compiler23.types.objectExpression(objProps)
+                );
+              }
             }
             program.node.body.push(
               import_compiler23.types.variableDeclaration("const", [
@@ -6770,7 +6768,7 @@ function knownTagTranslateHTML(tag, tagIdentifier, contentSection, propTree) {
             import_compiler33.types.objectProperty(
               withLeadingComment(
                 import_compiler33.types.numericLiteral(i),
-                mapToString(group.reason, ", ", getDebugName)
+                getDebugNames(group.reason)
               ),
               getSerializeGuard(reason, false)
             )
@@ -8400,6 +8398,9 @@ function getDebugName(binding) {
   const { root, access } = getDebugScopeAccess(binding);
   return root.name + access;
 }
+function getDebugNames(refs) {
+  return mapToString(refs, ", ", getDebugName);
+}
 function getSectionInstancesAccessor(section) {
   return section.sectionAccessor ? section.sectionAccessor.prefix + getScopeAccessor(section.sectionAccessor.binding) : getAccessorPrefix().ClosureScopes + section.id;
 }
@@ -10637,8 +10638,12 @@ var let_default = {
           signal.extraArgs = [valueChangeAttr.value];
         }
         signal.buildAssignment = (valueSection, value) => {
-          const scope = getScopeExpression(valueSection, signal.section);
-          return import_compiler48.types.callExpression(signal.identifier, [scope, value]);
+          if (valueChangeAttr || signalHasStatements(signal)) {
+            return import_compiler48.types.callExpression(signal.identifier, [
+              getScopeExpression(valueSection, signal.section),
+              value
+            ]);
+          }
         };
       } else {
         translateVar(tag, valueAttr.value, "let");

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

@@ -105,6 +105,7 @@ export declare function getDebugScopeAccess(binding: Binding): {
     access: string;
 };
 export declare function getDebugName(binding: Binding): string;
+export declare function getDebugNames(refs: ReferencedBindings): string;
 export declare function getSectionInstancesAccessor(section: Section): string;
 export declare function getSectionInstancesAccessorLiteral(section: Section): t.StringLiteral | t.NumericLiteral | undefined;
 export declare function getReadReplacement(node: t.Identifier | t.MemberExpression): t.Node | undefined;

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

@@ -23,7 +23,7 @@ export type Signal = {
     export: boolean;
     extraArgs?: t.Expression[];
     prependStatements?: t.Statement[];
-    buildAssignment?: (valueSection: Section, value: t.Expression) => t.Expression;
+    buildAssignment?: (valueSection: Section, value: t.Expression) => t.Expression | undefined;
 };
 type closureSignalBuilder = (closure: Binding, render: t.Expression) => t.Expression;
 export declare function setClosureSignalBuilder(tag: t.NodePath<t.MarkoTag>, builder: closureSignalBuilder): void;

package/package.json

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