Commit 628f409

authored

Fix false positives for namespace component in vue/script-setup-uses-vars rule (#1602)

1 parent 59db655 commit 628f409Copy full SHA for 628f409

File tree

3 files changed

+33

-5

lines changed

lib
- rules
  - script-setup-uses-vars.js
- utils
  - index.js
tests/lib/rules
- script-setup-uses-vars.js

3 files changed

+33

-5

lines changed

`‎lib/rules/script-setup-uses-vars.js‎`

Lines changed: 16 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,28 +53,32 @@ module.exports = {`
`53`	`53`	`/**`
`54`	`54`	* `casing.camelCase()` converts the beginning to lowercase,
`55`	`55`	`* but does not convert the case of the beginning character when converting with Vue3.`
`56`		`- * @see https://github.com/vuejs/vue-next/blob/1ffd48a2f5fd3eead3ea29dae668b7ed1c6f6130/packages/shared/src/index.ts#L116`
	`56`	`+ * @see https://github.com/vuejs/vue-next/blob/2749c15170ad4913e6530a257db485d4e7ed2283/packages/shared/src/index.ts#L116`
`57`	`57`	`* @param {string} str`
`58`	`58`	`*/`
`59`	`59`	`function camelize(str) {`
`60`	`60`	`return str.replace(/-(\w)/g, (_, c) => (c ? c.toUpperCase() : ''))`
`61`	`61`	`}`
`62`	`62`	`/**`
`63`		`- * @see https://github.com/vuejs/vue-next/blob/1ffd48a2f5fd3eead3ea29dae668b7ed1c6f6130/packages/compiler-core/src/transforms/transformElement.ts#L321`
	`63`	`+ * @see https://github.com/vuejs/vue-next/blob/2749c15170ad4913e6530a257db485d4e7ed2283/packages/compiler-core/src/transforms/transformElement.ts#L333`
`64`	`64`	`* @param {string} name`
`65`	`65`	`*/`
`66`		`- function markElementVariableAsUsed(name) {`
	`66`	`+ function markSetupReferenceVariableAsUsed(name) {`
`67`	`67`	`if (scriptVariableNames.has(name)) {`
`68`	`68`	`context.markVariableAsUsed(name)`
	`69`	`+ return true`
`69`	`70`	`}`
`70`	`71`	`const camelName = camelize(name)`
`71`	`72`	`if (scriptVariableNames.has(camelName)) {`
`72`	`73`	`context.markVariableAsUsed(camelName)`
	`74`	`+ return true`
`73`	`75`	`}`
`74`	`76`	`const pascalName = casing.capitalize(camelName)`
`75`	`77`	`if (scriptVariableNames.has(pascalName)) {`
`76`	`78`	`context.markVariableAsUsed(pascalName)`
	`79`	`+ return true`
`77`	`80`	`}`
	`81`	`+ return false`
`78`	`82`	`}`
`79`	`83`
`80`	`84`	`return utils.defineTemplateBodyVisitor(`
`@@ -97,14 +101,21 @@ module.exports = {`
`97`	`101`	`) {`
`98`	`102`	`return`
`99`	`103`	`}`
`100`		`- markElementVariableAsUsed(node.rawName)`
	`104`	`+ if (!markSetupReferenceVariableAsUsed(node.rawName)) {`
	`105`	`+ // Check namespace`
	`106`	`+ // https://github.com/vuejs/vue-next/blob/2749c15170ad4913e6530a257db485d4e7ed2283/packages/compiler-core/src/transforms/transformElement.ts#L304`
	`107`	`+ const dotIndex = node.rawName.indexOf('.')`
	`108`	`+ if (dotIndex > 0) {`
	`109`	`+ markSetupReferenceVariableAsUsed(node.rawName.slice(0, dotIndex))`
	`110`	`+ }`
	`111`	`+ }`
`101`	`112`	`},`
`102`	`113`	`/** @param {VDirective} node */`
`103`	`114`	`'VAttribute[directive=true]'(node) {`
`104`	`115`	`if (utils.isBuiltInDirectiveName(node.key.name.name)) {`
`105`	`116`	`return`
`106`	`117`	`}`
`107`		- markElementVariableAsUsed(`v-${node.key.name.rawName}`)
	`118`	+ markSetupReferenceVariableAsUsed(`v-${node.key.name.rawName}`)
`108`	`119`	`},`
`109`	`120`	`/** @param {VAttribute} node */`
`110`	`121`	`'VAttribute[directive=false]'(node) {`

`‎lib/utils/index.js‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -704,6 +704,7 @@ module.exports = {`
`704`	`704`	`name === 'pre' \|\|`
`705`	`705`	`name === 'cloak' \|\|`
`706`	`706`	`name === 'once' \|\|`
	`707`	`+ name === 'memo' \|\|`
`707`	`708`	`name === 'is'`
`708`	`709`	`)`
`709`	`710`	`},`

`‎tests/lib/rules/script-setup-uses-vars.js‎`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -198,6 +198,22 @@ describe('script-setup-uses-vars', () => {`
`198`	`198`	`}`
`199`	`199`	`</style>`
`200`	`200`	`
	`201`	`+ },`
	`202`	`+ // ns`
	`203`	`+ {`
	`204`	`+ filename: 'test.vue',`
	`205`	+ code: `
	`206`	`+ <script setup>`
	`207`	`+ /* eslint script-setup-uses-vars: 1 */`
	`208`	`+ import * as Form from './form-components'`
	`209`	`+ </script>`
	`210`	`+`
	`211`	`+ <template>`
	`212`	`+ <Form.Input>`
	`213`	`+ <Form.Label>label</Form.Label>`
	`214`	`+ </Form.Input>`
	`215`	`+ </template>`
	`216`	+ `
`201`	`217`	`}`
`202`	`218`	`],`
`203`	`219`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 628f409

File tree

3 files changed

3 files changed

`‎lib/rules/script-setup-uses-vars.js‎`

`‎lib/utils/index.js‎`

`‎tests/lib/rules/script-setup-uses-vars.js‎`

0 commit comments