@typescript-deploys/pr-build 4.7.0-pr-48997-3 → 4.7.0-pr-48997-6

package/lib/tsc.js

@@ -4242,7 +4242,12 @@ var ts;
                     (!relativeName ||
                         relativeName === lastDirectoryPart ||
                         (relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator) !== -1 && relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator) === relativeName.length - lastDirectoryPartWithDirectorySeparator.length))) {
-                    updateWatcher(!fileSystemEntryExists(fileOrDirectory, entryKind) ? watchMissingFileSystemEntry : watchPresentFileSystemEntry);
+                    if (inodeWatching) {
+                        updateWatcher(!fileSystemEntryExists(fileOrDirectory, entryKind) ? watchMissingFileSystemEntry : watchPresentFileSystemEntry);
+                    }
+                    else if (!fileSystemEntryExists(fileOrDirectory, entryKind)) {
+                        updateWatcher(watchMissingFileSystemEntry);
+                    }
                 }
             }
             function watchPresentFileSystemEntryWithFsWatchFile() {
@@ -26463,6 +26468,7 @@ var ts;
                     var startPos = scanner.getStartPos();
                     var result = parseListElement(kind, parseElement);
                     if (!result) {
+                        parsingContext = saveParsingContext;
                         return undefined;
                     }
                     list.push(result);
@@ -100611,14 +100617,14 @@ var ts;
             if (options === void 0) { options = {}; }
             var info = getInfo(importingSourceFile.path, host);
             var modulePaths = getAllModulePaths(importingSourceFile.path, nodeModulesFileName, host, preferences, options);
-            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, true, options.overrideImportMode); });
+            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, preferences, true, options.overrideImportMode); });
         }
         moduleSpecifiers_1.getNodeModulesPackageName = getNodeModulesPackageName;
         function getModuleSpecifierWorker(compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, preferences, userPreferences, options) {
             if (options === void 0) { options = {}; }
             var info = getInfo(importingSourceFileName, host);
             var modulePaths = getAllModulePaths(importingSourceFileName, toFileName, host, userPreferences, options);
-            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, undefined, options.overrideImportMode); }) ||
+            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, userPreferences, undefined, options.overrideImportMode); }) ||
                 getLocalModuleSpecifier(toFileName, info, compilerOptions, host, preferences);
         }
         function tryGetModuleSpecifiersFromCache(moduleSymbol, importingSourceFile, host, userPreferences, options) {
@@ -100684,7 +100690,7 @@ var ts;
             var relativeSpecifiers;
             for (var _i = 0, modulePaths_1 = modulePaths; _i < modulePaths_1.length; _i++) {
                 var modulePath = modulePaths_1[_i];
-                var specifier = tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, undefined, options.overrideImportMode);
+                var specifier = tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, userPreferences, undefined, options.overrideImportMode);
                 nodeModulesSpecifiers = ts.append(nodeModulesSpecifiers, specifier);
                 if (specifier && modulePath.isRedirect) {
                     return nodeModulesSpecifiers;
@@ -101015,7 +101021,7 @@ var ts;
                 ? removeExtensionAndIndexPostFix(relativePath, ending, compilerOptions)
                 : ts.removeFileExtension(relativePath);
         }
-        function tryGetModuleNameAsNodeModule(_a, _b, importingSourceFile, host, options, packageNameOnly, overrideMode) {
+        function tryGetModuleNameAsNodeModule(_a, _b, importingSourceFile, host, options, userPreferences, packageNameOnly, overrideMode) {
             var path = _a.path, isRedirect = _a.isRedirect;
             var getCanonicalFileName = _b.getCanonicalFileName, sourceDirectory = _b.sourceDirectory;
             if (!host.fileExists || !host.readFile) {
@@ -101028,8 +101034,9 @@ var ts;
             var moduleSpecifier = path;
             var isPackageRootPath = false;
             if (!packageNameOnly) {
+                var preferences = getPreferences(host, userPreferences, options, importingSourceFile);
                 var packageRootIndex = parts.packageRootIndex;
-                var moduleFileNameForExtensionless = void 0;
+                var moduleFileName = void 0;
                 while (true) {
                     var _c = tryDirectoryWithPackageJson(packageRootIndex), moduleFileToTry = _c.moduleFileToTry, packageRootPath = _c.packageRootPath, blockedByExports = _c.blockedByExports, verbatimFromExports = _c.verbatimFromExports;
                     if (ts.getEmitModuleResolutionKind(options) !== ts.ModuleResolutionKind.Classic) {
@@ -101045,11 +101052,11 @@ var ts;
                         isPackageRootPath = true;
                         break;
                     }
-                    if (!moduleFileNameForExtensionless)
-                        moduleFileNameForExtensionless = moduleFileToTry;
+                    if (!moduleFileName)
+                        moduleFileName = moduleFileToTry;
                     packageRootIndex = path.indexOf(ts.directorySeparator, packageRootIndex + 1);
                     if (packageRootIndex === -1) {
-                        moduleSpecifier = getExtensionlessFileName(moduleFileNameForExtensionless);
+                        moduleSpecifier = removeExtensionAndIndexPostFix(moduleFileName, preferences.ending, options, host);
                         break;
                     }
                 }
@@ -101098,7 +101105,7 @@ var ts;
                             moduleFileToTry = ts.combinePaths(packageRootPath, fromPaths);
                         }
                     }
-                    var mainFileRelative = packageJsonContent.typings || packageJsonContent.types || packageJsonContent.main;
+                    var mainFileRelative = packageJsonContent.typings || packageJsonContent.types || packageJsonContent.main || "index.js";
                     if (ts.isString(mainFileRelative)) {
                         var mainExportFile = ts.toPath(mainFileRelative, packageRootPath, getCanonicalFileName);
                         if (ts.removeFileExtension(mainExportFile) === ts.removeFileExtension(getCanonicalFileName(moduleFileToTry))) {
@@ -101106,14 +101113,13 @@ var ts;
                         }
                     }
                 }
-                return { moduleFileToTry: moduleFileToTry };
-            }
-            function getExtensionlessFileName(path) {
-                var fullModulePathWithoutExtension = ts.removeFileExtension(path);
-                if (getCanonicalFileName(fullModulePathWithoutExtension.substring(parts.fileNameIndex)) === "/index" && !tryGetAnyFileFromPath(host, fullModulePathWithoutExtension.substring(0, parts.fileNameIndex))) {
-                    return fullModulePathWithoutExtension.substring(0, parts.fileNameIndex);
+                else {
+                    var fileName = getCanonicalFileName(moduleFileToTry.substring(parts.packageRootIndex + 1));
+                    if (fileName === "index.d.ts" || fileName === "index.js" || fileName === "index.ts" || fileName === "index.tsx") {
+                        return { moduleFileToTry: moduleFileToTry, packageRootPath: packageRootPath };
+                    }
                 }
-                return fullModulePathWithoutExtension;
+                return { moduleFileToTry: moduleFileToTry };
             }
         }
         function tryGetAnyFileFromPath(host, path) {
@@ -101134,7 +101140,7 @@ var ts;
                 return relativePath !== undefined && isPathRelativeToParent(relativePath) ? undefined : relativePath;
             });
         }
-        function removeExtensionAndIndexPostFix(fileName, ending, options) {
+        function removeExtensionAndIndexPostFix(fileName, ending, options, host) {
             if (ts.fileExtensionIsOneOf(fileName, [".json", ".mjs", ".cjs"]))
                 return fileName;
             var noExtension = ts.removeFileExtension(fileName);
@@ -101142,7 +101148,11 @@ var ts;
                 return noExtension + getJSExtensionForFile(fileName, options);
             switch (ending) {
                 case 0:
-                    return ts.removeSuffix(noExtension, "/index");
+                    var withoutIndex = ts.removeSuffix(noExtension, "/index");
+                    if (host && withoutIndex !== noExtension && tryGetAnyFileFromPath(host, withoutIndex)) {
+                        return noExtension;
+                    }
+                    return withoutIndex;
                 case 1:
                     return noExtension;
                 case 2:

package/lib/tsserver.js

@@ -6766,7 +6766,12 @@ var ts;
                     (!relativeName ||
                         relativeName === lastDirectoryPart ||
                         (relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator) !== -1 && relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator) === relativeName.length - lastDirectoryPartWithDirectorySeparator.length))) {
-                    updateWatcher(!fileSystemEntryExists(fileOrDirectory, entryKind) ? watchMissingFileSystemEntry : watchPresentFileSystemEntry);
+                    if (inodeWatching) {
+                        updateWatcher(!fileSystemEntryExists(fileOrDirectory, entryKind) ? watchMissingFileSystemEntry : watchPresentFileSystemEntry);
+                    }
+                    else if (!fileSystemEntryExists(fileOrDirectory, entryKind)) {
+                        updateWatcher(watchMissingFileSystemEntry);
+                    }
                 }
             }
             /**
@@ -32847,6 +32852,7 @@ var ts;
                     var startPos = scanner.getStartPos();
                     var result = parseListElement(kind, parseElement);
                     if (!result) {
+                        parsingContext = saveParsingContext;
                         return undefined;
                     }
                     list.push(result);
@@ -121722,14 +121728,14 @@ var ts;
             if (options === void 0) { options = {}; }
             var info = getInfo(importingSourceFile.path, host);
             var modulePaths = getAllModulePaths(importingSourceFile.path, nodeModulesFileName, host, preferences, options);
-            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, /*packageNameOnly*/ true, options.overrideImportMode); });
+            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, preferences, /*packageNameOnly*/ true, options.overrideImportMode); });
         }
         moduleSpecifiers_1.getNodeModulesPackageName = getNodeModulesPackageName;
         function getModuleSpecifierWorker(compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, preferences, userPreferences, options) {
             if (options === void 0) { options = {}; }
             var info = getInfo(importingSourceFileName, host);
             var modulePaths = getAllModulePaths(importingSourceFileName, toFileName, host, userPreferences, options);
-            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, /*packageNameOnly*/ undefined, options.overrideImportMode); }) ||
+            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, userPreferences, /*packageNameOnly*/ undefined, options.overrideImportMode); }) ||
                 getLocalModuleSpecifier(toFileName, info, compilerOptions, host, preferences);
         }
         function tryGetModuleSpecifiersFromCache(moduleSymbol, importingSourceFile, host, userPreferences, options) {
@@ -121805,7 +121811,7 @@ var ts;
             var relativeSpecifiers;
             for (var _i = 0, modulePaths_1 = modulePaths; _i < modulePaths_1.length; _i++) {
                 var modulePath = modulePaths_1[_i];
-                var specifier = tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, /*packageNameOnly*/ undefined, options.overrideImportMode);
+                var specifier = tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, userPreferences, /*packageNameOnly*/ undefined, options.overrideImportMode);
                 nodeModulesSpecifiers = ts.append(nodeModulesSpecifiers, specifier);
                 if (specifier && modulePath.isRedirect) {
                     // If we got a specifier for a redirect, it was a bare package specifier (e.g. "@foo/bar",
@@ -122198,7 +122204,7 @@ var ts;
                 ? removeExtensionAndIndexPostFix(relativePath, ending, compilerOptions)
                 : ts.removeFileExtension(relativePath);
         }
-        function tryGetModuleNameAsNodeModule(_a, _b, importingSourceFile, host, options, packageNameOnly, overrideMode) {
+        function tryGetModuleNameAsNodeModule(_a, _b, importingSourceFile, host, options, userPreferences, packageNameOnly, overrideMode) {
             var path = _a.path, isRedirect = _a.isRedirect;
             var getCanonicalFileName = _b.getCanonicalFileName, sourceDirectory = _b.sourceDirectory;
             if (!host.fileExists || !host.readFile) {
@@ -122212,8 +122218,9 @@ var ts;
             var moduleSpecifier = path;
             var isPackageRootPath = false;
             if (!packageNameOnly) {
+                var preferences = getPreferences(host, userPreferences, options, importingSourceFile);
                 var packageRootIndex = parts.packageRootIndex;
-                var moduleFileNameForExtensionless = void 0;
+                var moduleFileName = void 0;
                 while (true) {
                     // If the module could be imported by a directory name, use that directory's name
                     var _c = tryDirectoryWithPackageJson(packageRootIndex), moduleFileToTry = _c.moduleFileToTry, packageRootPath = _c.packageRootPath, blockedByExports = _c.blockedByExports, verbatimFromExports = _c.verbatimFromExports;
@@ -122230,12 +122237,12 @@ var ts;
                         isPackageRootPath = true;
                         break;
                     }
-                    if (!moduleFileNameForExtensionless)
-                        moduleFileNameForExtensionless = moduleFileToTry;
+                    if (!moduleFileName)
+                        moduleFileName = moduleFileToTry;
                     // try with next level of directory
                     packageRootIndex = path.indexOf(ts.directorySeparator, packageRootIndex + 1);
                     if (packageRootIndex === -1) {
-                        moduleSpecifier = getExtensionlessFileName(moduleFileNameForExtensionless);
+                        moduleSpecifier = removeExtensionAndIndexPostFix(moduleFileName, preferences.ending, options, host);
                         break;
                     }
                 }
@@ -122293,7 +122300,7 @@ var ts;
                         }
                     }
                     // If the file is the main module, it can be imported by the package name
-                    var mainFileRelative = packageJsonContent.typings || packageJsonContent.types || packageJsonContent.main;
+                    var mainFileRelative = packageJsonContent.typings || packageJsonContent.types || packageJsonContent.main || "index.js";
                     if (ts.isString(mainFileRelative)) {
                         var mainExportFile = ts.toPath(mainFileRelative, packageRootPath, getCanonicalFileName);
                         if (ts.removeFileExtension(mainExportFile) === ts.removeFileExtension(getCanonicalFileName(moduleFileToTry))) {
@@ -122301,17 +122308,14 @@ var ts;
                         }
                     }
                 }
-                return { moduleFileToTry: moduleFileToTry };
-            }
-            function getExtensionlessFileName(path) {
-                // We still have a file name - remove the extension
-                var fullModulePathWithoutExtension = ts.removeFileExtension(path);
-                // If the file is /index, it can be imported by its directory name
-                // IFF there is not _also_ a file by the same name
-                if (getCanonicalFileName(fullModulePathWithoutExtension.substring(parts.fileNameIndex)) === "/index" && !tryGetAnyFileFromPath(host, fullModulePathWithoutExtension.substring(0, parts.fileNameIndex))) {
-                    return fullModulePathWithoutExtension.substring(0, parts.fileNameIndex);
+                else {
+                    // No package.json exists; an index.js will still resolve as the package name
+                    var fileName = getCanonicalFileName(moduleFileToTry.substring(parts.packageRootIndex + 1));
+                    if (fileName === "index.d.ts" || fileName === "index.js" || fileName === "index.ts" || fileName === "index.tsx") {
+                        return { moduleFileToTry: moduleFileToTry, packageRootPath: packageRootPath };
+                    }
                 }
-                return fullModulePathWithoutExtension;
+                return { moduleFileToTry: moduleFileToTry };
             }
         }
         function tryGetAnyFileFromPath(host, path) {
@@ -122333,7 +122337,7 @@ var ts;
                 return relativePath !== undefined && isPathRelativeToParent(relativePath) ? undefined : relativePath;
             });
         }
-        function removeExtensionAndIndexPostFix(fileName, ending, options) {
+        function removeExtensionAndIndexPostFix(fileName, ending, options, host) {
             if (ts.fileExtensionIsOneOf(fileName, [".json" /* Json */, ".mjs" /* Mjs */, ".cjs" /* Cjs */]))
                 return fileName;
             var noExtension = ts.removeFileExtension(fileName);
@@ -122341,7 +122345,13 @@ var ts;
                 return noExtension + getJSExtensionForFile(fileName, options);
             switch (ending) {
                 case 0 /* Minimal */:
-                    return ts.removeSuffix(noExtension, "/index");
+                    var withoutIndex = ts.removeSuffix(noExtension, "/index");
+                    if (host && withoutIndex !== noExtension && tryGetAnyFileFromPath(host, withoutIndex)) {
+                        // Can't remove index if there's a file by the same name as the directory.
+                        // Probably more callers should pass `host` so we can determine this?
+                        return noExtension;
+                    }
+                    return withoutIndex;
                 case 1 /* Index */:
                     return noExtension;
                 case 2 /* JsExtension */:

package/lib/tsserverlibrary.js

@@ -6960,7 +6960,12 @@ var ts;
                     (!relativeName ||
                         relativeName === lastDirectoryPart ||
                         (relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator) !== -1 && relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator) === relativeName.length - lastDirectoryPartWithDirectorySeparator.length))) {
-                    updateWatcher(!fileSystemEntryExists(fileOrDirectory, entryKind) ? watchMissingFileSystemEntry : watchPresentFileSystemEntry);
+                    if (inodeWatching) {
+                        updateWatcher(!fileSystemEntryExists(fileOrDirectory, entryKind) ? watchMissingFileSystemEntry : watchPresentFileSystemEntry);
+                    }
+                    else if (!fileSystemEntryExists(fileOrDirectory, entryKind)) {
+                        updateWatcher(watchMissingFileSystemEntry);
+                    }
                 }
             }
             /**
@@ -33041,6 +33046,7 @@ var ts;
                     var startPos = scanner.getStartPos();
                     var result = parseListElement(kind, parseElement);
                     if (!result) {
+                        parsingContext = saveParsingContext;
                         return undefined;
                     }
                     list.push(result);
@@ -121916,14 +121922,14 @@ var ts;
             if (options === void 0) { options = {}; }
             var info = getInfo(importingSourceFile.path, host);
             var modulePaths = getAllModulePaths(importingSourceFile.path, nodeModulesFileName, host, preferences, options);
-            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, /*packageNameOnly*/ true, options.overrideImportMode); });
+            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, preferences, /*packageNameOnly*/ true, options.overrideImportMode); });
         }
         moduleSpecifiers_1.getNodeModulesPackageName = getNodeModulesPackageName;
         function getModuleSpecifierWorker(compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, preferences, userPreferences, options) {
             if (options === void 0) { options = {}; }
             var info = getInfo(importingSourceFileName, host);
             var modulePaths = getAllModulePaths(importingSourceFileName, toFileName, host, userPreferences, options);
-            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, /*packageNameOnly*/ undefined, options.overrideImportMode); }) ||
+            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, userPreferences, /*packageNameOnly*/ undefined, options.overrideImportMode); }) ||
                 getLocalModuleSpecifier(toFileName, info, compilerOptions, host, preferences);
         }
         function tryGetModuleSpecifiersFromCache(moduleSymbol, importingSourceFile, host, userPreferences, options) {
@@ -121999,7 +122005,7 @@ var ts;
             var relativeSpecifiers;
             for (var _i = 0, modulePaths_1 = modulePaths; _i < modulePaths_1.length; _i++) {
                 var modulePath = modulePaths_1[_i];
-                var specifier = tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, /*packageNameOnly*/ undefined, options.overrideImportMode);
+                var specifier = tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, userPreferences, /*packageNameOnly*/ undefined, options.overrideImportMode);
                 nodeModulesSpecifiers = ts.append(nodeModulesSpecifiers, specifier);
                 if (specifier && modulePath.isRedirect) {
                     // If we got a specifier for a redirect, it was a bare package specifier (e.g. "@foo/bar",
@@ -122392,7 +122398,7 @@ var ts;
                 ? removeExtensionAndIndexPostFix(relativePath, ending, compilerOptions)
                 : ts.removeFileExtension(relativePath);
         }
-        function tryGetModuleNameAsNodeModule(_a, _b, importingSourceFile, host, options, packageNameOnly, overrideMode) {
+        function tryGetModuleNameAsNodeModule(_a, _b, importingSourceFile, host, options, userPreferences, packageNameOnly, overrideMode) {
             var path = _a.path, isRedirect = _a.isRedirect;
             var getCanonicalFileName = _b.getCanonicalFileName, sourceDirectory = _b.sourceDirectory;
             if (!host.fileExists || !host.readFile) {
@@ -122406,8 +122412,9 @@ var ts;
             var moduleSpecifier = path;
             var isPackageRootPath = false;
             if (!packageNameOnly) {
+                var preferences = getPreferences(host, userPreferences, options, importingSourceFile);
                 var packageRootIndex = parts.packageRootIndex;
-                var moduleFileNameForExtensionless = void 0;
+                var moduleFileName = void 0;
                 while (true) {
                     // If the module could be imported by a directory name, use that directory's name
                     var _c = tryDirectoryWithPackageJson(packageRootIndex), moduleFileToTry = _c.moduleFileToTry, packageRootPath = _c.packageRootPath, blockedByExports = _c.blockedByExports, verbatimFromExports = _c.verbatimFromExports;
@@ -122424,12 +122431,12 @@ var ts;
                         isPackageRootPath = true;
                         break;
                     }
-                    if (!moduleFileNameForExtensionless)
-                        moduleFileNameForExtensionless = moduleFileToTry;
+                    if (!moduleFileName)
+                        moduleFileName = moduleFileToTry;
                     // try with next level of directory
                     packageRootIndex = path.indexOf(ts.directorySeparator, packageRootIndex + 1);
                     if (packageRootIndex === -1) {
-                        moduleSpecifier = getExtensionlessFileName(moduleFileNameForExtensionless);
+                        moduleSpecifier = removeExtensionAndIndexPostFix(moduleFileName, preferences.ending, options, host);
                         break;
                     }
                 }
@@ -122487,7 +122494,7 @@ var ts;
                         }
                     }
                     // If the file is the main module, it can be imported by the package name
-                    var mainFileRelative = packageJsonContent.typings || packageJsonContent.types || packageJsonContent.main;
+                    var mainFileRelative = packageJsonContent.typings || packageJsonContent.types || packageJsonContent.main || "index.js";
                     if (ts.isString(mainFileRelative)) {
                         var mainExportFile = ts.toPath(mainFileRelative, packageRootPath, getCanonicalFileName);
                         if (ts.removeFileExtension(mainExportFile) === ts.removeFileExtension(getCanonicalFileName(moduleFileToTry))) {
@@ -122495,17 +122502,14 @@ var ts;
                         }
                     }
                 }
-                return { moduleFileToTry: moduleFileToTry };
-            }
-            function getExtensionlessFileName(path) {
-                // We still have a file name - remove the extension
-                var fullModulePathWithoutExtension = ts.removeFileExtension(path);
-                // If the file is /index, it can be imported by its directory name
-                // IFF there is not _also_ a file by the same name
-                if (getCanonicalFileName(fullModulePathWithoutExtension.substring(parts.fileNameIndex)) === "/index" && !tryGetAnyFileFromPath(host, fullModulePathWithoutExtension.substring(0, parts.fileNameIndex))) {
-                    return fullModulePathWithoutExtension.substring(0, parts.fileNameIndex);
+                else {
+                    // No package.json exists; an index.js will still resolve as the package name
+                    var fileName = getCanonicalFileName(moduleFileToTry.substring(parts.packageRootIndex + 1));
+                    if (fileName === "index.d.ts" || fileName === "index.js" || fileName === "index.ts" || fileName === "index.tsx") {
+                        return { moduleFileToTry: moduleFileToTry, packageRootPath: packageRootPath };
+                    }
                 }
-                return fullModulePathWithoutExtension;
+                return { moduleFileToTry: moduleFileToTry };
             }
         }
         function tryGetAnyFileFromPath(host, path) {
@@ -122527,7 +122531,7 @@ var ts;
                 return relativePath !== undefined && isPathRelativeToParent(relativePath) ? undefined : relativePath;
             });
         }
-        function removeExtensionAndIndexPostFix(fileName, ending, options) {
+        function removeExtensionAndIndexPostFix(fileName, ending, options, host) {
             if (ts.fileExtensionIsOneOf(fileName, [".json" /* Json */, ".mjs" /* Mjs */, ".cjs" /* Cjs */]))
                 return fileName;
             var noExtension = ts.removeFileExtension(fileName);
@@ -122535,7 +122539,13 @@ var ts;
                 return noExtension + getJSExtensionForFile(fileName, options);
             switch (ending) {
                 case 0 /* Minimal */:
-                    return ts.removeSuffix(noExtension, "/index");
+                    var withoutIndex = ts.removeSuffix(noExtension, "/index");
+                    if (host && withoutIndex !== noExtension && tryGetAnyFileFromPath(host, withoutIndex)) {
+                        // Can't remove index if there's a file by the same name as the directory.
+                        // Probably more callers should pass `host` so we can determine this?
+                        return noExtension;
+                    }
+                    return withoutIndex;
                 case 1 /* Index */:
                     return noExtension;
                 case 2 /* JsExtension */:

package/lib/typescript.js

@@ -6960,7 +6960,12 @@ var ts;
                     (!relativeName ||
                         relativeName === lastDirectoryPart ||
                         (relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator) !== -1 && relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator) === relativeName.length - lastDirectoryPartWithDirectorySeparator.length))) {
-                    updateWatcher(!fileSystemEntryExists(fileOrDirectory, entryKind) ? watchMissingFileSystemEntry : watchPresentFileSystemEntry);
+                    if (inodeWatching) {
+                        updateWatcher(!fileSystemEntryExists(fileOrDirectory, entryKind) ? watchMissingFileSystemEntry : watchPresentFileSystemEntry);
+                    }
+                    else if (!fileSystemEntryExists(fileOrDirectory, entryKind)) {
+                        updateWatcher(watchMissingFileSystemEntry);
+                    }
                 }
             }
             /**
@@ -33041,6 +33046,7 @@ var ts;
                     var startPos = scanner.getStartPos();
                     var result = parseListElement(kind, parseElement);
                     if (!result) {
+                        parsingContext = saveParsingContext;
                         return undefined;
                     }
                     list.push(result);
@@ -121916,14 +121922,14 @@ var ts;
             if (options === void 0) { options = {}; }
             var info = getInfo(importingSourceFile.path, host);
             var modulePaths = getAllModulePaths(importingSourceFile.path, nodeModulesFileName, host, preferences, options);
-            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, /*packageNameOnly*/ true, options.overrideImportMode); });
+            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, preferences, /*packageNameOnly*/ true, options.overrideImportMode); });
         }
         moduleSpecifiers_1.getNodeModulesPackageName = getNodeModulesPackageName;
         function getModuleSpecifierWorker(compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, preferences, userPreferences, options) {
             if (options === void 0) { options = {}; }
             var info = getInfo(importingSourceFileName, host);
             var modulePaths = getAllModulePaths(importingSourceFileName, toFileName, host, userPreferences, options);
-            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, /*packageNameOnly*/ undefined, options.overrideImportMode); }) ||
+            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, userPreferences, /*packageNameOnly*/ undefined, options.overrideImportMode); }) ||
                 getLocalModuleSpecifier(toFileName, info, compilerOptions, host, preferences);
         }
         function tryGetModuleSpecifiersFromCache(moduleSymbol, importingSourceFile, host, userPreferences, options) {
@@ -121999,7 +122005,7 @@ var ts;
             var relativeSpecifiers;
             for (var _i = 0, modulePaths_1 = modulePaths; _i < modulePaths_1.length; _i++) {
                 var modulePath = modulePaths_1[_i];
-                var specifier = tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, /*packageNameOnly*/ undefined, options.overrideImportMode);
+                var specifier = tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, userPreferences, /*packageNameOnly*/ undefined, options.overrideImportMode);
                 nodeModulesSpecifiers = ts.append(nodeModulesSpecifiers, specifier);
                 if (specifier && modulePath.isRedirect) {
                     // If we got a specifier for a redirect, it was a bare package specifier (e.g. "@foo/bar",
@@ -122392,7 +122398,7 @@ var ts;
                 ? removeExtensionAndIndexPostFix(relativePath, ending, compilerOptions)
                 : ts.removeFileExtension(relativePath);
         }
-        function tryGetModuleNameAsNodeModule(_a, _b, importingSourceFile, host, options, packageNameOnly, overrideMode) {
+        function tryGetModuleNameAsNodeModule(_a, _b, importingSourceFile, host, options, userPreferences, packageNameOnly, overrideMode) {
             var path = _a.path, isRedirect = _a.isRedirect;
             var getCanonicalFileName = _b.getCanonicalFileName, sourceDirectory = _b.sourceDirectory;
             if (!host.fileExists || !host.readFile) {
@@ -122406,8 +122412,9 @@ var ts;
             var moduleSpecifier = path;
             var isPackageRootPath = false;
             if (!packageNameOnly) {
+                var preferences = getPreferences(host, userPreferences, options, importingSourceFile);
                 var packageRootIndex = parts.packageRootIndex;
-                var moduleFileNameForExtensionless = void 0;
+                var moduleFileName = void 0;
                 while (true) {
                     // If the module could be imported by a directory name, use that directory's name
                     var _c = tryDirectoryWithPackageJson(packageRootIndex), moduleFileToTry = _c.moduleFileToTry, packageRootPath = _c.packageRootPath, blockedByExports = _c.blockedByExports, verbatimFromExports = _c.verbatimFromExports;
@@ -122424,12 +122431,12 @@ var ts;
                         isPackageRootPath = true;
                         break;
                     }
-                    if (!moduleFileNameForExtensionless)
-                        moduleFileNameForExtensionless = moduleFileToTry;
+                    if (!moduleFileName)
+                        moduleFileName = moduleFileToTry;
                     // try with next level of directory
                     packageRootIndex = path.indexOf(ts.directorySeparator, packageRootIndex + 1);
                     if (packageRootIndex === -1) {
-                        moduleSpecifier = getExtensionlessFileName(moduleFileNameForExtensionless);
+                        moduleSpecifier = removeExtensionAndIndexPostFix(moduleFileName, preferences.ending, options, host);
                         break;
                     }
                 }
@@ -122487,7 +122494,7 @@ var ts;
                         }
                     }
                     // If the file is the main module, it can be imported by the package name
-                    var mainFileRelative = packageJsonContent.typings || packageJsonContent.types || packageJsonContent.main;
+                    var mainFileRelative = packageJsonContent.typings || packageJsonContent.types || packageJsonContent.main || "index.js";
                     if (ts.isString(mainFileRelative)) {
                         var mainExportFile = ts.toPath(mainFileRelative, packageRootPath, getCanonicalFileName);
                         if (ts.removeFileExtension(mainExportFile) === ts.removeFileExtension(getCanonicalFileName(moduleFileToTry))) {
@@ -122495,17 +122502,14 @@ var ts;
                         }
                     }
                 }
-                return { moduleFileToTry: moduleFileToTry };
-            }
-            function getExtensionlessFileName(path) {
-                // We still have a file name - remove the extension
-                var fullModulePathWithoutExtension = ts.removeFileExtension(path);
-                // If the file is /index, it can be imported by its directory name
-                // IFF there is not _also_ a file by the same name
-                if (getCanonicalFileName(fullModulePathWithoutExtension.substring(parts.fileNameIndex)) === "/index" && !tryGetAnyFileFromPath(host, fullModulePathWithoutExtension.substring(0, parts.fileNameIndex))) {
-                    return fullModulePathWithoutExtension.substring(0, parts.fileNameIndex);
+                else {
+                    // No package.json exists; an index.js will still resolve as the package name
+                    var fileName = getCanonicalFileName(moduleFileToTry.substring(parts.packageRootIndex + 1));
+                    if (fileName === "index.d.ts" || fileName === "index.js" || fileName === "index.ts" || fileName === "index.tsx") {
+                        return { moduleFileToTry: moduleFileToTry, packageRootPath: packageRootPath };
+                    }
                 }
-                return fullModulePathWithoutExtension;
+                return { moduleFileToTry: moduleFileToTry };
             }
         }
         function tryGetAnyFileFromPath(host, path) {
@@ -122527,7 +122531,7 @@ var ts;
                 return relativePath !== undefined && isPathRelativeToParent(relativePath) ? undefined : relativePath;
             });
         }
-        function removeExtensionAndIndexPostFix(fileName, ending, options) {
+        function removeExtensionAndIndexPostFix(fileName, ending, options, host) {
             if (ts.fileExtensionIsOneOf(fileName, [".json" /* Json */, ".mjs" /* Mjs */, ".cjs" /* Cjs */]))
                 return fileName;
             var noExtension = ts.removeFileExtension(fileName);
@@ -122535,7 +122539,13 @@ var ts;
                 return noExtension + getJSExtensionForFile(fileName, options);
             switch (ending) {
                 case 0 /* Minimal */:
-                    return ts.removeSuffix(noExtension, "/index");
+                    var withoutIndex = ts.removeSuffix(noExtension, "/index");
+                    if (host && withoutIndex !== noExtension && tryGetAnyFileFromPath(host, withoutIndex)) {
+                        // Can't remove index if there's a file by the same name as the directory.
+                        // Probably more callers should pass `host` so we can determine this?
+                        return noExtension;
+                    }
+                    return withoutIndex;
                 case 1 /* Index */:
                     return noExtension;
                 case 2 /* JsExtension */:

package/lib/typescriptServices.js

@@ -6960,7 +6960,12 @@ var ts;
                     (!relativeName ||
                         relativeName === lastDirectoryPart ||
                         (relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator) !== -1 && relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator) === relativeName.length - lastDirectoryPartWithDirectorySeparator.length))) {
-                    updateWatcher(!fileSystemEntryExists(fileOrDirectory, entryKind) ? watchMissingFileSystemEntry : watchPresentFileSystemEntry);
+                    if (inodeWatching) {
+                        updateWatcher(!fileSystemEntryExists(fileOrDirectory, entryKind) ? watchMissingFileSystemEntry : watchPresentFileSystemEntry);
+                    }
+                    else if (!fileSystemEntryExists(fileOrDirectory, entryKind)) {
+                        updateWatcher(watchMissingFileSystemEntry);
+                    }
                 }
             }
             /**
@@ -33041,6 +33046,7 @@ var ts;
                     var startPos = scanner.getStartPos();
                     var result = parseListElement(kind, parseElement);
                     if (!result) {
+                        parsingContext = saveParsingContext;
                         return undefined;
                     }
                     list.push(result);
@@ -121916,14 +121922,14 @@ var ts;
             if (options === void 0) { options = {}; }
             var info = getInfo(importingSourceFile.path, host);
             var modulePaths = getAllModulePaths(importingSourceFile.path, nodeModulesFileName, host, preferences, options);
-            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, /*packageNameOnly*/ true, options.overrideImportMode); });
+            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, preferences, /*packageNameOnly*/ true, options.overrideImportMode); });
         }
         moduleSpecifiers_1.getNodeModulesPackageName = getNodeModulesPackageName;
         function getModuleSpecifierWorker(compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, preferences, userPreferences, options) {
             if (options === void 0) { options = {}; }
             var info = getInfo(importingSourceFileName, host);
             var modulePaths = getAllModulePaths(importingSourceFileName, toFileName, host, userPreferences, options);
-            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, /*packageNameOnly*/ undefined, options.overrideImportMode); }) ||
+            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, userPreferences, /*packageNameOnly*/ undefined, options.overrideImportMode); }) ||
                 getLocalModuleSpecifier(toFileName, info, compilerOptions, host, preferences);
         }
         function tryGetModuleSpecifiersFromCache(moduleSymbol, importingSourceFile, host, userPreferences, options) {
@@ -121999,7 +122005,7 @@ var ts;
             var relativeSpecifiers;
             for (var _i = 0, modulePaths_1 = modulePaths; _i < modulePaths_1.length; _i++) {
                 var modulePath = modulePaths_1[_i];
-                var specifier = tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, /*packageNameOnly*/ undefined, options.overrideImportMode);
+                var specifier = tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, userPreferences, /*packageNameOnly*/ undefined, options.overrideImportMode);
                 nodeModulesSpecifiers = ts.append(nodeModulesSpecifiers, specifier);
                 if (specifier && modulePath.isRedirect) {
                     // If we got a specifier for a redirect, it was a bare package specifier (e.g. "@foo/bar",
@@ -122392,7 +122398,7 @@ var ts;
                 ? removeExtensionAndIndexPostFix(relativePath, ending, compilerOptions)
                 : ts.removeFileExtension(relativePath);
         }
-        function tryGetModuleNameAsNodeModule(_a, _b, importingSourceFile, host, options, packageNameOnly, overrideMode) {
+        function tryGetModuleNameAsNodeModule(_a, _b, importingSourceFile, host, options, userPreferences, packageNameOnly, overrideMode) {
             var path = _a.path, isRedirect = _a.isRedirect;
             var getCanonicalFileName = _b.getCanonicalFileName, sourceDirectory = _b.sourceDirectory;
             if (!host.fileExists || !host.readFile) {
@@ -122406,8 +122412,9 @@ var ts;
             var moduleSpecifier = path;
             var isPackageRootPath = false;
             if (!packageNameOnly) {
+                var preferences = getPreferences(host, userPreferences, options, importingSourceFile);
                 var packageRootIndex = parts.packageRootIndex;
-                var moduleFileNameForExtensionless = void 0;
+                var moduleFileName = void 0;
                 while (true) {
                     // If the module could be imported by a directory name, use that directory's name
                     var _c = tryDirectoryWithPackageJson(packageRootIndex), moduleFileToTry = _c.moduleFileToTry, packageRootPath = _c.packageRootPath, blockedByExports = _c.blockedByExports, verbatimFromExports = _c.verbatimFromExports;
@@ -122424,12 +122431,12 @@ var ts;
                         isPackageRootPath = true;
                         break;
                     }
-                    if (!moduleFileNameForExtensionless)
-                        moduleFileNameForExtensionless = moduleFileToTry;
+                    if (!moduleFileName)
+                        moduleFileName = moduleFileToTry;
                     // try with next level of directory
                     packageRootIndex = path.indexOf(ts.directorySeparator, packageRootIndex + 1);
                     if (packageRootIndex === -1) {
-                        moduleSpecifier = getExtensionlessFileName(moduleFileNameForExtensionless);
+                        moduleSpecifier = removeExtensionAndIndexPostFix(moduleFileName, preferences.ending, options, host);
                         break;
                     }
                 }
@@ -122487,7 +122494,7 @@ var ts;
                         }
                     }
                     // If the file is the main module, it can be imported by the package name
-                    var mainFileRelative = packageJsonContent.typings || packageJsonContent.types || packageJsonContent.main;
+                    var mainFileRelative = packageJsonContent.typings || packageJsonContent.types || packageJsonContent.main || "index.js";
                     if (ts.isString(mainFileRelative)) {
                         var mainExportFile = ts.toPath(mainFileRelative, packageRootPath, getCanonicalFileName);
                         if (ts.removeFileExtension(mainExportFile) === ts.removeFileExtension(getCanonicalFileName(moduleFileToTry))) {
@@ -122495,17 +122502,14 @@ var ts;
                         }
                     }
                 }
-                return { moduleFileToTry: moduleFileToTry };
-            }
-            function getExtensionlessFileName(path) {
-                // We still have a file name - remove the extension
-                var fullModulePathWithoutExtension = ts.removeFileExtension(path);
-                // If the file is /index, it can be imported by its directory name
-                // IFF there is not _also_ a file by the same name
-                if (getCanonicalFileName(fullModulePathWithoutExtension.substring(parts.fileNameIndex)) === "/index" && !tryGetAnyFileFromPath(host, fullModulePathWithoutExtension.substring(0, parts.fileNameIndex))) {
-                    return fullModulePathWithoutExtension.substring(0, parts.fileNameIndex);
+                else {
+                    // No package.json exists; an index.js will still resolve as the package name
+                    var fileName = getCanonicalFileName(moduleFileToTry.substring(parts.packageRootIndex + 1));
+                    if (fileName === "index.d.ts" || fileName === "index.js" || fileName === "index.ts" || fileName === "index.tsx") {
+                        return { moduleFileToTry: moduleFileToTry, packageRootPath: packageRootPath };
+                    }
                 }
-                return fullModulePathWithoutExtension;
+                return { moduleFileToTry: moduleFileToTry };
             }
         }
         function tryGetAnyFileFromPath(host, path) {
@@ -122527,7 +122531,7 @@ var ts;
                 return relativePath !== undefined && isPathRelativeToParent(relativePath) ? undefined : relativePath;
             });
         }
-        function removeExtensionAndIndexPostFix(fileName, ending, options) {
+        function removeExtensionAndIndexPostFix(fileName, ending, options, host) {
             if (ts.fileExtensionIsOneOf(fileName, [".json" /* Json */, ".mjs" /* Mjs */, ".cjs" /* Cjs */]))
                 return fileName;
             var noExtension = ts.removeFileExtension(fileName);
@@ -122535,7 +122539,13 @@ var ts;
                 return noExtension + getJSExtensionForFile(fileName, options);
             switch (ending) {
                 case 0 /* Minimal */:
-                    return ts.removeSuffix(noExtension, "/index");
+                    var withoutIndex = ts.removeSuffix(noExtension, "/index");
+                    if (host && withoutIndex !== noExtension && tryGetAnyFileFromPath(host, withoutIndex)) {
+                        // Can't remove index if there's a file by the same name as the directory.
+                        // Probably more callers should pass `host` so we can determine this?
+                        return noExtension;
+                    }
+                    return withoutIndex;
                 case 1 /* Index */:
                     return noExtension;
                 case 2 /* JsExtension */:

package/lib/typingsInstaller.js

@@ -6755,7 +6755,12 @@ var ts;
                     (!relativeName ||
                         relativeName === lastDirectoryPart ||
                         (relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator) !== -1 && relativeName.lastIndexOf(lastDirectoryPartWithDirectorySeparator) === relativeName.length - lastDirectoryPartWithDirectorySeparator.length))) {
-                    updateWatcher(!fileSystemEntryExists(fileOrDirectory, entryKind) ? watchMissingFileSystemEntry : watchPresentFileSystemEntry);
+                    if (inodeWatching) {
+                        updateWatcher(!fileSystemEntryExists(fileOrDirectory, entryKind) ? watchMissingFileSystemEntry : watchPresentFileSystemEntry);
+                    }
+                    else if (!fileSystemEntryExists(fileOrDirectory, entryKind)) {
+                        updateWatcher(watchMissingFileSystemEntry);
+                    }
                 }
             }
             /**
@@ -32836,6 +32841,7 @@ var ts;
                     var startPos = scanner.getStartPos();
                     var result = parseListElement(kind, parseElement);
                     if (!result) {
+                        parsingContext = saveParsingContext;
                         return undefined;
                     }
                     list.push(result);
@@ -121711,14 +121717,14 @@ var ts;
             if (options === void 0) { options = {}; }
             var info = getInfo(importingSourceFile.path, host);
             var modulePaths = getAllModulePaths(importingSourceFile.path, nodeModulesFileName, host, preferences, options);
-            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, /*packageNameOnly*/ true, options.overrideImportMode); });
+            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, preferences, /*packageNameOnly*/ true, options.overrideImportMode); });
         }
         moduleSpecifiers_1.getNodeModulesPackageName = getNodeModulesPackageName;
         function getModuleSpecifierWorker(compilerOptions, importingSourceFile, importingSourceFileName, toFileName, host, preferences, userPreferences, options) {
             if (options === void 0) { options = {}; }
             var info = getInfo(importingSourceFileName, host);
             var modulePaths = getAllModulePaths(importingSourceFileName, toFileName, host, userPreferences, options);
-            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, /*packageNameOnly*/ undefined, options.overrideImportMode); }) ||
+            return ts.firstDefined(modulePaths, function (modulePath) { return tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, userPreferences, /*packageNameOnly*/ undefined, options.overrideImportMode); }) ||
                 getLocalModuleSpecifier(toFileName, info, compilerOptions, host, preferences);
         }
         function tryGetModuleSpecifiersFromCache(moduleSymbol, importingSourceFile, host, userPreferences, options) {
@@ -121794,7 +121800,7 @@ var ts;
             var relativeSpecifiers;
             for (var _i = 0, modulePaths_1 = modulePaths; _i < modulePaths_1.length; _i++) {
                 var modulePath = modulePaths_1[_i];
-                var specifier = tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, /*packageNameOnly*/ undefined, options.overrideImportMode);
+                var specifier = tryGetModuleNameAsNodeModule(modulePath, info, importingSourceFile, host, compilerOptions, userPreferences, /*packageNameOnly*/ undefined, options.overrideImportMode);
                 nodeModulesSpecifiers = ts.append(nodeModulesSpecifiers, specifier);
                 if (specifier && modulePath.isRedirect) {
                     // If we got a specifier for a redirect, it was a bare package specifier (e.g. "@foo/bar",
@@ -122187,7 +122193,7 @@ var ts;
                 ? removeExtensionAndIndexPostFix(relativePath, ending, compilerOptions)
                 : ts.removeFileExtension(relativePath);
         }
-        function tryGetModuleNameAsNodeModule(_a, _b, importingSourceFile, host, options, packageNameOnly, overrideMode) {
+        function tryGetModuleNameAsNodeModule(_a, _b, importingSourceFile, host, options, userPreferences, packageNameOnly, overrideMode) {
             var path = _a.path, isRedirect = _a.isRedirect;
             var getCanonicalFileName = _b.getCanonicalFileName, sourceDirectory = _b.sourceDirectory;
             if (!host.fileExists || !host.readFile) {
@@ -122201,8 +122207,9 @@ var ts;
             var moduleSpecifier = path;
             var isPackageRootPath = false;
             if (!packageNameOnly) {
+                var preferences = getPreferences(host, userPreferences, options, importingSourceFile);
                 var packageRootIndex = parts.packageRootIndex;
-                var moduleFileNameForExtensionless = void 0;
+                var moduleFileName = void 0;
                 while (true) {
                     // If the module could be imported by a directory name, use that directory's name
                     var _c = tryDirectoryWithPackageJson(packageRootIndex), moduleFileToTry = _c.moduleFileToTry, packageRootPath = _c.packageRootPath, blockedByExports = _c.blockedByExports, verbatimFromExports = _c.verbatimFromExports;
@@ -122219,12 +122226,12 @@ var ts;
                         isPackageRootPath = true;
                         break;
                     }
-                    if (!moduleFileNameForExtensionless)
-                        moduleFileNameForExtensionless = moduleFileToTry;
+                    if (!moduleFileName)
+                        moduleFileName = moduleFileToTry;
                     // try with next level of directory
                     packageRootIndex = path.indexOf(ts.directorySeparator, packageRootIndex + 1);
                     if (packageRootIndex === -1) {
-                        moduleSpecifier = getExtensionlessFileName(moduleFileNameForExtensionless);
+                        moduleSpecifier = removeExtensionAndIndexPostFix(moduleFileName, preferences.ending, options, host);
                         break;
                     }
                 }
@@ -122282,7 +122289,7 @@ var ts;
                         }
                     }
                     // If the file is the main module, it can be imported by the package name
-                    var mainFileRelative = packageJsonContent.typings || packageJsonContent.types || packageJsonContent.main;
+                    var mainFileRelative = packageJsonContent.typings || packageJsonContent.types || packageJsonContent.main || "index.js";
                     if (ts.isString(mainFileRelative)) {
                         var mainExportFile = ts.toPath(mainFileRelative, packageRootPath, getCanonicalFileName);
                         if (ts.removeFileExtension(mainExportFile) === ts.removeFileExtension(getCanonicalFileName(moduleFileToTry))) {
@@ -122290,17 +122297,14 @@ var ts;
                         }
                     }
                 }
-                return { moduleFileToTry: moduleFileToTry };
-            }
-            function getExtensionlessFileName(path) {
-                // We still have a file name - remove the extension
-                var fullModulePathWithoutExtension = ts.removeFileExtension(path);
-                // If the file is /index, it can be imported by its directory name
-                // IFF there is not _also_ a file by the same name
-                if (getCanonicalFileName(fullModulePathWithoutExtension.substring(parts.fileNameIndex)) === "/index" && !tryGetAnyFileFromPath(host, fullModulePathWithoutExtension.substring(0, parts.fileNameIndex))) {
-                    return fullModulePathWithoutExtension.substring(0, parts.fileNameIndex);
+                else {
+                    // No package.json exists; an index.js will still resolve as the package name
+                    var fileName = getCanonicalFileName(moduleFileToTry.substring(parts.packageRootIndex + 1));
+                    if (fileName === "index.d.ts" || fileName === "index.js" || fileName === "index.ts" || fileName === "index.tsx") {
+                        return { moduleFileToTry: moduleFileToTry, packageRootPath: packageRootPath };
+                    }
                 }
-                return fullModulePathWithoutExtension;
+                return { moduleFileToTry: moduleFileToTry };
             }
         }
         function tryGetAnyFileFromPath(host, path) {
@@ -122322,7 +122326,7 @@ var ts;
                 return relativePath !== undefined && isPathRelativeToParent(relativePath) ? undefined : relativePath;
             });
         }
-        function removeExtensionAndIndexPostFix(fileName, ending, options) {
+        function removeExtensionAndIndexPostFix(fileName, ending, options, host) {
             if (ts.fileExtensionIsOneOf(fileName, [".json" /* Json */, ".mjs" /* Mjs */, ".cjs" /* Cjs */]))
                 return fileName;
             var noExtension = ts.removeFileExtension(fileName);
@@ -122330,7 +122334,13 @@ var ts;
                 return noExtension + getJSExtensionForFile(fileName, options);
             switch (ending) {
                 case 0 /* Minimal */:
-                    return ts.removeSuffix(noExtension, "/index");
+                    var withoutIndex = ts.removeSuffix(noExtension, "/index");
+                    if (host && withoutIndex !== noExtension && tryGetAnyFileFromPath(host, withoutIndex)) {
+                        // Can't remove index if there's a file by the same name as the directory.
+                        // Probably more callers should pass `host` so we can determine this?
+                        return noExtension;
+                    }
+                    return withoutIndex;
                 case 1 /* Index */:
                     return noExtension;
                 case 2 /* JsExtension */:

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "4.7.0-pr-48997-3",
+  "version": "4.7.0-pr-48997-6",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [