@marko/compiler 5.37.20 → 5.37.22

package/dist/babel-plugin/parser.js

@@ -49,7 +49,28 @@ function parseMarko(file) {
     return node;
   };
   const enterTag = (node) => {
-    currentTag = currentBody.pushContainer("body", node)[0];
+    if (isAttrTag(node)) {
+      if (currentTag === file.path) {
+        throw file.buildCodeFrameError(
+          node.name,
+          "@tags must be nested within another element."
+        );
+      }
+
+      let previousSiblingIndex = currentBody.length;
+      while (previousSiblingIndex) {
+        let previousSibling = currentBody[--previousSiblingIndex];
+        if (!t.isMarkoComment(previousSibling)) {
+          break;
+        }
+        currentTag.pushContainer("attributeTags", previousSibling.node);
+        currentBody.get("body").get(previousSiblingIndex).remove();
+      }
+
+      currentTag = currentTag.pushContainer("attributeTags", node)[0];
+    } else {
+      currentTag = currentBody.pushContainer("body", node)[0];
+    }
     currentBody = currentTag.get("body");
     onNext(node);
   };
@@ -496,7 +517,8 @@ function parseMarko(file) {
     },
     onCloseTagEnd(part) {
       const { node } = currentTag;
-      const parserPlugin = node.tagDef?.parser;
+      const tagDef = node.tagDef;
+      const parserPlugin = tagDef?.parser;
       if (preservingWhitespaceUntil === node) {
         preservingWhitespaceUntil = undefined;
       }
@@ -510,9 +532,54 @@ function parseMarko(file) {
         (hook.default || hook)(currentTag, t);
       }
 
-      currentTag = currentTag.parentPath.parentPath;
+      const parentTag = isAttrTag(node) ?
+      currentTag.parentPath :
+      currentTag.parentPath.parentPath;
+      const { attributeTags } = node;
+
+      if (attributeTags.length) {
+        const isControlFlow = tagDef?.parseOptions?.controlFlow;
+
+        if (node.body.body.length) {
+          const body = [];
+          for (const child of node.body.body) {
+            if (
+            t.isMarkoScriptlet(child) ||
+            isControlFlow && (
+            t.isMarkoComment(child) ||
+            child.tagDef?.controlFlow && !child.body.body.length))
+            {
+              // 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 {
+              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."
+            );
+          } else {
+            node.body.body = body;
+          }
 
-      if (currentTag) {
+          attributeTags.sort(sortByStart);
+        }
+
+        if (isControlFlow) {
+          currentTag.remove();
+          parentTag.pushContainer("attributeTags", node);
+        }
+      }
+
+      if (parentTag) {
+        currentTag = parentTag;
         currentBody = currentTag.get("body");
       } else {
         currentTag = currentBody = file.path;
@@ -533,4 +600,8 @@ function parseMarko(file) {
     start: { line: 1, column: 0 },
     end: positionAt(ast.end)
   };
+}
+
+function sortByStart(a, b) {
+  return a.start - b.start;
 }

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

@@ -30,7 +30,7 @@ Object.assign(_printer.default.prototype, {
   },
   MarkoPlaceholder(node, parent) {
     if (parent) {
-      const parentBody = parent.body;
+      const parentBody = getBody(parent);
       const prev = parentBody[parentBody.indexOf(node) - 1];
 
       if (prev && (t.isMarkoText(prev) || t.isMarkoPlaceholder(prev))) {
@@ -45,7 +45,7 @@ Object.assign(_printer.default.prototype, {
   MarkoScriptlet(node, parent) {
     this.removeTrailingNewline();
 
-    if (!(t.isProgram(parent) && parent.body.indexOf(node) === 0)) {
+    if (!(t.isProgram(parent) && getBody(parent)[0] === node)) {
       this.token("\n");
     }
 
@@ -109,7 +109,7 @@ Object.assign(_printer.default.prototype, {
     printWithParansIfNeeded.call(this, node.value);
   },
   MarkoText(node, parent) {
-    const parentBody = parent.body;
+    const parentBody = getBody(parent);
     const prev = parentBody[parentBody.indexOf(node) - 1];
     const concatToPrev = prev && t.isMarkoPlaceholder(prev);
     let { value } = node;
@@ -213,14 +213,14 @@ Object.assign(_printer.default.prototype, {
     if (_selfClosingTags.default.voidElements.includes(tagName)) {
       this.token(">");
     } else if (
-    !node.body.body.length ||
+    !(node.body.body.length || node.attributeTags.length) ||
     _selfClosingTags.default.svgElements.includes(tagName))
     {
       this.token("/>");
     } else {
       this.token(">");
       this.newline();
-      this.print(node.body);
+      this.printSequence(zipAttributeTagsAndBody(node), { indent: true });
       this.token("</");
       if (!isDynamicTag) {
         this.token(tagName);
@@ -269,4 +269,66 @@ function statementCouldHaveUnenclosedNewline(node) {
     default:
       return false;
   }
+}
+
+function zipAttributeTagsAndBody(tag) {
+  const {
+    attributeTags,
+    body: { body }
+  } = tag;
+  const bodyLen = body.length;
+  const attributeTagsLen = attributeTags.length;
+  if (!attributeTagsLen) return body;
+  if (!bodyLen) return attributeTags;
+
+  const result = [];
+  let i = 0;
+  let j = 0;
+
+  while (i < bodyLen && j < attributeTagsLen) {
+    const bodyNode = body[i];
+    const attributeTag = attributeTags[j];
+
+    if (bodyNode.loc != null && attributeTag.loc != null) {
+      if (compareStartLoc(bodyNode, attributeTag) < 0) {
+        result.push(bodyNode);
+        i++;
+      } else {
+        result.push(attributeTag);
+        j++;
+      }
+    } else if (j < attributeTagsLen) {
+      result.push(attributeTag);
+      j++;
+    } else {
+      result.push(bodyNode);
+      i++;
+    }
+  }
+
+  while (j < attributeTagsLen) {
+    result.push(attributeTags[j++]);
+  }
+
+  while (i < bodyLen) {
+    result.push(body[i++]);
+  }
+
+  return result;
+}
+
+function getBody(parent) {
+  switch (parent.type) {
+    case "MarkoTag":
+      return parent.body.body;
+    default:
+      return parent.body;
+  }
+}
+
+function compareStartLoc(a, b) {
+  return (
+    a.loc.start.line - b.loc.start.line ||
+    a.loc.start.column - b.loc.start.column);
+
 }

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

@@ -180,14 +180,22 @@ const MarkoDefinitions = {
 
   MarkoTag: {
     aliases: ["Marko", "Statement"],
-    builder: ["name", "attributes", "body", "arguments", "var"],
-    visitor: [
+    builder: [
     "name",
-    "typeArguments",
     "attributes",
     "body",
     "arguments",
-    "var"],
+    "var",
+    "attributeTags"],
+
+    visitor: [
+    "name",
+    "typeArguments",
+    "arguments",
+    "attributes",
+    "attributeTags",
+    "var",
+    "body"],
 
     fields: {
       name: {
@@ -218,6 +226,10 @@ const MarkoDefinitions = {
       var: {
         validate: (0, _utils.assertNodeType)("LVal"),
         optional: true
+      },
+      attributeTags: {
+        validate: arrayOfType(["MarkoTag", "MarkoScriptlet", "MarkoComment"]),
+        default: []
       }
     }
   }

package/dist/taglib/index.js

@@ -37,26 +37,16 @@ function buildLookup(dirname, requestedTranslator, onError) {
     loadedTranslatorsTaglibs.set(
       translator,
       taglibsForDir = registeredTaglibs.concat(
-        resolveOptionalTaglibs(translator.optionalTaglibs || []).
+        resolveOptionalTaglibs(translator.optionalTaglibs || [], onError).
         concat(translator.taglibs).
         map(([id, props]) => loadTaglib(id, props))
       )
     );
   }
 
-  if (onError) {
-    const prevOnError = _config.default.onError;
-    _config.default.onError = onError;
-    try {
-      taglibsForDir = _finder2.default.find(dirname, taglibsForDir);
-    } catch (err) {
-      _config.default.onError(err);
-    } finally {
-      _config.default.onError = prevOnError;
-    }
-  } else {
+  runAndCatchErrors(() => {
     taglibsForDir = _finder2.default.find(dirname, taglibsForDir);
-  }
+  }, onError);
 
   const cacheKey = taglibsForDir.
   map((it) => it.id).
@@ -95,11 +85,13 @@ function clearCaches() {
   lookupCache = Object.create(null);
 }
 
-function resolveOptionalTaglibs(taglibIds) {
+function resolveOptionalTaglibs(taglibIds, onError) {
   const resolvedTaglibs = [];
   for (const id of taglibIds) {
     if (hasRootDependency(id)) {
-      resolvedTaglibs.push(resolveTaglib(id));
+      runAndCatchErrors(() => {
+        resolvedTaglibs.push(resolveTaglib(id));
+      }, onError);
     }
   }
 
@@ -110,6 +102,22 @@ function resolveOptionalTaglibs(taglibIds) {
 const _loader = exports._loader = _loader2.default;
 const _finder = exports._finder = _finder2.default;
 
+function runAndCatchErrors(fn, onError) {
+  if (onError) {
+    const prevOnError = _config.default.onError;
+    _config.default.onError = onError;
+    try {
+      fn();
+    } catch (err) {
+      _config.default.onError(err);
+    } finally {
+      _config.default.onError = prevOnError;
+    }
+  } else {
+    fn();
+  }
+}
+
 function loadTaglib(id, props) {
   return _loader2.default.loadTaglibFromProps(_loader2.default.createTaglib(id), props);
 }

package/dist/types.d.ts

@@ -1751,6 +1751,7 @@ export interface MarkoTag extends BaseNode {
   body: MarkoTagBody;
   arguments: Array<Expression | SpreadElement> | null;
   var: LVal | null;
+  attributeTags: Array<MarkoTag | MarkoScriptlet | MarkoComment>;
   rawValue: string | null;
   typeArguments: TSTypeParameterInstantiation | null;
 }
@@ -2147,7 +2148,7 @@ export function markoClass(body: ClassBody): MarkoClass;
 export function markoAttribute(name: string, value: Expression, modifier?: string | null, _arguments?: Array<Expression | SpreadElement> | null, _default?: boolean | null, bound?: boolean | null): MarkoAttribute;
 export function markoSpreadAttribute(value: Expression): MarkoSpreadAttribute;
 export function markoTagBody(body?: Array<MarkoTag | MarkoCDATA | MarkoText | MarkoPlaceholder | MarkoScriptlet | MarkoComment>, params?: Array<Identifier | Pattern | RestElement>): MarkoTagBody;
-export function markoTag(name: Expression, attributes: Array<MarkoAttribute | MarkoSpreadAttribute> | undefined, body: MarkoTagBody, _arguments?: Array<Expression | SpreadElement> | null, _var?: LVal | null): MarkoTag;
+export function markoTag(name: Expression, attributes: Array<MarkoAttribute | MarkoSpreadAttribute> | undefined, body: MarkoTagBody, _arguments?: Array<Expression | SpreadElement> | null, _var?: LVal | null, attributeTags?: Array<MarkoTag | MarkoScriptlet | MarkoComment>): MarkoTag;
 export function isAccessor(node: object | null | undefined, opts?: object | null): node is Accessor;
 export function assertAccessor(node: object | null | undefined, opts?: object | null): void;
 export function isAnyTypeAnnotation(node: object | null | undefined, opts?: object | null): node is AnyTypeAnnotation;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/compiler",
-  "version": "5.37.20",
+  "version": "5.37.22",
   "description": "Marko template to JS compiler.",
   "keywords": [
     "babel",
@@ -58,7 +58,7 @@
     "@babel/code-frame": "^7.26.0",
     "@babel/core": "^7.26.0",
     "@babel/generator": "^7.26.0",
-    "@babel/parser": "^7.26.0",
+    "@babel/parser": "^7.26.1",
     "@babel/plugin-syntax-typescript": "^7.25.9",
     "@babel/plugin-transform-modules-commonjs": "^7.25.9",
     "@babel/plugin-transform-typescript": "^7.25.9",
@@ -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.8",
+    "@marko/babel-utils": "^6.5.9",
     "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.21"
+    "@marko/translator-default": "^6.0.22"
   },
   "publishConfig": {
     "access": "public"