@marko/compiler 5.39.43 → 5.39.44

package/babel-utils.d.ts

@@ -23,6 +23,10 @@ export interface PluginDefinition<T = any> {
   path?: string;
   hook: Plugin<T>;
 }
+export interface ParsePluginDefinition<T = any> {
+  path?: string;
+  hook: ParsePlugin<T>;
+}
 export interface TagDefinition {
   dir: string;
   filePath: string;
@@ -57,7 +61,7 @@ export interface TagDefinition {
   openTagOnly: boolean;
   analyzer?: PluginDefinition<t.MarkoTag>;
   translator?: PluginDefinition<t.MarkoTag>;
-  parser?: PluginDefinition<t.MarkoTag>;
+  parser?: ParsePluginDefinition<t.MarkoTag>;
   transformers?: PluginDefinition<t.MarkoTag>[];
   migrators?: PluginDefinition<t.MarkoTag>[];
   parseOptions?: {
@@ -127,9 +131,9 @@ export interface Tag {
   openTagOnly?: boolean;
   analyze?: Plugin<t.MarkoTag>;
   translate?: Plugin<t.MarkoTag>;
-  parse?: Plugin<t.MarkoTag>;
-  transform?: Plugin<t.MarkoTag>[];
-  migrate?: Plugin<t.MarkoTag>[];
+  parse?: ParsePlugin<t.MarkoTag>;
+  transform?: Plugin<t.MarkoTag> | Plugin<t.MarkoTag>[];
+  migrate?: Plugin<t.MarkoTag> | Plugin<t.MarkoTag>[];
   parseOptions?: {
     rootOnly?: boolean;
     rawOpenTag?: boolean;
@@ -147,14 +151,20 @@ export type FunctionPlugin<T = any> = (
   path: t.NodePath<T>,
   types: typeof t,
 ) => void;
-export type EnterExitPlugin<T = any> = {
+export interface EnterExitPlugin<T = any> {
   enter?(path: t.NodePath<T>, types: typeof t): void;
   exit?(path: t.NodePath<T>, types: typeof t): void;
-};
+}
 
-export type ModulePlugin<T = any> = {
+export interface ModulePlugin<T = any> {
   default: EnterExitPlugin<T> | FunctionPlugin<T>;
-};
+}
+
+export interface ModuleFunctionPlugin<T = any> {
+  default: FunctionPlugin<T>;
+}
+
+export type ParsePlugin<T = any> = ModuleFunctionPlugin<T> | FunctionPlugin<T>;
 
 export type Plugin<T = any> =
   | ModulePlugin<T>

package/dist/babel-plugin/index.js

@@ -273,14 +273,10 @@ function getMarkoFile(code, fileOpts, markoOpts) {
       }
     }
 
-    if (markoOpts.stripTypes) {
-      stripTypes(file);
-      if (!isMigrate) {
-        file.path.scope.crawl();
-      }
-    }
-
     if (isMigrate) {
+      if (markoOpts.stripTypes) {
+        stripTypes(file);
+      }
       return file;
     }
 
@@ -299,6 +295,12 @@ function getMarkoFile(code, fileOpts, markoOpts) {
     }
     traverseAll(file, rootTransformers);
 
+    if (markoOpts.stripTypes) {
+      stripTypes(file);
+    }
+
+    file.path.scope.crawl();
+
     for (const taglibId in taglibLookup.taglibsById) {
       const { filePath } = taglibLookup.taglibsById[taglibId];
 

package/dist/babel-plugin/parser.js

@@ -18,6 +18,7 @@ var _mergeErrors = _interopRequireDefault(require("../util/merge-errors"));funct
 const noop = () => {};
 const emptyRange = (part) => part.start === part.end;
 const isAttrTag = (tag) => tag.name.value?.[0] === "@";
+const isStatementTag = (tag) => tag.tagDef?.parseOptions?.statement;
 const toBabelPosition = ({ line, character }) => ({
   // Babel lines start at 1 and use "column" instead of "character".
   line: line + 1,
@@ -28,6 +29,7 @@ function parseMarko(file) {
   const { code } = file;
   const { htmlParseOptions = {} } = file.markoOpts;
   const { watchFiles } = file.metadata.marko;
+  const parseVisits = [];
   let currentTag = file.path;
   let currentBody = currentTag;
   let currentAttr = undefined;
@@ -183,7 +185,7 @@ function parseMarko(file) {
           }
           break;
         case "MarkoTag":
-          if (isAttrTag(prev)) {
+          if (isStatementTag(prev) || isAttrTag(prev)) {
             value = value.replace(/^[\n\r]\s*/, "");
           }
           break;
@@ -207,7 +209,7 @@ function parseMarko(file) {
             }
             break;
           case "MarkoTag":
-            if (isAttrTag(next)) {
+            if (isStatementTag(next) || isAttrTag(next)) {
               value = value.replace(/[\n\r]\s*$/, "");
             }
 
@@ -558,7 +560,7 @@ function parseMarko(file) {
       if (parserPlugin) {
         const { hook } = parserPlugin;
         if (parserPlugin.path) watchFiles.push(parserPlugin.path);
-        (hook.default || hook)(currentTag, t);
+        parseVisits.push(hook.default || hook, currentTag);
       }
 
       const parentTag = isAttrTag(node) ?
@@ -637,6 +639,10 @@ function parseMarko(file) {
   parser.parse(code);
   onNext();
 
+  for (let i = 0; i < parseVisits.length;) {
+    parseVisits[i++](parseVisits[i++]);
+  }
+
   const { ast } = file;
   const { program } = ast;
   ast.start = program.start = 0;

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

@@ -19,6 +19,7 @@ const {
 getBindingIdentifiers.keys.Program = ["params"];
 getBindingIdentifiers.keys.MarkoTag = ["var"];
 getBindingIdentifiers.keys.MarkoTagBody = ["params"];
+getBindingIdentifiers.keys.MarkoScriptlet = ["body"];
 
 _definitions.MARKO_TYPES.forEach((typeName) => {
   definitionUtils.default(typeName, _definitions.default[typeName]);

package/package.json

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