npm - @typescript-deploys/pr-build - Versions diffs - 5.0.0-pr-51753-3 → 5.0.0-pr-50403-6 - Mend

@typescript-deploys/pr-build 5.0.0-pr-51753-3 → 5.0.0-pr-50403-6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/lib/tsc.js +388 -303
package/lib/tsserver.js +424 -342
package/lib/tsserverlibrary.d.ts +28 -24
package/lib/tsserverlibrary.js +425 -339
package/lib/typescript.d.ts +28 -24
package/lib/typescript.js +425 -335
package/lib/typingsInstaller.js +109 -123
package/package.json +1 -1

package/lib/tsc.js CHANGED Viewed

@@ -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 = [];
@@ -3340,15 +3340,14 @@ var SyntaxKind = /* @__PURE__ */ ((SyntaxKind4) => {
   SyntaxKind4[SyntaxKind4["JSDocTypedefTag"] = 348] = "JSDocTypedefTag";
   SyntaxKind4[SyntaxKind4["JSDocSeeTag"] = 349] = "JSDocSeeTag";
   SyntaxKind4[SyntaxKind4["JSDocPropertyTag"] = 350] = "JSDocPropertyTag";
-  SyntaxKind4[SyntaxKind4["JSDocSatisfiesTag"] = 351] = "JSDocSatisfiesTag";
-  SyntaxKind4[SyntaxKind4["SyntaxList"] = 352] = "SyntaxList";
-  SyntaxKind4[SyntaxKind4["NotEmittedStatement"] = 353] = "NotEmittedStatement";
-  SyntaxKind4[SyntaxKind4["PartiallyEmittedExpression"] = 354] = "PartiallyEmittedExpression";
-  SyntaxKind4[SyntaxKind4["CommaListExpression"] = 355] = "CommaListExpression";
-  SyntaxKind4[SyntaxKind4["MergeDeclarationMarker"] = 356] = "MergeDeclarationMarker";
-  SyntaxKind4[SyntaxKind4["EndOfDeclarationMarker"] = 357] = "EndOfDeclarationMarker";
-  SyntaxKind4[SyntaxKind4["SyntheticReferenceExpression"] = 358] = "SyntheticReferenceExpression";
-  SyntaxKind4[SyntaxKind4["Count"] = 359] = "Count";
+  SyntaxKind4[SyntaxKind4["SyntaxList"] = 351] = "SyntaxList";
+  SyntaxKind4[SyntaxKind4["NotEmittedStatement"] = 352] = "NotEmittedStatement";
+  SyntaxKind4[SyntaxKind4["PartiallyEmittedExpression"] = 353] = "PartiallyEmittedExpression";
+  SyntaxKind4[SyntaxKind4["CommaListExpression"] = 354] = "CommaListExpression";
+  SyntaxKind4[SyntaxKind4["MergeDeclarationMarker"] = 355] = "MergeDeclarationMarker";
+  SyntaxKind4[SyntaxKind4["EndOfDeclarationMarker"] = 356] = "EndOfDeclarationMarker";
+  SyntaxKind4[SyntaxKind4["SyntheticReferenceExpression"] = 357] = "SyntheticReferenceExpression";
+  SyntaxKind4[SyntaxKind4["Count"] = 358] = "Count";
   SyntaxKind4[SyntaxKind4["FirstAssignment"] = 63 /* EqualsToken */] = "FirstAssignment";
   SyntaxKind4[SyntaxKind4["LastAssignment"] = 78 /* CaretEqualsToken */] = "LastAssignment";
   SyntaxKind4[SyntaxKind4["FirstCompoundAssignment"] = 64 /* PlusEqualsToken */] = "FirstCompoundAssignment";
@@ -9876,9 +9875,6 @@ function getJSDocThisTag(node) {
 function getJSDocReturnTag(node) {
   return getFirstJSDocTag(node, isJSDocReturnTag);
 }
-function getJSDocSatisfiesTag(node) {
-  return getFirstJSDocTag(node, isJSDocSatisfiesTag);
-}
 function getJSDocTypeTag(node) {
   const tag = getFirstJSDocTag(node, isJSDocTypeTag);
   if (tag && tag.typeExpression && tag.typeExpression.type) {
@@ -10369,8 +10365,8 @@ function isExpressionKind(kind) {
     case 227 /* SpreadElement */:
     case 231 /* AsExpression */:
     case 229 /* OmittedExpression */:
-    case 355 /* CommaListExpression */:
-    case 354 /* PartiallyEmittedExpression */:
+    case 354 /* CommaListExpression */:
+    case 353 /* PartiallyEmittedExpression */:
     case 235 /* SatisfiesExpression */:
       return true;
     default:
@@ -10433,7 +10429,7 @@ function isDeclarationStatementKind(kind) {
   return kind === 259 /* FunctionDeclaration */ || kind === 279 /* MissingDeclaration */ || kind === 260 /* ClassDeclaration */ || kind === 261 /* InterfaceDeclaration */ || kind === 262 /* TypeAliasDeclaration */ || kind === 263 /* EnumDeclaration */ || kind === 264 /* ModuleDeclaration */ || kind === 269 /* ImportDeclaration */ || kind === 268 /* ImportEqualsDeclaration */ || kind === 275 /* ExportDeclaration */ || kind === 274 /* ExportAssignment */ || kind === 267 /* NamespaceExportDeclaration */;
 }
 function isStatementKindButNotDeclarationKind(kind) {
-  return kind === 249 /* BreakStatement */ || kind === 248 /* ContinueStatement */ || kind === 256 /* DebuggerStatement */ || kind === 243 /* DoStatement */ || kind === 241 /* ExpressionStatement */ || kind === 239 /* EmptyStatement */ || kind === 246 /* ForInStatement */ || kind === 247 /* ForOfStatement */ || kind === 245 /* ForStatement */ || kind === 242 /* IfStatement */ || kind === 253 /* LabeledStatement */ || kind === 250 /* ReturnStatement */ || kind === 252 /* SwitchStatement */ || kind === 254 /* ThrowStatement */ || kind === 255 /* TryStatement */ || kind === 240 /* VariableStatement */ || kind === 244 /* WhileStatement */ || kind === 251 /* WithStatement */ || kind === 353 /* NotEmittedStatement */ || kind === 357 /* EndOfDeclarationMarker */ || kind === 356 /* MergeDeclarationMarker */;
+  return kind === 249 /* BreakStatement */ || kind === 248 /* ContinueStatement */ || kind === 256 /* DebuggerStatement */ || kind === 243 /* DoStatement */ || kind === 241 /* ExpressionStatement */ || kind === 239 /* EmptyStatement */ || kind === 246 /* ForInStatement */ || kind === 247 /* ForOfStatement */ || kind === 245 /* ForStatement */ || kind === 242 /* IfStatement */ || kind === 253 /* LabeledStatement */ || kind === 250 /* ReturnStatement */ || kind === 252 /* SwitchStatement */ || kind === 254 /* ThrowStatement */ || kind === 255 /* TryStatement */ || kind === 240 /* VariableStatement */ || kind === 244 /* WhileStatement */ || kind === 251 /* WithStatement */ || kind === 352 /* NotEmittedStatement */ || kind === 356 /* EndOfDeclarationMarker */ || kind === 355 /* MergeDeclarationMarker */;
 }
 function isDeclaration(node) {
   if (node.kind === 165 /* TypeParameter */) {
@@ -10879,7 +10875,7 @@ function getTokenPosOfNode(node, sourceFile, includeJsDoc) {
   if (includeJsDoc && hasJSDocNodes(node)) {
     return getTokenPosOfNode(node.jsDoc[0], sourceFile);
   }
-  if (node.kind === 352 /* SyntaxList */ && node._children.length > 0) {
+  if (node.kind === 351 /* SyntaxList */ && node._children.length > 0) {
     return getTokenPosOfNode(node._children[0], sourceFile, includeJsDoc);
   }
   return skipTrivia(
@@ -12940,7 +12936,7 @@ function getOperator(expression) {
 }
 function getOperatorPrecedence(nodeKind, operatorKind, hasArguments) {
   switch (nodeKind) {
-    case 355 /* CommaListExpression */:
+    case 354 /* CommaListExpression */:
       return 0 /* Comma */;
     case 227 /* SpreadElement */:
       return 1 /* Spread */;
@@ -14362,7 +14358,7 @@ function getLeftmostExpression(node, stopAtCallExpressions) {
       case 209 /* ElementAccessExpression */:
       case 208 /* PropertyAccessExpression */:
       case 232 /* NonNullExpression */:
-      case 354 /* PartiallyEmittedExpression */:
+      case 353 /* PartiallyEmittedExpression */:
       case 235 /* SatisfiesExpression */:
         node = node.expression;
         continue;
@@ -15487,7 +15483,7 @@ function getContainingNodeArray(node) {
       return parent.types;
     case 186 /* TupleType */:
     case 206 /* ArrayLiteralExpression */:
-    case 355 /* CommaListExpression */:
+    case 354 /* CommaListExpression */:
     case 272 /* NamedImports */:
     case 276 /* NamedExports */:
       return parent.elements;
@@ -15639,15 +15635,6 @@ function canUsePropertyAccess(name, languageVersion) {
   const firstChar = name.charCodeAt(0);
   return firstChar === 35 /* hash */ ? name.length > 1 && isIdentifierStart(name.charCodeAt(1), languageVersion) : isIdentifierStart(firstChar, languageVersion);
 }
-function isJSDocSatisfiesExpression(node) {
-  return isInJSFile(node) && isParenthesizedExpression(node) && !!getJSDocSatisfiesTag(node);
-}
-function getJSDocSatisfiesExpressionType(node) {
-  const tag = getJSDocSatisfiesTag(node);
-  const type = tag && tag.typeExpression && tag.typeExpression.type;
-  Debug.assertIsDefined(type);
-  return type;
-}
 // src/compiler/factory/baseNodeFactory.ts
 function createBaseNodeFactory() {
@@ -16592,12 +16579,6 @@ function createNodeFactory(flags, baseFactory2) {
     get updateJSDocDeprecatedTag() {
       return getJSDocSimpleTagUpdateFunction(334 /* JSDocDeprecatedTag */);
     },
-    get createJSDocSatisfiesTag() {
-      return getJSDocTypeLikeTagCreateFunction(351 /* JSDocSatisfiesTag */);
-    },
-    get updateJSDocSatisfiesTag() {
-      return getJSDocTypeLikeTagUpdateFunction(351 /* JSDocSatisfiesTag */);
-    },
     createJSDocUnknownTag,
     updateJSDocUnknownTag,
     createJSDocText,
@@ -19547,18 +19528,18 @@ function createNodeFactory(flags, baseFactory2) {
     return node;
   }
   function createSyntaxList(children) {
-    const node = createBaseNode(352 /* SyntaxList */);
+    const node = createBaseNode(351 /* SyntaxList */);
     node._children = children;
     return node;
   }
   function createNotEmittedStatement(original) {
-    const node = createBaseNode(353 /* NotEmittedStatement */);
+    const node = createBaseNode(352 /* NotEmittedStatement */);
     node.original = original;
     setTextRange(node, original);
     return node;
   }
   function createPartiallyEmittedExpression(expression, original) {
-    const node = createBaseNode(354 /* PartiallyEmittedExpression */);
+    const node = createBaseNode(353 /* PartiallyEmittedExpression */);
     node.expression = expression;
     node.original = original;
     node.transformFlags |= propagateChildFlags(node.expression) | 1 /* ContainsTypeScript */;
@@ -19580,7 +19561,7 @@ function createNodeFactory(flags, baseFactory2) {
     return node;
   }
   function createCommaListExpression(elements) {
-    const node = createBaseNode(355 /* CommaListExpression */);
+    const node = createBaseNode(354 /* CommaListExpression */);
     node.elements = createNodeArray(sameFlatMap(elements, flattenCommaElements));
     node.transformFlags |= propagateChildrenFlags(node.elements);
     return node;
@@ -19589,19 +19570,19 @@ function createNodeFactory(flags, baseFactory2) {
     return node.elements !== elements ? update(createCommaListExpression(elements), node) : node;
   }
   function createEndOfDeclarationMarker(original) {
-    const node = createBaseNode(357 /* EndOfDeclarationMarker */);
+    const node = createBaseNode(356 /* EndOfDeclarationMarker */);
     node.emitNode = {};
     node.original = original;
     return node;
   }
   function createMergeDeclarationMarker(original) {
-    const node = createBaseNode(356 /* MergeDeclarationMarker */);
+    const node = createBaseNode(355 /* MergeDeclarationMarker */);
     node.emitNode = {};
     node.original = original;
     return node;
   }
   function createSyntheticReferenceExpression(expression, thisArg) {
-    const node = createBaseNode(358 /* SyntheticReferenceExpression */);
+    const node = createBaseNode(357 /* SyntheticReferenceExpression */);
     node.expression = expression;
     node.thisArg = thisArg;
     node.transformFlags |= propagateChildFlags(node.expression) | propagateChildFlags(node.thisArg);
@@ -19749,7 +19730,7 @@ function createNodeFactory(flags, baseFactory2) {
         return updateSatisfiesExpression(outerExpression, expression, outerExpression.type);
       case 232 /* NonNullExpression */:
         return updateNonNullExpression(outerExpression, expression);
-      case 354 /* PartiallyEmittedExpression */:
+      case 353 /* PartiallyEmittedExpression */:
         return updatePartiallyEmittedExpression(outerExpression, expression);
     }
   }
@@ -20240,7 +20221,7 @@ function getTransformFlagsSubtreeExclusions(kind) {
     case 213 /* TypeAssertionExpression */:
     case 235 /* SatisfiesExpression */:
     case 231 /* AsExpression */:
-    case 354 /* PartiallyEmittedExpression */:
+    case 353 /* PartiallyEmittedExpression */:
     case 214 /* ParenthesizedExpression */:
     case 106 /* SuperKeyword */:
       return -2147483648 /* OuterExpressionExcludes */;
@@ -21692,10 +21673,10 @@ function isMetaProperty(node) {
   return node.kind === 233 /* MetaProperty */;
 }
 function isPartiallyEmittedExpression(node) {
-  return node.kind === 354 /* PartiallyEmittedExpression */;
+  return node.kind === 353 /* PartiallyEmittedExpression */;
 }
 function isCommaListExpression(node) {
-  return node.kind === 355 /* CommaListExpression */;
+  return node.kind === 354 /* CommaListExpression */;
 }
 function isTemplateSpan(node) {
   return node.kind === 236 /* TemplateSpan */;
@@ -21818,10 +21799,10 @@ function isExportSpecifier(node) {
   return node.kind === 278 /* ExportSpecifier */;
 }
 function isNotEmittedStatement(node) {
-  return node.kind === 353 /* NotEmittedStatement */;
+  return node.kind === 352 /* NotEmittedStatement */;
 }
 function isSyntheticReference(node) {
-  return node.kind === 358 /* SyntheticReferenceExpression */;
+  return node.kind === 357 /* SyntheticReferenceExpression */;
 }
 function isExternalModuleReference(node) {
   return node.kind === 280 /* ExternalModuleReference */;
@@ -21982,9 +21963,6 @@ function isJSDocTypedefTag(node) {
 function isJSDocImplementsTag(node) {
   return node.kind === 332 /* JSDocImplementsTag */;
 }
-function isJSDocSatisfiesTag(node) {
-  return node.kind === 351 /* JSDocSatisfiesTag */;
-}
 // src/compiler/factory/utilities.ts
 function createEmptyExports(factory2) {
@@ -22280,7 +22258,7 @@ function startsWithUseStrict(statements) {
   return firstStatement !== void 0 && isPrologueDirective(firstStatement) && isUseStrictPrologue(firstStatement);
 }
 function isCommaSequence(node) {
-  return node.kind === 223 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ || node.kind === 355 /* CommaListExpression */;
+  return node.kind === 223 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ || node.kind === 354 /* CommaListExpression */;
 }
 function isJSDocTypeAssertion(node) {
   return isParenthesizedExpression(node) && isInJSFile(node) && !!getJSDocTypeTag(node);
@@ -22303,7 +22281,7 @@ function isOuterExpression(node, kinds = 15 /* All */) {
       return (kinds & 2 /* TypeAssertions */) !== 0;
     case 232 /* NonNullExpression */:
       return (kinds & 4 /* NonNullAssertions */) !== 0;
-    case 354 /* PartiallyEmittedExpression */:
+    case 353 /* PartiallyEmittedExpression */:
       return (kinds & 8 /* PartiallyEmittedExpressions */) !== 0;
   }
   return false;
@@ -23230,7 +23208,7 @@ var forEachChildTable = {
   [279 /* MissingDeclaration */]: function forEachChildInMissingDeclaration(node, cbNode, cbNodes) {
     return visitNodes(cbNode, cbNodes, node.illegalDecorators) || visitNodes(cbNode, cbNodes, node.modifiers);
   },
-  [355 /* CommaListExpression */]: function forEachChildInCommaListExpression(node, cbNode, cbNodes) {
+  [354 /* CommaListExpression */]: function forEachChildInCommaListExpression(node, cbNode, cbNodes) {
     return visitNodes(cbNode, cbNodes, node.elements);
   },
   [281 /* JsxElement */]: function forEachChildInJsxElement(node, cbNode, cbNodes) {
@@ -23298,11 +23276,10 @@ var forEachChildTable = {
   [341 /* JSDocCallbackTag */]: function forEachChildInJSDocCallbackTag(node, cbNode, cbNodes) {
     return visitNode2(cbNode, node.tagName) || visitNode2(cbNode, node.fullName) || visitNode2(cbNode, node.typeExpression) || (typeof node.comment === "string" ? void 0 : visitNodes(cbNode, cbNodes, node.comment));
   },
-  [344 /* JSDocReturnTag */]: forEachChildInJSDocTypeLikeTag,
-  [346 /* JSDocTypeTag */]: forEachChildInJSDocTypeLikeTag,
-  [345 /* JSDocThisTag */]: forEachChildInJSDocTypeLikeTag,
-  [342 /* JSDocEnumTag */]: forEachChildInJSDocTypeLikeTag,
-  [351 /* JSDocSatisfiesTag */]: forEachChildInJSDocTypeLikeTag,
+  [344 /* JSDocReturnTag */]: forEachChildInJSDocReturnTag,
+  [346 /* JSDocTypeTag */]: forEachChildInJSDocReturnTag,
+  [345 /* JSDocThisTag */]: forEachChildInJSDocReturnTag,
+  [342 /* JSDocEnumTag */]: forEachChildInJSDocReturnTag,
   [326 /* JSDocSignature */]: function forEachChildInJSDocSignature(node, cbNode, _cbNodes) {
     return forEach(node.typeParameters, cbNode) || forEach(node.parameters, cbNode) || visitNode2(cbNode, node.type);
   },
@@ -23320,7 +23297,7 @@ var forEachChildTable = {
   [339 /* JSDocReadonlyTag */]: forEachChildInJSDocTag,
   [334 /* JSDocDeprecatedTag */]: forEachChildInJSDocTag,
   [340 /* JSDocOverrideTag */]: forEachChildInJSDocTag,
-  [354 /* PartiallyEmittedExpression */]: forEachChildInPartiallyEmittedExpression
+  [353 /* PartiallyEmittedExpression */]: forEachChildInPartiallyEmittedExpression
 };
 function forEachChildInCallOrConstructSignature(node, cbNode, cbNodes) {
   return visitNodes(cbNode, cbNodes, node.typeParameters) || visitNodes(cbNode, cbNodes, node.parameters) || visitNode2(cbNode, node.type);
@@ -23361,7 +23338,7 @@ function forEachChildInOptionalRestOrJSDocParameterModifier(node, cbNode, _cbNod
 function forEachChildInJSDocParameterOrPropertyTag(node, cbNode, cbNodes) {
   return visitNode2(cbNode, node.tagName) || (node.isNameFirst ? visitNode2(cbNode, node.name) || visitNode2(cbNode, node.typeExpression) : visitNode2(cbNode, node.typeExpression) || visitNode2(cbNode, node.name)) || (typeof node.comment === "string" ? void 0 : visitNodes(cbNode, cbNodes, node.comment));
 }
-function forEachChildInJSDocTypeLikeTag(node, cbNode, cbNodes) {
+function forEachChildInJSDocReturnTag(node, cbNode, cbNodes) {
   return visitNode2(cbNode, node.tagName) || visitNode2(cbNode, node.typeExpression) || (typeof node.comment === "string" ? void 0 : visitNodes(cbNode, cbNodes, node.comment));
 }
 function forEachChildInJSDocLinkCodeOrPlain(node, cbNode, _cbNodes) {
@@ -28641,9 +28618,6 @@ var Parser;
           case "callback":
             tag = parseCallbackTag(start2, tagName, margin, indentText);
             break;
-          case "satisfies":
-            tag = parseSatisfiesTag(start2, tagName, margin, indentText);
-            break;
           case "see":
             tag = parseSeeTag(start2, tagName, margin, indentText);
             break;
@@ -28937,14 +28911,6 @@ var Parser;
         const className = parseExpressionWithTypeArgumentsForAugments();
         return finishNode(factory2.createJSDocAugmentsTag(tagName, className, parseTrailingTagComments(start2, getNodePos(), margin, indentText)), start2);
       }
-      function parseSatisfiesTag(start2, tagName, margin, indentText) {
-        if (some(tags, isJSDocSatisfiesTag)) {
-          parseErrorAt(tagName.pos, scanner.getTokenPos(), Diagnostics._0_tag_already_specified, tagName.escapedText);
-        }
-        const typeExpression = parseJSDocTypeExpression(true);
-        const comments2 = margin !== void 0 && indentText !== void 0 ? parseTrailingTagComments(start2, getNodePos(), margin, indentText) : void 0;
-        return finishNode(factory2.createJSDocSatisfiesTag(tagName, typeExpression, comments2), start2);
-      }
       function parseExpressionWithTypeArgumentsForAugments() {
         const usedBrace = parseOptional(18 /* OpenBraceToken */);
         const pos = getNodePos();
@@ -31175,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 [];
   }
@@ -31184,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));
   }
@@ -31317,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++;
@@ -31468,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) {
@@ -31499,11 +31484,7 @@ function getTsconfigRootOptionsMap() {
           elementOptions: getCommandLineTypeAcquisitionMap(),
           extraKeyDiagnostics: typeAcquisitionDidYouMeanDiagnostics
         },
-        {
-          name: "extends",
-          type: "string",
-          category: Diagnostics.File_Management
-        },
+        extendsOptionDeclaration,
         {
           name: "references",
           type: "list",
@@ -31642,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");
@@ -31654,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())) {
@@ -31670,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;
@@ -31698,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
@@ -31733,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) {
@@ -31742,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;
   }
@@ -31821,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) {
@@ -31853,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) {
@@ -32001,6 +31994,7 @@ function convertToOptionValueWithAbsolutePaths(option, value, toAbsolutePath) {
     } else if (option.isFilePath) {
       return toAbsolutePath(value);
     }
+    Debug.assert(option.type !== "listOrElement");
   }
   return value;
 }
@@ -32194,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")) {
@@ -32229,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 };
@@ -32269,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;
       }
     },
@@ -32325,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;
@@ -32351,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) {
@@ -32412,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);
@@ -32424,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);
@@ -32676,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:
@@ -32894,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);
@@ -32971,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;
@@ -33091,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;
@@ -33121,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() {
@@ -33175,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
@@ -33184,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}`;
@@ -33239,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);
   }
@@ -33281,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) {
@@ -33315,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() {
@@ -33331,7 +33409,32 @@ 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);
@@ -33345,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);
@@ -33396,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) {
@@ -34310,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) {
@@ -34324,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;
         }
@@ -34470,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);
@@ -34514,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;
         }
@@ -48788,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)}`;
@@ -59014,9 +59113,6 @@ function createTypeChecker(host) {
         Debug.assert(parent.parent.kind === 225 /* TemplateExpression */);
         return getContextualTypeForSubstitutionExpression(parent.parent, node);
       case 214 /* ParenthesizedExpression */: {
-        if (isJSDocSatisfiesExpression(parent)) {
-          return getTypeFromTypeNode(getJSDocSatisfiesExpressionType(parent));
-        }
         const tag = isInJSFile(parent) ? getJSDocTypeTag(parent) : void 0;
         return !tag ? getContextualType(parent, contextFlags) : isJSDocTypeTag(tag) && isConstTypeReference(tag.typeExpression.type) ? tryFindWhenConstTypeReference(parent) : getTypeFromTypeNode(tag.typeExpression.type);
       }
@@ -62675,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)) {
@@ -62736,15 +62833,12 @@ function createTypeChecker(host) {
   }
   function checkSatisfiesExpression(node) {
     checkSourceElement(node.type);
-    return checkSatisfiesExpressionWorker(node.expression, node.type);
-  }
-  function checkSatisfiesExpressionWorker(expression, target, checkMode) {
-    const exprType = checkExpression(expression, checkMode);
-    const targetType = getTypeFromTypeNode(target);
+    const exprType = checkExpression(node.expression);
+    const targetType = getTypeFromTypeNode(node.type);
     if (isErrorType(targetType)) {
       return targetType;
     }
-    checkTypeAssignableToAndOptionallyElaborate(exprType, targetType, target, expression, Diagnostics.Type_0_does_not_satisfy_the_expected_type_1);
+    checkTypeAssignableToAndOptionallyElaborate(exprType, targetType, node.type, node.expression, Diagnostics.Type_0_does_not_satisfy_the_expected_type_1);
     return exprType;
   }
   function checkMetaProperty(node) {
@@ -64858,14 +64952,9 @@ function createTypeChecker(host) {
     }
   }
   function checkParenthesizedExpression(node, checkMode) {
-    if (hasJSDocNodes(node)) {
-      if (isJSDocSatisfiesExpression(node)) {
-        return checkSatisfiesExpressionWorker(node.expression, getJSDocSatisfiesExpressionType(node), checkMode);
-      }
-      if (isJSDocTypeAssertion(node)) {
-        const type = getJSDocTypeAssertionType(node);
-        return checkAssertionWorker(type, type, node.expression, checkMode);
-      }
+    if (hasJSDocNodes(node) && isJSDocTypeAssertion(node)) {
+      const type = getJSDocTypeAssertionType(node);
+      return checkAssertionWorker(type, type, node.expression, checkMode);
     }
     return checkExpression(node.expression, checkMode);
   }
@@ -66493,9 +66582,6 @@ function createTypeChecker(host) {
   function checkJSDocTypeTag(node) {
     checkSourceElement(node.typeExpression);
   }
-  function checkJSDocSatisfiesTag(node) {
-    checkSourceElement(node.typeExpression);
-  }
   function checkJSDocLinkLikeTag(node) {
     if (node.name) {
       resolveJSDocMemberName(node.name, true);
@@ -69831,8 +69917,6 @@ function createTypeChecker(host) {
       case 338 /* JSDocProtectedTag */:
       case 337 /* JSDocPrivateTag */:
         return checkJSDocAccessibilityModifiers(node);
-      case 351 /* JSDocSatisfiesTag */:
-        return checkJSDocSatisfiesTag(node);
       case 196 /* IndexedAccessType */:
         return checkIndexedAccessType(node);
       case 197 /* MappedType */:
@@ -74236,13 +74320,13 @@ var visitEachChildTable = {
       visitLexicalEnvironment(node.statements, visitor, context)
     );
   },
-  [354 /* PartiallyEmittedExpression */]: function visitEachChildOfPartiallyEmittedExpression(node, visitor, context, _nodesVisitor, nodeVisitor, _tokenVisitor) {
+  [353 /* PartiallyEmittedExpression */]: function visitEachChildOfPartiallyEmittedExpression(node, visitor, context, _nodesVisitor, nodeVisitor, _tokenVisitor) {
     return context.factory.updatePartiallyEmittedExpression(
       node,
       nodeVisitor(node.expression, visitor, isExpression)
     );
   },
-  [355 /* CommaListExpression */]: function visitEachChildOfCommaListExpression(node, visitor, context, nodesVisitor, _nodeVisitor, _tokenVisitor) {
+  [354 /* CommaListExpression */]: function visitEachChildOfCommaListExpression(node, visitor, context, nodesVisitor, _nodeVisitor, _tokenVisitor) {
     return context.factory.updateCommaListExpression(
       node,
       nodesVisitor(node.elements, visitor, isExpression)
@@ -80141,7 +80225,7 @@ function transformES2018(context) {
         return visitObjectLiteralExpression(node);
       case 223 /* BinaryExpression */:
         return visitBinaryExpression(node, expressionResultIsUnused2);
-      case 355 /* CommaListExpression */:
+      case 354 /* CommaListExpression */:
         return visitCommaListExpression(node, expressionResultIsUnused2);
       case 295 /* CatchClause */:
         return visitCatchClause(node);
@@ -82337,7 +82421,7 @@ function transformES2015(context) {
         return visitParenthesizedExpression(node, expressionResultIsUnused2);
       case 223 /* BinaryExpression */:
         return visitBinaryExpression(node, expressionResultIsUnused2);
-      case 355 /* CommaListExpression */:
+      case 354 /* CommaListExpression */:
         return visitCommaListExpression(node, expressionResultIsUnused2);
       case 14 /* NoSubstitutionTemplateLiteral */:
       case 15 /* TemplateHead */:
@@ -85032,7 +85116,7 @@ function transformGenerators(context) {
     switch (node.kind) {
       case 223 /* BinaryExpression */:
         return visitBinaryExpression(node);
-      case 355 /* CommaListExpression */:
+      case 354 /* CommaListExpression */:
         return visitCommaListExpression(node);
       case 224 /* ConditionalExpression */:
         return visitConditionalExpression(node);
@@ -87117,9 +87201,9 @@ function transformModule(context) {
         return visitFunctionDeclaration(node);
       case 260 /* ClassDeclaration */:
         return visitClassDeclaration(node);
-      case 356 /* MergeDeclarationMarker */:
+      case 355 /* MergeDeclarationMarker */:
         return visitMergeDeclarationMarker(node);
-      case 357 /* EndOfDeclarationMarker */:
+      case 356 /* EndOfDeclarationMarker */:
         return visitEndOfDeclarationMarker(node);
       default:
         return visitor(node);
@@ -87136,7 +87220,7 @@ function transformModule(context) {
         return visitExpressionStatement(node);
       case 214 /* ParenthesizedExpression */:
         return visitParenthesizedExpression(node, valueIsDiscarded);
-      case 354 /* PartiallyEmittedExpression */:
+      case 353 /* PartiallyEmittedExpression */:
         return visitPartiallyEmittedExpression(node, valueIsDiscarded);
       case 210 /* CallExpression */:
         if (isImportCall(node) && currentSourceFile.impliedNodeFormat === void 0) {
@@ -88911,9 +88995,9 @@ function transformSystemModule(context) {
         return visitCatchClause(node);
       case 238 /* Block */:
         return visitBlock(node);
-      case 356 /* MergeDeclarationMarker */:
+      case 355 /* MergeDeclarationMarker */:
         return visitMergeDeclarationMarker(node);
-      case 357 /* EndOfDeclarationMarker */:
+      case 356 /* EndOfDeclarationMarker */:
         return visitEndOfDeclarationMarker(node);
       default:
         return visitor(node);
@@ -89061,7 +89145,7 @@ function transformSystemModule(context) {
         return visitExpressionStatement(node);
       case 214 /* ParenthesizedExpression */:
         return visitParenthesizedExpression(node, valueIsDiscarded);
-      case 354 /* PartiallyEmittedExpression */:
+      case 353 /* PartiallyEmittedExpression */:
         return visitPartiallyEmittedExpression(node, valueIsDiscarded);
       case 223 /* BinaryExpression */:
         if (isDestructuringAssignment(node)) {
@@ -91462,7 +91546,7 @@ function noEmitNotification(hint, node, callback) {
 }
 function transformNodes(resolver, host, factory2, options, nodes, transformers, allowDtsFiles) {
   var _a2, _b;
-  const enabledSyntaxKindFeatures = new Array(359 /* Count */);
+  const enabledSyntaxKindFeatures = new Array(358 /* Count */);
   let lexicalEnvironmentVariableDeclarations;
   let lexicalEnvironmentFunctionDeclarations;
   let lexicalEnvironmentStatements;
@@ -93169,7 +93253,6 @@ function createPrinter(printerOptions = {}, handlers = {}) {
         case 344 /* JSDocReturnTag */:
         case 345 /* JSDocThisTag */:
         case 346 /* JSDocTypeTag */:
-        case 351 /* JSDocSatisfiesTag */:
           return emitJSDocSimpleTypedTag(node);
         case 347 /* JSDocTemplateTag */:
           return emitJSDocTemplateTag(node);
@@ -93177,9 +93260,9 @@ function createPrinter(printerOptions = {}, handlers = {}) {
           return emitJSDocTypedefTag(node);
         case 349 /* JSDocSeeTag */:
           return emitJSDocSeeTag(node);
-        case 353 /* NotEmittedStatement */:
-        case 357 /* EndOfDeclarationMarker */:
-        case 356 /* MergeDeclarationMarker */:
+        case 352 /* NotEmittedStatement */:
+        case 356 /* EndOfDeclarationMarker */:
+        case 355 /* MergeDeclarationMarker */:
           return;
       }
       if (isExpression(node)) {
@@ -93274,18 +93357,18 @@ function createPrinter(printerOptions = {}, handlers = {}) {
           return emitJsxSelfClosingElement(node);
         case 285 /* JsxFragment */:
           return emitJsxFragment(node);
-        case 352 /* SyntaxList */:
+        case 351 /* SyntaxList */:
           return Debug.fail("SyntaxList should not be printed");
-        case 353 /* NotEmittedStatement */:
+        case 352 /* NotEmittedStatement */:
           return;
-        case 354 /* PartiallyEmittedExpression */:
+        case 353 /* PartiallyEmittedExpression */:
           return emitPartiallyEmittedExpression(node);
-        case 355 /* CommaListExpression */:
+        case 354 /* CommaListExpression */:
           return emitCommaList(node);
-        case 356 /* MergeDeclarationMarker */:
-        case 357 /* EndOfDeclarationMarker */:
+        case 355 /* MergeDeclarationMarker */:
+        case 356 /* EndOfDeclarationMarker */:
           return;
-        case 358 /* SyntheticReferenceExpression */:
+        case 357 /* SyntheticReferenceExpression */:
           return Debug.fail("SyntheticReferenceExpression should not be printed");
       }
     }
@@ -96200,7 +96283,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
     const skipTrailingComments = end < 0 || (emitFlags & 2048 /* NoTrailingComments */) !== 0 || node.kind === 11 /* JsxText */;
     if ((pos > 0 || end > 0) && pos !== end) {
       if (!skipLeadingComments) {
-        emitLeadingComments(pos, node.kind !== 353 /* NotEmittedStatement */);
+        emitLeadingComments(pos, node.kind !== 352 /* NotEmittedStatement */);
       }
       if (!skipLeadingComments || pos >= 0 && (emitFlags & 1024 /* NoLeadingComments */) !== 0) {
         containerPos = pos;
@@ -96223,7 +96306,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
       containerPos = savedContainerPos;
       containerEnd = savedContainerEnd;
       declarationListContainerEnd = savedDeclarationListContainerEnd;
-      if (!skipTrailingComments && node.kind !== 353 /* NotEmittedStatement */) {
+      if (!skipTrailingComments && node.kind !== 352 /* NotEmittedStatement */) {
         emitTrailingComments(end);
       }
     }
@@ -96475,7 +96558,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
       }
     } else {
       const source = sourceMapRange.source || sourceMapSource;
-      if (node.kind !== 353 /* NotEmittedStatement */ && (emitFlags & 32 /* NoLeadingSourceMap */) === 0 && sourceMapRange.pos >= 0) {
+      if (node.kind !== 352 /* NotEmittedStatement */ && (emitFlags & 32 /* NoLeadingSourceMap */) === 0 && sourceMapRange.pos >= 0) {
         emitSourcePos(sourceMapRange.source || sourceMapSource, skipSourceTrivia(source, sourceMapRange.pos));
       }
       if (emitFlags & 128 /* NoNestedSourceMaps */) {
@@ -96490,7 +96573,7 @@ function createPrinter(printerOptions = {}, handlers = {}) {
       if (emitFlags & 128 /* NoNestedSourceMaps */) {
         sourceMapsDisabled = false;
       }
-      if (node.kind !== 353 /* NotEmittedStatement */ && (emitFlags & 64 /* NoTrailingSourceMap */) === 0 && sourceMapRange.end >= 0) {
+      if (node.kind !== 352 /* NotEmittedStatement */ && (emitFlags & 64 /* NoTrailingSourceMap */) === 0 && sourceMapRange.end >= 0) {
         emitSourcePos(sourceMapRange.source || sourceMapSource, sourceMapRange.end);
       }
     }
@@ -98045,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
@@ -98085,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);
   }
@@ -100613,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);
         }
@@ -100682,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))
@@ -100690,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;
@@ -100733,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)) {
@@ -100895,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;
@@ -101005,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;
@@ -101018,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) {
@@ -101189,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 */);
@@ -101316,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 = [];
@@ -101434,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);
@@ -101472,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) {
@@ -101537,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) {
@@ -101557,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})`;
   }
 }
@@ -101572,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;
@@ -102031,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;
@@ -102106,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;
@@ -102424,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 {
@@ -102437,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);
@@ -102448,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) {
@@ -102480,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);
     }
@@ -102559,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);
@@ -102596,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) {
@@ -102644,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) {
@@ -102947,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}`));
@@ -103006,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;
@@ -103242,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;
@@ -103309,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)
   };
@@ -103411,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));
@@ -104146,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);
@@ -104159,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,
@@ -104173,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,
@@ -104190,8 +104275,6 @@ function createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, optio
   const state = {
     host,
     hostWithWatch,
-    currentDirectory,
-    getCanonicalFileName,
     parseConfigFileHost: parseConfigHostFromCompilerHostLike(host),
     write: maybeBind(host, host.trace),
     options,
@@ -104235,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;
@@ -104278,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();
@@ -104481,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;
@@ -104506,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()
@@ -104562,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;
@@ -105669,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,
@@ -105774,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));
@@ -106064,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) {
@@ -106148,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":
@@ -106168,6 +106252,7 @@ function generateOptionOutput(sys2, option, rightAlignOfLeft, leftAlignOfRight)
           possibleValues = option3.type;
           break;
         case "list":
+        case "listOrElement":
           possibleValues = getPossibleValues(option3.element);
           break;
         case "object":