Skip to content

Fix crash on non-dts-require #19980

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

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/compiler/checker.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17164,7 +17164,7 @@ namespace ts {
if (targetDeclarationKind !== SyntaxKind.Unknown) {
const decl = getDeclarationOfKind(resolvedRequire, targetDeclarationKind);
// function/variable declaration should be ambient
return !!(decl.flags & NodeFlags.Ambient);
return !!decl && !!(decl.flags & NodeFlags.Ambient);
}
return false;
}
Expand Down
11 changes: 11 additions & 0 deletions tests/baselines/reference/noCrashOnParameterNamedRequire.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//// [index.js]
(function(require, module, exports){
const mod = require("./mod");
mod.foo;
})(null, null, null);

//// [index.js]
(function (require, module, exports) {
var mod = require("./mod");
mod.foo;
})(null, null, null);
14 changes: 14 additions & 0 deletions tests/baselines/reference/noCrashOnParameterNamedRequire.symbols
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
=== tests/cases/compiler/index.js ===
(function(require, module, exports){
>require : Symbol(require, Decl(index.js, 0, 10))
>module : Symbol(module, Decl(index.js, 0, 18))
>exports : Symbol(exports, Decl(index.js, 0, 26))

const mod = require("./mod");
>mod : Symbol(mod, Decl(index.js, 1, 9))
>require : Symbol(require, Decl(index.js, 0, 10))

mod.foo;
>mod : Symbol(mod, Decl(index.js, 1, 9))

})(null, null, null);
25 changes: 25 additions & 0 deletions tests/baselines/reference/noCrashOnParameterNamedRequire.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
=== tests/cases/compiler/index.js ===
(function(require, module, exports){
>(function(require, module, exports){ const mod = require("./mod"); mod.foo;})(null, null, null) : void
>(function(require, module, exports){ const mod = require("./mod"); mod.foo;}) : (require: any, module: any, exports: any) => void
>function(require, module, exports){ const mod = require("./mod"); mod.foo;} : (require: any, module: any, exports: any) => void
>require : any
>module : any
>exports : any

const mod = require("./mod");
>mod : any
>require("./mod") : any
>require : any
>"./mod" : "./mod"

mod.foo;
>mod.foo : any
>mod : any
>foo : any

})(null, null, null);
>null : null
>null : null
>null : null

8 changes: 8 additions & 0 deletions tests/cases/compiler/noCrashOnParameterNamedRequire.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
// @allowJs: true
// @checkJs: true
// @outDir: ./built
// @filename: index.js
(function(require, module, exports){
const mod = require("./mod");
mod.foo;
})(null, null, null);