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.

Sign up for GitHub

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

#961 support flow variance syntax #980

Merged
merged 2 commits into from
Dec 4, 2016
Merged

#961 support flow variance syntax #980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c107636
Add unit tests
ajhyndman Nov 25, 2016
754022c
getKeyValue should account for variance syntax
ajhyndman Nov 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions lib/rules/prop-types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,11 @@ module.exports = {
*/
function getKeyValue(node) {
if (node.type === 'ObjectTypeProperty') {
var tokens = context.getFirstTokens(node, 1);
return tokens[0].value;
var tokens = context.getFirstTokens(node, 2);
return (tokens[0].value === '+' || tokens[0].value === '-'
? tokens[1].value
: tokens[0].value
);
}
var key = node.key || node.argument;
return key.type === 'Identifier' ? key.name : key.value;
Expand Down
59 changes: 59 additions & 0 deletions tests/lib/rules/prop-types.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1385,6 +1385,19 @@ ruleTester.run('prop-types', rule, {
'}'
].join('\n'),
parser: 'babel-eslint'
}, {
// Flow annotations with variance
code: [
'type Props = {',
' +firstname: string;',
' -lastname: string;',
'};',
'function Hello(props: Props): React.Element {',
' const {firstname, lastname} = props;',
' return <div>Hello {firstname} {lastname}</div>',
'}'
].join('\n'),
parser: 'babel-eslint'
}
],

Expand Down Expand Up @@ -2471,6 +2484,52 @@ ruleTester.run('prop-types', rule, {
line: 3,
column: 29
}]
}, {
code: [
'type MyComponentProps = {',
' +a: number,',
'};',
'function MyComponent({ a, b }: MyComponentProps) {',
' return <div />;',
'}'
].join('\n'),
parser: 'babel-eslint',
errors: [{
message: '\'b\' is missing in props validation',
line: 4,
column: 27,
type: 'Property'
}]
}, {
code: [
'type MyComponentProps = {',
' -a: number,',
'};',
'function MyComponent({ a, b }: MyComponentProps) {',
' return <div />;',
'}'
].join('\n'),
parser: 'babel-eslint',
errors: [{
message: '\'b\' is missing in props validation',
line: 4,
column: 27,
type: 'Property'
}]
}, {
code: [
'type Props = {+name: Object;};',
'class Hello extends React.Component {',
' props: Props;',
' render () {',
' return <div>Hello {this.props.firstname}</div>;',
' }',
'}'
].join('\n'),
parser: 'babel-eslint',
errors: [
{message: '\'firstname\' is missing in props validation'}
]
}
]
});