Skip to content

Commit df84d9b

Browse files
armano2mysticatea
armano2
authored and
mysticatea
committed
Fix: improve support for spread operator (#146)
* Fix exceptions in iterateFunctionExpression and iterateProperties: * Cannot read property 'type' of null * Improve support for spread operator * Add more unit tests to match all possible cases
1 parent 140a276 commit df84d9b

14 files changed

+115
-28
lines changed

‎lib/rules/order-in-components.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ function getOrderMap (order) {
5353
}
5454

5555
function checkOrder (propertiesNodes, orderMap, context) {
56-
const properties = propertiesNodes.map(property => property.key)
56+
const properties = propertiesNodes
57+
.filter(property => property.type === 'Property')
58+
.map(property => property.key)
5759

5860
properties.forEach((property, i) => {
5961
const propertiesAbove = properties.slice(0, i)

‎lib/utils/index.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@ module.exports = {
323323
getComputedProperties (componentObject) {
324324
const computedPropertiesNode = componentObject.properties
325325
.find(p =>
326+
p.type === 'Property' &&
326327
p.key.type === 'Identifier' &&
327328
p.key.name === 'computed' &&
328329
p.value.type === 'ObjectExpression'
@@ -480,6 +481,8 @@ module.exports = {
480481
const nodes = node.properties.filter(p => p.type === 'Property' && groups.has(this.getStaticPropertyName(p.key)))
481482
for (const item of nodes) {
482483
const name = this.getStaticPropertyName(item.key)
484+
if (!name) continue
485+
483486
if (item.value.type === 'ArrayExpression') {
484487
yield * this.iterateArrayExpression(item.value, name)
485488
} else if (item.value.type === 'ObjectExpression') {
@@ -531,7 +534,7 @@ module.exports = {
531534
assert(node.type === 'FunctionExpression')
532535
if (node.body.type === 'BlockStatement') {
533536
for (const item of node.body.body) {
534-
if (item.type === 'ReturnStatement' && item.argument.type === 'ObjectExpression') {
537+
if (item.type === 'ReturnStatement' && item.argument && item.argument.type === 'ObjectExpression') {
535538
yield * this.iterateObjectExpression(item.argument, groupName)
536539
}
537540
}

‎tests/lib/rules/html-end-tags.js‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,24 @@ tester.run('html-end-tags', rule, {
4949
}
5050
],
5151
invalid: [
52-
// {
53-
// filename: "test.vue",
54-
// code: "<template><div><hr></hr></div></template>",
55-
// errors: ["'<hr>' should not have end tag."],
56-
// },
57-
// {
58-
// filename: "test.vue",
59-
// code: "<template><div><img></img></div></template>",
60-
// errors: ["'<img>' should not have end tag."],
61-
// },
62-
// {
63-
// filename: "test.vue",
64-
// code: "<template><div><input></input></div></template>",
65-
// errors: ["'<input>' should not have end tag."],
66-
// },
52+
// {
53+
// filename: 'test.vue',
54+
// code: '<template><div><hr></hr></div></template>',
55+
// output: '<template><div><hr></template>',
56+
// errors: ["'<hr>' should not have end tag."]
57+
// },
58+
// {
59+
// filename: 'test.vue',
60+
// code: '<template><div><img></img></div></template>',
61+
// output: '<template><div><img></template>',
62+
// errors: ["'<img>' should not have end tag."]
63+
// },
64+
// {
65+
// filename: 'test.vue',
66+
// code: '<template><div><input></input></div></template>',
67+
// output: '<template><div><input></template>',
68+
// errors: ["'<input>' should not have end tag."]
69+
// },
6770
{
6871
filename: 'test.vue',
6972
code: '<template><div><div></div></template>',

‎tests/lib/rules/name-property-casing.js‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ const RuleTester = require('eslint').RuleTester
1717

1818
const parserOptions = {
1919
ecmaVersion: 6,
20-
sourceType: 'module'
20+
sourceType: 'module',
21+
ecmaFeatures: { experimentalObjectRestSpread: true }
2122
}
2223

2324
const ruleTester = new RuleTester()
@@ -33,6 +34,16 @@ ruleTester.run('name-property-casing', rule, {
3334
options: ['camelCase'],
3435
parserOptions
3536
},
37+
{
38+
filename: 'test.vue',
39+
code: `
40+
export default {
41+
...name
42+
}
43+
`,
44+
options: ['camelCase'],
45+
parserOptions
46+
},
3647
{
3748
filename: 'test.vue',
3849
code: `

‎tests/lib/rules/no-async-in-computed-properties.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ ruleTester.run('no-async-in-computed-properties', rule, {
3636
filename: 'test.vue',
3737
code: `
3838
export default {
39+
...foo,
3940
computed: {
4041
...mapGetters({
4142
test: 'getTest'

‎tests/lib/rules/no-dupe-keys.js‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ ruleTester.run('no-dupe-keys', rule, {
3232
dat: null
3333
}
3434
},
35+
data () {
36+
return
37+
},
3538
methods: {
3639
_foo () {},
3740
test () {
@@ -68,7 +71,12 @@ ruleTester.run('no-dupe-keys', rule, {
6871
...foo(),
6972
test () {
7073
}
71-
}
74+
},
75+
data () {
76+
return {
77+
...dat
78+
}
79+
},
7280
}
7381
`,
7482
parserOptions: { ecmaVersion: 8, sourceType: 'module', ecmaFeatures: { experimentalObjectRestSpread: true }}

‎tests/lib/rules/no-reservered-keys.js‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
const rule = require('../../../lib/rules/no-reservered-keys')
1212
const RuleTester = require('eslint').RuleTester
1313

14+
const parserOptions = {
15+
ecmaVersion: 7,
16+
sourceType: 'module',
17+
ecmaFeatures: { experimentalObjectRestSpread: true }
18+
}
19+
1420
// ------------------------------------------------------------------------------
1521
// Tests
1622
// ------------------------------------------------------------------------------
@@ -39,7 +45,7 @@ ruleTester.run('no-reservered-keys', rule, {
3945
}
4046
}
4147
`,
42-
parserOptions: { ecmaVersion: 6, sourceType: 'module' }
48+
parserOptions
4349
}
4450
],
4551

‎tests/lib/rules/no-shared-component-data.js‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,24 @@ ruleTester.run('no-shared-component-data', rule, {
3232
})
3333
`
3434
},
35+
{
36+
filename: 'test.js',
37+
code: `
38+
new Vue({
39+
...data,
40+
data () {
41+
return {
42+
foo: 'bar'
43+
}
44+
}
45+
})
46+
`,
47+
parserOptions: {
48+
ecmaVersion: 7,
49+
sourceType: 'module',
50+
ecmaFeatures: { experimentalObjectRestSpread: true }
51+
}
52+
},
3553
{
3654
filename: 'test.js',
3755
code: `

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ ruleTester.run('no-side-effects-in-computed-properties', rule, {
2626
valid: [
2727
{
2828
code: `Vue.component('test', {
29+
...foo,
2930
computed: {
3031
...test0({}),
3132
test1() {

‎tests/lib/rules/order-in-components.js‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ const RuleTester = require('eslint').RuleTester
99

1010
const ruleTester = new RuleTester()
1111

12+
const parserOptions = {
13+
ecmaVersion: 6,
14+
sourceType: 'module',
15+
ecmaFeatures: { experimentalObjectRestSpread: true }
16+
}
17+
1218
ruleTester.run('order-in-components', rule, {
1319

1420
valid: [
@@ -20,28 +26,29 @@ ruleTester.run('order-in-components', rule, {
2026
props: {
2127
propA: Number,
2228
},
29+
...a,
2330
data () {
2431
return {
2532
msg: 'Welcome to Your Vue.js App'
2633
}
2734
},
2835
}
2936
`,
30-
parserOptions: { ecmaVersion: 6, sourceType: 'module' }
37+
parserOptions
3138
},
3239
{
3340
filename: 'test.vue',
3441
code: `
3542
export default {}
3643
`,
37-
parserOptions: { ecmaVersion: 6, sourceType: 'module' }
44+
parserOptions
3845
},
3946
{
4047
filename: 'test.vue',
4148
code: `
4249
export default 'example-text'
4350
`,
44-
parserOptions: { ecmaVersion: 6, sourceType: 'module' }
51+
parserOptions
4552
},
4653
{
4754
filename: 'test.jsx',
@@ -55,7 +62,7 @@ ruleTester.run('order-in-components', rule, {
5562
},
5663
}
5764
`,
58-
parserOptions: { ecmaVersion: 6, sourceType: 'module' }
65+
parserOptions
5966
},
6067
{
6168
filename: 'test.js',
@@ -136,7 +143,7 @@ ruleTester.run('order-in-components', rule, {
136143
},
137144
}
138145
`,
139-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
146+
parserOptions,
140147
errors: [{
141148
message: 'The "props" property should be above the "data" property on line 4.',
142149
line: 9
@@ -268,7 +275,7 @@ ruleTester.run('order-in-components', rule, {
268275
name: 'burger',
269276
};
270277
`,
271-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
278+
parserOptions,
272279
errors: [{
273280
message: 'The "name" property should be above the "data" property on line 3.',
274281
line: 16
@@ -284,7 +291,7 @@ ruleTester.run('order-in-components', rule, {
284291
test: 'ok'
285292
};
286293
`,
287-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
294+
parserOptions,
288295
options: [{ order: ['data', 'test', 'name'] }],
289296
errors: [{
290297
message: 'The "test" property should be above the "name" property on line 5.',

0 commit comments

Comments
 (0)