@marko/compiler 5.39.48 → 5.39.50

package/dist/babel-plugin/index.js

@@ -64,17 +64,20 @@ let stripTypesVisitor;var _default =
   return {
     name: "marko",
     manipulateOptions(opts) {
+      const { parserOpts } = opts;
       // We need to allow these for now since we are not parsing the entire file
       // These types of syntax errors will be picked up by the bundler / runtime anyways.
-      opts.parserOpts.allowAwaitOutsideFunction =
-      opts.parserOpts.allowImportExportEverywhere =
-      opts.parserOpts.allowReturnOutsideFunction =
-      opts.parserOpts.allowSuperOutsideMethod =
-      opts.parserOpts.allowUndeclaredExports =
-      opts.parserOpts.allowNewTargetOutsideFunction =
+      parserOpts.allowAwaitOutsideFunction =
+      parserOpts.allowImportExportEverywhere =
+      parserOpts.allowReturnOutsideFunction =
+      parserOpts.allowSuperOutsideMethod =
+      parserOpts.allowUndeclaredExports =
+      parserOpts.allowNewTargetOutsideFunction =
+      parserOpts.createParenthesizedExpressions =
+      parserOpts.createImportExpressions =
       true;
 
-      opts.parserOpts.plugins.push("objectRestSpread", "classProperties", [
+      parserOpts.plugins.push("objectRestSpread", "classProperties", [
       "typescript",
       {
         disallowAmbiguousJSXLike: false,

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

@@ -1,10 +1,5 @@
-"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");require("../types/patch");
-
-var _printer = _interopRequireDefault(require("@babel/generator/lib/printer"));
-var t = _interopRequireWildcard(require("@babel/types"));
-var _selfClosingTags = _interopRequireDefault(require("self-closing-tags"));function _interopRequireWildcard(e, t) {if ("function" == typeof WeakMap) var r = new WeakMap(),n = new WeakMap();return (_interopRequireWildcard = function (e, t) {if (!t && e && e.__esModule) return e;var o,i,f = { __proto__: null, default: e };if (null === e || "object" != typeof e && "function" != typeof e) return f;if (o = t ? n : r) {if (o.has(e)) return o.get(e);o.set(e, f);}for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]);return f;})(e, t);}
-
-Object.assign(_printer.default.prototype, {
+"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");var _selfClosingTags = _interopRequireDefault(require("self-closing-tags"));
+Object.assign(require("@babel/generator/lib/generators/template-literals"), {
   MarkoParseError(node) {
     this.token(node.source);
   },
@@ -29,26 +24,16 @@ Object.assign(_printer.default.prototype, {
     this.token("-->");
   },
   MarkoPlaceholder(node, parent) {
-    if (parent) {
-      const parentBody = getBody(parent);
-      const prev = parentBody[parentBody.indexOf(node) - 1];
+    const isRootLevel = parent.type === "Program";
 
-      if (prev && (t.isMarkoText(prev) || t.isMarkoPlaceholder(prev))) {
-        this.removeTrailingNewline();
-      }
+    if (isRootLevel) {
+      this.token("-- ");
     }
-
     this.token(node.escape ? "${" : "$!{");
-    this.print(node.value);
+    this.print(node.value, true, true);
     this.token("}");
   },
   MarkoScriptlet(node, parent) {
-    this.removeTrailingNewline();
-
-    if (!(t.isProgram(parent) && getBody(parent)[0] === node)) {
-      this.token("\n");
-    }
-
     this.token(`${node.static ? node.target ?? "static" : "$"} `);
 
     if (
@@ -56,20 +41,17 @@ Object.assign(_printer.default.prototype, {
     !statementCouldHaveUnenclosedNewline(node.body[0]))
     {
       // TODO should determine if node has unenclosed newlines.
-      this.print(node.body[0]);
+      this.print(node.body[0], false, true);
     } else {
       this.token("{");
-      this.newline();
-      this.indent();
-      this.printSequence(node.body);
-      this.dedent();
+      this.printSequence(node.body, true, true);
       this.token("}");
     }
   },
   MarkoClass(node) {
     this.token("class");
     this.token(" ");
-    this.print(node.body);
+    this.print(node.body, true, true);
   },
   MarkoAttribute(node) {
     const value = node.value;
@@ -89,15 +71,18 @@ Object.assign(_printer.default.prototype, {
       }
     }
 
-    if (node.default || !t.isBooleanLiteral(value, { value: true })) {
+    if (
+    node.default ||
+    !(node.value.type === "BooleanLiteral" && node.value.value))
+    {
       if (
-      t.isFunctionExpression(value) &&
+      value.type === "FunctionExpression" &&
       !(value.id || value.async || value.generator))
       {
         this.token("(");
         this.printList(value.params);
-        this.token(") ");
-        this.print(value.body);
+        this.token(")");
+        this.printBlock(value.body);
       } else {
         this.token(node.bound ? ":=" : "=");
         printWithParansIfNeeded.call(this, value);
@@ -109,17 +94,10 @@ Object.assign(_printer.default.prototype, {
     printWithParansIfNeeded.call(this, node.value);
   },
   MarkoText(node, parent) {
-    const parentBody = getBody(parent);
-    const prev = parentBody[parentBody.indexOf(node) - 1];
-    const concatToPrev = prev && t.isMarkoPlaceholder(prev);
-    let { value } = node;
-
-    if (concatToPrev) {
-      this.removeTrailingNewline();
-    }
+    const { value } = node;
 
     const isMultiLine = /[\r\n]/g.test(value);
-    const isRootLevel = !concatToPrev && t.isProgram(parent);
+    const isRootLevel = parent.type === "Program";
 
     if (isRootLevel) {
       if (isMultiLine) {
@@ -136,10 +114,10 @@ Object.assign(_printer.default.prototype, {
     }
   },
   MarkoTagBody(node) {
-    this.printSequence(node.body, true);
+    this.printSequence(node.body);
   },
   MarkoTag(node) {
-    const isDynamicTag = !t.isStringLiteral(node.name);
+    const isDynamicTag = node.name.type !== "StringLiteral";
     const tagName = !isDynamicTag && node.name.value;
     const rawValue = node.rawValue;
     let bodyOverride;
@@ -159,7 +137,7 @@ Object.assign(_printer.default.prototype, {
     } else {
       if (isDynamicTag) {
         this.token("${");
-        this.print(node.name);
+        this.print(node.name, true, true);
         this.token("}");
       } else {
         this.token(tagName);
@@ -173,10 +151,10 @@ Object.assign(_printer.default.prototype, {
 
       if (node.var) {
         this.token("/");
-        this.print(node.var);
+        this.print(node.var, true, true);
 
         if (node.var.typeAnnotation) {
-          this.print(node.var.typeAnnotation);
+          this.print(node.var.typeAnnotation, true, true);
         }
       }
 
@@ -239,8 +217,11 @@ Object.assign(_printer.default.prototype, {
       this.token("/>");
     } else {
       this.token(">");
-      this.newline();
-      this.printSequence(bodyOverride || zipAttributeTagsAndBody(node), true);
+      this.printSequence(
+        bodyOverride || zipAttributeTagsAndBody(node),
+        true,
+        true
+      );
       this.token("</");
       if (!isDynamicTag) {
         this.token(tagName);
@@ -261,7 +242,7 @@ function printWithParansIfNeeded(value) {
     this.token("(");
   }
 
-  this.print(value);
+  this.print(value, true, true);
 
   if (needsParans) {
     this.token(")");

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

@@ -1,4 +1,6 @@
 "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+require("../generator/patch");
+
 var babelTypes = _interopRequireWildcard(require("@babel/types"));
 var definitionUtils = _interopRequireWildcard(require("@babel/types/lib/definitions/utils"));
 var generatedValidators = _interopRequireWildcard(require("@babel/types/lib/validators/generated"));

package/dist/babel-utils/tags.js

@@ -1,6 +1,5 @@
 "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.findAttributeTags = findAttributeTags;exports.findParentTag = findParentTag;exports.getArgOrSequence = getArgOrSequence;exports.getFullyResolvedTagName = getFullyResolvedTagName;exports.getMacroIdentifier = getMacroIdentifier;exports.getMacroIdentifierForName = getMacroIdentifierForName;exports.getTagDef = getTagDef;exports.getTagTemplate = getTagTemplate;exports.getTemplateId = getTemplateId;exports.hasMacro = hasMacro;exports.isAttributeTag = isAttributeTag;exports.isDynamicTag = isDynamicTag;exports.isLoopTag = isLoopTag;exports.isMacroTag = isMacroTag;exports.isNativeTag = isNativeTag;exports.isTransparentTag = isTransparentTag;exports.loadFileForImport = loadFileForImport;exports.loadFileForTag = loadFileForTag;exports.registerMacro = registerMacro;exports.resolveTagImport = resolveTagImport;var _compiler = require("@marko/compiler");
 var _modules = _interopRequireDefault(require("@marko/compiler/modules"));
-var _lassoPackageRoot = require("lasso-package-root");
 var _path = require("path");
 
 var _quickHash = require("../util/quick-hash");
@@ -296,10 +295,11 @@ function resolveMarkoFile(file, filename) {
 const idCache = new WeakMap();
 const templateIdHashOpts = { outputLength: 5 };
 function getTemplateId(opts, request, child) {
+  if (!child && opts.getTemplateId) return opts.getTemplateId(request);
+
   const id = (0, _path.relative)(root, request).replace(/[^a-zA-Z0-9_$./-]/g, "/");
-  const optimize = typeof opts === "object" ? opts.optimize : opts;
 
-  if (optimize) {
+  if (opts.optimize) {
     const optimizeKnownTemplates =
     typeof opts === "object" && opts.optimizeKnownTemplates;
     const knownTemplatesSize = optimizeKnownTemplates?.length || 0;

package/dist/taglib/index.js

@@ -1,5 +1,4 @@
 "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports._loader = exports._finder = void 0;exports.buildLookup = buildLookup;exports.clearCaches = clearCaches;exports.excludePackage = exports.excludeDir = void 0;exports.register = register;exports.resolveOptionalTaglibs = resolveOptionalTaglibs;var _modules = _interopRequireDefault(require("@marko/compiler/modules"));
-var _lassoPackageRoot = require("lasso-package-root");
 var _path = _interopRequireDefault(require("path"));
 
 var _tryLoadTranslator = _interopRequireDefault(require("../util/try-load-translator"));

package/dist/types.d.ts

@@ -447,8 +447,8 @@ export interface ClassDeclaration extends BaseNode {
 export interface ExportAllDeclaration extends BaseNode {
   type: "ExportAllDeclaration";
   source: StringLiteral;
-  assertions: Array<ImportAttribute> | null;
   attributes: Array<ImportAttribute> | null;
+  assertions: Array<ImportAttribute> | null;
   exportKind: "type" | "value" | null;
 }
 
@@ -463,8 +463,8 @@ export interface ExportNamedDeclaration extends BaseNode {
   declaration: Declaration | null;
   specifiers: Array<ExportSpecifier | ExportDefaultSpecifier | ExportNamespaceSpecifier>;
   source: StringLiteral | null;
-  assertions: Array<ImportAttribute> | null;
   attributes: Array<ImportAttribute> | null;
+  assertions: Array<ImportAttribute> | null;
   exportKind: "type" | "value" | null;
 }
 
@@ -487,8 +487,8 @@ export interface ImportDeclaration extends BaseNode {
   type: "ImportDeclaration";
   specifiers: Array<ImportSpecifier | ImportDefaultSpecifier | ImportNamespaceSpecifier>;
   source: StringLiteral;
-  assertions: Array<ImportAttribute> | null;
   attributes: Array<ImportAttribute> | null;
+  assertions: Array<ImportAttribute> | null;
   importKind: "type" | "typeof" | "value" | null;
   module: boolean | null;
   phase: "source" | "defer" | null;
@@ -1962,12 +1962,12 @@ export function arrowFunctionExpression(params: Array<FunctionParameter>, body:
 export function classBody(body: Array<ClassMethod | ClassPrivateMethod | ClassProperty | ClassPrivateProperty | ClassAccessorProperty | TSDeclareMethod | TSIndexSignature | StaticBlock>): ClassBody;
 export function classExpression(id: Identifier | null | undefined, superClass: Expression | null | undefined, body: ClassBody, decorators?: Array<Decorator> | null): ClassExpression;
 export function classDeclaration(id: Identifier | null | undefined, superClass: Expression | null | undefined, body: ClassBody, decorators?: Array<Decorator> | null): ClassDeclaration;
-export function exportAllDeclaration(source: StringLiteral): ExportAllDeclaration;
+export function exportAllDeclaration(source: StringLiteral, attributes?: Array<ImportAttribute> | null): ExportAllDeclaration;
 export function exportDefaultDeclaration(declaration: TSDeclareFunction | FunctionDeclaration | ClassDeclaration | Expression): ExportDefaultDeclaration;
-export function exportNamedDeclaration(declaration?: Declaration | null, specifiers?: Array<ExportSpecifier | ExportDefaultSpecifier | ExportNamespaceSpecifier>, source?: StringLiteral | null): ExportNamedDeclaration;
+export function exportNamedDeclaration(declaration?: Declaration | null, specifiers?: Array<ExportSpecifier | ExportDefaultSpecifier | ExportNamespaceSpecifier>, source?: StringLiteral | null, attributes?: Array<ImportAttribute> | null): ExportNamedDeclaration;
 export function exportSpecifier(local: Identifier, exported: Identifier | StringLiteral): ExportSpecifier;
 export function forOfStatement(left: VariableDeclaration | LVal, right: Expression, body: Statement, _await?: boolean): ForOfStatement;
-export function importDeclaration(specifiers: Array<ImportSpecifier | ImportDefaultSpecifier | ImportNamespaceSpecifier>, source: StringLiteral): ImportDeclaration;
+export function importDeclaration(specifiers: Array<ImportSpecifier | ImportDefaultSpecifier | ImportNamespaceSpecifier>, source: StringLiteral, attributes?: Array<ImportAttribute> | null): ImportDeclaration;
 export function importDefaultSpecifier(local: Identifier): ImportDefaultSpecifier;
 export function importNamespaceSpecifier(local: Identifier): ImportNamespaceSpecifier;
 export function importSpecifier(local: Identifier, imported: Identifier | StringLiteral): ImportSpecifier;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/compiler",
-  "version": "5.39.48",
+  "version": "5.39.50",
   "description": "Marko template to JS compiler.",
   "keywords": [
     "babel",
@@ -62,20 +62,20 @@
     "prepare": "node -r ~ts scripts/types"
   },
   "dependencies": {
-    "@babel/code-frame": "^7.27.1",
-    "@babel/core": "^7.28.0",
-    "@babel/generator": "^7.28.0",
-    "@babel/parser": "^7.28.0",
-    "@babel/plugin-syntax-typescript": "^7.27.1",
-    "@babel/plugin-transform-modules-commonjs": "^7.27.1",
-    "@babel/plugin-transform-typescript": "^7.28.0",
-    "@babel/runtime": "^7.28.2",
-    "@babel/traverse": "^7.28.0",
-    "@babel/types": "^7.28.2",
+    "@babel/code-frame": "^7.29.0",
+    "@babel/core": "^7.29.0",
+    "@babel/generator": "^7.29.1",
+    "@babel/parser": "^7.29.0",
+    "@babel/plugin-syntax-typescript": "^7.28.6",
+    "@babel/plugin-transform-modules-commonjs": "^7.28.6",
+    "@babel/plugin-transform-typescript": "^7.28.6",
+    "@babel/runtime": "^7.28.6",
+    "@babel/traverse": "^7.29.0",
+    "@babel/types": "^7.29.0",
     "@luxass/strip-json-comments": "^1.4.0",
     "complain": "^1.6.1",
     "he": "^1.2.0",
-    "htmljs-parser": "^5.7.3",
+    "htmljs-parser": "^5.7.4",
     "jsesc": "^3.1.0",
     "kleur": "^4.1.5",
     "lasso-package-root": "^1.0.1",
@@ -87,7 +87,7 @@
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
-    "marko": "^5.38.11"
+    "marko": "^5.38.20"
   },
   "engines": {
     "node": "18 || 20 || >=22"