marko 6.0.0-next.3.70 → 6.0.0-next.3.72

package/dist/translator/index.js

@@ -1849,7 +1849,7 @@ function flushInto(path5) {
   const target = path5.isProgram() ? path5 : path5.get("body");
   const expr = consumeHTML(target);
   if (expr) {
-    target.pushContainer("body", expr)[0].skip();
+    target.node.body.push(expr);
   }
 }
 function getSectionMeta(section) {
@@ -2394,7 +2394,7 @@ function getSignal(section, referencedBindings, name2 = generateSignalName(refer
     if (isOutputHTML()) {
       return signal;
     } else if (!referencedBindings) {
-      signal.build = () => getSignalFn(signal, [scopeIdentifier]);
+      signal.build = () => getSignalFn(signal);
     } else if (Array.isArray(referencedBindings)) {
       subscribe(referencedBindings, signal);
       signal.build = () => {
@@ -2402,21 +2402,14 @@ function getSignal(section, referencedBindings, name2 = generateSignalName(refer
         return callRuntime(
           "intersection",
           import_compiler18.types.numericLiteral(id),
-          getSignalFn(
-            signal,
-            [scopeIdentifier],
-            signal.renderReferencedBindings
-          ),
+          getSignalFn(signal),
           scopeOffset || referencedBindings.length > 2 ? import_compiler18.types.numericLiteral(referencedBindings.length - 1) : void 0,
           scopeOffset && getScopeAccessorLiteral(scopeOffset)
         );
       };
     } else if (referencedBindings.section !== section && bindingUtil.find(section.referencedClosures, referencedBindings)) {
       signal.build = () => {
-        const render = getSignalFn(signal, [
-          scopeIdentifier,
-          import_compiler18.types.identifier(referencedBindings.name)
-        ]);
+        const render = getSignalFn(signal);
         const closureSignalBuilder = getClosureSignalBuilder(section);
         return !closureSignalBuilder || isDynamicClosure(section, referencedBindings) ? callRuntime(
           "dynamicClosureRead",
@@ -2436,10 +2429,7 @@ function initValue(binding, runtimeHelper = "value") {
   const section = binding.section;
   const signal = getSignal(section, binding);
   signal.build = () => {
-    const fn = getSignalFn(signal, [
-      scopeIdentifier,
-      import_compiler18.types.identifier(binding.name)
-    ]);
+    const fn = getSignalFn(signal);
     const isParamBinding = !binding.upstreamAlias && (binding.type === 3 /* param */ || binding.type === 2 /* input */);
     const isNakedAlias = binding.upstreamAlias && !binding.property;
     const needsGuard = !isNakedAlias && (binding.downstreamExpressions.size || fn.body.body.length > 0);
@@ -2464,19 +2454,30 @@ function initValue(binding, runtimeHelper = "value") {
   }
   return signal;
 }
-function getSignalFn(signal, params, referencedBindings) {
+function getSignalFn(signal) {
   const section = signal.section;
   const binding = signal.referencedBindings;
-  const [scopeIdentifier2, valueIdentifier] = params;
-  const isValueSignal = binding && !Array.isArray(binding) && binding.section === section;
-  if (isValueSignal) {
+  const params = [scopeIdentifier];
+  const isIntersection = Array.isArray(binding);
+  const isBinding = binding && !isIntersection;
+  const isValue = isBinding && binding.section === section;
+  if (isBinding && (signal.renderReferencedBindings || binding.aliases.size || binding.propertyAliases.size)) {
+    const valueParam = import_compiler18.types.identifier(binding.name);
+    if (binding.loc) {
+      valueParam.loc = binding.loc;
+      valueParam.start = binding.loc.start.index;
+      valueParam.end = binding.loc.end.index;
+    }
+    params.push(valueParam);
+  }
+  if (isValue) {
     for (const alias of binding.aliases) {
       const aliasSignal = getSignal(alias.section, alias);
       signal.render.push(
         import_compiler18.types.expressionStatement(
           import_compiler18.types.callExpression(aliasSignal.identifier, [
-            scopeIdentifier2,
-            valueIdentifier,
+            scopeIdentifier,
+            import_compiler18.types.identifier(binding.name),
             ...getTranslatedExtraArgs(aliasSignal)
           ])
         )
@@ -2487,8 +2488,12 @@ function getSignalFn(signal, params, referencedBindings) {
       signal.render.push(
         import_compiler18.types.expressionStatement(
           import_compiler18.types.callExpression(aliasSignal.identifier, [
-            scopeIdentifier2,
-            toMemberExpression(valueIdentifier, key, binding.nullable),
+            scopeIdentifier,
+            toMemberExpression(
+              import_compiler18.types.identifier(binding.name),
+              key,
+              binding.nullable
+            ),
             ...getTranslatedExtraArgs(aliasSignal)
           ])
         )
@@ -2508,10 +2513,10 @@ function getSignalFn(signal, params, referencedBindings) {
   }
   forEach(signal.intersection, (intersection) => {
     signal.render.push(
-      import_compiler18.types.expressionStatement(import_compiler18.types.callExpression(intersection, [scopeIdentifier2]))
+      import_compiler18.types.expressionStatement(import_compiler18.types.callExpression(intersection, [scopeIdentifier]))
     );
   });
-  if (isValueSignal) {
+  if (isValue) {
     let dynamicClosureArgs;
     let dynamicClosureSignalIdentifier;
     forEach(binding.closureSections, (closureSection) => {
@@ -2525,7 +2530,7 @@ function getSignalFn(signal, params, referencedBindings) {
             signal.render.push(
               import_compiler18.types.expressionStatement(
                 import_compiler18.types.callExpression(dynamicClosureSignalIdentifier, [
-                  scopeIdentifier2
+                  scopeIdentifier
                 ])
               )
             );
@@ -2537,7 +2542,7 @@ function getSignalFn(signal, params, referencedBindings) {
           signal.render.push(
             import_compiler18.types.expressionStatement(
               import_compiler18.types.callExpression(getSignal(closureSection, binding).identifier, [
-                scopeIdentifier2
+                scopeIdentifier
               ])
             )
           );
@@ -2559,16 +2564,16 @@ function getSignalFn(signal, params, referencedBindings) {
     const effectIdentifier = import_compiler18.types.identifier(`${signal.identifier.name}_effect`);
     signal.render.push(
       import_compiler18.types.expressionStatement(
-        import_compiler18.types.callExpression(effectIdentifier, [scopeIdentifier2])
+        import_compiler18.types.callExpression(effectIdentifier, [scopeIdentifier])
       )
     );
   }
-  if (referencedBindings) {
+  if (isIntersection && signal.renderReferencedBindings) {
     signal.render.unshift(
       import_compiler18.types.variableDeclaration("const", [
         import_compiler18.types.variableDeclarator(
-          createScopeReadPattern(section, referencedBindings),
-          scopeIdentifier2
+          createScopeReadPattern(section, signal.renderReferencedBindings),
+          scopeIdentifier
         )
       ])
     );
@@ -2736,8 +2741,7 @@ function writeSignals(section) {
         currentSection = parentSection;
       }
       const hoistIdentifier = getHoistFunctionIdentifier(hoistedBinding);
-      currentProgramPath.pushContainer(
-        "body",
+      currentProgramPath.node.body.push(
         import_compiler18.types.variableDeclaration("const", [
           import_compiler18.types.variableDeclarator(
             hoistIdentifier,
@@ -2824,7 +2828,7 @@ function writeSignals(section) {
       signalStatements.push(import_compiler18.types.variableDeclaration("const", [effectDeclarator]));
     }
     signalStatements.push(signalDeclaration);
-    currentProgramPath.pushContainer("body", signalStatements);
+    currentProgramPath.node.body.push(...signalStatements);
   }
 }
 function writeRegisteredFns() {
@@ -2878,9 +2882,7 @@ function writeRegisteredFns() {
         )
       );
     }
-    for (const stmt of currentProgramPath.pushContainer("body", statements)) {
-      stmt.skip();
-    }
+    currentProgramPath.node.body.push(...statements);
   }
 }
 function toReturnedFunction(rawFn) {
@@ -2914,6 +2916,7 @@ function addHTMLEffectCall(section, referencedBindings) {
 function writeHTMLResumeStatements(path5) {
   const section = getSectionForBody(path5);
   if (!section) return;
+  const body = path5.node.body;
   const allSignals = Array.from(getSignals(section).values());
   const scopeIdIdentifier = getScopeIdIdentifier(section);
   const serializeOwnersUntilBinding = (binding) => serializeOwners(section, binding.section);
@@ -3027,8 +3030,7 @@ function writeHTMLResumeStatements(path5) {
   for (let i = allSignals.length; i--; ) {
     if (allSignals[i].effect.length) {
       const signalRefs = allSignals[i].referencedBindings;
-      path5.pushContainer(
-        "body",
+      body.push(
         import_compiler18.types.expressionStatement(
           callRuntime(
             "writeEffect",
@@ -3099,8 +3101,7 @@ function writeHTMLResumeStatements(path5) {
         writeScopeArgs.push(import_compiler18.types.objectExpression(debugVars));
       }
     }
-    path5.pushContainer(
-      "body",
+    body.push(
       import_compiler18.types.expressionStatement(
         writeScopeBuilder ? writeScopeBuilder(callRuntime("writeScope", ...writeScopeArgs)) : callRuntime("writeScope", ...writeScopeArgs)
       )
@@ -3108,25 +3109,24 @@ function writeHTMLResumeStatements(path5) {
   }
   const resumeClosestBranch2 = !section.isBranch && (section.hasAbortSignal || !!section.referencedClosures || !!find(section.bindings, (binding) => binding.type === 1 /* let */));
   if (resumeClosestBranch2) {
-    path5.pushContainer(
-      "body",
+    body.push(
       import_compiler18.types.expressionStatement(
         callRuntime("resumeClosestBranch", scopeIdIdentifier)
       )
     );
   }
   const additionalStatements = getHTMLSectionStatements(section);
-  if (path5.get("body").length || additionalStatements.length) {
-    path5.unshiftContainer("body", [
+  if (body.length || additionalStatements.length) {
+    body.unshift(
       import_compiler18.types.variableDeclaration("const", [
         import_compiler18.types.variableDeclarator(scopeIdIdentifier, callRuntime("nextScopeId"))
       ]),
       ...additionalStatements
-    ]);
+    );
   }
   const returnIdentifier = getSectionReturnValueIdentifier(section);
   if (returnIdentifier !== void 0) {
-    path5.pushContainer("body", import_compiler18.types.returnStatement(returnIdentifier));
+    body.push(import_compiler18.types.returnStatement(returnIdentifier));
   }
 }
 function serializeOwners(from, to) {
@@ -3487,15 +3487,16 @@ var html_default = {
           contentId ? import_compiler20.types.identifier(contentId) : contentFn
         )
       );
-      program.pushContainer(
-        "body",
-        contentId ? [
+      if (contentId) {
+        program.node.body.push(
           import_compiler20.types.variableDeclaration("const", [
             import_compiler20.types.variableDeclarator(import_compiler20.types.identifier(contentId), contentFn)
           ]),
           exportDefault
-        ] : exportDefault
-      );
+        );
+      } else {
+        program.node.body.push(exportDefault);
+      }
     }
   }
 };
@@ -5206,8 +5207,7 @@ var native_tag_default = {
             getterFnIdentifier = currentProgramPath.scope.generateUidIdentifier(
               `get_${varName}`
             );
-            currentProgramPath.pushContainer(
-              "body",
+            currentProgramPath.node.body.push(
               import_compiler30.types.variableDeclaration("const", [
                 import_compiler30.types.variableDeclarator(
                   getterFnIdentifier,
@@ -6524,8 +6524,7 @@ var html_comment_default = {
           getterFnIdentifier = currentProgramPath.scope.generateUidIdentifier(
             `get_${varName}`
           );
-          currentProgramPath.pushContainer(
-            "body",
+          currentProgramPath.node.body.push(
             import_compiler36.types.variableDeclaration("const", [
               import_compiler36.types.variableDeclarator(
                 getterFnIdentifier,
@@ -6743,8 +6742,7 @@ var html_script_default = {
           getterFnIdentifier = currentProgramPath.scope.generateUidIdentifier(
             `get_${varName}`
           );
-          currentProgramPath.pushContainer(
-            "body",
+          currentProgramPath.node.body.push(
             import_compiler37.types.variableDeclaration("const", [
               import_compiler37.types.variableDeclarator(
                 getterFnIdentifier,
@@ -7129,8 +7127,7 @@ var html_style_default = {
           getterFnIdentifier = currentProgramPath.scope.generateUidIdentifier(
             `get_${varName}`
           );
-          currentProgramPath.pushContainer(
-            "body",
+          currentProgramPath.node.body.push(
             import_compiler38.types.variableDeclaration("const", [
               import_compiler38.types.variableDeclarator(
                 getterFnIdentifier,
@@ -8306,21 +8303,18 @@ var style_default = {
     });
     if (importPath) {
       if (!node.var) {
-        currentProgramPath.pushContainer(
-          "body",
+        currentProgramPath.node.body.push(
           import_compiler48.types.importDeclaration([], import_compiler48.types.stringLiteral(importPath))
         );
       } else if (import_compiler48.types.isIdentifier(node.var)) {
-        currentProgramPath.pushContainer(
-          "body",
+        currentProgramPath.node.body.push(
           import_compiler48.types.importDeclaration(
             [import_compiler48.types.importDefaultSpecifier(node.var)],
             import_compiler48.types.stringLiteral(importPath)
           )
         );
       } else {
-        currentProgramPath.pushContainer(
-          "body",
+        currentProgramPath.node.body.push(
           import_compiler48.types.variableDeclaration("const", [
             import_compiler48.types.variableDeclarator(
               node.var,
@@ -8455,8 +8449,7 @@ var try_default = {
             translatedAttrs.statements
           );
         }
-        currentProgramPath.pushContainer(
-          "body",
+        currentProgramPath.node.body.push(
           import_compiler49.types.expressionStatement(callRuntime("enableCatch"))
         );
         addValue(
@@ -9655,8 +9648,7 @@ var dynamic_tag_default = {
       }
       if (isClassAPI) {
         if (isOutputHTML()) {
-          currentProgramPath.pushContainer(
-            "body",
+          currentProgramPath.node.body.push(
             import_compiler55.types.markoScriptlet(
               [
                 import_compiler55.types.expressionStatement(
@@ -9673,8 +9665,7 @@ var dynamic_tag_default = {
             )
           );
         } else {
-          currentProgramPath.pushContainer(
-            "body",
+          currentProgramPath.node.body.push(
             import_compiler55.types.expressionStatement(
               callRuntime(
                 "register",

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

@@ -39,7 +39,6 @@ export declare const getHTMLSectionStatements: (section: Section) => t.Statement
 export declare function getHoistFunctionIdentifier(hoistedBinding: Binding): t.Identifier;
 export declare function getSignal(section: Section, referencedBindings: ReferencedBindings, name?: string): Signal;
 export declare function initValue(binding: Binding, runtimeHelper?: "value" | "state"): Signal;
-export declare function getSignalFn(signal: Signal, params: Array<t.Identifier | t.Pattern>, referencedBindings?: ReferencedBindings): t.ArrowFunctionExpression;
 export declare function getDestructureSignal(bindingIdentifiersByName: Record<string, t.Identifier> | t.Identifier[], destructurePattern: t.LVal): {
     readonly identifier: t.Identifier;
     build(canCallOnlyWhenDirty?: boolean): t.ArrowFunctionExpression;

package/index.d.ts

@@ -33,6 +33,24 @@ declare global {
       $global?: Global;
     };
 
+    /** The result of calling `template.render`. */
+    export type RenderedTemplate = Promise<string> &
+      AsyncIterable<string> & {
+        toReadable(): ReadableStream<Uint8Array<ArrayBufferLike>>;
+        pipe(stream: {
+          write(chunk: string): unknown;
+          end(): unknown;
+          flush?(): void;
+        }): void;
+        toString(): string;
+      };
+
+    /** The result of calling `template.mount`. */
+    export type MountedTemplate<Input = unknown> = {
+      update(input: Marko.TemplateInput<Input>): void;
+      destroy(): void;
+    };
+
     /** Body content created by a template. */
     export interface Body<
       in Params extends readonly any[] = [],
@@ -68,26 +86,16 @@ declare global {
 
       /** @marko-overload-start */
       /** Render the template to a string. */
-      abstract render(input: Marko.TemplateInput<Input>): Promise<string> &
-        AsyncIterable<string> & {
-          toReadable(): ReadableStream;
-          pipe(stream: {
-            write(chunk: string): unknown;
-            end(): unknown;
-            flush?(): void;
-          }): void;
-          toString(): string;
-        };
+      abstract render(
+        input: Marko.TemplateInput<Input>,
+      ): Marko.RenderedTemplate;
 
       /** Render and attach the template to a DOM node. */
       abstract mount(
         input: Marko.TemplateInput<Input>,
         reference: Node,
         position?: "afterbegin" | "afterend" | "beforebegin" | "beforeend",
-      ): {
-        update(input: Marko.TemplateInput<Input>): void;
-        destroy(): void;
-      };
+      ): Marko.MountedTemplate<typeof input>;
       /** @marko-overload-end */
     }
 

package/package.json

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