Merge pull request #12 from sawa-zen/update-eslint-parser

Update vue-eslint-parser
maranran · May 17, 2019 · 0c182d9 · 0c182d9
2 parents 79aef6c + c3a2bfa
commit 0c182d9
Show file tree

Hide file tree

Showing 14 changed files with 434 additions and 182 deletions.
diff --git a/lib/rules/alt-text.js b/lib/rules/alt-text.js
@@ -142,4 +142,4 @@ module.exports = {
       }
     }, altRule.create(context))
   }
-}
+}
diff --git a/lib/rules/anchor-has-content.js b/lib/rules/anchor-has-content.js
@@ -37,4 +37,4 @@ module.exports = {
       }
     }, anchorRule.create(context))
   }
-}
+}
diff --git a/lib/rules/click-events-have-key-events.js b/lib/rules/click-events-have-key-events.js
@@ -18,7 +18,7 @@ module.exports = {
   },
   create (context) {
     return VueUtils.defineTemplateBodyVisitor(context, {
-      "VAttribute[directive=true][key.name='on'][key.argument='click']" (node) {
+      "VAttribute[directive=true][key.name.name='on'][key.argument.name='click']" (node) {
         const requiredEvents = ['keydown', 'keyup', 'keypress'];
         const element = node.parent.parent;
         if (VueUtils.isCustomComponent(element)) {
@@ -42,4 +42,4 @@ module.exports = {
       }
     }, JsxRule.create(context))
   }
-}
+}
diff --git a/lib/rules/no-access-key.js b/lib/rules/no-access-key.js
@@ -27,7 +27,7 @@ module.exports = {
     return VueUtils.defineTemplateBodyVisitor(context, {
       "VAttribute" (node) {
         const isAccesskey = (!node.directive && node.key.name ==='accesskey')
-          || (node.key.name === 'bind' && node.key.argument === 'accesskey')
+          || (node.key.name.name === 'bind' && node.key.argument.name === 'accesskey')
         if (!isAccesskey) {
           return;
         }

diff --git a/lib/rules/no-autofocus.js b/lib/rules/no-autofocus.js
@@ -25,7 +25,7 @@ module.exports = {
     return VueUtils.defineTemplateBodyVisitor(context, {
       "VAttribute" (node) {
         const isAutofocus = (!node.directive && node.key.name ==='autofocus')
-          || (node.key.name === 'bind' && node.key.argument === 'autofocus')
+          || (node.key.name.name === 'bind' && node.key.argument.name === 'autofocus')
         if (!isAutofocus) {
           return;
         }
@@ -46,4 +46,4 @@ module.exports = {
       }
     }, JsxRule.create(context))
   }
-}
+}
diff --git a/lib/rules/no-onchange.js b/lib/rules/no-onchange.js
@@ -23,7 +23,7 @@ module.exports = {
   },
   create (context) {
     return VueUtils.defineTemplateBodyVisitor(context, {
-      "VAttribute[directive=true][key.name='on'][key.argument='change']" (node) {
+      "VAttribute[directive=true][key.name.name='on'][key.argument.name='change']" (node) {
         const element = node.parent.parent;
         const nodeType = utils.getElementType(element);
 
@@ -41,4 +41,4 @@ module.exports = {
       }
     }, JsxRule.create(context))
   }
-}
+}
diff --git a/lib/rules/tabindex-no-positive.js b/lib/rules/tabindex-no-positive.js
@@ -23,13 +23,18 @@ module.exports = {
   create (context) {
     return VueUtils.defineTemplateBodyVisitor(context, {
       "VAttribute" (node) {
-        const tabindex = (!node.directive && node.key.name ==='tabindex')
-          || (node.key.name === 'bind' && node.key.argument === 'tabindex')
+        let tabindex;
+        if (node.directive) {
+          tabindex = node.key.argument.name === 'tabindex';
+        } else {
+          tabindex = node.key.name === 'tabindex';
+        }
+
         if (!tabindex) {
           return;
         }
+
         const value = utils.getAttributeValue(node);
-        // 获得value
         if (value.type || +value <= 0) {
           return;
         }

diff --git a/lib/utils/index.js b/lib/utils/index.js
@@ -55,7 +55,17 @@ module.exports = {
     return (ariaLabelProp && this.hasAttributeValue(ariaLabelProp)) || (arialLabelledByProp && this.hasAttributeValue(arialLabelledByProp));
   },
   getAttribute (node, attr) {
-    return utils.getAttribute(node, attr) || utils.getDirective(node, 'bind', attr);
+    return utils.getAttribute(node, attr) || this.getDirective(node, 'bind', attr);
+  },
+  getDirective (node, name, argument) {
+    assert(node && node.type === 'VElement')
+    return node.startTag.attributes.find(a => {
+      return (
+        a.directive &&
+        a.key.name.name === name &&
+        (argument === undefined || a.key.argument.name === argument)
+      );
+    })
   },
   getElementType (node) { // return tagName
     assert(node && node.type === 'VElement');
@@ -83,13 +93,13 @@ module.exports = {
   hasAnyDirective (node, keyArray) {
     assert(node && node.type === 'VElement');
     return keyArray.some((key) => {
-      return utils.getDirective(node, key);
+      return this.getDirective(node, key);
     });
   },
   hasAnyEvent (node, events) {
     assert(node && node.type === 'VElement');
     return events.some((event) => {
-      return utils.getDirective(node, 'on', event);
+      return this.getDirective(node, 'on', event);
     });
   },
   hasAttributeValue (node) {
@@ -228,4 +238,4 @@ module.exports = {
     })
     return implicitRole
   }
-}
+}