Skip to content

chore(eslint-plugin): re-using logic from builtinSymbolLike in no-implied-eval #9462

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

Merged
merged 6 commits into from
Jul 5, 2024
Merged

chore(eslint-plugin): re-using logic from builtinSymbolLike in no-implied-eval #9462

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6d2d958
re-using logic from builtinSymbolLike in no-implied-eval
YutongZhuu Jul 1, 2024
b3eadd5
Merge branch 'typescript-eslint:main' into main
YutongZhuu Jul 1, 2024
444e855
quick fix
YutongZhuu Jul 1, 2024
97e5d27
Merge branch 'main' of https://github.com/YutongZhuu/typescript-eslint
YutongZhuu Jul 1, 2024
3545dcf
removing unnecessay directive
YutongZhuu Jul 1, 2024
346072d
Merge branch 'main' into main
YutongZhuu Jul 1, 2024
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
25 changes: 8 additions & 17 deletions packages/eslint-plugin/src/rules/no-implied-eval.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { AST_NODE_TYPES } from '@typescript-eslint/utils';
import * as tsutils from 'ts-api-utils';
import * as ts from 'typescript';

import { createRule, getParserServices } from '../util';
import { createRule, getParserServices, isBuiltinSymbolLike } from '../util';

const FUNCTION_CONSTRUCTOR = 'Function';
const GLOBAL_CANDIDATES = new Set(['global', 'window', 'globalThis']);
Expand Down Expand Up @@ -75,15 +75,8 @@ export default createRule({
return true;
}

// eslint-disable-next-line @typescript-eslint/no-unsafe-enum-comparison
if (symbol && symbol.escapedName === FUNCTION_CONSTRUCTOR) {
const declarations = symbol.getDeclarations() ?? [];
for (const declaration of declarations) {
const sourceFile = declaration.getSourceFile();
if (services.program.isSourceFileDefaultLibrary(sourceFile)) {
return true;
}
}
if (isBuiltinSymbolLike(services.program, type, FUNCTION_CONSTRUCTOR)) {
return true;
}

const signatures = checker.getSignaturesOfType(
Expand Down Expand Up @@ -143,13 +136,11 @@ export default createRule({
const type = services.getTypeAtLocation(node.callee);
const symbol = type.getSymbol();
if (symbol) {
const declarations = symbol.getDeclarations() ?? [];
for (const declaration of declarations) {
const sourceFile = declaration.getSourceFile();
if (services.program.isSourceFileDefaultLibrary(sourceFile)) {
context.report({ node, messageId: 'noFunctionConstructor' });
return;
}
if (
isBuiltinSymbolLike(services.program, type, 'FunctionConstructor')
) {
context.report({ node, messageId: 'noFunctionConstructor' });
return;
}
} else {
context.report({ node, messageId: 'noFunctionConstructor' });
Expand Down
Loading