Commit 5ed7397

authored

Add support for Vue2 functional component to vue/no-unused-properties and vue/no-undef-properties rules (#1761)

1 parent ae34c65 commit 5ed7397Copy full SHA for 5ed7397

File tree

+105

-3

lines changed

+105

-3

lines changed

Lines changed: 16 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,12 @@ function definePropertyReferenceExtractor(context) {`
`96`	`96`	`/** @type {{ toRefNodes: Set<ESNode>, toRefsNodes: Set<ESNode>} \| null} */`
`97`	`97`	`let toRefSet = null`
`98`	`98`
	`99`	`+ let isFunctionalTemplate = false`
	`100`	`+ const templateBody = context.getSourceCode().ast.templateBody`
	`101`	`+ if (templateBody) {`
	`102`	`+ isFunctionalTemplate = utils.hasAttribute(templateBody, 'functional')`
	`103`	`+ }`
	`104`	`+`
`99`	`105`	`function getToRefSet() {`
`100`	`106`	`if (toRefSet) {`
`101`	`107`	`return toRefSet`
`@@ -578,16 +584,23 @@ function definePropertyReferenceExtractor(context) {`
`578`	`584`
`579`	`585`	`ignoreRef = (name) => globalScope.set.has(name)`
`580`	`586`	`}`
	`587`	`+ /** @type {IPropertyReferences[]} */`
`581`	`588`	`const references = []`
`582`	`589`	`for (const id of node.references`
`583`	`590`	`.filter((ref) => ref.variable == null)`
`584`	`591`	`.map((ref) => ref.id)) {`
`585`	`592`	`if (ignoreRef(id.name)) {`
`586`	`593`	`continue`
`587`	`594`	`}`
`588`		`- references.push(`
`589`		`- extractFromName(id.name, id, () => extractFromExpression(id, true))`
`590`		`- )`
	`595`	`+ if (!isFunctionalTemplate) {`
	`596`	`+ references.push(`
	`597`	`+ extractFromName(id.name, id, () => extractFromExpression(id, true))`
	`598`	`+ )`
	`599`	`+ } else {`
	`600`	`+ if (id.name === 'props') {`
	`601`	`+ references.push(extractFromExpression(id, true))`
	`602`	`+ }`
	`603`	`+ }`
`591`	`604`	`}`
`592`	`605`	`return mergePropertyReferences(references)`
`593`	`606`	`}`

Lines changed: 43 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -517,6 +517,24 @@ tester.run('no-undef-properties', rule, {`
`517`	`517`	`};`
`518`	`518`	`</script>`
`519`	`519`	`
	`520`	`+ },`
	`521`	`+`
	`522`	`+ // Vue2 functional component`
	`523`	`+ {`
	`524`	`+ filename: 'test.vue',`
	`525`	+ code: `
	`526`	`+ <template functional>`
	`527`	`+ <div>{{props.a}} {{props.b}}</div>`
	`528`	`+ </template>`
	`529`	`+`
	`530`	`+ <script>`
	`531`	`+ export default {`
	`532`	`+ props: {`
	`533`	`+ a: String,`
	`534`	`+ b: String,`
	`535`	`+ },`
	`536`	`+ };`
	`537`	+ </script>`
`520`	`538`	`}`
`521`	`539`	`],`
`522`	`540`
`@@ -1086,6 +1104,31 @@ tester.run('no-undef-properties', rule, {`
`1086`	`1104`	`line: 16`
`1087`	`1105`	`}`
`1088`	`1106`	`]`
	`1107`	`+ },`
	`1108`	`+`
	`1109`	`+ // Vue2 functional component`
	`1110`	`+ {`
	`1111`	`+ filename: 'test.vue',`
	`1112`	+ code: `
	`1113`	`+ <template functional>`
	`1114`	`+ <div>{{props.a}} {{props.b}} {{props.c}}</div>`
	`1115`	`+ </template>`
	`1116`	`+`
	`1117`	`+ <script>`
	`1118`	`+ export default {`
	`1119`	`+ props: {`
	`1120`	`+ a: String,`
	`1121`	`+ b: String,`
	`1122`	`+ },`
	`1123`	`+ };`
	`1124`	+ </script>`,
	`1125`	`+ errors: [`
	`1126`	`+ {`
	`1127`	`+ message: "'c' is not defined.",`
	`1128`	`+ line: 3,`
	`1129`	`+ column: 46`
	`1130`	`+ }`
	`1131`	`+ ]`
`1089`	`1132`	`}`
`1090`	`1133`	`]`
`1091`	`1134`	`})`

Lines changed: 46 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1678,6 +1678,24 @@ tester.run('no-unused-properties', rule, {`
`1678`	`1678`	`<style lang="scss" scoped>`
`1679`	`1679`	`//`
`1680`	`1680`	</style>`
	`1681`	`+ },`
	`1682`	`+`
	`1683`	`+ // Vue2 functional component`
	`1684`	`+ {`
	`1685`	`+ filename: 'test.vue',`
	`1686`	+ code: `
	`1687`	`+ <template functional>`
	`1688`	`+ <div>{{props.a}} {{props.b}}</div>`
	`1689`	`+ </template>`
	`1690`	`+`
	`1691`	`+ <script>`
	`1692`	`+ export default {`
	`1693`	`+ props: {`
	`1694`	`+ a: String,`
	`1695`	`+ b: String,`
	`1696`	`+ },`
	`1697`	`+ };`
	`1698`	+ </script>`
`1681`	`1699`	`}`
`1682`	`1700`	`],`
`1683`	`1701`
`@@ -2756,6 +2774,34 @@ tester.run('no-unused-properties', rule, {`
`2756`	`2774`	`"'foo.bar.b' of data found, but never used.",`
`2757`	`2775`	`"'foo.baz' of data found, but never used."`
`2758`	`2776`	`]`
	`2777`	`+ },`
	`2778`	`+`
	`2779`	`+ // Vue2 functional component`
	`2780`	`+ {`
	`2781`	`+ filename: 'test.vue',`
	`2782`	+ code: `
	`2783`	`+ <template functional>`
	`2784`	`+ <div>{{a}} {{b}} {{props.c}}</div>`
	`2785`	`+ </template>`
	`2786`	`+`
	`2787`	`+ <script>`
	`2788`	`+ export default {`
	`2789`	`+ props: {`
	`2790`	`+ a: String,`
	`2791`	`+ b: String,`
	`2792`	`+ },`
	`2793`	`+ };`
	`2794`	+ </script>`,
	`2795`	`+ errors: [`
	`2796`	`+ {`
	`2797`	`+ message: "'a' of property found, but never used.",`
	`2798`	`+ line: 9`
	`2799`	`+ },`
	`2800`	`+ {`
	`2801`	`+ message: "'b' of property found, but never used.",`
	`2802`	`+ line: 10`
	`2803`	`+ }`
	`2804`	`+ ]`
`2759`	`2805`	`}`
`2760`	`2806`	`]`
`2761`	`2807`	`})`

Comments

(0)