@typescript-deploys/pr-build 5.4.0-pr-55015-10 → 5.4.0-pr-55774-37

package/lib/tsc.js

@@ -4521,6 +4521,7 @@ function createSystemWatchFunctions({
   useNonPollingWatchers,
   tscWatchDirectory,
   inodeWatching,
+  fsWatchWithTimestamp,
   sysLog: sysLog2
 }) {
   const pollingWatches = /* @__PURE__ */ new Map();
@@ -4759,7 +4760,7 @@ function createSystemWatchFunctions({
         return watchPresentFileSystemEntryWithFsWatchFile();
       }
       try {
-        const presentWatcher = fsWatchWorker(
+        const presentWatcher = (!fsWatchWithTimestamp ? fsWatchWorker : fsWatchWorkerHandlingTimestamp)(
           fileOrDirectory,
           recursive,
           inodeWatching ? callbackChangingToMissingFileSystemEntry : callback
@@ -4822,6 +4823,18 @@ function createSystemWatchFunctions({
       );
     }
   }
+  function fsWatchWorkerHandlingTimestamp(fileOrDirectory, recursive, callback) {
+    let modifiedTime = getModifiedTime3(fileOrDirectory) || missingFileModifiedTime;
+    return fsWatchWorker(fileOrDirectory, recursive, (eventName, relativeFileName, currentModifiedTime) => {
+      if (eventName === "change") {
+        currentModifiedTime || (currentModifiedTime = getModifiedTime3(fileOrDirectory) || missingFileModifiedTime);
+        if (currentModifiedTime.getTime() === modifiedTime.getTime())
+          return;
+      }
+      modifiedTime = currentModifiedTime || getModifiedTime3(fileOrDirectory) || missingFileModifiedTime;
+      callback(eventName, relativeFileName, modifiedTime);
+    });
+  }
 }
 function patchWriteFileEnsuringDirectory(sys2) {
   const originalWriteFile = sys2.writeFile;
@@ -4850,12 +4863,13 @@ var sys = (() => {
     let activeSession;
     let profilePath = "./profile.cpuprofile";
     const Buffer = require("buffer").Buffer;
-    const isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
+    const isMacOs = process.platform === "darwin";
+    const isLinuxOrMacOs = process.platform === "linux" || isMacOs;
     const platform = _os.platform();
     const useCaseSensitiveFileNames2 = isFileSystemCaseSensitive();
     const fsRealpath = !!_fs.realpathSync.native ? process.platform === "win32" ? fsRealPathHandlingLongPath : _fs.realpathSync.native : _fs.realpathSync;
     const executingFilePath = __filename.endsWith("sys.js") ? _path.join(_path.dirname(__dirname), "__fake__.js") : __filename;
-    const fsSupportsRecursiveFsWatch = process.platform === "win32" || process.platform === "darwin";
+    const fsSupportsRecursiveFsWatch = process.platform === "win32" || isMacOs;
     const getCurrentDirectory = memoize(() => process.cwd());
     const { watchFile: watchFile2, watchDirectory } = createSystemWatchFunctions({
       pollingWatchFileWorker: fsWatchFileWorker,
@@ -4875,6 +4889,7 @@ var sys = (() => {
       useNonPollingWatchers: !!process.env.TSC_NONPOLLING_WATCHER,
       tscWatchDirectory: process.env.TSC_WATCHDIRECTORY,
       inodeWatching: isLinuxOrMacOs,
+      fsWatchWithTimestamp: isMacOs,
       sysLog
     });
     const nodeSystem = {
@@ -16448,22 +16463,6 @@ function getResolvePackageJsonExports(compilerOptions) {
   }
   return false;
 }
-function getResolvePackageJsonImports(compilerOptions) {
-  const moduleResolution = getEmitModuleResolutionKind(compilerOptions);
-  if (!moduleResolutionSupportsPackageJsonExportsAndImports(moduleResolution)) {
-    return false;
-  }
-  if (compilerOptions.resolvePackageJsonExports !== void 0) {
-    return compilerOptions.resolvePackageJsonExports;
-  }
-  switch (moduleResolution) {
-    case 3 /* Node16 */:
-    case 99 /* NodeNext */:
-    case 100 /* Bundler */:
-      return true;
-  }
-  return false;
-}
 function getResolveJsonModule(compilerOptions) {
   if (compilerOptions.resolveJsonModule !== void 0) {
     return compilerOptions.resolveJsonModule;
@@ -42377,13 +42376,6 @@ function createGetSymbolWalker(getRestTypeOfSignature, getTypePredicateOfSignatu
 }
 
 // src/compiler/moduleSpecifiers.ts
-function safeJsonRead(packageJsonPath, readFile) {
-  try {
-    return JSON.parse(readFile(packageJsonPath));
-  } catch {
-    return {};
-  }
-}
 function getPreferences({ importModuleSpecifierPreference, importModuleSpecifierEnding }, compilerOptions, importingSourceFile, oldImportSpecifier) {
   const preferredEnding = getPreferredEnding();
   return {
@@ -42576,7 +42568,7 @@ function getLocalModuleSpecifier(moduleFileName, info, compilerOptions, host, im
   const { sourceDirectory, getCanonicalFileName } = info;
   const allowedEndings = getAllowedEndingsInPrefererredOrder(importMode);
   const relativePath = rootDirs && tryGetModuleNameFromRootDirs(rootDirs, moduleFileName, sourceDirectory, getCanonicalFileName, allowedEndings, compilerOptions) || processEnding(ensurePathIsNonModuleName(getRelativePathFromDirectory(sourceDirectory, moduleFileName, getCanonicalFileName)), allowedEndings, compilerOptions);
-  if (!baseUrl && !paths && !getResolvePackageJsonImports(compilerOptions) || relativePreference === 0 /* Relative */) {
+  if (!baseUrl && !paths || relativePreference === 0 /* Relative */) {
     return pathsOnly ? void 0 : relativePath;
   }
   const baseDirectory = getNormalizedAbsolutePath(getPathsBasePath(compilerOptions, host) || baseUrl, host.getCurrentDirectory());
@@ -42584,12 +42576,11 @@ function getLocalModuleSpecifier(moduleFileName, info, compilerOptions, host, im
   if (!relativeToBaseUrl) {
     return pathsOnly ? void 0 : relativePath;
   }
-  const fromPackageJsonImports = pathsOnly ? void 0 : tryGetModuleNameFromPackageJsonImports(moduleFileName, sourceDirectory, compilerOptions, host, importMode);
-  const fromPaths = pathsOnly || fromPackageJsonImports === void 0 ? paths && tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, host, compilerOptions) : void 0;
+  const fromPaths = paths && tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, host, compilerOptions);
   if (pathsOnly) {
     return fromPaths;
   }
-  const maybeNonRelative = fromPackageJsonImports ?? (fromPaths === void 0 && baseUrl !== void 0 ? processEnding(relativeToBaseUrl, allowedEndings, compilerOptions) : fromPaths);
+  const maybeNonRelative = fromPaths === void 0 && baseUrl !== void 0 ? processEnding(relativeToBaseUrl, allowedEndings, compilerOptions) : fromPaths;
   if (!maybeNonRelative) {
     return relativePath;
   }
@@ -42628,8 +42619,8 @@ function getNearestAncestorDirectoryWithPackageJson(host, fileName) {
   if (host.getNearestAncestorDirectoryWithPackageJson) {
     return host.getNearestAncestorDirectoryWithPackageJson(fileName);
   }
-  return forEachAncestorDirectory(fileName, (directory) => {
-    return host.fileExists(combinePaths(directory, "package.json")) ? directory : void 0;
+  return !!forEachAncestorDirectory(fileName, (directory) => {
+    return host.fileExists(combinePaths(directory, "package.json")) ? true : void 0;
   });
 }
 function forEachFileNameOfModule(importingFileName, importedFileName, host, preferSymlinks, cb) {
@@ -42800,40 +42791,8 @@ function tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, hos
     return ending !== 0 /* Minimal */ || value === processEnding(relativeToBaseUrl, [ending], compilerOptions, host);
   }
 }
-function getOutputPath(targetFilePath, options, commonSourceDirectory) {
-  return changeExtension(
-    options.outDir ? resolvePath(
-      options.outDir,
-      getRelativePathFromDirectory(
-        commonSourceDirectory,
-        targetFilePath,
-        /*ignoreCase*/
-        false
-      )
-    ) : targetFilePath,
-    getOutputExtension(targetFilePath, options)
-  );
-}
-function getOutputDeclarationPath(targetFilePath, options, commonSourceDirectory) {
-  const declarationDir = options.declarationDir || options.outDir;
-  return changeExtension(
-    declarationDir ? resolvePath(
-      declarationDir,
-      getRelativePathFromDirectory(
-        commonSourceDirectory,
-        targetFilePath,
-        /*ignoreCase*/
-        false
-      )
-    ) : targetFilePath,
-    getDeclarationEmitExtensionForPath(targetFilePath)
-  );
-}
-function tryGetModuleNameFromExportsOrImports(options, host, targetFilePath, packageDirectory, packageName, exports, conditions, mode, isImports) {
+function tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, exports, conditions, mode = 0 /* Exact */) {
   if (typeof exports === "string") {
-    const commonSourceDirectory = host.getCommonSourceDirectory();
-    const outputFile = isImports && getOutputPath(targetFilePath, options, commonSourceDirectory);
-    const declarationFile = isImports && getOutputDeclarationPath(targetFilePath, options, commonSourceDirectory);
     const pathOrPattern = getNormalizedAbsolutePath(
       combinePaths(packageDirectory, exports),
       /*currentDirectory*/
@@ -42842,24 +42801,11 @@ function tryGetModuleNameFromExportsOrImports(options, host, targetFilePath, pac
     const extensionSwappedTarget = hasTSFileExtension(targetFilePath) ? removeFileExtension(targetFilePath) + tryGetJSExtensionForFile(targetFilePath, options) : void 0;
     switch (mode) {
       case 0 /* Exact */:
-        if (extensionSwappedTarget && comparePaths(extensionSwappedTarget, pathOrPattern) === 0 /* EqualTo */ || comparePaths(targetFilePath, pathOrPattern) === 0 /* EqualTo */ || outputFile && comparePaths(outputFile, pathOrPattern) === 0 /* EqualTo */ || declarationFile && comparePaths(declarationFile, pathOrPattern) === 0 /* EqualTo */) {
+        if (comparePaths(targetFilePath, pathOrPattern) === 0 /* EqualTo */ || extensionSwappedTarget && comparePaths(extensionSwappedTarget, pathOrPattern) === 0 /* EqualTo */) {
           return { moduleFileToTry: packageName };
         }
         break;
       case 1 /* Directory */:
-        if (extensionSwappedTarget && containsPath(pathOrPattern, extensionSwappedTarget)) {
-          const fragment = getRelativePathFromDirectory(
-            pathOrPattern,
-            extensionSwappedTarget,
-            /*ignoreCase*/
-            false
-          );
-          return { moduleFileToTry: getNormalizedAbsolutePath(
-            combinePaths(combinePaths(packageName, exports), fragment),
-            /*currentDirectory*/
-            void 0
-          ) };
-        }
         if (containsPath(pathOrPattern, targetFilePath)) {
           const fragment = getRelativePathFromDirectory(
             pathOrPattern,
@@ -42873,136 +42819,48 @@ function tryGetModuleNameFromExportsOrImports(options, host, targetFilePath, pac
             void 0
           ) };
         }
-        if (outputFile && containsPath(pathOrPattern, outputFile)) {
-          const fragment = getRelativePathFromDirectory(
-            pathOrPattern,
-            outputFile,
-            /*ignoreCase*/
-            false
-          );
-          return { moduleFileToTry: combinePaths(packageName, fragment) };
-        }
-        if (declarationFile && containsPath(pathOrPattern, declarationFile)) {
-          const fragment = getRelativePathFromDirectory(
-            pathOrPattern,
-            declarationFile,
-            /*ignoreCase*/
-            false
-          );
-          return { moduleFileToTry: combinePaths(packageName, fragment) };
-        }
         break;
       case 2 /* Pattern */:
         const starPos = pathOrPattern.indexOf("*");
         const leadingSlice = pathOrPattern.slice(0, starPos);
         const trailingSlice = pathOrPattern.slice(starPos + 1);
-        if (extensionSwappedTarget && startsWith(extensionSwappedTarget, leadingSlice) && endsWith(extensionSwappedTarget, trailingSlice)) {
-          const starReplacement = extensionSwappedTarget.slice(leadingSlice.length, extensionSwappedTarget.length - trailingSlice.length);
-          return { moduleFileToTry: packageName.replace("*", starReplacement) };
-        }
         if (startsWith(targetFilePath, leadingSlice) && endsWith(targetFilePath, trailingSlice)) {
           const starReplacement = targetFilePath.slice(leadingSlice.length, targetFilePath.length - trailingSlice.length);
           return { moduleFileToTry: packageName.replace("*", starReplacement) };
         }
-        if (outputFile && startsWith(outputFile, leadingSlice) && endsWith(outputFile, trailingSlice)) {
-          const starReplacement = outputFile.slice(leadingSlice.length, outputFile.length - trailingSlice.length);
-          return { moduleFileToTry: packageName.replace("*", starReplacement) };
-        }
-        if (declarationFile && startsWith(declarationFile, leadingSlice) && endsWith(declarationFile, trailingSlice)) {
-          const starReplacement = declarationFile.slice(leadingSlice.length, declarationFile.length - trailingSlice.length);
+        if (extensionSwappedTarget && startsWith(extensionSwappedTarget, leadingSlice) && endsWith(extensionSwappedTarget, trailingSlice)) {
+          const starReplacement = extensionSwappedTarget.slice(leadingSlice.length, extensionSwappedTarget.length - trailingSlice.length);
           return { moduleFileToTry: packageName.replace("*", starReplacement) };
         }
         break;
     }
   } else if (Array.isArray(exports)) {
-    return forEach(exports, (e) => tryGetModuleNameFromExportsOrImports(options, host, targetFilePath, packageDirectory, packageName, e, conditions, mode, isImports));
+    return forEach(exports, (e) => tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, e, conditions));
   } else if (typeof exports === "object" && exports !== null) {
-    for (const key of getOwnKeys(exports)) {
-      if (key === "default" || conditions.indexOf(key) >= 0 || isApplicableVersionedTypesKey(conditions, key)) {
-        const subTarget = exports[key];
-        const result = tryGetModuleNameFromExportsOrImports(options, host, targetFilePath, packageDirectory, packageName, subTarget, conditions, mode, isImports);
-        if (result) {
-          return result;
+    if (allKeysStartWithDot(exports)) {
+      return forEach(getOwnKeys(exports), (k) => {
+        const subPackageName = getNormalizedAbsolutePath(
+          combinePaths(packageName, k),
+          /*currentDirectory*/
+          void 0
+        );
+        const mode2 = endsWith(k, "/") ? 1 /* Directory */ : k.includes("*") ? 2 /* Pattern */ : 0 /* Exact */;
+        return tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, subPackageName, exports[k], conditions, mode2);
+      });
+    } else {
+      for (const key of getOwnKeys(exports)) {
+        if (key === "default" || conditions.includes(key) || isApplicableVersionedTypesKey(conditions, key)) {
+          const subTarget = exports[key];
+          const result = tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, subTarget, conditions, mode);
+          if (result) {
+            return result;
+          }
         }
       }
     }
   }
   return void 0;
 }
-function tryGetModuleNameFromExports(options, host, targetFilePath, packageDirectory, packageName, exports, conditions) {
-  if (typeof exports === "object" && exports !== null && !Array.isArray(exports) && allKeysStartWithDot(exports)) {
-    return forEach(getOwnKeys(exports), (k) => {
-      const subPackageName = getNormalizedAbsolutePath(
-        combinePaths(packageName, k),
-        /*currentDirectory*/
-        void 0
-      );
-      const mode = endsWith(k, "/") ? 1 /* Directory */ : k.includes("*") ? 2 /* Pattern */ : 0 /* Exact */;
-      return tryGetModuleNameFromExportsOrImports(
-        options,
-        host,
-        targetFilePath,
-        packageDirectory,
-        subPackageName,
-        exports[k],
-        conditions,
-        mode,
-        /*isImports*/
-        false
-      );
-    });
-  }
-  return tryGetModuleNameFromExportsOrImports(
-    options,
-    host,
-    targetFilePath,
-    packageDirectory,
-    packageName,
-    exports,
-    conditions,
-    0 /* Exact */,
-    /*isImports*/
-    false
-  );
-}
-function tryGetModuleNameFromPackageJsonImports(moduleFileName, sourceDirectory, options, host, importMode) {
-  var _a, _b, _c;
-  if (!host.readFile || !getResolvePackageJsonImports(options)) {
-    return void 0;
-  }
-  const ancestorDirectoryWithPackageJson = getNearestAncestorDirectoryWithPackageJson(host, sourceDirectory);
-  if (!ancestorDirectoryWithPackageJson) {
-    return void 0;
-  }
-  const packageJsonPath = combinePaths(ancestorDirectoryWithPackageJson, "package.json");
-  const cachedPackageJson = (_b = (_a = host.getPackageJsonInfoCache) == null ? void 0 : _a.call(host)) == null ? void 0 : _b.getPackageJsonInfo(packageJsonPath);
-  if (typeof cachedPackageJson !== "object" && cachedPackageJson !== void 0 || !host.fileExists(packageJsonPath)) {
-    return void 0;
-  }
-  const packageJsonContent = (cachedPackageJson == null ? void 0 : cachedPackageJson.contents.packageJsonContent) || safeJsonRead(packageJsonPath, host.readFile);
-  const imports = packageJsonContent == null ? void 0 : packageJsonContent.imports;
-  if (!imports) {
-    return void 0;
-  }
-  const conditions = getConditions(options, importMode);
-  return (_c = forEach(getOwnKeys(imports), (k) => {
-    if (!startsWith(k, "#") || k === "#" || startsWith(k, "#/"))
-      return void 0;
-    const mode = endsWith(k, "/") ? 1 /* Directory */ : k.includes("*") ? 2 /* Pattern */ : 0 /* Exact */;
-    return tryGetModuleNameFromExportsOrImports(
-      options,
-      host,
-      moduleFileName,
-      ancestorDirectoryWithPackageJson,
-      k,
-      imports[k],
-      conditions,
-      mode,
-      /*isImports*/
-      true
-    );
-  })) == null ? void 0 : _c.moduleFileToTry;
-}
 function tryGetModuleNameFromRootDirs(rootDirs, moduleFileName, sourceDirectory, getCanonicalFileName, allowedEndings, compilerOptions) {
   const normalizedTargetPaths = getPathsRelativeToRootDirs(moduleFileName, rootDirs, getCanonicalFileName);
   if (normalizedTargetPaths === void 0) {
@@ -43076,15 +42934,16 @@ function tryGetModuleNameAsNodeModule({ path, isRedirect }, { getCanonicalFileNa
     let maybeBlockedByTypesVersions = false;
     const cachedPackageJson = (_b = (_a = host.getPackageJsonInfoCache) == null ? void 0 : _a.call(host)) == null ? void 0 : _b.getPackageJsonInfo(packageJsonPath);
     if (typeof cachedPackageJson === "object" || cachedPackageJson === void 0 && host.fileExists(packageJsonPath)) {
-      const packageJsonContent = (cachedPackageJson == null ? void 0 : cachedPackageJson.contents.packageJsonContent) || safeJsonRead(packageJsonPath, host.readFile);
+      const packageJsonContent = (cachedPackageJson == null ? void 0 : cachedPackageJson.contents.packageJsonContent) || JSON.parse(host.readFile(packageJsonPath));
       const importMode = overrideMode || importingSourceFile.impliedNodeFormat;
       if (getResolvePackageJsonExports(options)) {
         const nodeModulesDirectoryName2 = packageRootPath.substring(parts.topLevelPackageNameIndex + 1);
         const packageName2 = getPackageNameFromTypesPackageName(nodeModulesDirectoryName2);
         const conditions = getConditions(options, importMode);
-        const fromExports = packageJsonContent.exports ? tryGetModuleNameFromExports(options, host, path, packageRootPath, packageName2, packageJsonContent.exports, conditions) : void 0;
+        const fromExports = packageJsonContent.exports ? tryGetModuleNameFromExports(options, path, packageRootPath, packageName2, packageJsonContent.exports, conditions) : void 0;
         if (fromExports) {
-          return { ...fromExports, verbatimFromExports: true };
+          const withJsExtension = !hasTSFileExtension(fromExports.moduleFileToTry) ? fromExports : { moduleFileToTry: removeFileExtension(fromExports.moduleFileToTry) + tryGetJSExtensionForFile(fromExports.moduleFileToTry, options) };
+          return { ...withJsExtension, verbatimFromExports: true };
         }
         if (packageJsonContent.exports) {
           return { moduleFileToTry: path, blockedByExports: true };
@@ -54379,6 +54238,14 @@ function createTypeChecker(host) {
     return getCheckFlags(s) & 4096 /* Late */;
   }
   function forEachMappedTypePropertyKeyTypeAndIndexSignatureKeyType(type, include, stringsOnly, cb) {
+    if (isTupleType(type)) {
+      forEachType(getUnionType(getElementTypes(type).map((_, i) => getStringLiteralType("" + i))), cb);
+      return;
+    }
+    if (isArrayType(type)) {
+      cb(numberType);
+      return;
+    }
     for (const prop of getPropertiesOfType(type)) {
       cb(getLiteralTypeFromProperty(prop, include));
     }
@@ -56215,7 +56082,7 @@ function createTypeChecker(host) {
         if (constraint) {
           constraints = append(constraints, constraint);
         }
-      } else if (type.flags & 262144 /* TypeParameter */ && parent.kind === 200 /* MappedType */ && node === parent.type) {
+      } else if (type.flags & 262144 /* TypeParameter */ && parent.kind === 200 /* MappedType */ && (node === parent.type || node === parent.nameType)) {
         const mappedType = getTypeFromTypeNode(parent);
         if (getTypeParameterFromMappedType(mappedType) === getActualTypeVariable(type)) {
           const typeParameter = getHomomorphicTypeVariable(mappedType);

package/lib/tsserver.js

@@ -8041,6 +8041,7 @@ function createSystemWatchFunctions({
   useNonPollingWatchers,
   tscWatchDirectory,
   inodeWatching,
+  fsWatchWithTimestamp,
   sysLog: sysLog2
 }) {
   const pollingWatches = /* @__PURE__ */ new Map();
@@ -8279,7 +8280,7 @@ function createSystemWatchFunctions({
         return watchPresentFileSystemEntryWithFsWatchFile();
       }
       try {
-        const presentWatcher = fsWatchWorker(
+        const presentWatcher = (!fsWatchWithTimestamp ? fsWatchWorker : fsWatchWorkerHandlingTimestamp)(
           fileOrDirectory,
           recursive,
           inodeWatching ? callbackChangingToMissingFileSystemEntry : callback
@@ -8342,6 +8343,18 @@ function createSystemWatchFunctions({
       );
     }
   }
+  function fsWatchWorkerHandlingTimestamp(fileOrDirectory, recursive, callback) {
+    let modifiedTime = getModifiedTime3(fileOrDirectory) || missingFileModifiedTime;
+    return fsWatchWorker(fileOrDirectory, recursive, (eventName, relativeFileName, currentModifiedTime) => {
+      if (eventName === "change") {
+        currentModifiedTime || (currentModifiedTime = getModifiedTime3(fileOrDirectory) || missingFileModifiedTime);
+        if (currentModifiedTime.getTime() === modifiedTime.getTime())
+          return;
+      }
+      modifiedTime = currentModifiedTime || getModifiedTime3(fileOrDirectory) || missingFileModifiedTime;
+      callback(eventName, relativeFileName, modifiedTime);
+    });
+  }
 }
 function patchWriteFileEnsuringDirectory(sys2) {
   const originalWriteFile = sys2.writeFile;
@@ -8370,12 +8383,13 @@ var sys = (() => {
     let activeSession;
     let profilePath = "./profile.cpuprofile";
     const Buffer2 = require("buffer").Buffer;
-    const isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
+    const isMacOs = process.platform === "darwin";
+    const isLinuxOrMacOs = process.platform === "linux" || isMacOs;
     const platform = _os.platform();
     const useCaseSensitiveFileNames2 = isFileSystemCaseSensitive();
     const fsRealpath = !!_fs.realpathSync.native ? process.platform === "win32" ? fsRealPathHandlingLongPath : _fs.realpathSync.native : _fs.realpathSync;
     const executingFilePath = __filename.endsWith("sys.js") ? _path.join(_path.dirname(__dirname), "__fake__.js") : __filename;
-    const fsSupportsRecursiveFsWatch = process.platform === "win32" || process.platform === "darwin";
+    const fsSupportsRecursiveFsWatch = process.platform === "win32" || isMacOs;
     const getCurrentDirectory = memoize(() => process.cwd());
     const { watchFile: watchFile2, watchDirectory } = createSystemWatchFunctions({
       pollingWatchFileWorker: fsWatchFileWorker,
@@ -8395,6 +8409,7 @@ var sys = (() => {
       useNonPollingWatchers: !!process.env.TSC_NONPOLLING_WATCHER,
       tscWatchDirectory: process.env.TSC_WATCHDIRECTORY,
       inodeWatching: isLinuxOrMacOs,
+      fsWatchWithTimestamp: isMacOs,
       sysLog
     });
     const nodeSystem = {
@@ -47039,13 +47054,6 @@ __export(ts_moduleSpecifiers_exports, {
 });
 
 // src/compiler/moduleSpecifiers.ts
-function safeJsonRead(packageJsonPath, readFile) {
-  try {
-    return JSON.parse(readFile(packageJsonPath));
-  } catch {
-    return {};
-  }
-}
 function getPreferences({ importModuleSpecifierPreference, importModuleSpecifierEnding }, compilerOptions, importingSourceFile, oldImportSpecifier) {
   const preferredEnding = getPreferredEnding();
   return {
@@ -47268,7 +47276,7 @@ function getLocalModuleSpecifier(moduleFileName, info, compilerOptions, host, im
   const { sourceDirectory, getCanonicalFileName } = info;
   const allowedEndings = getAllowedEndingsInPrefererredOrder(importMode);
   const relativePath = rootDirs && tryGetModuleNameFromRootDirs(rootDirs, moduleFileName, sourceDirectory, getCanonicalFileName, allowedEndings, compilerOptions) || processEnding(ensurePathIsNonModuleName(getRelativePathFromDirectory(sourceDirectory, moduleFileName, getCanonicalFileName)), allowedEndings, compilerOptions);
-  if (!baseUrl && !paths && !getResolvePackageJsonImports(compilerOptions) || relativePreference === 0 /* Relative */) {
+  if (!baseUrl && !paths || relativePreference === 0 /* Relative */) {
     return pathsOnly ? void 0 : relativePath;
   }
   const baseDirectory = getNormalizedAbsolutePath(getPathsBasePath(compilerOptions, host) || baseUrl, host.getCurrentDirectory());
@@ -47276,12 +47284,11 @@ function getLocalModuleSpecifier(moduleFileName, info, compilerOptions, host, im
   if (!relativeToBaseUrl) {
     return pathsOnly ? void 0 : relativePath;
   }
-  const fromPackageJsonImports = pathsOnly ? void 0 : tryGetModuleNameFromPackageJsonImports(moduleFileName, sourceDirectory, compilerOptions, host, importMode);
-  const fromPaths = pathsOnly || fromPackageJsonImports === void 0 ? paths && tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, host, compilerOptions) : void 0;
+  const fromPaths = paths && tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, host, compilerOptions);
   if (pathsOnly) {
     return fromPaths;
   }
-  const maybeNonRelative = fromPackageJsonImports ?? (fromPaths === void 0 && baseUrl !== void 0 ? processEnding(relativeToBaseUrl, allowedEndings, compilerOptions) : fromPaths);
+  const maybeNonRelative = fromPaths === void 0 && baseUrl !== void 0 ? processEnding(relativeToBaseUrl, allowedEndings, compilerOptions) : fromPaths;
   if (!maybeNonRelative) {
     return relativePath;
   }
@@ -47320,8 +47327,8 @@ function getNearestAncestorDirectoryWithPackageJson(host, fileName) {
   if (host.getNearestAncestorDirectoryWithPackageJson) {
     return host.getNearestAncestorDirectoryWithPackageJson(fileName);
   }
-  return forEachAncestorDirectory(fileName, (directory) => {
-    return host.fileExists(combinePaths(directory, "package.json")) ? directory : void 0;
+  return !!forEachAncestorDirectory(fileName, (directory) => {
+    return host.fileExists(combinePaths(directory, "package.json")) ? true : void 0;
   });
 }
 function forEachFileNameOfModule(importingFileName, importedFileName, host, preferSymlinks, cb) {
@@ -47492,40 +47499,8 @@ function tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, hos
     return ending !== 0 /* Minimal */ || value === processEnding(relativeToBaseUrl, [ending], compilerOptions, host);
   }
 }
-function getOutputPath(targetFilePath, options, commonSourceDirectory) {
-  return changeExtension(
-    options.outDir ? resolvePath(
-      options.outDir,
-      getRelativePathFromDirectory(
-        commonSourceDirectory,
-        targetFilePath,
-        /*ignoreCase*/
-        false
-      )
-    ) : targetFilePath,
-    getOutputExtension(targetFilePath, options)
-  );
-}
-function getOutputDeclarationPath(targetFilePath, options, commonSourceDirectory) {
-  const declarationDir = options.declarationDir || options.outDir;
-  return changeExtension(
-    declarationDir ? resolvePath(
-      declarationDir,
-      getRelativePathFromDirectory(
-        commonSourceDirectory,
-        targetFilePath,
-        /*ignoreCase*/
-        false
-      )
-    ) : targetFilePath,
-    getDeclarationEmitExtensionForPath(targetFilePath)
-  );
-}
-function tryGetModuleNameFromExportsOrImports(options, host, targetFilePath, packageDirectory, packageName, exports, conditions, mode, isImports) {
+function tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, exports, conditions, mode = 0 /* Exact */) {
   if (typeof exports === "string") {
-    const commonSourceDirectory = host.getCommonSourceDirectory();
-    const outputFile = isImports && getOutputPath(targetFilePath, options, commonSourceDirectory);
-    const declarationFile = isImports && getOutputDeclarationPath(targetFilePath, options, commonSourceDirectory);
     const pathOrPattern = getNormalizedAbsolutePath(
       combinePaths(packageDirectory, exports),
       /*currentDirectory*/
@@ -47534,24 +47509,11 @@ function tryGetModuleNameFromExportsOrImports(options, host, targetFilePath, pac
     const extensionSwappedTarget = hasTSFileExtension(targetFilePath) ? removeFileExtension(targetFilePath) + tryGetJSExtensionForFile(targetFilePath, options) : void 0;
     switch (mode) {
       case 0 /* Exact */:
-        if (extensionSwappedTarget && comparePaths(extensionSwappedTarget, pathOrPattern) === 0 /* EqualTo */ || comparePaths(targetFilePath, pathOrPattern) === 0 /* EqualTo */ || outputFile && comparePaths(outputFile, pathOrPattern) === 0 /* EqualTo */ || declarationFile && comparePaths(declarationFile, pathOrPattern) === 0 /* EqualTo */) {
+        if (comparePaths(targetFilePath, pathOrPattern) === 0 /* EqualTo */ || extensionSwappedTarget && comparePaths(extensionSwappedTarget, pathOrPattern) === 0 /* EqualTo */) {
           return { moduleFileToTry: packageName };
         }
         break;
       case 1 /* Directory */:
-        if (extensionSwappedTarget && containsPath(pathOrPattern, extensionSwappedTarget)) {
-          const fragment = getRelativePathFromDirectory(
-            pathOrPattern,
-            extensionSwappedTarget,
-            /*ignoreCase*/
-            false
-          );
-          return { moduleFileToTry: getNormalizedAbsolutePath(
-            combinePaths(combinePaths(packageName, exports), fragment),
-            /*currentDirectory*/
-            void 0
-          ) };
-        }
         if (containsPath(pathOrPattern, targetFilePath)) {
           const fragment = getRelativePathFromDirectory(
             pathOrPattern,
@@ -47565,136 +47527,48 @@ function tryGetModuleNameFromExportsOrImports(options, host, targetFilePath, pac
             void 0
           ) };
         }
-        if (outputFile && containsPath(pathOrPattern, outputFile)) {
-          const fragment = getRelativePathFromDirectory(
-            pathOrPattern,
-            outputFile,
-            /*ignoreCase*/
-            false
-          );
-          return { moduleFileToTry: combinePaths(packageName, fragment) };
-        }
-        if (declarationFile && containsPath(pathOrPattern, declarationFile)) {
-          const fragment = getRelativePathFromDirectory(
-            pathOrPattern,
-            declarationFile,
-            /*ignoreCase*/
-            false
-          );
-          return { moduleFileToTry: combinePaths(packageName, fragment) };
-        }
         break;
       case 2 /* Pattern */:
         const starPos = pathOrPattern.indexOf("*");
         const leadingSlice = pathOrPattern.slice(0, starPos);
         const trailingSlice = pathOrPattern.slice(starPos + 1);
-        if (extensionSwappedTarget && startsWith(extensionSwappedTarget, leadingSlice) && endsWith(extensionSwappedTarget, trailingSlice)) {
-          const starReplacement = extensionSwappedTarget.slice(leadingSlice.length, extensionSwappedTarget.length - trailingSlice.length);
-          return { moduleFileToTry: packageName.replace("*", starReplacement) };
-        }
         if (startsWith(targetFilePath, leadingSlice) && endsWith(targetFilePath, trailingSlice)) {
           const starReplacement = targetFilePath.slice(leadingSlice.length, targetFilePath.length - trailingSlice.length);
           return { moduleFileToTry: packageName.replace("*", starReplacement) };
         }
-        if (outputFile && startsWith(outputFile, leadingSlice) && endsWith(outputFile, trailingSlice)) {
-          const starReplacement = outputFile.slice(leadingSlice.length, outputFile.length - trailingSlice.length);
-          return { moduleFileToTry: packageName.replace("*", starReplacement) };
-        }
-        if (declarationFile && startsWith(declarationFile, leadingSlice) && endsWith(declarationFile, trailingSlice)) {
-          const starReplacement = declarationFile.slice(leadingSlice.length, declarationFile.length - trailingSlice.length);
+        if (extensionSwappedTarget && startsWith(extensionSwappedTarget, leadingSlice) && endsWith(extensionSwappedTarget, trailingSlice)) {
+          const starReplacement = extensionSwappedTarget.slice(leadingSlice.length, extensionSwappedTarget.length - trailingSlice.length);
           return { moduleFileToTry: packageName.replace("*", starReplacement) };
         }
         break;
     }
   } else if (Array.isArray(exports)) {
-    return forEach(exports, (e) => tryGetModuleNameFromExportsOrImports(options, host, targetFilePath, packageDirectory, packageName, e, conditions, mode, isImports));
+    return forEach(exports, (e) => tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, e, conditions));
   } else if (typeof exports === "object" && exports !== null) {
-    for (const key of getOwnKeys(exports)) {
-      if (key === "default" || conditions.indexOf(key) >= 0 || isApplicableVersionedTypesKey(conditions, key)) {
-        const subTarget = exports[key];
-        const result = tryGetModuleNameFromExportsOrImports(options, host, targetFilePath, packageDirectory, packageName, subTarget, conditions, mode, isImports);
-        if (result) {
-          return result;
+    if (allKeysStartWithDot(exports)) {
+      return forEach(getOwnKeys(exports), (k) => {
+        const subPackageName = getNormalizedAbsolutePath(
+          combinePaths(packageName, k),
+          /*currentDirectory*/
+          void 0
+        );
+        const mode2 = endsWith(k, "/") ? 1 /* Directory */ : k.includes("*") ? 2 /* Pattern */ : 0 /* Exact */;
+        return tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, subPackageName, exports[k], conditions, mode2);
+      });
+    } else {
+      for (const key of getOwnKeys(exports)) {
+        if (key === "default" || conditions.includes(key) || isApplicableVersionedTypesKey(conditions, key)) {
+          const subTarget = exports[key];
+          const result = tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, subTarget, conditions, mode);
+          if (result) {
+            return result;
+          }
         }
       }
     }
   }
   return void 0;
 }
-function tryGetModuleNameFromExports(options, host, targetFilePath, packageDirectory, packageName, exports, conditions) {
-  if (typeof exports === "object" && exports !== null && !Array.isArray(exports) && allKeysStartWithDot(exports)) {
-    return forEach(getOwnKeys(exports), (k) => {
-      const subPackageName = getNormalizedAbsolutePath(
-        combinePaths(packageName, k),
-        /*currentDirectory*/
-        void 0
-      );
-      const mode = endsWith(k, "/") ? 1 /* Directory */ : k.includes("*") ? 2 /* Pattern */ : 0 /* Exact */;
-      return tryGetModuleNameFromExportsOrImports(
-        options,
-        host,
-        targetFilePath,
-        packageDirectory,
-        subPackageName,
-        exports[k],
-        conditions,
-        mode,
-        /*isImports*/
-        false
-      );
-    });
-  }
-  return tryGetModuleNameFromExportsOrImports(
-    options,
-    host,
-    targetFilePath,
-    packageDirectory,
-    packageName,
-    exports,
-    conditions,
-    0 /* Exact */,
-    /*isImports*/
-    false
-  );
-}
-function tryGetModuleNameFromPackageJsonImports(moduleFileName, sourceDirectory, options, host, importMode) {
-  var _a, _b, _c;
-  if (!host.readFile || !getResolvePackageJsonImports(options)) {
-    return void 0;
-  }
-  const ancestorDirectoryWithPackageJson = getNearestAncestorDirectoryWithPackageJson(host, sourceDirectory);
-  if (!ancestorDirectoryWithPackageJson) {
-    return void 0;
-  }
-  const packageJsonPath = combinePaths(ancestorDirectoryWithPackageJson, "package.json");
-  const cachedPackageJson = (_b = (_a = host.getPackageJsonInfoCache) == null ? void 0 : _a.call(host)) == null ? void 0 : _b.getPackageJsonInfo(packageJsonPath);
-  if (typeof cachedPackageJson !== "object" && cachedPackageJson !== void 0 || !host.fileExists(packageJsonPath)) {
-    return void 0;
-  }
-  const packageJsonContent = (cachedPackageJson == null ? void 0 : cachedPackageJson.contents.packageJsonContent) || safeJsonRead(packageJsonPath, host.readFile);
-  const imports = packageJsonContent == null ? void 0 : packageJsonContent.imports;
-  if (!imports) {
-    return void 0;
-  }
-  const conditions = getConditions(options, importMode);
-  return (_c = forEach(getOwnKeys(imports), (k) => {
-    if (!startsWith(k, "#") || k === "#" || startsWith(k, "#/"))
-      return void 0;
-    const mode = endsWith(k, "/") ? 1 /* Directory */ : k.includes("*") ? 2 /* Pattern */ : 0 /* Exact */;
-    return tryGetModuleNameFromExportsOrImports(
-      options,
-      host,
-      moduleFileName,
-      ancestorDirectoryWithPackageJson,
-      k,
-      imports[k],
-      conditions,
-      mode,
-      /*isImports*/
-      true
-    );
-  })) == null ? void 0 : _c.moduleFileToTry;
-}
 function tryGetModuleNameFromRootDirs(rootDirs, moduleFileName, sourceDirectory, getCanonicalFileName, allowedEndings, compilerOptions) {
   const normalizedTargetPaths = getPathsRelativeToRootDirs(moduleFileName, rootDirs, getCanonicalFileName);
   if (normalizedTargetPaths === void 0) {
@@ -47768,15 +47642,16 @@ function tryGetModuleNameAsNodeModule({ path, isRedirect }, { getCanonicalFileNa
     let maybeBlockedByTypesVersions = false;
     const cachedPackageJson = (_b = (_a = host.getPackageJsonInfoCache) == null ? void 0 : _a.call(host)) == null ? void 0 : _b.getPackageJsonInfo(packageJsonPath);
     if (typeof cachedPackageJson === "object" || cachedPackageJson === void 0 && host.fileExists(packageJsonPath)) {
-      const packageJsonContent = (cachedPackageJson == null ? void 0 : cachedPackageJson.contents.packageJsonContent) || safeJsonRead(packageJsonPath, host.readFile);
+      const packageJsonContent = (cachedPackageJson == null ? void 0 : cachedPackageJson.contents.packageJsonContent) || JSON.parse(host.readFile(packageJsonPath));
       const importMode = overrideMode || importingSourceFile.impliedNodeFormat;
       if (getResolvePackageJsonExports(options)) {
         const nodeModulesDirectoryName2 = packageRootPath.substring(parts.topLevelPackageNameIndex + 1);
         const packageName2 = getPackageNameFromTypesPackageName(nodeModulesDirectoryName2);
         const conditions = getConditions(options, importMode);
-        const fromExports = packageJsonContent.exports ? tryGetModuleNameFromExports(options, host, path, packageRootPath, packageName2, packageJsonContent.exports, conditions) : void 0;
+        const fromExports = packageJsonContent.exports ? tryGetModuleNameFromExports(options, path, packageRootPath, packageName2, packageJsonContent.exports, conditions) : void 0;
         if (fromExports) {
-          return { ...fromExports, verbatimFromExports: true };
+          const withJsExtension = !hasTSFileExtension(fromExports.moduleFileToTry) ? fromExports : { moduleFileToTry: removeFileExtension(fromExports.moduleFileToTry) + tryGetJSExtensionForFile(fromExports.moduleFileToTry, options) };
+          return { ...withJsExtension, verbatimFromExports: true };
         }
         if (packageJsonContent.exports) {
           return { moduleFileToTry: path, blockedByExports: true };
@@ -59071,6 +58946,14 @@ function createTypeChecker(host) {
     return getCheckFlags(s) & 4096 /* Late */;
   }
   function forEachMappedTypePropertyKeyTypeAndIndexSignatureKeyType(type, include, stringsOnly, cb) {
+    if (isTupleType(type)) {
+      forEachType(getUnionType(getElementTypes(type).map((_, i) => getStringLiteralType("" + i))), cb);
+      return;
+    }
+    if (isArrayType(type)) {
+      cb(numberType);
+      return;
+    }
     for (const prop of getPropertiesOfType(type)) {
       cb(getLiteralTypeFromProperty(prop, include));
     }
@@ -60907,7 +60790,7 @@ function createTypeChecker(host) {
         if (constraint) {
           constraints = append(constraints, constraint);
         }
-      } else if (type.flags & 262144 /* TypeParameter */ && parent2.kind === 200 /* MappedType */ && node === parent2.type) {
+      } else if (type.flags & 262144 /* TypeParameter */ && parent2.kind === 200 /* MappedType */ && (node === parent2.type || node === parent2.nameType)) {
         const mappedType = getTypeFromTypeNode(parent2);
         if (getTypeParameterFromMappedType(mappedType) === getActualTypeVariable(type)) {
           const typeParameter = getHomomorphicTypeVariable(mappedType);
@@ -133150,8 +133033,7 @@ function createModuleSpecifierResolutionHost(program, host) {
     getProjectReferenceRedirect: (fileName) => program.getProjectReferenceRedirect(fileName),
     isSourceOfProjectReferenceRedirect: (fileName) => program.isSourceOfProjectReferenceRedirect(fileName),
     getNearestAncestorDirectoryWithPackageJson: maybeBind(host, host.getNearestAncestorDirectoryWithPackageJson),
-    getFileIncludeReasons: () => program.getFileIncludeReasons(),
-    getCommonSourceDirectory: () => program.getCommonSourceDirectory()
+    getFileIncludeReasons: () => program.getFileIncludeReasons()
   };
 }
 function getModuleSpecifierResolverHost(program, host) {

package/lib/typescript.js

@@ -5779,6 +5779,7 @@ ${lanes.join("\n")}
     useNonPollingWatchers,
     tscWatchDirectory,
     inodeWatching,
+    fsWatchWithTimestamp,
     sysLog: sysLog2
   }) {
     const pollingWatches = /* @__PURE__ */ new Map();
@@ -6017,7 +6018,7 @@ ${lanes.join("\n")}
           return watchPresentFileSystemEntryWithFsWatchFile();
         }
         try {
-          const presentWatcher = fsWatchWorker(
+          const presentWatcher = (!fsWatchWithTimestamp ? fsWatchWorker : fsWatchWorkerHandlingTimestamp)(
             fileOrDirectory,
             recursive,
             inodeWatching ? callbackChangingToMissingFileSystemEntry : callback
@@ -6080,6 +6081,18 @@ ${lanes.join("\n")}
         );
       }
     }
+    function fsWatchWorkerHandlingTimestamp(fileOrDirectory, recursive, callback) {
+      let modifiedTime = getModifiedTime3(fileOrDirectory) || missingFileModifiedTime;
+      return fsWatchWorker(fileOrDirectory, recursive, (eventName, relativeFileName, currentModifiedTime) => {
+        if (eventName === "change") {
+          currentModifiedTime || (currentModifiedTime = getModifiedTime3(fileOrDirectory) || missingFileModifiedTime);
+          if (currentModifiedTime.getTime() === modifiedTime.getTime())
+            return;
+        }
+        modifiedTime = currentModifiedTime || getModifiedTime3(fileOrDirectory) || missingFileModifiedTime;
+        callback(eventName, relativeFileName, modifiedTime);
+      });
+    }
   }
   function patchWriteFileEnsuringDirectory(sys2) {
     const originalWriteFile = sys2.writeFile;
@@ -6139,12 +6152,13 @@ ${lanes.join("\n")}
           let activeSession;
           let profilePath = "./profile.cpuprofile";
           const Buffer2 = require("buffer").Buffer;
-          const isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
+          const isMacOs = process.platform === "darwin";
+          const isLinuxOrMacOs = process.platform === "linux" || isMacOs;
           const platform = _os.platform();
           const useCaseSensitiveFileNames2 = isFileSystemCaseSensitive();
           const fsRealpath = !!_fs.realpathSync.native ? process.platform === "win32" ? fsRealPathHandlingLongPath : _fs.realpathSync.native : _fs.realpathSync;
           const executingFilePath = __filename.endsWith("sys.js") ? _path.join(_path.dirname(__dirname), "__fake__.js") : __filename;
-          const fsSupportsRecursiveFsWatch = process.platform === "win32" || process.platform === "darwin";
+          const fsSupportsRecursiveFsWatch = process.platform === "win32" || isMacOs;
           const getCurrentDirectory = memoize(() => process.cwd());
           const { watchFile: watchFile2, watchDirectory } = createSystemWatchFunctions({
             pollingWatchFileWorker: fsWatchFileWorker,
@@ -6164,6 +6178,7 @@ ${lanes.join("\n")}
             useNonPollingWatchers: !!process.env.TSC_NONPOLLING_WATCHER,
             tscWatchDirectory: process.env.TSC_WATCHDIRECTORY,
             inodeWatching: isLinuxOrMacOs,
+            fsWatchWithTimestamp: isMacOs,
             sysLog
           });
           const nodeSystem = {
@@ -44902,13 +44917,6 @@ ${lanes.join("\n")}
   });
 
   // src/compiler/moduleSpecifiers.ts
-  function safeJsonRead(packageJsonPath, readFile) {
-    try {
-      return JSON.parse(readFile(packageJsonPath));
-    } catch {
-      return {};
-    }
-  }
   function getPreferences({ importModuleSpecifierPreference, importModuleSpecifierEnding }, compilerOptions, importingSourceFile, oldImportSpecifier) {
     const preferredEnding = getPreferredEnding();
     return {
@@ -45131,7 +45139,7 @@ ${lanes.join("\n")}
     const { sourceDirectory, getCanonicalFileName } = info;
     const allowedEndings = getAllowedEndingsInPrefererredOrder(importMode);
     const relativePath = rootDirs && tryGetModuleNameFromRootDirs(rootDirs, moduleFileName, sourceDirectory, getCanonicalFileName, allowedEndings, compilerOptions) || processEnding(ensurePathIsNonModuleName(getRelativePathFromDirectory(sourceDirectory, moduleFileName, getCanonicalFileName)), allowedEndings, compilerOptions);
-    if (!baseUrl && !paths && !getResolvePackageJsonImports(compilerOptions) || relativePreference === 0 /* Relative */) {
+    if (!baseUrl && !paths || relativePreference === 0 /* Relative */) {
       return pathsOnly ? void 0 : relativePath;
     }
     const baseDirectory = getNormalizedAbsolutePath(getPathsBasePath(compilerOptions, host) || baseUrl, host.getCurrentDirectory());
@@ -45139,12 +45147,11 @@ ${lanes.join("\n")}
     if (!relativeToBaseUrl) {
       return pathsOnly ? void 0 : relativePath;
     }
-    const fromPackageJsonImports = pathsOnly ? void 0 : tryGetModuleNameFromPackageJsonImports(moduleFileName, sourceDirectory, compilerOptions, host, importMode);
-    const fromPaths = pathsOnly || fromPackageJsonImports === void 0 ? paths && tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, host, compilerOptions) : void 0;
+    const fromPaths = paths && tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, host, compilerOptions);
     if (pathsOnly) {
       return fromPaths;
     }
-    const maybeNonRelative = fromPackageJsonImports ?? (fromPaths === void 0 && baseUrl !== void 0 ? processEnding(relativeToBaseUrl, allowedEndings, compilerOptions) : fromPaths);
+    const maybeNonRelative = fromPaths === void 0 && baseUrl !== void 0 ? processEnding(relativeToBaseUrl, allowedEndings, compilerOptions) : fromPaths;
     if (!maybeNonRelative) {
       return relativePath;
     }
@@ -45183,8 +45190,8 @@ ${lanes.join("\n")}
     if (host.getNearestAncestorDirectoryWithPackageJson) {
       return host.getNearestAncestorDirectoryWithPackageJson(fileName);
     }
-    return forEachAncestorDirectory(fileName, (directory) => {
-      return host.fileExists(combinePaths(directory, "package.json")) ? directory : void 0;
+    return !!forEachAncestorDirectory(fileName, (directory) => {
+      return host.fileExists(combinePaths(directory, "package.json")) ? true : void 0;
     });
   }
   function forEachFileNameOfModule(importingFileName, importedFileName, host, preferSymlinks, cb) {
@@ -45355,40 +45362,8 @@ ${lanes.join("\n")}
       return ending !== 0 /* Minimal */ || value === processEnding(relativeToBaseUrl, [ending], compilerOptions, host);
     }
   }
-  function getOutputPath(targetFilePath, options, commonSourceDirectory) {
-    return changeExtension(
-      options.outDir ? resolvePath(
-        options.outDir,
-        getRelativePathFromDirectory(
-          commonSourceDirectory,
-          targetFilePath,
-          /*ignoreCase*/
-          false
-        )
-      ) : targetFilePath,
-      getOutputExtension(targetFilePath, options)
-    );
-  }
-  function getOutputDeclarationPath(targetFilePath, options, commonSourceDirectory) {
-    const declarationDir = options.declarationDir || options.outDir;
-    return changeExtension(
-      declarationDir ? resolvePath(
-        declarationDir,
-        getRelativePathFromDirectory(
-          commonSourceDirectory,
-          targetFilePath,
-          /*ignoreCase*/
-          false
-        )
-      ) : targetFilePath,
-      getDeclarationEmitExtensionForPath(targetFilePath)
-    );
-  }
-  function tryGetModuleNameFromExportsOrImports(options, host, targetFilePath, packageDirectory, packageName, exports, conditions, mode, isImports) {
+  function tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, exports, conditions, mode = 0 /* Exact */) {
     if (typeof exports === "string") {
-      const commonSourceDirectory = host.getCommonSourceDirectory();
-      const outputFile = isImports && getOutputPath(targetFilePath, options, commonSourceDirectory);
-      const declarationFile = isImports && getOutputDeclarationPath(targetFilePath, options, commonSourceDirectory);
       const pathOrPattern = getNormalizedAbsolutePath(
         combinePaths(packageDirectory, exports),
         /*currentDirectory*/
@@ -45397,24 +45372,11 @@ ${lanes.join("\n")}
       const extensionSwappedTarget = hasTSFileExtension(targetFilePath) ? removeFileExtension(targetFilePath) + tryGetJSExtensionForFile(targetFilePath, options) : void 0;
       switch (mode) {
         case 0 /* Exact */:
-          if (extensionSwappedTarget && comparePaths(extensionSwappedTarget, pathOrPattern) === 0 /* EqualTo */ || comparePaths(targetFilePath, pathOrPattern) === 0 /* EqualTo */ || outputFile && comparePaths(outputFile, pathOrPattern) === 0 /* EqualTo */ || declarationFile && comparePaths(declarationFile, pathOrPattern) === 0 /* EqualTo */) {
+          if (comparePaths(targetFilePath, pathOrPattern) === 0 /* EqualTo */ || extensionSwappedTarget && comparePaths(extensionSwappedTarget, pathOrPattern) === 0 /* EqualTo */) {
             return { moduleFileToTry: packageName };
           }
           break;
         case 1 /* Directory */:
-          if (extensionSwappedTarget && containsPath(pathOrPattern, extensionSwappedTarget)) {
-            const fragment = getRelativePathFromDirectory(
-              pathOrPattern,
-              extensionSwappedTarget,
-              /*ignoreCase*/
-              false
-            );
-            return { moduleFileToTry: getNormalizedAbsolutePath(
-              combinePaths(combinePaths(packageName, exports), fragment),
-              /*currentDirectory*/
-              void 0
-            ) };
-          }
           if (containsPath(pathOrPattern, targetFilePath)) {
             const fragment = getRelativePathFromDirectory(
               pathOrPattern,
@@ -45428,136 +45390,48 @@ ${lanes.join("\n")}
               void 0
             ) };
           }
-          if (outputFile && containsPath(pathOrPattern, outputFile)) {
-            const fragment = getRelativePathFromDirectory(
-              pathOrPattern,
-              outputFile,
-              /*ignoreCase*/
-              false
-            );
-            return { moduleFileToTry: combinePaths(packageName, fragment) };
-          }
-          if (declarationFile && containsPath(pathOrPattern, declarationFile)) {
-            const fragment = getRelativePathFromDirectory(
-              pathOrPattern,
-              declarationFile,
-              /*ignoreCase*/
-              false
-            );
-            return { moduleFileToTry: combinePaths(packageName, fragment) };
-          }
           break;
         case 2 /* Pattern */:
           const starPos = pathOrPattern.indexOf("*");
           const leadingSlice = pathOrPattern.slice(0, starPos);
           const trailingSlice = pathOrPattern.slice(starPos + 1);
-          if (extensionSwappedTarget && startsWith(extensionSwappedTarget, leadingSlice) && endsWith(extensionSwappedTarget, trailingSlice)) {
-            const starReplacement = extensionSwappedTarget.slice(leadingSlice.length, extensionSwappedTarget.length - trailingSlice.length);
-            return { moduleFileToTry: packageName.replace("*", starReplacement) };
-          }
           if (startsWith(targetFilePath, leadingSlice) && endsWith(targetFilePath, trailingSlice)) {
             const starReplacement = targetFilePath.slice(leadingSlice.length, targetFilePath.length - trailingSlice.length);
             return { moduleFileToTry: packageName.replace("*", starReplacement) };
           }
-          if (outputFile && startsWith(outputFile, leadingSlice) && endsWith(outputFile, trailingSlice)) {
-            const starReplacement = outputFile.slice(leadingSlice.length, outputFile.length - trailingSlice.length);
-            return { moduleFileToTry: packageName.replace("*", starReplacement) };
-          }
-          if (declarationFile && startsWith(declarationFile, leadingSlice) && endsWith(declarationFile, trailingSlice)) {
-            const starReplacement = declarationFile.slice(leadingSlice.length, declarationFile.length - trailingSlice.length);
+          if (extensionSwappedTarget && startsWith(extensionSwappedTarget, leadingSlice) && endsWith(extensionSwappedTarget, trailingSlice)) {
+            const starReplacement = extensionSwappedTarget.slice(leadingSlice.length, extensionSwappedTarget.length - trailingSlice.length);
             return { moduleFileToTry: packageName.replace("*", starReplacement) };
           }
           break;
       }
     } else if (Array.isArray(exports)) {
-      return forEach(exports, (e) => tryGetModuleNameFromExportsOrImports(options, host, targetFilePath, packageDirectory, packageName, e, conditions, mode, isImports));
+      return forEach(exports, (e) => tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, e, conditions));
     } else if (typeof exports === "object" && exports !== null) {
-      for (const key of getOwnKeys(exports)) {
-        if (key === "default" || conditions.indexOf(key) >= 0 || isApplicableVersionedTypesKey(conditions, key)) {
-          const subTarget = exports[key];
-          const result = tryGetModuleNameFromExportsOrImports(options, host, targetFilePath, packageDirectory, packageName, subTarget, conditions, mode, isImports);
-          if (result) {
-            return result;
+      if (allKeysStartWithDot(exports)) {
+        return forEach(getOwnKeys(exports), (k) => {
+          const subPackageName = getNormalizedAbsolutePath(
+            combinePaths(packageName, k),
+            /*currentDirectory*/
+            void 0
+          );
+          const mode2 = endsWith(k, "/") ? 1 /* Directory */ : k.includes("*") ? 2 /* Pattern */ : 0 /* Exact */;
+          return tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, subPackageName, exports[k], conditions, mode2);
+        });
+      } else {
+        for (const key of getOwnKeys(exports)) {
+          if (key === "default" || conditions.includes(key) || isApplicableVersionedTypesKey(conditions, key)) {
+            const subTarget = exports[key];
+            const result = tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, subTarget, conditions, mode);
+            if (result) {
+              return result;
+            }
           }
         }
       }
     }
     return void 0;
   }
-  function tryGetModuleNameFromExports(options, host, targetFilePath, packageDirectory, packageName, exports, conditions) {
-    if (typeof exports === "object" && exports !== null && !Array.isArray(exports) && allKeysStartWithDot(exports)) {
-      return forEach(getOwnKeys(exports), (k) => {
-        const subPackageName = getNormalizedAbsolutePath(
-          combinePaths(packageName, k),
-          /*currentDirectory*/
-          void 0
-        );
-        const mode = endsWith(k, "/") ? 1 /* Directory */ : k.includes("*") ? 2 /* Pattern */ : 0 /* Exact */;
-        return tryGetModuleNameFromExportsOrImports(
-          options,
-          host,
-          targetFilePath,
-          packageDirectory,
-          subPackageName,
-          exports[k],
-          conditions,
-          mode,
-          /*isImports*/
-          false
-        );
-      });
-    }
-    return tryGetModuleNameFromExportsOrImports(
-      options,
-      host,
-      targetFilePath,
-      packageDirectory,
-      packageName,
-      exports,
-      conditions,
-      0 /* Exact */,
-      /*isImports*/
-      false
-    );
-  }
-  function tryGetModuleNameFromPackageJsonImports(moduleFileName, sourceDirectory, options, host, importMode) {
-    var _a, _b, _c;
-    if (!host.readFile || !getResolvePackageJsonImports(options)) {
-      return void 0;
-    }
-    const ancestorDirectoryWithPackageJson = getNearestAncestorDirectoryWithPackageJson(host, sourceDirectory);
-    if (!ancestorDirectoryWithPackageJson) {
-      return void 0;
-    }
-    const packageJsonPath = combinePaths(ancestorDirectoryWithPackageJson, "package.json");
-    const cachedPackageJson = (_b = (_a = host.getPackageJsonInfoCache) == null ? void 0 : _a.call(host)) == null ? void 0 : _b.getPackageJsonInfo(packageJsonPath);
-    if (typeof cachedPackageJson !== "object" && cachedPackageJson !== void 0 || !host.fileExists(packageJsonPath)) {
-      return void 0;
-    }
-    const packageJsonContent = (cachedPackageJson == null ? void 0 : cachedPackageJson.contents.packageJsonContent) || safeJsonRead(packageJsonPath, host.readFile);
-    const imports = packageJsonContent == null ? void 0 : packageJsonContent.imports;
-    if (!imports) {
-      return void 0;
-    }
-    const conditions = getConditions(options, importMode);
-    return (_c = forEach(getOwnKeys(imports), (k) => {
-      if (!startsWith(k, "#") || k === "#" || startsWith(k, "#/"))
-        return void 0;
-      const mode = endsWith(k, "/") ? 1 /* Directory */ : k.includes("*") ? 2 /* Pattern */ : 0 /* Exact */;
-      return tryGetModuleNameFromExportsOrImports(
-        options,
-        host,
-        moduleFileName,
-        ancestorDirectoryWithPackageJson,
-        k,
-        imports[k],
-        conditions,
-        mode,
-        /*isImports*/
-        true
-      );
-    })) == null ? void 0 : _c.moduleFileToTry;
-  }
   function tryGetModuleNameFromRootDirs(rootDirs, moduleFileName, sourceDirectory, getCanonicalFileName, allowedEndings, compilerOptions) {
     const normalizedTargetPaths = getPathsRelativeToRootDirs(moduleFileName, rootDirs, getCanonicalFileName);
     if (normalizedTargetPaths === void 0) {
@@ -45631,15 +45505,16 @@ ${lanes.join("\n")}
       let maybeBlockedByTypesVersions = false;
       const cachedPackageJson = (_b = (_a = host.getPackageJsonInfoCache) == null ? void 0 : _a.call(host)) == null ? void 0 : _b.getPackageJsonInfo(packageJsonPath);
       if (typeof cachedPackageJson === "object" || cachedPackageJson === void 0 && host.fileExists(packageJsonPath)) {
-        const packageJsonContent = (cachedPackageJson == null ? void 0 : cachedPackageJson.contents.packageJsonContent) || safeJsonRead(packageJsonPath, host.readFile);
+        const packageJsonContent = (cachedPackageJson == null ? void 0 : cachedPackageJson.contents.packageJsonContent) || JSON.parse(host.readFile(packageJsonPath));
         const importMode = overrideMode || importingSourceFile.impliedNodeFormat;
         if (getResolvePackageJsonExports(options)) {
           const nodeModulesDirectoryName2 = packageRootPath.substring(parts.topLevelPackageNameIndex + 1);
           const packageName2 = getPackageNameFromTypesPackageName(nodeModulesDirectoryName2);
           const conditions = getConditions(options, importMode);
-          const fromExports = packageJsonContent.exports ? tryGetModuleNameFromExports(options, host, path, packageRootPath, packageName2, packageJsonContent.exports, conditions) : void 0;
+          const fromExports = packageJsonContent.exports ? tryGetModuleNameFromExports(options, path, packageRootPath, packageName2, packageJsonContent.exports, conditions) : void 0;
           if (fromExports) {
-            return { ...fromExports, verbatimFromExports: true };
+            const withJsExtension = !hasTSFileExtension(fromExports.moduleFileToTry) ? fromExports : { moduleFileToTry: removeFileExtension(fromExports.moduleFileToTry) + tryGetJSExtensionForFile(fromExports.moduleFileToTry, options) };
+            return { ...withJsExtension, verbatimFromExports: true };
           }
           if (packageJsonContent.exports) {
             return { moduleFileToTry: path, blockedByExports: true };
@@ -56836,6 +56711,14 @@ ${lanes.join("\n")}
       return getCheckFlags(s) & 4096 /* Late */;
     }
     function forEachMappedTypePropertyKeyTypeAndIndexSignatureKeyType(type, include, stringsOnly, cb) {
+      if (isTupleType(type)) {
+        forEachType(getUnionType(getElementTypes(type).map((_, i) => getStringLiteralType("" + i))), cb);
+        return;
+      }
+      if (isArrayType(type)) {
+        cb(numberType);
+        return;
+      }
       for (const prop of getPropertiesOfType(type)) {
         cb(getLiteralTypeFromProperty(prop, include));
       }
@@ -58672,7 +58555,7 @@ ${lanes.join("\n")}
           if (constraint) {
             constraints = append(constraints, constraint);
           }
-        } else if (type.flags & 262144 /* TypeParameter */ && parent2.kind === 200 /* MappedType */ && node === parent2.type) {
+        } else if (type.flags & 262144 /* TypeParameter */ && parent2.kind === 200 /* MappedType */ && (node === parent2.type || node === parent2.nameType)) {
           const mappedType = getTypeFromTypeNode(parent2);
           if (getTypeParameterFromMappedType(mappedType) === getActualTypeVariable(type)) {
             const typeParameter = getHomomorphicTypeVariable(mappedType);
@@ -131420,8 +131303,7 @@ ${lanes.join("\n")}
       getProjectReferenceRedirect: (fileName) => program.getProjectReferenceRedirect(fileName),
       isSourceOfProjectReferenceRedirect: (fileName) => program.isSourceOfProjectReferenceRedirect(fileName),
       getNearestAncestorDirectoryWithPackageJson: maybeBind(host, host.getNearestAncestorDirectoryWithPackageJson),
-      getFileIncludeReasons: () => program.getFileIncludeReasons(),
-      getCommonSourceDirectory: () => program.getCommonSourceDirectory()
+      getFileIncludeReasons: () => program.getFileIncludeReasons()
     };
   }
   function getModuleSpecifierResolverHost(program, host) {

package/lib/typingsInstaller.js

@@ -3934,6 +3934,7 @@ function createSystemWatchFunctions({
   useNonPollingWatchers,
   tscWatchDirectory,
   inodeWatching,
+  fsWatchWithTimestamp,
   sysLog: sysLog2
 }) {
   const pollingWatches = /* @__PURE__ */ new Map();
@@ -4172,7 +4173,7 @@ function createSystemWatchFunctions({
         return watchPresentFileSystemEntryWithFsWatchFile();
       }
       try {
-        const presentWatcher = fsWatchWorker(
+        const presentWatcher = (!fsWatchWithTimestamp ? fsWatchWorker : fsWatchWorkerHandlingTimestamp)(
           fileOrDirectory,
           recursive,
           inodeWatching ? callbackChangingToMissingFileSystemEntry : callback
@@ -4235,6 +4236,18 @@ function createSystemWatchFunctions({
       );
     }
   }
+  function fsWatchWorkerHandlingTimestamp(fileOrDirectory, recursive, callback) {
+    let modifiedTime = getModifiedTime2(fileOrDirectory) || missingFileModifiedTime;
+    return fsWatchWorker(fileOrDirectory, recursive, (eventName, relativeFileName, currentModifiedTime) => {
+      if (eventName === "change") {
+        currentModifiedTime || (currentModifiedTime = getModifiedTime2(fileOrDirectory) || missingFileModifiedTime);
+        if (currentModifiedTime.getTime() === modifiedTime.getTime())
+          return;
+      }
+      modifiedTime = currentModifiedTime || getModifiedTime2(fileOrDirectory) || missingFileModifiedTime;
+      callback(eventName, relativeFileName, modifiedTime);
+    });
+  }
 }
 function patchWriteFileEnsuringDirectory(sys2) {
   const originalWriteFile = sys2.writeFile;
@@ -4263,12 +4276,13 @@ var sys = (() => {
     let activeSession;
     let profilePath = "./profile.cpuprofile";
     const Buffer2 = require("buffer").Buffer;
-    const isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
+    const isMacOs = process.platform === "darwin";
+    const isLinuxOrMacOs = process.platform === "linux" || isMacOs;
     const platform = _os.platform();
     const useCaseSensitiveFileNames2 = isFileSystemCaseSensitive();
     const fsRealpath = !!_fs.realpathSync.native ? process.platform === "win32" ? fsRealPathHandlingLongPath : _fs.realpathSync.native : _fs.realpathSync;
     const executingFilePath = __filename.endsWith("sys.js") ? _path.join(_path.dirname(__dirname), "__fake__.js") : __filename;
-    const fsSupportsRecursiveFsWatch = process.platform === "win32" || process.platform === "darwin";
+    const fsSupportsRecursiveFsWatch = process.platform === "win32" || isMacOs;
     const getCurrentDirectory = memoize(() => process.cwd());
     const { watchFile, watchDirectory } = createSystemWatchFunctions({
       pollingWatchFileWorker: fsWatchFileWorker,
@@ -4288,6 +4302,7 @@ var sys = (() => {
       useNonPollingWatchers: !!process.env.TSC_NONPOLLING_WATCHER,
       tscWatchDirectory: process.env.TSC_WATCHDIRECTORY,
       inodeWatching: isLinuxOrMacOs,
+      fsWatchWithTimestamp: isMacOs,
       sysLog
     });
     const nodeSystem = {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.4.0-pr-55015-10",
+  "version": "5.4.0-pr-55774-37",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -115,5 +115,5 @@
     "node": "20.1.0",
     "npm": "8.19.4"
   },
-  "gitHead": "d6f199d69cfaf8f69510f81d95c5358f1f16e9a7"
+  "gitHead": "5dbc02ba770ef61d5f9cbbc9e5aeb1ee2a686529"
 }