refactor: inline expression ignoring

use negative lookbehind so we only evaluate non-ignored expressions

Author: cossssmin

lib/index.js

@@ -10,7 +10,7 @@ const revertBackupedLocals = require('./backup').revert
 const placeholders = require('./placeholders')
 
 const delimitersSettings = []
-let conditionals, switches, loops, scopes, ignored, ignoredBefore, ignoredAfter, toReplace, ignoredNodeExpression, ignoredAttrsExpression
+let conditionals, switches, loops, scopes, ignored, delimitersReplace, unescapeDelimitersReplace
 
 /**
  * @description Creates a set of local variables within the loop, and evaluates all nodes within the loop, returning their contents
@@ -124,12 +124,12 @@ module.exports = function postHTMLExpressions (options) {
   let before = escapeRegexpString(options.delimiters[0])
   let after = escapeRegexpString(options.delimiters[1])
 
-  const delimitersRegexp = new RegExp(`${before}(.+?)${after}`, 'g')
+  const delimitersRegexp = new RegExp(`(?<!@)${before}(.+?)${after}`, 'g')
 
   before = escapeRegexpString(options.unescapeDelimiters[0])
   after = escapeRegexpString(options.unescapeDelimiters[1])
 
-  const unescapeDelimitersRegexp = new RegExp(`${before}(.+?)${after}`, 'g')
+  const unescapeDelimitersRegexp = new RegExp(`(?<!@)${before}(.+?)${after}`, 'g')
 
   // make array of delimiters
   const delimiters = [
@@ -147,13 +147,9 @@ module.exports = function postHTMLExpressions (options) {
     delimitersSettings[0] = delimiters[1]
     delimitersSettings[1] = delimiters[0]
   }
-  
-  
-  ignoredBefore = delimitersSettings[1].text[0]
-  ignoredAfter = delimitersSettings[1].text[1]
-  toReplace = new RegExp(`@${ignoredBefore}`, 'g')
-  ignoredNodeExpression = new RegExp(`@${ignoredBefore}(.+?)${ignoredAfter}`, 'g')
-  ignoredAttrsExpression = new RegExp(`.*@${ignoredBefore}(.+?)${ignoredAfter}`)
+
+  delimitersReplace = new RegExp(`@${delimitersSettings[1].text[0]}`, 'g')
+  unescapeDelimitersReplace = new RegExp(`@${delimitersSettings[0].text[0]}`, 'g')
 
   // kick off the parsing
   return walk.bind(null, { locals: options.locals })
@@ -183,16 +179,10 @@ function walk (opts, nodes) {
 
     // if we have a string, match and replace it
     if (typeof node === 'string') {
-      // if node contains ignored expression delimiter, output as-is
-      if (ignoredNodeExpression.test(node)) {
-        node = node.replace(toReplace, ignoredBefore)
-
-        m.push(node)
-
-        return m
-      }
-
       node = placeholders(node, ctx, delimitersSettings)
+      node = node
+        .replace(unescapeDelimitersReplace, delimitersSettings[0].text[0])
+        .replace(delimitersReplace, delimitersSettings[1].text[0])
 
       m.push(node)
 
@@ -202,11 +192,10 @@ function walk (opts, nodes) {
     // if not, we have an object, so we need to run the attributes and contents
     if (node.attrs) {
       for (const key in node.attrs) {
-        if (ignoredAttrsExpression.test(node.attrs[key])) {
-          node.attrs[key] = node.attrs[key].replace(toReplace, ignoredBefore)
-        } else {
-          node.attrs[key] = placeholders(node.attrs[key], ctx, delimitersSettings)
-        }
+        node.attrs[key] = placeholders(node.attrs[key], ctx, delimitersSettings)
+        node.attrs[key] = node.attrs[key]
+          .replace(unescapeDelimitersReplace, delimitersSettings[0].text[0])
+          .replace(delimitersReplace, delimitersSettings[1].text[0])
       }
     }
 

test/expect/expression_ignored.html

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

test/fixtures/expression_ignored.html

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