Apply sugestion from code review.

Author: armano2

docs/rules/no-dupe-keys.md

@@ -1,4 +1,4 @@
-# Prevent duplicate field names (no-dupe-keys)
+# Prevents duplication of field names (no-dupe-keys)
 
 This rule prevents to use duplicated names.
 
@@ -54,13 +54,13 @@ export default {
 
 This rule has an object option:
 
-`"scope"`: [] (default) array of additional scopes to search for duplicates.
+`"groups"`: [] (default) array of additional groups to search for duplicates.
 
 ### Example:
 
 ```
 vue/no-dupe-keys: [2, {
-  scope: ['asyncComputed']
+  groups: ['asyncComputed']
 }]
 ```
 

docs/rules/no-reservered-keys.md

@@ -31,9 +31,9 @@ export default {
 
 This rule has an object option:
 
-`"reserved"`: [] (default) array of dissalowed names inside `scopes`.
+`"reserved"`: [] (default) array of dissalowed names inside `groups`.
 
-`"scope"`: [] (default) array of additional scopes to search for duplicates.
+`"groups"`: [] (default) array of additional groups to search for duplicates.
 
 ### Example:
 

lib/rules/no-dupe-keys.js

@@ -1,5 +1,5 @@
 /**
- * @fileoverview Prevent duplicate field names
+ * @fileoverview Prevents duplication of field names.
  * @author Armano
  */
 'use strict'
@@ -10,30 +10,24 @@ const utils = require('../utils')
 // Rule Definition
 // ------------------------------------------------------------------------------
 
-const SCOPE_NAMES = new Set(['props', 'computed', 'data', 'methods'])
+const GROUP_NAMES = ['props', 'computed', 'data', 'methods']
 
 function create (context) {
   const usedNames = []
-  const scopeNames = SCOPE_NAMES
 
   const options = context.options[0] || {}
-
-  if (options.scope) {
-    options.scope.forEach(name => {
-      scopeNames.add(name)
-    })
-  }
+  const groups = new Set([...GROUP_NAMES, ...options.groups || []])
 
   // ----------------------------------------------------------------------
   // Public
   // ----------------------------------------------------------------------
 
-  return utils.executeOnVueComponent(context, (obj) => {
-    utils.iterateProperties(obj, scopeNames, (name, node, groupName) => {
+  return utils.executeOnVue(context, (obj) => {
+    utils.iterateProperties(obj, groups, (name, node, groupName) => {
       if (usedNames.indexOf(name) !== -1) {
         context.report({
           node: node,
-          message: "Duplicate key '{{name}}'.",
+          message: "Duplicated key '{{name}}'.",
           data: {
             name
           }
@@ -51,7 +45,7 @@ function create (context) {
 module.exports = {
   meta: {
     docs: {
-      description: 'Prevent duplicate field names',
+      description: 'Prevents duplication of field names.',
       category: 'Possible Errors',
       recommended: false
     },
@@ -60,7 +54,7 @@ module.exports = {
       {
         type: 'object',
         properties: {
-          scope: {
+          groups: {
             type: 'array'
           }
         },

lib/rules/no-reservered-keys.js

@@ -10,43 +10,32 @@ const utils = require('../utils')
 // Rule Definition
 // ------------------------------------------------------------------------------
 
-const RESERVER_NAMES = new Set(require('../utils/vue-reserved.json'))
-const SCOPE_NAMES = new Set(['props', 'computed', 'data', 'methods'])
+const RESERVED_KEYS = require('../utils/vue-reserved.json')
+const GROUP_NAMES = ['props', 'computed', 'data', 'methods']
 
 function create (context) {
-  const reservedNames = RESERVER_NAMES
-  const scopeNames = SCOPE_NAMES
-
   const options = context.options[0] || {}
-  if (options.reserved) {
-    options.reserved.forEach(name => {
-      reservedNames.add(name)
-    })
-  }
-  if (options.scope) {
-    options.scope.forEach(name => {
-      scopeNames.add(name)
-    })
-  }
+  const reservedKeys = new Set([...RESERVED_KEYS, ...options.reserved || []])
+  const groups = new Set([...GROUP_NAMES, ...options.groups || []])
 
   // ----------------------------------------------------------------------
   // Public
   // ----------------------------------------------------------------------
 
-  return utils.executeOnVueComponent(context, (obj) => {
-    utils.iterateProperties(obj, scopeNames, (name, node, groupName) => {
-      if (groupName === 'data' && name.substr(0, 1) === '_') {
+  return utils.executeOnVue(context, (obj) => {
+    utils.iterateProperties(obj, groups, (name, node, groupName) => {
+      if (groupName === 'data' && name[0] === '_') {
         context.report({
           node: node,
-          message: "Field '{{name}}' which start with _ in data is reserved.",
+          message: "Keys starting with with '_' are reserved in '{{name}}' group.",
           data: {
             name
           }
         })
-      } else if (reservedNames.has(name)) {
+      } else if (reservedKeys.has(name)) {
         context.report({
           node: node,
-          message: "Reserved key '{{name}}'.",
+          message: "Key '{{name}}' is reserved.",
           data: {
             name
           }
@@ -59,7 +48,7 @@ function create (context) {
 module.exports = {
   meta: {
     docs: {
-      description: 'Prevent overwrite reserved keys',
+      description: 'Prevent overwrite reserved keys.',
       category: 'Possible Errors',
       recommended: false
     },
@@ -71,7 +60,7 @@ module.exports = {
           reserved: {
             type: 'array'
           },
-          scope: {
+          groups: {
             type: 'array'
           }
         },

lib/utils/index.js

@@ -442,9 +442,9 @@ module.exports = {
     }
   },
 
-  iterateProperties (node, scopeNames, cb) {
+  iterateProperties (node, groups, cb) {
     node.properties
-      .filter(p => p.type === 'Property' && scopeNames.has(this.getStaticPropertyName(p.key)))
+      .filter(p => p.type === 'Property' && groups.has(this.getStaticPropertyName(p.key)))
       .forEach(node => {
         const name = this.getStaticPropertyName(node.key)
         if (node.value.type === 'ArrayExpression') {
@@ -457,7 +457,14 @@ module.exports = {
       })
   },
 
+  /**
+   * Interate over all elements inside ArrayExpression
+   * @param {ASTNode} node Node to check
+   * @param {string} groupName Name of parent group
+   * @param {*} cb Callback function to iterate over nodes
+   */
   iterateArrayExpression (node, groupName, cb) {
+    assert(node.type === 'ArrayExpression')
     node.elements.forEach(item => {
       const name = this.getStaticPropertyName(item)
       if (name) {
@@ -466,7 +473,14 @@ module.exports = {
     })
   },
 
+  /**
+   * Interate over all elements inside ObjectExpression
+   * @param {ASTNode} node Node to check
+   * @param {string} groupName Name of parent group
+   * @param {*} cb Callback function to iterate over nodes
+   */
   iterateObjectExpression (node, groupName, cb) {
+    assert(node.type === 'ObjectExpression')
     node.properties.forEach(item => {
       const name = this.getStaticPropertyName(item)
       if (name) {
@@ -475,7 +489,14 @@ module.exports = {
     })
   },
 
+  /**
+   * Interate over all elements inside FunctionExpression
+   * @param {ASTNode} node Node to check
+   * @param {string} groupName Name of parent group
+   * @param {*} cb Callback function to iterate over nodes
+   */
   iterateFunctionExpression (node, groupName, cb) {
+    assert(node.type === 'FunctionExpression')
     if (node.body.type === 'BlockStatement') {
       node.body.body.forEach(item => {
         if (item.type === 'ReturnStatement' && item.argument.type === 'ObjectExpression') {

tests/lib/rules/no-dupe-keys.js

@@ -1,5 +1,5 @@
 /**
- * @fileoverview Prevent duplicate field names
+ * @fileoverview Prevents duplication of field names.
  * @author Armano
  */
 'use strict'
@@ -98,13 +98,13 @@ ruleTester.run('no-dupe-keys', rule, {
       `,
       parserOptions: { ecmaVersion: 6, sourceType: 'module' },
       errors: [{
-        message: 'Duplicate key \'foo\'.',
+        message: 'Duplicated key \'foo\'.',
         line: 5
       }, {
-        message: 'Duplicate key \'foo\'.',
+        message: 'Duplicated key \'foo\'.',
         line: 10
       }, {
-        message: 'Duplicate key \'foo\'.',
+        message: 'Duplicated key \'foo\'.',
         line: 14
       }]
     },
@@ -132,15 +132,34 @@ ruleTester.run('no-dupe-keys', rule, {
       `,
       parserOptions: { ecmaVersion: 6, sourceType: 'module' },
       errors: [{
-        message: 'Duplicate key \'foo\'.',
+        message: 'Duplicated key \'foo\'.',
         line: 7
       }, {
-        message: 'Duplicate key \'foo\'.',
+        message: 'Duplicated key \'foo\'.',
         line: 13
       }, {
-        message: 'Duplicate key \'foo\'.',
+        message: 'Duplicated key \'foo\'.',
         line: 16
       }]
+    },
+    {
+      filename: 'test.js',
+      code: `
+        new Vue({
+          foo: {
+            bar: String
+          },
+          data: {
+            bar: null
+          },
+        })
+      `,
+      options: [{ groups: ['foo'] }],
+      parserOptions: { ecmaVersion: 6 },
+      errors: [{
+        message: 'Duplicated key \'bar\'.',
+        line: 7
+      }]
     }
   ]
 })

tests/lib/rules/no-reservered-keys.js

@@ -55,7 +55,7 @@ ruleTester.run('no-reservered-keys', rule, {
       `,
       parserOptions: { ecmaVersion: 6 },
       errors: [{
-        message: 'Reserved key \'$el\'.',
+        message: "Key '$el' is reserved.",
         line: 4
       }]
     },
@@ -70,7 +70,7 @@ ruleTester.run('no-reservered-keys', rule, {
       `,
       parserOptions: { ecmaVersion: 6 },
       errors: [{
-        message: "Field '_foo' which start with _ in data is reserved.",
+        message: "Keys starting with with '_' are reserved in '_foo' group.",
         line: 4
       }]
     },
@@ -83,10 +83,10 @@ ruleTester.run('no-reservered-keys', rule, {
           }
         })
       `,
-      options: [{ reserved: ['bar'], scope: ['foo'] }],
+      options: [{ reserved: ['bar'], groups: ['foo'] }],
       parserOptions: { ecmaVersion: 6 },
       errors: [{
-        message: "Reserved key 'bar'.",
+        message: "Key 'bar' is reserved.",
         line: 4
       }]
     }