Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use features for selected module resolution rather than all features for type reference directives, since they can add restrictions to resolutions

Browse Source
This commit is contained in:
Wesley Wigham
2021-12-03 11:21:52 -08:00
parent 4b794fe1dd
commit 48b9027927
13 changed files with 190 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/moduleNameResolver.ts
+11 -3
View File
@@ -340,7 +340,11 @@ namespace ts {
}
const failedLookupLocations: string[] = [];
const moduleResolutionState: ModuleResolutionState = { compilerOptions: options, host, traceEnabled, failedLookupLocations, packageJsonInfoCache: cache, features: NodeResolutionFeatures.AllFeatures, conditions: ["node", "require", "types"] };
const features =
getEmitModuleResolutionKind(options) === ModuleResolutionKind.Node12 ? NodeResolutionFeatures.Node12Default :
getEmitModuleResolutionKind(options) === ModuleResolutionKind.NodeNext ? NodeResolutionFeatures.NodeNextDefault :
NodeResolutionFeatures.None;
const moduleResolutionState: ModuleResolutionState = { compilerOptions: options, host, traceEnabled, failedLookupLocations, packageJsonInfoCache: cache, features, conditions: ["node", "require", "types"] };
let resolved = primaryLookup();
let primary = true;
if (!resolved) {
@@ -1186,6 +1190,10 @@ namespace ts {
ExportsPatternTrailers = 1 << 4,
AllFeatures = Imports | SelfName | Exports | ExportsPatternTrailers,
Node12Default = Imports | SelfName | Exports,
NodeNextDefault = AllFeatures,
EsmMode = 1 << 5,
}
@@ -1193,7 +1201,7 @@ namespace ts {
host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference,
resolutionMode?: ModuleKind.CommonJS | ModuleKind.ESNext): ResolvedModuleWithFailedLookupLocations {
return nodeNextModuleNameResolverWorker(
NodeResolutionFeatures.Imports | NodeResolutionFeatures.SelfName | NodeResolutionFeatures.Exports,
NodeResolutionFeatures.Node12Default,
moduleName,
containingFile,
compilerOptions,
@@ -1208,7 +1216,7 @@ namespace ts {
host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference,
resolutionMode?: ModuleKind.CommonJS | ModuleKind.ESNext): ResolvedModuleWithFailedLookupLocations {
return nodeNextModuleNameResolverWorker(
NodeResolutionFeatures.AllFeatures,
NodeResolutionFeatures.NodeNextDefault,
moduleName,
containingFile,
compilerOptions,
tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=commonjs).js
+18
View File
@@ -0,0 +1,18 @@
//// [tests/cases/compiler/tripleSlashTypesReferenceWithMissingExports.ts] ////
//// [index.d.ts]
interface GlobalThing { a: number }
//// [package.json]
{
"name": "pkg",
"types": "index.d.ts",
"exports": "some-other-thing.js"
}
//// [usage.ts]
/// <reference types="pkg" />
const a: GlobalThing = { a: 0 };
//// [usage.js]
/// <reference types="pkg" />
var a = { a: 0 };
tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=commonjs).symbols
+13
View File
@@ -0,0 +1,13 @@
=== tests/cases/compiler/node_modules/pkg/index.d.ts ===
interface GlobalThing { a: number }
>GlobalThing : Symbol(GlobalThing, Decl(index.d.ts, 0, 0))
>a : Symbol(GlobalThing.a, Decl(index.d.ts, 0, 23))
=== tests/cases/compiler/usage.ts ===
/// <reference types="pkg" />
const a: GlobalThing = { a: 0 };
>a : Symbol(a, Decl(usage.ts, 2, 5))
>GlobalThing : Symbol(GlobalThing, Decl(index.d.ts, 0, 0))
>a : Symbol(a, Decl(usage.ts, 2, 24))
tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=commonjs).types
+13
View File
@@ -0,0 +1,13 @@
=== tests/cases/compiler/node_modules/pkg/index.d.ts ===
interface GlobalThing { a: number }
>a : number
=== tests/cases/compiler/usage.ts ===
/// <reference types="pkg" />
const a: GlobalThing = { a: 0 };
>a : GlobalThing
>{ a: 0 } : { a: number; }
>a : number
>0 : 0
tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=node12).errors.txt
+17
View File
@@ -0,0 +1,17 @@
tests/cases/compiler/usage.ts(1,23): error TS2688: Cannot find type definition file for 'pkg'.
==== tests/cases/compiler/node_modules/pkg/index.d.ts (0 errors) ====
interface GlobalThing { a: number }
==== tests/cases/compiler/node_modules/pkg/package.json (0 errors) ====
{
"name": "pkg",
"types": "index.d.ts",
"exports": "some-other-thing.js"
}
==== tests/cases/compiler/usage.ts (1 errors) ====
/// <reference types="pkg" />
~~~
!!! error TS2688: Cannot find type definition file for 'pkg'.
const a: GlobalThing = { a: 0 };
tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=node12).js
+18
View File
@@ -0,0 +1,18 @@
//// [tests/cases/compiler/tripleSlashTypesReferenceWithMissingExports.ts] ////
//// [index.d.ts]
interface GlobalThing { a: number }
//// [package.json]
{
"name": "pkg",
"types": "index.d.ts",
"exports": "some-other-thing.js"
}
//// [usage.ts]
/// <reference types="pkg" />
const a: GlobalThing = { a: 0 };
//// [usage.js]
/// <reference types="pkg" />
const a = { a: 0 };
tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=node12).symbols
+13
View File
@@ -0,0 +1,13 @@
=== tests/cases/compiler/node_modules/pkg/index.d.ts ===
interface GlobalThing { a: number }
>GlobalThing : Symbol(GlobalThing, Decl(index.d.ts, 0, 0))
>a : Symbol(GlobalThing.a, Decl(index.d.ts, 0, 23))
=== tests/cases/compiler/usage.ts ===
/// <reference types="pkg" />
const a: GlobalThing = { a: 0 };
>a : Symbol(a, Decl(usage.ts, 2, 5))
>GlobalThing : Symbol(GlobalThing, Decl(index.d.ts, 0, 0))
>a : Symbol(a, Decl(usage.ts, 2, 24))
tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=node12).types
+13
View File
@@ -0,0 +1,13 @@
=== tests/cases/compiler/node_modules/pkg/index.d.ts ===
interface GlobalThing { a: number }
>a : number
=== tests/cases/compiler/usage.ts ===
/// <reference types="pkg" />
const a: GlobalThing = { a: 0 };
>a : GlobalThing
>{ a: 0 } : { a: number; }
>a : number
>0 : 0
tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=nodenext).errors.txt
+17
View File
@@ -0,0 +1,17 @@
tests/cases/compiler/usage.ts(1,23): error TS2688: Cannot find type definition file for 'pkg'.
==== tests/cases/compiler/node_modules/pkg/index.d.ts (0 errors) ====
interface GlobalThing { a: number }
==== tests/cases/compiler/node_modules/pkg/package.json (0 errors) ====
{
"name": "pkg",
"types": "index.d.ts",
"exports": "some-other-thing.js"
}
==== tests/cases/compiler/usage.ts (1 errors) ====
/// <reference types="pkg" />
~~~
!!! error TS2688: Cannot find type definition file for 'pkg'.
const a: GlobalThing = { a: 0 };
tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=nodenext).js
+18
View File
@@ -0,0 +1,18 @@
//// [tests/cases/compiler/tripleSlashTypesReferenceWithMissingExports.ts] ////
//// [index.d.ts]
interface GlobalThing { a: number }
//// [package.json]
{
"name": "pkg",
"types": "index.d.ts",
"exports": "some-other-thing.js"
}
//// [usage.ts]
/// <reference types="pkg" />
const a: GlobalThing = { a: 0 };
//// [usage.js]
/// <reference types="pkg" />
const a = { a: 0 };
tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=nodenext).symbols
+13
View File
@@ -0,0 +1,13 @@
=== tests/cases/compiler/node_modules/pkg/index.d.ts ===
interface GlobalThing { a: number }
>GlobalThing : Symbol(GlobalThing, Decl(index.d.ts, 0, 0))
>a : Symbol(GlobalThing.a, Decl(index.d.ts, 0, 23))
=== tests/cases/compiler/usage.ts ===
/// <reference types="pkg" />
const a: GlobalThing = { a: 0 };
>a : Symbol(a, Decl(usage.ts, 2, 5))
>GlobalThing : Symbol(GlobalThing, Decl(index.d.ts, 0, 0))
>a : Symbol(a, Decl(usage.ts, 2, 24))
tests/baselines/reference/tripleSlashTypesReferenceWithMissingExports(module=nodenext).types
+13
View File
@@ -0,0 +1,13 @@
=== tests/cases/compiler/node_modules/pkg/index.d.ts ===
interface GlobalThing { a: number }
>a : number
=== tests/cases/compiler/usage.ts ===
/// <reference types="pkg" />
const a: GlobalThing = { a: 0 };
>a : GlobalThing
>{ a: 0 } : { a: number; }
>a : number
>0 : 0
tests/cases/compiler/tripleSlashTypesReferenceWithMissingExports.ts
+13
View File
@@ -0,0 +1,13 @@
// @module: commonjs,node12,nodenext
// @filename: node_modules/pkg/index.d.ts
interface GlobalThing { a: number }
// @filename: node_modules/pkg/package.json
{
"name": "pkg",
"types": "index.d.ts",
"exports": "some-other-thing.js"
}
// @filename: usage.ts
/// <reference types="pkg" />
const a: GlobalThing = { a: 0 };