@marko/compiler 5.38.3 → 5.38.5

package/dist/babel-plugin/index.js

@@ -1,4 +1,4 @@
-"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = void 0;exports.getMarkoFile = getMarkoFile;var _traverse = require("@babel/traverse");
+"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = void 0;exports.getMarkoFile = getMarkoFile;var _traverse = _interopRequireDefault(require("@babel/traverse"));
 var _babelUtils = require("@marko/babel-utils");
 var _crypto = require("crypto");
 var _path = _interopRequireDefault(require("path"));
@@ -358,27 +358,23 @@ function mergeVisitors(all) {
     if (all.length === 1) {
       all = all[0];
     } else {
-      return _traverse.visitors.merge(all);
+      return _traverse.default.visitors.merge(all);
     }
   }
 
-  return _traverse.visitors.explode(all);
+  return _traverse.default.visitors.explode(all);
 }
 
 function traverseAll(file, visitors) {
   const program = file.path;
-  const { Program, ...mergedVisitors } = mergeVisitors(visitors);
-  program.state = {};
-
-  // Traverse only walks into children by default
-  // This manually traverses into the Program node as well.
-  if (!(Program && Program.enter && program._call(Program.enter))) {
-    program.traverse(mergedVisitors, program.state);
-
-    if (Program && Program.exit) {
-      program._call(Program.exit);
-    }
-  }
+  (0, _traverse.default)(
+    program.node,
+    mergeVisitors(visitors),
+    program.scope,
+    program.state = {},
+    program,
+    true
+  );
 }
 
 function addPlugin(meta, arr, plugin) {

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

@@ -136,12 +136,13 @@ Object.assign(_printer.default.prototype, {
     }
   },
   MarkoTagBody(node) {
-    this.printSequence(node.body, { indent: true });
+    this.printSequence(node.body, true);
   },
   MarkoTag(node) {
     const isDynamicTag = !t.isStringLiteral(node.name);
     const tagName = !isDynamicTag && node.name.value;
     const rawValue = node.rawValue;
+    let bodyOverride;
 
     if (
     tagName === "style" &&
@@ -199,28 +200,37 @@ Object.assign(_printer.default.prototype, {
         this.token("|");
       }
 
-      if (node.attributes.length) {
-        if (
-        !(node.attributes && node.attributes[0] && node.attributes[0].default))
-        {
+      let { attributes } = node;
+      if (attributes.length) {
+        if (tagName === "script") {
+          for (let i = attributes.length; i--;) {
+            if (attributes[i].value.fromBody) {
+              bodyOverride = attributes[i].value.body.body;
+              attributes = toSpliced(attributes, i);
+              break;
+            }
+          }
+        }
+
+        if (!(attributes && attributes[0] && attributes[0].default)) {
           this.token(" ");
         }
 
-        this.printJoin(node.attributes, { separator: spaceSeparator });
+        this.printJoin(attributes, undefined, undefined, spaceSeparator);
       }
     }
 
     if (_selfClosingTags.default.voidElements.includes(tagName)) {
       this.token(">");
     } else if (
-    !(node.body.body.length || node.attributeTags.length) ||
+    !(bodyOverride || node.body.body.length || node.attributeTags.length) ||
     _selfClosingTags.default.svgElements.includes(tagName))
     {
       this.token("/>");
     } else {
       this.token(">");
       this.newline();
-      this.printSequence(zipAttributeTagsAndBody(node), { indent: true });
+      this.printSequence(bodyOverride || zipAttributeTagsAndBody(node), true);
       this.token("</");
       if (!isDynamicTag) {
         this.token(tagName);
@@ -331,4 +341,20 @@ function compareStartLoc(a, b) {
     a.loc.start.line - b.loc.start.line ||
     a.loc.start.column - b.loc.start.column);
 
+}
+
+function toSpliced(arr, index) {
+  const len = arr.length;
+  const result = new Array(len - 1);
+  let i = 0;
+
+  for (; i < index; i++) {
+    result[i] = arr[i];
+  }
+
+  for (i++; i < len; i++) {
+    result[i - 1] = arr[i];
+  }
+
+  return result;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/compiler",
-  "version": "5.38.3",
+  "version": "5.38.5",
   "description": "Marko template to JS compiler.",
   "keywords": [
     "babel",
@@ -57,20 +57,20 @@
   "dependencies": {
     "@babel/code-frame": "^7.26.2",
     "@babel/core": "^7.26.0",
-    "@babel/generator": "^7.26.2",
-    "@babel/parser": "^7.26.2",
+    "@babel/generator": "^7.26.3",
+    "@babel/parser": "^7.26.3",
     "@babel/plugin-syntax-typescript": "^7.25.9",
-    "@babel/plugin-transform-modules-commonjs": "^7.25.9",
-    "@babel/plugin-transform-typescript": "^7.25.9",
+    "@babel/plugin-transform-modules-commonjs": "^7.26.3",
+    "@babel/plugin-transform-typescript": "^7.26.3",
     "@babel/runtime": "^7.26.0",
-    "@babel/traverse": "^7.25.9",
-    "@babel/types": "^7.26.0",
+    "@babel/traverse": "^7.26.4",
+    "@babel/types": "^7.26.3",
     "@luxass/strip-json-comments": "^1.3.2",
-    "@marko/babel-utils": "^6.6.1",
+    "@marko/babel-utils": "^6.6.3",
     "complain": "^1.6.1",
     "he": "^1.2.0",
-    "htmljs-parser": "^5.5.2",
-    "jsesc": "^3.0.2",
+    "htmljs-parser": "^5.5.3",
+    "jsesc": "^3.1.0",
     "kleur": "^4.1.5",
     "lasso-package-root": "^1.0.1",
     "raptor-regexp": "^1.0.1",
@@ -80,7 +80,7 @@
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
-    "@marko/translator-default": "^6.1.2"
+    "@marko/translator-default": "^6.1.3"
   },
   "publishConfig": {
     "access": "public"