@marko/compiler 5.37.23 → 5.37.24

package/dist/babel-plugin/parser.js

@@ -542,34 +542,50 @@ function parseMarko(file) {
 
         if (node.body.body.length) {
           const body = [];
+          // When we have a control flow with mixed body and attribute tag content
+          // we move any scriptlets, comments or empty nested control flow.
+          // This is because they initially ambiguous as to whether
+          // they are part of the body or the attributeTags.
+          // Otherwise we only move scriptlets.
           for (const child of node.body.body) {
             if (
             t.isMarkoScriptlet(child) ||
-            isControlFlow && (
-            t.isMarkoComment(child) ||
-            child.tagDef?.controlFlow && !child.body.body.length))
+            isControlFlow && t.isMarkoComment(child))
             {
-              // When we have a control flow with mixed body and attribute tag content
-              // we move any scriptlets, comments or empty nested control flow.
-              // This is because they initially ambiguous as to whether
-              // they are part of the body or the attributeTags.
+              attributeTags.push(child);
+            } else if (
+            isControlFlow &&
+            child.tagDef?.controlFlow &&
+            !child.body.body.length)
+            {
+              child.body.attributeTags = true;
               attributeTags.push(child);
             } else {
               body.push(child);
             }
           }
 
-          if (isControlFlow && body.length) {
-            onNext();
-            throw file.buildCodeFrameError(
-              body[0],
-              "Cannot have attribute tags and body content under a control flow tag."
-            );
+          if (isControlFlow) {
+            if (body.length) {
+              onNext();
+              throw file.buildCodeFrameError(
+                body[0],
+                "Cannot have attribute tags and body content under a control flow tag."
+              );
+            }
+
+            node.attributeTags = body;
+            node.body.body = attributeTags;
+            node.body.attributeTags = true;
           } else {
             node.body.body = body;
           }
 
           attributeTags.sort(sortByStart);
+        } else if (isControlFlow) {
+          node.attributeTags = [];
+          node.body.body = attributeTags;
+          node.body.attributeTags = true;
         }
 
         if (isControlFlow) {

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

@@ -174,6 +174,10 @@ const MarkoDefinitions = {
         "MarkoComment"]
         ),
         default: []
+      },
+      attributeTags: {
+        validate: (0, _utils.assertValueType)("boolean"),
+        default: false
       }
     }
   },

package/dist/types.d.ts

@@ -1741,6 +1741,7 @@ export interface MarkoTagBody extends BaseNode {
   type: "MarkoTagBody";
   body: Array<MarkoTag | MarkoCDATA | MarkoText | MarkoPlaceholder | MarkoScriptlet | MarkoComment>;
   params: Array<Identifier | Pattern | RestElement>;
+  attributeTags: boolean;
   typeParameters: TSTypeParameterDeclaration | null;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/compiler",
-  "version": "5.37.23",
+  "version": "5.37.24",
   "description": "Marko template to JS compiler.",
   "keywords": [
     "babel",
@@ -66,7 +66,7 @@
     "@babel/traverse": "^7.25.9",
     "@babel/types": "^7.26.0",
     "@luxass/strip-json-comments": "^1.3.2",
-    "@marko/babel-utils": "^6.5.10",
+    "@marko/babel-utils": "^6.5.12",
     "complain": "^1.6.1",
     "he": "^1.2.0",
     "htmljs-parser": "^5.5.2",
@@ -80,7 +80,7 @@
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
-    "@marko/translator-default": "^6.0.23"
+    "@marko/translator-default": "^6.0.24"
   },
   "publishConfig": {
     "access": "public"