marko 6.0.14 → 6.0.16

package/dist/translator/index.js

@@ -1987,6 +1987,7 @@ function startSection(path5) {
       parent: parentSection,
       sectionAccessor: void 0,
       params: void 0,
+      referencedLocalClosures: void 0,
       referencedClosures: void 0,
       referencedHoists: void 0,
       bindings: void 0,
@@ -2008,7 +2009,7 @@ function getOrCreateSection(path5) {
   let cur = path5;
   while (true) {
     if (cur.type === "Program" || cur.type === "MarkoTagBody" && !cur.node.attributeTags && !isNativeNode(cur.parentPath)) {
-      return startSection(cur);
+      return (path5.node.extra ??= {}).section = startSection(cur);
     }
     cur = cur.parentPath;
   }
@@ -3048,9 +3049,6 @@ function getHoistFunctionIdentifier(hoistedBinding) {
   }
   return identifier;
 }
-var unimplementedBuild = () => {
-  return import_compiler20.types.stringLiteral("SIGNAL NOT INITIALIZED");
-};
 function getSignal(section, referencedBindings, name2 = generateSignalName(referencedBindings)) {
   const signals = getSignals(section);
   let signal = signals.get(referencedBindings);
@@ -3069,7 +3067,7 @@ function getSignal(section, referencedBindings, name2 = generateSignalName(refer
         effect: [],
         effectReferencedBindings: void 0,
         subscribers: [],
-        build: unimplementedBuild,
+        build: void 0,
         export: !!exportName
       }
     );
@@ -3113,7 +3111,7 @@ function initValue(binding, runtimeHelper = "value") {
   const signal = getSignal(section, binding);
   signal.build = () => {
     const fn = getSignalFn(signal);
-    const isParamBinding = !binding.upstreamAlias && (binding.type === 3 /* param */ || binding.type === 2 /* input */);
+    const isParamBinding = !binding.upstreamAlias && (binding.type === 3 /* param */ || binding.type === 4 /* local */ || binding.type === 2 /* input */);
     const isNakedAlias = binding.upstreamAlias && !binding.property;
     const needsGuard = !isNakedAlias && (binding.closureSections || binding.downstreamExpressions.size || fn.type === "ArrowFunctionExpression" && fn.body.body.length > 0);
     const needsCache = needsGuard || signal.intersection;
@@ -3208,7 +3206,7 @@ function getSignalFn(signal) {
       )
     );
   });
-  if (isValue && binding.sources) {
+  if (isValue && binding.sources && binding.type !== 4 /* local */) {
     let dynamicClosureArgs;
     let dynamicClosureSignalIdentifier;
     if (binding.sources) {
@@ -3286,6 +3284,9 @@ function getSignalFn(signal) {
             }
           }
           if (i === -1) {
+            if (expression.callee.type === "MemberExpression" && expression.callee.property.type === "Identifier" && expression.callee.property.name === "_") {
+              return expression.callee.object;
+            }
             return expression.callee;
           }
         }
@@ -3441,7 +3442,7 @@ function writeSignals(section) {
     writeSignal(signal);
   }
   function writeSignal(signal) {
-    if (seen.has(signal)) return;
+    if (!signal.build || seen.has(signal)) return;
     seen.add(signal);
     for (const value2 of signal.values) {
       writeSignal(value2.signal);
@@ -3740,11 +3741,13 @@ function writeHTMLResumeStatements(path5) {
       );
     }
   }
+  const debug = !isOptimize();
+  const writeScopeBuilder = getSectionWriteScopeBuilder(section);
   const serializedLookup = getSerializedAccessors(section);
   const serializedProperties = [];
   const sectionSerializeReason = nonAnalyzedForceSerializedSection.has(section) ? true : section.serializeReason;
-  forEach(section.bindings, (binding) => {
-    if (binding.type === 0 /* dom */) return;
+  let debugVars;
+  const writeSerializedBinding = (binding) => {
     const reason = getBindingSerializeReason(section, binding);
     if (!reason) return;
     const accessor = getScopeAccessor(binding);
@@ -3755,7 +3758,25 @@ function writeHTMLResumeStatements(path5) {
         sectionSerializeReason && (sectionSerializeReason === reason || sectionSerializeReason !== true && reason !== true && compareSources(sectionSerializeReason, reason) === 0) ? getDeclaredBindingExpression(binding) : getExprIfSerialized(reason, getDeclaredBindingExpression(binding))
       )
     );
+    if (debug) {
+      const { root, access } = getDebugScopeAccess(binding);
+      const locExpr = root.loc && import_compiler20.types.stringLiteral(`${root.loc.start.line}:${root.loc.start.column + 1}`);
+      (debugVars ||= []).push(
+        toObjectProperty(
+          getScopeAccessor(binding),
+          root !== binding ? import_compiler20.types.arrayExpression(
+            locExpr ? [import_compiler20.types.stringLiteral(root.name + access), locExpr] : [import_compiler20.types.stringLiteral(root.name + access)]
+          ) : locExpr || import_compiler20.types.numericLiteral(0)
+        )
+      );
+    }
+  };
+  forEach(section.bindings, (binding) => {
+    if (binding.type !== 0 /* dom */ && binding.type !== 4 /* local */) {
+      writeSerializedBinding(binding);
+    }
   });
+  forEach(section.referencedLocalClosures, writeSerializedBinding);
   if (section.parent) {
     const ownerAccessor = getAccessorProp().Owner;
     const ownerReason = getSectionSerializeReason(section, ownerAccessor);
@@ -3778,7 +3799,6 @@ function writeHTMLResumeStatements(path5) {
       toObjectProperty(key, getExprIfSerialized(reason, expression))
     );
   }
-  const writeScopeBuilder = getSectionWriteScopeBuilder(section);
   if (sectionSerializeReason) {
     for (const prop of serializedProperties) {
       if (prop.key.type === "Identifier" && prop.value.type === "Identifier" && prop.key.name === prop.value.name) {
@@ -3789,25 +3809,7 @@ function writeHTMLResumeStatements(path5) {
       scopeIdIdentifier,
       import_compiler20.types.objectExpression(serializedProperties)
     ];
-    if (!isOptimize()) {
-      let debugVars;
-      forEach(section.bindings, (binding) => {
-        if (binding.type === 0 /* dom */) return;
-        const serializeReason = getBindingSerializeReason(section, binding);
-        if (!serializeReason) return;
-        const { root, access } = getDebugScopeAccess(binding);
-        const locExpr = root.loc && import_compiler20.types.stringLiteral(
-          `${root.loc.start.line}:${root.loc.start.column + 1}`
-        );
-        (debugVars ||= []).push(
-          toObjectProperty(
-            getScopeAccessor(binding),
-            root !== binding ? import_compiler20.types.arrayExpression(
-              locExpr ? [import_compiler20.types.stringLiteral(root.name + access), locExpr] : [import_compiler20.types.stringLiteral(root.name + access)]
-            ) : locExpr || import_compiler20.types.numericLiteral(0)
-          )
-        );
-      });
+    if (debug) {
       writeScopeArgs.push(
         import_compiler20.types.stringLiteral(path5.hub.file.opts.filenameRelative),
         section.loc && section.loc.start.line != null ? import_compiler20.types.stringLiteral(
@@ -4037,34 +4039,33 @@ var dom_default = {
       }
       forEachSectionReverse((childSection) => {
         if (childSection !== section) {
+          forEach(childSection.referencedClosures, (closure) => {
+            const closureSignal = getSignal(childSection, closure);
+            addStatement(
+              "render",
+              childSection,
+              void 0,
+              import_compiler21.types.expressionStatement(
+                import_compiler21.types.callExpression(
+                  isDynamicClosure(childSection, closure) ? closureSignal.identifier : import_compiler21.types.memberExpression(
+                    closureSignal.identifier,
+                    import_compiler21.types.identifier(getAccessorProp().Owner)
+                  ),
+                  [scopeIdentifier]
+                )
+              )
+            );
+          });
           const tagParamsSignal = childSection.params && initValue(childSection.params);
           const { walks: walks2, writes: writes2, setup: setup2 } = getSectionMeta(childSection);
           const identifier = import_compiler21.types.identifier(childSection.name);
-          const referencedClosures = childSection.referencedClosures ? Array.isArray(childSection.referencedClosures) ? import_compiler21.types.arrowFunctionExpression(
-            [scopeIdentifier],
-            toFirstExpressionOrBlock(
-              toArray(childSection.referencedClosures, (closure) => {
-                const closureSignal = getSignal(childSection, closure);
-                return import_compiler21.types.expressionStatement(
-                  import_compiler21.types.callExpression(
-                    isDynamicClosure(childSection, closure) ? closureSignal.identifier : import_compiler21.types.memberExpression(
-                      closureSignal.identifier,
-                      import_compiler21.types.identifier(getAccessorProp().Owner)
-                    ),
-                    [scopeIdentifier]
-                  )
-                );
-              })
-            )
-          ) : getSignal(childSection, childSection.referencedClosures).identifier : void 0;
-          const renderer = getSectionParentIsOwner(childSection) ? callRuntime(
+          let renderer = getSectionParentIsOwner(childSection) ? callRuntime(
             "createRenderer",
             ...replaceNullishAndEmptyFunctionsWith0([
               writes2,
               walks2,
               setup2,
-              tagParamsSignal?.identifier,
-              referencedClosures
+              tagParamsSignal?.identifier
             ])
           ) : callRuntime(
             isSerializedSection(childSection) ? "registerContent" : "createContent",
@@ -4074,10 +4075,30 @@ var dom_default = {
               walks2,
               setup2,
               tagParamsSignal?.identifier,
-              referencedClosures,
               childSection.hoisted || childSection.isHoistThrough ? getSectionInstancesAccessorLiteral(childSection) : void 0
             ])
           );
+          if (childSection.referencedLocalClosures) {
+            renderer = callRuntime(
+              "localClosures",
+              renderer,
+              import_compiler21.types.objectExpression(
+                toArray(childSection.referencedLocalClosures, (closure) => {
+                  const expr = getSignalFn(getSignal(childSection, closure));
+                  const key = toPropertyName(getScopeAccessor(closure));
+                  if (import_compiler21.types.isFunction(expr) && import_compiler21.types.isBlockStatement(expr.body)) {
+                    return import_compiler21.types.objectMethod(
+                      "method",
+                      key,
+                      expr.params,
+                      expr.body
+                    );
+                  }
+                  return import_compiler21.types.objectProperty(key, expr);
+                })
+              )
+            );
+          }
           writeSignals(childSection);
           program.node.body.push(
             import_compiler21.types.variableDeclaration("const", [
@@ -4272,7 +4293,7 @@ function createScopeReadPattern(section, referencedBindings) {
     const propertyKey = getScopeAccessor(ref);
     const isShorthand = propertyKey === propertyValue;
     let pattern = rootPattern;
-    if (ref.section !== section) {
+    if (ref.section !== section && ref.type !== 4 /* local */) {
       if (!nestedPatterns) nestedPatterns = [rootPattern];
       const relativeDepth = rootDepth - ref.section.depth;
       let i = nestedPatterns.length;
@@ -4443,7 +4464,7 @@ function trackHoistedReference(referencePath, binding) {
       hoistSection,
       hoistedBinding = createBinding(
         generateUid("hoisted_" + referencePath.node.name),
-        5 /* hoist */,
+        6 /* hoist */,
         hoistSection,
         void 0,
         void 0,
@@ -4769,16 +4790,23 @@ function finalizeReferences() {
           canonicalUpstreamAlias.closureSections,
           section2
         );
-        section2.referencedClosures = bindingUtil.add(
-          section2.referencedClosures,
-          binding
-        );
-        addOwnersSerializeReason(
-          section2,
-          canonicalUpstreamAlias.section,
-          !!isEffect || canonicalUpstreamAlias.sources,
-          getAccessorProp().Owner
-        );
+        if (binding.type === 4 /* local */) {
+          section2.referencedLocalClosures = bindingUtil.add(
+            section2.referencedLocalClosures,
+            binding
+          );
+        } else {
+          section2.referencedClosures = bindingUtil.add(
+            section2.referencedClosures,
+            binding
+          );
+          addOwnersSerializeReason(
+            section2,
+            canonicalUpstreamAlias.section,
+            !!isEffect || canonicalUpstreamAlias.sources,
+            getAccessorProp().Owner
+          );
+        }
       }
       if (isEffect) {
         forEach(
@@ -4871,6 +4899,32 @@ function finalizeReferences() {
         }
       }
     }
+    forEach(section.referencedLocalClosures, (closure) => {
+      if (!isBindingForceSerialized(section, closure)) {
+        const sourceSection = closure.section;
+        let serializeReason;
+        let currentSection = section;
+        while (currentSection !== sourceSection) {
+          const upstreamReason = !currentSection.upstreamExpression || getSerializeSourcesForExpr(currentSection.upstreamExpression);
+          if (upstreamReason === true) {
+            serializeReason = true;
+            break;
+          }
+          serializeReason = mergeSerializeReasons(
+            serializeReason,
+            upstreamReason
+          );
+          currentSection = currentSection.parent;
+        }
+        addBindingSerializeReason(section, closure, serializeReason);
+      }
+      if (closure.sources) {
+        addSectionSerializeReason(
+          section,
+          getBindingSerializeReason(section, closure)
+        );
+      }
+    });
     forEach(section.referencedClosures, (closure) => {
       if (!isBindingForceSerialized(closure.section, closure)) {
         const sourceSection = closure.section;
@@ -5187,7 +5241,7 @@ function getReadReplacement(node) {
   }
   if (binding) {
     if (node.type === "Identifier") {
-      if (binding.type === 5 /* hoist */) {
+      if (binding.type === 6 /* hoist */) {
         replacement = node.extra?.[kIsInvoked] ? import_compiler24.types.callExpression(getHoistFunctionIdentifier(binding), [
           getScopeExpression(node.extra.section, binding.section)
         ]) : import_compiler24.types.identifier(getScopeAccessor(binding));
@@ -5523,7 +5577,7 @@ var const_default = {
     if (upstreamAlias) {
       valueExtra.pruned = true;
     }
-    const binding = trackVarReferences(tag, 4 /* derived */, upstreamAlias);
+    const binding = trackVarReferences(tag, 5 /* derived */, upstreamAlias);
     if (binding) {
       if (!valueExtra.nullable) binding.nullable = false;
       setBindingValueExpr(binding, valueExtra);
@@ -6617,7 +6671,13 @@ function getOptimizedOnlyChildNodeBinding(tag, section, branchSize = 1) {
 // src/translator/core/for.ts
 var for_default = {
   analyze(tag) {
+    const tagSection = getOrCreateSection(tag);
     const isAttrTag = tag.node.body.attributeTags;
+    const tagBody = tag.get("body");
+    const paramsBinding = trackParamsReferences(
+      tagBody,
+      isAttrTag ? 4 /* local */ : 3 /* param */
+    );
     let allowAttrs;
     (0, import_babel_utils25.assertNoVar)(tag);
     (0, import_babel_utils25.assertNoArgs)(tag);
@@ -6642,15 +6702,12 @@ var for_default = {
     }
     (0, import_babel_utils25.assertAllowedAttributes)(tag, allowAttrs);
     if (isAttrTag) return;
-    const tagBody = tag.get("body");
     const bodySection = startSection(tagBody);
     if (!bodySection) {
       dropReferences(getAllTagReferenceNodes(tag.node));
       return;
     }
-    const tagSection = getOrCreateSection(tag);
     const nodeBinding = getOptimizedOnlyChildNodeBinding(tag, tagSection);
-    const paramsBinding = trackParamsReferences(tagBody, 3 /* param */);
     const tagExtra = mergeReferences(
       tagSection,
       tag.node,
@@ -6708,7 +6765,7 @@ var for_default = {
         flushInto(tag);
         writeHTMLResumeStatements(tagBody);
         const forTagArgs = getBaseArgsInForTag(forType, forAttrs);
-        const forTagHTMLRuntime = branchSerializeReason ? forTypeToHTMLResumeRuntime(forType, singleNodeOptimization) : forTypeToRuntime(forType);
+        const forTagHTMLRuntime = branchSerializeReason ? forTypeToHTMLResumeRuntime(forType) : forTypeToRuntime(forType);
         forTagArgs.push(
           import_compiler33.types.arrowFunctionExpression(params, import_compiler33.types.blockStatement(bodyStatements))
         );
@@ -6716,7 +6773,7 @@ var for_default = {
           const skipParentEnd = onlyChildParentTagName && markerSerializeReason;
           const markerSerializeArg = getSerializeGuard(
             markerSerializeReason,
-            !skipParentEnd
+            !(skipParentEnd || singleNodeOptimization)
           );
           forTagArgs.push(
             forAttrs.by || import_compiler33.types.numericLiteral(0),
@@ -6729,6 +6786,12 @@ var for_default = {
             getParentTag(tag).node.extra[kSkipEndTag] = true;
             forTagArgs.push(import_compiler33.types.stringLiteral(`</${onlyChildParentTagName}>`));
           }
+          if (singleNodeOptimization) {
+            if (!skipParentEnd) {
+              forTagArgs.push(import_compiler33.types.numericLiteral(0));
+            }
+            forTagArgs.push(import_compiler33.types.numericLiteral(1));
+          }
         }
         statements.push(
           import_compiler33.types.expressionStatement(callRuntime(forTagHTMLRuntime, ...forTagArgs))
@@ -6884,25 +6947,14 @@ function forTypeToRuntime(type) {
       return "forTo";
   }
 }
-function forTypeToHTMLResumeRuntime(type, singleNodeOptimization) {
-  if (singleNodeOptimization) {
-    switch (type) {
-      case "of":
-        return "resumeSingleNodeForOf";
-      case "in":
-        return "resumeSingleNodeForIn";
-      case "to":
-        return "resumeSingleNodeForTo";
-    }
-  } else {
-    switch (type) {
-      case "of":
-        return "resumeForOf";
-      case "in":
-        return "resumeForIn";
-      case "to":
-        return "resumeForTo";
-    }
+function forTypeToHTMLResumeRuntime(type) {
+  switch (type) {
+    case "of":
+      return "resumeForOf";
+    case "in":
+      return "resumeForIn";
+    case "to":
+      return "resumeForTo";
   }
 }
 function forTypeToDOMRuntime(type) {
@@ -7255,9 +7307,24 @@ function buildContent(body) {
         ) : void 0
       );
     } else {
-      return import_compiler34.types.callExpression(import_compiler34.types.identifier(bodySection.name), [
-        scopeIdentifier
-      ]);
+      return import_compiler34.types.callExpression(
+        import_compiler34.types.identifier(bodySection.name),
+        bodySection.referencedLocalClosures ? [
+          scopeIdentifier,
+          import_compiler34.types.objectExpression(
+            toArray(bodySection.referencedLocalClosures, (ref) => {
+              const accessor = getScopeAccessor(ref);
+              const isShorthand = accessor === ref.name;
+              return import_compiler34.types.objectProperty(
+                toPropertyName(accessor),
+                import_compiler34.types.identifier(ref.name),
+                false,
+                isShorthand
+              );
+            })
+          )
+        ] : [scopeIdentifier]
+      );
     }
   }
 }
@@ -7278,7 +7345,7 @@ var define_default = {
     }
     const tagBody = tag.get("body");
     const bodySection = startSection(tagBody);
-    const varBinding = trackVarReferences(tag, 4 /* derived */);
+    const varBinding = trackVarReferences(tag, 5 /* derived */);
     if (bodySection) {
       if (varBinding) {
         bodySection.downstreamBinding = varBinding.propertyAliases.get("content") || varBinding;
@@ -8425,7 +8492,7 @@ var id_default = {
     if (!import_compiler40.types.isIdentifier(node.var)) {
       throw tag.get("var").buildCodeFrameError("The `id` tag cannot be destructured");
     }
-    const binding = trackVarReferences(tag, 4 /* derived */);
+    const binding = trackVarReferences(tag, 5 /* derived */);
     if (binding) {
       setBindingValueExpr(binding, false);
     }
@@ -8601,7 +8668,7 @@ var IfTag = {
             }
             const markerSerializeArg = getSerializeGuard(
               markerSerializeReason,
-              !skipParentEnd
+              !(skipParentEnd || singleNodeOptimization)
             );
             const cbNode = import_compiler42.types.arrowFunctionExpression(
               [],
@@ -8609,7 +8676,7 @@ var IfTag = {
             );
             statement = import_compiler42.types.expressionStatement(
               callRuntime(
-                singleNodeOptimization ? "resumeSingleNodeConditional" : "resumeConditional",
+                "resumeConditional",
                 cbNode,
                 getScopeIdIdentifier(ifTagSection),
                 getScopeAccessorLiteral(nodeBinding),
@@ -8618,7 +8685,8 @@ var IfTag = {
                   !markerSerializeArg
                 ),
                 markerSerializeArg,
-                skipParentEnd && import_compiler42.types.stringLiteral(`</${onlyChildParentTagName}>`)
+                skipParentEnd ? import_compiler42.types.stringLiteral(`</${onlyChildParentTagName}>`) : singleNodeOptimization ? import_compiler42.types.numericLiteral(0) : void 0,
+                singleNodeOptimization ? import_compiler42.types.numericLiteral(1) : void 0
               )
             );
           }
@@ -8963,7 +9031,7 @@ var lifecycle_default = {
     );
     tagExtra[kRef] = createBinding(
       generateUid("lifecycle"),
-      4 /* derived */,
+      5 /* derived */,
       section
     );
     if (node.attributes.length === 0) {
@@ -10018,7 +10086,7 @@ var custom_tag_default = {
       if (!childFile) {
         throw tag.get("name").buildCodeFrameError("Unable to resolve file for tag.");
       }
-      const varBinding = trackVarReferences(tag, 4 /* derived */);
+      const varBinding = trackVarReferences(tag, 5 /* derived */);
       if (varBinding) {
         varBinding.scopeOffset = tagExtra[kChildOffsetScopeBinding] = createBinding("#scopeOffset", 0 /* dom */, section);
       }
@@ -10819,7 +10887,7 @@ var dynamic_tag_default = {
         tagSection
       );
       if (hasVar) {
-        trackVarReferences(tag, 4 /* derived */);
+        trackVarReferences(tag, 5 /* derived */);
         tag.node.var.extra.binding.scopeOffset = tagExtra[kChildOffsetScopeBinding2] = createBinding("#scopeOffset", 0 /* dom */, tagSection);
       }
       startSection(tagBody);

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

@@ -11,8 +11,9 @@ export declare enum BindingType {
     let = 1,
     input = 2,
     param = 3,
-    derived = 4,
-    hoist = 5
+    local = 4,
+    derived = 5,
+    hoist = 6
 }
 export interface Sources {
     state: Opt<Binding>;

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

@@ -21,6 +21,7 @@ export interface Section {
         prefix: AccessorPrefix;
     } | undefined;
     params: undefined | Binding;
+    referencedLocalClosures: ReferencedBindings;
     referencedClosures: ReferencedBindings;
     referencedHoists: ReferencedBindings;
     bindings: ReferencedBindings;

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

@@ -8,7 +8,7 @@ export type Signal = {
     valueAccessor?: t.Expression;
     referencedBindings: ReferencedBindings;
     section: Section;
-    build: () => t.Expression;
+    build: undefined | (() => t.Expression);
     register?: boolean;
     values: Array<{
         signal: Signal;
@@ -34,6 +34,7 @@ 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): t.Expression;
 export declare function subscribe(provider: ReferencedBindings, subscriber: Signal): void;
 export declare function replaceNullishAndEmptyFunctionsWith0(args: (t.Expression | undefined | false)[]): t.Expression[];
 export declare function addStatement(type: "render" | "effect", targetSection: Section, referencedBindings: ReferencedBindings, statement: t.Statement | t.Statement[], usedReferences?: ReferencedBindings[] | false): void;

package/package.json

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