fix: check directive value; refactor directive visitor; test (#60)

* fix: check directive value; refactor directive visitor; test

* fix: check element and conditional expression text against ignorePattern and ignoreText; test

Author: piktur

lib/rules/no-raw-text.js

@@ -25,13 +25,41 @@ function calculateLoc (node, base = null) {
     }
 }
 
+function testValue (value) {
+  return typeof value !== 'string' ||
+    hasOnlyWhitespace(value) ||
+    config.ignorePattern.test(value.trim()) ||
+    config.ignoreText.includes(value.trim())
+}
+
+// parent is directive (e.g <p v-xxx="..."></p>)
+function checkVAttributeDirective (context, node, baseNode = null) {
+  const attrNode = node.parent
+  if (attrNode.key && attrNode.key.type === 'VDirectiveKey') {
+    if ((attrNode.key.name === 'text' || attrNode.key.name.name === 'text') && node.expression.type === 'Literal') {
+      const literalNode = node.expression
+      const value = literalNode.value
+
+      if (testValue(value)) { return }
+
+      const loc = calculateLoc(literalNode, baseNode)
+      context.report({
+        loc,
+        message: `raw text '${literalNode.value}' is used`
+      })
+    }
+  }
+}
+
 function checkVExpressionContainerText (context, node, baseNode = null) {
   if (!node.expression) { return }
 
   if (node.parent && node.parent.type === 'VElement') {
     // parent is element (e.g. <p>{{ ... }}</p>)
     if (node.expression.type === 'Literal') {
       const literalNode = node.expression
+      if (testValue(literalNode.value)) { return }
+
       const loc = calculateLoc(literalNode, baseNode)
       context.report({
         loc,
@@ -41,6 +69,8 @@ function checkVExpressionContainerText (context, node, baseNode = null) {
       const targets = [node.expression.consequent, node.expression.alternate]
       targets.forEach(target => {
         if (target.type === 'Literal') {
+          if (testValue(target.value)) { return }
+
           const loc = calculateLoc(target, baseNode)
           context.report({
             loc,
@@ -50,27 +80,12 @@ function checkVExpressionContainerText (context, node, baseNode = null) {
       })
     }
   } else if (node.parent && node.parent.type === 'VAttribute' && node.parent.directive) {
-    // parent is directive (e.g <p v-xxx="..."></p>)
-    const attrNode = node.parent
-    if (attrNode.key && attrNode.key.type === 'VDirectiveKey') {
-      if ((attrNode.key.name === 'text' || attrNode.key.name.name === 'text') && node.expression.type === 'Literal') {
-        const literalNode = node.expression
-        const loc = calculateLoc(literalNode, baseNode)
-        context.report({
-          loc,
-          message: `raw text '${literalNode.value}' is used`
-        })
-      }
-    }
+    checkVAttributeDirective(context, node)
   }
 }
 
 function checkRawText (context, value, loc) {
-  if (typeof value !== 'string' || hasOnlyWhitespace(value)) { return }
-
-  if (config.ignorePattern.test(value.trim())) { return }
-
-  if (config.ignoreText.includes(value.trim())) { return }
+  if (testValue(value)) { return }
 
   context.report({
     loc,

tests/lib/rules/no-raw-text.js

@@ -233,11 +233,36 @@ tester.run('no-raw-text', rule, {
       <template>
         <p>{{ $t('foo') }}: {{ $t('bar') }}</p>
         <p>hello</p>
+        <p> - </p>
+        <p>@</p>
+        <p>{{ true ? $t('ok') : ' - ' }}</p>
+        <p>{{ true ? $t('ok') : '@' }}</p>
       </template>
     `,
     options: [{ ignorePattern: '^[-.#:()&]+$' }],
     errors: [{
       message: `raw text 'hello' is used`, line: 4
+    }, {
+      message: `raw text '@' is used`, line: 6, column: 12
+    }, {
+      message: `raw text '@' is used`, line: 8, column: 33
+    }]
+  }, {
+    code: `
+      <template>
+        <v-icon v-text="'mdi-check'" />
+        <v-icon v-text="'not'" />
+        <v-icon v-text="'ok'" />
+        <v-icon v-html="'mdi-check'" />
+        <v-icon v-html="'ok'" />
+      </template>
+    `,
+    options: [{
+      ignorePattern: '^mdi[-]|[-#:()/&]+$',
+      ignoreText: ['ok']
+    }],
+    errors: [{
+      message: `raw text 'not' is used`, line: 4, column: 25
     }]
   }, {
     code: `