marko 6.0.0-next.3.38 → 6.0.0-next.3.40

package/dist/translator/index.js

@@ -996,8 +996,15 @@ function analyzeTagNameType(tag) {
     if (name2.isStringLiteral()) {
       extra.tagNameType = name2.node.value[0] === "@" ? 3 /* AttributeTag */ : (0, import_babel_utils6.isNativeTag)(tag) ? 0 /* NativeTag */ : 1 /* CustomTag */;
       extra.tagNameNullable = extra.tagNameNullable = false;
-    } else {
+    } else if (name2.isIdentifier()) {
       analyzeExpressionTagName(name2, extra);
+      if (extra.tagNameType === 0 /* NativeTag */) {
+        extra.tagNameType = 2 /* DynamicTag */;
+      }
+    } else if (name2.isTemplateLiteral() && !name2.node.expressions.length) {
+      extra.tagNameType = 0 /* NativeTag */;
+    } else {
+      extra.tagNameType = 2 /* DynamicTag */;
     }
     if (extra.tagNameType === void 0) {
       extra.tagNameType = 2 /* DynamicTag */;
@@ -2084,13 +2091,26 @@ function getSignal(section, referencedBindings, name2 = generateSignalName(refer
           scopeIdentifier,
           import_compiler17.types.identifier(referencedBindings.name)
         ]);
-        signal.isDynamicClosure = isDynamicClosure;
         const intersection = buildSignalIntersections(signal);
-        return isDynamicClosure ? callRuntime(
+        return isDynamicClosure ? isStatefulReferences(referencedBindings) ? callRuntime(
+          "registerDynamicClosure",
+          import_compiler17.types.stringLiteral(
+            getResumeRegisterId(
+              section,
+              signal.referencedBindings,
+              "subscriber"
+            )
+          ),
+          getScopeAccessorLiteral(referencedBindings),
+          render,
+          intersection,
+          isImmediateOwner ? void 0 : import_compiler17.types.arrowFunctionExpression([scopeIdentifier], ownerScope)
+        ) : callRuntime(
           "dynamicClosure",
+          getScopeAccessorLiteral(referencedBindings),
           render,
-          isImmediateOwner ? null : import_compiler17.types.arrowFunctionExpression([scopeIdentifier], ownerScope),
-          intersection
+          intersection,
+          isImmediateOwner ? void 0 : import_compiler17.types.arrowFunctionExpression([scopeIdentifier], ownerScope)
         ) : builder(signal, render, intersection);
       };
       addStatement(
@@ -2100,10 +2120,7 @@ function getSignal(section, referencedBindings, name2 = generateSignalName(refer
         import_compiler17.types.expressionStatement(
           import_compiler17.types.callExpression(
             import_compiler17.types.memberExpression(signal.identifier, import_compiler17.types.identifier("_")),
-            [
-              scopeIdentifier,
-              createScopeReadExpression(section, referencedBindings)
-            ]
+            [scopeIdentifier]
           )
         )
       );
@@ -2191,10 +2208,7 @@ function getSignalFn(signal, params, referencedBindings) {
       if (isStatefulReferences(closureSignal.referencedBindings)) {
         signal.render.push(
           import_compiler17.types.expressionStatement(
-            import_compiler17.types.callExpression(closureSignal.identifier, [
-              scopeIdentifier2,
-              valueIdentifier
-            ])
+            import_compiler17.types.callExpression(closureSignal.identifier, [scopeIdentifier2])
           )
         );
       }
@@ -2288,7 +2302,7 @@ function generateSignalName(referencedBindings) {
   return name2;
 }
 function finalizeSignalArgs(args) {
-  for (let i = args.length - 1; i >= 0; i--) {
+  for (let i = args.length; i--; ) {
     const arg = args[i];
     if (import_compiler17.types.isArrowFunctionExpression(arg) && import_compiler17.types.isBlockStatement(arg.body)) {
       const body = arg.body.body;
@@ -2297,9 +2311,11 @@ function finalizeSignalArgs(args) {
       } else if (body.length === 1 && import_compiler17.types.isExpressionStatement(body[0])) {
         arg.body = toParenthesizedExpressionIfNeeded(body[0].expression);
       }
+    } else if (import_compiler17.types.isNullLiteral(arg) || import_compiler17.types.isUnaryExpression(arg) && arg.operator === "void") {
+      args[i] = import_compiler17.types.numericLiteral(0);
     }
   }
-  for (let i = args.length - 1; import_compiler17.types.isNullLiteral(args[i]); ) {
+  for (let i = args.length - 1; import_compiler17.types.isNumericLiteral(args[i]) && args[i].value === 0; ) {
     args.length = i--;
   }
 }
@@ -2437,15 +2453,6 @@ function writeSignals(section) {
         value
       );
     }
-    if (signal.isDynamicClosure && isStatefulReferences(signal.referencedBindings)) {
-      value = callRuntime(
-        "registerSubscriber",
-        import_compiler17.types.stringLiteral(
-          getResumeRegisterId(section, signal.referencedBindings, "subscriber")
-        ),
-        value
-      );
-    }
     const signalDeclarator = import_compiler17.types.variableDeclarator(signal.identifier, value);
     let signalDeclaration = !section.parent && !signal.referencedBindings && (import_compiler17.types.isFunctionExpression(value) || import_compiler17.types.isArrowFunctionExpression(value)) ? import_compiler17.types.functionDeclaration(
       signal.identifier,
@@ -3973,7 +3980,7 @@ function isStatefulBinding(binding) {
     case 2 /* input */:
       return true;
     default:
-      return !binding.upstreamExpression || isStatefulReferences(binding.upstreamExpression.referencedBindings);
+      return binding.upstreamAlias ? isStatefulBinding(binding.upstreamAlias) : !binding.upstreamExpression || isStatefulReferences(binding.upstreamExpression.referencedBindings);
   }
 }
 
@@ -5265,9 +5272,12 @@ var for_default = {
         const tagExtra = node.extra;
         const { referencedBindings } = tagExtra;
         const nodeRef2 = getOptimizedOnlyChildNodeRef(tag, tagSection);
-        setClosureSignalBuilder(tag, (_closureSignal, render, intersection) => {
+        setClosureSignalBuilder(tag, (closureSignal, render, intersection) => {
           return callRuntime(
             "loopClosure",
+            getScopeAccessorLiteral(
+              closureSignal.referencedBindings
+            ),
             getScopeAccessorLiteral(nodeRef2),
             render,
             intersection
@@ -7150,9 +7160,12 @@ var IfTag = {
               rendererIdentifiers.push(import_compiler39.types.identifier(branchBodySection.name));
               setClosureSignalBuilder(
                 branchTag,
-                (_closureSignal, render, intersection) => {
+                (closureSignal, render, intersection) => {
                   return callRuntime(
                     "conditionalClosure",
+                    getScopeAccessorLiteral(
+                      closureSignal.referencedBindings
+                    ),
                     getScopeAccessorLiteral(nodeRef2),
                     import_compiler39.types.numericLiteral(i),
                     render,

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

@@ -2,8 +2,6 @@ import { types as t } from "@marko/compiler";
 import { type Opt } from "./optional";
 import { type Binding, type ReferencedBindings } from "./references";
 import { type Section } from "./sections";
-export type closureSignalBuilder = (signal: Signal, render: t.Expression, intersection?: t.Expression) => t.Expression;
-export type registerScopeBuilder = (scope: t.Expression) => t.Expression;
 export type Signal = {
     identifier: t.Identifier;
     valueAccessor?: t.Expression;
@@ -11,7 +9,6 @@ export type Signal = {
     section: Section;
     build: () => t.Expression;
     register?: boolean;
-    isDynamicClosure?: boolean;
     values: Array<{
         signal: {
             identifier: t.Identifier | t.MemberExpression;
@@ -35,6 +32,7 @@ export type Signal = {
     extraArgs?: t.Expression[];
     buildAssignment?: (valueSection: Section, value: t.Expression) => t.Expression;
 };
+type closureSignalBuilder = (signal: Signal, render: t.Expression, intersection?: t.Expression) => t.Expression;
 export declare function setClosureSignalBuilder(tag: t.NodePath<t.MarkoTag>, builder: closureSignalBuilder): void;
 export declare function setForceResumeScope(section: Section): void;
 export declare const getSerializedScopeProperties: (section: Section) => Map<t.StringLiteral | t.NumericLiteral, t.Expression>;
@@ -60,3 +58,4 @@ export declare function addHTMLEffectCall(section: Section, referencedBindings?:
 export declare function writeHTMLResumeStatements(path: t.NodePath<t.MarkoTagBody | t.Program>): void;
 export declare function getSetup(section: Section): t.Identifier | undefined;
 export declare function replaceRegisteredFunctionNode(node: t.Node): t.CallExpression | t.ClassPrivateProperty | t.ClassProperty | t.VariableDeclaration | t.Identifier | t.ObjectProperty | undefined;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.0-next.3.38",
+  "version": "6.0.0-next.3.40",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",