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

Add support for import defer proposal #60757

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
+2,234 −292
Open

Add support for import defer proposal #60757

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
bd82b0b
Add support for `import defer` proposal
ryzokuken Jul 8, 2024
4b3c02c
Update AST to unify `type` with other modifiers
nicolo-ribaudo Dec 19, 2024
b66fb03
Add test for comments around `defer`
nicolo-ribaudo Dec 19, 2024
bdf98f5
Remove unnecessary backwards compat check
nicolo-ribaudo Jan 16, 2025
e8d76ea
Add support for `import.defer(...)`
nicolo-ribaudo Jan 16, 2025
68d3d25
Also support `module: NodeNext`
nicolo-ribaudo Jan 17, 2025
066d762
`aren't` -> `are not`
nicolo-ribaudo Jan 17, 2025
daf55fe
ImportPhaseModifier -> ImportPhaseModifierSyntaxKind
nicolo-ribaudo Jan 17, 2025
ef4eecb
Move import clause checks to checker.ts
nicolo-ribaudo Jan 17, 2025
5f4ca3b
Report `'(' expected` for import.defer
nicolo-ribaudo Jan 17, 2025
84f7535
Make meta property error localizable
nicolo-ribaudo Jan 17, 2025
33f70c0
Move `import.defer` checks to checker.ts
nicolo-ribaudo Jan 17, 2025
2a8e8b6
Unify tests testing different values of `module`
nicolo-ribaudo Jan 17, 2025
455d843
Move `errorType` for `import.defer` handling
nicolo-ribaudo Jan 17, 2025
831d771
Do not consider `import.defer` in `import.defer(...)` as an expression
nicolo-ribaudo Jan 17, 2025
b764f3a
fmt
nicolo-ribaudo Jan 17, 2025
8c85100
Sort tokens alphabetically
nicolo-ribaudo Jan 17, 2025
e787ee5
Remove unused baselines
nicolo-ribaudo Jan 20, 2025
7b17c31
Properly resolve specifiers in `import.defer(...)`
nicolo-ribaudo Jan 20, 2025
84c71d5
rbuckton review
nicolo-ribaudo Feb 5, 2025
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/utilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12074,7 +12074,7 @@ export function forEachDynamicImportOrRequireCall<IncludeTypeSpaceImports extend
cb: (node: CallExpression | (IncludeTypeSpaceImports extends false ? never : JSDocImportTag | ImportTypeNode), argument: RequireStringLiteralLikeArgument extends true ? StringLiteralLike : Expression) => void,
): void {
const isJavaScriptFile = isInJSFile(file);
const r = /import|require/g;
const r = /import|defer|require/g;
while (r.exec(file.text) !== null) { // eslint-disable-line no-restricted-syntax
const node = getNodeAtPosition(file, r.lastIndex, /*includeJSDoc*/ includeTypeSpaceImports);
if (isJavaScriptFile && isRequireCall(node, requireStringLiteralLikeArgument)) {
Expand Down
2 changes: 0 additions & 2 deletions tests/baselines/reference/dynamicImportDefer(module=commonjs).errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,4 @@ b.ts(1,1): error TS18060: Deferred imports are only supported when the '--module
!!! error TS18060: Deferred imports are only supported when the '--module' flag is set to 'esnext' or 'nodenext'.
ns.foo();
});

import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a

3 changes: 0 additions & 3 deletions tests/baselines/reference/dynamicImportDefer(module=commonjs).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ export function foo() {
import.defer("./a.js").then(ns => {
ns.foo();
});

import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a


//// [a.js]
Expand All @@ -24,4 +22,3 @@ function foo() {
import.defer("./a.js").then(ns => {
ns.foo();
});
Promise.resolve().then(() => require("./a.js")); // TODO: Without this the import.defer cannot resolve ./a
3 changes: 0 additions & 3 deletions tests/baselines/reference/dynamicImportDefer(module=commonjs).symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,3 @@ import.defer("./a.js").then(ns => {

});

import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
>"./a.js" : Symbol("a", Decl(a.ts, 0, 0))

6 changes: 0 additions & 6 deletions tests/baselines/reference/dynamicImportDefer(module=commonjs).types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,3 @@ import.defer("./a.js").then(ns => {

});

import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
>import("./a.js") : Promise<typeof import("a")>
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
>"./a.js" : "./a.js"
> : ^^^^^^^^

7 changes: 1 addition & 6 deletions tests/baselines/reference/dynamicImportDefer(module=es2015).errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,15 @@
b.ts(1,1): error TS18060: Deferred imports are only supported when the '--module' flag is set to 'esnext' or 'nodenext'.
b.ts(5,1): error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'es2022', 'esnext', 'commonjs', 'amd', 'system', 'umd', 'node16', 'node18', or 'nodenext'.


==== a.ts (0 errors) ====
export function foo() {
console.log("foo from a");
}

==== b.ts (2 errors) ====
==== b.ts (1 errors) ====
import.defer("./a.js").then(ns => {
~~~~~~~~~~~~~~~~~~~~~~
!!! error TS18060: Deferred imports are only supported when the '--module' flag is set to 'esnext' or 'nodenext'.
ns.foo();
});

import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
~~~~~~~~~~~~~~~~
!!! error TS1323: Dynamic imports are only supported when the '--module' flag is set to 'es2020', 'es2022', 'esnext', 'commonjs', 'amd', 'system', 'umd', 'node16', 'node18', or 'nodenext'.

3 changes: 0 additions & 3 deletions tests/baselines/reference/dynamicImportDefer(module=es2015).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ export function foo() {
import.defer("./a.js").then(ns => {
ns.foo();
});

import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a


//// [a.js]
Expand All @@ -21,4 +19,3 @@ export function foo() {
import.defer("./a.js").then(ns => {
ns.foo();
});
import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
3 changes: 0 additions & 3 deletions tests/baselines/reference/dynamicImportDefer(module=es2015).symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,3 @@ import.defer("./a.js").then(ns => {

});

import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
>"./a.js" : Symbol("a", Decl(a.ts, 0, 0))

6 changes: 0 additions & 6 deletions tests/baselines/reference/dynamicImportDefer(module=es2015).types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,3 @@ import.defer("./a.js").then(ns => {

});

import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
>import("./a.js") : Promise<typeof import("a")>
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
>"./a.js" : "./a.js"
> : ^^^^^^^^

2 changes: 0 additions & 2 deletions tests/baselines/reference/dynamicImportDefer(module=es2020).errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,4 @@ b.ts(1,1): error TS18060: Deferred imports are only supported when the '--module
!!! error TS18060: Deferred imports are only supported when the '--module' flag is set to 'esnext' or 'nodenext'.
ns.foo();
});

import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a

3 changes: 0 additions & 3 deletions tests/baselines/reference/dynamicImportDefer(module=es2020).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ export function foo() {
import.defer("./a.js").then(ns => {
ns.foo();
});

import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a


//// [a.js]
Expand All @@ -21,4 +19,3 @@ export function foo() {
import.defer("./a.js").then(ns => {
ns.foo();
});
import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
3 changes: 0 additions & 3 deletions tests/baselines/reference/dynamicImportDefer(module=es2020).symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,3 @@ import.defer("./a.js").then(ns => {

});

import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
>"./a.js" : Symbol("a", Decl(a.ts, 0, 0))

6 changes: 0 additions & 6 deletions tests/baselines/reference/dynamicImportDefer(module=es2020).types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,3 @@ import.defer("./a.js").then(ns => {

});

import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
>import("./a.js") : Promise<typeof import("a")>
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
>"./a.js" : "./a.js"
> : ^^^^^^^^

3 changes: 0 additions & 3 deletions tests/baselines/reference/dynamicImportDefer(module=esnext).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ export function foo() {
import.defer("./a.js").then(ns => {
ns.foo();
});

import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a


//// [a.js]
Expand All @@ -21,4 +19,3 @@ export function foo() {
import.defer("./a.js").then(ns => {
ns.foo();
});
import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
3 changes: 0 additions & 3 deletions tests/baselines/reference/dynamicImportDefer(module=esnext).symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,3 @@ import.defer("./a.js").then(ns => {

});

import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
>"./a.js" : Symbol("a", Decl(a.ts, 0, 0))

6 changes: 0 additions & 6 deletions tests/baselines/reference/dynamicImportDefer(module=esnext).types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,3 @@ import.defer("./a.js").then(ns => {

});

import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
>import("./a.js") : Promise<typeof import("a")>
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^
>"./a.js" : "./a.js"
> : ^^^^^^^^

3 changes: 0 additions & 3 deletions tests/baselines/reference/dynamicImportDefer(module=nodenext).js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ export function foo() {
import.defer("./a.js").then(ns => {
ns.foo();
});

import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a


//// [a.js]
Expand All @@ -26,4 +24,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
import.defer("./a.js").then(ns => {
ns.foo();
});
import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
3 changes: 0 additions & 3 deletions tests/baselines/reference/dynamicImportDefer(module=nodenext).symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,3 @@ import.defer("./a.js").then(ns => {

});

import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
>"./a.js" : Symbol("a", Decl(a.ts, 0, 0))

6 changes: 0 additions & 6 deletions tests/baselines/reference/dynamicImportDefer(module=nodenext).types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,3 @@ import.defer("./a.js").then(ns => {

});

import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
>import("./a.js") : Promise<{ default: typeof import("a"); foo(): void; }>
> : ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
>"./a.js" : "./a.js"
> : ^^^^^^^^

2 changes: 0 additions & 2 deletions tests/cases/conformance/importDefer/dynamicImportDefer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,3 @@ export function foo() {
import.defer("./a.js").then(ns => {
ns.foo();
});

import("./a.js"); // TODO: Without this the import.defer cannot resolve ./a
Loading