typescript 5.0.0-dev.20221201 → 5.0.0-dev.20221202

package/lib/lib.es2022.sharedmemory.d.ts

@@ -22,6 +22,20 @@ interface Atomics {
     /**
      * A non-blocking, asynchronous version of wait which is usable on the main thread.
      * Waits asynchronously on a shared memory location and returns a Promise
+     * @param typedArray A shared Int32Array or BigInt64Array.
+     * @param index The position in the typedArray to wait on.
+     * @param value The expected value to test.
+     * @param [timeout] The expected value to test.
      */
-    waitAsync(typedArray: BigInt64Array | Int32Array, index: number, value: bigint, timeout?: number): { async: false, value: "ok" | "not-equal" | "timed-out" } | { async: true, value: Promise<"ok" | "not-equal" | "timed-out"> };
+    waitAsync(typedArray: Int32Array, index: number, value: number, timeout?: number): { async: false, value: "not-equal" | "timed-out" } | { async: true, value: Promise<"ok" | "timed-out"> };
+
+    /**
+     * A non-blocking, asynchronous version of wait which is usable on the main thread.
+     * Waits asynchronously on a shared memory location and returns a Promise
+     * @param typedArray A shared Int32Array or BigInt64Array.
+     * @param index The position in the typedArray to wait on.
+     * @param value The expected value to test.
+     * @param [timeout] The expected value to test.
+     */
+    waitAsync(typedArray: BigInt64Array, index: number, value: bigint, timeout?: number): { async: false, value: "not-equal" | "timed-out" } | { async: true, value: Promise<"ok" | "timed-out"> };
 }

package/lib/tsc.js

@@ -23,7 +23,7 @@ var __export = (target, all) => {
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.0";
-var version = `${versionMajorMinor}.0-dev.20221201`;
+var version = `${versionMajorMinor}.0-dev.20221202`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -15307,6 +15307,26 @@ function parsePseudoBigInt(stringValue) {
 function pseudoBigIntToString({ negative, base10Value }) {
   return (negative && base10Value !== "0" ? "-" : "") + base10Value;
 }
+function parseValidBigInt(text) {
+  const negative = text.startsWith("-");
+  const base10Value = parsePseudoBigInt(`${negative ? text.slice(1) : text}n`);
+  return { negative, base10Value };
+}
+function isValidBigIntString(s, roundTripOnly) {
+  if (s === "")
+    return false;
+  const scanner = createScanner(99 /* ESNext */, false);
+  let success = true;
+  scanner.setOnError(() => success = false);
+  scanner.setText(s + "n");
+  let result = scanner.scan();
+  const negative = result === 40 /* MinusToken */;
+  if (negative) {
+    result = scanner.scan();
+  }
+  const flags = scanner.getTokenFlags();
+  return success && result === 9 /* BigIntLiteral */ && scanner.getTextPos() === s.length + 1 && !(flags & 512 /* ContainsSeparator */) && (!roundTripOnly || s === pseudoBigIntToString({ negative, base10Value: parsePseudoBigInt(scanner.getTokenValue()) }));
+}
 function isValidTypeOnlyAliasUseSite(useSite) {
   return !!(useSite.flags & 16777216 /* Ambient */) || isPartOfTypeQuery(useSite) || isIdentifierInNonEmittingHeritageClause(useSite) || isPartOfPossiblyValidTypeOrAbstractComputedPropertyName(useSite) || !(isExpressionNode(useSite) || isShorthandPropertyNameUseSite(useSite));
 }
@@ -15626,6 +15646,13 @@ function isOptionalJSDocPropertyLikeTag(node) {
   const { isBracketed, typeExpression } = node;
   return isBracketed || !!typeExpression && typeExpression.type.kind === 319 /* JSDocOptionalType */;
 }
+function canUsePropertyAccess(name, languageVersion) {
+  if (name.length === 0) {
+    return false;
+  }
+  const firstChar = name.charCodeAt(0);
+  return firstChar === 35 /* hash */ ? name.length > 1 && isIdentifierStart(name.charCodeAt(1), languageVersion) : isIdentifierStart(firstChar, languageVersion);
+}
 
 // src/compiler/factory/baseNodeFactory.ts
 function createBaseNodeFactory() {
@@ -33004,41 +33031,86 @@ function getAutomaticTypeDirectiveNames(options, host) {
   }
   return result;
 }
-function createCacheWithRedirects(options) {
-  let ownMap = /* @__PURE__ */ new Map();
+function compilerOptionValueToString(value) {
+  var _a2;
+  if (value === null || typeof value !== "object") {
+    return "" + value;
+  }
+  if (isArray(value)) {
+    return `[${(_a2 = value.map((e) => compilerOptionValueToString(e))) == null ? void 0 : _a2.join(",")}]`;
+  }
+  let str = "{";
+  for (const key in value) {
+    if (hasProperty(value, key)) {
+      str += `${key}: ${compilerOptionValueToString(value[key])}`;
+    }
+  }
+  return str + "}";
+}
+function getKeyForCompilerOptions(options, affectingOptionDeclarations) {
+  return affectingOptionDeclarations.map((option) => compilerOptionValueToString(getCompilerOptionValue(options, option))).join("|") + (options.pathsBasePath ? `|${options.pathsBasePath}` : void 0);
+}
+function createCacheWithRedirects(ownOptions) {
   const redirectsMap = /* @__PURE__ */ new Map();
+  const optionsToRedirectsKey = /* @__PURE__ */ new Map();
+  const redirectsKeyToMap = /* @__PURE__ */ new Map();
+  let ownMap = /* @__PURE__ */ new Map();
+  if (ownOptions)
+    redirectsMap.set(ownOptions, ownMap);
   return {
-    getOwnMap,
-    redirectsMap,
     getOrCreateMapOfCacheRedirects,
-    clear: clear2,
-    setOwnOptions,
-    setOwnMap
+    update,
+    clear: clear2
   };
-  function getOwnMap() {
-    return ownMap;
-  }
-  function setOwnOptions(newOptions) {
-    options = newOptions;
-  }
-  function setOwnMap(newOwnMap) {
-    ownMap = newOwnMap;
-  }
   function getOrCreateMapOfCacheRedirects(redirectedReference) {
-    if (!redirectedReference) {
-      return ownMap;
+    return redirectedReference ? getOrCreateMap(redirectedReference.commandLine.options) : ownMap;
+  }
+  function update(newOptions) {
+    if (ownOptions !== newOptions) {
+      if (ownOptions)
+        ownMap = getOrCreateMap(newOptions);
+      else
+        redirectsMap.set(newOptions, ownMap);
+      ownOptions = newOptions;
     }
-    const path = redirectedReference.sourceFile.path;
-    let redirects = redirectsMap.get(path);
-    if (!redirects) {
-      redirects = !options || optionsHaveModuleResolutionChanges(options, redirectedReference.commandLine.options) ? /* @__PURE__ */ new Map() : ownMap;
-      redirectsMap.set(path, redirects);
+  }
+  function getOrCreateMap(redirectOptions) {
+    let result = redirectsMap.get(redirectOptions);
+    if (result)
+      return result;
+    const key = getRedirectsCacheKey(redirectOptions);
+    result = redirectsKeyToMap.get(key);
+    if (!result) {
+      if (ownOptions) {
+        const ownKey = getRedirectsCacheKey(ownOptions);
+        if (ownKey === key)
+          result = ownMap;
+        else if (!redirectsKeyToMap.has(ownKey))
+          redirectsKeyToMap.set(ownKey, ownMap);
+      }
+      redirectsKeyToMap.set(key, result != null ? result : result = /* @__PURE__ */ new Map());
     }
-    return redirects;
+    redirectsMap.set(redirectOptions, result);
+    return result;
   }
   function clear2() {
+    const ownKey = ownOptions && optionsToRedirectsKey.get(ownOptions);
     ownMap.clear();
     redirectsMap.clear();
+    optionsToRedirectsKey.clear();
+    redirectsKeyToMap.clear();
+    if (ownOptions) {
+      if (ownKey)
+        optionsToRedirectsKey.set(ownOptions, ownKey);
+      redirectsMap.set(ownOptions, ownMap);
+    }
+  }
+  function getRedirectsCacheKey(options) {
+    let result = optionsToRedirectsKey.get(options);
+    if (!result) {
+      optionsToRedirectsKey.set(options, result = getKeyForCompilerOptions(options, moduleResolutionOptionDeclarations));
+    }
+    return result;
   }
 }
 function createPackageJsonInfoCache(currentDirectory, getCanonicalFileName) {
@@ -33070,27 +33142,6 @@ function getOrCreateCache(cacheWithRedirects, redirectedReference, key, create)
   }
   return result;
 }
-function updateRedirectsMap(options, directoryToModuleNameMap, moduleNameToDirectoryMap) {
-  if (!options.configFile)
-    return;
-  if (directoryToModuleNameMap.redirectsMap.size === 0) {
-    Debug.assert(!moduleNameToDirectoryMap || moduleNameToDirectoryMap.redirectsMap.size === 0);
-    Debug.assert(directoryToModuleNameMap.getOwnMap().size === 0);
-    Debug.assert(!moduleNameToDirectoryMap || moduleNameToDirectoryMap.getOwnMap().size === 0);
-    directoryToModuleNameMap.redirectsMap.set(options.configFile.path, directoryToModuleNameMap.getOwnMap());
-    moduleNameToDirectoryMap == null ? void 0 : moduleNameToDirectoryMap.redirectsMap.set(options.configFile.path, moduleNameToDirectoryMap.getOwnMap());
-  } else {
-    Debug.assert(!moduleNameToDirectoryMap || moduleNameToDirectoryMap.redirectsMap.size > 0);
-    const ref = {
-      sourceFile: options.configFile,
-      commandLine: { options }
-    };
-    directoryToModuleNameMap.setOwnMap(directoryToModuleNameMap.getOrCreateMapOfCacheRedirects(ref));
-    moduleNameToDirectoryMap == null ? void 0 : moduleNameToDirectoryMap.setOwnMap(moduleNameToDirectoryMap.getOrCreateMapOfCacheRedirects(ref));
-  }
-  directoryToModuleNameMap.setOwnOptions(options);
-  moduleNameToDirectoryMap == null ? void 0 : moduleNameToDirectoryMap.setOwnOptions(options);
-}
 function createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap) {
   return {
     getOrCreateCacheForDirectory,
@@ -33101,13 +33152,16 @@ function createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileNam
     directoryToModuleNameMap.clear();
   }
   function update(options) {
-    updateRedirectsMap(options, directoryToModuleNameMap);
+    directoryToModuleNameMap.update(options);
   }
   function getOrCreateCacheForDirectory(directoryName, redirectedReference) {
     const path = toPath(directoryName, currentDirectory, getCanonicalFileName);
     return getOrCreateCache(directoryToModuleNameMap, redirectedReference, path, () => createModeAwareCache());
   }
 }
+function createModeAwareCacheKey(specifier, mode) {
+  return mode === void 0 ? specifier : `${mode}|${specifier}`;
+}
 function createModeAwareCache() {
   const underlying = /* @__PURE__ */ new Map();
   const memoizedReverseKeys = /* @__PURE__ */ new Map();
@@ -33138,7 +33192,7 @@ function createModeAwareCache() {
   };
   return cache;
   function getUnderlyingCacheKey(specifier, mode) {
-    const result = mode === void 0 ? specifier : `${mode}|${specifier}`;
+    const result = createModeAwareCacheKey(specifier, mode);
     memoizedReverseKeys.set(result, [specifier, mode]);
     return result;
   }
@@ -33158,9 +33212,10 @@ function zipToModeAwareCache(file, keys, values) {
   }
   return map2;
 }
-function createModuleResolutionCache(currentDirectory, getCanonicalFileName, options, directoryToModuleNameMap, moduleNameToDirectoryMap) {
-  const perDirectoryResolutionCache = createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap || (directoryToModuleNameMap = createCacheWithRedirects(options)));
-  moduleNameToDirectoryMap || (moduleNameToDirectoryMap = createCacheWithRedirects(options));
+function createModuleResolutionCache(currentDirectory, getCanonicalFileName, options) {
+  const directoryToModuleNameMap = createCacheWithRedirects(options);
+  const perDirectoryResolutionCache = createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap);
+  const moduleNameToDirectoryMap = createCacheWithRedirects(options);
   const packageJsonInfoCache = createPackageJsonInfoCache(currentDirectory, getCanonicalFileName);
   return {
     ...packageJsonInfoCache,
@@ -33180,11 +33235,12 @@ function createModuleResolutionCache(currentDirectory, getCanonicalFileName, opt
     moduleNameToDirectoryMap.clear();
   }
   function update(options2) {
-    updateRedirectsMap(options2, directoryToModuleNameMap, moduleNameToDirectoryMap);
+    directoryToModuleNameMap.update(options2);
+    moduleNameToDirectoryMap.update(options2);
   }
   function getOrCreateCacheForModuleName(nonRelativeModuleName, mode, redirectedReference) {
     Debug.assert(!isExternalModuleNameRelative(nonRelativeModuleName));
-    return getOrCreateCache(moduleNameToDirectoryMap, redirectedReference, mode === void 0 ? nonRelativeModuleName : `${mode}|${nonRelativeModuleName}`, createPerModuleNameCache);
+    return getOrCreateCache(moduleNameToDirectoryMap, redirectedReference, createModeAwareCacheKey(nonRelativeModuleName, mode), createPerModuleNameCache);
   }
   function createPerModuleNameCache() {
     const directoryPathMap = /* @__PURE__ */ new Map();
@@ -33232,8 +33288,9 @@ function createModuleResolutionCache(currentDirectory, getCanonicalFileName, opt
     }
   }
 }
-function createTypeReferenceDirectiveResolutionCache(currentDirectory, getCanonicalFileName, options, packageJsonInfoCache, directoryToModuleNameMap) {
-  const perDirectoryResolutionCache = createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap || (directoryToModuleNameMap = createCacheWithRedirects(options)));
+function createTypeReferenceDirectiveResolutionCache(currentDirectory, getCanonicalFileName, options, packageJsonInfoCache) {
+  const directoryToModuleNameMap = createCacheWithRedirects(options);
+  const perDirectoryResolutionCache = createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap);
   packageJsonInfoCache || (packageJsonInfoCache = createPackageJsonInfoCache(currentDirectory, getCanonicalFileName));
   return {
     ...packageJsonInfoCache,
@@ -42870,7 +42927,7 @@ function createTypeChecker(host) {
       }
       const contextFile = getSourceFileOfNode(getOriginalNode(context.enclosingDeclaration));
       const resolutionMode = overrideImportMode || (contextFile == null ? void 0 : contextFile.impliedNodeFormat);
-      const cacheKey = getSpecifierCacheKey(contextFile.path, resolutionMode);
+      const cacheKey = createModeAwareCacheKey(contextFile.path, resolutionMode);
       const links = getSymbolLinks(symbol);
       let specifier = links.specifierCache && links.specifierCache.get(cacheKey);
       if (!specifier) {
@@ -42893,9 +42950,6 @@ function createTypeChecker(host) {
         links.specifierCache.set(cacheKey, specifier);
       }
       return specifier;
-      function getSpecifierCacheKey(path, mode) {
-        return mode === void 0 ? path : `${mode}|${path}`;
-      }
     }
     function symbolToEntityNameNode(symbol) {
       const identifier = factory.createIdentifier(unescapeLeadingUnderscores(symbol.escapedName));
@@ -43109,8 +43163,7 @@ function createTypeChecker(host) {
         if (isSingleOrDoubleQuote(firstChar) && some(symbol2.declarations, hasNonGlobalAugmentationExternalModuleSymbol)) {
           return factory.createStringLiteral(getSpecifierForModuleSymbol(symbol2, context));
         }
-        const canUsePropertyAccess = firstChar === 35 /* hash */ ? symbolName2.length > 1 && isIdentifierStart(symbolName2.charCodeAt(1), languageVersion) : isIdentifierStart(firstChar, languageVersion);
-        if (index === 0 || canUsePropertyAccess) {
+        if (index === 0 || canUsePropertyAccess(symbolName2, languageVersion)) {
           const identifier = setEmitFlags(factory.createIdentifier(symbolName2, typeParameterNodes), 33554432 /* NoAsciiEscaping */);
           identifier.symbol = symbol2;
           return index > 0 ? factory.createPropertyAccessExpression(createExpressionFromSymbolChain(chain2, index - 1), identifier) : identifier;
@@ -55182,24 +55235,7 @@ function createTypeChecker(host) {
     return isFinite(n) && (!roundTripOnly || "" + n === s);
   }
   function parseBigIntLiteralType(text) {
-    const negative = text.startsWith("-");
-    const base10Value = parsePseudoBigInt(`${negative ? text.slice(1) : text}n`);
-    return getBigIntLiteralType({ negative, base10Value });
-  }
-  function isValidBigIntString(s, roundTripOnly) {
-    if (s === "")
-      return false;
-    const scanner = createScanner(99 /* ESNext */, false);
-    let success = true;
-    scanner.setOnError(() => success = false);
-    scanner.setText(s + "n");
-    let result = scanner.scan();
-    const negative = result === 40 /* MinusToken */;
-    if (negative) {
-      result = scanner.scan();
-    }
-    const flags = scanner.getTokenFlags();
-    return success && result === 9 /* BigIntLiteral */ && scanner.getTextPos() === s.length + 1 && !(flags & 512 /* ContainsSeparator */) && (!roundTripOnly || s === pseudoBigIntToString({ negative, base10Value: parsePseudoBigInt(scanner.getTokenValue()) }));
+    return getBigIntLiteralType(parseValidBigInt(text));
   }
   function isMemberOfStringMapping(source, target) {
     if (target.flags & (4 /* String */ | 1 /* Any */)) {
@@ -62671,11 +62707,11 @@ function createTypeChecker(host) {
   }
   function checkSatisfiesExpression(node) {
     checkSourceElement(node.type);
+    const exprType = checkExpression(node.expression);
     const targetType = getTypeFromTypeNode(node.type);
     if (isErrorType(targetType)) {
       return targetType;
     }
-    const exprType = checkExpression(node.expression);
     checkTypeAssignableToAndOptionallyElaborate(exprType, targetType, node.type, node.expression, Diagnostics.Type_0_does_not_satisfy_the_expected_type_1);
     return exprType;
   }
@@ -97322,16 +97358,15 @@ function loadWithTypeDirectiveCache(names, containingFile, redirectedReference,
     return [];
   }
   const resolutions = [];
-  const cache = /* @__PURE__ */ new Map();
+  const cache = createModeAwareCache();
   for (const name of names) {
     let result;
     const mode = getModeForFileReference(name, containingFileMode);
     const strName = getResolutionName(name);
-    const cacheKey = mode !== void 0 ? `${mode}|${strName}` : strName;
-    if (cache.has(cacheKey)) {
-      result = cache.get(cacheKey);
+    if (cache.has(strName, mode)) {
+      result = cache.get(strName, mode);
     } else {
-      cache.set(cacheKey, result = loader(strName, containingFile, redirectedReference, mode));
+      cache.set(strName, mode, result = loader(strName, containingFile, redirectedReference, mode));
     }
     resolutions.push(result);
   }
@@ -97407,18 +97442,17 @@ function loadWithModeAwareCache(names, containingFile, containingFileName, redir
     return [];
   }
   const resolutions = [];
-  const cache = /* @__PURE__ */ new Map();
+  const cache = createModeAwareCache();
   let i = 0;
   for (const entry of resolutionInfo ? resolutionInfo.names : names) {
     let result;
     const mode = !isString(entry) ? getModeForUsageLocation(containingFile, entry) : getModeForResolutionAtIndex(containingFile, i);
     i++;
     const name = isString(entry) ? entry : entry.text;
-    const cacheKey = mode !== void 0 ? `${mode}|${name}` : name;
-    if (cache.has(cacheKey)) {
-      result = cache.get(cacheKey);
+    if (cache.has(name, mode)) {
+      result = cache.get(name, mode);
     } else {
-      cache.set(cacheKey, result = loader(name, mode, containingFileName, redirectedReference));
+      cache.set(name, mode, result = loader(name, mode, containingFileName, redirectedReference));
     }
     resolutions.push(result);
   }
@@ -101912,23 +101946,17 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   const getCurrentDirectory = memoize(() => resolutionHost.getCurrentDirectory());
   const cachedDirectoryStructureHost = resolutionHost.getCachedDirectoryStructureHost();
   const resolvedModuleNames = /* @__PURE__ */ new Map();
-  const perDirectoryResolvedModuleNames = createCacheWithRedirects();
-  const nonRelativeModuleNameCache = createCacheWithRedirects();
   const moduleResolutionCache = createModuleResolutionCache(
     getCurrentDirectory(),
     resolutionHost.getCanonicalFileName,
-    void 0,
-    perDirectoryResolvedModuleNames,
-    nonRelativeModuleNameCache
+    resolutionHost.getCompilationSettings()
   );
   const resolvedTypeReferenceDirectives = /* @__PURE__ */ new Map();
-  const perDirectoryResolvedTypeReferenceDirectives = createCacheWithRedirects();
   const typeReferenceDirectiveResolutionCache = createTypeReferenceDirectiveResolutionCache(
     getCurrentDirectory(),
     resolutionHost.getCanonicalFileName,
-    void 0,
-    moduleResolutionCache.getPackageJsonInfoCache(),
-    perDirectoryResolvedTypeReferenceDirectives
+    resolutionHost.getCompilationSettings(),
+    moduleResolutionCache.getPackageJsonInfoCache()
   );
   const failedLookupDefaultExtensions = [".ts" /* Ts */, ".tsx" /* Tsx */, ".js" /* Js */, ".jsx" /* Jsx */, ".json" /* Json */];
   const customFailedLookupPaths = /* @__PURE__ */ new Map();
@@ -101989,6 +102017,8 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     affectingPathChecksForFile = void 0;
     moduleResolutionCache.clear();
     typeReferenceDirectiveResolutionCache.clear();
+    moduleResolutionCache.update(resolutionHost.getCompilationSettings());
+    typeReferenceDirectiveResolutionCache.update(resolutionHost.getCompilationSettings());
     impliedFormatPackageJsons.clear();
     hasChangedAutomaticTypeDirectiveNames = false;
   }
@@ -102093,8 +102123,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     names,
     containingFile,
     redirectedReference,
-    cache,
-    perDirectoryCacheWithRedirects,
+    perFileCache,
     loader,
     getResolutionWithResolvedFileName,
     shouldRetryResolution,
@@ -102104,16 +102133,9 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     containingSourceFile,
     containingSourceFileMode
   }) {
-    var _a2, _b, _c, _d;
+    var _a2, _b, _c;
     const path = resolutionHost.toPath(containingFile);
-    const resolutionsInFile = cache.get(path) || cache.set(path, createModeAwareCache()).get(path);
-    const dirPath = getDirectoryPath(path);
-    const perDirectoryCache = perDirectoryCacheWithRedirects.getOrCreateMapOfCacheRedirects(redirectedReference);
-    let perDirectoryResolution = perDirectoryCache.get(dirPath);
-    if (!perDirectoryResolution) {
-      perDirectoryResolution = createModeAwareCache();
-      perDirectoryCache.set(dirPath, perDirectoryResolution);
-    }
+    const resolutionsInFile = perFileCache.get(path) || perFileCache.set(path, createModeAwareCache()).get(path);
     const resolvedModules = [];
     const compilerOptions = resolutionHost.getCompilationSettings();
     const hasInvalidatedNonRelativeUnresolvedImport = logChanges && isFileWithInvalidatedNonRelativeUnresolvedImports(path);
@@ -102129,28 +102151,9 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       let resolution = resolutionsInFile.get(name, mode);
       if (!seenNamesInFile.has(name, mode) && unmatchedRedirects || !resolution || resolution.isInvalidated || hasInvalidatedNonRelativeUnresolvedImport && !isExternalModuleNameRelative(name) && shouldRetryResolution(resolution)) {
         const existingResolution = resolution;
-        const resolutionInDirectory = perDirectoryResolution.get(name, mode);
-        if (resolutionInDirectory) {
-          resolution = resolutionInDirectory;
-          const host = ((_a2 = resolutionHost.getCompilerHost) == null ? void 0 : _a2.call(resolutionHost)) || resolutionHost;
-          if (isTraceEnabled(compilerOptions, host)) {
-            const resolved = getResolutionWithResolvedFileName(resolution);
-            trace(
-              host,
-              loader === resolveModuleName2 ? (resolved == null ? void 0 : resolved.resolvedFileName) ? resolved.packageId ? Diagnostics.Reusing_resolution_of_module_0_from_1_found_in_cache_from_location_2_it_was_successfully_resolved_to_3_with_Package_ID_4 : Diagnostics.Reusing_resolution_of_module_0_from_1_found_in_cache_from_location_2_it_was_successfully_resolved_to_3 : Diagnostics.Reusing_resolution_of_module_0_from_1_found_in_cache_from_location_2_it_was_not_resolved : (resolved == null ? void 0 : resolved.resolvedFileName) ? resolved.packageId ? Diagnostics.Reusing_resolution_of_type_reference_directive_0_from_1_found_in_cache_from_location_2_it_was_successfully_resolved_to_3_with_Package_ID_4 : Diagnostics.Reusing_resolution_of_type_reference_directive_0_from_1_found_in_cache_from_location_2_it_was_successfully_resolved_to_3 : Diagnostics.Reusing_resolution_of_type_reference_directive_0_from_1_found_in_cache_from_location_2_it_was_not_resolved,
-              name,
-              containingFile,
-              getDirectoryPath(containingFile),
-              resolved == null ? void 0 : resolved.resolvedFileName,
-              (resolved == null ? void 0 : resolved.packageId) && packageIdToString(resolved.packageId)
-            );
-          }
-        } else {
-          resolution = loader(name, containingFile, compilerOptions, ((_b = resolutionHost.getCompilerHost) == null ? void 0 : _b.call(resolutionHost)) || resolutionHost, redirectedReference, containingSourceFile, mode);
-          perDirectoryResolution.set(name, mode, resolution);
-          if (resolutionHost.onDiscoveredSymlink && resolutionIsSymlink(resolution)) {
-            resolutionHost.onDiscoveredSymlink();
-          }
+        resolution = loader(name, containingFile, compilerOptions, ((_a2 = resolutionHost.getCompilerHost) == null ? void 0 : _a2.call(resolutionHost)) || resolutionHost, redirectedReference, containingSourceFile, mode);
+        if (resolutionHost.onDiscoveredSymlink && resolutionIsSymlink(resolution)) {
+          resolutionHost.onDiscoveredSymlink();
         }
         resolutionsInFile.set(name, mode, resolution);
         watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, path, getResolutionWithResolvedFileName);
@@ -102162,7 +102165,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
           logChanges = false;
         }
       } else {
-        const host = ((_c = resolutionHost.getCompilerHost) == null ? void 0 : _c.call(resolutionHost)) || resolutionHost;
+        const host = ((_b = resolutionHost.getCompilerHost) == null ? void 0 : _b.call(resolutionHost)) || resolutionHost;
         if (isTraceEnabled(compilerOptions, host) && !seenNamesInFile.has(name, mode)) {
           const resolved = getResolutionWithResolvedFileName(resolution);
           trace(
@@ -102180,7 +102183,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       resolvedModules.push(getResolutionWithResolvedFileName(resolution));
     }
     if (resolutionInfo && (loader === resolveTypeReferenceDirective2 || containingSourceFile)) {
-      (_d = resolutionInfo.reusedNames) == null ? void 0 : _d.forEach((entry) => seenNamesInFile.set(
+      (_c = resolutionInfo.reusedNames) == null ? void 0 : _c.forEach((entry) => seenNamesInFile.set(
         getResolutionName(entry),
         !isString(entry) && isStringLiteralLike(entry) ? getModeForUsageLocation(containingSourceFile, entry) : getModeForFileReference(entry, containingSourceFileMode),
         true
@@ -102219,8 +102222,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       names: typeDirectiveNames,
       containingFile,
       redirectedReference,
-      cache: resolvedTypeReferenceDirectives,
-      perDirectoryCacheWithRedirects: perDirectoryResolvedTypeReferenceDirectives,
+      perFileCache: resolvedTypeReferenceDirectives,
       loader: resolveTypeReferenceDirective2,
       getResolutionWithResolvedFileName: getResolvedTypeReferenceDirective2,
       shouldRetryResolution: (resolution) => resolution.resolvedTypeReferenceDirective === void 0,
@@ -102233,8 +102235,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       names: moduleNames,
       containingFile,
       redirectedReference,
-      cache: resolvedModuleNames,
-      perDirectoryCacheWithRedirects: perDirectoryResolvedModuleNames,
+      perFileCache: resolvedModuleNames,
       loader: resolveModuleName2,
       getResolutionWithResolvedFileName: getResolvedModule2,
       shouldRetryResolution: (resolution) => !resolution.resolvedModule || !resolutionExtensionIsTSOrJson(resolution.resolvedModule.extension),