marko 6.0.0-next.3.33 → 6.0.0-next.3.34

package/dist/translator/index.js

@@ -3237,12 +3237,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 +3267,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 +3406,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) {
@@ -7989,10 +8001,10 @@ 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;
     }
@@ -8029,18 +8041,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;
 }

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/package.json

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