marko 6.0.0-next.3.33 → 6.0.0-next.3.35

package/dist/translator/index.js

@@ -3114,7 +3114,9 @@ var program_default = {
       currentProgramPath = program;
       startSection(program);
       trackParamsReferences(program, 2 /* input */);
-      program.node.params[0].extra.binding.nullable = false;
+      if (program.node.params[0]?.extra?.binding) {
+        program.node.params[0].extra.binding.nullable = false;
+      }
       const { scope } = program;
       (program.node.extra ??= {}).domExports = {
         template: scope.generateUid("template_"),
@@ -3237,12 +3239,22 @@ function getExprRoot(path5) {
 }
 function getFnRoot(path5) {
   let curPath = path5;
+  let fnPath;
   if (curPath.isProgram()) return;
-  while (!isFunctionExpression(curPath)) {
-    if (isMarko(curPath)) return;
+  while (!isMarko(curPath)) {
+    if (isFunction(curPath)) {
+      fnPath = curPath;
+    } else {
+      switch (curPath.type) {
+        case "CallExpression":
+        case "NewExpression":
+          fnPath = void 0;
+          break;
+      }
+    }
     curPath = curPath.parentPath;
   }
-  return curPath;
+  return fnPath;
 }
 function isMarko(path5) {
   switch (path5.type) {
@@ -3257,10 +3269,13 @@ function isMarko(path5) {
       return false;
   }
 }
-function isFunctionExpression(path5) {
+function isFunction(path5) {
   switch (path5.type) {
+    case "FunctionDeclaration":
+      return !path5.node.declare;
     case "FunctionExpression":
     case "ArrowFunctionExpression":
+    case "ObjectMethod":
       return true;
     default:
       return false;
@@ -3393,10 +3408,9 @@ function trackAssignment(assignment, binding) {
   });
 }
 function setReferencesScope(path5) {
-  let fnRoot = getFnRoot(path5);
-  while (fnRoot) {
+  const fnRoot = getFnRoot(path5);
+  if (fnRoot) {
     (fnRoot.node.extra ??= {}).referencesScope = true;
-    fnRoot = getFnRoot(fnRoot.parentPath);
   }
 }
 function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAlias, upstreamExpression, property) {
@@ -4557,6 +4571,7 @@ var native_tag_default = {
               );
             }
           }
+          setForceResumeScope(section);
           translateVar(
             tag,
             callRuntime(
@@ -7989,21 +8004,21 @@ var import_babel_utils37 = require("@marko/compiler/babel-utils");
 var functionIdsBySection = /* @__PURE__ */ new WeakMap();
 var function_default = {
   analyze(fn) {
-    const fnRoot = getFnRoot(fn.parentPath);
-    const markoRoot = getMarkoRoot(fnRoot || fn);
-    const isStatic2 = !markoRoot || markoRoot.isMarkoScriptlet({ static: true });
-    if (fnRoot || !isFunction(fn, isStatic2)) return;
+    if (fn !== getFnRoot(fn)) {
+      return;
+    }
+    const markoRoot = getMarkoRoot(fn);
     if (markoRoot && (markoRoot.isMarkoPlaceholder() || markoRoot.isMarkoScriptlet() && markoRoot.node.target === "server")) {
       return;
     }
+    if (isMarkoAttribute(markoRoot) && ((0, import_babel_utils37.isNativeTag)(markoRoot.parentPath) && /^on[A-Z-]/.test(markoRoot.node.name) || isCoreTagName(markoRoot.parentPath, "script") || isCoreTagName(markoRoot.parentPath, "lifecycle") || isCoreTagName(markoRoot.parentPath, "for"))) {
+      return;
+    }
     const { node } = fn;
     const extra = node.extra ??= {};
     const name2 = extra.name = fn.node.id?.name || (isMarkoAttribute(markoRoot) ? markoRoot.node.default ? import_compiler47.types.toIdentifier(
       markoRoot.parentPath.has("var") ? markoRoot.parentPath.get("var") : markoRoot.parentPath.get("name")
     ) : markoRoot.node.name : import_compiler47.types.isVariableDeclarator(fn.parent) && import_compiler47.types.isIdentifier(fn.parent.id) ? fn.parent.id.name : import_compiler47.types.isObjectMethod(node) && import_compiler47.types.isIdentifier(node.key) ? node.key.name : "anonymous");
-    if (isMarkoAttribute(markoRoot) && ((0, import_babel_utils37.isNativeTag)(markoRoot.parentPath) && /^on[A-Z-]/.test(markoRoot.node.name) || isCoreTagName(markoRoot.parentPath, "script") || isCoreTagName(markoRoot.parentPath, "lifecycle") || isCoreTagName(markoRoot.parentPath, "for"))) {
-      return;
-    }
     const {
       markoOpts,
       opts: { filename }
@@ -8029,18 +8044,6 @@ var function_default = {
     );
   }
 };
-function isFunction(fn, isStatic2) {
-  switch (fn.node.type) {
-    case "FunctionDeclaration":
-      return isStatic2 && !fn.node.declare;
-    case "FunctionExpression":
-    case "ArrowFunctionExpression":
-    case "ObjectMethod":
-      return true;
-    default:
-      return false;
-  }
-}
 function isMarkoAttribute(path5) {
   return path5 ? path5.isMarkoAttribute() : false;
 }
@@ -8370,6 +8373,7 @@ var import_compiler51 = require("@marko/compiler");
 var import_babel_utils40 = require("@marko/compiler/babel-utils");
 var import_path4 = __toESM(require("path"));
 var kChildScopeBinding = Symbol("custom tag child scope");
+var kChildAttrExprs = Symbol("custom tag child attribute expressions");
 var custom_tag_default = {
   analyze: {
     enter(tag) {
@@ -8398,12 +8402,14 @@ var custom_tag_default = {
         void 0,
         tagExtra
       );
+      tagExtra[kChildAttrExprs] = /* @__PURE__ */ new Set([tagExtra]);
       const childFile = (0, import_babel_utils40.loadFileForTag)(tag);
       if (childFile.opts.filename === tag.hub.file.opts.filename) {
         mergeReferences(section, tag.node, getAllTagReferenceNodes(tag.node));
       } else {
         const childProgramExtra = childFile.ast.program.extra;
         analyzeAttrs(
+          tagExtra,
           section,
           tag,
           childProgramExtra?.domExports.params?.props?.[0]
@@ -8442,40 +8448,51 @@ function translateHTML(tag) {
   }
   const tagVar = node.var;
   const section = getSection(tag);
-  const childScopeBinding = node.extra[kChildScopeBinding];
-  const peekScopeId = tag.scope.generateUidIdentifier(childScopeBinding?.name);
-  tag.insertBefore(
-    import_compiler51.types.variableDeclaration("const", [
-      import_compiler51.types.variableDeclarator(peekScopeId, callRuntime("peekNextScope"))
-    ])
-  );
-  getSerializedScopeProperties(section).set(
-    getScopeAccessorLiteral(childScopeBinding),
-    callRuntime("writeExistingScope", peekScopeId)
-  );
   const inputExport = (0, import_babel_utils40.loadFileForTag)(tag)?.ast.program.extra?.domExports?.params?.props?.[0];
   const { properties, statements } = inputExport ? translateAttrs(tag, inputExport.props) : {
     properties: [],
     statements: []
   };
-  if (tagVar) {
-    statements.push(
-      import_compiler51.types.expressionStatement(
-        callRuntime(
-          "setTagVar",
-          getScopeIdIdentifier(section),
-          peekScopeId,
-          import_compiler51.types.stringLiteral(
-            getResumeRegisterId(
-              section,
-              node.var.extra?.binding,
-              // TODO: node.var is not always an identifier.
-              "var"
+  let providesStatefulAttrs = false;
+  for (const expr of tag.node.extra[kChildAttrExprs]) {
+    if (isReferencedExtra(expr) && isStatefulReferences(expr.referencedBindings)) {
+      providesStatefulAttrs = true;
+      break;
+    }
+  }
+  if (providesStatefulAttrs || tagVar) {
+    const childScopeBinding = node.extra[kChildScopeBinding];
+    const peekScopeId = tag.scope.generateUidIdentifier(
+      childScopeBinding?.name
+    );
+    tag.insertBefore(
+      import_compiler51.types.variableDeclaration("const", [
+        import_compiler51.types.variableDeclarator(peekScopeId, callRuntime("peekNextScope"))
+      ])
+    );
+    getSerializedScopeProperties(section).set(
+      getScopeAccessorLiteral(childScopeBinding),
+      callRuntime("writeExistingScope", peekScopeId)
+    );
+    if (tagVar) {
+      statements.push(
+        import_compiler51.types.expressionStatement(
+          callRuntime(
+            "setTagVar",
+            getScopeIdIdentifier(section),
+            peekScopeId,
+            import_compiler51.types.stringLiteral(
+              getResumeRegisterId(
+                section,
+                node.var.extra?.binding,
+                // TODO: node.var is not always an identifier.
+                "var"
+              )
             )
           )
         )
-      )
-    );
+      );
+    }
   }
   if (node.extra.tagNameNullable) {
     const contentProp = getTranslatedBodyContentProperty(properties);
@@ -8617,7 +8634,7 @@ function getTagRelativePath(tag) {
   }
   return relativePath;
 }
-function analyzeAttrs(section, tag, templateExport) {
+function analyzeAttrs(rootTagExtra, section, tag, templateExport) {
   if (!templateExport) {
     dropReferences(getAllTagReferenceNodes(tag.node));
     return;
@@ -8653,7 +8670,7 @@ function analyzeAttrs(section, tag, templateExport) {
           const childAttrExports = templateExport.props[attrTagMeta.name];
           if (childAttrExports) {
             if (childAttrExports.props && !attrTagMeta.dynamic) {
-              analyzeAttrs(section, child, childAttrExports);
+              analyzeAttrs(rootTagExtra, section, child, childAttrExports);
             } else {
               analyzeDynamicChildGroup(attrTagMeta.group, child);
             }
@@ -8677,8 +8694,12 @@ function analyzeAttrs(section, tag, templateExport) {
         }
       }
     }
-    for (const { firstTag, referenceNodes } of nodeReferencesByGroup.values()) {
-      mergeReferences(section, firstTag.node, referenceNodes);
+    for (const {
+      firstTag: { node },
+      referenceNodes
+    } of nodeReferencesByGroup.values()) {
+      mergeReferences(section, node, referenceNodes);
+      rootTagExtra[kChildAttrExprs].add(node.extra);
     }
   }
   const { attributes } = tag.node;
@@ -8696,6 +8717,8 @@ function analyzeAttrs(section, tag, templateExport) {
       spreadReferenceNodes.push(attr2.value);
     } else if (import_compiler51.types.isMarkoSpreadAttribute(attr2)) {
       spreadReferenceNodes = [attr2.value];
+    } else {
+      rootTagExtra[kChildAttrExprs].add(attr2.value.extra ??= {});
     }
   }
   if (spreadReferenceNodes) {

package/dist/translator/util/get-root.d.ts

@@ -2,6 +2,6 @@ import type { types as t } from "@marko/compiler";
 type MarkoExprRootPath = t.NodePath<t.MarkoTag | t.MarkoTagBody | t.MarkoAttribute | t.MarkoSpreadAttribute | t.MarkoScriptlet | t.MarkoPlaceholder>;
 export declare function getMarkoRoot(path: t.NodePath<t.Node>): MarkoExprRootPath | null;
 export declare function getExprRoot(path: t.NodePath<t.Node>): t.NodePath<t.Node>;
-export declare function getFnRoot(path: t.NodePath<t.Node>): t.NodePath<t.ArrowFunctionExpression | t.FunctionExpression> | undefined;
+export declare function getFnRoot(path: t.NodePath<t.Node>): t.NodePath<t.ArrowFunctionExpression | t.FunctionExpression | t.ObjectMember> | undefined;
 export declare function isMarko(path: t.NodePath<any>): path is MarkoExprRootPath;
 export {};

package/dist/translator/visitors/tag/custom-tag.d.ts

@@ -1,9 +1,11 @@
 import { types as t } from "@marko/compiler";
 import { type Binding } from "../../util/references";
 declare const kChildScopeBinding: unique symbol;
+declare const kChildAttrExprs: unique symbol;
 declare module "@marko/compiler/dist/types" {
     interface MarkoTagExtra {
         [kChildScopeBinding]?: Binding;
+        [kChildAttrExprs]?: Set<t.NodeExtra>;
     }
 }
 declare const _default: {

package/package.json

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