marko 4.24.4 → 4.24.5

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [4.24.5](https://github.com/marko-js/marko/compare/v4.24.4...v4.24.5) (2022-07-14)
+
+
+### Bug Fixes
+
+* ignoreUnrecognizedTags attr tags under control flow ([8e0aaf2](https://github.com/marko-js/marko/commit/8e0aaf227d4e192e3c02b494995f1f2682c4cbc3))
+
 ### [4.24.4](https://github.com/marko-js/marko/compare/v4.24.3...v4.24.4) (2022-03-22)
 
 

package/dist/compiler/Normalizer.js

@@ -104,8 +104,16 @@ class Normalizer {
     try {
       if (elNode.rawTagNameExpression) {
         tagName = builder.parseExpression(elNode.rawTagNameExpression);
-      } else if (context.ignoreUnrecognizedTags && !elNode.parentNode.tagDef && !elNode.parentNode.rawTagNameExpression) {
-        tagName = tagName.replace(/^@/, "at_"); // escapes @tags inside unrecognized tags
+      } else if (context.ignoreUnrecognizedTags && tagName[0] === "@") {
+        let owner = elNode.parentNode;
+
+        while (owner && /^(?:for|while|if|else(?:-if))$/.test(owner.tagName)) {
+          owner = owner.parentNode;
+        }
+
+        if (!owner || !(owner.rawTagNameExpression || owner.tagDef)) {
+          tagName = "at_" + tagName.slice(1); // escapes @tags inside unrecognized tags
+        }
       }
     } catch (e) {
       const type = elNode.rawTagNameExpression === "()" ? "Missing" : "Invalid";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "marko",
-    "version": "4.24.4",
+    "version": "4.24.5",
     "license": "MIT",
     "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
     "dependencies": {

package/src/compiler/Normalizer.js

@@ -122,12 +122,16 @@ class Normalizer {
     try {
       if (elNode.rawTagNameExpression) {
         tagName = builder.parseExpression(elNode.rawTagNameExpression);
-      } else if (
-        context.ignoreUnrecognizedTags &&
-        !elNode.parentNode.tagDef &&
-        !elNode.parentNode.rawTagNameExpression
-      ) {
-        tagName = tagName.replace(/^@/, "at_"); // escapes @tags inside unrecognized tags
+      } else if (context.ignoreUnrecognizedTags && tagName[0] === "@") {
+        let owner = elNode.parentNode;
+
+        while (owner && /^(?:for|while|if|else(?:-if))$/.test(owner.tagName)) {
+          owner = owner.parentNode;
+        }
+
+        if (!owner || !(owner.rawTagNameExpression || owner.tagDef)) {
+          tagName = "at_" + tagName.slice(1); // escapes @tags inside unrecognized tags
+        }
       }
     } catch (e) {
       const type = elNode.rawTagNameExpression === "()" ? "Missing" : "Invalid";