@marko/translator-default 6.0.23 → 6.0.24

package/dist/tag/attribute-tag.js

@@ -27,7 +27,10 @@ function analyzeAttributeTags(rootTag) {
 
   while (i < visit.length) {
     const tag = visit[i++];
-    for (const child of tag.get("attributeTags")) {
+    const attrTags = tag.node.body.attributeTags ?
+    tag.get("body").get("body") :
+    tag.get("attributeTags");
+    for (const child of attrTags) {
       if ((0, _babelUtils.isAttributeTag)(child)) {
         (0, _babelUtils.assertNoArgs)(child);
         const tagDef = (0, _babelUtils.getTagDef)(child) || {};
@@ -89,17 +92,7 @@ function analyzeAttributeTags(rootTag) {
         parentTags.push(child);
         visit.push(child);
       } else if ((0, _babelUtils.isTransparentTag)(child)) {
-        switch (getContentType(child)) {
-          case ContentType.mixed:
-            throw child.buildCodeFrameError(
-              "Cannot mix @tags with other content when under a control flow."
-            );
-          case ContentType.attribute:
-            visit.push(child);
-            break;
-          case ContentType.render:
-            break;
-        }
+        visit.push(child);
       }
     }
   }
@@ -147,45 +140,6 @@ function getAttrTagObject(tag) {
   return attrs;
 }
 
-function getContentType(tag) {
-  const { node } = tag;
-  const cached = contentTypeCache.get(node);
-  if (cached !== undefined) return cached;
-
-  const body = tag.get("body").get("body");
-  let hasAttributeTag = false;
-  let hasRenderBody = false;
-
-  for (const child of body) {
-    if ((0, _babelUtils.isAttributeTag)(child)) {
-      hasAttributeTag = true;
-    } else if ((0, _babelUtils.isTransparentTag)(child)) {
-      switch (getContentType(child)) {
-        case ContentType.mixed:
-          contentTypeCache.set(node, ContentType.mixed);
-          return ContentType.mixed;
-        case ContentType.attribute:
-          hasAttributeTag = true;
-          break;
-        case ContentType.render:
-          hasRenderBody = true;
-          break;
-      }
-    } else if (!child.isMarkoScriptlet() && !child.isMarkoComment()) {
-      hasRenderBody = true;
-    }
-
-    if (hasAttributeTag && hasRenderBody) {
-      contentTypeCache.set(node, ContentType.mixed);
-      return ContentType.mixed;
-    }
-  }
-
-  const result = hasAttributeTag ? ContentType.attribute : ContentType.render;
-  contentTypeCache.set(node, result);
-  return result;
-}
-
 function removeDashes(str) {
   return str.replace(/-([a-z])/g, matchToUpperCase);
 }

package/dist/tag/index.js

@@ -50,8 +50,8 @@ var _nativeTag = _interopRequireDefault(require("./native-tag"));function _getRe
     if (!(0, _babelUtils.isAttributeTag)(path)) {
       if (
       !tagDef &&
-      path.node.attributeTags.length &&
-      path.hub.file.markoOpts.ignoreUnrecognizedTags &&
+      path.hub.file.markoOpts.ignoreUnrecognizedTags && (
+      path.node.attributeTags.length || path.node.body.attributeTags) &&
       !(0, _babelUtils.isDynamicTag)(path))
       {
         moveIgnoredAttrTags(path);
@@ -261,9 +261,13 @@ function isMarkoFile(request) {
 }
 
 function moveIgnoredAttrTags(parentTag) {
-  if (!parentTag.node.attributeTags.length) return;
+  const attrTags = parentTag.node.body.attributeTags ?
+  parentTag.get("body").get("body") :
+  parentTag.get("attributeTags");
 
-  for (const attrTag of parentTag.get("attributeTags")) {
+  if (!attrTags.length) return;
+
+  for (const attrTag of attrTags) {
     if (attrTag.isMarkoTag()) {
       if ((0, _babelUtils.isAttributeTag)(attrTag)) {
         attrTag.set(

package/dist/taglib/core/conditional/translate-else.js

@@ -15,10 +15,6 @@ function exit(path) {
     );
   }
 
-  ifStatement.alternate = _compiler.types.blockStatement(
-    path.node.attributeTags.length ?
-    path.node.attributeTags :
-    path.node.body.body
-  );
+  ifStatement.alternate = _compiler.types.blockStatement(path.node.body.body);
   path.remove();
 }

package/dist/taglib/core/conditional/util.js

@@ -12,11 +12,7 @@ function buildIfStatement(path, args) {
 
   const ifStatement = _compiler.types.ifStatement(
     args.length === 1 ? args[0] : _compiler.types.sequenceExpression(args),
-    _compiler.types.blockStatement(
-      path.node.attributeTags.length ?
-      path.node.attributeTags :
-      path.node.body.body
-    )
+    _compiler.types.blockStatement(path.node.body.body)
   );
 
   let nextPath = path.getNextSibling();

package/dist/taglib/core/translate-for.js

@@ -7,7 +7,7 @@ function exit(path) {
     attributes,
     body: { params }
   } = node;
-  const body = node.attributeTags.length ? node.attributeTags : node.body.body;
+  const body = node.body.body;
   const namePath = path.get("name");
   const ofAttr = findName(attributes, "of");
   const inAttr = findName(attributes, "in");

package/dist/taglib/core/translate-while.js

@@ -24,11 +24,7 @@ function exit(path) {
     (0, _withPreviousLocation.default)(
       _compiler.types.whileStatement(
         (0, _babelUtils.getArgOrSequence)(path),
-        _compiler.types.blockStatement(
-          path.node.attributeTags.length ?
-          path.node.attributeTags :
-          path.node.body.body
-        )
+        _compiler.types.blockStatement(path.node.body.body)
       ),
       path.node
     )

package/dist/util/optimize-vdom-create.js

@@ -72,6 +72,7 @@ const analyzeStaticVisitor = {
       let isStatic =
       (0, _babelUtils.isNativeTag)(path) &&
       !path.node.attributeTags.length &&
+      !path.node.body.attributeTags &&
       !path.node.body.params.length &&
       !path.node.arguments &&
       !(0, _keyManager.hasUserKey)(path);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/translator-default",
-  "version": "6.0.23",
+  "version": "6.0.24",
   "description": "Translates Marko templates to the default Marko runtime.",
   "keywords": [
     "babel",
@@ -29,13 +29,13 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.26.0",
-    "@marko/babel-utils": "^6.5.10",
+    "@marko/babel-utils": "^6.5.12",
     "magic-string": "^0.30.12",
     "self-closing-tags": "^1.0.1"
   },
   "devDependencies": {
-    "@marko/compiler": "^5.37.23",
-    "marko": "^5.35.32"
+    "@marko/compiler": "^5.37.24",
+    "marko": "^5.35.33"
   },
   "peerDependencies": {
     "@marko/compiler": "^5.16.1",