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

feat(eslint-plugin): allow explicit variable type with arrow functions #260

Merged
Show file tree
Hide file tree
Changes from 1 commit
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
14 changes: 14 additions & 0 deletions packages/eslint-plugin/docs/rules/explicit-function-return-type.md
Expand Up @@ -84,6 +84,20 @@ node.addEventListener('click', function() {});
const foo = arr.map(i => i * i);
```

### allowTypedFunctionExpressions

Examples of additional **correct** code for this rule with `{ allowTypedFunctionExpressions: true }`:

```ts
type FuncType = () => string;

let arrowFn: FuncType = () => 'test';

let funcExpr: FuncType = function() {
return 'test';
};
```

## When Not To Use It

If you don't wish to prevent calling code from using function return values in unexpected ways, then
Expand Down
Expand Up @@ -9,6 +9,7 @@ import * as util from '../util';
type Options = [
{
allowExpressions?: boolean;
allowTypedFunctionExpressions?: boolean;
}
];
type MessageIds = 'missingReturnType';
Expand All @@ -32,6 +33,9 @@ export default util.createRule<Options, MessageIds>({
properties: {
allowExpressions: {
type: 'boolean'
},
allowTypedFunctionExpressions: {
type: 'boolean'
}
},
additionalProperties: false
Expand All @@ -40,7 +44,8 @@ export default util.createRule<Options, MessageIds>({
},
defaultOptions: [
{
allowExpressions: true
allowExpressions: true,
allowTypedFunctionExpressions: false
}
],
create(context, [options]) {
Expand All @@ -65,6 +70,17 @@ export default util.createRule<Options, MessageIds>({
);
}

/**
* Checks if the parent of a function expression has a type annotation.
* @param parent The parent of a function expression node
*/
function hasTypeAnnotation(parent: TSESTree.Node): boolean {
bradzacher marked this conversation as resolved.
Show resolved Hide resolved
return (
parent.type === AST_NODE_TYPES.VariableDeclarator &&
!!parent.id.typeAnnotation
);
}

/**
* Checks if a function declaration/expression has a return type.
* @param node The node representing a function.
Expand Down Expand Up @@ -108,6 +124,14 @@ export default util.createRule<Options, MessageIds>({
return;
}

if (
options.allowTypedFunctionExpressions &&
node.parent &&
hasTypeAnnotation(node.parent)
) {
return;
}

checkFunctionReturnType(node);
}

Expand Down
Expand Up @@ -91,6 +91,28 @@ function test() {
allowExpressions: true
}
]
},
{
filename: 'test.ts',
code: `
var arrowFn: Foo = () => 'test';
`,
options: [
{
allowTypedFunctionExpressions: true
}
]
},
{
filename: 'test.ts',
code: `
var funcExpr: Foo = function() { return 'test'; };
`,
options: [
{
allowTypedFunctionExpressions: true
}
]
}
],
invalid: [
Expand Down Expand Up @@ -187,6 +209,30 @@ class Test {
column: 13
}
]
},
{
filename: 'test.ts',
code: `var arrowFn = () => 'test';`,
options: [{ allowTypedFunctionExpressions: true }],
errors: [
{
messageId: 'missingReturnType',
line: 1,
column: 15
}
]
},
{
filename: 'test.ts',
code: `var funcExpr = function() { return 'test'; };`,
options: [{ allowTypedFunctionExpressions: true }],
errors: [
{
messageId: 'missingReturnType',
line: 1,
column: 16
}
]
}
]
});