@marko/compiler 5.39.46 → 5.39.48

package/dist/babel-types/types/definitions.js

@@ -149,7 +149,7 @@ const MarkoDefinitions = {
   },
 
   MarkoTagBody: {
-    aliases: ["Marko", "BlockParent", "Scope"],
+    aliases: ["Marko", "BlockParent", "FunctionParent", "Scope"],
     builder: ["body", "params"],
     visitor: ["typeParameters", "params", "body"],
     fields: {

package/dist/babel-utils/tags.js

@@ -255,35 +255,17 @@ function loadFileForTag(tag) {
   const filename = def && def.template;
 
   if (filename) {
-    const markoMeta = file.metadata.marko;
-    const relativeFileName = (0, _imports.resolveRelativePath)(file, filename);
-    const { analyzedTags } = markoMeta;
-    if (analyzedTags) {
-      analyzedTags.add(relativeFileName);
-    } else {
-      markoMeta.analyzedTags = new Set([relativeFileName]);
-    }
-
     return resolveMarkoFile(file, filename);
   }
 }
 
 function loadFileForImport(file, request) {
   const relativeRequest = resolveTagImport(file.path, request);
-
   if (relativeRequest) {
     const filename =
     relativeRequest[0] === "." ?
     (0, _path.resolve)(file.opts.filename, "..", relativeRequest) :
     _modules.default.resolve(relativeRequest, (0, _path.dirname)(file.opts.filename));
-    const markoMeta = file.metadata.marko;
-    const { analyzedTags } = markoMeta;
-    if (analyzedTags) {
-      analyzedTags.add(relativeRequest);
-    } else {
-      markoMeta.analyzedTags = new Set([relativeRequest]);
-    }
-
     return resolveMarkoFile(file, filename);
   }
 }
@@ -298,11 +280,14 @@ function resolveMarkoFile(file, filename) {
   }
 
   try {
-    return file.___getMarkoFile(
+    const childFile = file.___getMarkoFile(
       file.markoOpts.fileSystem.readFileSync(filename).toString("utf-8"),
       createNewFileOpts(file.opts, filename),
       file.markoOpts
     );
+
+    (file.metadata.marko.analyzedTags ||= new Set()).add(filename);
+    return childFile;
   } catch (_) {
 
     // ignore

package/dist/types.d.ts

@@ -1811,7 +1811,7 @@ export type ExpressionWrapper = ExpressionStatement | ParenthesizedExpression |
 export type For = ForInStatement | ForStatement | ForOfStatement;
 export type ForXStatement = ForInStatement | ForOfStatement;
 export type Function = FunctionDeclaration | FunctionExpression | ObjectMethod | ArrowFunctionExpression | ClassMethod | ClassPrivateMethod;
-export type FunctionParent = FunctionDeclaration | FunctionExpression | ObjectMethod | ArrowFunctionExpression | ClassMethod | ClassPrivateMethod | StaticBlock | TSModuleBlock;
+export type FunctionParent = FunctionDeclaration | FunctionExpression | ObjectMethod | ArrowFunctionExpression | ClassMethod | ClassPrivateMethod | StaticBlock | TSModuleBlock | MarkoTagBody;
 export type Pureish = FunctionDeclaration | FunctionExpression | StringLiteral | NumericLiteral | NullLiteral | BooleanLiteral | RegExpLiteral | ArrowFunctionExpression | BigIntLiteral | DecimalLiteral;
 export type Declaration = FunctionDeclaration | VariableDeclaration | ClassDeclaration | ExportAllDeclaration | ExportDefaultDeclaration | ExportNamedDeclaration | ImportDeclaration | DeclareClass | DeclareFunction | DeclareInterface | DeclareModule | DeclareModuleExports | DeclareTypeAlias | DeclareOpaqueType | DeclareVariable | DeclareExportDeclaration | DeclareExportAllDeclaration | InterfaceDeclaration | OpaqueType | TypeAlias | EnumDeclaration | TSDeclareFunction | TSInterfaceDeclaration | TSTypeAliasDeclaration | TSEnumDeclaration | TSModuleDeclaration | TSImportEqualsDeclaration;
 export type FunctionParameter = Identifier | RestElement | AssignmentPattern | ArrayPattern | ObjectPattern | VoidPattern;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/compiler",
-  "version": "5.39.46",
+  "version": "5.39.48",
   "description": "Marko template to JS compiler.",
   "keywords": [
     "babel",
@@ -87,7 +87,7 @@
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
-    "marko": "^5.38.1"
+    "marko": "^5.38.11"
   },
   "engines": {
     "node": "18 || 20 || >=22"