Add first tests

microsoft · andrewbranch · Dec 13, 2022 · Jul 28, 2022 · Jul 29, 2022 · Jul 29, 2022
commit 9bc0f07fd2585253d04531ed81f5b1d0991cce08
diff --git a/src/compiler/moduleNameResolver.ts b/src/compiler/moduleNameResolver.ts
@@ -376,7 +376,7 @@ namespace ts {
         if (resolutionMode === ModuleKind.ESNext && (getEmitModuleResolutionKind(options) === ModuleResolutionKind.Node16 || getEmitModuleResolutionKind(options) === ModuleResolutionKind.NodeNext)) {
             features |= NodeResolutionFeatures.EsmMode;
         }
-        const conditions = features & NodeResolutionFeatures.Exports ? features & NodeResolutionFeatures.EsmMode ? ["node", "import", "types"] : ["node", "require", "types"] : [];
+        const conditions = features & NodeResolutionFeatures.Exports ? getConditions(options, !!(features & NodeResolutionFeatures.EsmMode)) : [];
         const diagnostics: Diagnostic[] = [];
         const moduleResolutionState: ModuleResolutionState = {
             compilerOptions: options,
@@ -508,10 +508,12 @@ namespace ts {
         return features;
     }
 
-    function getConditions(options: CompilerOptions, esmMode: boolean | undefined) {
+    function getConditions(options: CompilerOptions, esmMode?: boolean) {
         // conditions are only used by the node16/nodenext/hybrid resolvers - there's no priority order in the list,
         // it's essentially a set (priority is determined by object insertion order in the object we look at).
-        const conditions = esmMode ? ["node", "import"] : ["node", "require"];
+        const conditions = esmMode || getEmitModuleResolutionKind(options) === ModuleResolutionKind.Hybrid
+            ? ["node", "import"]
+            : ["node", "require"];
         if (!options.noDtsResolution) {
             conditions.push("types");
         }
@@ -1546,7 +1548,7 @@ namespace ts {
             }
         }
         // esm mode relative imports shouldn't do any directory lookups (either inside `package.json`
-        // files or implicit `index.js`es). This is a notable depature from cjs norms, where `./foo/pkg`
+        // files or implicit `index.js`es). This is a notable departure from cjs norms, where `./foo/pkg`
         // could have been redirected by `./foo/pkg/package.json` to an arbitrary location!
         if (!(state.features & NodeResolutionFeatures.EsmMode)) {
             return loadNodeModuleFromDirectory(extensions, candidate, onlyRecordFailures, state, considerPackageJson);
@@ -1774,25 +1776,29 @@ namespace ts {
         let entrypoints: string[] | undefined;
         const extensions = resolveJs ? Extensions.JavaScript : Extensions.TypeScript;
         const features = getNodeResolutionFeatures(options);
-        const requireState = getTemporaryModuleResolutionState(cache?.getPackageJsonInfoCache(), host, options);
-        requireState.conditions = ["node", "require", "types"];
-        requireState.requestContainingDirectory = packageJsonInfo.packageDirectory;
-        const requireResolution = loadNodeModuleFromDirectoryWorker(
+        const loadPackageJsonMainState = getTemporaryModuleResolutionState(cache?.getPackageJsonInfoCache(), host, options);
+        loadPackageJsonMainState.conditions = getConditions(options);
+        loadPackageJsonMainState.requestContainingDirectory = packageJsonInfo.packageDirectory;
+        const mainResolution = loadNodeModuleFromDirectoryWorker(
             extensions,
             packageJsonInfo.packageDirectory,
             /*onlyRecordFailures*/ false,
-            requireState,
+            loadPackageJsonMainState,
             packageJsonInfo.contents.packageJsonContent,
             packageJsonInfo.contents.versionPaths);
-        entrypoints = append(entrypoints, requireResolution?.path);
+        entrypoints = append(entrypoints, mainResolution?.path);
 
         if (features & NodeResolutionFeatures.Exports && packageJsonInfo.contents.packageJsonContent.exports) {
-            for (const conditions of [["node", "import", "types"], ["node", "require", "types"]]) {
-                const exportState = { ...requireState, failedLookupLocations: [], conditions };
+            const conditionSets = deduplicate(
+                [getConditions(options, /*esmMode*/ true), getConditions(options, /*esmMode*/ false)],
+                arrayIsEqualTo
+            );
+            for (const conditions of conditionSets) {
+                const loadPackageJsonExportsState = { ...loadPackageJsonMainState, failedLookupLocations: [], conditions };
                 const exportResolutions = loadEntrypointsFromExportMap(
                     packageJsonInfo,
                     packageJsonInfo.contents.packageJsonContent.exports,
-                    exportState,
+                    loadPackageJsonExportsState,
                     extensions);
                 if (exportResolutions) {
                     for (const resolution of exportResolutions) {

diff --git a/src/compiler/utilities.ts b/src/compiler/utilities.ts
@@ -6441,11 +6441,12 @@ namespace ts {
     }
 
     export function getAllowSyntheticDefaultImports(compilerOptions: CompilerOptions) {
-        const moduleKind = getEmitModuleKind(compilerOptions);
-        return compilerOptions.allowSyntheticDefaultImports !== undefined
-            ? compilerOptions.allowSyntheticDefaultImports
-            : getESModuleInterop(compilerOptions) ||
-            moduleKind === ModuleKind.System;
+        if (compilerOptions.allowSyntheticDefaultImports !== undefined) {
+            return compilerOptions.allowSyntheticDefaultImports;
+        }
+        return getESModuleInterop(compilerOptions)
+            || getEmitModuleKind(compilerOptions) === ModuleKind.System
+            || getEmitModuleResolutionKind(compilerOptions) === ModuleResolutionKind.Hybrid;
     }
 
     export function moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution: ModuleResolutionKind): boolean {

diff --git a/tests/baselines/reference/hybridRelative1.errors.txt b/tests/baselines/reference/hybridRelative1.errors.txt
@@ -0,0 +1,41 @@
+error TS5070: Option '--resolveJsonModule' cannot be specified without 'node' module resolution strategy.
+/main.ts(4,16): error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+/main.ts(7,16): error TS2307: Cannot find module './redirect/index' or its corresponding type declarations.
+
+
+!!! error TS5070: Option '--resolveJsonModule' cannot be specified without 'node' module resolution strategy.
+==== /dir/index.ts (0 errors) ====
+    export const x = 0;
+
+==== /redirect/package.json (0 errors) ====
+    { "main": "../foo" }
+
+==== /foo/index.ts (0 errors) ====
+    export const y = 0;
+
+==== /types/esm.d.ts (0 errors) ====
+    declare const _: string;
+    export default _;
+
+==== /types/cjs.d.ts (0 errors) ====
+    declare const _: string;
+    export = _;
+
+==== /main.ts (2 errors) ====
+    import { x } from "./dir";
+    import {} from "./dir/index";
+    import {} from "./dir/index.js";
+    import {} from "./dir/index.ts";
+                   ~~~~~~~~~~~~~~~~
+!!! error TS5097: An import path can only end with a '.ts' extension when 'allowImportingTsExtensions' is enabled.
+
+    import { y } from "./redirect";
+    import {} from "./redirect/index";
+                   ~~~~~~~~~~~~~~~~~~
+!!! error TS2307: Cannot find module './redirect/index' or its corresponding type declarations.
+
+    import a from "./types/esm";
+    import * as esm from "./types/esm";
+    import b from "./types/cjs";
+    import * as cjs from "./types/cjs";
+
diff --git a/tests/baselines/reference/hybridRelative1.js b/tests/baselines/reference/hybridRelative1.js
@@ -0,0 +1,47 @@
+//// [tests/cases/conformance/moduleResolution/hybrid/hybridRelative1.ts] ////
+
+//// [index.ts]
+export const x = 0;
+
+//// [package.json]
+{ "main": "../foo" }
+
+//// [index.ts]
+export const y = 0;
+
+//// [esm.d.ts]
+declare const _: string;
+export default _;
+
+//// [cjs.d.ts]
+declare const _: string;
+export = _;
+
+//// [main.ts]
+import { x } from "./dir";
+import {} from "./dir/index";
+import {} from "./dir/index.js";
+import {} from "./dir/index.ts";
+
+import { y } from "./redirect";
+import {} from "./redirect/index";
+
+import a from "./types/esm";
+import * as esm from "./types/esm";
+import b from "./types/cjs";
+import * as cjs from "./types/cjs";
+
+
+//// [index.js]
+"use strict";
+exports.__esModule = true;
+exports.x = void 0;
+exports.x = 0;
+//// [index.js]
+"use strict";
+exports.__esModule = true;
+exports.y = void 0;
+exports.y = 0;
+//// [main.js]
+"use strict";
+exports.__esModule = true;
diff --git a/tests/baselines/reference/hybridRelative1.symbols b/tests/baselines/reference/hybridRelative1.symbols
@@ -0,0 +1,47 @@
+=== /dir/index.ts ===
+export const x = 0;
+>x : Symbol(x, Decl(index.ts, 0, 12))
+
+=== /foo/index.ts ===
+export const y = 0;
+>y : Symbol(y, Decl(index.ts, 0, 12))
+
+=== /types/esm.d.ts ===
+declare const _: string;
+>_ : Symbol(_, Decl(esm.d.ts, 0, 13))
+
+export default _;
+>_ : Symbol(_, Decl(esm.d.ts, 0, 13))
+
+=== /types/cjs.d.ts ===
+declare const _: string;
+>_ : Symbol(_, Decl(cjs.d.ts, 0, 13))
+
+export = _;
+>_ : Symbol(_, Decl(cjs.d.ts, 0, 13))
+
+=== /main.ts ===
+import { x } from "./dir";
+>x : Symbol(x, Decl(main.ts, 0, 8))
+
+import {} from "./dir/index";
+import {} from "./dir/index.js";
+import {} from "./dir/index.ts";
+
+import { y } from "./redirect";
+>y : Symbol(y, Decl(main.ts, 5, 8))
+
+import {} from "./redirect/index";
+
+import a from "./types/esm";
+>a : Symbol(a, Decl(main.ts, 8, 6))
+
+import * as esm from "./types/esm";
+>esm : Symbol(esm, Decl(main.ts, 9, 6))
+
+import b from "./types/cjs";
+>b : Symbol(b, Decl(main.ts, 10, 6))
+
+import * as cjs from "./types/cjs";
+>cjs : Symbol(cjs, Decl(main.ts, 11, 6))
+
diff --git a/tests/baselines/reference/hybridRelative1.trace.json b/tests/baselines/reference/hybridRelative1.trace.json
@@ -0,0 +1,80 @@
+[
+    "======== Resolving module './dir' from '/main.ts'. ========",
+    "Explicitly specified module resolution kind: 'Hybrid'.",
+    "Loading module as file / folder, candidate module location '/dir', target file type 'TypeScript'.",
+    "File '/dir.ts' does not exist.",
+    "File '/dir.tsx' does not exist.",
+    "File '/dir.d.ts' does not exist.",
+    "File '/dir/package.json' does not exist.",
+    "File '/dir/index.ts' exist - use it as a name resolution result.",
+    "======== Module name './dir' was successfully resolved to '/dir/index.ts'. ========",
+    "======== Resolving module './dir/index' from '/main.ts'. ========",
+    "Explicitly specified module resolution kind: 'Hybrid'.",
+    "Loading module as file / folder, candidate module location '/dir/index', target file type 'TypeScript'.",
+    "File '/dir/index.ts' exist - use it as a name resolution result.",
+    "======== Module name './dir/index' was successfully resolved to '/dir/index.ts'. ========",
+    "======== Resolving module './dir/index.js' from '/main.ts'. ========",
+    "Explicitly specified module resolution kind: 'Hybrid'.",
+    "Loading module as file / folder, candidate module location '/dir/index.js', target file type 'TypeScript'.",
+    "File '/dir/index.js.ts' does not exist.",
+    "File '/dir/index.js.tsx' does not exist.",
+    "File '/dir/index.js.d.ts' does not exist.",
+    "File name '/dir/index.js' has a '.js' extension - stripping it.",
+    "File '/dir/index.ts' exist - use it as a name resolution result.",
+    "======== Module name './dir/index.js' was successfully resolved to '/dir/index.ts'. ========",
+    "======== Resolving module './dir/index.ts' from '/main.ts'. ========",
+    "Explicitly specified module resolution kind: 'Hybrid'.",
+    "Loading module as file / folder, candidate module location '/dir/index.ts', target file type 'TypeScript'.",
+    "File '/dir/index.ts.ts' does not exist.",
+    "File '/dir/index.ts.tsx' does not exist.",
+    "File '/dir/index.ts.d.ts' does not exist.",
+    "File name '/dir/index.ts' has a '.ts' extension - stripping it.",
+    "File '/dir/index.ts' exist - use it as a name resolution result.",
+    "======== Module name './dir/index.ts' was successfully resolved to '/dir/index.ts'. ========",
+    "======== Resolving module './redirect' from '/main.ts'. ========",
+    "Explicitly specified module resolution kind: 'Hybrid'.",
+    "Loading module as file / folder, candidate module location '/redirect', target file type 'TypeScript'.",
+    "File '/redirect.ts' does not exist.",
+    "File '/redirect.tsx' does not exist.",
+    "File '/redirect.d.ts' does not exist.",
+    "Found 'package.json' at '/redirect/package.json'.",
+    "'package.json' does not have a 'typesVersions' field.",
+    "'package.json' does not have a 'typings' field.",
+    "'package.json' does not have a 'types' field.",
+    "'package.json' has 'main' field '../foo' that references '/foo'.",
+    "File '/foo' does not exist.",
+    "Loading module as file / folder, candidate module location '/foo', target file type 'TypeScript'.",
+    "File '/foo.ts' does not exist.",
+    "File '/foo.tsx' does not exist.",
+    "File '/foo.d.ts' does not exist.",
+    "File '/foo/index.ts' exist - use it as a name resolution result.",
+    "======== Module name './redirect' was successfully resolved to '/foo/index.ts'. ========",
+    "======== Resolving module './redirect/index' from '/main.ts'. ========",
+    "Explicitly specified module resolution kind: 'Hybrid'.",
+    "Loading module as file / folder, candidate module location '/redirect/index', target file type 'TypeScript'.",
+    "File '/redirect/index.ts' does not exist.",
+    "File '/redirect/index.tsx' does not exist.",
+    "File '/redirect/index.d.ts' does not exist.",
+    "Directory '/redirect/index' does not exist, skipping all lookups in it.",
+    "Loading module as file / folder, candidate module location '/redirect/index', target file type 'JavaScript'.",
+    "File '/redirect/index.js' does not exist.",
+    "File '/redirect/index.jsx' does not exist.",
+    "Directory '/redirect/index' does not exist, skipping all lookups in it.",
+    "Loading module as file / folder, candidate module location '/redirect/index', target file type 'Json'.",
+    "Directory '/redirect/index' does not exist, skipping all lookups in it.",
+    "======== Module name './redirect/index' was not resolved. ========",
+    "======== Resolving module './types/esm' from '/main.ts'. ========",
+    "Explicitly specified module resolution kind: 'Hybrid'.",
+    "Loading module as file / folder, candidate module location '/types/esm', target file type 'TypeScript'.",
+    "File '/types/esm.ts' does not exist.",
+    "File '/types/esm.tsx' does not exist.",
+    "File '/types/esm.d.ts' exist - use it as a name resolution result.",
+    "======== Module name './types/esm' was successfully resolved to '/types/esm.d.ts'. ========",
+    "======== Resolving module './types/cjs' from '/main.ts'. ========",
+    "Explicitly specified module resolution kind: 'Hybrid'.",
+    "Loading module as file / folder, candidate module location '/types/cjs', target file type 'TypeScript'.",
+    "File '/types/cjs.ts' does not exist.",
+    "File '/types/cjs.tsx' does not exist.",
+    "File '/types/cjs.d.ts' exist - use it as a name resolution result.",
+    "======== Module name './types/cjs' was successfully resolved to '/types/cjs.d.ts'. ========"
+]
diff --git a/tests/baselines/reference/hybridRelative1.types b/tests/baselines/reference/hybridRelative1.types
@@ -0,0 +1,49 @@
+=== /dir/index.ts ===
+export const x = 0;
+>x : 0
+>0 : 0
+
+=== /foo/index.ts ===
+export const y = 0;
+>y : 0
+>0 : 0
+
+=== /types/esm.d.ts ===
+declare const _: string;
+>_ : string
+
+export default _;
+>_ : string
+
+=== /types/cjs.d.ts ===
+declare const _: string;
+>_ : string
+
+export = _;
+>_ : string
+
+=== /main.ts ===
+import { x } from "./dir";
+>x : 0
+
+import {} from "./dir/index";
+import {} from "./dir/index.js";
+import {} from "./dir/index.ts";
+
+import { y } from "./redirect";
+>y : 0
+
+import {} from "./redirect/index";
+
+import a from "./types/esm";
+>a : string
+
+import * as esm from "./types/esm";
+>esm : typeof esm
+
+import b from "./types/cjs";
+>b : string
+
+import * as cjs from "./types/cjs";
+>cjs : string
+
diff --git a/tests/cases/conformance/moduleResolution/hybrid/hybridRelative1.ts b/tests/cases/conformance/moduleResolution/hybrid/hybridRelative1.ts
@@ -0,0 +1,33 @@
+// @moduleResolution: hybrid
+// @traceResolution: true
+
+// @Filename: /dir/index.ts
+export const x = 0;
+
+// @Filename: /redirect/package.json
+{ "main": "../foo" }
+
+// @Filename: /foo/index.ts
+export const y = 0;
+
+// @Filename: /types/esm.d.ts
+declare const _: string;
+export default _;
+
+// @Filename: /types/cjs.d.ts
+declare const _: string;
+export = _;
+
+// @Filename: /main.ts
+import { x } from "./dir";
+import {} from "./dir/index";
+import {} from "./dir/index.js";
+import {} from "./dir/index.ts";
+
+import { y } from "./redirect";
+import {} from "./redirect/index";
+
+import a from "./types/esm";
+import * as esm from "./types/esm";
+import b from "./types/cjs";
+import * as cjs from "./types/cjs";