Skip to content

--moduleResolution hybrid #2

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

Closed
wants to merge 33 commits into from
Closed

--moduleResolution hybrid #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
86dd5da
Add options
andrewbranch Oct 20, 2022
8846f31
Add customConditions option
andrewbranch Oct 21, 2022
9bc0f07
Add first tests
andrewbranch Oct 24, 2022
4545afb
CJS constructs are not allowed
andrewbranch Oct 24, 2022
e82e61d
Add another test
andrewbranch Oct 24, 2022
038783d
Fix extension adding/replacing priority
andrewbranch Oct 25, 2022
870d807
Merge branch 'module-resolution/ts-extensions' into module-resolution…
andrewbranch Nov 8, 2022
a482180
Merge branch 'module-resolution/ts-extensions' into module-resolution…
andrewbranch Nov 15, 2022
89bcd01
Update test to reflect the choice not to block on unrecognized extens…
andrewbranch Nov 16, 2022
6074661
Add auto-imports and string completions tests
andrewbranch Nov 17, 2022
9e03db2
Merge branch 'module-resolution/ts-extensions' into module-resolution…
andrewbranch Nov 18, 2022
c4320a2
Comment test
andrewbranch Nov 18, 2022
f04f1b5
Auto-imports of declaration files cannot use .ts extension
andrewbranch Nov 18, 2022
29039de
Have declaration file auto imports default to extensionless instead
andrewbranch Nov 18, 2022
e83ca2a
Merge branch 'module-resolution/ts-extensions' into module-resolution…
andrewbranch Nov 18, 2022
f98730a
Add test for custom conditions
andrewbranch Nov 18, 2022
5a01dd6
Fix indentation
andrewbranch Nov 18, 2022
4dd6d01
Add baseline showing resolvePackageJsonImports/Exports compatibility
andrewbranch Nov 18, 2022
81b9e70
Merge branch 'module-resolution/ts-extensions' into module-resolution…
andrewbranch Nov 28, 2022
f6fa5f3
Fix test and prevent CJS require from resolving
andrewbranch Nov 28, 2022
aeb23be
Update unit test baselines
andrewbranch Nov 28, 2022
e0c0375
Merge branch 'module-resolution/ts-extensions' into module-resolution…
andrewbranch Dec 5, 2022
f9414aa
Fix bad merge conflict resolution
andrewbranch Dec 5, 2022
dadc1a8
Make resolvedUsingTsExtension optional
andrewbranch Dec 5, 2022
5089aab
Merge branch 'module-resolution/ts-extensions' into module-resolution…
andrewbranch Dec 5, 2022
a88b8ad
Update missed baselines
andrewbranch Dec 6, 2022
224bb10
Merge branch 'module-resolution/ts-extensions' into module-resolution…
andrewbranch Dec 6, 2022
b2e283c
Revert now-unnecessary API implementation changes
andrewbranch Dec 6, 2022
30afa86
Clean up
andrewbranch Dec 9, 2022
0baca5b
Merge branch 'module-resolution/ts-extensions' into module-resolution…
andrewbranch Dec 9, 2022
6e763d9
Update baselines to es5 emit
andrewbranch Dec 9, 2022
22fbb44
Merge branch 'module-resolution/ts-extensions' into module-resolution…
andrewbranch Dec 13, 2022
d4a3b3c
Rename to `bundler`
andrewbranch Dec 13, 2022
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
Prev Previous commit
Next Next commit
Merge branch 'module-resolution/ts-extensions' into module-resolution… 
…/hybrid
  • Loading branch information
@andrewbranch
andrewbranch committed Dec 5, 2022
commit e0c0375435bfe24d813151ccf992498e84ddb43e
2 changes: 1 addition & 1 deletion src/compiler/moduleNameResolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1908,7 +1908,7 @@ export function getEntrypointsFromPackageJsonInfo(
/*onlyRecordFailures*/ false,
loadPackageJsonMainState,
packageJsonInfo.contents.packageJsonContent,
packageJsonInfo.contents.versionPaths);
getVersionPathsOfPackageJsonInfo(packageJsonInfo, loadPackageJsonMainState));
entrypoints = append(entrypoints, mainResolution?.path);

if (features & NodeResolutionFeatures.Exports && packageJsonInfo.contents.packageJsonContent.exports) {
Expand Down
140 changes: 120 additions & 20 deletions ...s/reference/reuseProgramStructure/can-reuse-module-resolutions-from-non-modified-files.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,12 @@ import { B } from './b1';
export let BB = B;
declare module './b1' { interface B { y: string; } }
resolvedModules:
./b1: {"resolvedFileName":"b1.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
./b1: {
"resolvedFileName": "b1.ts",
"extension": ".ts",
"isExternalLibraryImport": false,
"resolvedUsingTsExtension": false
}
resolvedTypeReferenceDirectiveNames:
typerefs1: {
"primary": true,
Expand All @@ -64,8 +69,18 @@ import { B } from './b2';
import { BB } from './f1';
(new BB).x; (new BB).y;
resolvedModules:
./b2: {"resolvedFileName":"b2.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
./f1: {"resolvedFileName":"f1.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
./b2: {
"resolvedFileName": "b2.ts",
"extension": ".ts",
"isExternalLibraryImport": false,
"resolvedUsingTsExtension": false
}
./f1: {
"resolvedFileName": "f1.ts",
"extension": ".ts",
"isExternalLibraryImport": false,
"resolvedUsingTsExtension": false
}
resolvedTypeReferenceDirectiveNames:
typerefs2: {
"primary": true,
Expand Down Expand Up @@ -155,7 +170,12 @@ import { B } from './b1';
export let BB = B;
declare module './b1' { interface B { y: string; } }
resolvedModules:
./b1: {"resolvedFileName":"b1.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
./b1: {
"resolvedFileName": "b1.ts",
"extension": ".ts",
"isExternalLibraryImport": false,
"resolvedUsingTsExtension": false
}
resolvedTypeReferenceDirectiveNames:
typerefs1: {
"primary": true,
Expand All @@ -170,8 +190,18 @@ import { B } from './b2';
import { BB } from './f1';
(new BB).x; (new BB).y;
resolvedModules:
./b2: {"resolvedFileName":"b2.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
./f1: {"resolvedFileName":"f1.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
./b2: {
"resolvedFileName": "b2.ts",
"extension": ".ts",
"isExternalLibraryImport": false,
"resolvedUsingTsExtension": false
}
./f1: {
"resolvedFileName": "f1.ts",
"extension": ".ts",
"isExternalLibraryImport": false,
"resolvedUsingTsExtension": false
}
resolvedTypeReferenceDirectiveNames:
typerefs2: {
"primary": true,
Expand Down Expand Up @@ -250,7 +280,12 @@ import { B } from './b1';
export let BB = B;
declare module './b1' { interface B { y: string; } }
resolvedModules:
./b1: {"resolvedFileName":"b1.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
./b1: {
"resolvedFileName": "b1.ts",
"extension": ".ts",
"isExternalLibraryImport": false,
"resolvedUsingTsExtension": false
}
resolvedTypeReferenceDirectiveNames: undefined

File: f2.ts
Expand All @@ -260,8 +295,18 @@ import { B } from './b2';
import { BB } from './f1';
(new BB).x; (new BB).y;
resolvedModules:
./b2: {"resolvedFileName":"b2.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
./f1: {"resolvedFileName":"f1.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
./b2: {
"resolvedFileName": "b2.ts",
"extension": ".ts",
"isExternalLibraryImport": false,
"resolvedUsingTsExtension": false
}
./f1: {
"resolvedFileName": "f1.ts",
"extension": ".ts",
"isExternalLibraryImport": false,
"resolvedUsingTsExtension": false
}
resolvedTypeReferenceDirectiveNames:
typerefs2: {
"primary": true,
Expand Down Expand Up @@ -335,7 +380,12 @@ import { B } from './b1';
export let BB = B;
declare module './b1' { interface B { y: string; } }
resolvedModules:
./b1: {"resolvedFileName":"b1.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
./b1: {
"resolvedFileName": "b1.ts",
"extension": ".ts",
"isExternalLibraryImport": false,
"resolvedUsingTsExtension": false
}
resolvedTypeReferenceDirectiveNames: undefined

File: f2.ts
Expand All @@ -345,8 +395,18 @@ import { B } from './b2';
import { BB } from './f1';
(new BB).x; (new BB).y;
resolvedModules:
./b2: {"resolvedFileName":"b2.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
./f1: {"resolvedFileName":"f1.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
./b2: {
"resolvedFileName": "b2.ts",
"extension": ".ts",
"isExternalLibraryImport": false,
"resolvedUsingTsExtension": false
}
./f1: {
"resolvedFileName": "f1.ts",
"extension": ".ts",
"isExternalLibraryImport": false,
"resolvedUsingTsExtension": false
}
resolvedTypeReferenceDirectiveNames:
typerefs2: {
"primary": true,
Expand Down Expand Up @@ -419,7 +479,12 @@ File: f1.ts
import { B } from './b1';
declare module './b1' { interface B { y: string; } }
resolvedModules:
./b1: {"resolvedFileName":"b1.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
./b1: {
"resolvedFileName": "b1.ts",
"extension": ".ts",
"isExternalLibraryImport": false,
"resolvedUsingTsExtension": false
}
resolvedTypeReferenceDirectiveNames: undefined

File: f2.ts
Expand All @@ -429,8 +494,18 @@ import { B } from './b2';
import { BB } from './f1';
(new BB).x; (new BB).y;
resolvedModules:
./b2: {"resolvedFileName":"b2.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
./f1: {"resolvedFileName":"f1.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
./b2: {
"resolvedFileName": "b2.ts",
"extension": ".ts",
"isExternalLibraryImport": false,
"resolvedUsingTsExtension": false
}
./f1: {
"resolvedFileName": "f1.ts",
"extension": ".ts",
"isExternalLibraryImport": false,
"resolvedUsingTsExtension": false
}
resolvedTypeReferenceDirectiveNames:
typerefs2: {
"primary": true,
Expand Down Expand Up @@ -501,7 +576,12 @@ File: f1.ts
import { B } from './b1';

resolvedModules:
./b1: {"resolvedFileName":"b1.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
./b1: {
"resolvedFileName": "b1.ts",
"extension": ".ts",
"isExternalLibraryImport": false,
"resolvedUsingTsExtension": false
}
resolvedTypeReferenceDirectiveNames: undefined

File: f2.ts
Expand All @@ -511,8 +591,18 @@ import { B } from './b2';
import { BB } from './f1';
(new BB).x; (new BB).y;
resolvedModules:
./b2: {"resolvedFileName":"b2.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
./f1: {"resolvedFileName":"f1.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
./b2: {
"resolvedFileName": "b2.ts",
"extension": ".ts",
"isExternalLibraryImport": false,
"resolvedUsingTsExtension": false
}
./f1: {
"resolvedFileName": "f1.ts",
"extension": ".ts",
"isExternalLibraryImport": false,
"resolvedUsingTsExtension": false
}
resolvedTypeReferenceDirectiveNames:
typerefs2: {
"primary": true,
Expand Down Expand Up @@ -595,8 +685,18 @@ import { B } from './b2';
import { BB } from './f1';
(new BB).x; (new BB).y;
resolvedModules:
./b2: {"resolvedFileName":"b2.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
./f1: {"resolvedFileName":"f1.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
./b2: {
"resolvedFileName": "b2.ts",
"extension": ".ts",
"isExternalLibraryImport": false,
"resolvedUsingTsExtension": false
}
./f1: {
"resolvedFileName": "f1.ts",
"extension": ".ts",
"isExternalLibraryImport": false,
"resolvedUsingTsExtension": false
}
resolvedTypeReferenceDirectiveNames:
typerefs2: {
"primary": true,
Expand Down
48 changes: 44 additions & 4 deletions .../baselines/reference/reuseProgramStructure/change-affects-a-single-module-of-a-package.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,35 @@ File: /node_modules/b/index.d.ts
export * from './internal';

resolvedModules:
./internal: {"resolvedFileName":"/node_modules/b/internal.d.ts","extension":".d.ts","isExternalLibraryImport":true,"packageId":{"name":"b","subModuleName":"internal.d.ts","version":"1.2.3"},"resolvedUsingTsExtension":false}
./internal: {
"resolvedFileName": "/node_modules/b/internal.d.ts",
"extension": ".d.ts",
"isExternalLibraryImport": true,
"packageId": {
"name": "b",
"subModuleName": "internal.d.ts",
"version": "1.2.3"
},
"resolvedUsingTsExtension": false
}
resolvedTypeReferenceDirectiveNames: undefined

File: /a.ts

import {b} from 'b'
var a = b;
resolvedModules:
b: {"resolvedFileName":"/node_modules/b/index.d.ts","extension":".d.ts","isExternalLibraryImport":true,"packageId":{"name":"b","subModuleName":"index.d.ts","version":"1.2.3"},"resolvedUsingTsExtension":false}
b: {
"resolvedFileName": "/node_modules/b/index.d.ts",
"extension": ".d.ts",
"isExternalLibraryImport": true,
"packageId": {
"name": "b",
"subModuleName": "index.d.ts",
"version": "1.2.3"
},
"resolvedUsingTsExtension": false
}
resolvedTypeReferenceDirectiveNames: undefined


Expand All @@ -41,15 +61,35 @@ File: /node_modules/b/index.d.ts
export * from './internal';

resolvedModules:
./internal: {"resolvedFileName":"/node_modules/b/internal.d.ts","extension":".d.ts","isExternalLibraryImport":true,"packageId":{"name":"b","subModuleName":"internal.d.ts","version":"1.2.3"},"resolvedUsingTsExtension":false}
./internal: {
"resolvedFileName": "/node_modules/b/internal.d.ts",
"extension": ".d.ts",
"isExternalLibraryImport": true,
"packageId": {
"name": "b",
"subModuleName": "internal.d.ts",
"version": "1.2.3"
},
"resolvedUsingTsExtension": false
}
resolvedTypeReferenceDirectiveNames: undefined

File: /a.ts

import {b} from 'b'
var a = b;
resolvedModules:
b: {"resolvedFileName":"/node_modules/b/index.d.ts","extension":".d.ts","isExternalLibraryImport":true,"packageId":{"name":"b","subModuleName":"index.d.ts","version":"1.2.3"},"resolvedUsingTsExtension":false}
b: {
"resolvedFileName": "/node_modules/b/index.d.ts",
"extension": ".d.ts",
"isExternalLibraryImport": true,
"packageId": {
"name": "b",
"subModuleName": "index.d.ts",
"version": "1.2.3"
},
"resolvedUsingTsExtension": false
}
resolvedTypeReferenceDirectiveNames: undefined


Expand Down
7 changes: 6 additions & 1 deletion tests/baselines/reference/reuseProgramStructure/change-affects-imports.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ File: c.ts
import x from 'b'
var z = 1;
resolvedModules:
b: {"resolvedFileName":"b.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
b: {
"resolvedFileName": "b.ts",
"extension": ".ts",
"isExternalLibraryImport": false,
"resolvedUsingTsExtension": false
}
resolvedTypeReferenceDirectiveNames: undefined

File: b.ts
Expand Down
6 changes: 2 additions & 4 deletions tests/baselines/reference/reuseProgramStructure/change-affects-type-directives.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ File: c.ts


var z = 1;
resolvedModules:
b: {"resolvedFileName":"b.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
resolvedModules: undefined
resolvedTypeReferenceDirectiveNames: undefined

File: b.ts
Expand Down Expand Up @@ -39,8 +38,7 @@ File: c.ts


var z = 1;
resolvedModules:
b: {"resolvedFileName":"b.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
resolvedModules: undefined
resolvedTypeReferenceDirectiveNames: undefined

File: b.ts
Expand Down
7 changes: 6 additions & 1 deletion tests/baselines/reference/reuseProgramStructure/fetches-imports-after-npm-install.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,12 @@ File: file1.ts
import * as a from "a";
const myX: number = a.x;
resolvedModules:
a: {"resolvedFileName":"node_modules/a/index.d.ts","extension":".d.ts","isExternalLibraryImport":true,"resolvedUsingTsExtension":false}
a: {
"resolvedFileName": "node_modules/a/index.d.ts",
"extension": ".d.ts",
"isExternalLibraryImport": true,
"resolvedUsingTsExtension": false
}
resolvedTypeReferenceDirectiveNames: undefined

File: file2.ts
Expand Down
6 changes: 2 additions & 4 deletions tests/baselines/reference/reuseProgramStructure/missing-file-is-created.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ File: c.ts


var z = 1;
resolvedModules:
b: {"resolvedFileName":"b.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
resolvedModules: undefined
resolvedTypeReferenceDirectiveNames: undefined

File: b.ts
Expand Down Expand Up @@ -39,8 +38,7 @@ File: c.ts


var z = 1;
resolvedModules:
b: {"resolvedFileName":"b.ts","extension":".ts","isExternalLibraryImport":false,"resolvedUsingTsExtension":false}
resolvedModules: undefined
resolvedTypeReferenceDirectiveNames: undefined

File: b.ts
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.