🐛 bug(rule): fix detect literal

closes #24
intlify · Jul 22, 2019 · 6b6efae · 6b6efae
1 parent 82ddc5f
commit 6b6efae
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 16 deletions.
diff --git a/lib/rules/no-raw-text.js b/lib/rules/no-raw-text.js
@@ -27,26 +27,40 @@ function calculateLoc (node, base = null) {
 function checkVExpressionContainerText (context, node, baseNode = null) {
   if (!node.expression) { return }
 
-  if (node.expression.type === 'Literal') {
-    const literalNode = node.expression
-    const loc = calculateLoc(literalNode, baseNode)
-    context.report({
-      loc,
-      message: `raw text '${literalNode.value}' is used`
-    })
-  } else if (node.expression.type === 'ConditionalExpression') {
-    const targets = [node.expression.consequent, node.expression.alternate]
-    targets.forEach(target => {
-      if (target.type === 'Literal') {
-        const loc = calculateLoc(target, baseNode)
+  if (node.parent && node.parent.type === 'VElement') {
+    // parent is element (e.g. <p>{{ ... }}</p>)
+    if (node.expression.type === 'Literal') {
+      const literalNode = node.expression
+      const loc = calculateLoc(literalNode, baseNode)
+      context.report({
+        loc,
+        message: `raw text '${literalNode.value}' is used`
+      })
+    } else if (node.expression.type === 'ConditionalExpression') {
+      const targets = [node.expression.consequent, node.expression.alternate]
+      targets.forEach(target => {
+        if (target.type === 'Literal') {
+          const loc = calculateLoc(target, baseNode)
+          context.report({
+            loc,
+            message: `raw text '${target.value}' is used`
+          })
+        }
+      })
+    }
+  } 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 '${target.value}' is used`
+          message: `raw text '${literalNode.value}' is used`
         })
       }
-    })
-  } else if ((node.parent && node.parent.type === 'VAttribute' && node.parent.directive) &&
-    (node.parent.key && node.parent.key.type === 'VDirectiveKey')) {
+    }
   }
 }
 

diff --git a/tests/lib/rules/no-raw-text.js b/tests/lib/rules/no-raw-text.js
@@ -28,6 +28,7 @@ tester.run('no-raw-text', rule, {
   }, {
     code: `
     <template>
+      <comp :value="1" :msg="$t('foo.bar')"/>
       <p>{{ hello }}</p>
     </template>
     `