Skip to content

Commit b12dfba

Browse files
GulajavaMinistudioGulajavaMinistudio
authored
Merge pull request #582 from microsoft/main
Create a new pull request by comparing changes across two branches\
2 parents 2e89224 + 8daac14 commit b12dfba

File tree

296 files changed

+7865
-627
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

296 files changed

+7865
-627
lines changed

‎src/compiler/checker.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8428,6 +8428,9 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
84288428
introducesError = true;
84298429
return { introducesError, node, sym };
84308430
}
8431+
else {
8432+
sym = symAtLocation;
8433+
}
84318434
}
84328435

84338436
if (sym) {

‎src/compiler/program.ts

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1392,16 +1392,13 @@ export function getImpliedNodeFormatForFileWorker(
13921392
host: ModuleResolutionHost,
13931393
options: CompilerOptions,
13941394
) {
1395-
switch (getEmitModuleResolutionKind(options)) {
1396-
case ModuleResolutionKind.Node16:
1397-
case ModuleResolutionKind.NodeNext:
1398-
return fileExtensionIsOneOf(fileName, [Extension.Dmts, Extension.Mts, Extension.Mjs]) ? ModuleKind.ESNext :
1399-
fileExtensionIsOneOf(fileName, [Extension.Dcts, Extension.Cts, Extension.Cjs]) ? ModuleKind.CommonJS :
1400-
fileExtensionIsOneOf(fileName, [Extension.Dts, Extension.Ts, Extension.Tsx, Extension.Js, Extension.Jsx]) ? lookupFromPackageJson() :
1401-
undefined; // other extensions, like `json` or `tsbuildinfo`, are set as `undefined` here but they should never be fed through the transformer pipeline
1402-
default:
1403-
return undefined;
1404-
}
1395+
const moduleResolution = getEmitModuleResolutionKind(options);
1396+
const shouldLookupFromPackageJson = ModuleResolutionKind.Node16 <= moduleResolution && moduleResolution <= ModuleResolutionKind.NodeNext
1397+
|| pathContainsNodeModules(fileName);
1398+
return fileExtensionIsOneOf(fileName, [Extension.Dmts, Extension.Mts, Extension.Mjs]) ? ModuleKind.ESNext :
1399+
fileExtensionIsOneOf(fileName, [Extension.Dcts, Extension.Cts, Extension.Cjs]) ? ModuleKind.CommonJS :
1400+
shouldLookupFromPackageJson && fileExtensionIsOneOf(fileName, [Extension.Dts, Extension.Ts, Extension.Tsx, Extension.Js, Extension.Jsx]) ? lookupFromPackageJson() :
1401+
undefined; // other extensions, like `json` or `tsbuildinfo`, are set as `undefined` here but they should never be fed through the transformer pipeline
14051402

14061403
function lookupFromPackageJson(): Partial<CreateSourceFileOptions> {
14071404
const state = getTemporaryModuleResolutionState(packageJsonInfoCache, host, options);

‎src/compiler/utilities.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9164,10 +9164,16 @@ export function getJSXTransformEnabled(options: CompilerOptions): boolean {
91649164
export function getJSXImplicitImportBase(compilerOptions: CompilerOptions, file?: SourceFile): string | undefined {
91659165
const jsxImportSourcePragmas = file?.pragmas.get("jsximportsource");
91669166
const jsxImportSourcePragma = isArray(jsxImportSourcePragmas) ? jsxImportSourcePragmas[jsxImportSourcePragmas.length - 1] : jsxImportSourcePragmas;
9167+
const jsxRuntimePragmas = file?.pragmas.get("jsxruntime");
9168+
const jsxRuntimePragma = isArray(jsxRuntimePragmas) ? jsxRuntimePragmas[jsxRuntimePragmas.length - 1] : jsxRuntimePragmas;
9169+
if (jsxRuntimePragma?.arguments.factory === "classic") {
9170+
return undefined;
9171+
}
91679172
return compilerOptions.jsx === JsxEmit.ReactJSX ||
91689173
compilerOptions.jsx === JsxEmit.ReactJSXDev ||
91699174
compilerOptions.jsxImportSource ||
9170-
jsxImportSourcePragma ?
9175+
jsxImportSourcePragma ||
9176+
jsxRuntimePragma?.arguments.factory === "automatic" ?
91719177
jsxImportSourcePragma?.arguments.factory || compilerOptions.jsxImportSource || "react" :
91729178
undefined;
91739179
}

‎tests/baselines/reference/allowJsCrossMonorepoPackage.trace.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@
7373
"File '/node_modules/pkg/index.d.ts' exists - use it as a name resolution result.",
7474
"Resolving real path for '/node_modules/pkg/index.d.ts', result '/node_modules/pkg/index.d.ts'.",
7575
"======== Module name 'pkg' was successfully resolved to '/node_modules/pkg/index.d.ts'. ========",
76+
"File '/node_modules/pkg/package.json' does not exist according to earlier cached lookups.",
77+
"File '/node_modules/package.json' does not exist.",
78+
"File '/package.json' does not exist.",
7679
"======== Resolving module '@typescript/lib-es5' from '/packages/main/__lib_node_modules_lookup_lib.es5.d.ts__.ts'. ========",
7780
"Explicitly specified module resolution kind: 'Node10'.",
7881
"Loading module '@typescript/lib-es5' from 'node_modules' folder, target file types: TypeScript, Declaration.",

‎tests/baselines/reference/bundlerConditionsExcludesNode(module=esnext).trace.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
[
2+
"Found 'package.json' at '/node_modules/conditions/package.json'.",
3+
"File '/node_modules/conditions/package.json' exists according to earlier cached lookups.",
24
"======== Resolving module 'conditions' from '/main.ts'. ========",
35
"Explicitly specified module resolution kind: 'Bundler'.",
46
"Resolving in CJS mode with conditions 'import', 'types'.",
57
"File '/package.json' does not exist.",
68
"Loading module 'conditions' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON.",
79
"Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.",
8-
"Found 'package.json' at '/node_modules/conditions/package.json'.",
10+
"File '/node_modules/conditions/package.json' exists according to earlier cached lookups.",
911
"Entering conditional exports.",
1012
"Saw non-matching condition 'node'.",
1113
"Matched 'exports' condition 'default'.",

‎tests/baselines/reference/bundlerConditionsExcludesNode(module=preserve).trace.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
[
2+
"Found 'package.json' at '/node_modules/conditions/package.json'.",
3+
"File '/node_modules/conditions/package.json' exists according to earlier cached lookups.",
24
"======== Resolving module 'conditions' from '/main.ts'. ========",
35
"Explicitly specified module resolution kind: 'Bundler'.",
46
"Resolving in CJS mode with conditions 'import', 'types'.",
57
"File '/package.json' does not exist.",
68
"Loading module 'conditions' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON.",
79
"Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.",
8-
"Found 'package.json' at '/node_modules/conditions/package.json'.",
10+
"File '/node_modules/conditions/package.json' exists according to earlier cached lookups.",
911
"Entering conditional exports.",
1012
"Saw non-matching condition 'node'.",
1113
"Matched 'exports' condition 'default'.",

‎tests/baselines/reference/bundlerImportESM(module=esnext).js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import { esm } from "./esm.mjs";
1616
//// [esm.mjs]
1717
export var esm = 0;
1818
//// [not-actually-cjs.cjs]
19-
export {};
19+
"use strict";
20+
Object.defineProperty(exports, "__esModule", { value: true });
2021
//// [still-not-cjs.js]
2122
export {};

‎tests/baselines/reference/bundlerNodeModules1(module=esnext).errors.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error TS6504: File '/node_modules/dual/index.cjs' is a JavaScript file. Did you
44
error TS6504: File '/node_modules/dual/index.js' is a JavaScript file. Did you mean to enable the 'allowJs' option?
55
The file is in the program because:
66
Root file specified for compilation
7-
/main.cts(1,15): error TS2305: Module '"dual"' has no exported member 'cjs'.
7+
/main.cts(1,10): error TS2305: Module '"dual"' has no exported member 'esm'.
88
/main.mts(1,15): error TS2305: Module '"dual"' has no exported member 'cjs'.
99
/main.ts(1,15): error TS2305: Module '"dual"' has no exported member 'cjs'.
1010

@@ -54,6 +54,6 @@ error TS6504: File '/node_modules/dual/index.js' is a JavaScript file. Did you m
5454

5555
==== /main.cts (1 errors) ====
5656
import { esm, cjs } from "dual";
57-
~~~
58-
!!! error TS2305: Module '"dual"' has no exported member 'cjs'.
57+
~~~
58+
!!! error TS2305: Module '"dual"' has no exported member 'esm'.
5959

‎tests/baselines/reference/bundlerNodeModules1(module=esnext).js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,5 @@ export {};
4242
//// [main.mjs]
4343
export {};
4444
//// [main.cjs]
45-
export {};
45+
"use strict";
46+
Object.defineProperty(exports, "__esModule", { value: true });

‎tests/baselines/reference/bundlerNodeModules1(module=esnext).trace.json

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
[
2+
"Found 'package.json' at '/node_modules/dual/package.json'.",
23
"======== Resolving module 'dual' from '/main.ts'. ========",
34
"Explicitly specified module resolution kind: 'Bundler'.",
45
"Resolving in CJS mode with conditions 'import', 'types'.",
56
"File '/package.json' does not exist.",
67
"Loading module 'dual' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON.",
78
"Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.",
8-
"Found 'package.json' at '/node_modules/dual/package.json'.",
9+
"File '/node_modules/dual/package.json' exists according to earlier cached lookups.",
910
"Entering conditional exports.",
1011
"Matched 'exports' condition 'import'.",
1112
"Using 'exports' subpath '.' with target './index.js'.",
@@ -22,8 +23,23 @@
2223
"Resolution for module 'dual' was found in cache from location '/'.",
2324
"======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.ts' with Package ID 'dual/index.d.ts@1.0.0'. ========",
2425
"======== Resolving module 'dual' from '/main.cts'. ========",
25-
"Resolution for module 'dual' was found in cache from location '/'.",
26-
"======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.ts' with Package ID 'dual/index.d.ts@1.0.0'. ========",
26+
"Explicitly specified module resolution kind: 'Bundler'.",
27+
"Resolving in CJS mode with conditions 'require', 'types'.",
28+
"File '/package.json' does not exist according to earlier cached lookups.",
29+
"Loading module 'dual' from 'node_modules' folder, target file types: TypeScript, JavaScript, Declaration, JSON.",
30+
"Searching all ancestor node_modules directories for preferred extensions: TypeScript, Declaration.",
31+
"File '/node_modules/dual/package.json' exists according to earlier cached lookups.",
32+
"Entering conditional exports.",
33+
"Saw non-matching condition 'import'.",
34+
"Matched 'exports' condition 'require'.",
35+
"Using 'exports' subpath '.' with target './index.cjs'.",
36+
"File name '/node_modules/dual/index.cjs' has a '.cjs' extension - stripping it.",
37+
"File '/node_modules/dual/index.cts' does not exist.",
38+
"File '/node_modules/dual/index.d.cts' exists - use it as a name resolution result.",
39+
"Resolved under condition 'require'.",
40+
"Exiting conditional exports.",
41+
"Resolving real path for '/node_modules/dual/index.d.cts', result '/node_modules/dual/index.d.cts'.",
42+
"======== Module name 'dual' was successfully resolved to '/node_modules/dual/index.d.cts' with Package ID 'dual/index.d.cts@1.0.0'. ========",
2743
"======== Resolving module '@typescript/lib-es5' from '/.src/__lib_node_modules_lookup_lib.es5.d.ts__.ts'. ========",
2844
"Explicitly specified module resolution kind: 'Node10'.",
2945
"Loading module '@typescript/lib-es5' from 'node_modules' folder, target file types: TypeScript, Declaration.",

0 commit comments

Comments
 (0)