fix: ignore expressions inside node attributes

Author: cossssmin

lib/index.js

@@ -174,16 +174,16 @@ function walk (opts, nodes) {
       return m
     }
 
+    const ignoredBefore = delimitersSettings[1].text[0]
+    const ignoredAfter = delimitersSettings[1].text[1]
+    const toReplace = new RegExp(`@${ignoredBefore}`, 'g')
+    let ignoredExpression = new RegExp(`@${ignoredBefore}(.+?)${ignoredAfter}`, 'g')
+
     // if we have a string, match and replace it
     if (typeof node === 'string') {
       // if node contains ignored expression delimiter, output as-is
-      const before = delimitersSettings[1].text[0]
-      const after = delimitersSettings[1].text[1]
-      const ignoredDelimiter = new RegExp(`@${before}(.+?)${after}`, 'g')
-
-      if (ignoredDelimiter.test(node)) {
-        const toReplace = new RegExp(`@${before}`, 'g')
-        node = node.replace(toReplace, before)
+      if (ignoredExpression.test(node)) {
+        node = node.replace(toReplace, ignoredBefore)
 
         m.push(node)
 
@@ -199,8 +199,14 @@ function walk (opts, nodes) {
 
     // if not, we have an object, so we need to run the attributes and contents
     if (node.attrs) {
+      // adapt regex to work with attribute values
+      ignoredExpression = new RegExp(`.*@${ignoredBefore}(.+?)${ignoredAfter}`)
       for (const key in node.attrs) {
-        node.attrs[key] = placeholders(node.attrs[key], ctx, delimitersSettings)
+        if (ignoredExpression.test(node.attrs[key])) {
+          node.attrs[key] = node.attrs[key].replace(toReplace, ignoredBefore)
+        } else {
+          node.attrs[key] = placeholders(node.attrs[key], ctx, delimitersSettings)
+        }
       }
     }
 

test/expect/expression_ignored.html

@@ -1,4 +1,4 @@
 {{ foo }}
-<p data-user-id="{{ user.id }}">
+<p data-username="{{ user.name }}" data-user-id="user-{{ user.id }}">
   Here's one {{ variable }} and here's {{ another }}.
 </p>

test/fixtures/expression_ignored.html

@@ -1,4 +1,4 @@
 @{{ foo }}
-<p data-user-id="@{{ user.id }}">
+<p data-username="@{{ user.name }}" data-user-id="user-@{{ user.id }}">
   Here's one @{{ variable }} and here's @{{ another }}.
 </p>