Skip to content

Use ad-hoc code for nested destructuring in require #40188

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 3 commits into from
Sep 10, 2020
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
4 changes: 3 additions & 1 deletion src/compiler/utilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1939,7 +1939,9 @@ namespace ts {
export function isRequireVariableDeclaration(node: Node, requireStringLiteralLikeArgument: true): node is RequireVariableDeclaration;
export function isRequireVariableDeclaration(node: Node, requireStringLiteralLikeArgument: boolean): node is VariableDeclaration;
export function isRequireVariableDeclaration(node: Node, requireStringLiteralLikeArgument: boolean): node is VariableDeclaration {
node = getRootDeclaration(node);
if (node.kind === SyntaxKind.BindingElement) {
node = node.parent.parent;
}
return isVariableDeclaration(node) && !!node.initializer && isRequireCall(getLeftmostAccessExpression(node.initializer), requireStringLiteralLikeArgument);
}

Expand Down
18 changes: 18 additions & 0 deletions tests/baselines/reference/nestedDestructuringOfRequire.errors.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
tests/cases/conformance/salsa/main.js(5,1): error TS2304: Cannot find name 'chalk'.


==== tests/cases/conformance/salsa/main.js (1 errors) ====
const {
chalk: { grey }
} = require('./mod1');
grey
chalk
~~~~~
!!! error TS2304: Cannot find name 'chalk'.

==== tests/cases/conformance/salsa/mod1.js (0 errors) ====
const chalk = {
grey: {}
};
module.exports.chalk = chalk

33 changes: 33 additions & 0 deletions tests/baselines/reference/nestedDestructuringOfRequire.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
//// [tests/cases/conformance/salsa/nestedDestructuringOfRequire.ts] ////

//// [mod1.js]
const chalk = {
grey: {}
};
module.exports.chalk = chalk

//// [main.js]
const {
chalk: { grey }
} = require('./mod1');
grey
chalk


//// [mod1.js]
var chalk = {
grey: {}
};
module.exports.chalk = chalk;
//// [main.js]
var grey = require('./mod1').chalk.grey;
grey;
chalk;


//// [mod1.d.ts]
export namespace chalk {
const grey: {};
}
//// [main.d.ts]
export {};
31 changes: 31 additions & 0 deletions tests/baselines/reference/nestedDestructuringOfRequire.symbols
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
=== tests/cases/conformance/salsa/main.js ===
const {
chalk: { grey }
>chalk : Symbol(chalk, Decl(mod1.js, 2, 2))
>grey : Symbol(grey, Decl(main.js, 1, 12))

} = require('./mod1');
>require : Symbol(require)
>'./mod1' : Symbol("tests/cases/conformance/salsa/mod1", Decl(mod1.js, 0, 0))

grey
>grey : Symbol(grey, Decl(main.js, 1, 12))

chalk

=== tests/cases/conformance/salsa/mod1.js ===
const chalk = {
>chalk : Symbol(chalk, Decl(mod1.js, 0, 5))

grey: {}
>grey : Symbol(grey, Decl(mod1.js, 0, 15))

};
module.exports.chalk = chalk
>module.exports.chalk : Symbol(chalk, Decl(mod1.js, 2, 2))
>module.exports : Symbol(chalk, Decl(mod1.js, 2, 2))
>module : Symbol(module, Decl(mod1.js, 2, 2))
>exports : Symbol("tests/cases/conformance/salsa/mod1", Decl(mod1.js, 0, 0))
>chalk : Symbol(chalk, Decl(mod1.js, 2, 2))
>chalk : Symbol(chalk, Decl(mod1.js, 0, 5))

36 changes: 36 additions & 0 deletions tests/baselines/reference/nestedDestructuringOfRequire.types
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
=== tests/cases/conformance/salsa/main.js ===
const {
chalk: { grey }
>chalk : any
>grey : {}

} = require('./mod1');
>require('./mod1') : typeof import("tests/cases/conformance/salsa/mod1")
>require : any
>'./mod1' : "./mod1"

grey
>grey : {}

chalk
>chalk : any

=== tests/cases/conformance/salsa/mod1.js ===
const chalk = {
>chalk : { grey: {}; }
>{ grey: {}} : { grey: {}; }

grey: {}
>grey : {}
>{} : {}

};
module.exports.chalk = chalk
>module.exports.chalk = chalk : { grey: {}; }
>module.exports.chalk : { grey: {}; }
>module.exports : typeof import("tests/cases/conformance/salsa/mod1")
>module : { "\"tests/cases/conformance/salsa/mod1\"": typeof import("tests/cases/conformance/salsa/mod1"); }
>exports : typeof import("tests/cases/conformance/salsa/mod1")
>chalk : { grey: {}; }
>chalk : { grey: {}; }

17 changes: 17 additions & 0 deletions tests/cases/conformance/salsa/nestedDestructuringOfRequire.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// @allowJs: true
// @checkJs: true
// @outDir: out
// @declaration: true

// @filename: mod1.js
const chalk = {
grey: {}
};
module.exports.chalk = chalk

// @filename: main.js
const {
chalk: { grey }
} = require('./mod1');
grey
chalk