@marko/compiler 5.37.23 → 5.37.25

package/config.js

@@ -1 +1 @@
-module.exports = require("./dist/config");
+module.exports = require("./dist/config").default;

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/index.js

@@ -1,4 +1,4 @@
-"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports._clearDefaults = _clearDefaults;exports.compile = compile;exports.compileFile = compileFile;exports.compileFileSync = compileFileSync;exports.compileSync = compileSync;exports.configure = configure;exports.getRuntimeEntryFiles = getRuntimeEntryFiles;exports.types = exports.taglib = void 0;var _types = _interopRequireWildcard(require("./babel-types"));exports.types = _types;
+"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports._clearDefaults = _clearDefaults;exports.compile = compile;exports.compileFile = compileFile;exports.compileFileSync = compileFileSync;exports.compileSync = compileSync;exports.configure = configure;exports.getRuntimeEntryFiles = getRuntimeEntryFiles;exports.types = exports.taglib = exports.globalConfig = void 0;var _types = _interopRequireWildcard(require("./babel-types"));exports.types = _types;
 var babel = _interopRequireWildcard(require("@babel/core"));
 var _pluginSyntaxTypescript = _interopRequireDefault(require("@babel/plugin-syntax-typescript"));
 var _pluginTransformModulesCommonjs = _interopRequireDefault(require("@babel/plugin-transform-modules-commonjs"));
@@ -17,9 +17,9 @@ var _tryLoadTranslator = _interopRequireDefault(require("./util/try-load-transla
 
 const CWD = process.cwd();
 
-let globalConfig = { ..._config.default };
+let globalConfig = exports.globalConfig = { ..._config.default };
 function configure(newConfig) {
-  globalConfig = { ..._config.default, ...newConfig };
+  exports.globalConfig = globalConfig = { ..._config.default, ...newConfig };
 }
 
 async function compile(src, filename, config) {

package/dist/traverse.d.ts

@@ -1126,19 +1126,19 @@ export class NodePath<T = Node> {
     // #endregion
 
     // #region ------------------------- assertXXX -------------------------
-    assertMarkoParseError(opts?: object | null): void;
-    assertMarkoDocumentType(opts?: object | null): void;
-    assertMarkoDeclaration(opts?: object | null): void;
-    assertMarkoCDATA(opts?: object | null): void;
-    assertMarkoComment(opts?: object | null): void;
-    assertMarkoText(opts?: object | null): void;
-    assertMarkoPlaceholder(opts?: object | null): void;
-    assertMarkoScriptlet(opts?: object | null): void;
-    assertMarkoClass(opts?: object | null): void;
-    assertMarkoAttribute(opts?: object | null): void;
-    assertMarkoSpreadAttribute(opts?: object | null): void;
-    assertMarkoTagBody(opts?: object | null): void;
-    assertMarkoTag(opts?: object | null): void;
+    assertMarkoParseError(opts?: object | null): asserts this is NodePath<t.MarkoParseError>;
+    assertMarkoDocumentType(opts?: object | null): asserts this is NodePath<t.MarkoDocumentType>;
+    assertMarkoDeclaration(opts?: object | null): asserts this is NodePath<t.MarkoDeclaration>;
+    assertMarkoCDATA(opts?: object | null): asserts this is NodePath<t.MarkoCDATA>;
+    assertMarkoComment(opts?: object | null): asserts this is NodePath<t.MarkoComment>;
+    assertMarkoText(opts?: object | null): asserts this is NodePath<t.MarkoText>;
+    assertMarkoPlaceholder(opts?: object | null): asserts this is NodePath<t.MarkoPlaceholder>;
+    assertMarkoScriptlet(opts?: object | null): asserts this is NodePath<t.MarkoScriptlet>;
+    assertMarkoClass(opts?: object | null): asserts this is NodePath<t.MarkoClass>;
+    assertMarkoAttribute(opts?: object | null): asserts this is NodePath<t.MarkoAttribute>;
+    assertMarkoSpreadAttribute(opts?: object | null): asserts this is NodePath<t.MarkoSpreadAttribute>;
+    assertMarkoTagBody(opts?: object | null): asserts this is NodePath<t.MarkoTagBody>;
+    assertMarkoTag(opts?: object | null): asserts this is NodePath<t.MarkoTag>;
     assertAccessor(opts?: object): asserts this is NodePath<t.Accessor>;
     assertAnyTypeAnnotation(opts?: object): asserts this is NodePath<t.AnyTypeAnnotation>;
     assertArgumentPlaceholder(opts?: object): asserts this is NodePath<t.ArgumentPlaceholder>;

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/index.d.ts

@@ -38,6 +38,8 @@ export interface CompileResult {
   meta: MarkoMeta;
 }
 
+export const globalConfig: Config;
+
 export function configure(config: Config): void;
 
 export function compile(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/compiler",
-  "version": "5.37.23",
+  "version": "5.37.25",
   "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.13",
     "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.25"
   },
   "publishConfig": {
     "access": "public"