eslint-plugin-mpx 0.0.20 → 0.0.21

package/README.md

@@ -23,8 +23,8 @@ Add `mpx` to the plugins section of your `.eslintrc` configuration file. You can
 
 ```json
 {
-    "plugins": [
-        "mpx"
+    "extends": [
+       "plugin:mpx/mpx-essential"
     ]
 }
 ```

package/lib/configs/base.js

@@ -13,9 +13,18 @@ module.exports = {
     browser: true,
     es6: true
   },
+  globals: {
+    wx: 'readonly',
+    getApp: 'readonly',
+    App: 'readonly',
+    __mpx_mode__: 'readonly',
+    __mpx_env__: 'readonly',
+    requirePlugin: 'readonly'
+  },
   plugins: ['mpx'],
   rules: {
     'mpx/comment-directive': 'error',
-    'mpx/jsx-uses-vars': 'error'
+    // 'mpx/jsx-uses-vars': 'error',
+    camelcase: ['error', { allow: ['__mpx_mode__', '__mpx_env__'] }]
   }
 }

package/lib/rules/html-end-tags.js

@@ -20,7 +20,7 @@ module.exports = {
     type: 'suggestion',
     docs: {
       description: 'enforce end tag style',
-      categories: ['vue3-strongly-recommended', 'strongly-recommended'],
+      categories: ['mpx-essential'],
       url: 'https://eslint.vuejs.org/rules/html-end-tags.html'
     },
     fixable: 'code',

package/lib/rules/jsx-uses-vars.js

@@ -39,7 +39,7 @@ module.exports = {
     type: 'problem',
     docs: {
       description: 'prevent variables used in JSX to be marked as unused', // eslint-disable-line consistent-docs-description
-      categories: ['base'],
+      // categories: ['base'],
       url: 'https://eslint.vuejs.org/rules/jsx-uses-vars.html'
     },
     schema: []

package/lib/rules/no-arrow-functions-in-watch.js

@@ -10,7 +10,7 @@ module.exports = {
     type: 'problem',
     docs: {
       description: 'disallow using arrow functions to define watcher',
-      categories: ['vue3-essential', 'essential'],
+      categories: ['mpx-essential'],
       url: 'https://eslint.vuejs.org/rules/no-arrow-functions-in-watch.html'
     },
     fixable: null,

package/lib/rules/no-async-in-computed-properties.js

@@ -69,7 +69,7 @@ module.exports = {
     type: 'problem',
     docs: {
       description: 'disallow asynchronous actions in computed properties',
-      categories: ['vue3-essential', 'essential'],
+      categories: ['mpx-essential'],
       url: 'https://eslint.vuejs.org/rules/no-async-in-computed-properties.html'
     },
     fixable: null,

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

@@ -14,14 +14,14 @@ const utils = require('../utils')
 // Rule Definition
 // ------------------------------------------------------------------------------
 /** @type {GroupName[]} */
-const GROUP_NAMES = ['props', 'computed', 'data', 'methods', 'setup']
+const GROUP_NAMES = ['properties', 'computed', 'data', 'methods']
 
 module.exports = {
   meta: {
     type: 'problem',
     docs: {
       description: 'disallow duplication of field names',
-      categories: ['vue3-essential', 'essential'],
+      categories: ['mpx-essential'],
       url: 'https://eslint.vuejs.org/rules/no-dupe-keys.html'
     },
     fixable: null, // or "code" or "whitespace"

package/lib/rules/no-duplicate-attributes.js

@@ -44,7 +44,7 @@ module.exports = {
     type: 'problem',
     docs: {
       description: 'disallow duplication of attributes',
-      categories: ['vue3-essential', 'essential'],
+      categories: ['mpx-essential'],
       url: 'https://eslint.vuejs.org/rules/no-duplicate-attributes.html'
     },
     fixable: null,

package/lib/rules/no-reserved-keys.js

@@ -23,7 +23,7 @@ module.exports = {
     type: 'suggestion',
     docs: {
       description: 'disallow overwriting reserved keys',
-      categories: ['vue3-essential', 'essential'],
+      categories: ['mpx-essential'],
       url: 'https://eslint.vuejs.org/rules/no-reserved-keys.html'
     },
     fixable: null,

package/lib/rules/no-side-effects-in-computed-properties.js

@@ -20,7 +20,7 @@ module.exports = {
     type: 'problem',
     docs: {
       description: 'disallow side effects in computed properties',
-      categories: ['vue3-essential', 'essential'],
+      categories: ['mpx-essential'],
       url:
         'https://eslint.vuejs.org/rules/no-side-effects-in-computed-properties.html'
     },

package/lib/rules/no-template-shadow.js

@@ -19,7 +19,7 @@ const utils = require('../utils')
 // ------------------------------------------------------------------------------
 
 /** @type {GroupName[]} */
-const GROUP_NAMES = ['props', 'computed', 'data', 'methods']
+const GROUP_NAMES = ['properties', 'computed', 'data', 'methods']
 
 module.exports = {
   meta: {

package/lib/rules/no-unused-vars.js

@@ -63,7 +63,7 @@ module.exports = {
     docs: {
       description:
         'disallow unused variable definitions of v-for directives or scope attributes',
-      categories: ['vue3-essential', 'essential'],
+      categories: ['essential'],
       url: 'https://eslint.vuejs.org/rules/no-unused-vars.html'
     },
     fixable: null,

package/lib/rules/return-in-computed-property.js

@@ -20,7 +20,7 @@ module.exports = {
     docs: {
       description:
         'enforce that a return statement is present in computed property',
-      categories: ['vue3-essential', 'essential'],
+      categories: ['mpx-essential'],
       url: 'https://eslint.vuejs.org/rules/return-in-computed-property.html'
     },
     fixable: null, // or "code" or "whitespace"

package/lib/rules/valid-v-text.js

@@ -20,7 +20,7 @@ module.exports = {
     type: 'problem',
     docs: {
       description: 'enforce valid `v-text` directives',
-      categories: ['vue3-essential', 'essential'],
+      categories: ['essential'],
       url: 'https://eslint.vuejs.org/rules/valid-v-text.html'
     },
     fixable: null,

package/lib/rules/valid-wx-elif.js

@@ -20,7 +20,7 @@ module.exports = {
     type: 'problem',
     docs: {
       description: 'enforce valid `wx:elif` directives',
-      categories: ['vue3-essential', 'essential'],
+      categories: ['mpx-essential'],
       url: 'https://eslint.vuejs.org/rules/valid-wx:elif.html'
     },
     fixable: null,

package/lib/rules/valid-wx-else.js

@@ -20,7 +20,7 @@ module.exports = {
     type: 'problem',
     docs: {
       description: 'enforce valid `wx:else` directives',
-      categories: ['vue3-essential', 'essential'],
+      categories: ['mpx-essential'],
       url: 'https://eslint.vuejs.org/rules/valid-wx:else.html'
     },
     fixable: null,

package/lib/rules/valid-wx-for.js

@@ -103,7 +103,7 @@ module.exports = {
     type: 'problem',
     docs: {
       description: 'enforce valid `wx:for` directives',
-      categories: ['vue3-essential', 'essential'],
+      categories: [],
       url: 'https://eslint.vuejs.org/rules/valid-wx:for.html'
     },
     fixable: null,

package/lib/rules/valid-wx-if.js

@@ -20,7 +20,7 @@ module.exports = {
     type: 'problem',
     docs: {
       description: 'enforce valid `wx:if` directives',
-      categories: ['vue3-essential', 'essential'],
+      categories: ['mpx-essential'],
       url: 'https://eslint.vuejs.org/rules/valid-v-if.html'
     },
     fixable: null,
@@ -38,7 +38,7 @@ module.exports = {
             node,
             loc: node.loc,
             message:
-              "'wx:if' and 'wx:elif' directives can't exist on the same element. You may want 'wx:elif' directives."
+              "'wx:if' and 'wx:else' directives can't exist on the same element. You may want 'wx:elif' directives."
           })
         }
         if (utils.hasDirective(element, 'elif')) {

package/lib/rules/valid-wx-model.js

@@ -33,7 +33,7 @@ module.exports = {
     type: 'problem',
     docs: {
       description: 'enforce valid `wx:model` directives',
-      categories: ['vue3-essential', 'essential'],
+      categories: ['mpx-essential'],
       url: 'https://eslint.vuejs.org/rules/valid-wx:model.html'
     },
     fixable: null,

package/lib/utils/index.js

@@ -81,15 +81,15 @@
  * @typedef { {key: string | null, value: BlockStatement | null} } ComponentComputedProperty
  */
 /**
- * @typedef { 'props' | 'data' | 'computed' | 'setup' | 'watch' | 'methods' } GroupName
+ * @typedef { 'properties' | 'data' | 'computed' | 'watch' | 'methods' } GroupName
  * @typedef { { type: 'array',  name: string, groupName: GroupName, node: Literal | TemplateLiteral } } ComponentArrayPropertyData
  * @typedef { { type: 'object', name: string, groupName: GroupName, node: Identifier | Literal | TemplateLiteral, property: Property } } ComponentObjectPropertyData
  * @typedef { ComponentArrayPropertyData | ComponentObjectPropertyData } ComponentPropertyData
  */
 /**
- * @typedef {import('../../typings/eslint-plugin-vue/util-types/utils').VueObjectType} VueObjectType
- * @typedef {import('../../typings/eslint-plugin-vue/util-types/utils').VueObjectData} VueObjectData
- * @typedef {import('../../typings/eslint-plugin-vue/util-types/utils').VueVisitor} VueVisitor
+ * @typedef {import('../../typings/eslint-plugin-mpx/util-types/utils').VueObjectType} VueObjectType
+ * @typedef {import('../../typings/eslint-plugin-mpx/util-types/utils').VueObjectData} VueObjectData
+ * @typedef {import('../../typings/eslint-plugin-mpx/util-types/utils').VueVisitor} VueVisitor
  */
 
 // ------------------------------------------------------------------------------
@@ -670,8 +670,7 @@ module.exports = {
         return (
           p.type === 'Property' &&
           p.key.type === 'Identifier' &&
-          (p.key.name === 'props' || 
-            p.key.name === 'properties' ) &&
+          (p.key.name === 'props' || p.key.name === 'properties') &&
           (p.value.type === 'ObjectExpression' ||
             p.value.type === 'ArrayExpression')
         )
@@ -1489,7 +1488,11 @@ module.exports = {
     const tokensL = sourceCode.getTokens(left)
     const tokensR = sourceCode.getTokens(right)
 
-    if (tokensL.length !== tokensR.length) {
+    if (
+      tokensL.length !== tokensR.length ||
+      sourceCode.getTokenBefore(left).value !==
+        sourceCode.getTokenBefore(right).value
+    ) {
       return false
     }
     for (let i = 0; i < tokensL.length; ++i) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-mpx",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "description": "Official ESLint plugin for Mpx.js",
   "main": "lib/index.js",
   "scripts": {
@@ -48,8 +48,8 @@
     "eslint": "^6.2.0 || ^7.0.0"
   },
   "dependencies": {
+    "mpx-eslint-parser": "0.0.7",
     "eslint-utils": "^2.1.0",
-    "mpx-eslint-parser": "0.0.5",
     "natural-compare": "^1.4.0",
     "semver": "^7.3.2",
     "vue-eslint-parser": "^7.1.0"