@typescript-deploys/pr-build 5.0.0-pr-51373-23 → 5.0.0-pr-50403-6

package/lib/tsc.js

@@ -23,7 +23,7 @@ var __export = (target, all) => {
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.0";
-var version = `${versionMajorMinor}.0-insiders.20221206`;
+var version = `${versionMajorMinor}.0-insiders.20221207`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -1695,22 +1695,8 @@ Node ${formatSyntaxKind(node.kind)} was unexpected.`,
   function enableDebugInfo() {
     if (isDebugInfoEnabled)
       return;
-    let weakTypeTextMap;
-    let weakNodeTextMap;
-    function getWeakTypeTextMap() {
-      if (weakTypeTextMap === void 0) {
-        if (typeof WeakMap === "function")
-          weakTypeTextMap = /* @__PURE__ */ new WeakMap();
-      }
-      return weakTypeTextMap;
-    }
-    function getWeakNodeTextMap() {
-      if (weakNodeTextMap === void 0) {
-        if (typeof WeakMap === "function")
-          weakNodeTextMap = /* @__PURE__ */ new WeakMap();
-      }
-      return weakNodeTextMap;
-    }
+    const weakTypeTextMap = /* @__PURE__ */ new WeakMap();
+    const weakNodeTextMap = /* @__PURE__ */ new WeakMap();
     Object.defineProperties(objectAllocator.getSymbolConstructor().prototype, {
       __tsDebuggerDisplay: {
         value() {
@@ -1739,11 +1725,10 @@ Node ${formatSyntaxKind(node.kind)} was unexpected.`,
       } },
       __debugTypeToString: {
         value() {
-          const map2 = getWeakTypeTextMap();
-          let text = map2 == null ? void 0 : map2.get(this);
+          let text = weakTypeTextMap.get(this);
           if (text === void 0) {
             text = this.checker.typeToString(this);
-            map2 == null ? void 0 : map2.set(this, text);
+            weakTypeTextMap.set(this, text);
           }
           return text;
         }
@@ -1795,13 +1780,12 @@ Node ${formatSyntaxKind(node.kind)} was unexpected.`,
             value(includeTrivia) {
               if (nodeIsSynthesized(this))
                 return "";
-              const map2 = getWeakNodeTextMap();
-              let text = map2 == null ? void 0 : map2.get(this);
+              let text = weakNodeTextMap.get(this);
               if (text === void 0) {
                 const parseNode = getParseTreeNode(this);
                 const sourceFile = parseNode && getSourceFileOfNode(parseNode);
                 text = sourceFile ? getSourceTextOfNodeFromSourceFile(sourceFile, parseNode, includeTrivia) : "";
-                map2 == null ? void 0 : map2.set(this, text);
+                weakNodeTextMap.set(this, text);
               }
               return text;
             }
@@ -31157,6 +31141,9 @@ function parseListTypeOption(opt, value = "", errors) {
   if (startsWith(value, "-")) {
     return void 0;
   }
+  if (opt.type === "listOrElement" && !stringContains(value, ",")) {
+    return validateJsonOptionValue(opt, value, errors);
+  }
   if (value === "") {
     return [];
   }
@@ -31166,6 +31153,10 @@ function parseListTypeOption(opt, value = "", errors) {
       return mapDefined(values, (v) => validateJsonOptionValue(opt.element, parseInt(v), errors));
     case "string":
       return mapDefined(values, (v) => validateJsonOptionValue(opt.element, v || "", errors));
+    case "boolean":
+    case "object":
+    case "listOrElement":
+      return Debug.fail(`List of ${opt.element.type} is not yet supported.`);
     default:
       return mapDefined(values, (v) => parseCustomTypeOption(opt.element, v, errors));
   }
@@ -31299,6 +31290,9 @@ function parseOptionValue(args, i, diagnostics, opt, options, errors) {
             i++;
           }
           break;
+        case "listOrElement":
+          Debug.fail("listOrElement not supported here");
+          break;
         default:
           options[opt.name] = parseCustomTypeOption(opt, args[i], errors);
           i++;
@@ -31450,6 +31444,15 @@ var commandLineTypeAcquisitionMapCache;
 function getCommandLineTypeAcquisitionMap() {
   return commandLineTypeAcquisitionMapCache || (commandLineTypeAcquisitionMapCache = commandLineOptionsToMap(typeAcquisitionDeclarations));
 }
+var extendsOptionDeclaration = {
+  name: "extends",
+  type: "listOrElement",
+  element: {
+    name: "extends",
+    type: "string"
+  },
+  category: Diagnostics.File_Management
+};
 var _tsconfigRootOptions;
 function getTsconfigRootOptionsMap() {
   if (_tsconfigRootOptions === void 0) {
@@ -31481,11 +31484,7 @@ function getTsconfigRootOptionsMap() {
           elementOptions: getCommandLineTypeAcquisitionMap(),
           extraKeyDiagnostics: typeAcquisitionDidYouMeanDiagnostics
         },
-        {
-          name: "extends",
-          type: "string",
-          category: Diagnostics.File_Management
-        },
+        extendsOptionDeclaration,
         {
           name: "references",
           type: "list",
@@ -31624,10 +31623,10 @@ function convertToObjectWorker(sourceFile, rootExpression, errors, returnValue,
     let invalidReported;
     switch (valueExpression.kind) {
       case 110 /* TrueKeyword */:
-        reportInvalidOptionValue(option && option.type !== "boolean");
+        reportInvalidOptionValue(option && option.type !== "boolean" && (option.type !== "listOrElement" || option.element.type !== "boolean"));
         return validateValue(true);
       case 95 /* FalseKeyword */:
-        reportInvalidOptionValue(option && option.type !== "boolean");
+        reportInvalidOptionValue(option && option.type !== "boolean" && (option.type !== "listOrElement" || option.element.type !== "boolean"));
         return validateValue(false);
       case 104 /* NullKeyword */:
         reportInvalidOptionValue(option && option.name === "extends");
@@ -31636,8 +31635,11 @@ function convertToObjectWorker(sourceFile, rootExpression, errors, returnValue,
         if (!isDoubleQuotedString(valueExpression)) {
           errors.push(createDiagnosticForNodeInSourceFile(sourceFile, valueExpression, Diagnostics.String_literal_with_double_quotes_expected));
         }
-        reportInvalidOptionValue(option && (isString(option.type) && option.type !== "string"));
+        reportInvalidOptionValue(option && isString(option.type) && option.type !== "string" && (option.type !== "listOrElement" || isString(option.element.type) && option.element.type !== "string"));
         const text = valueExpression.text;
+        if (option) {
+          Debug.assert(option.type !== "listOrElement" || option.element.type === "string", "Only string or array of string is handled for now");
+        }
         if (option && !isString(option.type)) {
           const customOption = option;
           if (!customOption.type.has(text.toLowerCase())) {
@@ -31652,16 +31654,16 @@ function convertToObjectWorker(sourceFile, rootExpression, errors, returnValue,
         }
         return validateValue(text);
       case 8 /* NumericLiteral */:
-        reportInvalidOptionValue(option && option.type !== "number");
+        reportInvalidOptionValue(option && option.type !== "number" && (option.type !== "listOrElement" || option.element.type !== "number"));
         return validateValue(Number(valueExpression.text));
       case 221 /* PrefixUnaryExpression */:
         if (valueExpression.operator !== 40 /* MinusToken */ || valueExpression.operand.kind !== 8 /* NumericLiteral */) {
           break;
         }
-        reportInvalidOptionValue(option && option.type !== "number");
+        reportInvalidOptionValue(option && option.type !== "number" && (option.type !== "listOrElement" || option.element.type !== "number"));
         return validateValue(-Number(valueExpression.operand.text));
       case 207 /* ObjectLiteralExpression */:
-        reportInvalidOptionValue(option && option.type !== "object");
+        reportInvalidOptionValue(option && option.type !== "object" && (option.type !== "listOrElement" || option.element.type !== "object"));
         const objectLiteralExpression = valueExpression;
         if (option) {
           const { elementOptions, extraKeyDiagnostics, name: optionName } = option;
@@ -31680,7 +31682,7 @@ function convertToObjectWorker(sourceFile, rootExpression, errors, returnValue,
           ));
         }
       case 206 /* ArrayLiteralExpression */:
-        reportInvalidOptionValue(option && option.type !== "list");
+        reportInvalidOptionValue(option && option.type !== "list" && option.type !== "listOrElement");
         return validateValue(convertArrayLiteralExpressionToJson(
           valueExpression.elements,
           option && option.element
@@ -31715,7 +31717,7 @@ function convertToObjectWorker(sourceFile, rootExpression, errors, returnValue,
   }
 }
 function getCompilerOptionValueTypeString(option) {
-  return option.type === "list" ? "Array" : isString(option.type) ? option.type : "string";
+  return option.type === "listOrElement" ? `${getCompilerOptionValueTypeString(option.element)} or Array` : option.type === "list" ? "Array" : isString(option.type) ? option.type : "string";
 }
 function isCompilerOptionsValue(option, value) {
   if (option) {
@@ -31724,6 +31726,9 @@ function isCompilerOptionsValue(option, value) {
     if (option.type === "list") {
       return isArray(value);
     }
+    if (option.type === "listOrElement") {
+      return isArray(value) || isCompilerOptionsValue(option.element, value);
+    }
     const expectedType = isString(option.type) ? option.type : "string";
     return typeof value === expectedType;
   }
@@ -31803,12 +31808,17 @@ function matchesSpecs(path, includeSpecs, excludeSpecs, host) {
   return returnTrue;
 }
 function getCustomTypeMapOfCommandLineOption(optionDefinition) {
-  if (optionDefinition.type === "string" || optionDefinition.type === "number" || optionDefinition.type === "boolean" || optionDefinition.type === "object") {
-    return void 0;
-  } else if (optionDefinition.type === "list") {
-    return getCustomTypeMapOfCommandLineOption(optionDefinition.element);
-  } else {
-    return optionDefinition.type;
+  switch (optionDefinition.type) {
+    case "string":
+    case "number":
+    case "boolean":
+    case "object":
+      return void 0;
+    case "list":
+    case "listOrElement":
+      return getCustomTypeMapOfCommandLineOption(optionDefinition.element);
+    default:
+      return optionDefinition.type;
   }
 }
 function getNameOfCompilerOptionValue(value, customTypeMap) {
@@ -31835,6 +31845,7 @@ function serializeOptionBaseObject(options, { optionsNameMap }, pathOptions) {
       const value = options[name];
       const optionDefinition = optionsNameMap.get(name.toLowerCase());
       if (optionDefinition) {
+        Debug.assert(optionDefinition.type !== "listOrElement");
         const customTypeMap = getCustomTypeMapOfCommandLineOption(optionDefinition);
         if (!customTypeMap) {
           if (pathOptions && optionDefinition.isFilePath) {
@@ -31983,6 +31994,7 @@ function convertToOptionValueWithAbsolutePaths(option, value, toAbsolutePath) {
     } else if (option.isFilePath) {
       return toAbsolutePath(value);
     }
+    Debug.assert(option.type !== "listOrElement");
   }
   return value;
 }
@@ -32176,30 +32188,49 @@ function parseConfig(json, sourceFile, host, basePath, configFileName, resolutio
   }
   if (ownConfig.extendedConfigPath) {
     resolutionStack = resolutionStack.concat([resolvedPath]);
-    const extendedConfig = getExtendedConfig(sourceFile, ownConfig.extendedConfigPath, host, resolutionStack, errors, extendedConfigCache);
+    const result = { options: {} };
+    if (isString(ownConfig.extendedConfigPath)) {
+      applyExtendedConfig(result, ownConfig.extendedConfigPath);
+    } else {
+      ownConfig.extendedConfigPath.forEach((extendedConfigPath) => applyExtendedConfig(result, extendedConfigPath));
+    }
+    if (!ownConfig.raw.include && result.include)
+      ownConfig.raw.include = result.include;
+    if (!ownConfig.raw.exclude && result.exclude)
+      ownConfig.raw.exclude = result.exclude;
+    if (!ownConfig.raw.files && result.files)
+      ownConfig.raw.files = result.files;
+    if (ownConfig.raw.compileOnSave === void 0 && result.compileOnSave)
+      ownConfig.raw.compileOnSave = result.compileOnSave;
+    if (sourceFile && result.extendedSourceFiles)
+      sourceFile.extendedSourceFiles = arrayFrom(result.extendedSourceFiles.keys());
+    ownConfig.options = assign(result.options, ownConfig.options);
+    ownConfig.watchOptions = ownConfig.watchOptions && result.watchOptions ? assign(result.watchOptions, ownConfig.watchOptions) : ownConfig.watchOptions || result.watchOptions;
+  }
+  return ownConfig;
+  function applyExtendedConfig(result, extendedConfigPath) {
+    const extendedConfig = getExtendedConfig(sourceFile, extendedConfigPath, host, resolutionStack, errors, extendedConfigCache, result);
     if (extendedConfig && isSuccessfulParsedTsconfig(extendedConfig)) {
-      const baseRaw = extendedConfig.raw;
-      const raw = ownConfig.raw;
+      const extendsRaw = extendedConfig.raw;
       let relativeDifference;
-      const setPropertyInRawIfNotUndefined = (propertyName) => {
-        if (!raw[propertyName] && baseRaw[propertyName]) {
-          raw[propertyName] = map(baseRaw[propertyName], (path) => isRootedDiskPath(path) ? path : combinePaths(
-            relativeDifference || (relativeDifference = convertToRelativePath(getDirectoryPath(ownConfig.extendedConfigPath), basePath, createGetCanonicalFileName(host.useCaseSensitiveFileNames))),
+      const setPropertyInResultIfNotUndefined = (propertyName) => {
+        if (extendsRaw[propertyName]) {
+          result[propertyName] = map(extendsRaw[propertyName], (path) => isRootedDiskPath(path) ? path : combinePaths(
+            relativeDifference || (relativeDifference = convertToRelativePath(getDirectoryPath(extendedConfigPath), basePath, createGetCanonicalFileName(host.useCaseSensitiveFileNames))),
             path
           ));
         }
       };
-      setPropertyInRawIfNotUndefined("include");
-      setPropertyInRawIfNotUndefined("exclude");
-      setPropertyInRawIfNotUndefined("files");
-      if (raw.compileOnSave === void 0) {
-        raw.compileOnSave = baseRaw.compileOnSave;
+      setPropertyInResultIfNotUndefined("include");
+      setPropertyInResultIfNotUndefined("exclude");
+      setPropertyInResultIfNotUndefined("files");
+      if (extendsRaw.compileOnSave !== void 0) {
+        result.compileOnSave = extendsRaw.compileOnSave;
       }
-      ownConfig.options = assign({}, extendedConfig.options, ownConfig.options);
-      ownConfig.watchOptions = ownConfig.watchOptions && extendedConfig.watchOptions ? assign({}, extendedConfig.watchOptions, ownConfig.watchOptions) : ownConfig.watchOptions || extendedConfig.watchOptions;
+      assign(result.options, extendedConfig.options);
+      result.watchOptions = result.watchOptions && extendedConfig.watchOptions ? assign({}, result.watchOptions, extendedConfig.watchOptions) : result.watchOptions || extendedConfig.watchOptions;
     }
   }
-  return ownConfig;
 }
 function parseOwnConfigOfJson(json, host, basePath, configFileName, errors) {
   if (hasProperty(json, "excludes")) {
@@ -32211,11 +32242,22 @@ function parseOwnConfigOfJson(json, host, basePath, configFileName, errors) {
   json.compileOnSave = convertCompileOnSaveOptionFromJson(json, basePath, errors);
   let extendedConfigPath;
   if (json.extends) {
-    if (!isString(json.extends)) {
-      errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "extends", "string"));
+    if (!isCompilerOptionsValue(extendsOptionDeclaration, json.extends)) {
+      errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "extends", getCompilerOptionValueTypeString(extendsOptionDeclaration)));
     } else {
       const newBase = configFileName ? directoryOfCombinedPath(configFileName, basePath) : basePath;
-      extendedConfigPath = getExtendsConfigPath(json.extends, host, newBase, errors, createCompilerDiagnostic);
+      if (isString(json.extends)) {
+        extendedConfigPath = getExtendsConfigPath(json.extends, host, newBase, errors, createCompilerDiagnostic);
+      } else {
+        extendedConfigPath = [];
+        for (const fileName of json.extends) {
+          if (isString(fileName)) {
+            extendedConfigPath = append(extendedConfigPath, getExtendsConfigPath(fileName, host, newBase, errors, createCompilerDiagnostic));
+          } else {
+            errors.push(createCompilerDiagnostic(Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "extends", getCompilerOptionValueTypeString(extendsOptionDeclaration.element)));
+          }
+        }
+      }
     }
   }
   return { raw: json, options, watchOptions, typeAcquisition, extendedConfigPath };
@@ -32251,13 +32293,29 @@ function parseOwnConfigOfJsonSourceFile(sourceFile, host, basePath, configFileNa
       switch (key) {
         case "extends":
           const newBase = configFileName ? directoryOfCombinedPath(configFileName, basePath) : basePath;
-          extendedConfigPath = getExtendsConfigPath(
-            value,
-            host,
-            newBase,
-            errors,
-            (message, arg0) => createDiagnosticForNodeInSourceFile(sourceFile, valueNode, message, arg0)
-          );
+          if (isString(value)) {
+            extendedConfigPath = getExtendsConfigPath(
+              value,
+              host,
+              newBase,
+              errors,
+              (message, arg0) => createDiagnosticForNodeInSourceFile(sourceFile, valueNode, message, arg0)
+            );
+          } else {
+            extendedConfigPath = [];
+            for (let index = 0; index < value.length; index++) {
+              const fileName = value[index];
+              if (isString(fileName)) {
+                extendedConfigPath = append(extendedConfigPath, getExtendsConfigPath(
+                  fileName,
+                  host,
+                  newBase,
+                  errors,
+                  (message, arg0) => createDiagnosticForNodeInSourceFile(sourceFile, valueNode.elements[index], message, arg0)
+                ));
+              }
+            }
+          }
           return;
       }
     },
@@ -32307,7 +32365,8 @@ function getExtendsConfigPath(extendedConfig, host, basePath, errors, createDiag
   errors.push(createDiagnostic(Diagnostics.File_0_not_found, extendedConfig));
   return void 0;
 }
-function getExtendedConfig(sourceFile, extendedConfigPath, host, resolutionStack, errors, extendedConfigCache) {
+function getExtendedConfig(sourceFile, extendedConfigPath, host, resolutionStack, errors, extendedConfigCache, result) {
+  var _a2;
   const path = host.useCaseSensitiveFileNames ? extendedConfigPath : toFileNameLowerCase(extendedConfigPath);
   let value;
   let extendedResult;
@@ -32333,9 +32392,11 @@ function getExtendedConfig(sourceFile, extendedConfigPath, host, resolutionStack
     }
   }
   if (sourceFile) {
-    sourceFile.extendedSourceFiles = [extendedResult.fileName];
+    ((_a2 = result.extendedSourceFiles) != null ? _a2 : result.extendedSourceFiles = /* @__PURE__ */ new Set()).add(extendedResult.fileName);
     if (extendedResult.extendedSourceFiles) {
-      sourceFile.extendedSourceFiles.push(...extendedResult.extendedSourceFiles);
+      for (const extenedSourceFile of extendedResult.extendedSourceFiles) {
+        result.extendedSourceFiles.add(extenedSourceFile);
+      }
     }
   }
   if (extendedResult.parseDiagnostics.length) {
@@ -32394,7 +32455,9 @@ function convertJsonOption(opt, value, basePath, errors) {
     const optType = opt.type;
     if (optType === "list" && isArray(value)) {
       return convertJsonOptionOfListType(opt, value, basePath, errors);
-    } else if (!isString(optType)) {
+    } else if (optType === "listOrElement") {
+      return isArray(value) ? convertJsonOptionOfListType(opt, value, basePath, errors) : convertJsonOption(opt.element, value, basePath, errors);
+    } else if (!isString(opt.type)) {
       return convertJsonOptionOfCustomType(opt, value, errors);
     }
     const validatedValue = validateJsonOptionValue(opt, value, errors);
@@ -32406,7 +32469,9 @@ function convertJsonOption(opt, value, basePath, errors) {
 function normalizeOptionValue(option, basePath, value) {
   if (isNullOrUndefined(value))
     return void 0;
-  if (option.type === "list") {
+  if (option.type === "listOrElement" && !isArray(value))
+    return normalizeOptionValue(option.element, basePath, value);
+  else if (option.type === "list" || option.type === "listOrElement") {
     const listOption = option;
     if (listOption.element.isFilePath || !isString(listOption.element.type)) {
       return filter(map(value, (v) => normalizeOptionValue(listOption.element, basePath, v)), (v) => listOption.listPreserveFalsyValues ? true : !!v);
@@ -32658,6 +32723,8 @@ function getDefaultValueForOption(option) {
       return option.isFilePath ? `./${defaultValue && typeof defaultValue === "string" ? defaultValue : ""}` : "";
     case "list":
       return [];
+    case "listOrElement":
+      return getDefaultValueForOption(option.element);
     case "object":
       return {};
     default:
@@ -32876,8 +32943,10 @@ function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFil
     options = redirectedReference.commandLine.options;
   }
   const containingDirectory = containingFile ? getDirectoryPath(containingFile) : void 0;
-  const perFolderCache = containingDirectory ? cache && cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference) : void 0;
-  let result = perFolderCache && perFolderCache.get(typeReferenceDirectiveName, resolutionMode);
+  let result = containingDirectory ? cache == null ? void 0 : cache.getFromDirectoryCache(typeReferenceDirectiveName, resolutionMode, containingDirectory, redirectedReference) : void 0;
+  if (!result && containingDirectory && !isExternalModuleNameRelative(typeReferenceDirectiveName)) {
+    result = cache == null ? void 0 : cache.getFromNonRelativeNameCache(typeReferenceDirectiveName, resolutionMode, containingDirectory, redirectedReference);
+  }
   if (result) {
     if (traceEnabled) {
       trace(host, Diagnostics.Resolving_type_reference_directive_0_containing_file_1, typeReferenceDirectiveName, containingFile);
@@ -32953,7 +33022,12 @@ function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFil
     affectingLocations: initializeResolutionField(affectingLocations),
     resolutionDiagnostics: initializeResolutionField(diagnostics)
   };
-  perFolderCache == null ? void 0 : perFolderCache.set(typeReferenceDirectiveName, resolutionMode, result);
+  if (containingDirectory) {
+    cache == null ? void 0 : cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference).set(typeReferenceDirectiveName, resolutionMode, result);
+    if (!isExternalModuleNameRelative(typeReferenceDirectiveName)) {
+      cache == null ? void 0 : cache.getOrCreateCacheForNonRelativeName(typeReferenceDirectiveName, resolutionMode, redirectedReference).set(containingDirectory, result);
+    }
+  }
   if (traceEnabled)
     traceResult(result);
   return result;
@@ -33073,23 +33147,27 @@ function createCacheWithRedirects(ownOptions) {
   if (ownOptions)
     redirectsMap.set(ownOptions, ownMap);
   return {
+    getMapOfCacheRedirects,
     getOrCreateMapOfCacheRedirects,
     update,
     clear: clear2
   };
+  function getMapOfCacheRedirects(redirectedReference) {
+    return redirectedReference ? getOrCreateMap(redirectedReference.commandLine.options, false) : ownMap;
+  }
   function getOrCreateMapOfCacheRedirects(redirectedReference) {
-    return redirectedReference ? getOrCreateMap(redirectedReference.commandLine.options) : ownMap;
+    return redirectedReference ? getOrCreateMap(redirectedReference.commandLine.options, true) : ownMap;
   }
   function update(newOptions) {
     if (ownOptions !== newOptions) {
       if (ownOptions)
-        ownMap = getOrCreateMap(newOptions);
+        ownMap = getOrCreateMap(newOptions, true);
       else
         redirectsMap.set(newOptions, ownMap);
       ownOptions = newOptions;
     }
   }
-  function getOrCreateMap(redirectOptions) {
+  function getOrCreateMap(redirectOptions, create) {
     let result = redirectsMap.get(redirectOptions);
     if (result)
       return result;
@@ -33103,9 +33181,13 @@ function createCacheWithRedirects(ownOptions) {
         else if (!redirectsKeyToMap.has(ownKey))
           redirectsKeyToMap.set(ownKey, ownMap);
       }
-      redirectsKeyToMap.set(key, result != null ? result : result = /* @__PURE__ */ new Map());
+      if (create)
+        result != null ? result : result = /* @__PURE__ */ new Map();
+      if (result)
+        redirectsKeyToMap.set(key, result);
     }
-    redirectsMap.set(redirectOptions, result);
+    if (result)
+      redirectsMap.set(redirectOptions, result);
     return result;
   }
   function clear2() {
@@ -33157,8 +33239,10 @@ function getOrCreateCache(cacheWithRedirects, redirectedReference, key, create)
   }
   return result;
 }
-function createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap) {
+function createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, options) {
+  const directoryToModuleNameMap = createCacheWithRedirects(options);
   return {
+    getFromDirectoryCache,
     getOrCreateCacheForDirectory,
     clear: clear2,
     update
@@ -33166,13 +33250,18 @@ function createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileNam
   function clear2() {
     directoryToModuleNameMap.clear();
   }
-  function update(options) {
-    directoryToModuleNameMap.update(options);
+  function update(options2) {
+    directoryToModuleNameMap.update(options2);
   }
   function getOrCreateCacheForDirectory(directoryName, redirectedReference) {
     const path = toPath(directoryName, currentDirectory, getCanonicalFileName);
     return getOrCreateCache(directoryToModuleNameMap, redirectedReference, path, () => createModeAwareCache());
   }
+  function getFromDirectoryCache(name, mode, directoryName, redirectedReference) {
+    var _a2, _b;
+    const path = toPath(directoryName, currentDirectory, getCanonicalFileName);
+    return (_b = (_a2 = directoryToModuleNameMap.getMapOfCacheRedirects(redirectedReference)) == null ? void 0 : _a2.get(path)) == null ? void 0 : _b.get(name, mode);
+  }
 }
 function createModeAwareCacheKey(specifier, mode) {
   return mode === void 0 ? specifier : `${mode}|${specifier}`;
@@ -33221,33 +33310,32 @@ function zipToModeAwareCache(file, keys, values, nameAndModeGetter) {
   }
   return map2;
 }
-function createModuleResolutionCache(currentDirectory, getCanonicalFileName, options) {
-  const directoryToModuleNameMap = createCacheWithRedirects(options);
-  const perDirectoryResolutionCache = createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap);
+function getOriginalOrResolvedModuleFileName(result) {
+  return result.resolvedModule && (result.resolvedModule.originalPath || result.resolvedModule.resolvedFileName);
+}
+function getOriginalOrResolvedTypeReferenceFileName(result) {
+  return result.resolvedTypeReferenceDirective && (result.resolvedTypeReferenceDirective.originalPath || result.resolvedTypeReferenceDirective.resolvedFileName);
+}
+function createNonRelativeNameResolutionCache(currentDirectory, getCanonicalFileName, options, getResolvedFileName) {
   const moduleNameToDirectoryMap = createCacheWithRedirects(options);
-  const packageJsonInfoCache = createPackageJsonInfoCache(currentDirectory, getCanonicalFileName);
   return {
-    ...packageJsonInfoCache,
-    ...perDirectoryResolutionCache,
-    getOrCreateCacheForModuleName,
+    getFromNonRelativeNameCache,
+    getOrCreateCacheForNonRelativeName,
     clear: clear2,
-    update,
-    getPackageJsonInfoCache: () => packageJsonInfoCache,
-    clearAllExceptPackageJsonInfoCache
+    update
   };
   function clear2() {
-    clearAllExceptPackageJsonInfoCache();
-    packageJsonInfoCache.clear();
-  }
-  function clearAllExceptPackageJsonInfoCache() {
-    perDirectoryResolutionCache.clear();
     moduleNameToDirectoryMap.clear();
   }
   function update(options2) {
-    directoryToModuleNameMap.update(options2);
     moduleNameToDirectoryMap.update(options2);
   }
-  function getOrCreateCacheForModuleName(nonRelativeModuleName, mode, redirectedReference) {
+  function getFromNonRelativeNameCache(nonRelativeModuleName, mode, directoryName, redirectedReference) {
+    var _a2, _b;
+    Debug.assert(!isExternalModuleNameRelative(nonRelativeModuleName));
+    return (_b = (_a2 = moduleNameToDirectoryMap.getMapOfCacheRedirects(redirectedReference)) == null ? void 0 : _a2.get(createModeAwareCacheKey(nonRelativeModuleName, mode))) == null ? void 0 : _b.get(directoryName);
+  }
+  function getOrCreateCacheForNonRelativeName(nonRelativeModuleName, mode, redirectedReference) {
     Debug.assert(!isExternalModuleNameRelative(nonRelativeModuleName));
     return getOrCreateCache(moduleNameToDirectoryMap, redirectedReference, createModeAwareCacheKey(nonRelativeModuleName, mode), createPerModuleNameCache);
   }
@@ -33263,7 +33351,7 @@ function createModuleResolutionCache(currentDirectory, getCanonicalFileName, opt
         return;
       }
       directoryPathMap.set(path, result);
-      const resolvedFileName = result.resolvedModule && (result.resolvedModule.originalPath || result.resolvedModule.resolvedFileName);
+      const resolvedFileName = getResolvedFileName(result);
       const commonPrefix = resolvedFileName && getCommonPrefix(path, resolvedFileName);
       let current = path;
       while (current !== commonPrefix) {
@@ -33297,14 +33385,22 @@ function createModuleResolutionCache(currentDirectory, getCanonicalFileName, opt
     }
   }
 }
-function createTypeReferenceDirectiveResolutionCache(currentDirectory, getCanonicalFileName, options, packageJsonInfoCache) {
-  const directoryToModuleNameMap = createCacheWithRedirects(options);
-  const perDirectoryResolutionCache = createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap);
-  packageJsonInfoCache || (packageJsonInfoCache = createPackageJsonInfoCache(currentDirectory, getCanonicalFileName));
+function createModuleOrTypeReferenceResolutionCache(currentDirectory, getCanonicalFileName, options, packageJsonInfoCache, getResolvedFileName) {
+  const perDirectoryResolutionCache = createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, options);
+  const nonRelativeNameResolutionCache = createNonRelativeNameResolutionCache(
+    currentDirectory,
+    getCanonicalFileName,
+    options,
+    getResolvedFileName
+  );
+  packageJsonInfoCache != null ? packageJsonInfoCache : packageJsonInfoCache = createPackageJsonInfoCache(currentDirectory, getCanonicalFileName);
   return {
     ...packageJsonInfoCache,
     ...perDirectoryResolutionCache,
+    ...nonRelativeNameResolutionCache,
     clear: clear2,
+    update,
+    getPackageJsonInfoCache: () => packageJsonInfoCache,
     clearAllExceptPackageJsonInfoCache
   };
   function clear2() {
@@ -33313,8 +33409,33 @@ function createTypeReferenceDirectiveResolutionCache(currentDirectory, getCanoni
   }
   function clearAllExceptPackageJsonInfoCache() {
     perDirectoryResolutionCache.clear();
+    nonRelativeNameResolutionCache.clear();
+  }
+  function update(options2) {
+    perDirectoryResolutionCache.update(options2);
+    nonRelativeNameResolutionCache.update(options2);
   }
 }
+function createModuleResolutionCache(currentDirectory, getCanonicalFileName, options) {
+  const result = createModuleOrTypeReferenceResolutionCache(
+    currentDirectory,
+    getCanonicalFileName,
+    options,
+    void 0,
+    getOriginalOrResolvedModuleFileName
+  );
+  result.getOrCreateCacheForModuleName = (nonRelativeName, mode, redirectedReference) => result.getOrCreateCacheForNonRelativeName(nonRelativeName, mode, redirectedReference);
+  return result;
+}
+function createTypeReferenceDirectiveResolutionCache(currentDirectory, getCanonicalFileName, options, packageJsonInfoCache) {
+  return createModuleOrTypeReferenceResolutionCache(
+    currentDirectory,
+    getCanonicalFileName,
+    options,
+    packageJsonInfoCache,
+    getOriginalOrResolvedTypeReferenceFileName
+  );
+}
 function resolveModuleName(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode) {
   const traceEnabled = isTraceEnabled(compilerOptions, host);
   if (redirectedReference) {
@@ -33327,8 +33448,7 @@ function resolveModuleName(moduleName, containingFile, compilerOptions, host, ca
     }
   }
   const containingDirectory = getDirectoryPath(containingFile);
-  const perFolderCache = cache && cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference);
-  let result = perFolderCache && perFolderCache.get(moduleName, resolutionMode);
+  let result = cache == null ? void 0 : cache.getFromDirectoryCache(moduleName, resolutionMode, containingDirectory, redirectedReference);
   if (result) {
     if (traceEnabled) {
       trace(host, Diagnostics.Resolution_for_module_0_was_found_in_cache_from_location_1, moduleName, containingDirectory);
@@ -33378,11 +33498,9 @@ function resolveModuleName(moduleName, containingFile, compilerOptions, host, ca
     if (result && result.resolvedModule)
       perfLogger.logInfoEvent(`Module "${moduleName}" resolved to "${result.resolvedModule.resolvedFileName}"`);
     perfLogger.logStopResolveModule(result && result.resolvedModule ? "" + result.resolvedModule.resolvedFileName : "null");
-    if (perFolderCache) {
-      perFolderCache.set(moduleName, resolutionMode, result);
-      if (!isExternalModuleNameRelative(moduleName)) {
-        cache.getOrCreateCacheForModuleName(moduleName, resolutionMode, redirectedReference).set(containingDirectory, result);
-      }
+    cache == null ? void 0 : cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference).set(moduleName, resolutionMode, result);
+    if (!isExternalModuleNameRelative(moduleName)) {
+      cache == null ? void 0 : cache.getOrCreateCacheForNonRelativeName(moduleName, resolutionMode, redirectedReference).set(containingDirectory, result);
     }
   }
   if (traceEnabled) {
@@ -34292,7 +34410,7 @@ function loadModuleFromNearestNodeModulesDirectoryTypesScope(moduleName, directo
   return loadModuleFromNearestNodeModulesDirectoryWorker(4 /* Declaration */, moduleName, directory, state, true, void 0, void 0);
 }
 function loadModuleFromNearestNodeModulesDirectoryWorker(extensions, moduleName, directory, state, typesScopeOnly, cache, redirectedReference) {
-  const perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName, state.features === 0 ? void 0 : state.features & 32 /* EsmMode */ ? 99 /* ESNext */ : 1 /* CommonJS */, redirectedReference);
+  const mode = state.features === 0 ? void 0 : state.features & 32 /* EsmMode */ ? 99 /* ESNext */ : 1 /* CommonJS */;
   const priorityExtensions = extensions & (1 /* TypeScript */ | 4 /* Declaration */);
   const secondaryExtensions = extensions & ~(1 /* TypeScript */ | 4 /* Declaration */);
   if (priorityExtensions) {
@@ -34306,7 +34424,7 @@ function loadModuleFromNearestNodeModulesDirectoryWorker(extensions, moduleName,
   function lookup(extensions2) {
     return forEachAncestorDirectory(normalizeSlashes(directory), (ancestorDirectory) => {
       if (getBaseFileName(ancestorDirectory) !== "node_modules") {
-        const resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, ancestorDirectory, state);
+        const resolutionFromCache = tryFindNonRelativeModuleNameInCache(cache, moduleName, mode, ancestorDirectory, redirectedReference, state);
         if (resolutionFromCache) {
           return resolutionFromCache;
         }
@@ -34452,8 +34570,8 @@ function getPackageNameFromTypesPackageName(mangledName) {
 function unmangleScopedPackageName(typesPackageName) {
   return stringContains(typesPackageName, mangledScopedPackageSeparator) ? "@" + typesPackageName.replace(mangledScopedPackageSeparator, directorySeparator) : typesPackageName;
 }
-function tryFindNonRelativeModuleNameInCache(cache, moduleName, containingDirectory, state) {
-  const result = cache && cache.get(containingDirectory);
+function tryFindNonRelativeModuleNameInCache(cache, moduleName, mode, containingDirectory, redirectedReference, state) {
+  const result = cache && cache.getFromNonRelativeNameCache(moduleName, mode, containingDirectory, redirectedReference);
   if (result) {
     if (state.traceEnabled) {
       trace(state.host, Diagnostics.Resolution_for_module_0_was_found_in_cache_from_location_1, moduleName, containingDirectory);
@@ -34496,9 +34614,8 @@ function classicNameResolver(moduleName, containingFile, compilerOptions, host,
       return { value: resolvedUsingSettings };
     }
     if (!isExternalModuleNameRelative(moduleName)) {
-      const perModuleNameCache = cache && cache.getOrCreateCacheForModuleName(moduleName, void 0, redirectedReference);
       const resolved2 = forEachAncestorDirectory(containingDirectory, (directory) => {
-        const resolutionFromCache = tryFindNonRelativeModuleNameInCache(perModuleNameCache, moduleName, directory, state);
+        const resolutionFromCache = tryFindNonRelativeModuleNameInCache(cache, moduleName, void 0, directory, redirectedReference, state);
         if (resolutionFromCache) {
           return resolutionFromCache;
         }
@@ -48770,7 +48887,7 @@ function createTypeChecker(host) {
     return links.resolvedJSDocType;
   }
   function getSubstitutionType(baseType, constraint) {
-    if (constraint.flags & 3 /* AnyOrUnknown */ || constraint === baseType || !isGenericType(baseType) && !isGenericType(constraint)) {
+    if (constraint.flags & 3 /* AnyOrUnknown */ || constraint === baseType) {
       return baseType;
     }
     const id = `${getTypeId(baseType)}>${getTypeId(constraint)}`;
@@ -62654,6 +62771,7 @@ function createTypeChecker(host) {
   }
   function checkExpressionWithTypeArguments(node) {
     checkGrammarExpressionWithTypeArguments(node);
+    forEach(node.typeArguments, checkSourceElement);
     const exprType = node.kind === 230 /* ExpressionWithTypeArguments */ ? checkExpression(node.expression) : isThisIdentifier(node.exprName) ? checkThisExpression(node.exprName) : checkExpression(node.exprName);
     const typeArguments = node.typeArguments;
     if (exprType === silentNeverType || isErrorType(exprType) || !some(typeArguments)) {
@@ -98010,6 +98128,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     getSymlinkCache,
     realpath: (_o = host.realpath) == null ? void 0 : _o.bind(host),
     useCaseSensitiveFileNames: () => host.useCaseSensitiveFileNames(),
+    getCanonicalFileName,
     getFileIncludeReasons: () => fileReasons,
     structureIsReused,
     writeFile: writeFile2
@@ -98050,7 +98169,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     const containingFileName = getNormalizedAbsolutePath(containingFile.originalFileName, currentDirectory);
     const containingDir = getDirectoryPath(containingFileName);
     const redirectedReference = getRedirectReferenceForResolution(containingFile);
-    const fromCache = moduleResolutionCache.getOrCreateCacheForModuleName(name, mode, redirectedReference).get(containingDir);
+    const fromCache = moduleResolutionCache.getFromNonRelativeNameCache(name, mode, containingDir, redirectedReference);
     if (fromCache)
       addResolutionDiagnostics(fromCache);
   }
@@ -100578,14 +100697,13 @@ var BuilderState;
     const referencedMap = options.module !== 0 /* None */ && !isOutFile ? createManyToManyPathMap() : void 0;
     const exportedModulesMap = referencedMap ? createManyToManyPathMap() : void 0;
     const useOldState = canReuseOldState(referencedMap, oldState);
-    const getCanonicalFileName = createGetCanonicalFileName(newProgram.useCaseSensitiveFileNames());
     newProgram.getTypeChecker();
     for (const sourceFile of newProgram.getSourceFiles()) {
       const version2 = Debug.checkDefined(sourceFile.version, "Program intended to be used with Builder should have source files with versions set");
       const oldUncommittedSignature = useOldState ? (_a2 = oldState.oldSignatures) == null ? void 0 : _a2.get(sourceFile.resolvedPath) : void 0;
       const signature = oldUncommittedSignature === void 0 ? useOldState ? (_b = oldState.fileInfos.get(sourceFile.resolvedPath)) == null ? void 0 : _b.signature : void 0 : oldUncommittedSignature || void 0;
       if (referencedMap) {
-        const newReferences = getReferencedFiles(newProgram, sourceFile, getCanonicalFileName);
+        const newReferences = getReferencedFiles(newProgram, sourceFile, newProgram.getCanonicalFileName);
         if (newReferences) {
           referencedMap.set(sourceFile.resolvedPath, newReferences);
         }
@@ -100647,6 +100765,26 @@ var BuilderState;
     (state.hasCalledUpdateShapeSignature || (state.hasCalledUpdateShapeSignature = /* @__PURE__ */ new Set())).add(path);
   }
   BuilderState2.updateSignatureOfFile = updateSignatureOfFile;
+  function computeDtsSignature(programOfThisState, sourceFile, cancellationToken, host, onNewSignature) {
+    programOfThisState.emit(
+      sourceFile,
+      (fileName, text, _writeByteOrderMark, _onError, sourceFiles, data) => {
+        Debug.assert(isDeclarationFileName(fileName), `File extension for signature expected to be dts: Got:: ${fileName}`);
+        onNewSignature(computeSignatureWithDiagnostics(
+          programOfThisState,
+          sourceFile,
+          text,
+          host,
+          data
+        ), sourceFiles);
+      },
+      cancellationToken,
+      true,
+      void 0,
+      true
+    );
+  }
+  BuilderState2.computeDtsSignature = computeDtsSignature;
   function updateShapeSignature(state, programOfThisState, sourceFile, cancellationToken, host, useFileVersionAsSignature = state.useFileVersionAsSignature) {
     var _a2;
     if ((_a2 = state.hasCalledUpdateShapeSignature) == null ? void 0 : _a2.has(sourceFile.resolvedPath))
@@ -100655,26 +100793,12 @@ var BuilderState;
     const prevSignature = info.signature;
     let latestSignature;
     if (!sourceFile.isDeclarationFile && !useFileVersionAsSignature) {
-      programOfThisState.emit(
-        sourceFile,
-        (fileName, text, _writeByteOrderMark, _onError, sourceFiles, data) => {
-          Debug.assert(isDeclarationFileName(fileName), `File extension for signature expected to be dts: Got:: ${fileName}`);
-          latestSignature = computeSignatureWithDiagnostics(
-            programOfThisState,
-            sourceFile,
-            text,
-            host,
-            data
-          );
-          if (latestSignature !== prevSignature) {
-            updateExportedModules(state, sourceFile, sourceFiles[0].exportedModulesFromDeclarationEmit);
-          }
-        },
-        cancellationToken,
-        true,
-        void 0,
-        true
-      );
+      computeDtsSignature(programOfThisState, sourceFile, cancellationToken, host, (signature, sourceFiles) => {
+        latestSignature = signature;
+        if (latestSignature !== prevSignature) {
+          updateExportedModules(state, sourceFile, sourceFiles[0].exportedModulesFromDeclarationEmit);
+        }
+      });
     }
     if (latestSignature === void 0) {
       latestSignature = sourceFile.version;
@@ -100698,27 +100822,24 @@ var BuilderState;
     if (!state.exportedModulesMap)
       return;
     (state.oldExportedModulesMap || (state.oldExportedModulesMap = /* @__PURE__ */ new Map())).set(sourceFile.resolvedPath, state.exportedModulesMap.getValues(sourceFile.resolvedPath) || false);
-    if (!exportedModulesFromDeclarationEmit) {
-      state.exportedModulesMap.deleteKey(sourceFile.resolvedPath);
-      return;
-    }
-    let exportedModules;
-    exportedModulesFromDeclarationEmit.forEach((symbol) => addExportedModule(getReferencedFilesFromImportedModuleSymbol(symbol)));
+    const exportedModules = getExportedModules(exportedModulesFromDeclarationEmit);
     if (exportedModules) {
       state.exportedModulesMap.set(sourceFile.resolvedPath, exportedModules);
     } else {
       state.exportedModulesMap.deleteKey(sourceFile.resolvedPath);
     }
-    function addExportedModule(exportedModulePaths) {
-      if (exportedModulePaths == null ? void 0 : exportedModulePaths.length) {
-        if (!exportedModules) {
-          exportedModules = /* @__PURE__ */ new Set();
-        }
-        exportedModulePaths.forEach((path) => exportedModules.add(path));
-      }
-    }
   }
   BuilderState2.updateExportedModules = updateExportedModules;
+  function getExportedModules(exportedModulesFromDeclarationEmit) {
+    let exportedModules;
+    exportedModulesFromDeclarationEmit == null ? void 0 : exportedModulesFromDeclarationEmit.forEach(
+      (symbol) => getReferencedFilesFromImportedModuleSymbol(symbol).forEach(
+        (path) => (exportedModules != null ? exportedModules : exportedModules = /* @__PURE__ */ new Set()).add(path)
+      )
+    );
+    return exportedModules;
+  }
+  BuilderState2.getExportedModules = getExportedModules;
   function getAllDependencies(state, programOfThisState, sourceFile) {
     const compilerOptions = programOfThisState.getCompilerOptions();
     if (outFile(compilerOptions)) {
@@ -100860,9 +100981,9 @@ function getPendingEmitKind(optionsOrEmitKind, oldOptionsOrEmitKind) {
 function hasSameKeys(map1, map2) {
   return map1 === map2 || map1 !== void 0 && map2 !== void 0 && map1.size === map2.size && !forEachKey(map1, (key) => !map2.has(key));
 }
-function createBuilderProgramState(newProgram, oldState, disableUseFileVersionAsSignature) {
+function createBuilderProgramState(newProgram, oldState) {
   var _a2, _b;
-  const state = BuilderState.create(newProgram, oldState, disableUseFileVersionAsSignature);
+  const state = BuilderState.create(newProgram, oldState, false);
   state.program = newProgram;
   const compilerOptions = newProgram.getCompilerOptions();
   state.compilerOptions = compilerOptions;
@@ -100970,7 +101091,6 @@ function convertToDiagnostics(diagnostics, newProgram) {
   if (!diagnostics.length)
     return emptyArray;
   let buildInfoDirectory;
-  let getCanonicalFileName;
   return diagnostics.map((diagnostic) => {
     const result = convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath3);
     result.reportsUnnecessary = diagnostic.reportsUnnecessary;
@@ -100983,7 +101103,7 @@ function convertToDiagnostics(diagnostics, newProgram) {
   });
   function toPath3(path) {
     buildInfoDirectory != null ? buildInfoDirectory : buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(getTsBuildInfoEmitOutputFilePath(newProgram.getCompilerOptions()), newProgram.getCurrentDirectory()));
-    return toPath(path, buildInfoDirectory, getCanonicalFileName != null ? getCanonicalFileName : getCanonicalFileName = createGetCanonicalFileName(newProgram.useCaseSensitiveFileNames()));
+    return toPath(path, buildInfoDirectory, newProgram.getCanonicalFileName);
   }
 }
 function convertToDiagnosticRelatedInformation(diagnostic, newProgram, toPath3) {
@@ -101154,7 +101274,7 @@ function handleDtsMayChangeOf(state, path, cancellationToken, host) {
         sourceFile,
         cancellationToken,
         host,
-        !host.disableUseFileVersionAsSignature
+        true
       );
       if (getEmitDeclarations(state.compilerOptions)) {
         addToAffectedFilesPendingEmit(state, path, state.compilerOptions.declarationMap ? 24 /* AllDts */ : 8 /* Dts */);
@@ -101281,7 +101401,6 @@ function isProgramBundleEmitBuildInfo(info) {
 function getBuildInfo2(state, bundle) {
   var _a2, _b, _c;
   const currentDirectory = Debug.checkDefined(state.program).getCurrentDirectory();
-  const getCanonicalFileName = createGetCanonicalFileName(state.program.useCaseSensitiveFileNames());
   const buildInfoDirectory = getDirectoryPath(getNormalizedAbsolutePath(getTsBuildInfoEmitOutputFilePath(state.compilerOptions), currentDirectory));
   const latestChangedDtsFile = state.latestChangedDtsFile ? relativeToBuildInfoEnsuringAbsolutePath(state.latestChangedDtsFile) : void 0;
   const fileNames = [];
@@ -101399,7 +101518,7 @@ function getBuildInfo2(state, bundle) {
     return relativeToBuildInfo(getNormalizedAbsolutePath(path, currentDirectory));
   }
   function relativeToBuildInfo(path) {
-    return ensurePathIsNonModuleName(getRelativePathFromDirectory(buildInfoDirectory, path, getCanonicalFileName));
+    return ensurePathIsNonModuleName(getRelativePathFromDirectory(buildInfoDirectory, path, state.program.getCanonicalFileName));
   }
   function toFileId(path) {
     let fileId = fileNameToFileId.get(path);
@@ -101437,6 +101556,7 @@ function getBuildInfo2(state, bundle) {
 }
 function convertToReusableCompilerOptionValue(option, value, relativeToBuildInfo) {
   if (option) {
+    Debug.assert(option.type !== "listOrElement");
     if (option.type === "list") {
       const values = value;
       if (option.element.isFilePath && values.length) {
@@ -101502,7 +101622,6 @@ function getTextHandlingSourceMapForSignature(text, data) {
 }
 function computeSignatureWithDiagnostics(program, sourceFile, text, host, data) {
   var _a2, _b;
-  let getCanonicalFileName;
   text = getTextHandlingSourceMapForSignature(text, data);
   let sourceFileDirectory;
   if ((_a2 = data == null ? void 0 : data.diagnostics) == null ? void 0 : _a2.length) {
@@ -101522,7 +101641,7 @@ function computeSignatureWithDiagnostics(program, sourceFile, text, host, data)
     return `${ensurePathIsNonModuleName(getRelativePathFromDirectory(
       sourceFileDirectory,
       diagnostic.file.resolvedPath,
-      getCanonicalFileName != null ? getCanonicalFileName : getCanonicalFileName = createGetCanonicalFileName(program.useCaseSensitiveFileNames())
+      program.getCanonicalFileName
     ))}(${diagnostic.start},${diagnostic.length})`;
   }
 }
@@ -101537,7 +101656,7 @@ function createBuilderProgram(kind, { newProgram, host, oldProgram, configFilePa
     oldState = void 0;
     return oldProgram;
   }
-  const state = createBuilderProgramState(newProgram, oldState, host.disableUseFileVersionAsSignature);
+  const state = createBuilderProgramState(newProgram, oldState);
   newProgram.getBuildInfo = (bundle) => getBuildInfo2(state, bundle);
   newProgram = void 0;
   oldProgram = void 0;
@@ -101996,9 +102115,9 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
   let filesWithInvalidatedResolutions;
   let filesWithInvalidatedNonRelativeUnresolvedImports;
   const nonRelativeExternalModuleResolutions = createMultiMap();
-  const resolutionsWithFailedLookups = [];
-  const resolutionsWithOnlyAffectingLocations = [];
-  const resolvedFileToResolution = createMultiMap();
+  const resolutionsWithFailedLookups = /* @__PURE__ */ new Set();
+  const resolutionsWithOnlyAffectingLocations = /* @__PURE__ */ new Set();
+  const resolvedFileToResolution = /* @__PURE__ */ new Map();
   const impliedFormatPackageJsons = /* @__PURE__ */ new Map();
   let hasChangedAutomaticTypeDirectiveNames = false;
   let affectingPathChecksForFile;
@@ -102071,8 +102190,8 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     resolvedModuleNames.clear();
     resolvedTypeReferenceDirectives.clear();
     resolvedFileToResolution.clear();
-    resolutionsWithFailedLookups.length = 0;
-    resolutionsWithOnlyAffectingLocations.length = 0;
+    resolutionsWithFailedLookups.clear();
+    resolutionsWithOnlyAffectingLocations.clear();
     failedLookupChecks = void 0;
     startsWithPathChecks = void 0;
     isInDirectoryChecks = void 0;
@@ -102389,12 +102508,13 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     return fileExtensionIsOneOf(path, failedLookupDefaultExtensions);
   }
   function watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, filePath, getResolutionWithResolvedFileName) {
+    var _a2, _b;
     if (resolution.refCount) {
       resolution.refCount++;
       Debug.assertIsDefined(resolution.files);
     } else {
       resolution.refCount = 1;
-      Debug.assert(length(resolution.files) === 0);
+      Debug.assert(!((_a2 = resolution.files) == null ? void 0 : _a2.size));
       if (isExternalModuleNameRelative(name)) {
         watchFailedLookupLocationOfResolution(resolution);
       } else {
@@ -102402,10 +102522,14 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
       }
       const resolved = getResolutionWithResolvedFileName(resolution);
       if (resolved && resolved.resolvedFileName) {
-        resolvedFileToResolution.add(resolutionHost.toPath(resolved.resolvedFileName), resolution);
+        const key = resolutionHost.toPath(resolved.resolvedFileName);
+        let resolutions = resolvedFileToResolution.get(key);
+        if (!resolutions)
+          resolvedFileToResolution.set(key, resolutions = /* @__PURE__ */ new Set());
+        resolutions.add(resolution);
       }
     }
-    (resolution.files || (resolution.files = [])).push(filePath);
+    ((_b = resolution.files) != null ? _b : resolution.files = /* @__PURE__ */ new Set()).add(filePath);
   }
   function watchFailedLookupLocationOfResolution(resolution) {
     Debug.assert(!!resolution.refCount);
@@ -102413,7 +102537,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     if (!(failedLookupLocations == null ? void 0 : failedLookupLocations.length) && !(affectingLocations == null ? void 0 : affectingLocations.length))
       return;
     if (failedLookupLocations == null ? void 0 : failedLookupLocations.length)
-      resolutionsWithFailedLookups.push(resolution);
+      resolutionsWithFailedLookups.add(resolution);
     let setAtRoot = false;
     if (failedLookupLocations) {
       for (const failedLookupLocation of failedLookupLocations) {
@@ -102445,7 +102569,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     if (!(affectingLocations == null ? void 0 : affectingLocations.length))
       return;
     if (addToResolutionsWithOnlyAffectingLocations)
-      resolutionsWithOnlyAffectingLocations.push(resolution);
+      resolutionsWithOnlyAffectingLocations.add(resolution);
     for (const affectingLocation of affectingLocations) {
       createFileWatcherOfAffectingLocation(affectingLocation, true);
     }
@@ -102524,17 +102648,20 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     }
   }
   function stopWatchFailedLookupLocationOfResolution(resolution, filePath, getResolutionWithResolvedFileName) {
-    unorderedRemoveItem(Debug.checkDefined(resolution.files), filePath);
+    Debug.checkDefined(resolution.files).delete(filePath);
     resolution.refCount--;
     if (resolution.refCount) {
       return;
     }
     const resolved = getResolutionWithResolvedFileName(resolution);
     if (resolved && resolved.resolvedFileName) {
-      resolvedFileToResolution.remove(resolutionHost.toPath(resolved.resolvedFileName), resolution);
+      const key = resolutionHost.toPath(resolved.resolvedFileName);
+      const resolutions = resolvedFileToResolution.get(key);
+      if ((resolutions == null ? void 0 : resolutions.delete(resolution)) && !resolutions.size)
+        resolvedFileToResolution.delete(key);
     }
     const { failedLookupLocations, affectingLocations } = resolution;
-    if (unorderedRemoveItem(resolutionsWithFailedLookups, resolution)) {
+    if (resolutionsWithFailedLookups.delete(resolution)) {
       let removeAtRoot = false;
       for (const failedLookupLocation of failedLookupLocations) {
         const failedLookupLocationPath = resolutionHost.toPath(failedLookupLocation);
@@ -102561,7 +102688,7 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
         removeDirectoryWatcher(rootPath);
       }
     } else if (affectingLocations == null ? void 0 : affectingLocations.length) {
-      unorderedRemoveItem(resolutionsWithOnlyAffectingLocations, resolution);
+      resolutionsWithOnlyAffectingLocations.delete(resolution);
     }
     if (affectingLocations) {
       for (const affectingLocation of affectingLocations) {
@@ -102609,15 +102736,15 @@ function createResolutionCache(resolutionHost, rootDirForResolution, logChangesW
     if (!resolutions)
       return false;
     let invalidated = false;
-    for (const resolution of resolutions) {
+    resolutions.forEach((resolution) => {
       if (resolution.isInvalidated || !canInvalidate(resolution))
-        continue;
+        return;
       resolution.isInvalidated = invalidated = true;
       for (const containingFilePath of Debug.checkDefined(resolution.files)) {
         (filesWithInvalidatedResolutions != null ? filesWithInvalidatedResolutions : filesWithInvalidatedResolutions = /* @__PURE__ */ new Set()).add(containingFilePath);
         hasChangedAutomaticTypeDirectiveNames = hasChangedAutomaticTypeDirectiveNames || endsWith(containingFilePath, inferredTypesContainingFile);
       }
-    }
+    });
     return invalidated;
   }
   function invalidateResolutionOfFile(filePath) {
@@ -102912,8 +103039,7 @@ function listFiles(program, write) {
 function explainFiles(program, write) {
   var _a2, _b;
   const reasons = program.getFileIncludeReasons();
-  const getCanonicalFileName = createGetCanonicalFileName(program.useCaseSensitiveFileNames());
-  const relativeFileName = (fileName) => convertToRelativePath(fileName, program.getCurrentDirectory(), getCanonicalFileName);
+  const relativeFileName = (fileName) => convertToRelativePath(fileName, program.getCurrentDirectory(), program.getCanonicalFileName);
   for (const file of program.getSourceFiles()) {
     write(`${toFileName(file, relativeFileName)}`);
     (_a2 = reasons.get(file.path)) == null ? void 0 : _a2.forEach((reason) => write(`  ${fileIncludeReasonToDiagnostics(program, reason, relativeFileName).messageText}`));
@@ -102971,10 +103097,9 @@ function getMatchedFileSpec(program, fileName) {
   const configFile = program.getCompilerOptions().configFile;
   if (!((_a2 = configFile == null ? void 0 : configFile.configFileSpecs) == null ? void 0 : _a2.validatedFilesSpec))
     return void 0;
-  const getCanonicalFileName = createGetCanonicalFileName(program.useCaseSensitiveFileNames());
-  const filePath = getCanonicalFileName(fileName);
+  const filePath = program.getCanonicalFileName(fileName);
   const basePath = getDirectoryPath(getNormalizedAbsolutePath(configFile.fileName, program.getCurrentDirectory()));
-  return find(configFile.configFileSpecs.validatedFilesSpec, (fileSpec) => getCanonicalFileName(getNormalizedAbsolutePath(fileSpec, basePath)) === filePath);
+  return find(configFile.configFileSpecs.validatedFilesSpec, (fileSpec) => program.getCanonicalFileName(getNormalizedAbsolutePath(fileSpec, basePath)) === filePath);
 }
 function getMatchedIncludeSpec(program, fileName) {
   var _a2, _b;
@@ -103207,7 +103332,6 @@ function createCompilerHostFromProgramHost(host, getCompilerOptions, directorySt
     getEnvironmentVariable: maybeBind(host, host.getEnvironmentVariable) || (() => ""),
     createHash: maybeBind(host, host.createHash),
     readDirectory: maybeBind(host, host.readDirectory),
-    disableUseFileVersionAsSignature: host.disableUseFileVersionAsSignature,
     storeFilesChangingSignatureDuringEmit: host.storeFilesChangingSignatureDuringEmit
   };
   return compilerHost;
@@ -103274,7 +103398,6 @@ function createProgramHost(system, createProgram2) {
     writeFile: (path, data, writeByteOrderMark) => system.writeFile(path, data, writeByteOrderMark),
     createHash: maybeBind(system, system.createHash),
     createProgram: createProgram2 || createEmitAndSemanticDiagnosticsBuilderProgram,
-    disableUseFileVersionAsSignature: system.disableUseFileVersionAsSignature,
     storeFilesChangingSignatureDuringEmit: system.storeFilesChangingSignatureDuringEmit,
     now: maybeBind(system, system.now)
   };
@@ -103376,7 +103499,6 @@ function readBuilderProgram(compilerOptions, host) {
 function createIncrementalCompilerHost(options, system = sys) {
   const host = createCompilerHostWorker(options, void 0, system);
   host.createHash = maybeBind(system, system.createHash);
-  host.disableUseFileVersionAsSignature = system.disableUseFileVersionAsSignature;
   host.storeFilesChangingSignatureDuringEmit = system.storeFilesChangingSignatureDuringEmit;
   setGetSourceFileAsHashVersioned(host);
   changeCompilerHostLikeToUseCache(host, (fileName) => toPath(fileName, host.getCurrentDirectory(), host.getCanonicalFileName));
@@ -104111,8 +104233,6 @@ function createSolutionBuilderWithWatch(host, rootNames, defaultOptions, baseWat
 function createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, options, baseWatchOptions) {
   const host = hostOrHostWithWatch;
   const hostWithWatch = hostOrHostWithWatch;
-  const currentDirectory = host.getCurrentDirectory();
-  const getCanonicalFileName = createGetCanonicalFileName(host.useCaseSensitiveFileNames());
   const baseCompilerOptions = getCompilerOptionsOfBuildOptions(options);
   const compilerHost = createCompilerHostFromProgramHost(host, () => state.projectCompilerOptions);
   setGetSourceFileAsHashVersioned(compilerHost);
@@ -104124,7 +104244,7 @@ function createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, optio
   compilerHost.getModuleResolutionCache = maybeBind(host, host.getModuleResolutionCache);
   let moduleResolutionCache, typeReferenceDirectiveResolutionCache;
   if (!compilerHost.resolveModuleNameLiterals && !compilerHost.resolveModuleNames) {
-    moduleResolutionCache = createModuleResolutionCache(currentDirectory, getCanonicalFileName);
+    moduleResolutionCache = createModuleResolutionCache(compilerHost.getCurrentDirectory(), compilerHost.getCanonicalFileName);
     compilerHost.resolveModuleNameLiterals = (moduleNames, containingFile, redirectedReference, options2, containingSourceFile) => loadWithModeAwareCache(
       moduleNames,
       containingFile,
@@ -104138,7 +104258,7 @@ function createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, optio
     compilerHost.getModuleResolutionCache = () => moduleResolutionCache;
   }
   if (!compilerHost.resolveTypeReferenceDirectiveReferences && !compilerHost.resolveTypeReferenceDirectives) {
-    typeReferenceDirectiveResolutionCache = createTypeReferenceDirectiveResolutionCache(currentDirectory, getCanonicalFileName, void 0, moduleResolutionCache == null ? void 0 : moduleResolutionCache.getPackageJsonInfoCache());
+    typeReferenceDirectiveResolutionCache = createTypeReferenceDirectiveResolutionCache(compilerHost.getCurrentDirectory(), compilerHost.getCanonicalFileName, void 0, moduleResolutionCache == null ? void 0 : moduleResolutionCache.getPackageJsonInfoCache());
     compilerHost.resolveTypeReferenceDirectiveReferences = (typeDirectiveNames, containingFile, redirectedReference, options2, containingSourceFile) => loadWithModeAwareCache(
       typeDirectiveNames,
       containingFile,
@@ -104155,8 +104275,6 @@ function createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, optio
   const state = {
     host,
     hostWithWatch,
-    currentDirectory,
-    getCanonicalFileName,
     parseConfigFileHost: parseConfigHostFromCompilerHostLike(host),
     write: maybeBind(host, host.trace),
     options,
@@ -104200,7 +104318,7 @@ function createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, optio
   return state;
 }
 function toPath2(state, fileName) {
-  return toPath(fileName, state.currentDirectory, state.getCanonicalFileName);
+  return toPath(fileName, state.compilerHost.getCurrentDirectory(), state.compilerHost.getCanonicalFileName);
 }
 function toResolvedConfigFilePath(state, fileName) {
   const { resolvedConfigFilePaths } = state;
@@ -104243,7 +104361,7 @@ function parseConfigFile(state, configFileName, configFilePath) {
   return parsed;
 }
 function resolveProjectName(state, name) {
-  return resolveConfigFileProjectName(resolvePath(state.currentDirectory, name));
+  return resolveConfigFileProjectName(resolvePath(state.compilerHost.getCurrentDirectory(), name));
 }
 function createBuildOrder(state, roots) {
   const temporaryMarks = /* @__PURE__ */ new Map();
@@ -104446,7 +104564,7 @@ function createUpdateOutputFileStampsProject(state, project, projectPath, config
     projectPath,
     buildOrder,
     getCompilerOptions: () => config.options,
-    getCurrentDirectory: () => state.currentDirectory,
+    getCurrentDirectory: () => state.compilerHost.getCurrentDirectory(),
     updateOutputFileStatmps: () => {
       updateOutputTimestamps(state, config, projectPath);
       updateOutputFileStampsPending = false;
@@ -104471,7 +104589,7 @@ function createBuildOrUpdateInvalidedProject(kind, state, project, projectPath,
     projectPath,
     buildOrder,
     getCompilerOptions: () => config.options,
-    getCurrentDirectory: () => state.currentDirectory,
+    getCurrentDirectory: () => state.compilerHost.getCurrentDirectory(),
     getBuilderProgram: () => withProgramOrUndefined(identity),
     getProgram: () => withProgramOrUndefined(
       (program2) => program2.getProgramOrUndefined()
@@ -104527,7 +104645,7 @@ function createBuildOrUpdateInvalidedProject(kind, state, project, projectPath,
     projectPath,
     buildOrder,
     getCompilerOptions: () => config.options,
-    getCurrentDirectory: () => state.currentDirectory,
+    getCurrentDirectory: () => state.compilerHost.getCurrentDirectory(),
     emit: (writeFile2, customTransformers) => {
       if (step !== 4 /* EmitBundle */)
         return invalidatedProjectOfBundle;
@@ -105634,7 +105752,7 @@ function watchWildCardDirectories(state, resolved, resolvedPath, parsed) {
           fileOrDirectory,
           fileOrDirectoryPath: toPath2(state, fileOrDirectory),
           configFileName: resolved,
-          currentDirectory: state.currentDirectory,
+          currentDirectory: state.compilerHost.getCurrentDirectory(),
           options: parsed.options,
           program: state.builderPrograms.get(resolvedPath) || ((_a2 = getCachedParsedConfigFile(state, resolvedPath)) == null ? void 0 : _a2.fileNames),
           useCaseSensitiveFileNames: state.parseConfigFileHost.useCaseSensitiveFileNames,
@@ -105739,7 +105857,7 @@ function createSolutionBuilderWorker(watch, hostOrHostWithWatch, rootNames, opti
   };
 }
 function relName(state, path) {
-  return convertToRelativePath(path, state.currentDirectory, (f) => state.getCanonicalFileName(f));
+  return convertToRelativePath(path, state.compilerHost.getCurrentDirectory(), state.compilerHost.getCanonicalFileName);
 }
 function reportStatus(state, message, ...args) {
   state.host.reportSolutionBuilderStatus(createCompilerDiagnostic(message, ...args));
@@ -106029,7 +106147,7 @@ function generateOptionOutput(sys2, option, rightAlignOfLeft, leftAlignOfRight)
   const valueCandidates = getValueCandidate(option);
   const defaultValueDescription = typeof option.defaultValueDescription === "object" ? getDiagnosticText(option.defaultValueDescription) : formatDefaultValue(
     option.defaultValueDescription,
-    option.type === "list" ? option.element.type : option.type
+    option.type === "list" || option.type === "listOrElement" ? option.element.type : option.type
   );
   const terminalWidth = (_b = (_a2 = sys2.getWidthOfTerminal) == null ? void 0 : _a2.call(sys2)) != null ? _b : 0;
   if (terminalWidth >= 80) {
@@ -106113,6 +106231,7 @@ function generateOptionOutput(sys2, option, rightAlignOfLeft, leftAlignOfRight)
       possibleValues: getPossibleValues(option2)
     };
     function getValueType(option3) {
+      Debug.assert(option3.type !== "listOrElement");
       switch (option3.type) {
         case "string":
         case "number":
@@ -106133,6 +106252,7 @@ function generateOptionOutput(sys2, option, rightAlignOfLeft, leftAlignOfRight)
           possibleValues = option3.type;
           break;
         case "list":
+        case "listOrElement":
           possibleValues = getPossibleValues(option3.element);
           break;
         case "object":