Commit bc29d3d

armano2michalsnik

authored and

committed

Fix #560 Allow null in require-prop-type-constructor (#578)

* Fix #560 Allow null in require-prop-type-constructor * Add missing check for `{ type: null }`

1 parent ce7cb10 commit bc29d3dCopy full SHA for bc29d3d

File tree

2 files changed

+26

-18

lines changed

lib/rules
- require-prop-type-constructor.js
tests/lib/rules
- require-prop-type-constructor.js

2 files changed

+26

-18

lines changed

`‎lib/rules/require-prop-type-constructor.js`

Lines changed: 16 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ const forbiddenTypes = [`
`19`	`19`	`'UpdateExpression'`
`20`	`20`	`]`
`21`	`21`
`22`		`-const isForbiddenType = nodeType => forbiddenTypes.indexOf(nodeType) > -1`
	`22`	`+const isForbiddenType = node => forbiddenTypes.indexOf(node.type) > -1&&node.raw!=='null'`
`23`	`23`
`24`	`24`	`module.exports = {`
`25`	`25`	`meta: {`
`@@ -46,7 +46,7 @@ module.exports = {`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`const checkPropertyNode = (p) => {`
`49`		`- if (isForbiddenType(p.value.type)) {`
	`49`	`+ if (isForbiddenType(p.value)) {`
`50`	`50`	`context.report({`
`51`	`51`	`node: p.value,`
`52`	`52`	`message,`
`@@ -57,7 +57,7 @@ module.exports = {`
`57`	`57`	`})`
`58`	`58`	`} else if (p.value.type === 'ArrayExpression') {`
`59`	`59`	`p.value.elements`
`60`		`- .filter(prop => isForbiddenType(prop.type))`
	`60`	`+ .filter(prop => isForbiddenType(prop))`
`61`	`61`	`.forEach(prop => context.report({`
`62`	`62`	`node: prop,`
`63`	`63`	`message,`
`@@ -79,20 +79,21 @@ module.exports = {`
`79`	`79`
`80`	`80`	`if (!node) return`
`81`	`81`
`82`		`- node.value.properties.forEach(p => {`
`83`		`- if (isForbiddenType(p.value.type) \|\| p.value.type === 'ArrayExpression') {`
`84`		`- checkPropertyNode(p)`
`85`		`- } else if (p.value.type === 'ObjectExpression') {`
`86`		`- const typeProperty = p.value.properties.find(prop =>`
`87`		`- prop.type === 'Property' &&`
`88`		`- prop.key.name === 'type'`
`89`		`- )`
	`82`	`+ node.value.properties`
	`83`	`+ .forEach(p => {`
	`84`	`+ if (isForbiddenType(p.value) \|\| p.value.type === 'ArrayExpression') {`
	`85`	`+ checkPropertyNode(p)`
	`86`	`+ } else if (p.value.type === 'ObjectExpression') {`
	`87`	`+ const typeProperty = p.value.properties.find(prop =>`
	`88`	`+ prop.type === 'Property' &&`
	`89`	`+ prop.key.name === 'type'`
	`90`	`+ )`
`90`	`91`
`91`		`- if (!typeProperty) return`
	`92`	`+ if (!typeProperty) return`
`92`	`93`
`93`		`- checkPropertyNode(typeProperty)`
`94`		`- }`
`95`		`- })`
	`94`	`+ checkPropertyNode(typeProperty)`
	`95`	`+ }`
	`96`	`+ })`
`96`	`97`	`})`
`97`	`98`	`}`
`98`	`99`	`}`

`‎tests/lib/rules/require-prop-type-constructor.js`

Lines changed: 10 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,9 @@ ruleTester.run('require-prop-type-constructor', rule, {`
`37`	`37`	`},`
`38`	`38`	`lastProp: {`
`39`	`39`	`type: [Number, Boolean]`
`40`		`- }`
	`40`	`+ },`
	`41`	`+ nullProp: null,`
	`42`	`+ nullTypeProp: { type: null }`
`41`	`43`	`}`
`42`	`44`	`}`
`43`	`45`	`
`@@ -58,7 +60,8 @@ ruleTester.run('require-prop-type-constructor', rule, {`
`58`	`60`	`},`
`59`	`61`	`lastProp: {`
`60`	`62`	`type: ['Boolean']`
`61`		`- }`
	`63`	`+ },`
	`64`	`+ nullProp: 'null'`
`62`	`65`	`}`
`63`	`66`	`}`
`64`	`67`	`,
`@@ -73,7 +76,8 @@ ruleTester.run('require-prop-type-constructor', rule, {`
`73`	`76`	`},`
`74`	`77`	`lastProp: {`
`75`	`78`	`type: [Boolean]`
`76`		`- }`
	`79`	`+ },`
	`80`	`+ nullProp: null`
`77`	`81`	`}`
`78`	`82`	`}`
`79`	`83`	`,
`@@ -92,6 +96,9 @@ ruleTester.run('require-prop-type-constructor', rule, {`
`92`	`96`	`}, {`
`93`	`97`	`message: 'The "type" property should be a constructor.',`
`94`	`98`	`line: 11`
	`99`	`+ }, {`
	`100`	`+ message: 'The "nullProp" property should be a constructor.',`
	`101`	`+ line: 13`
`95`	`102`	`}]`
`96`	`103`	`},`
`97`	`104`	`{`

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 bc29d3d

File tree

2 files changed

2 files changed

`‎lib/rules/require-prop-type-constructor.js`

`‎tests/lib/rules/require-prop-type-constructor.js`

0 commit comments