🤖 Pick PRs #62320 and #62338 into tsgo-port (#62637)

Co-authored-by: Andrew Branch <[email protected]>
Co-authored-by: Andrew Branch <[email protected]>

Author: typescript-bot

src/compiler/checker.ts

@@ -339,6 +339,7 @@ import {
     getMembersOfDeclaration,
     getModifiers,
     getModuleInstanceState,
+    getModuleSpecifierOfBareOrAccessedRequire,
     getNameFromImportAttribute,
     getNameFromIndexInfo,
     getNameOfDeclaration,
@@ -4717,7 +4718,7 @@ export function createTypeChecker(host: TypeCheckerHost): TypeChecker {
             ? location
             : (isModuleDeclaration(location) ? location : location.parent && isModuleDeclaration(location.parent) && location.parent.name === location ? location.parent : undefined)?.name ||
                 (isLiteralImportTypeNode(location) ? location : undefined)?.argument.literal ||
-                (isVariableDeclaration(location) && location.initializer && isRequireCall(location.initializer, /*requireStringLiteralLikeArgument*/ true) ? location.initializer.arguments[0] : undefined) ||
+                isVariableDeclarationInitializedToBareOrAccessedRequire(location) && getModuleSpecifierOfBareOrAccessedRequire(location) ||
                 findAncestor(location, isImportCall)?.arguments[0] ||
                 findAncestor(location, or(isImportDeclaration, isJSDocImportTag, isExportDeclaration))?.moduleSpecifier ||
                 findAncestor(location, isExternalModuleImportEqualsDeclaration)?.moduleReference.expression;

src/compiler/diagnosticMessages.json

@@ -4661,7 +4661,7 @@
         "category": "Error",
         "code": 5094
     },
-    "Option '{0}' can only be used when 'module' is set to 'preserve' or to 'es2015' or later.": {
+    "Option '{0}' can only be used when 'module' is set to 'preserve', 'commonjs', or 'es2015' or later.": {
         "category": "Error",
         "code": 5095
     },

src/compiler/program.ts

@@ -4370,8 +4370,8 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro
             createDiagnosticForOptionName(Diagnostics.Option_0_can_only_be_used_when_moduleResolution_is_set_to_node16_nodenext_or_bundler, "customConditions");
         }
 
-        if (moduleResolution === ModuleResolutionKind.Bundler && !emitModuleKindIsNonNodeESM(moduleKind) && moduleKind !== ModuleKind.Preserve) {
-            createOptionValueDiagnostic("moduleResolution", Diagnostics.Option_0_can_only_be_used_when_module_is_set_to_preserve_or_to_es2015_or_later, "bundler");
+        if (moduleResolution === ModuleResolutionKind.Bundler && !emitModuleKindIsNonNodeESM(moduleKind) && moduleKind !== ModuleKind.Preserve && moduleKind !== ModuleKind.CommonJS) {
+            createOptionValueDiagnostic("moduleResolution", Diagnostics.Option_0_can_only_be_used_when_module_is_set_to_preserve_commonjs_or_es2015_or_later, "bundler");
         }
 
         if (
@@ -4435,10 +4435,7 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro
     function getIgnoreDeprecationsVersion(): Version {
         const ignoreDeprecations = options.ignoreDeprecations;
         if (ignoreDeprecations) {
-            // While we could do Version.tryParse here to support any version,
-            // for now, only allow "5.0". We aren't planning on deprecating anything
-            // until 6.0.
-            if (ignoreDeprecations === "5.0") {
+            if (ignoreDeprecations === "5.0" || ignoreDeprecations === "6.0") {
                 return new Version(ignoreDeprecations);
             }
             reportInvalidIgnoreDeprecations();
@@ -4526,6 +4523,12 @@ export function createProgram(_rootNamesOrOptions: readonly string[] | CreatePro
                 createDeprecatedDiagnostic("preserveValueImports", /*value*/ undefined, "verbatimModuleSyntax");
             }
         });
+
+        checkDeprecations("6.0", "7.0", createDiagnostic, createDeprecatedDiagnostic => {
+            if (options.moduleResolution === ModuleResolutionKind.Node10) {
+                createDeprecatedDiagnostic("moduleResolution", "node10");
+            }
+        });
     }
 
     function verifyDeprecatedProjectReference(ref: ProjectReference, parentFile: JsonSourceFile | undefined, index: number) {

src/compiler/types.ts

@@ -7338,6 +7338,9 @@ export enum ModuleResolutionKind {
      * Use the new name or consider switching to a modern module resolution target.
      */
     NodeJs = 2,
+    /**
+     * @deprecated
+     */
     Node10 = 2,
     // Starting with node12, node's module resolver has significant departures from traditional cjs resolution
     // to better support ECMAScript modules and their use within node - however more features are still being added.

src/compiler/utilities.ts

@@ -3823,6 +3823,20 @@ export function isBindingElementOfBareOrAccessedRequire(node: Node): node is Bin
     return isBindingElement(node) && isVariableDeclarationInitializedToBareOrAccessedRequire(node.parent.parent);
 }
 
+/** @internal */
+export function getModuleSpecifierOfBareOrAccessedRequire(node: VariableDeclarationInitializedTo<RequireOrImportCall | AccessExpression>): StringLiteralLike | undefined {
+    if (isVariableDeclarationInitializedToRequire(node)) {
+        return node.initializer.arguments[0];
+    }
+    if (isVariableDeclarationInitializedToBareOrAccessedRequire(node)) {
+        const leftmost = getLeftmostAccessExpression(node.initializer);
+        if (isRequireCall(leftmost, /*requireStringLiteralLikeArgument*/ true)) {
+            return leftmost.arguments[0];
+        }
+    }
+    return undefined;
+}
+
 function isVariableDeclarationInitializedWithRequireHelper(node: Node, allowAccessedRequire: boolean) {
     return isVariableDeclaration(node) &&
         !!node.initializer &&
@@ -8974,9 +8988,6 @@ const _computedOptions = createComputedCompilerOptions({
             let moduleResolution = compilerOptions.moduleResolution;
             if (moduleResolution === undefined) {
                 switch (_computedOptions.module.computeValue(compilerOptions)) {
-                    case ModuleKind.CommonJS:
-                        moduleResolution = ModuleResolutionKind.Node10;
-                        break;
                     case ModuleKind.Node16:
                     case ModuleKind.Node18:
                     case ModuleKind.Node20:
@@ -8985,6 +8996,7 @@ const _computedOptions = createComputedCompilerOptions({
                     case ModuleKind.NodeNext:
                         moduleResolution = ModuleResolutionKind.NodeNext;
                         break;
+                    case ModuleKind.CommonJS:
                     case ModuleKind.Preserve:
                         moduleResolution = ModuleResolutionKind.Bundler;
                         break;

src/server/protocol.ts

@@ -3269,6 +3269,7 @@ export const enum ModuleResolutionKind {
     Node = "node",
     /** @deprecated Renamed to `Node10` */
     NodeJs = "node",
+    /** @deprecated */
     Node10 = "node10",
     Node16 = "node16",
     NodeNext = "nodenext",

src/services/completions.ts

@@ -4184,10 +4184,6 @@ function getCompletionData(
                         return charactersFuzzyMatchInString(symbolName, lowerCaseTokenText);
                     },
                     (info, symbolName, isFromAmbientModule, exportMapKey) => {
-                        if (detailsEntryId && !some(info, i => detailsEntryId.source === stripQuotes(i.moduleSymbol.name))) {
-                            return;
-                        }
-
                         // Do a relatively cheap check to bail early if all re-exports are non-importable
                         // due to file location or package.json dependency filtering. For non-node16+
                         // module resolution modes, getting past this point guarantees that we'll be
@@ -4216,6 +4212,10 @@ function getCompletionData(
                             ({ exportInfo = info[0], moduleSpecifier } = result);
                         }
 
+                        if (detailsEntryId && (detailsEntryId.source !== moduleSpecifier && !some(info, i => detailsEntryId.source === stripQuotes(i.moduleSymbol.name)))) {
+                            return;
+                        }
+
                         const isDefaultExport = exportInfo.exportKind === ExportKind.Default;
                         const symbol = isDefaultExport && getLocalSymbolForExportDefault(Debug.checkDefined(exportInfo.symbol)) || Debug.checkDefined(exportInfo.symbol);
 

src/services/stringCompletions.ts

@@ -1067,8 +1067,9 @@ function getCompletionEntriesForNonRelativeModules(
                     if (tryFileExists(host, packageFile)) {
                         const packageJson = readJson(packageFile, host);
                         const fragmentSubpath = components.join("/") + (components.length && hasTrailingDirectorySeparator(fragment) ? "/" : "");
-                        exportsOrImportsLookup((packageJson as MapLike<unknown>).exports, fragmentSubpath, packageDirectory, /*isExports*/ true, /*isImports*/ false);
-                        return;
+                        if (exportsOrImportsLookup((packageJson as MapLike<unknown>).exports, fragmentSubpath, packageDirectory, /*isExports*/ true, /*isImports*/ false)) {
+                            return;
+                        }
                     }
                     return nodeModulesDirectoryOrImportsLookup(ancestor);
                 };
@@ -1079,9 +1080,10 @@ function getCompletionEntriesForNonRelativeModules(
 
     return arrayFrom(result.values());
 
-    function exportsOrImportsLookup(lookupTable: unknown, fragment: string, baseDirectory: string, isExports: boolean, isImports: boolean) {
+    /** Returns true if the search should stop */
+    function exportsOrImportsLookup(lookupTable: unknown, fragment: string, baseDirectory: string, isExports: boolean, isImports: boolean): boolean {
         if (typeof lookupTable !== "object" || lookupTable === null) { // eslint-disable-line no-restricted-syntax
-            return; // null lookupTable or entrypoint only
+            return lookupTable !== undefined; // null lookupTable or entrypoint only
         }
         const keys = getOwnKeys(lookupTable as MapLike<unknown>);
         const conditions = getConditions(compilerOptions, mode);
@@ -1105,6 +1107,7 @@ function getCompletionEntriesForNonRelativeModules(
             },
             comparePatternKeys,
         );
+        return true;
     }
 }
 

src/testRunner/unittests/tscWatch/watchEnvironment.ts

@@ -288,7 +288,7 @@ describe("unittests:: tscWatch:: watchEnvironment:: tsc-watch with different pol
             sys: () => {
                 const configFile: File = {
                     path: `/user/username/projects/myproject/tsconfig.json`,
-                    content: "{}",
+                    content: `{ "compilerOptions": { "moduleResolution": "node10" } }`,
                 };
                 const file1: File = {
                     path: `/user/username/projects/myproject/src/file1.ts`,

src/testRunner/unittests/tsserver/autoImportProvider.ts

@@ -188,6 +188,11 @@ describe("unittests:: tsserver:: autoImportProvider::", () => {
 
         // Create auto import provider project, ensure still !session.getProjectService().pendingEnsureProjectForOpenFiles
         host.writeFile(packageJson.path, packageJson.content);
+        // package.json was watched in --moduleResolution bundler
+        assert.isTrue(session.getProjectService().pendingEnsureProjectForOpenFiles);
+        host.runQueuedTimeoutCallbacks();
+        assert.isFalse(session.getProjectService().pendingEnsureProjectForOpenFiles);
+
         session.host.baselineHost("Before getPackageJsonAutoImportProvider");
         hostProject.getPackageJsonAutoImportProvider();
         assert.isFalse(session.getProjectService().pendingEnsureProjectForOpenFiles);