From b08fe0b4a40691920e0152146703a48a3043181e Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Mon, 29 Nov 2021 17:34:49 +0800 Subject: [PATCH 001/455] docs: add missing backticks (#1730) --- docs/rules/component-definition-name-casing.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/rules/component-definition-name-casing.md b/docs/rules/component-definition-name-casing.md index 5e89ace75..615b876f9 100644 --- a/docs/rules/component-definition-name-casing.md +++ b/docs/rules/component-definition-name-casing.md @@ -31,7 +31,7 @@ Default casing is set to `PascalCase`. - `"PascalCase"` (default) ... enforce component definition names to pascal case. - `"kebab-case"` ... enforce component definition names to kebab case. -### `"PascalCase" (default) +### `"PascalCase"` (default) @@ -64,18 +64,18 @@ export default { ```js /* ✓ GOOD */ Vue.component('MyComponent', { - + }) /* ✗ BAD */ Vue.component('my-component', { - + }) ``` -### `"kebab-case" +### `"kebab-case"` @@ -108,12 +108,12 @@ export default { ```js /* ✓ GOOD */ Vue.component('my-component', { - + }) /* ✗ BAD */ Vue.component('MyComponent', { - + }) ``` From 10dd1a99aa983754deb76383b224d48ebb2cbe91 Mon Sep 17 00:00:00 2001 From: Pig Fang Date: Tue, 30 Nov 2021 13:06:13 +0800 Subject: [PATCH 002/455] Add `vue/component-options-name-casing` rule (#1725) * Add `vue/component-options-name-casing` rule * fix docs * fix demo * refactor * fix auto-fix * fix checking kebab-case * provide suggestions * accept suggestions --- docs/rules/README.md | 1 + docs/rules/component-options-name-casing.md | 165 ++++++ lib/index.js | 1 + lib/rules/component-options-name-casing.js | 115 ++++ .../rules/component-options-name-casing.js | 558 ++++++++++++++++++ 5 files changed, 840 insertions(+) create mode 100644 docs/rules/component-options-name-casing.md create mode 100644 lib/rules/component-options-name-casing.js create mode 100644 tests/lib/rules/component-options-name-casing.js diff --git a/docs/rules/README.md b/docs/rules/README.md index 5794cc3ed..2af1c06ca 100644 --- a/docs/rules/README.md +++ b/docs/rules/README.md @@ -311,6 +311,7 @@ For example: | [vue/block-tag-newline](./block-tag-newline.md) | enforce line breaks after opening and before closing block-level tags | :wrench: | | [vue/component-api-style](./component-api-style.md) | enforce component API style | | | [vue/component-name-in-template-casing](./component-name-in-template-casing.md) | enforce specific casing for the component naming style in template | :wrench: | +| [vue/component-options-name-casing](./component-options-name-casing.md) | enforce the casing of component name in `components` options | :wrench::bulb: | | [vue/custom-event-name-casing](./custom-event-name-casing.md) | enforce specific casing for custom event name | | | [vue/html-button-has-type](./html-button-has-type.md) | disallow usage of button without an explicit type attribute | | | [vue/html-comment-content-newline](./html-comment-content-newline.md) | enforce unified line brake in HTML comments | :wrench: | diff --git a/docs/rules/component-options-name-casing.md b/docs/rules/component-options-name-casing.md new file mode 100644 index 000000000..9a956553b --- /dev/null +++ b/docs/rules/component-options-name-casing.md @@ -0,0 +1,165 @@ +--- +pageClass: rule-details +sidebarDepth: 0 +title: vue/component-options-name-casing +description: enforce the casing of component name in `components` options +--- +# vue/component-options-name-casing + +> enforce the casing of component name in `components` options + +- :exclamation: ***This rule has not been released yet.*** +- :wrench: The `--fix` option on the [command line](https://eslint.org/docs/user-guide/command-line-interface#fixing-problems) can automatically fix some of the problems reported by this rule. +- :bulb: Some problems reported by this rule are manually fixable by editor [suggestions](https://eslint.org/docs/developer-guide/working-with-rules#providing-suggestions). + +## :book: Rule Details + +This rule aims to enforce casing of the component names in `components` options. + +## :wrench: Options + +```json +{ + "vue/component-options-name-casing": ["error", "PascalCase" | "kebab-case" | "camelCase"] +} +``` + +This rule has an option which can be one of these values: + +- `"PascalCase"` (default) ... enforce component names to pascal case. +- `"kebab-case"` ... enforce component names to kebab case. +- `"camelCase"` ... enforce component names to camel case. + +Please note that if you use kebab case in `components` options, +you can **only** use kebab case in template; +and if you use camel case in `components` options, +you **can't** use pascal case in template. + +For demonstration, the code example is invalid: + +```vue + + + +``` + +### `"PascalCase"` (default) + + + +```vue + +``` + + + + + +```vue + +``` + + + +### `"kebab-case"` + + + +```vue + +``` + + + + + +```vue + +``` + + + +### `"camelCase"` + + + +```vue + +``` + + + + + +```vue + +``` + + + +## :mag: Implementation + +- [Rule source](https://github.com/vuejs/eslint-plugin-vue/blob/master/lib/rules/component-options-name-casing.js) +- [Test source](https://github.com/vuejs/eslint-plugin-vue/blob/master/tests/lib/rules/component-options-name-casing.js) diff --git a/lib/index.js b/lib/index.js index c9969917c..0adbf3f74 100644 --- a/lib/index.js +++ b/lib/index.js @@ -24,6 +24,7 @@ module.exports = { 'component-api-style': require('./rules/component-api-style'), 'component-definition-name-casing': require('./rules/component-definition-name-casing'), 'component-name-in-template-casing': require('./rules/component-name-in-template-casing'), + 'component-options-name-casing': require('./rules/component-options-name-casing'), 'component-tags-order': require('./rules/component-tags-order'), 'custom-event-name-casing': require('./rules/custom-event-name-casing'), 'dot-location': require('./rules/dot-location'), diff --git a/lib/rules/component-options-name-casing.js b/lib/rules/component-options-name-casing.js new file mode 100644 index 000000000..ad70c1546 --- /dev/null +++ b/lib/rules/component-options-name-casing.js @@ -0,0 +1,115 @@ +/** + * @author Pig Fang + * See LICENSE file in root directory for full license. + */ +'use strict' + +// ------------------------------------------------------------------------------ +// Requirements +// ------------------------------------------------------------------------------ + +const utils = require('../utils') +const casing = require('../utils/casing') + +// ------------------------------------------------------------------------------ +// Helpers +// ------------------------------------------------------------------------------ + +/** + * @param {import('../../typings/eslint-plugin-vue/util-types/ast').Expression} node + * @returns {string | null} + */ +function getOptionsComponentName(node) { + if (node.type === 'Identifier') { + return node.name + } + if (node.type === 'Literal') { + return typeof node.value === 'string' ? node.value : null + } + return null +} + +// ------------------------------------------------------------------------------ +// Rule Definition +// ------------------------------------------------------------------------------ + +module.exports = { + meta: { + type: 'suggestion', + docs: { + description: + 'enforce the casing of component name in `components` options', + categories: undefined, + url: 'https://eslint.vuejs.org/rules/component-options-name-casing.html' + }, + fixable: 'code', + hasSuggestions: true, + schema: [{ enum: casing.allowedCaseOptions }], + messages: { + caseNotMatched: 'Component name "{{component}}" is not {{caseType}}.', + possibleRenaming: 'Rename component name to be in {{caseType}}.' + } + }, + /** @param {RuleContext} context */ + create(context) { + const caseType = context.options[0] || 'PascalCase' + + const canAutoFix = caseType === 'PascalCase' + const checkCase = casing.getChecker(caseType) + const convert = casing.getConverter(caseType) + + return utils.executeOnVue(context, (obj) => { + const node = utils.findProperty(obj, 'components') + if (!node || node.value.type !== 'ObjectExpression') { + return + } + + node.value.properties.forEach((property) => { + if (property.type !== 'Property') { + return + } + + const name = getOptionsComponentName(property.key) + if (!name || checkCase(name)) { + return + } + + context.report({ + node: property.key, + messageId: 'caseNotMatched', + data: { + component: name, + caseType + }, + fix: canAutoFix + ? (fixer) => { + const converted = convert(name) + return property.shorthand + ? fixer.replaceText(property, `${converted}: ${name}`) + : fixer.replaceText(property.key, converted) + } + : undefined, + suggest: canAutoFix + ? undefined + : [ + { + messageId: 'possibleRenaming', + data: { caseType }, + fix: (fixer) => { + const converted = convert(name) + if (caseType === 'kebab-case') { + return property.shorthand + ? fixer.replaceText(property, `'${converted}': ${name}`) + : fixer.replaceText(property.key, `'${converted}'`) + } + return property.shorthand + ? fixer.replaceText(property, `${converted}: ${name}`) + : fixer.replaceText(property.key, converted) + } + } + ] + }) + }) + }) + } +} diff --git a/tests/lib/rules/component-options-name-casing.js b/tests/lib/rules/component-options-name-casing.js new file mode 100644 index 000000000..504d98b0c --- /dev/null +++ b/tests/lib/rules/component-options-name-casing.js @@ -0,0 +1,558 @@ +/** + * @author Pig Fang + * See LICENSE file in root directory for full license. + */ +'use strict' + +const RuleTester = require('eslint').RuleTester +const rule = require('../../../lib/rules/component-options-name-casing') + +const tester = new RuleTester({ + parserOptions: { + ecmaVersion: 2020, + sourceType: 'module' + } +}) + +tester.run('component-options-name-casing', rule, { + valid: [ + { + filename: 'test.vue', + code: ` + export default { + } + ` + }, + { + filename: 'test.vue', + code: ` + export default { + ...components + } + ` + }, + { + filename: 'test.vue', + code: ` + export default { + components: { + FooBar + } + } + ` + }, + { + filename: 'test.vue', + code: ` + export default { + components: { + FooBar: fooBar + } + } + ` + }, + { + filename: 'test.vue', + code: ` + export default { + components: { + FooBar + } + } + `, + options: ['PascalCase'] + }, + { + filename: 'test.vue', + code: ` + export default { + components: { + fooBar + } + } + `, + options: ['camelCase'] + }, + { + filename: 'test.vue', + code: ` + export default { + components: { + fooBar: FooBar + } + } + `, + options: ['camelCase'] + }, + { + filename: 'test.vue', + code: ` + export default { + components: { + 'foo-bar': fooBar + } + } + `, + options: ['kebab-case'] + }, + { + filename: 'test.vue', + code: ` + export default { + components: { + 'foo-bar': FooBar + } + } + `, + options: ['kebab-case'] + } + ], + invalid: [ + { + filename: 'test.vue', + code: ` + export default { + components: { + fooBar + } + } + `, + errors: [ + { + messageId: 'caseNotMatched', + data: { + component: 'fooBar', + caseType: 'PascalCase' + }, + line: 4, + column: 13, + endColumn: 19 + } + ], + output: ` + export default { + components: { + FooBar: fooBar + } + } + ` + }, + { + filename: 'test.vue', + code: ` + export default { + components: { + fooBar: FooBar + } + } + `, + errors: [ + { + messageId: 'caseNotMatched', + data: { + component: 'fooBar', + caseType: 'PascalCase' + }, + line: 4, + column: 13, + endColumn: 19 + } + ], + output: ` + export default { + components: { + FooBar: FooBar + } + } + ` + }, + { + filename: 'test.vue', + code: ` + export default { + components: { + fooBar + } + } + `, + options: ['PascalCase'], + errors: [ + { + messageId: 'caseNotMatched', + data: { + component: 'fooBar', + caseType: 'PascalCase' + }, + line: 4, + column: 13, + endColumn: 19 + } + ], + output: ` + export default { + components: { + FooBar: fooBar + } + } + ` + }, + { + filename: 'test.vue', + code: ` + export default { + components: { + fooBar: FooBar + } + } + `, + options: ['PascalCase'], + errors: [ + { + messageId: 'caseNotMatched', + data: { + component: 'fooBar', + caseType: 'PascalCase' + }, + line: 4, + column: 13, + endColumn: 19 + } + ], + output: ` + export default { + components: { + FooBar: FooBar + } + } + ` + }, + { + filename: 'test.vue', + code: ` + export default { + components: { + 'foo-bar': FooBar + } + } + `, + options: ['PascalCase'], + errors: [ + { + messageId: 'caseNotMatched', + data: { + component: 'foo-bar', + caseType: 'PascalCase' + }, + line: 4, + column: 13, + endColumn: 22 + } + ], + output: ` + export default { + components: { + FooBar: FooBar + } + } + ` + }, + { + filename: 'test.vue', + code: ` + export default { + components: { + FooBar + } + } + `, + options: ['camelCase'], + errors: [ + { + messageId: 'caseNotMatched', + data: { + component: 'FooBar', + caseType: 'camelCase' + }, + line: 4, + column: 13, + endColumn: 19, + suggestions: [ + { + messageId: 'possibleRenaming', + data: { caseType: 'camelCase' }, + output: ` + export default { + components: { + fooBar: FooBar + } + } + ` + } + ] + } + ], + output: null + }, + { + filename: 'test.vue', + code: ` + export default { + components: { + FooBar: fooBar + } + } + `, + options: ['camelCase'], + errors: [ + { + messageId: 'caseNotMatched', + data: { + component: 'FooBar', + caseType: 'camelCase' + }, + line: 4, + column: 13, + endColumn: 19, + suggestions: [ + { + messageId: 'possibleRenaming', + data: { caseType: 'camelCase' }, + output: ` + export default { + components: { + fooBar: fooBar + } + } + ` + } + ] + } + ], + output: null + }, + { + filename: 'test.vue', + code: ` + export default { + components: { + 'foo-bar': fooBar + } + } + `, + options: ['camelCase'], + errors: [ + { + messageId: 'caseNotMatched', + data: { + component: 'foo-bar', + caseType: 'camelCase' + }, + line: 4, + column: 13, + endColumn: 22, + suggestions: [ + { + messageId: 'possibleRenaming', + data: { caseType: 'camelCase' }, + output: ` + export default { + components: { + fooBar: fooBar + } + } + ` + } + ] + } + ], + output: null + }, + { + filename: 'test.vue', + code: ` + export default { + components: { + FooBar + } + } + `, + options: ['kebab-case'], + errors: [ + { + messageId: 'caseNotMatched', + data: { + component: 'FooBar', + caseType: 'kebab-case' + }, + line: 4, + column: 13, + endColumn: 19, + suggestions: [ + { + messageId: 'possibleRenaming', + data: { caseType: 'kebab-case' }, + output: ` + export default { + components: { + 'foo-bar': FooBar + } + } + ` + } + ] + } + ], + output: null + }, + { + filename: 'test.vue', + code: ` + export default { + components: { + FooBar: fooBar + } + } + `, + options: ['kebab-case'], + errors: [ + { + messageId: 'caseNotMatched', + data: { + component: 'FooBar', + caseType: 'kebab-case' + }, + line: 4, + column: 13, + endColumn: 19, + suggestions: [ + { + messageId: 'possibleRenaming', + data: { caseType: 'kebab-case' }, + output: ` + export default { + components: { + 'foo-bar': fooBar + } + } + ` + } + ] + } + ], + output: null + }, + { + filename: 'test.vue', + code: ` + export default { + components: { + fooBar + } + } + `, + options: ['kebab-case'], + errors: [ + { + messageId: 'caseNotMatched', + data: { + component: 'fooBar', + caseType: 'kebab-case' + }, + line: 4, + column: 13, + endColumn: 19, + suggestions: [ + { + messageId: 'possibleRenaming', + data: { caseType: 'kebab-case' }, + output: ` + export default { + components: { + 'foo-bar': fooBar + } + } + ` + } + ] + } + ], + output: null + }, + { + filename: 'test.vue', + code: ` + export default { + components: { + fooBar: FooBar + } + } + `, + options: ['kebab-case'], + errors: [ + { + messageId: 'caseNotMatched', + data: { + component: 'fooBar', + caseType: 'kebab-case' + }, + line: 4, + column: 13, + endColumn: 19, + suggestions: [ + { + messageId: 'possibleRenaming', + data: { caseType: 'kebab-case' }, + output: ` + export default { + components: { + 'foo-bar': FooBar + } + } + ` + } + ] + } + ], + output: null + }, + { + filename: 'test.vue', + code: ` + export default { + components: { + FooBar, + 'my-component': MyComponent + } + } + `, + options: ['kebab-case'], + errors: [ + { + messageId: 'caseNotMatched', + data: { + component: 'FooBar', + caseType: 'kebab-case' + }, + line: 4, + column: 13, + endColumn: 19, + suggestions: [ + { + messageId: 'possibleRenaming', + data: { caseType: 'kebab-case' }, + output: ` + export default { + components: { + 'foo-bar': FooBar, + 'my-component': MyComponent + } + } + ` + } + ] + } + ], + output: null + } + ] +}) From 622ac268fc52ff5237a66db7c4d0cae1f9d6a035 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Fri, 3 Dec 2021 02:18:25 +0100 Subject: [PATCH 003/455] Allow `asyncData` in `vue/no-dupe-keys` (#1735) --- lib/rules/no-dupe-keys.js | 9 +------- tests/lib/rules/no-dupe-keys.js | 41 +++++++++++++++------------------ 2 files changed, 19 insertions(+), 31 deletions(-) diff --git a/lib/rules/no-dupe-keys.js b/lib/rules/no-dupe-keys.js index 61ffda40e..8b5e8e54c 100644 --- a/lib/rules/no-dupe-keys.js +++ b/lib/rules/no-dupe-keys.js @@ -14,14 +14,7 @@ const utils = require('../utils') // Rule Definition // ------------------------------------------------------------------------------ /** @type {GroupName[]} */ -const GROUP_NAMES = [ - 'props', - 'computed', - 'data', - 'asyncData', - 'methods', - 'setup' -] +const GROUP_NAMES = ['props', 'computed', 'data', 'methods', 'setup'] module.exports = { meta: { diff --git a/tests/lib/rules/no-dupe-keys.js b/tests/lib/rules/no-dupe-keys.js index 9e01f0856..2abae46d0 100644 --- a/tests/lib/rules/no-dupe-keys.js +++ b/tests/lib/rules/no-dupe-keys.js @@ -380,6 +380,24 @@ ruleTester.run('no-dupe-keys', rule, { } } ` + }, + { + // https://github.com/vuejs/eslint-plugin-vue/issues/1687 + filename: 'test.vue', + code: ` + export default { + asyncData() { + return { + foo: 1 + } + }, + data() { + return { + foo: 2 + } + }, + } + ` } ], @@ -709,29 +727,6 @@ ruleTester.run('no-dupe-keys', rule, { } ] }, - { - filename: 'test.vue', - code: ` - export default { - asyncData() { - return { - foo: 1 - } - }, - data() { - return { - foo: 2 - } - }, - } - `, - errors: [ - { - message: "Duplicated key 'foo'.", - line: 10 - } - ] - }, { filename: 'test.js', code: ` From fe82fb534b6ced51a54bb1c35a9c590f83a0f5b5 Mon Sep 17 00:00:00 2001 From: Yosuke Ota Date: Fri, 3 Dec 2021 11:02:24 +0900 Subject: [PATCH 004/455] Add support for ts4.5 to `vue/script-indent` rule (#1719) * Add support for ts4.5 to `vue/script-indent` rule * update deps --- .vscode/settings.json | 2 +- lib/utils/indent-common.js | 127 +++++++++++++----- lib/utils/indent-ts.js | 21 +++ package.json | 4 +- .../script-indent/ts-import-assertion-01.vue | 9 ++ .../script-indent/ts-import-assertion-02.vue | 15 +++ .../script-indent/ts-import-assertion-03.vue | 10 ++ .../script-indent/ts-import-assertion-04.vue | 10 ++ .../ts-type-only-import-export-01.vue | 17 +++ .../ts-type-only-import-export-02.vue | 23 ++++ .../ts-type-only-import-export-03.vue | 26 ++++ 11 files changed, 231 insertions(+), 33 deletions(-) create mode 100644 tests/fixtures/script-indent/ts-import-assertion-01.vue create mode 100644 tests/fixtures/script-indent/ts-import-assertion-02.vue create mode 100644 tests/fixtures/script-indent/ts-import-assertion-03.vue create mode 100644 tests/fixtures/script-indent/ts-import-assertion-04.vue create mode 100644 tests/fixtures/script-indent/ts-type-only-import-export-01.vue create mode 100644 tests/fixtures/script-indent/ts-type-only-import-export-02.vue create mode 100644 tests/fixtures/script-indent/ts-type-only-import-export-03.vue diff --git a/.vscode/settings.json b/.vscode/settings.json index 7bb646536..80e1f88fd 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -10,7 +10,7 @@ "json", "jsonc" ], - "typescript.tsdk": "node_modules/typescript/lib", + "typescript.tsdk": "./node_modules/typescript/lib", "vetur.validation.script": false, "[typescript]": { "editor.formatOnSave": true, diff --git a/lib/utils/indent-common.js b/lib/utils/indent-common.js index 39ef58670..d208d5a08 100644 --- a/lib/utils/indent-common.js +++ b/lib/utils/indent-common.js @@ -19,7 +19,8 @@ const { isNotOpeningBraceToken, isOpeningBracketToken, isClosingBracketToken, - isSemicolonToken + isSemicolonToken, + isNotSemicolonToken } = require('eslint-utils') const { isComment, @@ -1288,13 +1289,13 @@ module.exports.defineVisitor = function create( }, /** @param {ExportAllDeclaration} node */ ExportAllDeclaration(node) { - const tokens = tokenStore.getTokens(node) - const firstToken = /** @type {Token} */ (tokens.shift()) - if (isSemicolonToken(tokens[tokens.length - 1])) { - tokens.pop() - } + const exportToken = tokenStore.getFirstToken(node) + const tokens = [ + ...tokenStore.getTokensBetween(exportToken, node.source), + tokenStore.getFirstToken(node.source) + ] if (!node.exported) { - setOffset(tokens, 1, firstToken) + setOffset(tokens, 1, exportToken) } else { // export * as foo from "mod" const starToken = /** @type {Token} */ (tokens.find(isWildcard)) @@ -1302,10 +1303,28 @@ module.exports.defineVisitor = function create( const exportedToken = tokenStore.getTokenAfter(asToken) const afterTokens = tokens.slice(tokens.indexOf(exportedToken) + 1) - setOffset(starToken, 1, firstToken) + setOffset(starToken, 1, exportToken) setOffset(asToken, 1, starToken) setOffset(exportedToken, 1, starToken) - setOffset(afterTokens, 1, firstToken) + setOffset(afterTokens, 1, exportToken) + } + + // assertions + const lastToken = /** @type {Token} */ ( + tokenStore.getLastToken(node, isNotSemicolonToken) + ) + const assertionTokens = tokenStore.getTokensBetween( + node.source, + lastToken + ) + if (assertionTokens.length) { + const assertToken = /** @type {Token} */ (assertionTokens.shift()) + setOffset(assertToken, 0, exportToken) + const assertionOpen = assertionTokens.shift() + if (assertionOpen) { + setOffset(assertionOpen, 1, assertToken) + processNodeList(assertionTokens, assertionOpen, lastToken, 1) + } } }, /** @param {ExportDefaultDeclaration} node */ @@ -1328,28 +1347,66 @@ module.exports.defineVisitor = function create( const firstSpecifier = node.specifiers[0] if (!firstSpecifier || firstSpecifier.type === 'ExportSpecifier') { // export {foo, bar}; or export {foo, bar} from "mod"; - const leftParenToken = tokenStore.getFirstToken(node, 1) - const rightParenToken = /** @type {Token} */ ( - tokenStore.getLastToken(node, isClosingBraceToken) + const leftBraceTokens = firstSpecifier + ? tokenStore.getTokensBetween(exportToken, firstSpecifier) + : [tokenStore.getTokenAfter(exportToken)] + const rightBraceToken = /** @type {Token} */ ( + node.source + ? tokenStore.getTokenBefore(node.source, isClosingBraceToken) + : tokenStore.getLastToken(node, isClosingBraceToken) + ) + setOffset(leftBraceTokens, 0, exportToken) + processNodeList( + node.specifiers, + /** @type {Token} */ (last(leftBraceTokens)), + rightBraceToken, + 1 ) - setOffset(leftParenToken, 0, exportToken) - processNodeList(node.specifiers, leftParenToken, rightParenToken, 1) - - const maybeFromToken = tokenStore.getTokenAfter(rightParenToken) - if (maybeFromToken != null && maybeFromToken.value === 'from') { - const fromToken = maybeFromToken - const nameToken = tokenStore.getTokenAfter(fromToken) - setOffset([fromToken, nameToken], 1, exportToken) + + if (node.source) { + const tokens = tokenStore.getTokensBetween( + rightBraceToken, + node.source + ) + setOffset( + [...tokens, sourceCode.getFirstToken(node.source)], + 1, + exportToken + ) + + // assertions + const lastToken = /** @type {Token} */ ( + tokenStore.getLastToken(node, isNotSemicolonToken) + ) + const assertionTokens = tokenStore.getTokensBetween( + node.source, + lastToken + ) + if (assertionTokens.length) { + const assertToken = /** @type {Token} */ (assertionTokens.shift()) + setOffset(assertToken, 0, exportToken) + const assertionOpen = assertionTokens.shift() + if (assertionOpen) { + setOffset(assertionOpen, 1, assertToken) + processNodeList(assertionTokens, assertionOpen, lastToken, 1) + } + } } } else { // maybe babel parser } } }, - /** @param {ExportSpecifier} node */ - ExportSpecifier(node) { + /** @param {ExportSpecifier | ImportSpecifier} node */ + 'ExportSpecifier, ImportSpecifier'(node) { const tokens = tokenStore.getTokens(node) - const firstToken = /** @type {Token} */ (tokens.shift()) + let firstToken = /** @type {Token} */ (tokens.shift()) + if (firstToken.value === 'type') { + const typeToken = firstToken + firstToken = /** @type {Token} */ (tokens.shift()) + setOffset(firstToken, 0, typeToken) + } + setOffset(tokens, 1, firstToken) }, /** @param {ForInStatement | ForOfStatement} node */ @@ -1540,13 +1597,23 @@ module.exports.defineVisitor = function create( setOffset(fromToken, 1, importToken) setOffset(afterTokens, 0, fromToken) } - }, - /** @param {ImportSpecifier} node */ - ImportSpecifier(node) { - if (node.local.range[0] !== node.imported.range[0]) { - const tokens = tokenStore.getTokens(node) - const firstToken = /** @type {Token} */ (tokens.shift()) - setOffset(tokens, 1, firstToken) + + // assertions + const lastToken = /** @type {Token} */ ( + tokenStore.getLastToken(node, isNotSemicolonToken) + ) + const assertionTokens = tokenStore.getTokensBetween( + node.source, + lastToken + ) + if (assertionTokens.length) { + const assertToken = /** @type {Token} */ (assertionTokens.shift()) + setOffset(assertToken, 0, importToken) + const assertionOpen = assertionTokens.shift() + if (assertionOpen) { + setOffset(assertionOpen, 1, assertToken) + processNodeList(assertionTokens, assertionOpen, lastToken, 1) + } } }, /** @param {ImportNamespaceSpecifier} node */ diff --git a/lib/utils/indent-ts.js b/lib/utils/indent-ts.js index b98e9d105..496e892cd 100644 --- a/lib/utils/indent-ts.js +++ b/lib/utils/indent-ts.js @@ -1302,6 +1302,27 @@ function defineVisitor({ setOffset(atToken, 0, tokenStore.getFirstToken(decorators[0])) } }, + ImportAttribute(node) { + const firstToken = tokenStore.getFirstToken(node) + const keyTokens = getFirstAndLastTokens(node.key) + const prefixTokens = tokenStore.getTokensBetween( + firstToken, + keyTokens.firstToken + ) + setOffset(prefixTokens, 0, firstToken) + + setOffset(keyTokens.firstToken, 0, firstToken) + + const initToken = tokenStore.getFirstToken(node.value) + setOffset( + [ + ...tokenStore.getTokensBetween(keyTokens.lastToken, initToken), + initToken + ], + 1, + keyTokens.lastToken + ) + }, // ---------------------------------------------------------------------- // DEPRECATED NODES diff --git a/package.json b/package.json index 2c9bcbf18..96da9be83 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "@types/natural-compare": "^1.4.0", "@types/node": "^13.13.5", "@types/semver": "^7.2.0", - "@typescript-eslint/parser": "^5.4.0", + "@typescript-eslint/parser": "^5.5.0", "@vuepress/plugin-pwa": "^1.4.1", "acorn": "^8.5.0", "env-cmd": "^10.1.0", @@ -82,7 +82,7 @@ "mocha": "^7.1.2", "nyc": "^15.1.0", "prettier": "^2.4.1", - "typescript": "^4.5.0-0", + "typescript": "^4.5.0", "vue-eslint-editor": "^1.1.0", "vuepress": "^1.8.2" } diff --git a/tests/fixtures/script-indent/ts-import-assertion-01.vue b/tests/fixtures/script-indent/ts-import-assertion-01.vue new file mode 100644 index 000000000..f14761841 --- /dev/null +++ b/tests/fixtures/script-indent/ts-import-assertion-01.vue @@ -0,0 +1,9 @@ + + diff --git a/tests/fixtures/script-indent/ts-import-assertion-02.vue b/tests/fixtures/script-indent/ts-import-assertion-02.vue new file mode 100644 index 000000000..86fe80b4e --- /dev/null +++ b/tests/fixtures/script-indent/ts-import-assertion-02.vue @@ -0,0 +1,15 @@ + + diff --git a/tests/fixtures/script-indent/ts-import-assertion-03.vue b/tests/fixtures/script-indent/ts-import-assertion-03.vue new file mode 100644 index 000000000..ee88e92ce --- /dev/null +++ b/tests/fixtures/script-indent/ts-import-assertion-03.vue @@ -0,0 +1,10 @@ + + diff --git a/tests/fixtures/script-indent/ts-import-assertion-04.vue b/tests/fixtures/script-indent/ts-import-assertion-04.vue new file mode 100644 index 000000000..76d2f2860 --- /dev/null +++ b/tests/fixtures/script-indent/ts-import-assertion-04.vue @@ -0,0 +1,10 @@ + + diff --git a/tests/fixtures/script-indent/ts-type-only-import-export-01.vue b/tests/fixtures/script-indent/ts-type-only-import-export-01.vue new file mode 100644 index 000000000..97c6dc192 --- /dev/null +++ b/tests/fixtures/script-indent/ts-type-only-import-export-01.vue @@ -0,0 +1,17 @@ + + diff --git a/tests/fixtures/script-indent/ts-type-only-import-export-02.vue b/tests/fixtures/script-indent/ts-type-only-import-export-02.vue new file mode 100644 index 000000000..0ef5f1106 --- /dev/null +++ b/tests/fixtures/script-indent/ts-type-only-import-export-02.vue @@ -0,0 +1,23 @@ + + diff --git a/tests/fixtures/script-indent/ts-type-only-import-export-03.vue b/tests/fixtures/script-indent/ts-type-only-import-export-03.vue new file mode 100644 index 000000000..ca280f03c --- /dev/null +++ b/tests/fixtures/script-indent/ts-type-only-import-export-03.vue @@ -0,0 +1,26 @@ + + From 8a0b2c8142c4c413b84fcd31dc0e714a398bb30e Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Fri, 3 Dec 2021 12:07:44 +0100 Subject: [PATCH 005/455] Add new rule `vue/prefer-separate-static-class` (#1729) * Add new rule `vue/prefer-separate-static-class` * Also find static identifier object keys * Add auto-fix * Fix removing whole class directive if it's not empty * Simplify check with `property.computed` * Change rule type to `suggestion` * Make rule docs more consistent * Drop unnecessary `references` parameter --- docs/rules/README.md | 1 + docs/rules/prefer-separate-static-class.md | 43 +++ lib/index.js | 1 + lib/rules/prefer-separate-static-class.js | 231 ++++++++++++ .../lib/rules/prefer-separate-static-class.js | 333 ++++++++++++++++++ 5 files changed, 609 insertions(+) create mode 100644 docs/rules/prefer-separate-static-class.md create mode 100644 lib/rules/prefer-separate-static-class.js create mode 100644 tests/lib/rules/prefer-separate-static-class.js diff --git a/docs/rules/README.md b/docs/rules/README.md index 2af1c06ca..735dc87d0 100644 --- a/docs/rules/README.md +++ b/docs/rules/README.md @@ -351,6 +351,7 @@ For example: | [vue/no-useless-v-bind](./no-useless-v-bind.md) | disallow unnecessary `v-bind` directives | :wrench: | | [vue/no-v-text](./no-v-text.md) | disallow use of v-text | | | [vue/padding-line-between-blocks](./padding-line-between-blocks.md) | require or disallow padding lines between blocks | :wrench: | +| [vue/prefer-separate-static-class](./prefer-separate-static-class.md) | require static class names in template to be in a separate `class` attribute | :wrench: | | [vue/require-direct-export](./require-direct-export.md) | require the component to be directly exported | | | [vue/require-emit-validator](./require-emit-validator.md) | require type definitions in emits | :bulb: | | [vue/require-expose](./require-expose.md) | require declare public properties using `expose` | :bulb: | diff --git a/docs/rules/prefer-separate-static-class.md b/docs/rules/prefer-separate-static-class.md new file mode 100644 index 000000000..155c4fb5c --- /dev/null +++ b/docs/rules/prefer-separate-static-class.md @@ -0,0 +1,43 @@ +--- +pageClass: rule-details +sidebarDepth: 0 +title: vue/prefer-separate-static-class +description: require static class names in template to be in a separate `class` attribute +--- +# vue/prefer-separate-static-class + +> require static class names in template to be in a separate `class` attribute + +- :exclamation: ***This rule has not been released yet.*** +- :wrench: The `--fix` option on the [command line](https://eslint.org/docs/user-guide/command-line-interface#fixing-problems) can automatically fix some of the problems reported by this rule. + +## :book: Rule Details + +This rule reports static class names in dynamic class attributes. + + + +```vue + +``` + + + +## :wrench: Options + +Nothing. + +## :mag: Implementation + +- [Rule source](https://github.com/vuejs/eslint-plugin-vue/blob/master/lib/rules/prefer-separate-static-class.js) +- [Test source](https://github.com/vuejs/eslint-plugin-vue/blob/master/tests/lib/rules/prefer-separate-static-class.js) diff --git a/lib/index.js b/lib/index.js index 0adbf3f74..3c628c559 100644 --- a/lib/index.js +++ b/lib/index.js @@ -154,6 +154,7 @@ module.exports = { 'operator-linebreak': require('./rules/operator-linebreak'), 'order-in-components': require('./rules/order-in-components'), 'padding-line-between-blocks': require('./rules/padding-line-between-blocks'), + 'prefer-separate-static-class': require('./rules/prefer-separate-static-class'), 'prefer-template': require('./rules/prefer-template'), 'prop-name-casing': require('./rules/prop-name-casing'), 'require-component-is': require('./rules/require-component-is'), diff --git a/lib/rules/prefer-separate-static-class.js b/lib/rules/prefer-separate-static-class.js new file mode 100644 index 000000000..504d95d60 --- /dev/null +++ b/lib/rules/prefer-separate-static-class.js @@ -0,0 +1,231 @@ +/** + * @author Flo Edelmann + * See LICENSE file in root directory for full license. + */ +'use strict' + +// ------------------------------------------------------------------------------ +// Requirements +// ------------------------------------------------------------------------------ + +const { defineTemplateBodyVisitor, getStringLiteralValue } = require('../utils') + +// ------------------------------------------------------------------------------ +// Helpers +// ------------------------------------------------------------------------------ + +/** + * @param {ASTNode} node + * @returns {node is Literal | TemplateLiteral} + */ +function isStringLiteral(node) { + return ( + (node.type === 'Literal' && typeof node.value === 'string') || + (node.type === 'TemplateLiteral' && node.expressions.length === 0) + ) +} + +/** + * @param {Expression | VForExpression | VOnExpression | VSlotScopeExpression | VFilterSequenceExpression} expressionNode + * @returns {(Literal | TemplateLiteral | Identifier)[]} + */ +function findStaticClasses(expressionNode) { + if (isStringLiteral(expressionNode)) { + return [expressionNode] + } + + if (expressionNode.type === 'ArrayExpression') { + return expressionNode.elements.flatMap((element) => { + if (element === null || element.type === 'SpreadElement') { + return [] + } + return findStaticClasses(element) + }) + } + + if (expressionNode.type === 'ObjectExpression') { + return expressionNode.properties.flatMap((property) => { + if ( + property.type === 'Property' && + property.value.type === 'Literal' && + property.value.value === true && + (isStringLiteral(property.key) || + (property.key.type === 'Identifier' && !property.computed)) + ) { + return [property.key] + } + return [] + }) + } + + return [] +} + +/** + * @param {VAttribute | VDirective} attributeNode + * @returns {attributeNode is VAttribute & { value: VLiteral }} + */ +function isStaticClassAttribute(attributeNode) { + return ( + !attributeNode.directive && + attributeNode.key.name === 'class' && + attributeNode.value !== null + ) +} + +/** + * Removes the node together with the comma before or after the node. + * @param {RuleFixer} fixer + * @param {ParserServices.TokenStore} tokenStore + * @param {ASTNode} node + */ +function* removeNodeWithComma(fixer, tokenStore, node) { + const prevToken = tokenStore.getTokenBefore(node) + if (prevToken.type === 'Punctuator' && prevToken.value === ',') { + yield fixer.removeRange([prevToken.range[0], node.range[1]]) + return + } + + const [nextToken, nextNextToken] = tokenStore.getTokensAfter(node, { + count: 2 + }) + if ( + nextToken.type === 'Punctuator' && + nextToken.value === ',' && + (nextNextToken.type !== 'Punctuator' || + (nextNextToken.value !== ']' && nextNextToken.value !== '}')) + ) { + yield fixer.removeRange([node.range[0], nextNextToken.range[0]]) + return + } + + yield fixer.remove(node) +} + +// ------------------------------------------------------------------------------ +// Rule Definition +// ------------------------------------------------------------------------------ + +module.exports = { + meta: { + type: 'suggestion', + docs: { + description: + 'require static class names in template to be in a separate `class` attribute', + categories: undefined, + url: 'https://eslint.vuejs.org/rules/prefer-separate-static-class.html' + }, + fixable: 'code', + schema: [], + messages: { + preferSeparateStaticClass: + 'Static class "{{className}}" should be in a static `class` attribute.' + } + }, + /** @param {RuleContext} context */ + create(context) { + return defineTemplateBodyVisitor(context, { + /** @param {VDirectiveKey} directiveKeyNode */ + "VAttribute[directive=true] > VDirectiveKey[name.name='bind'][argument.name='class']"( + directiveKeyNode + ) { + const attributeNode = directiveKeyNode.parent + if (!attributeNode.value || !attributeNode.value.expression) { + return + } + + const expressionNode = attributeNode.value.expression + const staticClassNameNodes = findStaticClasses(expressionNode) + + for (const staticClassNameNode of staticClassNameNodes) { + const className = + staticClassNameNode.type === 'Identifier' + ? staticClassNameNode.name + : getStringLiteralValue(staticClassNameNode, true) + + if (className === null) { + continue + } + + context.report({ + node: staticClassNameNode, + messageId: 'preferSeparateStaticClass', + data: { className }, + *fix(fixer) { + let dynamicClassDirectiveRemoved = false + + yield* removeFromClassDirective() + yield* addToClassAttribute() + + /** + * Remove class from dynamic `:class` directive. + */ + function* removeFromClassDirective() { + if (isStringLiteral(expressionNode)) { + yield fixer.remove(attributeNode) + dynamicClassDirectiveRemoved = true + return + } + + const listElement = + staticClassNameNode.parent.type === 'Property' + ? staticClassNameNode.parent + : staticClassNameNode + + const listNode = listElement.parent + if ( + listNode.type === 'ArrayExpression' || + listNode.type === 'ObjectExpression' + ) { + const elements = + listNode.type === 'ObjectExpression' + ? listNode.properties + : listNode.elements + + if (elements.length === 1 && listNode === expressionNode) { + yield fixer.remove(attributeNode) + dynamicClassDirectiveRemoved = true + return + } + + const tokenStore = + context.parserServices.getTemplateBodyTokenStore() + + if (elements.length === 1) { + yield* removeNodeWithComma(fixer, tokenStore, listNode) + return + } + + yield* removeNodeWithComma(fixer, tokenStore, listElement) + } + } + + /** + * Add class to static `class` attribute. + */ + function* addToClassAttribute() { + const existingStaticClassAttribute = + attributeNode.parent.attributes.find(isStaticClassAttribute) + if (existingStaticClassAttribute) { + const literalNode = existingStaticClassAttribute.value + yield fixer.replaceText( + literalNode, + `"${literalNode.value} ${className}"` + ) + return + } + + // new static `class` attribute + const separator = dynamicClassDirectiveRemoved ? '' : ' ' + yield fixer.insertTextBefore( + attributeNode, + `class="${className}"${separator}` + ) + } + } + }) + } + } + }) + } +} diff --git a/tests/lib/rules/prefer-separate-static-class.js b/tests/lib/rules/prefer-separate-static-class.js new file mode 100644 index 000000000..498fc90dd --- /dev/null +++ b/tests/lib/rules/prefer-separate-static-class.js @@ -0,0 +1,333 @@ +/** + * @author Flo Edelmann + * See LICENSE file in root directory for full license. + */ +'use strict' + +const RuleTester = require('eslint').RuleTester +const rule = require('../../../lib/rules/prefer-separate-static-class') + +const tester = new RuleTester({ + parser: require.resolve('vue-eslint-parser'), + parserOptions: { + ecmaVersion: 2020, + sourceType: 'module' + } +}) + +tester.run('prefer-separate-static-class', rule, { + valid: [ + { + filename: 'test.vue', + code: `` + }, + { + filename: 'test.vue', + code: `` + }, + { + filename: 'test.vue', + code: '' + }, + { + filename: 'test.vue', + code: `` + }, + { + filename: 'test.vue', + code: `` + }, + { + filename: 'test.vue', + code: `` + }, + { + filename: 'test.vue', + code: `` + }, + { + filename: 'test.vue', + code: `` + }, + { + filename: 'test.vue', + code: `` + } + ], + invalid: [ + { + filename: 'test.vue', + code: ``, + output: ``, + errors: [ + { + message: + 'Static class "static-class" should be in a static `class` attribute.', + line: 1, + endLine: 1, + column: 30, + endColumn: 44 + } + ] + }, + { + filename: 'test.vue', + code: ``, + output: ``, + errors: [ + { + message: + 'Static class "static-class" should be in a static `class` attribute.', + line: 1, + endLine: 1, + column: 24, + endColumn: 38 + } + ] + }, + { + filename: 'test.vue', + code: '', + output: '', + errors: [ + { + message: + 'Static class "static-class" should be in a static `class` attribute.', + line: 1, + endLine: 1, + column: 24, + endColumn: 38 + } + ] + }, + { + filename: 'test.vue', + code: ``, + output: ``, + errors: [ + { + message: + 'Static class "static-class" should be in a static `class` attribute.', + line: 1, + endLine: 1, + column: 24, + endColumn: 38 + } + ] + }, + { + filename: 'test.vue', + code: ``, + output: ``, + errors: [ + { + message: + 'Static class "static-class" should be in a static `class` attribute.', + line: 1, + endLine: 1, + column: 25, + endColumn: 39 + } + ] + }, + { + filename: 'test.vue', + code: ``, + output: ``, + errors: [ + { + message: + 'Static class "static-class" should be in a static `class` attribute.', + line: 1, + endLine: 1, + column: 25, + endColumn: 39 + } + ] + }, + { + filename: 'test.vue', + code: ``, + output: ``, + errors: [ + { + message: + 'Static class "foo" should be in a static `class` attribute.', + line: 1, + endLine: 1, + column: 25, + endColumn: 28 + } + ] + }, + { + filename: 'test.vue', + code: ``, + output: ``, + errors: [ + { + message: + 'Static class "static-class" should be in a static `class` attribute.', + line: 1, + endLine: 1, + column: 26, + endColumn: 40 + } + ] + }, + { + filename: 'test.vue', + code: ``, + output: ``, + errors: [ + { + message: + 'Static class "static-class" should be in a static `class` attribute.', + line: 1, + endLine: 1, + column: 25, + endColumn: 39 + } + ] + }, + { + filename: 'test.vue', + code: ``, + output: ``, + errors: [ + { + message: + 'Static class "static-class" should be in a static `class` attribute.', + line: 1, + endLine: 1, + column: 58, + endColumn: 72 + } + ] + }, + { + filename: 'test.vue', + code: ``, + output: ``, + errors: [ + { + message: + 'Static class "static-class" should be in a static `class` attribute.', + line: 1, + endLine: 1, + column: 25, + endColumn: 39 + } + ] + }, + { + filename: 'test.vue', + code: ``, + output: ``, + errors: [ + { + message: + 'Static class "static-class" should be in a static `class` attribute.', + line: 1, + endLine: 1, + column: 48, + endColumn: 62 + } + ] + }, + { + filename: 'test.vue', + code: ``, + output: ``, + errors: [ + { + message: + 'Static class "staticClass" should be in a static `class` attribute.', + line: 1, + endLine: 1, + column: 40, + endColumn: 51 + } + ] + }, + { + filename: 'test.vue', + code: ` + + `, + output: ` + + `, + errors: [ + { + message: + 'Static class "static-class" should be in a static `class` attribute.', + line: 7, + endLine: 7, + column: 40, + endColumn: 54 + } + ] + }, + { + filename: 'test.vue', + code: ` + + `, + output: ` + + `, + errors: [ + { + message: + 'Static class "static-class-a" should be in a static `class` attribute.', + line: 7, + endLine: 7, + column: 15, + endColumn: 31 + }, + { + message: + 'Static class "static-class-b" should be in a static `class` attribute.', + line: 8, + endLine: 8, + column: 16, + endColumn: 32 + } + ] + } + ] +}) From 09d7bedc52678e87fd68af0a0f894d77d7765fc3 Mon Sep 17 00:00:00 2001 From: Yosuke Ota Date: Fri, 3 Dec 2021 23:23:36 +0900 Subject: [PATCH 006/455] Fix false positives for import binding in `vue/valid-define-emits` and `vue/valid-define-props` rules (#1736) * Fix false positives for import binding in `vue/valid-define-emits` and `vue/valid-define-props` rules * Apply suggestions from code review Co-authored-by: Flo Edelmann * fix Co-authored-by: Flo Edelmann --- lib/rules/valid-define-emits.js | 1 + lib/rules/valid-define-props.js | 1 + tests/lib/rules/valid-define-emits.js | 10 ++++++++++ tests/lib/rules/valid-define-props.js | 10 ++++++++++ 4 files changed, 22 insertions(+) diff --git a/lib/rules/valid-define-emits.js b/lib/rules/valid-define-emits.js index 6f433a835..d7480d538 100644 --- a/lib/rules/valid-define-emits.js +++ b/lib/rules/valid-define-emits.js @@ -79,6 +79,7 @@ module.exports = { variable.defs.length && variable.defs.every( (def) => + def.type !== 'ImportBinding' && utils.inRange(scriptSetup.range, def.name) && !utils.inRange(defineEmits.range, def.name) ) diff --git a/lib/rules/valid-define-props.js b/lib/rules/valid-define-props.js index 3a084dd68..849437b1e 100644 --- a/lib/rules/valid-define-props.js +++ b/lib/rules/valid-define-props.js @@ -80,6 +80,7 @@ module.exports = { variable.defs.length && variable.defs.every( (def) => + def.type !== 'ImportBinding' && utils.inRange(scriptSetup.range, def.name) && !utils.inRange(defineProps.range, def.name) ) diff --git a/tests/lib/rules/valid-define-emits.js b/tests/lib/rules/valid-define-emits.js index 557101d67..dd0b1f88f 100644 --- a/tests/lib/rules/valid-define-emits.js +++ b/tests/lib/rules/valid-define-emits.js @@ -117,6 +117,16 @@ tester.run('valid-define-emits', rule, { }); ` + }, + { + filename: 'test.vue', + code: ` + ` } ], invalid: [ diff --git a/tests/lib/rules/valid-define-props.js b/tests/lib/rules/valid-define-props.js index 10894e069..2d866274b 100644 --- a/tests/lib/rules/valid-define-props.js +++ b/tests/lib/rules/valid-define-props.js @@ -120,6 +120,16 @@ tester.run('valid-define-props', rule, { }); ` + }, + { + filename: 'test.vue', + code: ` + ` } ], invalid: [ From 024c8d837a092ae7153f0eb74bdb2363f85b5270 Mon Sep 17 00:00:00 2001 From: Flo Edelmann Date: Sat, 4 Dec 2021 14:07:12 +0100 Subject: [PATCH 007/455] Add built-in component tests in `vue/component-name-in-template-casing` (#1737) --- .../component-name-in-template-casing.js | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/tests/lib/rules/component-name-in-template-casing.js b/tests/lib/rules/component-name-in-template-casing.js index baeb66433..4c4d9f5cb 100644 --- a/tests/lib/rules/component-name-in-template-casing.js +++ b/tests/lib/rules/component-name-in-template-casing.js @@ -69,6 +69,10 @@ tester.run('component-name-in-template-casing', rule, { code: '', options: ['PascalCase', { registeredComponentsOnly: false }] }, + { + code: '', + options: ['PascalCase', { registeredComponentsOnly: false }] + }, { code: '', options: ['PascalCase', { registeredComponentsOnly: false }] @@ -151,6 +155,19 @@ tester.run('component-name-in-template-casing', rule, { { code: ' ` + }, + { + filename: 'test.vue', + code: unIndent` + `, - options: ['always', { exceptions: ['#+#-'] }], output: ` `, + options: ['always', { exceptions: ['#+#-'] }], errors: [ 'Expected line break after exception block.', "Expected line break before '-->'." @@ -432,8 +426,8 @@ comment `, - options: ['always', { exceptions: ['*', '++'] }], output: null, + options: ['always', { exceptions: ['*', '++'] }], errors: [ 'Expected line break after exception block.', { @@ -449,8 +443,8 @@ comment `, - options: ['always', { exceptions: ['*', '++'] }], output: null, + options: ['always', { exceptions: ['*', '++'] }], errors: [ 'Expected line break after exception block.', { diff --git a/tests/lib/rules/html-comment-content-spacing.js b/tests/lib/rules/html-comment-content-spacing.js index b29c1a960..ed3e5d4c4 100644 --- a/tests/lib/rules/html-comment-content-spacing.js +++ b/tests/lib/rules/html-comment-content-spacing.js @@ -16,13 +16,11 @@ const tester = new RuleTester({ }) tester.run('html-comment-content-spacing', rule, { valid: [ - { - code: ` - - ` - }, + ` + + `, { code: ` `, - options: ['always'], output: ` `, + options: ['always'], errors: [ { message: "Expected space after ' `, - options: ['never'], output: ` `, + options: ['never'], errors: [ { message: "Unexpected space after ' `, - options: ['never'], output: ` `, + options: ['never'], errors: [ { message: "Unexpected space after ' `, - options: ['always', { exceptions: ['+'] }], output: null, + options: ['always', { exceptions: ['+'] }], errors: [ 'Expected space after exception block.', 'Expected space before exception block.' @@ -300,8 +294,8 @@ tester.run('html-comment-content-spacing', rule, { `, - options: ['always', { exceptions: ['*'] }], output: null, + options: ['always', { exceptions: ['*'] }], errors: [ 'Expected space after exception block.', 'Expected space before exception block.' @@ -313,12 +307,12 @@ tester.run('html-comment-content-spacing', rule, { `, - options: ['always', { exceptions: ['#+#-'] }], output: ` `, + options: ['always', { exceptions: ['#+#-'] }], errors: [ 'Expected space after exception block.', "Expected space before '-->'." @@ -330,8 +324,8 @@ tester.run('html-comment-content-spacing', rule, { `, - options: ['always', { exceptions: ['*', '++'] }], output: null, + options: ['always', { exceptions: ['*', '++'] }], errors: [ 'Expected space after exception block.', { @@ -347,8 +341,8 @@ tester.run('html-comment-content-spacing', rule, { `, - options: ['always', { exceptions: ['*', '++'] }], output: null, + options: ['always', { exceptions: ['*', '++'] }], errors: [ 'Expected space after exception block.', { diff --git a/tests/lib/rules/html-comment-indent.js b/tests/lib/rules/html-comment-indent.js index 4ec5c6ee2..12880167e 100644 --- a/tests/lib/rules/html-comment-indent.js +++ b/tests/lib/rules/html-comment-indent.js @@ -16,23 +16,21 @@ const tester = new RuleTester({ }) tester.run('html-comment-indent', rule, { valid: [ - { - code: ` - + `, { code: ` + `, // IE conditional comments - { - code: ` - - ` - }, - { - code: ` - - ` - } + ` + + `, + ` + + ` ], invalid: [ @@ -232,7 +224,6 @@ tester.run('html-comment-indent', rule, { --> `, - options: ['tab'], output: ` `, + options: ['tab'], errors: [ { message: 'Expected relative indentation of 1 tab but found 0 tabs.', @@ -318,7 +310,6 @@ tester.run('html-comment-indent', rule, { --> `, - options: [4], output: ` `, + options: [4], errors: [ { message: @@ -407,7 +399,6 @@ tester.run('html-comment-indent', rule, { --> `, - options: [0], output: ` `, + options: [0], errors: [ { message: diff --git a/tests/lib/rules/html-end-tags.js b/tests/lib/rules/html-end-tags.js index b60c9848a..0d795875d 100644 --- a/tests/lib/rules/html-end-tags.js +++ b/tests/lib/rules/html-end-tags.js @@ -62,6 +62,7 @@ tester.run('html-end-tags', rule, { // https://github.com/vuejs/eslint-plugin-vue/issues/1403 { + filename: 'test.vue', code: ` - `, - filename: 'test.vue' + ` } ], invalid: [ diff --git a/tests/lib/rules/html-self-closing.js b/tests/lib/rules/html-self-closing.js index 5589c3da1..11ae3c6cf 100644 --- a/tests/lib/rules/html-self-closing.js +++ b/tests/lib/rules/html-self-closing.js @@ -69,6 +69,7 @@ tester.run('html-self-closing', rule, { // https://github.com/vuejs/eslint-plugin-vue/issues/1403 { + filename: 'test.vue', code: ` - `, - filename: 'test.vue' + ` } // other cases are in `invalid` tests. diff --git a/tests/lib/rules/jsx-uses-vars.js b/tests/lib/rules/jsx-uses-vars.js index 895093da7..3a2c7e82b 100644 --- a/tests/lib/rules/jsx-uses-vars.js +++ b/tests/lib/rules/jsx-uses-vars.js @@ -27,8 +27,7 @@ linter.defineRule('jsx-uses-vars', rule) describe('jsx-uses-vars', () => { ruleTester.run('no-unused-vars', ruleNoUnusedVars, { valid: [ - { - code: ` + ` /* eslint jsx-uses-vars: 1 */ import SomeComponent from './SomeComponent.jsx'; export default { @@ -38,10 +37,8 @@ describe('jsx-uses-vars', () => { ) }, }; + `, ` - }, - { - code: ` /* eslint jsx-uses-vars: 1 */ import SomeComponent from './SomeComponent.vue'; import OtherComponent from './OtherComponent.vue'; @@ -63,10 +60,8 @@ describe('jsx-uses-vars', () => { ) } } + `, ` - }, - { - code: ` /* eslint jsx-uses-vars: 1 */ export default { render () { @@ -76,7 +71,6 @@ describe('jsx-uses-vars', () => { } } ` - } ], invalid: [ diff --git a/tests/lib/rules/key-spacing.js b/tests/lib/rules/key-spacing.js index 519230e23..3d8d48a22 100644 --- a/tests/lib/rules/key-spacing.js +++ b/tests/lib/rules/key-spacing.js @@ -31,8 +31,8 @@ tester.run('key-spacing', rule, { }, { code: '', - options: [{ beforeColon: true }], output: '', + options: [{ beforeColon: true }], errors: [ "Missing space after key 'a'.", "Missing space before value for key 'a'." diff --git a/tests/lib/rules/keyword-spacing.js b/tests/lib/rules/keyword-spacing.js index dad5574e5..dadd553b7 100644 --- a/tests/lib/rules/keyword-spacing.js +++ b/tests/lib/rules/keyword-spacing.js @@ -101,7 +101,6 @@ tester.run('keyword-spacing', rule, { } " /> `, - options: [{ before: false, after: false }], output: ``, + options: [{ before: false, after: false }], errors: [ { message: 'Unexpected space(s) after "if".', diff --git a/tests/lib/rules/max-attributes-per-line.js b/tests/lib/rules/max-attributes-per-line.js index 252bd22c1..fdee711e7 100644 --- a/tests/lib/rules/max-attributes-per-line.js +++ b/tests/lib/rules/max-attributes-per-line.js @@ -14,23 +14,17 @@ const ruleTester = new RuleTester({ ruleTester.run('max-attributes-per-line', rule, { valid: [ - { - code: `` - }, - { - code: ``, + `` - }, - { - code: ``, + `` - }, + `, { code: ``, }, { code: ``, - options: [{ singleline: { max: 2 } }], output: ``, + options: [{ singleline: { max: 2 } }], errors: [ { message: "'job' should be on a new line.", @@ -110,13 +102,13 @@ job="Vet">`, job="Vet"> `, - options: [{ singleline: 3, multiline: 1 }], output: ``, + options: [{ singleline: 3, multiline: 1 }], errors: [ { message: "'age' should be on a new line.", @@ -131,13 +123,13 @@ age="30" job="Vet"> `, - options: [{ multiline: { max: 1 } }], output: ``, + options: [{ multiline: { max: 1 } }], errors: [ { message: "'age' should be on a new line.", diff --git a/tests/lib/rules/max-len.js b/tests/lib/rules/max-len.js index 3ff9f2dff..a1141ec22 100644 --- a/tests/lib/rules/max-len.js +++ b/tests/lib/rules/max-len.js @@ -1075,33 +1075,33 @@ var a = /regexploooooooooooooooooooooooooooooooooooooooooooooooooooooong/.test(b { filename: 'test.vue', code: ``, - errors: ['This line has a length of 41. Maximum allowed is 40.'], - options: [40] + options: [40], + errors: ['This line has a length of 41. Maximum allowed is 40.'] }, { filename: 'test.vue', code: ``, - errors: ['This line has a length of 41. Maximum allowed is 40.'], - options: [{ code: 40 }] + options: [{ code: 40 }], + errors: ['This line has a length of 41. Maximum allowed is 40.'] }, // tabWidth { filename: 'test.vue', code: ``, - errors: ['This line has a length of 45. Maximum allowed is 40.'], - options: [40, 4] + options: [40, 4], + errors: ['This line has a length of 45. Maximum allowed is 40.'] }, { filename: 'test.vue', code: ``, - errors: ['This line has a length of 45. Maximum allowed is 40.'], - options: [{ code: 40, tabWidth: 4 }] + options: [{ code: 40, tabWidth: 4 }], + errors: ['This line has a length of 45. Maximum allowed is 40.'] }, { filename: 'test.vue', code: ``, - errors: ['This line has a length of 44. Maximum allowed is 40.'], - options: [{ code: 40, tabWidth: 3 }] + options: [{ code: 40, tabWidth: 3 }], + errors: ['This line has a length of 44. Maximum allowed is 40.'] }, // comments { @@ -1122,6 +1122,7 @@ var a; // 41 cols comment * */ `, + options: [{ comments: 40 }], errors: [ { message: @@ -1148,8 +1149,7 @@ var a; // 41 cols comment * 'This line has a comment length of 41. Maximum allowed is 40.', line: 13 } - ], - options: [{ comments: 40 }] + ] }, // .js { @@ -1159,6 +1159,7 @@ var a = '81 columns ' var b = \`81 columns \`; /* 81 columns */ `, + options: [], errors: [ { message: 'This line has a length of 81. Maximum allowed is 80.', @@ -1172,8 +1173,7 @@ var b = \`81 columns message: 'This line has a length of 81. Maximum allowed is 80.', line: 4 } - ], - options: [] + ] }, { filename: 'test.js', @@ -1182,6 +1182,7 @@ var a = '81 columns ignoreStrings ' var b = \`81 columns \`; /* 81 columns */ `, + options: [{ ignoreStrings: true }], errors: [ { message: 'This line has a length of 81. Maximum allowed is 80.', @@ -1191,8 +1192,7 @@ var b = \`81 columns message: 'This line has a length of 81. Maximum allowed is 80.', line: 4 } - ], - options: [{ ignoreStrings: true }] + ] }, { filename: 'test.js', @@ -1201,6 +1201,7 @@ var a = '81 columns ' var b = \`81 columns \`; /* 81 columns */ `, + options: [{ ignoreComments: true }], errors: [ { message: 'This line has a length of 81. Maximum allowed is 80.', @@ -1210,8 +1211,7 @@ var b = \`81 columns message: 'This line has a length of 81. Maximum allowed is 80.', line: 3 } - ], - options: [{ ignoreComments: true }] + ] }, // only script comment { @@ -1222,6 +1222,7 @@ var b = \`81 columns 41 cols * */ `, + options: [{ comments: 40 }], errors: [ { message: @@ -1238,8 +1239,7 @@ var b = \`81 columns 'This line has a comment length of 41. Maximum allowed is 40.', line: 4 } - ], - options: [{ comments: 40 }] + ] } ] }) diff --git a/tests/lib/rules/multi-word-component-names.js b/tests/lib/rules/multi-word-component-names.js index 96302eec8..3d68364bc 100644 --- a/tests/lib/rules/multi-word-component-names.js +++ b/tests/lib/rules/multi-word-component-names.js @@ -165,14 +165,14 @@ tester.run('multi-word-component-names', rule, { }, { filename: 'test.vue', - options: [{ ignores: ['Todo'] }], code: ` - ` + `, + options: [{ ignores: ['Todo'] }] }, { filename: 'test.js', @@ -314,7 +314,6 @@ tester.run('multi-word-component-names', rule, { }, { filename: 'test.vue', - options: [{ ignores: ['Todo'] }], code: ` `, + options: [{ ignores: ['Todo'] }], errors: [ { message: 'Component name "Item" should always be multi-word.', diff --git a/tests/lib/rules/multiline-html-element-content-newline.js b/tests/lib/rules/multiline-html-element-content-newline.js index d06982955..2d68c7685 100644 --- a/tests/lib/rules/multiline-html-element-content-newline.js +++ b/tests/lib/rules/multiline-html-element-content-newline.js @@ -566,7 +566,6 @@ content
`, - options: [{ allowEmptyLines: true, ignoreWhenEmpty: false }], output: ` `, + options: [{ allowEmptyLines: true, ignoreWhenEmpty: false }], errors: [ 'Expected 1 line break after opening tag (`
`), but no line breaks found.' ] @@ -594,7 +594,6 @@ content content
`, - options: [{ allowEmptyLines: true }], output: ` `, + options: [{ allowEmptyLines: true }], errors: [ 'Expected 1 line break after opening tag (`
`), but no line breaks found.', 'Expected 1 line break before closing tag (`
`), but no line breaks found.' diff --git a/tests/lib/rules/multiline-ternary.js b/tests/lib/rules/multiline-ternary.js index 2922f0e65..d79e82eff 100644 --- a/tests/lib/rules/multiline-ternary.js +++ b/tests/lib/rules/multiline-ternary.js @@ -92,6 +92,7 @@ tester.run('multiline-ternary', rule, { ` : null, + options: ['always-multiline'], errors: [ { message: @@ -99,8 +100,7 @@ tester.run('multiline-ternary', rule, { line: 5, column: 15 } - ], - options: ['always-multiline'] + ] }, { filename: 'test.vue', @@ -123,6 +123,7 @@ tester.run('multiline-ternary', rule, { ` : null, + options: ['never'], errors: [ { message: @@ -130,8 +131,7 @@ tester.run('multiline-ternary', rule, { line: 4, column: 21 } - ], - options: ['never'] + ] }, { filename: 'test.vue', diff --git a/tests/lib/rules/new-line-between-multi-line-property.js b/tests/lib/rules/new-line-between-multi-line-property.js index a302cca7e..31983d7b0 100644 --- a/tests/lib/rules/new-line-between-multi-line-property.js +++ b/tests/lib/rules/new-line-between-multi-line-property.js @@ -280,7 +280,6 @@ ruleTester.run('new-line-between-multi-line-property', rule, { // test set insertLine and minLineOfMultilineProperty to 5 { filename: 'test.vue', - options: [{ minLineOfMultilineProperty: 5 }], code: ` `, + options: [{ minLineOfMultilineProperty: 5 }], errors: [ { message: @@ -331,7 +331,6 @@ ruleTester.run('new-line-between-multi-line-property', rule, { // test js comments { filename: 'test.vue', - options: [{ minLineOfMultilineProperty: 5 }], code: ` `, + options: [{ minLineOfMultilineProperty: 5 }], errors: [ { message: @@ -384,7 +384,6 @@ ruleTester.run('new-line-between-multi-line-property', rule, { // test js doc { filename: 'test.vue', - options: [], code: ` `, + options: [], errors: [ { message: diff --git a/tests/lib/rules/next-tick-style.js b/tests/lib/rules/next-tick-style.js index 24ef50a8e..28e2d338c 100644 --- a/tests/lib/rules/next-tick-style.js +++ b/tests/lib/rules/next-tick-style.js @@ -40,7 +40,6 @@ tester.run('next-tick-style', rule, { }, { filename: 'test.vue', - options: ['promise'], code: `` + }`, + options: ['promise'] }, { filename: 'test.vue', - options: ['callback'], code: `` + }`, + options: ['callback'] }, // https://github.com/vuejs/eslint-plugin-vue/pull/1400#discussion_r550937977 { filename: 'test.vue', - options: ['promise'], code: `` + }`, + options: ['promise'] }, { filename: 'test.vue', - options: ['callback'], code: `` + }`, + options: ['callback'] } ], invalid: [ @@ -173,7 +173,6 @@ tester.run('next-tick-style', rule, { }, { filename: 'test.vue', - options: ['promise'], code: ``, + options: ['promise'], errors: [ { message: @@ -239,7 +239,6 @@ tester.run('next-tick-style', rule, { }, { filename: 'test.vue', - options: ['callback'], code: ``, output: null, + options: ['callback'], errors: [ { message: diff --git a/tests/lib/rules/no-async-in-computed-properties.js b/tests/lib/rules/no-async-in-computed-properties.js index 31950ec5d..2e150b021 100644 --- a/tests/lib/rules/no-async-in-computed-properties.js +++ b/tests/lib/rules/no-async-in-computed-properties.js @@ -303,11 +303,6 @@ ruleTester.run('no-async-in-computed-properties', rule, { { // https://github.com/vuejs/eslint-plugin-vue/issues/1690 filename: 'test.vue', - parser, - parserOptions: { - sourceType: 'module', - ecmaVersion: 2020 - }, code: ` `, - output: ` - `, + output: null, errors: [ '`slot` attributes are deprecated.', '`slot` attributes are deprecated.' diff --git a/tests/lib/rules/no-deprecated-v-bind-sync.js b/tests/lib/rules/no-deprecated-v-bind-sync.js index 626993731..c02342a86 100644 --- a/tests/lib/rules/no-deprecated-v-bind-sync.js +++ b/tests/lib/rules/no-deprecated-v-bind-sync.js @@ -68,7 +68,7 @@ ruleTester.run('no-deprecated-v-bind-sync', rule, { { filename: 'test.vue', code: "", - output: "", + output: null, errors: [ "'.sync' modifier on 'v-bind' directive is deprecated. Use 'v-model:propName' instead." ] @@ -76,7 +76,7 @@ ruleTester.run('no-deprecated-v-bind-sync', rule, { { filename: 'test.vue', code: '', - output: '', + output: null, errors: [ "'.sync' modifier on 'v-bind' directive is deprecated. Use 'v-model:propName' instead." ] @@ -84,8 +84,7 @@ ruleTester.run('no-deprecated-v-bind-sync', rule, { { filename: 'test.vue', code: '', - output: - '', + output: null, errors: [ "'.sync' modifier on 'v-bind' directive is deprecated. Use 'v-model:propName' instead." ] diff --git a/tests/lib/rules/no-duplicate-attributes.js b/tests/lib/rules/no-duplicate-attributes.js index 25f6fe5dc..b47611184 100644 --- a/tests/lib/rules/no-duplicate-attributes.js +++ b/tests/lib/rules/no-duplicate-attributes.js @@ -73,26 +73,26 @@ tester.run('no-duplicate-attributes', rule, { { filename: 'test.vue', code: '', - errors: ["Duplicate attribute 'style'."], - options: [{ allowCoexistStyle: false }] + options: [{ allowCoexistStyle: false }], + errors: ["Duplicate attribute 'style'."] }, { filename: 'test.vue', code: '', - errors: ["Duplicate attribute 'class'."], - options: [{ allowCoexistClass: false }] + options: [{ allowCoexistClass: false }], + errors: ["Duplicate attribute 'class'."] }, { filename: 'test.vue', code: '', - errors: ["Duplicate attribute 'style'."], - options: [{ allowCoexistStyle: false }] + options: [{ allowCoexistStyle: false }], + errors: ["Duplicate attribute 'style'."] }, { filename: 'test.vue', code: '', - errors: ["Duplicate attribute 'class'."], - options: [{ allowCoexistClass: false }] + options: [{ allowCoexistClass: false }], + errors: ["Duplicate attribute 'class'."] } ] }) diff --git a/tests/lib/rules/no-multiple-template-root.js b/tests/lib/rules/no-multiple-template-root.js index 167dc6385..e57afd188 100644 --- a/tests/lib/rules/no-multiple-template-root.js +++ b/tests/lib/rules/no-multiple-template-root.js @@ -49,6 +49,7 @@ ruleTester.run('no-multiple-template-root', rule, { // https://github.com/vuejs/eslint-plugin-vue/issues/1439 { + filename: 'test.vue', code: ` - `, - filename: 'test.vue' + ` } ], invalid: [ diff --git a/tests/lib/rules/no-parsing-error.js b/tests/lib/rules/no-parsing-error.js index 7eb295c4b..54500f18c 100644 --- a/tests/lib/rules/no-parsing-error.js +++ b/tests/lib/rules/no-parsing-error.js @@ -206,6 +206,7 @@ tester.run('no-parsing-error', rule, { // https://github.com/vuejs/eslint-plugin-vue/issues/1403 { + filename: 'test.vue', code: ` - `, - filename: 'test.vue' + ` } ], invalid: [ diff --git a/tests/lib/rules/no-potential-component-option-typo.js b/tests/lib/rules/no-potential-component-option-typo.js index 2b85fc999..68ea21901 100644 --- a/tests/lib/rules/no-potential-component-option-typo.js +++ b/tests/lib/rules/no-potential-component-option-typo.js @@ -174,6 +174,7 @@ tester.run('no-potential-component-option-typo', rule, { method: {} } `, + options: [{ custom: ['data', 'methods'] }], errors: [ { message: "'dat' may be a typo, which is similar to option [data].", @@ -209,8 +210,7 @@ tester.run('no-potential-component-option-typo', rule, { } ] } - ], - options: [{ custom: ['data', 'methods'] }] + ] }, // test if user define custom rule is duplicate with presets // test custom option that is not available in the presets @@ -224,6 +224,9 @@ tester.run('no-potential-component-option-typo', rule, { custo: {} } `, + options: [ + { custom: ['data', 'methods', 'custom', 'foo'], presets: ['all'] } + ], errors: [ { message: "'dat' may be a typo, which is similar to option [data].", @@ -279,9 +282,6 @@ tester.run('no-potential-component-option-typo', rule, { } ] } - ], - options: [ - { custom: ['data', 'methods', 'custom', 'foo'], presets: ['all'] } ] }, // test if report correctly, only have preset option @@ -294,6 +294,7 @@ tester.run('no-potential-component-option-typo', rule, { method: {} } `, + options: [{ presets: ['vue'] }], errors: [ { message: "'dat' may be a typo, which is similar to option [data].", @@ -329,8 +330,7 @@ tester.run('no-potential-component-option-typo', rule, { } ] } - ], - options: [{ presets: ['vue'] }] + ] }, // multi preset report typo { @@ -343,6 +343,7 @@ tester.run('no-potential-component-option-typo', rule, { method: {} } `, + options: [{ presets: ['vue', 'vue-router'] }], errors: [ { message: "'dat' may be a typo, which is similar to option [data].", @@ -399,8 +400,7 @@ tester.run('no-potential-component-option-typo', rule, { } ] } - ], - options: [{ presets: ['vue', 'vue-router'] }] + ] }, // test multi suggestion { @@ -411,6 +411,7 @@ tester.run('no-potential-component-option-typo', rule, { method: {} } `, + options: [{ custom: ['data', 'methods'], threshold: 10, presets: [] }], errors: [ { message: `'method' may be a typo, which is similar to option [methods,data].`, @@ -437,8 +438,7 @@ tester.run('no-potential-component-option-typo', rule, { } ] } - ], - options: [{ custom: ['data', 'methods'], threshold: 10, presets: [] }] + ] } ] }) diff --git a/tests/lib/rules/no-ref-as-operand.js b/tests/lib/rules/no-ref-as-operand.js index 1cdbb1041..a932ff1c2 100644 --- a/tests/lib/rules/no-ref-as-operand.js +++ b/tests/lib/rules/no-ref-as-operand.js @@ -131,26 +131,21 @@ tester.run('no-ref-as-operand', rule, { const count = ref(0) const foo = count `, - { - code: ` + ` - ` - }, - { - code: ` + `, + ` - ` - }, - { - code: ` + `, + ` - ` - }, - { - code: ` + `, + ` - ` - } + ` ], invalid: [ { diff --git a/tests/lib/rules/no-required-prop-with-default.js b/tests/lib/rules/no-required-prop-with-default.js index 236de8cd4..ec1e749cc 100644 --- a/tests/lib/rules/no-required-prop-with-default.js +++ b/tests/lib/rules/no-required-prop-with-default.js @@ -196,7 +196,6 @@ tester.run('no-required-prop-with-default', rule, { ); `, - options: [{ autofix: true }], output: ` `, + options: [{ autofix: true }], parserOptions: { parser: require.resolve('@typescript-eslint/parser') }, @@ -237,7 +237,6 @@ tester.run('no-required-prop-with-default', rule, { ); `, - options: [{ autofix: true }], output: ` `, + options: [{ autofix: true }], parserOptions: { parser: require.resolve('@typescript-eslint/parser') }, @@ -647,7 +647,6 @@ tester.run('no-required-prop-with-default', rule, { ); `, - options: [{ autofix: true }], output: ` `, + options: [{ autofix: true }], parserOptions: { parser: require.resolve('@typescript-eslint/parser') }, @@ -868,19 +868,7 @@ tester.run('no-required-prop-with-default', rule, { }) `, - output: ` - - `, + output: null, errors: [ { message: 'Prop "name" should be optional.', diff --git a/tests/lib/rules/no-restricted-call-after-await.js b/tests/lib/rules/no-restricted-call-after-await.js index 69eaf3a42..5409f7f29 100644 --- a/tests/lib/rules/no-restricted-call-after-await.js +++ b/tests/lib/rules/no-restricted-call-after-await.js @@ -147,8 +147,8 @@ tester.run('no-restricted-call-after-await', rule, { useI18n() `, - parserOptions: { ecmaVersion: 2022 }, - options: [{ module: 'vue-i18n', path: 'useI18n' }] + options: [{ module: 'vue-i18n', path: 'useI18n' }], + parserOptions: { ecmaVersion: 2022 } } ], invalid: [ diff --git a/tests/lib/rules/no-restricted-class.js b/tests/lib/rules/no-restricted-class.js index 02815b2c6..2d53598c8 100644 --- a/tests/lib/rules/no-restricted-class.js +++ b/tests/lib/rules/no-restricted-class.js @@ -14,7 +14,7 @@ const ruleTester = new RuleTester({ ruleTester.run('no-restricted-class', rule, { valid: [ - { code: `` }, + ``, { code: ``, options: ['forbidden'] @@ -40,93 +40,93 @@ ruleTester.run('no-restricted-class', rule, { invalid: [ { code: ``, + options: ['forbidden'], errors: [ { message: "'forbidden' class is not allowed.", type: 'VAttribute' } - ], - options: ['forbidden'] + ] }, { code: ``, + options: ['forbidden'], errors: [ { message: "'forbidden' class is not allowed.", type: 'Literal' } - ], - options: ['forbidden'] + ] }, { code: ``, + options: ['forbidden'], errors: [ { message: "'forbidden' class is not allowed.", type: 'Literal' } - ], - options: ['forbidden'] + ] }, { code: ``, + options: ['forbidden'], errors: [ { message: "'forbidden' class is not allowed.", type: 'Identifier' } - ], - options: ['forbidden'] + ] }, { code: '', + options: ['forbidden'], errors: [ { message: "'forbidden' class is not allowed.", type: 'TemplateElement' } - ], - options: ['forbidden'] + ] }, { code: ``, + options: ['forbidden'], errors: [ { message: "'forbidden' class is not allowed.", type: 'Literal' } - ], - options: ['forbidden'] + ] }, { code: ``, + options: ['forbidden'], errors: [ { message: "'forbidden' class is not allowed.", type: 'Literal' } - ], - options: ['forbidden'] + ] }, { code: ``, + options: ['forbidden'], errors: [ { message: "'forbidden' class is not allowed.", type: 'Literal' } - ], - options: ['forbidden'] + ] }, { code: ``, + options: ['/^for(bidden|gotten)/'], errors: [ { message: "'forbidden' class is not allowed.", type: 'VAttribute' } - ], - options: ['/^for(bidden|gotten)/'] + ] } ] }) diff --git a/tests/lib/rules/no-restricted-html-elements.js b/tests/lib/rules/no-restricted-html-elements.js index 775d94580..3dee64643 100644 --- a/tests/lib/rules/no-restricted-html-elements.js +++ b/tests/lib/rules/no-restricted-html-elements.js @@ -38,38 +38,38 @@ tester.run('no-restricted-html-elements', rule, { { filename: 'test.vue', code: '', + options: ['button'], errors: [ { message: 'Unexpected use of forbidden HTML element button.', line: 1, column: 16 } - ], - options: ['button'] + ] }, { filename: 'test.vue', code: '', + options: ['div'], errors: [ { message: 'Unexpected use of forbidden HTML element div.', line: 1, column: 11 } - ], - options: ['div'] + ] }, { filename: 'test.vue', code: '', + options: [{ element: 'marquee', message: 'Custom error' }], errors: [ { message: 'Custom error', line: 1, column: 11 } - ], - options: [{ element: 'marquee', message: 'Custom error' }] + ] } ] }) diff --git a/tests/lib/rules/no-restricted-props.js b/tests/lib/rules/no-restricted-props.js index 0f1947ed1..934a255b0 100644 --- a/tests/lib/rules/no-restricted-props.js +++ b/tests/lib/rules/no-restricted-props.js @@ -386,10 +386,10 @@ tester.run('no-restricted-props', rule, { }>() `, + options: [{ name: 'foo', suggest: 'Foo' }], parserOptions: { parser: require.resolve('@typescript-eslint/parser') }, - options: [{ name: 'foo', suggest: 'Foo' }], errors: [ { message: 'Using `foo` props is not allowed.', diff --git a/tests/lib/rules/no-setup-props-destructure.js b/tests/lib/rules/no-setup-props-destructure.js index d990f8857..5e84a565e 100644 --- a/tests/lib/rules/no-setup-props-destructure.js +++ b/tests/lib/rules/no-setup-props-destructure.js @@ -160,12 +160,11 @@ tester.run('no-setup-props-destructure', rule, { ` }, - { - code: ` + ` Vue.component('test', { el: a = b - })` - }, + }) + `, { filename: 'test.vue', code: ` diff --git a/tests/lib/rules/no-side-effects-in-computed-properties.js b/tests/lib/rules/no-side-effects-in-computed-properties.js index cec6747f3..a72004060 100644 --- a/tests/lib/rules/no-side-effects-in-computed-properties.js +++ b/tests/lib/rules/no-side-effects-in-computed-properties.js @@ -19,8 +19,8 @@ const ruleTester = new RuleTester({ ruleTester.run('no-side-effects-in-computed-properties', rule, { valid: [ - { - code: `Vue.component('test', { + ` + Vue.component('test', { ...foo, computed: { ...test0({}), @@ -97,10 +97,10 @@ ruleTester.run('no-side-effects-in-computed-properties', rule, { this.someArray.forEach(arr => console.log(arr)) } } - })` - }, - { - code: `Vue.component('test', { + }) + `, + ` + Vue.component('test', { computed: { ...mapGetters(['example']), test1() { @@ -115,18 +115,18 @@ ruleTester.run('no-side-effects-in-computed-properties', rule, { return something.b } } - })` - }, - { - code: `Vue.component('test', { + }) + `, + ` + Vue.component('test', { name: 'something', data() { return {} } - })` - }, - { - code: `Vue.component('test', { + }) + `, + ` + Vue.component('test', { computed: { test () { let a; @@ -134,10 +134,10 @@ ruleTester.run('no-side-effects-in-computed-properties', rule, { return a }, } - })` - }, - { - code: `Vue.component('test', { + }) + `, + ` + Vue.component('test', { computed: { test () { return { @@ -153,32 +153,32 @@ ruleTester.run('no-side-effects-in-computed-properties', rule, { } }, } - })` - }, - { - code: `Vue.component('test', { + }) + `, + ` + Vue.component('test', { computed: { test () { return this.something['a']().reverse() }, } - })` - }, - { - code: `const test = { el: '#app' } + }) + `, + ` + const test = { el: '#app' } Vue.component('test', { el: test.el - })` - }, - { - code: `Vue.component('test', { + }) + `, + ` + Vue.component('test', { computed: { test () { return [...this.items].reverse() }, } - })` - }, + }) + `, { filename: 'test.vue', code: ` @@ -392,13 +392,13 @@ ruleTester.run('no-side-effects-in-computed-properties', rule, { } }); `, + parser: require.resolve('@typescript-eslint/parser'), errors: [ { line: 5, message: 'Unexpected side effect in "test1" computed property.' } - ], - parser: require.resolve('@typescript-eslint/parser') + ] }, { diff --git a/tests/lib/rules/no-template-target-blank.js b/tests/lib/rules/no-template-target-blank.js index 5445ae6d7..b9896d7ed 100644 --- a/tests/lib/rules/no-template-target-blank.js +++ b/tests/lib/rules/no-template-target-blank.js @@ -15,31 +15,21 @@ const ruleTester = new RuleTester({ ruleTester.run('no-template-target-blank', rule, { valid: [ - { code: '' }, - { code: '' }, - { code: '' }, - { - code: '' - }, - { code: '' }, - { - code: '' - }, - { - code: '' - }, + '', + '', + '', + '', + '', + '', + '', { code: '', options: [{ allowReferrer: true }] }, - { code: '' }, - { - code: '' - }, - { code: '' }, - { - code: '' - }, + '', + '', + '', + '', { code: '', options: [{ enforceDynamicLinks: 'never' }] diff --git a/tests/lib/rules/no-this-in-before-route-enter.js b/tests/lib/rules/no-this-in-before-route-enter.js index 1171959ae..f3861672e 100644 --- a/tests/lib/rules/no-this-in-before-route-enter.js +++ b/tests/lib/rules/no-this-in-before-route-enter.js @@ -83,8 +83,8 @@ export default { ], invalid: [ { - code: template(`this.xxx();`), filename: 'ValidComponent.vue', + code: template(`this.xxx();`), errors: [ { message: @@ -97,8 +97,8 @@ export default { ] }, { - code: functionTemplate('this.method();'), filename: 'ValidComponent.vue', + code: functionTemplate('this.method();'), errors: [ { message: @@ -111,8 +111,8 @@ export default { ] }, { - code: template('this.attr = this.method();'), filename: 'ValidComponent.vue', + code: template('this.attr = this.method();'), errors: [ { message: @@ -133,8 +133,8 @@ export default { ] }, { - code: functionTemplate('this.attr = this.method();'), filename: 'ValidComponent.vue', + code: functionTemplate('this.attr = this.method();'), errors: [ { message: @@ -155,10 +155,10 @@ export default { ] }, { + filename: 'ValidComponent.vue', code: template(` if (this.method()) {} `), - filename: 'ValidComponent.vue', errors: [ { message: @@ -171,10 +171,10 @@ export default { ] }, { + filename: 'ValidComponent.vue', code: functionTemplate(` if (true) { this.method(); } `), - filename: 'ValidComponent.vue', errors: [ { message: diff --git a/tests/lib/rules/no-undef-components.js b/tests/lib/rules/no-undef-components.js index f90cb56df..0941f003d 100644 --- a/tests/lib/rules/no-undef-components.js +++ b/tests/lib/rules/no-undef-components.js @@ -656,12 +656,12 @@ tester.run('no-undef-components', rule, { `, + parser: require.resolve('vue-eslint-parser'), parserOptions: { ecmaVersion: 6, sourceType: 'module', parser: require.resolve('@typescript-eslint/parser') - }, - parser: require.resolve('vue-eslint-parser') + } } ], invalid: [ @@ -803,12 +803,12 @@ tester.run('no-undef-components', rule, { `, + parser: require.resolve('vue-eslint-parser'), parserOptions: { ecmaVersion: 6, sourceType: 'module', parser: require.resolve('@typescript-eslint/parser') }, - parser: require.resolve('vue-eslint-parser'), errors: [ { message: diff --git a/tests/lib/rules/no-undef-properties.js b/tests/lib/rules/no-undef-properties.js index 9a97fe1a9..7ba344197 100644 --- a/tests/lib/rules/no-undef-properties.js +++ b/tests/lib/rules/no-undef-properties.js @@ -1169,13 +1169,13 @@ tester.run('no-undef-properties', rule, {
{{ foo }}
{{ unknown }}
`, - ...getTypeScriptFixtureTestOptions(), errors: [ { message: "'unknown' is not defined.", line: 11 } - ] + ], + ...getTypeScriptFixtureTestOptions() } ] }) diff --git a/tests/lib/rules/no-unsupported-features.js b/tests/lib/rules/no-unsupported-features.js index d12109311..77ee72055 100644 --- a/tests/lib/rules/no-unsupported-features.js +++ b/tests/lib/rules/no-unsupported-features.js @@ -45,7 +45,6 @@ tester.run('no-unsupported-features', rule, { `, - options: [{ version: '^2.5.0' }], output: ` `, + options: [{ version: '^2.5.0' }], errors: [ { message: '`v-slot` are not supported until Vue.js "2.6.0".', diff --git a/tests/lib/rules/no-unsupported-features/define-options.js b/tests/lib/rules/no-unsupported-features/define-options.js index 10b2069b2..a53bd776c 100644 --- a/tests/lib/rules/no-unsupported-features/define-options.js +++ b/tests/lib/rules/no-unsupported-features/define-options.js @@ -47,7 +47,6 @@ tester.run('no-unsupported-features/define-options', rule, { `, - options: buildOptions(), output: ` `, + options: buildOptions(), errors: [ { message: @@ -68,7 +68,6 @@ export default { name: 'Foo' } `, - options: buildOptions(), output: ` `, + options: buildOptions(), errors: [ { message: diff --git a/tests/lib/rules/no-unsupported-features/slot-scope-attribute.js b/tests/lib/rules/no-unsupported-features/slot-scope-attribute.js index 5307aa616..8f8b0b136 100644 --- a/tests/lib/rules/no-unsupported-features/slot-scope-attribute.js +++ b/tests/lib/rules/no-unsupported-features/slot-scope-attribute.js @@ -66,8 +66,8 @@ tester.run('no-unsupported-features/slot-scope-attribute', rule, { `, - options: buildOptions(), output: null, + options: buildOptions(), errors: [ { message: @@ -83,8 +83,8 @@ tester.run('no-unsupported-features/slot-scope-attribute', rule, { `, - options: buildOptions(), output: null, + options: buildOptions(), errors: [ { message: @@ -100,8 +100,8 @@ tester.run('no-unsupported-features/slot-scope-attribute', rule, { `, - options: buildOptions({ version: '^3.0.0' }), output: null, + options: buildOptions({ version: '^3.0.0' }), errors: [ { message: diff --git a/tests/lib/rules/no-unsupported-features/v-bind-prop-modifier-shorthand.js b/tests/lib/rules/no-unsupported-features/v-bind-prop-modifier-shorthand.js index 1cefc8ff1..58ffda146 100644 --- a/tests/lib/rules/no-unsupported-features/v-bind-prop-modifier-shorthand.js +++ b/tests/lib/rules/no-unsupported-features/v-bind-prop-modifier-shorthand.js @@ -63,11 +63,11 @@ tester.run('no-unsupported-features/v-bind-prop-modifier-shorthand', rule, { `, - options: buildOptions(), output: ` `, + options: buildOptions(), errors: [ { message: '`.prop` shorthand are not supported until Vue.js "3.2.0".', @@ -80,11 +80,11 @@ tester.run('no-unsupported-features/v-bind-prop-modifier-shorthand', rule, { `, - options: buildOptions({ version: '2.5.99' }), output: ` `, + options: buildOptions({ version: '2.5.99' }), errors: [ { message: '`.prop` shorthand are not supported until Vue.js "3.2.0".', @@ -97,11 +97,11 @@ tester.run('no-unsupported-features/v-bind-prop-modifier-shorthand', rule, { `, - options: buildOptions({ version: '3.1.0' }), output: ` `, + options: buildOptions({ version: '3.1.0' }), errors: [ { message: '`.prop` shorthand are not supported until Vue.js "3.2.0".', diff --git a/tests/lib/rules/no-unsupported-features/v-slot.js b/tests/lib/rules/no-unsupported-features/v-slot.js index 66b3b0b9e..a382a7eda 100644 --- a/tests/lib/rules/no-unsupported-features/v-slot.js +++ b/tests/lib/rules/no-unsupported-features/v-slot.js @@ -81,13 +81,13 @@ tester.run('no-unsupported-features/v-slot', rule, { `, - options: buildOptions(), output: ` `, + options: buildOptions(), errors: [ { message: '`v-slot` are not supported until Vue.js "2.6.0".', @@ -102,13 +102,13 @@ tester.run('no-unsupported-features/v-slot', rule, { `, - options: buildOptions(), output: ` `, + options: buildOptions(), errors: [ { message: '`v-slot` are not supported until Vue.js "2.6.0".', @@ -123,13 +123,13 @@ tester.run('no-unsupported-features/v-slot', rule, { `, - options: buildOptions(), output: ` `, + options: buildOptions(), errors: [ { message: '`v-slot` are not supported until Vue.js "2.6.0".', @@ -144,13 +144,13 @@ tester.run('no-unsupported-features/v-slot', rule, { `, - options: buildOptions(), output: ` `, + options: buildOptions(), errors: [ { message: '`v-slot` are not supported until Vue.js "2.6.0".', @@ -165,13 +165,13 @@ tester.run('no-unsupported-features/v-slot', rule, { `, - options: buildOptions(), output: ` `, + options: buildOptions(), errors: [ { message: '`v-slot` are not supported until Vue.js "2.6.0".', @@ -186,13 +186,13 @@ tester.run('no-unsupported-features/v-slot', rule, { `, - options: buildOptions(), output: ` `, + options: buildOptions(), errors: [ { message: '`v-slot` are not supported until Vue.js "2.6.0".', @@ -207,13 +207,13 @@ tester.run('no-unsupported-features/v-slot', rule, { `, - options: buildOptions(), output: ` `, + options: buildOptions(), errors: [ { message: '`v-slot` are not supported until Vue.js "2.6.0".', @@ -228,13 +228,13 @@ tester.run('no-unsupported-features/v-slot', rule, { `, - options: buildOptions(), output: ` `, + options: buildOptions(), errors: [ { message: '`v-slot` are not supported until Vue.js "2.6.0".', @@ -249,13 +249,13 @@ tester.run('no-unsupported-features/v-slot', rule, { `, - options: buildOptions(), output: ` `, + options: buildOptions(), errors: [ { message: '`v-slot` are not supported until Vue.js "2.6.0".', @@ -271,13 +271,13 @@ tester.run('no-unsupported-features/v-slot', rule, { `, - options: buildOptions(), output: ` `, + options: buildOptions(), errors: [ { message: '`v-slot` are not supported until Vue.js "2.6.0".', @@ -292,8 +292,8 @@ tester.run('no-unsupported-features/v-slot', rule, { `, - options: buildOptions(), output: null, + options: buildOptions(), errors: [ { message: '`v-slot` are not supported until Vue.js "2.6.0".', @@ -310,8 +310,8 @@ tester.run('no-unsupported-features/v-slot', rule, { `, - options: buildOptions(), output: null, + options: buildOptions(), errors: [ { message: '`v-slot` are not supported until Vue.js "2.6.0".', @@ -328,8 +328,8 @@ tester.run('no-unsupported-features/v-slot', rule, { `, - options: buildOptions(), output: null, + options: buildOptions(), errors: [ { message: '`v-slot` are not supported until Vue.js "2.6.0".', diff --git a/tests/lib/rules/no-unused-properties.js b/tests/lib/rules/no-unused-properties.js index 2db132c48..0139559b1 100644 --- a/tests/lib/rules/no-unused-properties.js +++ b/tests/lib/rules/no-unused-properties.js @@ -1651,9 +1651,6 @@ tester.run('no-unused-properties', rule, { { // https://github.com/vuejs/eslint-plugin-vue/issues/1643 filename: 'test.vue', - parserOptions: { - parser: '@typescript-eslint/parser' - }, code: ` `, - options: [ - 'never', - { - objectsInObjects: true - } - ], output: ` `, + options: [ + 'never', + { + objectsInObjects: true + } + ], errors: [ "There should be no space after '{'.", "There should be no space after '{'.", @@ -145,13 +145,13 @@ tester.run('object-curly-spacing', rule, { Hello World `, - options: ['never'], output: ` `, + options: ['never'], errors: [ "There should be no space after '{'.", "There should be no space after '{'.", diff --git a/tests/lib/rules/order-in-components.js b/tests/lib/rules/order-in-components.js index b12c41a33..669383e52 100644 --- a/tests/lib/rules/order-in-components.js +++ b/tests/lib/rules/order-in-components.js @@ -197,7 +197,6 @@ ruleTester.run('order-in-components', rule, { }, } `, - parserOptions, output: ` export default { name: 'app', @@ -211,6 +210,7 @@ ruleTester.run('order-in-components', rule, { }, } `, + parserOptions, errors: [ { message: @@ -239,11 +239,6 @@ ruleTester.run('order-in-components', rule, { }, } `, - parserOptions: { - ecmaVersion: 6, - sourceType: 'module', - ecmaFeatures: { jsx: true } - }, output: ` export default { name: 'app', @@ -262,6 +257,11 @@ ruleTester.run('order-in-components', rule, { }, } `, + parserOptions: { + ecmaVersion: 6, + sourceType: 'module', + ecmaFeatures: { jsx: true } + }, errors: [ { message: @@ -294,7 +294,6 @@ ruleTester.run('order-in-components', rule, { template: '
' }) `, - parserOptions: { ecmaVersion: 6 }, output: ` Vue.component('smart-list', { name: 'app', @@ -307,6 +306,7 @@ ruleTester.run('order-in-components', rule, { template: '
' }) `, + parserOptions: { ecmaVersion: 6 }, errors: [ { message: @@ -329,7 +329,6 @@ ruleTester.run('order-in-components', rule, { template: '
' }) `, - parserOptions: { ecmaVersion: 6 }, output: ` app.component('smart-list', { name: 'app', @@ -342,6 +341,7 @@ ruleTester.run('order-in-components', rule, { template: '
' }) `, + parserOptions: { ecmaVersion: 6 }, errors: [ { message: @@ -365,7 +365,6 @@ ruleTester.run('order-in-components', rule, { template: '
' }) `, - parserOptions: { ecmaVersion: 6 }, output: ` const { component } = Vue; component('smart-list', { @@ -379,6 +378,7 @@ ruleTester.run('order-in-components', rule, { template: '
' }) `, + parserOptions: { ecmaVersion: 6 }, errors: [ { message: @@ -402,7 +402,6 @@ ruleTester.run('order-in-components', rule, { template: '
' }) `, - parserOptions: { ecmaVersion: 6 }, output: ` new Vue({ el: '#app', @@ -416,6 +415,7 @@ ruleTester.run('order-in-components', rule, { template: '
' }) `, + parserOptions: { ecmaVersion: 6 }, errors: [ { message: @@ -449,7 +449,6 @@ ruleTester.run('order-in-components', rule, { name: 'burger', }; `, - parserOptions, output: ` export default { name: 'burger', @@ -468,6 +467,7 @@ ruleTester.run('order-in-components', rule, { }, }; `, + parserOptions, errors: [ { message: @@ -486,7 +486,6 @@ ruleTester.run('order-in-components', rule, { test: 'ok' }; `, - parserOptions, output: ` export default { data() { @@ -496,6 +495,7 @@ ruleTester.run('order-in-components', rule, { }; `, options: [{ order: ['data', 'test', 'name'] }], + parserOptions, errors: [ { message: @@ -515,7 +515,6 @@ ruleTester.run('order-in-components', rule, { name: 'burger' }; `, - parserOptions, output: ` export default { /** name of vue component */ @@ -525,6 +524,7 @@ ruleTester.run('order-in-components', rule, { } }; `, + parserOptions, errors: [ { message: @@ -544,7 +544,6 @@ ruleTester.run('order-in-components', rule, { name: 'burger' }; `, - parserOptions, output: ` export default { /** name of vue component */ @@ -554,6 +553,7 @@ ruleTester.run('order-in-components', rule, { }/*test*/ }; `, + parserOptions, errors: [ { message: @@ -565,8 +565,8 @@ ruleTester.run('order-in-components', rule, { { filename: 'example.vue', code: `export default {data(){},name:'burger'};`, - parserOptions, output: `export default {name:'burger',data(){}};`, + parserOptions, errors: [ { message: @@ -586,8 +586,8 @@ ruleTester.run('order-in-components', rule, { name: 'burger', }; `, - parserOptions, output: null, + parserOptions, errors: [ { message: @@ -607,8 +607,8 @@ ruleTester.run('order-in-components', rule, { name: 'burger', }; `, - parserOptions, output: null, + parserOptions, errors: [ { message: @@ -628,8 +628,8 @@ ruleTester.run('order-in-components', rule, { name: 'burger', }; `, - parserOptions, output: null, + parserOptions, errors: [ { message: @@ -649,8 +649,8 @@ ruleTester.run('order-in-components', rule, { name: 'burger', }; `, - parserOptions, output: null, + parserOptions, errors: [ { message: @@ -670,8 +670,8 @@ ruleTester.run('order-in-components', rule, { name: 'burger', }; `, - parserOptions, output: null, + parserOptions, errors: [ { message: @@ -691,8 +691,8 @@ ruleTester.run('order-in-components', rule, { name: 'burger', }; `, - parserOptions, output: null, + parserOptions, errors: [ { message: @@ -712,8 +712,8 @@ ruleTester.run('order-in-components', rule, { name: 'burger', }; `, - parserOptions, output: null, + parserOptions, errors: [ { message: @@ -733,8 +733,8 @@ ruleTester.run('order-in-components', rule, { name: 'burger', }; `, - parserOptions, output: null, + parserOptions, errors: [ { message: @@ -754,8 +754,8 @@ ruleTester.run('order-in-components', rule, { name: 'burger', }; `, - parserOptions, output: null, + parserOptions, errors: [ { message: @@ -775,8 +775,8 @@ ruleTester.run('order-in-components', rule, { name: 'burger', }; `, - parserOptions, output: null, + parserOptions, errors: [ { message: @@ -796,8 +796,8 @@ ruleTester.run('order-in-components', rule, { name: 'burger', }; `, - parserOptions, output: null, + parserOptions, errors: [ { message: @@ -817,8 +817,8 @@ ruleTester.run('order-in-components', rule, { name: 'burger', }; `, - parserOptions, output: null, + parserOptions, errors: [ { message: @@ -838,8 +838,8 @@ ruleTester.run('order-in-components', rule, { name: 'burger', }; `, - parserOptions, output: null, + parserOptions, errors: [ { message: @@ -859,7 +859,6 @@ ruleTester.run('order-in-components', rule, { test: fn(), }; `, - parserOptions, output: ` export default { name: 'burger', @@ -868,6 +867,7 @@ ruleTester.run('order-in-components', rule, { test: fn(), }; `, + parserOptions, errors: [ { message: @@ -896,7 +896,6 @@ ruleTester.run('order-in-components', rule, { name: 'burger', }; `, - parserOptions, output: ` export default { name: 'burger', @@ -914,6 +913,7 @@ ruleTester.run('order-in-components', rule, { testOptionalChaining: a?.b?.c, }; `, + parserOptions, errors: [ { message: @@ -934,11 +934,6 @@ ruleTester.run('order-in-components', rule, { }; `, - parser: require.resolve('vue-eslint-parser'), - parserOptions: { - ...parserOptions, - parser: { ts: require.resolve('@typescript-eslint/parser') } - }, output: ` `, + parser: require.resolve('vue-eslint-parser'), + parserOptions: { + ...parserOptions, + parser: { ts: require.resolve('@typescript-eslint/parser') } + }, errors: [ { message: @@ -967,8 +967,6 @@ ruleTester.run('order-in-components', rule, { }) `, - parser: require.resolve('vue-eslint-parser'), - parserOptions, output: ` `, + parser: require.resolve('vue-eslint-parser'), + parserOptions, errors: [ { message: diff --git a/tests/lib/rules/padding-line-between-blocks.js b/tests/lib/rules/padding-line-between-blocks.js index 622839bdc..f53461bae 100644 --- a/tests/lib/rules/padding-line-between-blocks.js +++ b/tests/lib/rules/padding-line-between-blocks.js @@ -125,12 +125,12 @@ tester.run('padding-line-between-blocks', rule, { `, - options: ['never'], output: ` `, + options: ['never'], errors: [ { message: 'Unexpected blank line before this block.', @@ -214,7 +214,6 @@ tester.run('padding-line-between-blocks', rule, { `, - options: ['never'], output: ` @@ -225,6 +224,7 @@ tester.run('padding-line-between-blocks', rule, { `, + options: ['never'], errors: [ { message: 'Unexpected blank line before this block.', @@ -290,7 +290,6 @@ tester.run('padding-line-between-blocks', rule, { `, - options: ['never'], output: ` @@ -304,6 +303,7 @@ tester.run('padding-line-between-blocks', rule, { TEXT `, + options: ['never'], errors: [ { message: 'Unexpected blank line before this block.', diff --git a/tests/lib/rules/padding-line-between-tags.js b/tests/lib/rules/padding-line-between-tags.js index 67aa6b228..70c7a57bb 100644 --- a/tests/lib/rules/padding-line-between-tags.js +++ b/tests/lib/rules/padding-line-between-tags.js @@ -498,18 +498,18 @@ tester.run('padding-line-between-tags', rule, { `, + options: [ + [ + { blankLine: 'always', prev: '*', next: '*' }, + { blankLine: 'never', prev: 'br', next: '*' } + ] + ], errors: [ { message: 'Expected blank line before this tag.', line: 7, column: 13 } - ], - options: [ - [ - { blankLine: 'always', prev: '*', next: '*' }, - { blankLine: 'never', prev: 'br', next: '*' } - ] ] }, { @@ -541,18 +541,18 @@ tester.run('padding-line-between-tags', rule, { `, + options: [ + [ + { blankLine: 'always', prev: '*', next: '*' }, + { blankLine: 'never', prev: '*', next: 'br' } + ] + ], errors: [ { message: 'Expected blank line before this tag.', line: 8, column: 13 } - ], - options: [ - [ - { blankLine: 'always', prev: '*', next: '*' }, - { blankLine: 'never', prev: '*', next: 'br' } - ] ] }, { @@ -586,6 +586,7 @@ tester.run('padding-line-between-tags', rule, { `, + options: [[{ blankLine: 'never', prev: '*', next: '*' }]], errors: [ { message: 'Unexpected blank line before this tag.', @@ -597,8 +598,7 @@ tester.run('padding-line-between-tags', rule, { line: 11, column: 13 } - ], - options: [[{ blankLine: 'never', prev: '*', next: '*' }]] + ] }, { filename: 'test.vue', @@ -624,6 +624,7 @@ tester.run('padding-line-between-tags', rule, { `, + options: [[{ blankLine: 'never', prev: '*', next: '*' }]], errors: [ { message: 'Unexpected blank line before this tag.', @@ -635,8 +636,7 @@ tester.run('padding-line-between-tags', rule, { line: 9, column: 11 } - ], - options: [[{ blankLine: 'never', prev: '*', next: '*' }]] + ] }, { filename: 'test.vue', @@ -669,18 +669,18 @@ tester.run('padding-line-between-tags', rule, { `, + options: [ + [ + { blankLine: 'never', prev: '*', next: '*' }, + { blankLine: 'always', prev: 'br', next: 'div' } + ] + ], errors: [ { message: 'Expected blank line before this tag.', line: 8, column: 13 } - ], - options: [ - [ - { blankLine: 'never', prev: '*', next: '*' }, - { blankLine: 'always', prev: 'br', next: 'div' } - ] ] }, { @@ -712,6 +712,13 @@ tester.run('padding-line-between-tags', rule, { `, + options: [ + [ + { blankLine: 'always', prev: '*', next: '*' }, + { blankLine: 'never', prev: 'br', next: 'div' }, + { blankLine: 'never', prev: 'br', next: 'img' } + ] + ], errors: [ { message: 'Expected blank line before this tag.', @@ -728,13 +735,6 @@ tester.run('padding-line-between-tags', rule, { line: 9, column: 11 } - ], - options: [ - [ - { blankLine: 'always', prev: '*', next: '*' }, - { blankLine: 'never', prev: 'br', next: 'div' }, - { blankLine: 'never', prev: 'br', next: 'img' } - ] ] }, { @@ -764,18 +764,18 @@ tester.run('padding-line-between-tags', rule, { `, + options: [ + [ + { blankLine: 'always', prev: 'br', next: 'div' }, + { blankLine: 'always', prev: 'div', next: 'br' } + ] + ], errors: [ { message: 'Expected blank line before this tag.', line: 8, column: 11 } - ], - options: [ - [ - { blankLine: 'always', prev: 'br', next: 'div' }, - { blankLine: 'always', prev: 'div', next: 'br' } - ] ] }, { @@ -805,18 +805,18 @@ tester.run('padding-line-between-tags', rule, { `, + options: [ + [ + { blankLine: 'always', prev: 'br', next: 'div' }, + { blankLine: 'always', prev: 'br', next: 'br' } + ] + ], errors: [ { message: 'Expected blank line before this tag.', line: 9, column: 11 } - ], - options: [ - [ - { blankLine: 'always', prev: 'br', next: 'div' }, - { blankLine: 'always', prev: 'br', next: 'br' } - ] ] }, { @@ -848,6 +848,12 @@ tester.run('padding-line-between-tags', rule, { `, + options: [ + [ + { blankLine: 'always', prev: '*', next: '*' }, + { blankLine: 'never', prev: 'br', next: 'br' } + ] + ], errors: [ { message: 'Expected blank line before this tag.', @@ -864,12 +870,6 @@ tester.run('padding-line-between-tags', rule, { line: 10, column: 11 } - ], - options: [ - [ - { blankLine: 'always', prev: '*', next: '*' }, - { blankLine: 'never', prev: 'br', next: 'br' } - ] ] }, { @@ -901,14 +901,14 @@ tester.run('padding-line-between-tags', rule, { `, + options: [[{ blankLine: 'never', prev: 'br', next: 'br' }]], errors: [ { message: 'Unexpected blank line before this tag.', line: 11, column: 11 } - ], - options: [[{ blankLine: 'never', prev: 'br', next: 'br' }]] + ] }, { filename: 'test.vue', @@ -935,14 +935,14 @@ tester.run('padding-line-between-tags', rule, { `, + options: [[{ blankLine: 'always', prev: '*', next: 'br' }]], errors: [ { message: 'Expected blank line before this tag.', line: 7, column: 11 } - ], - options: [[{ blankLine: 'always', prev: '*', next: 'br' }]] + ] }, { filename: 'test.vue', @@ -1015,14 +1015,14 @@ tester.run('padding-line-between-tags', rule, { `, + options: [[{ blankLine: 'never', prev: '*', next: '*' }]], errors: [ { message: 'Unexpected blank line before this tag.', line: 6, column: 12 } - ], - options: [[{ blankLine: 'never', prev: '*', next: '*' }]] + ] }, { filename: 'test.vue', @@ -1045,14 +1045,14 @@ tester.run('padding-line-between-tags', rule, { `, + options: [[{ blankLine: 'never', prev: '*', next: '*' }]], errors: [ { message: 'Unexpected blank line before this tag.', line: 7, column: 12 } - ], - options: [[{ blankLine: 'never', prev: '*', next: '*' }]] + ] }, { filename: 'test.vue', @@ -1076,14 +1076,14 @@ tester.run('padding-line-between-tags', rule, { `, + options: [[{ blankLine: 'never', prev: '*', next: '*' }]], errors: [ { message: 'Unexpected blank line before this tag.', line: 8, column: 12 } - ], - options: [[{ blankLine: 'never', prev: '*', next: '*' }]] + ] }, { filename: 'test.vue', @@ -1109,14 +1109,14 @@ tester.run('padding-line-between-tags', rule, { `, + options: [[{ blankLine: 'never', prev: '*', next: '*' }]], errors: [ { message: 'Unexpected blank line before this tag.', line: 10, column: 12 } - ], - options: [[{ blankLine: 'never', prev: '*', next: '*' }]] + ] }, { filename: 'test.vue', @@ -1147,14 +1147,14 @@ tester.run('padding-line-between-tags', rule, {
`, + options: [[{ blankLine: 'consistent', prev: '*', next: '*' }]], errors: [ { message: 'Expected blank line before this tag.', line: 7, column: 11 } - ], - options: [[{ blankLine: 'consistent', prev: '*', next: '*' }]] + ] }, { filename: 'test.vue', @@ -1191,6 +1191,7 @@ tester.run('padding-line-between-tags', rule, {
`, + options: [[{ blankLine: 'consistent', prev: '*', next: '*' }]], errors: [ { message: 'Expected blank line before this tag.', @@ -1207,8 +1208,7 @@ tester.run('padding-line-between-tags', rule, { line: 9, column: 11 } - ], - options: [[{ blankLine: 'consistent', prev: '*', next: '*' }]] + ] }, { filename: 'test.vue', @@ -1243,6 +1243,12 @@ tester.run('padding-line-between-tags', rule, { `, + options: [ + [ + { blankLine: 'consistent', prev: '*', next: '*' }, + { blankLine: 'never', prev: 'br', next: 'br' } + ] + ], errors: [ { message: 'Unexpected blank line before this tag.', @@ -1259,12 +1265,6 @@ tester.run('padding-line-between-tags', rule, { line: 13, column: 11 } - ], - options: [ - [ - { blankLine: 'consistent', prev: '*', next: '*' }, - { blankLine: 'never', prev: 'br', next: 'br' } - ] ] }, { @@ -1288,14 +1288,14 @@ tester.run('padding-line-between-tags', rule, { `, + options: [[{ blankLine: 'consistent', prev: '*', next: '*' }]], errors: [ { message: 'Unexpected blank line before this tag.', line: 7, column: 11 } - ], - options: [[{ blankLine: 'consistent', prev: '*', next: '*' }]] + ] } ] }) diff --git a/tests/lib/rules/prefer-true-attribute-shorthand.js b/tests/lib/rules/prefer-true-attribute-shorthand.js index e7d52ef7f..0bad5c173 100644 --- a/tests/lib/rules/prefer-true-attribute-shorthand.js +++ b/tests/lib/rules/prefer-true-attribute-shorthand.js @@ -157,6 +157,7 @@ tester.run('prefer-true-attribute-shorthand', rule, { `, + output: null, errors: [ { messageId: 'expectShort', @@ -172,8 +173,7 @@ tester.run('prefer-true-attribute-shorthand', rule, { } ] } - ], - output: null + ] }, { filename: 'test.vue', @@ -181,6 +181,7 @@ tester.run('prefer-true-attribute-shorthand', rule, { `, + output: null, errors: [ { messageId: 'expectShort', @@ -196,8 +197,7 @@ tester.run('prefer-true-attribute-shorthand', rule, { } ] } - ], - output: null + ] }, { filename: 'test.vue', @@ -205,6 +205,7 @@ tester.run('prefer-true-attribute-shorthand', rule, { `, + output: null, options: ['always'], errors: [ { @@ -221,8 +222,7 @@ tester.run('prefer-true-attribute-shorthand', rule, { } ] } - ], - output: null + ] }, { filename: 'test.vue', @@ -230,6 +230,7 @@ tester.run('prefer-true-attribute-shorthand', rule, { `, + output: null, options: ['always'], errors: [ { @@ -246,8 +247,7 @@ tester.run('prefer-true-attribute-shorthand', rule, { } ] } - ], - output: null + ] }, { filename: 'test.vue', @@ -255,6 +255,7 @@ tester.run('prefer-true-attribute-shorthand', rule, { `, + output: null, options: ['never'], errors: [ { @@ -276,8 +277,7 @@ tester.run('prefer-true-attribute-shorthand', rule, { } ] } - ], - output: null + ] } ] }) diff --git a/tests/lib/rules/require-emit-validator.js b/tests/lib/rules/require-emit-validator.js index 2b60e8910..d539b55ea 100644 --- a/tests/lib/rules/require-emit-validator.js +++ b/tests/lib/rules/require-emit-validator.js @@ -118,8 +118,8 @@ ruleTester.run('require-emit-validator', rule, { } }) `, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, - parser: require.resolve('@typescript-eslint/parser') + parser: require.resolve('@typescript-eslint/parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, { filename: 'test.vue', @@ -132,8 +132,8 @@ ruleTester.run('require-emit-validator', rule, { }, }) `, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, - parser: require.resolve('@typescript-eslint/parser') + parser: require.resolve('@typescript-eslint/parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, { filename: 'test.vue', @@ -333,8 +333,8 @@ ruleTester.run('require-emit-validator', rule, { } }); `, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, parser: require.resolve('@typescript-eslint/parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' }, errors: [ { messageId: 'missing', diff --git a/tests/lib/rules/require-explicit-emits.js b/tests/lib/rules/require-explicit-emits.js index 43a3c2599..af90569dd 100644 --- a/tests/lib/rules/require-explicit-emits.js +++ b/tests/lib/rules/require-explicit-emits.js @@ -1975,14 +1975,14 @@ emits: {'foo': null} emit('baz') emit('qux') `, - ...getTypeScriptFixtureTestOptions(), errors: [ { message: 'The "qux" event has been triggered but not declared on `defineEmits`.', line: 8 } - ] + ], + ...getTypeScriptFixtureTestOptions() } ] }) diff --git a/tests/lib/rules/require-expose.js b/tests/lib/rules/require-expose.js index 64d073c24..76932cd95 100644 --- a/tests/lib/rules/require-expose.js +++ b/tests/lib/rules/require-expose.js @@ -95,15 +95,13 @@ tester.run('require-expose', rule, { ` }, - { - code: ` + ` Vue.mixin({ methods: { foo () {} } }) - ` - }, + `, { filename: 'test.vue', code: ` diff --git a/tests/lib/rules/require-macro-variable-name.js b/tests/lib/rules/require-macro-variable-name.js index c54c224a5..ed99a64e5 100644 --- a/tests/lib/rules/require-macro-variable-name.js +++ b/tests/lib/rules/require-macro-variable-name.js @@ -237,6 +237,7 @@ tester.run('require-macro-variable-name', rule, { const attrs = useAttrs({}) `, + options: [customOptions], errors: [ { message: `The variable name of "defineSlots" must be "${customOptions.defineSlots}".`, @@ -289,8 +290,7 @@ tester.run('require-macro-variable-name', rule, { } ] } - ], - options: [customOptions] + ] }, { filename: 'test.vue', @@ -300,6 +300,7 @@ tester.run('require-macro-variable-name', rule, { const attrsCustom = useAttrs({}) `, + options: [{ defineSlots: 'slotsCustom' }], errors: [ { message: `The variable name of "useAttrs" must be "attrs".`, @@ -317,8 +318,7 @@ tester.run('require-macro-variable-name', rule, { } ] } - ], - options: [{ defineSlots: 'slotsCustom' }] + ] } ] }) diff --git a/tests/lib/rules/require-prop-comment.js b/tests/lib/rules/require-prop-comment.js index 900f25ec3..3863abc3d 100644 --- a/tests/lib/rules/require-prop-comment.js +++ b/tests/lib/rules/require-prop-comment.js @@ -20,8 +20,7 @@ const tester = new RuleTester({ tester.run('require-prop-comment', rule, { valid: [ - { - code: ` + ` - ` - }, + `, { code: ` - ` - }, + `, { code: ` `, + parserOptions: { + parser: require.resolve('@typescript-eslint/parser') + }, errors: [ { line: 4, column: 9, message: 'The "a" property should have a JSDoc comment.' } - ], - parserOptions: { - parser: require.resolve('@typescript-eslint/parser') - } + ] } ] }) diff --git a/tests/lib/rules/require-prop-type-constructor.js b/tests/lib/rules/require-prop-type-constructor.js index 9cd4eae6e..a4d6766df 100644 --- a/tests/lib/rules/require-prop-type-constructor.js +++ b/tests/lib/rules/require-prop-type-constructor.js @@ -224,13 +224,13 @@ ruleTester.run('require-prop-type-constructor', rule, { } } `, + parser: require.resolve('@typescript-eslint/parser'), errors: [ { message: 'The "a" property should be a constructor.', line: 5 } - ], - parser: require.resolve('@typescript-eslint/parser') + ] }, { filename: 'ExtraCommas.vue', @@ -248,13 +248,13 @@ ruleTester.run('require-prop-type-constructor', rule, { } } `, + parser: require.resolve('@typescript-eslint/parser'), errors: [ { message: 'The "name" property should be a constructor.', line: 4 } - ], - parser: require.resolve('@typescript-eslint/parser') + ] }, { filename: 'LiteralsComponent.vue', diff --git a/tests/lib/rules/require-prop-types.js b/tests/lib/rules/require-prop-types.js index 9b7077fc1..fdb91dd30 100644 --- a/tests/lib/rules/require-prop-types.js +++ b/tests/lib/rules/require-prop-types.js @@ -137,8 +137,8 @@ ruleTester.run('require-prop-types', rule, { } }); `, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, - parser: require.resolve('@typescript-eslint/parser') + parser: require.resolve('@typescript-eslint/parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, { filename: 'test.vue', @@ -151,8 +151,8 @@ ruleTester.run('require-prop-types', rule, { } }); `, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, - parser: require.resolve('@typescript-eslint/parser') + parser: require.resolve('@typescript-eslint/parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, { filename: 'test.vue', @@ -163,8 +163,8 @@ ruleTester.run('require-prop-types', rule, { }) `, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, - parser: require.resolve('vue-eslint-parser') + parser: require.resolve('vue-eslint-parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, { filename: 'test.vue', @@ -173,12 +173,12 @@ ruleTester.run('require-prop-types', rule, { defineProps<{foo:string}>() `, + parser: require.resolve('vue-eslint-parser'), parserOptions: { ecmaVersion: 6, sourceType: 'module', parser: require.resolve('@typescript-eslint/parser') - }, - parser: require.resolve('vue-eslint-parser') + } }, { code: ` @@ -308,8 +308,8 @@ ruleTester.run('require-prop-types', rule, { } }); `, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, parser: require.resolve('@typescript-eslint/parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' }, errors: [ { message: 'Prop "foo" should define at least its type.', @@ -326,8 +326,8 @@ ruleTester.run('require-prop-types', rule, { } }); `, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, parser: require.resolve('@typescript-eslint/parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' }, errors: [ { message: 'Prop "foo" should define at least its type.', @@ -344,8 +344,8 @@ ruleTester.run('require-prop-types', rule, { }) `, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, parser: require.resolve('vue-eslint-parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' }, errors: [ { message: 'Prop "foo" should define at least its type.', @@ -360,8 +360,8 @@ ruleTester.run('require-prop-types', rule, { defineProps(['foo']) `, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, parser: require.resolve('vue-eslint-parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' }, errors: [ { message: 'Prop "foo" should define at least its type.', diff --git a/tests/lib/rules/require-typed-object-prop.js b/tests/lib/rules/require-typed-object-prop.js index 5d93965a5..f574e82d8 100644 --- a/tests/lib/rules/require-typed-object-prop.js +++ b/tests/lib/rules/require-typed-object-prop.js @@ -14,235 +14,235 @@ ruleTester.run('require-typed-object-prop', rule, { // empty { filename: 'test.vue', - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, code: ` export default { props: {} } - ` + `, + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, { filename: 'test.vue', - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, code: ` export default Vue.extend({ props: {} }); - ` + `, + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, { filename: 'test.vue', - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, code: ` `, - parser: require.resolve('vue-eslint-parser') + parser: require.resolve('vue-eslint-parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, // array props { filename: 'test.vue', - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, code: ` export default { props: ['foo'] } - ` + `, + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, { filename: 'test.vue', - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, code: ` export default Vue.extend({ props: ['foo'] }); - ` + `, + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, { filename: 'test.vue', - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, code: ` `, - parser: require.resolve('vue-eslint-parser') + parser: require.resolve('vue-eslint-parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, // primitive props { filename: 'test.vue', - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, code: ` export default { props: { foo: String } } - ` + `, + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, { filename: 'test.vue', - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, code: ` export default Vue.extend({ props: { foo: String } }); - ` + `, + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, { filename: 'test.vue', - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, code: ` `, - parser: require.resolve('vue-eslint-parser') + parser: require.resolve('vue-eslint-parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, // union { filename: 'test.vue', - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, code: ` export default { props: { foo: [Number, String, Boolean] } } - ` + `, + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, { filename: 'test.vue', - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, code: ` export default Vue.extend({ props: { foo: [Number, String, Boolean] } }); - ` + `, + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, { filename: 'test.vue', - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, code: ` `, - parser: require.resolve('vue-eslint-parser') + parser: require.resolve('vue-eslint-parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, // function { filename: 'test.vue', - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, code: ` export default { props: { foo: someFunction() } } - ` + `, + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, { filename: 'test.vue', - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, code: ` export default Vue.extend({ props: { foo: someFunction() } }); - ` + `, + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, { filename: 'test.vue', - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, code: ` `, - parser: require.resolve('vue-eslint-parser') + parser: require.resolve('vue-eslint-parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, // typed object { filename: 'test.vue', - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, code: ` export default { props: { foo: Object as PropType } } `, - parser: require.resolve('@typescript-eslint/parser') + parser: require.resolve('@typescript-eslint/parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, { filename: 'test.vue', - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, code: ` export default { props: { foo: Array as PropType } } `, - parser: require.resolve('@typescript-eslint/parser') + parser: require.resolve('@typescript-eslint/parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, { filename: 'test.vue', - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, code: ` export default Vue.extend({ props: { foo: Object as PropType } }); `, - parser: require.resolve('@typescript-eslint/parser') + parser: require.resolve('@typescript-eslint/parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, { filename: 'test.vue', - parserOptions: { - ecmaVersion: 6, - sourceType: 'module', - parser: require.resolve('@typescript-eslint/parser') - }, code: ` `, - parser: require.resolve('vue-eslint-parser') - }, - - { - filename: 'test.vue', + parser: require.resolve('vue-eslint-parser'), parserOptions: { ecmaVersion: 6, sourceType: 'module', parser: require.resolve('@typescript-eslint/parser') - }, + } + }, + + { + filename: 'test.vue', code: ` export default { props: { foo: Object as () => User } } `, - parser: require.resolve('@typescript-eslint/parser') - }, - { - filename: 'test.vue', + parser: require.resolve('@typescript-eslint/parser'), parserOptions: { ecmaVersion: 6, sourceType: 'module', parser: require.resolve('@typescript-eslint/parser') - }, + } + }, + { + filename: 'test.vue', code: ` export default Vue.extend({ props: { foo: Object as () => User } }); `, - parser: require.resolve('@typescript-eslint/parser') - }, - { - filename: 'test.vue', + parser: require.resolve('@typescript-eslint/parser'), parserOptions: { ecmaVersion: 6, sourceType: 'module', parser: require.resolve('@typescript-eslint/parser') - }, + } + }, + { + filename: 'test.vue', code: ` `, - parser: require.resolve('vue-eslint-parser') + parser: require.resolve('vue-eslint-parser'), + parserOptions: { + ecmaVersion: 6, + sourceType: 'module', + parser: require.resolve('@typescript-eslint/parser') + } }, // any { @@ -252,12 +252,12 @@ ruleTester.run('require-typed-object-prop', rule, { defineProps({ foo: { type: Object as any } }); `, + parser: require.resolve('vue-eslint-parser'), parserOptions: { ecmaVersion: 6, sourceType: 'module', parser: require.resolve('@typescript-eslint/parser') - }, - parser: require.resolve('vue-eslint-parser') + } }, { filename: 'test.vue', @@ -270,12 +270,12 @@ ruleTester.run('require-typed-object-prop', rule, { }; `, + parser: require.resolve('vue-eslint-parser'), parserOptions: { ecmaVersion: 6, sourceType: 'module', parser: require.resolve('@typescript-eslint/parser') - }, - parser: require.resolve('vue-eslint-parser') + } }, { filename: 'test.vue', @@ -288,12 +288,12 @@ ruleTester.run('require-typed-object-prop', rule, { }); `, + parser: require.resolve('vue-eslint-parser'), parserOptions: { ecmaVersion: 6, sourceType: 'module', parser: require.resolve('@typescript-eslint/parser') - }, - parser: require.resolve('vue-eslint-parser') + } }, // unknown { @@ -303,12 +303,12 @@ ruleTester.run('require-typed-object-prop', rule, { defineProps({ foo: { type: Object as unknown } }); `, + parser: require.resolve('vue-eslint-parser'), parserOptions: { ecmaVersion: 6, sourceType: 'module', parser: require.resolve('@typescript-eslint/parser') - }, - parser: require.resolve('vue-eslint-parser') + } }, { filename: 'test.vue', @@ -321,12 +321,12 @@ ruleTester.run('require-typed-object-prop', rule, { }; `, + parser: require.resolve('vue-eslint-parser'), parserOptions: { ecmaVersion: 6, sourceType: 'module', parser: require.resolve('@typescript-eslint/parser') - }, - parser: require.resolve('vue-eslint-parser') + } }, { filename: 'test.vue', @@ -339,12 +339,12 @@ ruleTester.run('require-typed-object-prop', rule, { }); `, + parser: require.resolve('vue-eslint-parser'), parserOptions: { ecmaVersion: 6, sourceType: 'module', parser: require.resolve('@typescript-eslint/parser') - }, - parser: require.resolve('vue-eslint-parser') + } } ], invalid: [ @@ -355,8 +355,8 @@ ruleTester.run('require-typed-object-prop', rule, { defineProps({ foo: Object }); `, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, parser: require.resolve('vue-eslint-parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' }, errors: [ { messageId: 'expectedTypeAnnotation', @@ -394,8 +394,8 @@ ruleTester.run('require-typed-object-prop', rule, { defineProps({ foo: Array }); `, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, parser: require.resolve('vue-eslint-parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' }, errors: [ { messageId: 'expectedTypeAnnotation', @@ -585,8 +585,8 @@ ruleTester.run('require-typed-object-prop', rule, { defineProps({ foo: { type: Object } }); `, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, parser: require.resolve('vue-eslint-parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' }, errors: [ { messageId: 'expectedTypeAnnotation', diff --git a/tests/lib/rules/require-typed-ref.js b/tests/lib/rules/require-typed-ref.js index 571b5c5de..3da293b9a 100644 --- a/tests/lib/rules/require-typed-ref.js +++ b/tests/lib/rules/require-typed-ref.js @@ -75,13 +75,13 @@ tester.run('require-typed-ref', rule, { }, { filename: 'test.vue', - parser: require.resolve('vue-eslint-parser'), code: ` - ` + `, + parser: require.resolve('vue-eslint-parser') }, { filename: 'test.js', @@ -197,13 +197,13 @@ tester.run('require-typed-ref', rule, { }, { filename: 'test.vue', - parser: require.resolve('vue-eslint-parser'), code: ` `, + parser: require.resolve('vue-eslint-parser'), errors: [ { messageId: 'noType', diff --git a/tests/lib/rules/require-valid-default-prop.js b/tests/lib/rules/require-valid-default-prop.js index cec05ba05..1e6f7cd7a 100644 --- a/tests/lib/rules/require-valid-default-prop.js +++ b/tests/lib/rules/require-valid-default-prop.js @@ -122,8 +122,8 @@ ruleTester.run('require-valid-default-prop', rule, { } }); `, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, - parser: require.resolve('@typescript-eslint/parser') + parser: require.resolve('@typescript-eslint/parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' } }, { filename: 'test.vue', @@ -214,8 +214,8 @@ ruleTester.run('require-valid-default-prop', rule, { } }); `, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, parser: require.resolve('@typescript-eslint/parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' }, errors: errorMessage('function') }, { @@ -229,8 +229,8 @@ ruleTester.run('require-valid-default-prop', rule, { } }); `, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, parser: require.resolve('@typescript-eslint/parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' }, errors: errorMessage('function') }, { @@ -244,8 +244,8 @@ ruleTester.run('require-valid-default-prop', rule, { } }); `, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, parser: require.resolve('@typescript-eslint/parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' }, errors: errorMessage('function') }, { @@ -264,12 +264,12 @@ ruleTester.run('require-valid-default-prop', rule, { num: 1 }); `, + parser: require.resolve('vue-eslint-parser'), parserOptions: { ecmaVersion: 6, sourceType: 'module', parser: require.resolve('@typescript-eslint/parser') - }, - parser: require.resolve('vue-eslint-parser') + } }, { code: ` @@ -614,8 +614,8 @@ ruleTester.run('require-valid-default-prop', rule, { } as PropOptions } });`, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, parser: require.resolve('@typescript-eslint/parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' }, errors: errorMessage('function or number') }, @@ -874,8 +874,8 @@ ruleTester.run('require-valid-default-prop', rule, { } }); `, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, parser: require.resolve('@typescript-eslint/parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' }, errors: errorMessage('function') }, { @@ -889,8 +889,8 @@ ruleTester.run('require-valid-default-prop', rule, { } }); `, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, parser: require.resolve('@typescript-eslint/parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' }, errors: errorMessage('function') }, { @@ -904,8 +904,8 @@ ruleTester.run('require-valid-default-prop', rule, { } }); `, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, parser: require.resolve('@typescript-eslint/parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' }, errors: errorMessage('function') }, { @@ -920,8 +920,8 @@ ruleTester.run('require-valid-default-prop', rule, { }) `, - parserOptions: { ecmaVersion: 6, sourceType: 'module' }, parser: require.resolve('vue-eslint-parser'), + parserOptions: { ecmaVersion: 6, sourceType: 'module' }, errors: [ { message: "Type of the default value for 'foo' prop must be a string.", @@ -938,12 +938,12 @@ ruleTester.run('require-valid-default-prop', rule, { }) `, + parser: require.resolve('vue-eslint-parser'), parserOptions: { ecmaVersion: 6, sourceType: 'module', parser: require.resolve('@typescript-eslint/parser') }, - parser: require.resolve('vue-eslint-parser'), errors: [ { message: "Type of the default value for 'foo' prop must be a string.", @@ -967,7 +967,6 @@ ruleTester.run('require-valid-default-prop', rule, { i: ['foo', 'bar'], }) `, - ...getTypeScriptFixtureTestOptions(), errors: [ { message: "Type of the default value for 'a' prop must be a string.", @@ -1006,7 +1005,8 @@ ruleTester.run('require-valid-default-prop', rule, { message: "Type of the default value for 'i' prop must be a function.", line: 13 } - ] + ], + ...getTypeScriptFixtureTestOptions() } ] }) diff --git a/tests/lib/rules/return-in-computed-property.js b/tests/lib/rules/return-in-computed-property.js index 9fbe2c84e..71afcc3eb 100644 --- a/tests/lib/rules/return-in-computed-property.js +++ b/tests/lib/rules/return-in-computed-property.js @@ -94,8 +94,8 @@ ruleTester.run('return-in-computed-property', rule, { } } `, - parserOptions, - options: [{ treatUndefinedAsUnspecified: false }] + options: [{ treatUndefinedAsUnspecified: false }], + parserOptions }, { filename: 'test.vue', @@ -144,8 +144,8 @@ ruleTester.run('return-in-computed-property', rule, { } } `, - parserOptions, - options: [{ treatUndefinedAsUnspecified: false }] + options: [{ treatUndefinedAsUnspecified: false }], + parserOptions } ], @@ -264,8 +264,8 @@ ruleTester.run('return-in-computed-property', rule, { } } `, - parserOptions, options: [{ treatUndefinedAsUnspecified: false }], + parserOptions, errors: [ { message: 'Expected to return a value in "foo" computed property.', @@ -284,8 +284,8 @@ ruleTester.run('return-in-computed-property', rule, { } } `, - parserOptions, options: [{ treatUndefinedAsUnspecified: true }], + parserOptions, errors: [ { message: 'Expected to return a value in "foo" computed property.', @@ -378,8 +378,8 @@ ruleTester.run('return-in-computed-property', rule, { } } `, - parserOptions, options: [{ treatUndefinedAsUnspecified: false }], + parserOptions, errors: [ { message: 'Expected to return a value in computed function.', diff --git a/tests/lib/rules/singleline-html-element-content-newline.js b/tests/lib/rules/singleline-html-element-content-newline.js index a740ff0ed..5bf2c9392 100644 --- a/tests/lib/rules/singleline-html-element-content-newline.js +++ b/tests/lib/rules/singleline-html-element-content-newline.js @@ -372,7 +372,6 @@ content
singleline content
`, - options: [{ ignoreWhenNoAttributes: false }], output: ` `, + options: [{ ignoreWhenNoAttributes: false }], errors: [ 'Expected 1 line break after opening tag (`
`), but no line breaks found.', 'Expected 1 line break before closing tag (`
`), but no line breaks found.' @@ -391,7 +391,6 @@ singleline content singlelinechildren `, - options: [{ ignoreWhenNoAttributes: false }], output: ` `, + options: [{ ignoreWhenNoAttributes: false }], errors: [ 'Expected 1 line break after opening tag (``), but no line breaks found.', 'Expected 1 line break after opening tag (``), but no line breaks found.', @@ -418,7 +418,6 @@ children
`, - options: [{ ignoreWhenNoAttributes: false }], output: ` `, + options: [{ ignoreWhenNoAttributes: false }], errors: [ 'Expected 1 line break after opening tag (`
`), but no line breaks found.', 'Expected 1 line break before closing tag (`
`), but no line breaks found.' @@ -437,7 +437,6 @@ children
singleline element
`, - options: [{ ignoreWhenNoAttributes: false }], output: ` `, + options: [{ ignoreWhenNoAttributes: false }], errors: [ 'Expected 1 line break after opening tag (`
`), but no line breaks found.', 'Expected 1 line break before closing tag (`
`), but no line breaks found.' @@ -456,13 +456,13 @@ singleline element
`, - options: [{ ignoreWhenEmpty: false, ignoreWhenNoAttributes: false }], output: ` `, + options: [{ ignoreWhenEmpty: false, ignoreWhenNoAttributes: false }], errors: [ 'Expected 1 line break after opening tag (`
`), but no line breaks found.' ] @@ -473,13 +473,13 @@ singleline element
`, - options: [{ ignoreWhenEmpty: false, ignoreWhenNoAttributes: false }], output: ` `, + options: [{ ignoreWhenEmpty: false, ignoreWhenNoAttributes: false }], errors: [ 'Expected 1 line break after opening tag (`
`), but no line breaks found.' ] diff --git a/tests/lib/rules/space-in-parens.js b/tests/lib/rules/space-in-parens.js index 8791652ed..ef6fe628e 100644 --- a/tests/lib/rules/space-in-parens.js +++ b/tests/lib/rules/space-in-parens.js @@ -94,13 +94,13 @@ tester.run('space-in-parens', rule, { @click="foo(arg)" /> `, - options: ['always'], output: ` `, + options: ['always'], errors: [ errorMessage({ messageId: 'missingOpeningSpace', @@ -143,13 +143,13 @@ tester.run('space-in-parens', rule, { :value="(1 + 2) + 3" > `, - options: ['always'], output: ` `, + options: ['always'], errors: [ errorMessage({ messageId: 'missingOpeningSpace', @@ -192,13 +192,13 @@ tester.run('space-in-parens', rule, { :[(1+2)]="(1 + 2) + 3" > `, - options: ['always'], output: ` `, + options: ['always'], errors: [ errorMessage({ messageId: 'missingOpeningSpace', diff --git a/tests/lib/rules/space-unary-ops.js b/tests/lib/rules/space-unary-ops.js index 6b3e7c25f..63539a5a7 100644 --- a/tests/lib/rules/space-unary-ops.js +++ b/tests/lib/rules/space-unary-ops.js @@ -50,8 +50,8 @@ tester.run('space-unary-ops', rule, { }, { code: '', - options: [{ nonwords: true }], output: '', + options: [{ nonwords: true }], errors: ["Unary operator '!' must be followed by whitespace."] }, diff --git a/tests/lib/rules/template-curly-spacing.js b/tests/lib/rules/template-curly-spacing.js index 6c4376969..0fe530511 100644 --- a/tests/lib/rules/template-curly-spacing.js +++ b/tests/lib/rules/template-curly-spacing.js @@ -41,14 +41,13 @@ tester.run('template-curly-spacing', rule, { }, // CSS vars injection - { - code: ` + ` ` - } + + ` ], invalid: [ { @@ -79,12 +78,12 @@ tester.run('template-curly-spacing', rule, {
`, - options: ['always'], output: ` `, + options: ['always'], errors: [ { message: "Expected space(s) after '${'.", diff --git a/tests/lib/rules/this-in-template.js b/tests/lib/rules/this-in-template.js index 904aa00c4..5686bf137 100644 --- a/tests/lib/rules/this-in-template.js +++ b/tests/lib/rules/this-in-template.js @@ -248,14 +248,14 @@ ruleTester.run('this-in-template', rule, { { code: ``, output: ``, - errors: ["Unexpected usage of 'this'."], - options: ['never'] + options: ['never'], + errors: ["Unexpected usage of 'this'."] }, { code: ``, output: ``, - errors: ["Unexpected usage of 'this'."], - options: ['never'] + options: ['never'], + errors: ["Unexpected usage of 'this'."] } ] }) diff --git a/tests/lib/rules/use-v-on-exact.js b/tests/lib/rules/use-v-on-exact.js index 73ac2408b..929fd746a 100644 --- a/tests/lib/rules/use-v-on-exact.js +++ b/tests/lib/rules/use-v-on-exact.js @@ -15,92 +15,48 @@ const ruleTester = new RuleTester({ ruleTester.run('use-v-on-exact', rule, { valid: [ - { - code: `` - }, - { - code: `` - }, - { - code: `` - }, - { - code: `` - }, - { - code: `` - }, - { - code: `` - }, - { - code: `` - }, - { - code: `` - }, - { - code: `` - }, - { - code: `` - }, - { - code: `` - }, - { - code: `` - }, - { - code: `` - }, - { - code: `` - }, - { - code: `` - }, - { - code: `` - }, - { - code: `` - }, - { - code: `` - }, - { - code: `` - }, - { - code: `` - }, - { - code: `` - }, - { - code: `` - }, - { - code: ` + ` ], invalid: [ diff --git a/tests/lib/rules/v-bind-style.js b/tests/lib/rules/v-bind-style.js index 2fd1ce7c2..0cb67f62f 100644 --- a/tests/lib/rules/v-bind-style.js +++ b/tests/lib/rules/v-bind-style.js @@ -67,44 +67,44 @@ tester.run('v-bind-style', rule, { }, { filename: 'test.vue', - options: ['shorthand'], code: '', output: '', + options: ['shorthand'], errors: ["Unexpected 'v-bind' before ':'."] }, { filename: 'test.vue', - options: ['longform'], code: '', output: '', + options: ['longform'], errors: ["Expected 'v-bind' before ':'."] }, { filename: 'test.vue', - options: ['longform'], code: '', output: '', + options: ['longform'], errors: ["Expected 'v-bind:' instead of '.'."] }, { filename: 'test.vue', - options: ['longform'], code: '', output: '', + options: ['longform'], errors: ["Expected 'v-bind:' instead of '.'."] }, { filename: 'test.vue', - options: ['longform'], code: '', output: '', + options: ['longform'], errors: ["Expected 'v-bind:' instead of '.'."] }, { filename: 'test.vue', - options: ['longform'], code: '', output: '', + options: ['longform'], errors: ["Expected 'v-bind:' instead of '.'."] } ] diff --git a/tests/lib/rules/v-for-delimiter-style.js b/tests/lib/rules/v-for-delimiter-style.js index b1500af50..23665a32c 100644 --- a/tests/lib/rules/v-for-delimiter-style.js +++ b/tests/lib/rules/v-for-delimiter-style.js @@ -94,9 +94,9 @@ tester.run('v-for-delimiter-style', rule, { }, { filename: 'test.vue', - options: ['in'], code: '', output: '', + options: ['in'], errors: [ { message: "Expected 'in' instead of 'of' in 'v-for'.", @@ -106,9 +106,9 @@ tester.run('v-for-delimiter-style', rule, { }, { filename: 'test.vue', - options: ['of'], code: '', output: '', + options: ['of'], errors: [ { message: "Expected 'of' instead of 'in' in 'v-for'.", diff --git a/tests/lib/rules/v-on-event-hyphenation.js b/tests/lib/rules/v-on-event-hyphenation.js index 087e5d00a..beaa5e3fa 100644 --- a/tests/lib/rules/v-on-event-hyphenation.js +++ b/tests/lib/rules/v-on-event-hyphenation.js @@ -73,12 +73,12 @@ tester.run('v-on-event-hyphenation', rule, { `, - options: ['always', { autofix: true }], output: ` `, + options: ['always', { autofix: true }], errors: [ { message: "v-on event '@customEvent' must be hyphenated.", @@ -95,12 +95,12 @@ tester.run('v-on-event-hyphenation', rule, { `, - options: ['never', { autofix: true }], output: ` `, + options: ['never', { autofix: true }], errors: ["v-on event 'v-on:custom-event' can't be hyphenated."] }, { @@ -110,13 +110,13 @@ tester.run('v-on-event-hyphenation', rule, { `, - options: ['always', { autofix: true }], output: ` `, + options: ['always', { autofix: true }], errors: ["v-on event '@update:modelValue' must be hyphenated."] }, { @@ -126,13 +126,13 @@ tester.run('v-on-event-hyphenation', rule, { `, - options: ['never', { autofix: true }], output: ` `, + options: ['never', { autofix: true }], errors: ["v-on event '@update:model-value' can't be hyphenated."] }, { @@ -144,7 +144,6 @@ tester.run('v-on-event-hyphenation', rule, { `, - options: ['always', { autofix: true }], output: ` `, + options: ['always', { autofix: true }], errors: [ "v-on event '@upDate:modelValue' must be hyphenated.", "v-on event '@up-date:modelValue' must be hyphenated.", @@ -168,7 +168,6 @@ tester.run('v-on-event-hyphenation', rule, { `, - options: ['never', { autofix: true }], output: ` `, + options: ['never', { autofix: true }], errors: [ "v-on event '@up-date:modelValue' can't be hyphenated.", "v-on event '@upDate:model-value' can't be hyphenated.", diff --git a/tests/lib/rules/v-on-function-call.js b/tests/lib/rules/v-on-function-call.js index d8486a448..d06bbe231 100644 --- a/tests/lib/rules/v-on-function-call.js +++ b/tests/lib/rules/v-on-function-call.js @@ -161,37 +161,37 @@ tester.run('v-on-function-call', rule, { filename: 'test.vue', code: '', output: null, + options: ['always'], errors: [ "Method calls inside of 'v-on' directives must have parentheses." - ], - options: ['always'] + ] }, { filename: 'test.vue', code: '', output: ``, + options: ['never'], errors: [ "Method calls without arguments inside of 'v-on' directives must not have parentheses." - ], - options: ['never'] + ] }, { filename: 'test.vue', code: '', output: ``, + options: ['never'], errors: [ "Method calls without arguments inside of 'v-on' directives must not have parentheses." - ], - options: ['never'] + ] }, { filename: 'test.vue', code: '', output: null, + options: ['never'], errors: [ "Method calls without arguments inside of 'v-on' directives must not have parentheses." - ], - options: ['never'] + ] }, { filename: 'test.vue', @@ -204,13 +204,13 @@ tester.run('v-on-function-call', rule, { ">
`, output: null, + options: ['never'], errors: [ "Method calls without arguments inside of 'v-on' directives must not have parentheses.", "Method calls without arguments inside of 'v-on' directives must not have parentheses.", "Method calls without arguments inside of 'v-on' directives must not have parentheses.", "Method calls without arguments inside of 'v-on' directives must not have parentheses." - ], - options: ['never'] + ] }, { filename: 'test.vue', @@ -222,10 +222,10 @@ tester.run('v-on-function-call', rule, { `, + options: ['never'], errors: [ "Method calls without arguments inside of 'v-on' directives must not have parentheses." - ], - options: ['never'] + ] }, { filename: 'test.vue', @@ -237,10 +237,10 @@ tester.run('v-on-function-call', rule, { `, + options: ['never'], errors: [ "Method calls without arguments inside of 'v-on' directives must not have parentheses." - ], - options: ['never'] + ] }, { filename: 'test.vue', @@ -254,11 +254,11 @@ tester.run('v-on-function-call', rule, {
`, + options: ['never'], errors: [ "Method calls without arguments inside of 'v-on' directives must not have parentheses.", "Method calls without arguments inside of 'v-on' directives must not have parentheses." - ], - options: ['never'] + ] }, { filename: 'test.vue', @@ -270,10 +270,10 @@ tester.run('v-on-function-call', rule, { `, + options: ['never'], errors: [ "Method calls without arguments inside of 'v-on' directives must not have parentheses." - ], - options: ['never'] + ] }, { filename: 'test.vue', @@ -285,19 +285,19 @@ tester.run('v-on-function-call', rule, { `, + options: ['never'], errors: [ "Method calls without arguments inside of 'v-on' directives must not have parentheses." - ], - options: ['never'] + ] }, { filename: 'test.vue', code: '', output: '', + options: ['never'], errors: [ "Method calls without arguments inside of 'v-on' directives must not have parentheses." - ], - options: ['never'] + ] }, { filename: 'test.vue', @@ -319,10 +319,10 @@ tester.run('v-on-function-call', rule, { } } `, + options: ['never'], errors: [ "Method calls without arguments inside of 'v-on' directives must not have parentheses." - ], - options: ['never'] + ] }, { filename: 'test.vue', @@ -344,10 +344,10 @@ tester.run('v-on-function-call', rule, { } } `, + options: ['never'], errors: [ "Method calls without arguments inside of 'v-on' directives must not have parentheses." - ], - options: ['never'] + ] } ] }) diff --git a/tests/lib/rules/v-on-handler-style.js b/tests/lib/rules/v-on-handler-style.js index e3afd05d5..314bbf8c8 100644 --- a/tests/lib/rules/v-on-handler-style.js +++ b/tests/lib/rules/v-on-handler-style.js @@ -78,12 +78,12 @@ tester.run('v-on-handler-style', rule, {