Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed vue/no-unused-properties, vue/require-valid-default-prop, vue/require-default-prop and vue/no-multiple-objects-in-class rules crash on sparse arrays. #1242

Merged
merged 1 commit into from Jul 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/rules/no-multiple-objects-in-class.js
Expand Up @@ -21,7 +21,7 @@ const { defineTemplateBodyVisitor } = require('../utils')
*/
function countObjectExpression(node) {
return node.value.expression.elements.filter(
(element) => element.type === 'ObjectExpression'
(element) => element && element.type === 'ObjectExpression'
).length
}

Expand Down
22 changes: 14 additions & 8 deletions lib/rules/require-default-prop.js
Expand Up @@ -10,6 +10,7 @@
*/

const utils = require('../utils')
const { isDef } = require('../utils')

const NATIVE_TYPES = new Set([
'String',
Expand Down Expand Up @@ -99,16 +100,21 @@ module.exports = {
/**
* Detects whether given value node is a Boolean type
* @param {Expression | Pattern} value
* @return {Boolean}
* @return {boolean}
*/
function isValueNodeOfBooleanType(value) {
return (
(value.type === 'Identifier' && value.name === 'Boolean') ||
(value.type === 'ArrayExpression' &&
value.elements.length === 1 &&
value.elements[0].type === 'Identifier' &&
value.elements[0].name === 'Boolean')
)
if (value.type === 'Identifier' && value.name === 'Boolean') {
return true
}
if (value.type === 'ArrayExpression') {
const elements = value.elements.filter(isDef)
return (
elements.length === 1 &&
elements[0].type === 'Identifier' &&
elements[0].name === 'Boolean'
)
}
return false
}

/**
Expand Down
6 changes: 4 additions & 2 deletions lib/rules/require-prop-type-constructor.js
Expand Up @@ -5,6 +5,7 @@
'use strict'

const utils = require('../utils')
const { isDef } = require('../utils')

// ------------------------------------------------------------------------------
// Rule Definition
Expand Down Expand Up @@ -49,10 +50,11 @@ module.exports = {
*/
function checkPropertyNode(propName, node) {
/** @type {ESNode[]} */
const nodes = node.type === 'ArrayExpression' ? node.elements : [node]
const nodes =
node.type === 'ArrayExpression' ? node.elements.filter(isDef) : [node]

nodes
.filter((prop) => prop && isForbiddenType(prop))
.filter((prop) => isForbiddenType(prop))
.forEach((prop) =>
context.report({
node: prop,
Expand Down
4 changes: 2 additions & 2 deletions lib/rules/require-valid-default-prop.js
Expand Up @@ -58,10 +58,10 @@ function getTypes(node) {
return node.elements
.filter(
/**
* @param {Expression | SpreadElement} item
* @param {Expression | SpreadElement | null} item
* @returns {item is Identifier}
*/
(item) => item.type === 'Identifier'
(item) => item != null && item.type === 'Identifier'
)
.map((item) => item.name)
}
Expand Down
85 changes: 42 additions & 43 deletions lib/utils/index.js
Expand Up @@ -737,29 +737,27 @@ module.exports = {
}
})
} else {
return propsNode.value.elements
.filter((prop) => prop)
.map((prop) => {
if (prop.type === 'Literal' || prop.type === 'TemplateLiteral') {
const propName = getStringLiteralValue(prop)
if (propName != null) {
return {
type: 'array',
key: prop,
propName,
value: null,
node: prop
}
return propsNode.value.elements.filter(isDef).map((prop) => {
if (prop.type === 'Literal' || prop.type === 'TemplateLiteral') {
const propName = getStringLiteralValue(prop)
if (propName != null) {
return {
type: 'array',
key: prop,
propName,
value: null,
node: prop
}
}
return {
type: 'array',
key: null,
propName: null,
value: null,
node: prop
}
})
}
return {
type: 'array',
key: null,
propName: null,
value: null,
node: prop
}
})
}
},

Expand Down Expand Up @@ -810,29 +808,27 @@ module.exports = {
}
})
} else {
return emitsNode.value.elements
.filter((prop) => prop)
.map((prop) => {
if (prop.type === 'Literal' || prop.type === 'TemplateLiteral') {
const emitName = getStringLiteralValue(prop)
if (emitName != null) {
return {
type: 'array',
key: prop,
emitName,
value: null,
node: prop
}
return emitsNode.value.elements.filter(isDef).map((prop) => {
if (prop.type === 'Literal' || prop.type === 'TemplateLiteral') {
const emitName = getStringLiteralValue(prop)
if (emitName != null) {
return {
type: 'array',
key: prop,
emitName,
value: null,
node: prop
}
}
return {
type: 'array',
key: null,
emitName: null,
value: null,
node: prop
}
})
}
return {
type: 'array',
key: null,
emitName: null,
value: null,
node: prop
}
})
}
},

Expand Down Expand Up @@ -1109,7 +1105,10 @@ module.exports = {
*/
*iterateArrayExpression(node, groupName) {
for (const item of node.elements) {
if (item.type === 'Literal' || item.type === 'TemplateLiteral') {
if (
item &&
(item.type === 'Literal' || item.type === 'TemplateLiteral')
) {
const name = getStringLiteralValue(item)
if (name) {
yield { type: 'array', name, groupName, node: item }
Expand Down
11 changes: 11 additions & 0 deletions tests/lib/rules/no-multiple-objects-in-class.js
Expand Up @@ -43,6 +43,17 @@ ruleTester.run('no-multiple-objects-in-class', rule, {
type: 'VAttribute'
}
]
},

// sparse array
{
code: `<template><div v-bind:class="[,{'foo': isFoo}, {'bar': isBar}]" /></template>`,
errors: [
{
message: 'Unexpected multiple objects. Merge objects.',
type: 'VAttribute'
}
]
}
]
})
15 changes: 15 additions & 0 deletions tests/lib/rules/no-unused-properties.js
Expand Up @@ -981,6 +981,21 @@ tester.run('no-unused-properties', rule, {
}
</script>`,
options: [{ groups: ['props', 'setup'] }]
},

// sparse array
{
filename: 'test.vue',
code: `
<template>
<div>{{ count }}</div>
</template>
<script>
export default {
props: [, 'count']
}
</script>
`
}
],

Expand Down
15 changes: 15 additions & 0 deletions tests/lib/rules/require-default-prop.js
Expand Up @@ -179,6 +179,21 @@ ruleTester.run('require-default-prop', rule, {
}
}
`
},

// sparse array
{
filename: 'test.vue',
code: `
export default {
props: {
a: {
type: [,Boolean]
},
b: [,Boolean],
}
}
`
}
],

Expand Down
14 changes: 14 additions & 0 deletions tests/lib/rules/require-valid-default-prop.js
Expand Up @@ -181,6 +181,20 @@ ruleTester.run('require-valid-default-prop', rule, {
}
}`,
parserOptions
},

// sparse array
{
filename: 'test.vue',
code: `export default {
props: {
foo: {
type: [,Object, Number],
default: 10
}
}
}`,
parserOptions
}
],

Expand Down
2 changes: 1 addition & 1 deletion typings/eslint-plugin-vue/util-types/ast/es-ast.ts
Expand Up @@ -298,7 +298,7 @@ export interface ThisExpression extends HasParentNode {
}
export interface ArrayExpression extends HasParentNode {
type: 'ArrayExpression'
elements: (Expression | SpreadElement)[]
elements: (Expression | SpreadElement | null)[]
}
export interface ObjectExpression extends HasParentNode {
type: 'ObjectExpression'
Expand Down