@typescript-deploys/pr-build 4.7.0-pr-48581-7 → 4.7.0-pr-48788-2

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.7";
-    ts.version = ts.versionMajorMinor + ".0-insiders.20220406";
+    ts.version = ts.versionMajorMinor + ".0-insiders.20220420";
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -5901,6 +5901,7 @@ var ts;
         _0_index_signatures_are_incompatible: diag(2634, ts.DiagnosticCategory.Error, "_0_index_signatures_are_incompatible_2634", "'{0}' index signatures are incompatible."),
         Type_0_has_no_signatures_for_which_the_type_argument_list_is_applicable: diag(2635, ts.DiagnosticCategory.Error, "Type_0_has_no_signatures_for_which_the_type_argument_list_is_applicable_2635", "Type '{0}' has no signatures for which the type argument list is applicable."),
         Type_0_is_not_assignable_to_type_1_as_implied_by_variance_annotation: diag(2636, ts.DiagnosticCategory.Error, "Type_0_is_not_assignable_to_type_1_as_implied_by_variance_annotation_2636", "Type '{0}' is not assignable to type '{1}' as implied by variance annotation."),
+        Variance_annotations_are_only_supported_in_type_aliases_for_object_function_constructor_and_mapped_types: diag(2637, ts.DiagnosticCategory.Error, "Variance_annotations_are_only_supported_in_type_aliases_for_object_function_constructor_and_mapped_t_2637", "Variance annotations are only supported in type aliases for object, function, constructor, and mapped types."),
         Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity: diag(2649, ts.DiagnosticCategory.Error, "Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity_2649", "Cannot augment module '{0}' with value exports because it resolves to a non-module entity."),
         A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums: diag(2651, ts.DiagnosticCategory.Error, "A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_memb_2651", "A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums."),
         Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead: diag(2652, ts.DiagnosticCategory.Error, "Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_d_2652", "Merged declaration '{0}' cannot include a default export declaration. Consider adding a separate 'export default {0}' declaration instead."),
@@ -11443,6 +11444,10 @@ var ts;
         }
     }
     ts.isAnyImportSyntax = isAnyImportSyntax;
+    function isAnyImportOrBareOrAccessedRequire(node) {
+        return isAnyImportSyntax(node) || isVariableDeclarationInitializedToBareOrAccessedRequire(node);
+    }
+    ts.isAnyImportOrBareOrAccessedRequire = isAnyImportOrBareOrAccessedRequire;
     function isLateVisibilityPaintedStatement(node) {
         switch (node.kind) {
             case 266:
@@ -12673,17 +12678,13 @@ var ts;
         if (isPropertyNameLiteral(name) && isPropertyNameLiteral(initializer)) {
             return getTextOfIdentifierOrLiteral(name) === getTextOfIdentifierOrLiteral(initializer);
         }
-        if (ts.isIdentifier(name) && isLiteralLikeAccess(initializer) &&
+        if (ts.isMemberName(name) && isLiteralLikeAccess(initializer) &&
             (initializer.expression.kind === 108 ||
                 ts.isIdentifier(initializer.expression) &&
                     (initializer.expression.escapedText === "window" ||
                         initializer.expression.escapedText === "self" ||
                         initializer.expression.escapedText === "global"))) {
-            var nameOrArgument = getNameOrArgument(initializer);
-            if (ts.isPrivateIdentifier(nameOrArgument)) {
-                ts.Debug.fail("Unexpected PrivateIdentifier in name expression with literal-like access.");
-            }
-            return isSameEntityName(name, nameOrArgument);
+            return isSameEntityName(name, getNameOrArgument(initializer));
         }
         if (isLiteralLikeAccess(name) && isLiteralLikeAccess(initializer)) {
             return getElementOrPropertyAccessName(name) === getElementOrPropertyAccessName(initializer)
@@ -12873,14 +12874,14 @@ var ts;
     }
     ts.isFunctionSymbol = isFunctionSymbol;
     function tryGetModuleSpecifierFromDeclaration(node) {
-        var _a, _b, _c;
+        var _a, _b;
         switch (node.kind) {
             case 254:
-                return node.initializer.arguments[0].text;
+                return (_a = ts.findAncestor(node.initializer, function (node) { return isRequireCall(node, true); })) === null || _a === void 0 ? void 0 : _a.arguments[0];
             case 266:
-                return (_a = ts.tryCast(node.moduleSpecifier, ts.isStringLiteralLike)) === null || _a === void 0 ? void 0 : _a.text;
+                return ts.tryCast(node.moduleSpecifier, ts.isStringLiteralLike);
             case 265:
-                return (_c = ts.tryCast((_b = ts.tryCast(node.moduleReference, ts.isExternalModuleReference)) === null || _b === void 0 ? void 0 : _b.expression, ts.isStringLiteralLike)) === null || _c === void 0 ? void 0 : _c.text;
+                return ts.tryCast((_b = ts.tryCast(node.moduleReference, ts.isExternalModuleReference)) === null || _b === void 0 ? void 0 : _b.expression, ts.isStringLiteralLike);
             default:
                 ts.Debug.assertNever(node);
         }
@@ -13353,24 +13354,31 @@ var ts;
                 return parent.propertyName === node;
             case 275:
             case 285:
+            case 279:
+            case 280:
+            case 281:
                 return true;
         }
         return false;
     }
     ts.isIdentifierName = isIdentifierName;
     function isAliasSymbolDeclaration(node) {
-        return node.kind === 265 ||
+        if (node.kind === 265 ||
             node.kind === 264 ||
             node.kind === 267 && !!node.name ||
             node.kind === 268 ||
             node.kind === 274 ||
             node.kind === 270 ||
             node.kind === 275 ||
-            node.kind === 271 && exportAssignmentIsAlias(node) ||
-            ts.isBinaryExpression(node) && getAssignmentDeclarationKind(node) === 2 && exportAssignmentIsAlias(node) ||
-            ts.isPropertyAccessExpression(node) && ts.isBinaryExpression(node.parent) && node.parent.left === node && node.parent.operatorToken.kind === 63 && isAliasableExpression(node.parent.right) ||
-            node.kind === 297 ||
-            node.kind === 296 && isAliasableExpression(node.initializer);
+            node.kind === 271 && exportAssignmentIsAlias(node)) {
+            return true;
+        }
+        return isInJSFile(node) && (ts.isBinaryExpression(node) && getAssignmentDeclarationKind(node) === 2 && exportAssignmentIsAlias(node) ||
+            ts.isPropertyAccessExpression(node)
+                && ts.isBinaryExpression(node.parent)
+                && node.parent.left === node
+                && node.parent.operatorToken.kind === 63
+                && isAliasableExpression(node.parent.right));
     }
     ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
     function getAliasDeclarationFromName(node) {
@@ -13381,6 +13389,7 @@ var ts;
             case 275:
             case 271:
             case 265:
+            case 274:
                 return node.parent;
             case 161:
                 do {
@@ -14880,6 +14889,11 @@ var ts;
             (node.parent.kind === 206 && node.parent.name === node);
     }
     ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
+    function isRightSideOfAccessExpression(node) {
+        return ts.isPropertyAccessExpression(node.parent) && node.parent.name === node
+            || ts.isElementAccessExpression(node.parent) && node.parent.argumentExpression === node;
+    }
+    ts.isRightSideOfAccessExpression = isRightSideOfAccessExpression;
     function isRightSideOfQualifiedNameOrPropertyAccessOrJSDocMemberName(node) {
         return ts.isQualifiedName(node.parent) && node.parent.right === node
             || ts.isPropertyAccessExpression(node.parent) && node.parent.name === node
@@ -15440,6 +15454,38 @@ var ts;
         return expr;
     }
     ts.getLeftmostAccessExpression = getLeftmostAccessExpression;
+    function forEachNameInAccessChainWalkingLeft(name, action) {
+        if (isAccessExpression(name.parent) && isRightSideOfAccessExpression(name)) {
+            return walkAccessExpression(name.parent);
+        }
+        function walkAccessExpression(access) {
+            if (access.kind === 206) {
+                var res = action(access.name);
+                if (res !== undefined) {
+                    return res;
+                }
+            }
+            else if (access.kind === 207) {
+                if (ts.isIdentifier(access.argumentExpression) || ts.isStringLiteralLike(access.argumentExpression)) {
+                    var res = action(access.argumentExpression);
+                    if (res !== undefined) {
+                        return res;
+                    }
+                }
+                else {
+                    return undefined;
+                }
+            }
+            if (isAccessExpression(access.expression)) {
+                return walkAccessExpression(access.expression);
+            }
+            if (ts.isIdentifier(access.expression)) {
+                return action(access.expression);
+            }
+            return undefined;
+        }
+    }
+    ts.forEachNameInAccessChainWalkingLeft = forEachNameInAccessChainWalkingLeft;
     function getLeftmostExpression(node, stopAtCallExpressions) {
         while (true) {
             switch (node.kind) {
@@ -16297,6 +16343,7 @@ var ts;
     ts.supportedJSExtensionsFlat = ts.flatten(ts.supportedJSExtensions);
     var allSupportedExtensions = [[".ts", ".tsx", ".d.ts", ".js", ".jsx"], [".cts", ".d.cts", ".cjs"], [".mts", ".d.mts", ".mjs"]];
     var allSupportedExtensionsWithJson = __spreadArray(__spreadArray([], allSupportedExtensions, true), [[".json"]], false);
+    ts.supportedDeclarationExtensions = [".d.ts", ".d.cts", ".d.mts"];
     function getSupportedExtensions(options, extraFileExtensions) {
         var needJsExtensions = options && getAllowJSCompilerOption(options);
         if (!extraFileExtensions || extraFileExtensions.length === 0) {
@@ -16885,6 +16932,11 @@ var ts;
         return state > 1 ? { topLevelNodeModulesIndex: topLevelNodeModulesIndex, topLevelPackageNameIndex: topLevelPackageNameIndex, packageRootIndex: packageRootIndex, fileNameIndex: fileNameIndex } : undefined;
     }
     ts.getNodeModulePathParts = getNodeModulePathParts;
+    function getParameterTypeNode(parameter) {
+        var _a;
+        return parameter.kind === 340 ? (_a = parameter.typeExpression) === null || _a === void 0 ? void 0 : _a.type : parameter.type;
+    }
+    ts.getParameterTypeNode = getParameterTypeNode;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -26681,7 +26733,7 @@ var ts;
             var pos = getNodePos();
             parseExpected(112);
             var entityName = parseEntityName(true, true);
-            var typeArguments = tryParseTypeArguments();
+            var typeArguments = !scanner.hasPrecedingLineBreak() ? tryParseTypeArguments() : undefined;
             return finishNode(factory.createTypeQueryNode(entityName, typeArguments), pos);
         }
         function parseTypeParameter() {
@@ -27744,9 +27796,7 @@ var ts;
                     return undefined;
                 }
             }
-            if (disallowReturnTypeInArrowFunction && token() === 58) {
-                return undefined;
-            }
+            var hasReturnColon = token() === 58;
             var type = parseReturnType(58, false);
             if (type && !allowAmbiguity && typeHasArrowFunctionBlockingParseError(type)) {
                 return undefined;
@@ -27764,6 +27814,11 @@ var ts;
             var body = (lastToken === 38 || lastToken === 18)
                 ? parseArrowFunctionExpressionBody(ts.some(modifiers, ts.isAsyncModifier), disallowReturnTypeInArrowFunction)
                 : parseIdentifier();
+            if (disallowReturnTypeInArrowFunction && hasReturnColon) {
+                if (token() !== 58) {
+                    return undefined;
+                }
+            }
             var node = factory.createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body);
             return withJSDoc(finishNode(node, pos), hasJSDoc);
         }
@@ -28386,29 +28441,9 @@ var ts;
                 case 20:
                 case 14:
                 case 15:
-                case 27:
-                case 24:
-                case 28:
-                case 21:
-                case 23:
-                case 58:
-                case 26:
-                case 57:
-                case 34:
-                case 36:
-                case 35:
-                case 37:
-                case 55:
-                case 56:
-                case 60:
-                case 52:
-                case 50:
-                case 51:
-                case 19:
-                case 1:
                     return true;
             }
-            return false;
+            return !isStartOfExpression();
         }
         function parsePrimaryExpression() {
             switch (token()) {
@@ -31134,7 +31169,7 @@ var ts;
         IncrementalParser.createSyntaxCursor = createSyntaxCursor;
     })(IncrementalParser || (IncrementalParser = {}));
     function isDeclarationFileName(fileName) {
-        return ts.fileExtensionIsOneOf(fileName, [".d.ts", ".d.mts", ".d.cts"]);
+        return ts.fileExtensionIsOneOf(fileName, ts.supportedDeclarationExtensions);
     }
     ts.isDeclarationFileName = isDeclarationFileName;
     function parseResolutionMode(mode, pos, end, reportDiagnostic) {
@@ -34318,6 +34353,7 @@ var ts;
         Extensions[Extensions["Json"] = 2] = "Json";
         Extensions[Extensions["TSConfig"] = 3] = "TSConfig";
         Extensions[Extensions["DtsOnly"] = 4] = "DtsOnly";
+        Extensions[Extensions["TsOnly"] = 5] = "TsOnly";
     })(Extensions || (Extensions = {}));
     function resolvedTypeScriptOnly(resolved) {
         if (!resolved) {
@@ -35114,13 +35150,31 @@ var ts;
         return nodeModuleNameResolverWorker(NodeResolutionFeatures.None, moduleName, initialDir, { moduleResolution: ts.ModuleResolutionKind.NodeJs, allowJs: true }, host, undefined, jsOnlyExtensions, undefined);
     }
     function nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, lookupConfig) {
-        return nodeModuleNameResolverWorker(NodeResolutionFeatures.None, moduleName, ts.getDirectoryPath(containingFile), compilerOptions, host, cache, lookupConfig ? tsconfigExtensions : (compilerOptions.resolveJsonModule ? tsPlusJsonExtensions : tsExtensions), redirectedReference);
+        var extensions;
+        if (lookupConfig) {
+            extensions = tsconfigExtensions;
+        }
+        else if (compilerOptions.noDtsResolution) {
+            extensions = [Extensions.TsOnly];
+            if (compilerOptions.allowJs)
+                extensions.push(Extensions.JavaScript);
+            if (compilerOptions.resolveJsonModule)
+                extensions.push(Extensions.Json);
+        }
+        else {
+            extensions = compilerOptions.resolveJsonModule ? tsPlusJsonExtensions : tsExtensions;
+        }
+        return nodeModuleNameResolverWorker(NodeResolutionFeatures.None, moduleName, ts.getDirectoryPath(containingFile), compilerOptions, host, cache, extensions, redirectedReference);
     }
     ts.nodeModuleNameResolver = nodeModuleNameResolver;
     function nodeModuleNameResolverWorker(features, moduleName, containingDirectory, compilerOptions, host, cache, extensions, redirectedReference) {
         var _a, _b;
         var traceEnabled = isTraceEnabled(compilerOptions, host);
         var failedLookupLocations = [];
+        var conditions = features & NodeResolutionFeatures.EsmMode ? ["node", "import", "types"] : ["node", "require", "types"];
+        if (compilerOptions.noDtsResolution) {
+            conditions.pop();
+        }
         var state = {
             compilerOptions: compilerOptions,
             host: host,
@@ -35128,7 +35182,7 @@ var ts;
             failedLookupLocations: failedLookupLocations,
             packageJsonInfoCache: cache,
             features: features,
-            conditions: features & NodeResolutionFeatures.EsmMode ? ["node", "import", "types"] : ["node", "require", "types"]
+            conditions: conditions,
         };
         var result = ts.forEach(extensions, function (ext) { return tryResolve(ext); });
         return createResolvedModuleWithFailedLookupLocations((_a = result === null || result === void 0 ? void 0 : result.value) === null || _a === void 0 ? void 0 : _a.resolved, (_b = result === null || result === void 0 ? void 0 : result.value) === null || _b === void 0 ? void 0 : _b.isExternalLibraryImport, failedLookupLocations, state.resultFromCache);
@@ -35273,9 +35327,9 @@ var ts;
         }
     }
     function loadJSOrExactTSFileName(extensions, candidate, onlyRecordFailures, state) {
-        if ((extensions === Extensions.TypeScript || extensions === Extensions.DtsOnly) && ts.fileExtensionIsOneOf(candidate, [".d.ts", ".d.cts", ".d.mts"])) {
+        if ((extensions === Extensions.TypeScript || extensions === Extensions.DtsOnly) && ts.isDeclarationFileName(candidate)) {
             var result = tryFile(candidate, onlyRecordFailures, state);
-            return result !== undefined ? { path: candidate, ext: ts.forEach([".d.ts", ".d.cts", ".d.mts"], function (e) { return ts.fileExtensionIs(candidate, e) ? e : undefined; }) } : undefined;
+            return result !== undefined ? { path: candidate, ext: ts.forEach(ts.supportedDeclarationExtensions, function (e) { return ts.fileExtensionIs(candidate, e) ? e : undefined; }) } : undefined;
         }
         return loadModuleFromFileNoImplicitExtensions(extensions, candidate, onlyRecordFailures, state);
     }
@@ -35303,20 +35357,22 @@ var ts;
                     default: return tryExtension(".d.ts");
                 }
             case Extensions.TypeScript:
+            case Extensions.TsOnly:
+                var useDts = extensions === Extensions.TypeScript;
                 switch (originalExtension) {
                     case ".mjs":
                     case ".mts":
                     case ".d.mts":
-                        return tryExtension(".mts") || tryExtension(".d.mts");
+                        return tryExtension(".mts") || (useDts ? tryExtension(".d.mts") : undefined);
                     case ".cjs":
                     case ".cts":
                     case ".d.cts":
-                        return tryExtension(".cts") || tryExtension(".d.cts");
+                        return tryExtension(".cts") || (useDts ? tryExtension(".d.cts") : undefined);
                     case ".json":
                         candidate += ".json";
-                        return tryExtension(".d.ts");
+                        return useDts ? tryExtension(".d.ts") : undefined;
                     default:
-                        return tryExtension(".ts") || tryExtension(".tsx") || tryExtension(".d.ts");
+                        return tryExtension(".ts") || tryExtension(".tsx") || (useDts ? tryExtension(".d.ts") : undefined);
                 }
             case Extensions.JavaScript:
                 switch (originalExtension) {
@@ -35530,6 +35586,7 @@ var ts;
             switch (extensions) {
                 case Extensions.JavaScript:
                 case Extensions.Json:
+                case Extensions.TsOnly:
                     packageFile = readPackageJsonMainField(jsonContent, candidate, state);
                     break;
                 case Extensions.TypeScript:
@@ -35592,14 +35649,16 @@ var ts;
     function extensionIsOk(extensions, extension) {
         switch (extensions) {
             case Extensions.JavaScript:
-                return extension === ".js" || extension === ".jsx";
+                return extension === ".js" || extension === ".jsx" || extension === ".mjs" || extension === ".cjs";
             case Extensions.TSConfig:
             case Extensions.Json:
                 return extension === ".json";
             case Extensions.TypeScript:
-                return extension === ".ts" || extension === ".tsx" || extension === ".d.ts";
+                return extension === ".ts" || extension === ".tsx" || extension === ".mts" || extension === ".cts" || extension === ".d.ts" || extension === ".d.mts" || extension === ".d.cts";
+            case Extensions.TsOnly:
+                return extension === ".ts" || extension === ".tsx" || extension === ".mts" || extension === ".cts";
             case Extensions.DtsOnly:
-                return extension === ".d.ts";
+                return extension === ".d.ts" || extension === ".d.mts" || extension === ".d.cts";
         }
     }
     function parsePackageName(moduleName) {
@@ -37492,6 +37551,7 @@ var ts;
                 case 261:
                 case 259:
                 case 195:
+                case 176:
                     return 1 | 32;
                 case 305:
                     return 1 | 4 | 32;
@@ -37509,7 +37569,6 @@ var ts;
                 case 317:
                 case 179:
                 case 175:
-                case 176:
                 case 180:
                 case 170:
                     return 1 | 4 | 32 | 8;
@@ -41330,27 +41389,27 @@ var ts;
         function resolveAlias(symbol) {
             ts.Debug.assert((symbol.flags & 2097152) !== 0, "Should only get Alias here.");
             var links = getSymbolLinks(symbol);
-            if (!links.target) {
-                links.target = resolvingSymbol;
+            if (!links.aliasTarget) {
+                links.aliasTarget = resolvingSymbol;
                 var node = getDeclarationOfAliasSymbol(symbol);
                 if (!node)
                     return ts.Debug.fail();
                 var target = getTargetOfAliasDeclaration(node);
-                if (links.target === resolvingSymbol) {
-                    links.target = target || unknownSymbol;
+                if (links.aliasTarget === resolvingSymbol) {
+                    links.aliasTarget = target || unknownSymbol;
                 }
                 else {
                     error(node, ts.Diagnostics.Circular_definition_of_import_alias_0, symbolToString(symbol));
                 }
             }
-            else if (links.target === resolvingSymbol) {
-                links.target = unknownSymbol;
+            else if (links.aliasTarget === resolvingSymbol) {
+                links.aliasTarget = unknownSymbol;
             }
-            return links.target;
+            return links.aliasTarget;
         }
         function tryResolveAlias(symbol) {
             var links = getSymbolLinks(symbol);
-            if (links.target !== resolvingSymbol) {
+            if (links.aliasTarget !== resolvingSymbol) {
                 return resolveAlias(symbol);
             }
             return undefined;
@@ -42937,13 +42996,27 @@ var ts;
                 return ts.Debug.fail("Should be unreachable.");
                 function conditionalTypeToTypeNode(type) {
                     var checkTypeNode = typeToTypeNodeHelper(type.checkType, context);
+                    context.approximateLength += 15;
+                    if (context.flags & 4 && type.root.isDistributive && !(type.checkType.flags & 262144)) {
+                        var newParam = createTypeParameter(createSymbol(262144, "T"));
+                        var name = typeParameterToName(newParam, context);
+                        var newTypeVariable = ts.factory.createTypeReferenceNode(name);
+                        context.approximateLength += 37;
+                        var newMapper = prependTypeMapping(type.root.checkType, newParam, type.combinedMapper || type.mapper);
+                        var saveInferTypeParameters_1 = context.inferTypeParameters;
+                        context.inferTypeParameters = type.root.inferTypeParameters;
+                        var extendsTypeNode_1 = typeToTypeNodeHelper(instantiateType(type.root.extendsType, newMapper), context);
+                        context.inferTypeParameters = saveInferTypeParameters_1;
+                        var trueTypeNode_1 = typeToTypeNodeOrCircularityElision(instantiateType(getTypeFromTypeNode(type.root.node.trueType), newMapper));
+                        var falseTypeNode_1 = typeToTypeNodeOrCircularityElision(instantiateType(getTypeFromTypeNode(type.root.node.falseType), newMapper));
+                        return ts.factory.createConditionalTypeNode(checkTypeNode, ts.factory.createInferTypeNode(ts.factory.createTypeParameterDeclaration(undefined, ts.factory.cloneNode(newTypeVariable.typeName))), ts.factory.createConditionalTypeNode(ts.factory.createTypeReferenceNode(ts.factory.cloneNode(name)), typeToTypeNodeHelper(type.checkType, context), ts.factory.createConditionalTypeNode(newTypeVariable, extendsTypeNode_1, trueTypeNode_1, falseTypeNode_1), ts.factory.createKeywordTypeNode(143)), ts.factory.createKeywordTypeNode(143));
+                    }
                     var saveInferTypeParameters = context.inferTypeParameters;
                     context.inferTypeParameters = type.root.inferTypeParameters;
                     var extendsTypeNode = typeToTypeNodeHelper(type.extendsType, context);
                     context.inferTypeParameters = saveInferTypeParameters;
                     var trueTypeNode = typeToTypeNodeOrCircularityElision(getTrueTypeFromConditionalType(type));
                     var falseTypeNode = typeToTypeNodeOrCircularityElision(getFalseTypeFromConditionalType(type));
-                    context.approximateLength += 15;
                     return ts.factory.createConditionalTypeNode(checkTypeNode, extendsTypeNode, trueTypeNode, falseTypeNode);
                 }
                 function typeToTypeNodeOrCircularityElision(type) {
@@ -43044,7 +43117,7 @@ var ts;
                             type.symbol ? (isConstructorObject ? "+" : "") + getSymbolId(type.symbol) :
                                 undefined;
                     if (!context.visitedTypes) {
-                        context.visitedTypes = new ts.Map();
+                        context.visitedTypes = new ts.Set();
                     }
                     if (id && !context.symbolDepth) {
                         context.symbolDepth = new ts.Map();
@@ -43062,22 +43135,15 @@ var ts;
                         context.approximateLength += cachedResult.addedLength;
                         return deepCloneOrReuseNode(cachedResult);
                     }
-                    var totalDepth = 0;
-                    var symbolDepth = id ? context.symbolDepth.get(id) : undefined;
-                    if (symbolDepth) {
-                        totalDepth += symbolDepth;
-                    }
-                    var visitedTypeDepth = context.visitedTypes.get(typeId);
-                    if (visitedTypeDepth) {
-                        totalDepth += visitedTypeDepth;
-                    }
-                    if (totalDepth > 10) {
-                        return createElidedInformationPlaceholder(context);
-                    }
+                    var depth;
                     if (id) {
-                        context.symbolDepth.set(id, (symbolDepth || 0) + 1);
+                        depth = context.symbolDepth.get(id) || 0;
+                        if (depth > 10) {
+                            return createElidedInformationPlaceholder(context);
+                        }
+                        context.symbolDepth.set(id, depth + 1);
                     }
-                    context.visitedTypes.set(typeId, (visitedTypeDepth || 0) + 1);
+                    context.visitedTypes.add(typeId);
                     var startLength = context.approximateLength;
                     var result = transform(type);
                     var addedLength = context.approximateLength - startLength;
@@ -43088,19 +43154,9 @@ var ts;
                         result.addedLength = addedLength;
                         (_b = links === null || links === void 0 ? void 0 : links.serializedTypes) === null || _b === void 0 ? void 0 : _b.set(key, result);
                     }
-                    if (visitedTypeDepth !== undefined) {
-                        context.visitedTypes.set(typeId, visitedTypeDepth);
-                    }
-                    else {
-                        context.visitedTypes.delete(typeId);
-                    }
+                    context.visitedTypes.delete(typeId);
                     if (id) {
-                        if (symbolDepth !== undefined) {
-                            context.symbolDepth.set(id, symbolDepth);
-                        }
-                        else {
-                            context.symbolDepth.delete(id);
-                        }
+                        context.symbolDepth.set(id, depth);
                     }
                     return result;
                     function deepCloneOrReuseNode(node) {
@@ -43604,9 +43660,6 @@ var ts;
                 if (parameterDeclaration && isRequiredInitializedParameter(parameterDeclaration)) {
                     parameterType = getOptionalType(parameterType);
                 }
-                if ((context.flags & 1073741824) && parameterDeclaration && !ts.isJSDocParameterTag(parameterDeclaration) && isOptionalUninitializedParameter(parameterDeclaration)) {
-                    parameterType = getTypeWithFacts(parameterType, 524288);
-                }
                 var parameterTypeNode = serializeTypeForDeclaration(context, parameterType, parameterSymbol, context.enclosingDeclaration, privateSymbolVisitor, bundledImports);
                 var modifiers = !(context.flags & 8192) && preserveModifierFlags && parameterDeclaration && parameterDeclaration.modifiers ? parameterDeclaration.modifiers.map(ts.factory.cloneNode) : undefined;
                 var isRest = parameterDeclaration && ts.isRestParameter(parameterDeclaration) || ts.getCheckFlags(parameterSymbol) & 32768;
@@ -44113,7 +44166,7 @@ var ts;
                     var declWithExistingAnnotation = getDeclarationWithTypeAnnotation(symbol, enclosingDeclaration);
                     if (declWithExistingAnnotation && !ts.isFunctionLikeDeclaration(declWithExistingAnnotation) && !ts.isGetAccessorDeclaration(declWithExistingAnnotation)) {
                         var existing = ts.getEffectiveTypeAnnotationNode(declWithExistingAnnotation);
-                        if (getTypeFromTypeNode(existing) === type && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type)) {
+                        if (typeNodeIsEquivalentToType(existing, declWithExistingAnnotation, type) && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type)) {
                             var result_6 = serializeExistingTypeNode(context, existing, includePrivateSymbol, bundled);
                             if (result_6) {
                                 return result_6;
@@ -44130,6 +44183,16 @@ var ts;
                 context.flags = oldFlags;
                 return result;
             }
+            function typeNodeIsEquivalentToType(typeNode, annotatedDeclaration, type) {
+                var typeFromTypeNode = getTypeFromTypeNode(typeNode);
+                if (typeFromTypeNode === type) {
+                    return true;
+                }
+                if (ts.isParameter(annotatedDeclaration) && annotatedDeclaration.questionToken) {
+                    return getTypeWithFacts(type, 524288) === typeFromTypeNode;
+                }
+                return false;
+            }
             function serializeReturnTypeForSignature(context, type, signature, includePrivateSymbol, bundled) {
                 if (!isErrorType(type) && context.enclosingDeclaration) {
                     var annotation = signature.declaration && ts.getEffectiveReturnTypeNode(signature.declaration);
@@ -45983,7 +46046,7 @@ var ts;
                         }
                     }
                     var sourceTypes = ts.some(constructorTypes, function (t) { return !!(t.flags & ~98304); }) ? constructorTypes : types;
-                    type = getUnionType(sourceTypes, 2);
+                    type = getUnionType(sourceTypes);
                 }
             }
             var widened = getWidenedType(addOptionality(type, false, definedInMethod && !definedInConstructor));
@@ -48369,8 +48432,9 @@ var ts;
                         return circularConstraintType;
                     }
                     var result = void 0;
-                    if (stack.length < 10 || stack.length < 50 && !isDeeplyNestedType(t, stack, stack.length)) {
-                        stack.push(t);
+                    var identity_1 = getRecursionIdentity(t);
+                    if (stack.length < 10 || stack.length < 50 && !ts.contains(stack, identity_1)) {
+                        stack.push(identity_1);
                         result = computeBaseConstraint(getSimplifiedType(t, false));
                         stack.pop();
                     }
@@ -51357,8 +51421,11 @@ var ts;
                     return type[cache] = elementType;
                 }
             }
-            if (isGenericMappedType(objectType) && !objectType.declaration.nameType) {
-                return type[cache] = mapType(substituteIndexedMappedType(objectType, type.indexType), function (t) { return getSimplifiedType(t, writing); });
+            if (isGenericMappedType(objectType)) {
+                var nameType = getNameTypeFromMappedType(objectType);
+                if (!nameType || isTypeAssignableTo(nameType, getTypeParameterFromMappedType(objectType))) {
+                    return type[cache] = mapType(substituteIndexedMappedType(objectType, type.indexType), function (t) { return getSimplifiedType(t, writing); });
+                }
             }
             return type[cache] = type;
         }
@@ -55547,12 +55614,12 @@ var ts;
         function isDeeplyNestedType(type, stack, depth, maxDepth) {
             if (maxDepth === void 0) { maxDepth = 3; }
             if (depth >= maxDepth) {
-                var identity_1 = getRecursionIdentity(type);
+                var identity_2 = getRecursionIdentity(type);
                 var count = 0;
                 var lastTypeId = 0;
                 for (var i = 0; i < depth; i++) {
                     var t = stack[i];
-                    if (getRecursionIdentity(t) === identity_1) {
+                    if (getRecursionIdentity(t) === identity_2) {
                         if (t.id >= lastTypeId) {
                             count++;
                             if (count >= maxDepth) {
@@ -61936,7 +62003,9 @@ var ts;
                 }
                 prop = getPropertyOfType(apparentType, right.escapedText);
             }
-            if (ts.isIdentifier(left) && parentSymbol && (compilerOptions.isolatedModules || !(prop && isConstEnumOrConstEnumOnlyModule(prop)) || ts.shouldPreserveConstEnums(compilerOptions) && isExportOrExportExpression(node))) {
+            if (ts.isIdentifier(left) && parentSymbol && (compilerOptions.isolatedModules ||
+                !(prop && (isConstEnumOrConstEnumOnlyModule(prop) || prop.flags & 8 && node.parent.kind === 299)) ||
+                ts.shouldPreserveConstEnums(compilerOptions) && isExportOrExportExpression(node))) {
                 markAliasReferenced(parentSymbol, node);
             }
             var propType;
@@ -64080,7 +64149,7 @@ var ts;
             var newSymbol = createSymbol(2097152, "default");
             newSymbol.parent = originalSymbol;
             newSymbol.nameType = getStringLiteralType("default");
-            newSymbol.target = resolveSymbol(symbol);
+            newSymbol.aliasTarget = resolveSymbol(symbol);
             memberTable.set("default", newSymbol);
             return createAnonymousType(anonymousSymbol, memberTable, ts.emptyArray, ts.emptyArray, ts.emptyArray);
         }
@@ -66604,19 +66673,28 @@ var ts;
             if (constraintType && defaultType) {
                 checkTypeAssignableTo(defaultType, getTypeWithThisArgument(instantiateType(constraintType, makeUnaryTypeMapper(typeParameter, defaultType)), defaultType), node.default, ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
             }
-            if (node.parent.kind === 258 || node.parent.kind === 257 || node.parent.kind === 259) {
+            checkNodeDeferred(node);
+            addLazyDiagnostic(function () { return checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_parameter_name_cannot_be_0); });
+        }
+        function checkTypeParameterDeferred(node) {
+            if (ts.isInterfaceDeclaration(node.parent) || ts.isClassLike(node.parent) || ts.isTypeAliasDeclaration(node.parent)) {
+                var typeParameter = getDeclaredTypeOfTypeParameter(getSymbolOfNode(node));
                 var modifiers = getVarianceModifiers(typeParameter);
-                if (modifiers === 32768 || modifiers === 65536) {
+                if (modifiers) {
                     var symbol = getSymbolOfNode(node.parent);
-                    var source = createMarkerType(symbol, typeParameter, modifiers === 65536 ? markerSubType : markerSuperType);
-                    var target = createMarkerType(symbol, typeParameter, modifiers === 65536 ? markerSuperType : markerSubType);
-                    var saveVarianceTypeParameter = typeParameter;
-                    varianceTypeParameter = typeParameter;
-                    checkTypeAssignableTo(source, target, node, ts.Diagnostics.Type_0_is_not_assignable_to_type_1_as_implied_by_variance_annotation);
-                    varianceTypeParameter = saveVarianceTypeParameter;
+                    if (ts.isTypeAliasDeclaration(node.parent) && !(ts.getObjectFlags(getDeclaredTypeOfSymbol(symbol)) & (16 | 32))) {
+                        error(node, ts.Diagnostics.Variance_annotations_are_only_supported_in_type_aliases_for_object_function_constructor_and_mapped_types);
+                    }
+                    else if (modifiers === 32768 || modifiers === 65536) {
+                        var source = createMarkerType(symbol, typeParameter, modifiers === 65536 ? markerSubType : markerSuperType);
+                        var target = createMarkerType(symbol, typeParameter, modifiers === 65536 ? markerSuperType : markerSubType);
+                        var saveVarianceTypeParameter = typeParameter;
+                        varianceTypeParameter = typeParameter;
+                        checkTypeAssignableTo(source, target, node, ts.Diagnostics.Type_0_is_not_assignable_to_type_1_as_implied_by_variance_annotation);
+                        varianceTypeParameter = saveVarianceTypeParameter;
+                    }
                 }
             }
-            addLazyDiagnostic(function () { return checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_parameter_name_cannot_be_0); });
         }
         function checkParameter(node) {
             checkGrammarDecoratorsAndModifiers(node);
@@ -67043,7 +67121,7 @@ var ts;
                                         superCallStatement = statement;
                                         break;
                                     }
-                                    if (!ts.isPrologueDirective(statement) && nodeImmediatelyReferencesSuperOrThis(statement)) {
+                                    if (nodeImmediatelyReferencesSuperOrThis(statement)) {
                                         break;
                                     }
                                 }
@@ -71581,6 +71659,9 @@ var ts;
                 case 226:
                     checkClassExpressionDeferred(node);
                     break;
+                case 163:
+                    checkTypeParameterDeferred(node);
+                    break;
                 case 279:
                     checkJsxSelfClosingElementDeferred(node);
                     break;
@@ -72054,15 +72135,14 @@ var ts;
                         return propertyDeclaration;
                     }
                 }
-                else if (ts.isMetaProperty(parent)) {
-                    var parentType = getTypeOfNode(parent);
-                    var propertyDeclaration = getPropertyOfType(parentType, node.escapedText);
-                    if (propertyDeclaration) {
-                        return propertyDeclaration;
-                    }
-                    if (parent.keywordToken === 103) {
+                else if (ts.isMetaProperty(parent) && parent.name === node) {
+                    if (parent.keywordToken === 103 && ts.idText(node) === "target") {
                         return checkNewTargetMetaProperty(parent).symbol;
                     }
+                    if (parent.keywordToken === 100 && ts.idText(node) === "meta") {
+                        return getGlobalImportMetaExpressionType().members.get("meta");
+                    }
+                    return undefined;
                 }
             }
             switch (node.kind) {
@@ -72291,11 +72371,11 @@ var ts;
                 var _a = symbol, leftSpread = _a.leftSpread, rightSpread = _a.rightSpread, syntheticOrigin = _a.syntheticOrigin;
                 return leftSpread ? [leftSpread, rightSpread]
                     : syntheticOrigin ? [syntheticOrigin]
-                        : ts.singleElementArray(tryGetAliasTarget(symbol));
+                        : ts.singleElementArray(tryGetTarget(symbol));
             }
             return undefined;
         }
-        function tryGetAliasTarget(symbol) {
+        function tryGetTarget(symbol) {
             var target;
             var next = symbol;
             while (next = getSymbolLinks(next).target) {
@@ -72480,7 +72560,7 @@ var ts;
                 if (links === null || links === void 0 ? void 0 : links.referenced) {
                     return true;
                 }
-                var target = getSymbolLinks(symbol).target;
+                var target = getSymbolLinks(symbol).aliasTarget;
                 if (target && ts.getEffectiveModifierFlags(node) & 1 &&
                     target.flags & 111551 &&
                     (ts.shouldPreserveConstEnums(compilerOptions) || !isConstEnumOrConstEnumOnlyModule(target))) {
@@ -72516,11 +72596,6 @@ var ts;
                 !parameter.initializer &&
                 ts.hasSyntacticModifier(parameter, 16476);
         }
-        function isOptionalUninitializedParameter(parameter) {
-            return !!strictNullChecks &&
-                isOptionalParameter(parameter) &&
-                !parameter.initializer;
-        }
         function isExpandoFunctionDeclaration(node) {
             var declaration = ts.getParseTreeNode(node, ts.isFunctionDeclaration);
             if (!declaration) {
@@ -73385,8 +73460,7 @@ var ts;
                     case 144:
                         var inOutFlag = modifier.kind === 101 ? 32768 : 65536;
                         var inOutText = modifier.kind === 101 ? "in" : "out";
-                        if (node.kind !== 163 || (node.parent.kind !== 258 &&
-                            node.parent.kind !== 257 && node.parent.kind !== 259)) {
+                        if (node.kind !== 163 || !(ts.isInterfaceDeclaration(node.parent) || ts.isClassLike(node.parent) || ts.isTypeAliasDeclaration(node.parent))) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_can_only_appear_on_a_type_parameter_of_a_class_interface_or_type_alias, inOutText);
                         }
                         if (flags & inOutFlag) {
@@ -77582,19 +77656,19 @@ var ts;
             }
             var statements = [];
             resumeLexicalEnvironment();
-            var indexAfterLastPrologueStatement = factory.copyPrologue(body.statements, statements, false, visitor);
-            var superStatementIndex = ts.findSuperStatementIndex(body.statements, indexAfterLastPrologueStatement);
+            var prologueStatementCount = factory.copyPrologue(body.statements, statements, false, visitor);
+            var superStatementIndex = ts.findSuperStatementIndex(body.statements, prologueStatementCount);
             if (superStatementIndex >= 0) {
-                ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, indexAfterLastPrologueStatement, superStatementIndex + 1 - indexAfterLastPrologueStatement));
+                ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, prologueStatementCount, superStatementIndex + 1 - prologueStatementCount));
             }
             var parameterPropertyAssignments = ts.mapDefined(parametersWithPropertyAssignments, transformParameterWithPropertyAssignment);
             if (superStatementIndex >= 0) {
                 ts.addRange(statements, parameterPropertyAssignments);
             }
             else {
-                statements = ts.addRange(parameterPropertyAssignments, statements);
+                statements = __spreadArray(__spreadArray(__spreadArray([], statements.slice(0, prologueStatementCount), true), parameterPropertyAssignments, true), statements.slice(prologueStatementCount), true);
             }
-            ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, superStatementIndex + 1));
+            ts.addRange(statements, ts.visitNodes(body.statements, visitor, ts.isStatement, superStatementIndex + 1 + prologueStatementCount));
             statements = factory.mergeLexicalEnvironment(statements, endLexicalEnvironment());
             var block = factory.createBlock(ts.setTextRange(factory.createNodeArray(statements), body.statements), true);
             ts.setTextRange(block, body);
@@ -79014,7 +79088,7 @@ var ts;
             }
             resumeLexicalEnvironment();
             var needsSyntheticConstructor = !constructor && isDerivedClass;
-            var indexOfFirstStatementAfterSuper = 0;
+            var indexOfFirstStatementAfterSuperAndPrologue = 0;
             var prologueStatementCount = 0;
             var superStatementIndex = -1;
             var statements = [];
@@ -79022,8 +79096,11 @@ var ts;
                 prologueStatementCount = factory.copyPrologue(constructor.body.statements, statements, false, visitor);
                 superStatementIndex = ts.findSuperStatementIndex(constructor.body.statements, prologueStatementCount);
                 if (superStatementIndex >= 0) {
-                    indexOfFirstStatementAfterSuper = superStatementIndex + 1;
-                    statements = __spreadArray(__spreadArray(__spreadArray([], statements.slice(0, prologueStatementCount), true), ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, prologueStatementCount, indexOfFirstStatementAfterSuper - prologueStatementCount), true), statements.slice(prologueStatementCount), true);
+                    indexOfFirstStatementAfterSuperAndPrologue = superStatementIndex + 1;
+                    statements = __spreadArray(__spreadArray(__spreadArray([], statements.slice(0, prologueStatementCount), true), ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, prologueStatementCount, indexOfFirstStatementAfterSuperAndPrologue - prologueStatementCount), true), statements.slice(prologueStatementCount), true);
+                }
+                else if (prologueStatementCount >= 0) {
+                    indexOfFirstStatementAfterSuperAndPrologue = prologueStatementCount;
                 }
             }
             if (needsSyntheticConstructor) {
@@ -79042,19 +79119,17 @@ var ts;
                         }
                     }
                     if (parameterPropertyDeclarationCount > 0) {
-                        var parameterProperties = ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatementAfterSuper, parameterPropertyDeclarationCount);
+                        var parameterProperties = ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatementAfterSuperAndPrologue, parameterPropertyDeclarationCount);
                         if (superStatementIndex >= 0) {
                             ts.addRange(statements, parameterProperties);
                         }
-                        else if (needsSyntheticConstructor) {
-                            statements = __spreadArray(__spreadArray([
-                                statements[0]
-                            ], parameterProperties, true), statements.slice(1), true);
-                        }
                         else {
-                            statements = __spreadArray(__spreadArray([], parameterProperties, true), statements, true);
+                            var superAndPrologueStatementCount = prologueStatementCount;
+                            if (needsSyntheticConstructor)
+                                superAndPrologueStatementCount++;
+                            statements = __spreadArray(__spreadArray(__spreadArray([], statements.slice(0, superAndPrologueStatementCount), true), parameterProperties, true), statements.slice(superAndPrologueStatementCount), true);
                         }
-                        indexOfFirstStatementAfterSuper += parameterPropertyDeclarationCount;
+                        indexOfFirstStatementAfterSuperAndPrologue += parameterPropertyDeclarationCount;
                     }
                 }
             }
@@ -79062,7 +79137,7 @@ var ts;
             addMethodStatements(statements, privateMethodsAndAccessors, receiver);
             addPropertyOrClassStaticBlockStatements(statements, properties, receiver);
             if (constructor) {
-                ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitBodyStatement, ts.isStatement, indexOfFirstStatementAfterSuper + prologueStatementCount));
+                ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitBodyStatement, ts.isStatement, indexOfFirstStatementAfterSuperAndPrologue));
             }
             statements = factory.mergeLexicalEnvironment(statements, endLexicalEnvironment());
             return ts.setTextRange(factory.createBlock(ts.setTextRange(factory.createNodeArray(statements), constructor ? constructor.body.statements : node.members), true), constructor ? constructor.body : undefined);
@@ -82282,7 +82357,7 @@ var ts;
             else {
                 insertCaptureThisForNodeIfNeeded(prologue, constructor);
             }
-            var body = factory.createBlock(ts.setTextRange(factory.createNodeArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], existingPrologue, true), prologue, true), (superStatementIndex <= existingPrologue.length ? ts.emptyArray : ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, existingPrologue.length, superStatementIndex)), true), statements, true)), constructor.body.statements), true);
+            var body = factory.createBlock(ts.setTextRange(factory.createNodeArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], existingPrologue, true), prologue, true), (superStatementIndex <= existingPrologue.length ? ts.emptyArray : ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, existingPrologue.length, superStatementIndex - existingPrologue.length)), true), statements, true)), constructor.body.statements), true);
             ts.setTextRange(body, constructor.body);
             return body;
         }
@@ -88880,6 +88955,10 @@ var ts;
             return factory.updateModifiers(statement, modifiers);
         }
         function transformTopLevelDeclaration(input) {
+            if (lateMarkedStatements) {
+                while (ts.orderedRemoveItem(lateMarkedStatements, input))
+                    ;
+            }
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {
@@ -89846,7 +89925,7 @@ var ts;
         addOutput(buildInfoPath);
     }
     function getOwnOutputFileNames(configFile, inputFileName, ignoreCase, addOutput, getCommonSourceDirectory) {
-        if (ts.fileExtensionIs(inputFileName, ".d.ts"))
+        if (ts.isDeclarationFileName(inputFileName))
             return;
         var js = getOutputJSFileName(inputFileName, configFile, ignoreCase, getCommonSourceDirectory);
         addOutput(js);
@@ -89884,7 +89963,7 @@ var ts;
     ts.getCommonSourceDirectory = getCommonSourceDirectory;
     function getCommonSourceDirectoryOfConfig(_a, ignoreCase) {
         var options = _a.options, fileNames = _a.fileNames;
-        return getCommonSourceDirectory(options, function () { return ts.filter(fileNames, function (file) { return !(options.noEmitForJsFiles && ts.fileExtensionIsOneOf(file, ts.supportedJSExtensionsFlat)) && !ts.fileExtensionIs(file, ".d.ts"); }); }, ts.getDirectoryPath(ts.normalizeSlashes(ts.Debug.checkDefined(options.configFilePath))), ts.createGetCanonicalFileName(!ignoreCase));
+        return getCommonSourceDirectory(options, function () { return ts.filter(fileNames, function (file) { return !(options.noEmitForJsFiles && ts.fileExtensionIsOneOf(file, ts.supportedJSExtensionsFlat)) && !ts.isDeclarationFileName(file); }); }, ts.getDirectoryPath(ts.normalizeSlashes(ts.Debug.checkDefined(options.configFilePath))), ts.createGetCanonicalFileName(!ignoreCase));
     }
     ts.getCommonSourceDirectoryOfConfig = getCommonSourceDirectoryOfConfig;
     function getAllProjectOutputs(configFile, ignoreCase) {
@@ -89924,7 +90003,7 @@ var ts;
         var getCommonSourceDirectory = ts.memoize(function () { return getCommonSourceDirectoryOfConfig(configFile, ignoreCase); });
         for (var _a = 0, _b = configFile.fileNames; _a < _b.length; _a++) {
             var inputFileName = _b[_a];
-            if (ts.fileExtensionIs(inputFileName, ".d.ts"))
+            if (ts.isDeclarationFileName(inputFileName))
                 continue;
             var jsFilePath = getOutputJSFileName(inputFileName, configFile, ignoreCase, getCommonSourceDirectory);
             if (jsFilePath)
@@ -94779,7 +94858,7 @@ var ts;
             return false;
         if (ts.outFile(options) || options.outDir)
             return false;
-        if (ts.fileExtensionIs(fileOrDirectoryPath, ".d.ts")) {
+        if (ts.isDeclarationFileName(fileOrDirectoryPath)) {
             if (options.declarationDir)
                 return false;
         }
@@ -95837,7 +95916,7 @@ var ts;
                                 var getCommonSourceDirectory_2 = ts.memoize(function () { return ts.getCommonSourceDirectoryOfConfig(parsedRef.commandLine, !host.useCaseSensitiveFileNames()); });
                                 for (var _b = 0, _c = parsedRef.commandLine.fileNames; _b < _c.length; _b++) {
                                     var fileName = _c[_b];
-                                    if (!ts.fileExtensionIs(fileName, ".d.ts") && !ts.fileExtensionIs(fileName, ".json")) {
+                                    if (!ts.isDeclarationFileName(fileName) && !ts.fileExtensionIs(fileName, ".json")) {
                                         processProjectReferenceFile(ts.getOutputDeclarationFileName(fileName, parsedRef.commandLine, !host.useCaseSensitiveFileNames(), getCommonSourceDirectory_2), { kind: ts.FileIncludeKind.OutputFromProjectReference, index: index });
                                     }
                                 }
@@ -96013,7 +96092,7 @@ var ts;
         }
         function getRedirectReferenceForResolution(file) {
             var redirect = getResolvedProjectReferenceToRedirect(file.originalFileName);
-            if (redirect || !ts.fileExtensionIsOneOf(file.originalFileName, [".d.ts", ".d.cts", ".d.mts"]))
+            if (redirect || !ts.isDeclarationFileName(file.originalFileName))
                 return redirect;
             var resultFromDts = getRedirectReferenceForResolutionFromSourceOfProject(file.path);
             if (resultFromDts)
@@ -97202,7 +97281,7 @@ var ts;
             return referencedProject && getProjectReferenceOutputName(referencedProject, fileName);
         }
         function getProjectReferenceRedirectProject(fileName) {
-            if (!resolvedProjectReferences || !resolvedProjectReferences.length || ts.fileExtensionIs(fileName, ".d.ts") || ts.fileExtensionIs(fileName, ".json")) {
+            if (!resolvedProjectReferences || !resolvedProjectReferences.length || ts.isDeclarationFileName(fileName) || ts.fileExtensionIs(fileName, ".json")) {
                 return undefined;
             }
             return getResolvedProjectReferenceToRedirect(fileName);
@@ -97244,7 +97323,7 @@ var ts;
                     else {
                         var getCommonSourceDirectory_3 = ts.memoize(function () { return ts.getCommonSourceDirectoryOfConfig(resolvedRef.commandLine, !host.useCaseSensitiveFileNames()); });
                         ts.forEach(resolvedRef.commandLine.fileNames, function (fileName) {
-                            if (!ts.fileExtensionIs(fileName, ".d.ts") && !ts.fileExtensionIs(fileName, ".json")) {
+                            if (!ts.isDeclarationFileName(fileName) && !ts.fileExtensionIs(fileName, ".json")) {
                                 var outputDts = ts.getOutputDeclarationFileName(fileName, resolvedRef.commandLine, !host.useCaseSensitiveFileNames(), getCommonSourceDirectory_3);
                                 mapFromToProjectReferenceRedirectSource.set(toPath(outputDts), fileName);
                             }
@@ -97993,7 +98072,7 @@ var ts;
             if (options.outDir) {
                 return ts.containsPath(options.outDir, filePath, currentDirectory, !host.useCaseSensitiveFileNames());
             }
-            if (ts.fileExtensionIsOneOf(filePath, ts.supportedJSExtensionsFlat) || ts.fileExtensionIs(filePath, ".d.ts")) {
+            if (ts.fileExtensionIsOneOf(filePath, ts.supportedJSExtensionsFlat) || ts.isDeclarationFileName(filePath)) {
                 var filePathWithoutExtension = ts.removeFileExtension(filePath);
                 return !!getSourceFileByPath((filePathWithoutExtension + ".ts")) ||
                     !!getSourceFileByPath((filePathWithoutExtension + ".tsx"));
@@ -98285,13 +98364,9 @@ var ts;
     ts.getFileEmitOutput = getFileEmitOutput;
     var BuilderState;
     (function (BuilderState) {
-        var manyToManyPathMapCount = 0;
         function createManyToManyPathMap() {
             function create(forward, reverse, deleted) {
-                var version = 0;
                 var map = {
-                    id: manyToManyPathMapCount++,
-                    version: function () { return version; },
                     clone: function () { return create(new ts.Map(forward), new ts.Map(reverse), deleted && new ts.Set(deleted)); },
                     forEach: function (fn) { return forward.forEach(fn); },
                     getKeys: function (v) { return reverse.get(v); },
@@ -98307,30 +98382,29 @@ var ts;
                         }
                         set.forEach(function (v) { return deleteFromMultimap(reverse, v, k); });
                         forward.delete(k);
-                        version++;
                         return true;
                     },
                     set: function (k, vSet) {
-                        var changed = !!(deleted === null || deleted === void 0 ? void 0 : deleted.delete(k));
+                        deleted === null || deleted === void 0 ? void 0 : deleted.delete(k);
                         var existingVSet = forward.get(k);
                         forward.set(k, vSet);
                         existingVSet === null || existingVSet === void 0 ? void 0 : existingVSet.forEach(function (v) {
                             if (!vSet.has(v)) {
-                                changed = true;
                                 deleteFromMultimap(reverse, v, k);
                             }
                         });
                         vSet.forEach(function (v) {
                             if (!(existingVSet === null || existingVSet === void 0 ? void 0 : existingVSet.has(v))) {
-                                changed = true;
                                 addToMultimap(reverse, v, k);
                             }
                         });
-                        if (changed) {
-                            version++;
-                        }
                         return map;
                     },
+                    clear: function () {
+                        forward.clear();
+                        reverse.clear();
+                        deleted === null || deleted === void 0 ? void 0 : deleted.clear();
+                    }
                 };
                 return map;
             }
@@ -98345,11 +98419,10 @@ var ts;
             }
             set.add(v);
         }
-        function deleteFromMultimap(map, k, v, removeEmpty) {
-            if (removeEmpty === void 0) { removeEmpty = true; }
+        function deleteFromMultimap(map, k, v) {
             var set = map.get(k);
             if (set === null || set === void 0 ? void 0 : set.delete(v)) {
-                if (removeEmpty && !set.size) {
+                if (!set.size) {
                     map.delete(k);
                 }
                 return true;
@@ -98525,7 +98598,7 @@ var ts;
                 var emitOutput_1 = getFileEmitOutput(programOfThisState, sourceFile, true, cancellationToken, undefined, true);
                 var firstDts_1 = ts.firstOrUndefined(emitOutput_1.outputFiles);
                 if (firstDts_1) {
-                    ts.Debug.assert(ts.fileExtensionIsOneOf(firstDts_1.name, [".d.ts", ".d.mts", ".d.cts"]), "File extension for signature expected to be dts", function () { return "Found: " + ts.getAnyExtensionFromPath(firstDts_1.name) + " for " + firstDts_1.name + ":: All output files: " + JSON.stringify(emitOutput_1.outputFiles.map(function (f) { return f.name; })); });
+                    ts.Debug.assert(ts.isDeclarationFileName(firstDts_1.name), "File extension for signature expected to be dts", function () { return "Found: " + ts.getAnyExtensionFromPath(firstDts_1.name) + " for " + firstDts_1.name + ":: All output files: " + JSON.stringify(emitOutput_1.outputFiles.map(function (f) { return f.name; })); });
                     latestSignature = (computeHash || ts.generateDjb2Hash)(firstDts_1.text);
                     if (exportedModulesMapCache && latestSignature !== prevSignature) {
                         updateExportedModules(sourceFile, emitOutput_1.exportedModulesFromDeclarationEmit, exportedModulesMapCache);
@@ -98574,18 +98647,6 @@ var ts;
             var _a;
             if (exportedModulesMapCache) {
                 ts.Debug.assert(!!state.exportedModulesMap);
-                var cacheId = exportedModulesMapCache.id;
-                var cacheVersion = exportedModulesMapCache.version();
-                if (state.previousCache) {
-                    if (state.previousCache.id === cacheId && state.previousCache.version === cacheVersion) {
-                        return;
-                    }
-                    state.previousCache.id = cacheId;
-                    state.previousCache.version = cacheVersion;
-                }
-                else {
-                    state.previousCache = { id: cacheId, version: cacheVersion };
-                }
                 (_a = exportedModulesMapCache.deletedKeys()) === null || _a === void 0 ? void 0 : _a.forEach(function (path) { return state.exportedModulesMap.deleteKey(path); });
                 exportedModulesMapCache.forEach(function (exportedModules, path) { return state.exportedModulesMap.set(path, exportedModules); });
             }
@@ -98838,7 +98899,8 @@ var ts;
     function assertSourceFileOkWithoutNextAffectedCall(state, sourceFile) {
         ts.Debug.assert(!sourceFile || !state.affectedFiles || state.affectedFiles[state.affectedFilesIndex - 1] !== sourceFile || !state.semanticDiagnosticsPerFile.has(sourceFile.resolvedPath));
     }
-    function getNextAffectedFile(state, cancellationToken, computeHash) {
+    function getNextAffectedFile(state, cancellationToken, computeHash, host) {
+        var _a;
         while (true) {
             var affectedFiles = state.affectedFiles;
             if (affectedFiles) {
@@ -98848,7 +98910,7 @@ var ts;
                     var affectedFile = affectedFiles[affectedFilesIndex];
                     if (!seenAffectedFiles.has(affectedFile.resolvedPath)) {
                         state.affectedFilesIndex = affectedFilesIndex;
-                        handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash);
+                        handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash, host);
                         return affectedFile;
                     }
                     affectedFilesIndex++;
@@ -98858,6 +98920,7 @@ var ts;
                 ts.BuilderState.updateSignaturesFromCache(state, state.currentAffectedFilesSignatures);
                 state.currentAffectedFilesSignatures.clear();
                 ts.BuilderState.updateExportedFilesMapFromCache(state, state.currentAffectedFilesExportedModulesMap);
+                (_a = state.currentAffectedFilesExportedModulesMap) === null || _a === void 0 ? void 0 : _a.clear();
                 state.affectedFiles = undefined;
             }
             var nextKey = state.changedFilesSet.keys().next();
@@ -98882,6 +98945,11 @@ var ts;
                 state.seenAffectedFiles = new ts.Set();
         }
     }
+    function clearAffectedFilesPendingEmit(state) {
+        state.affectedFilesPendingEmit = undefined;
+        state.affectedFilesPendingEmitKind = undefined;
+        state.affectedFilesPendingEmitIndex = undefined;
+    }
     function getNextAffectedFilePendingEmit(state) {
         var affectedFilesPendingEmit = state.affectedFilesPendingEmit;
         if (affectedFilesPendingEmit) {
@@ -98897,13 +98965,11 @@ var ts;
                     }
                 }
             }
-            state.affectedFilesPendingEmit = undefined;
-            state.affectedFilesPendingEmitKind = undefined;
-            state.affectedFilesPendingEmitIndex = undefined;
+            clearAffectedFilesPendingEmit(state);
         }
         return undefined;
     }
-    function handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash) {
+    function handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash, host) {
         var _a;
         removeSemanticDiagnosticsOf(state, affectedFile.resolvedPath);
         if (state.allFilesExcludingDefaultLibraryFile === state.affectedFiles) {
@@ -98924,16 +98990,16 @@ var ts;
             ts.Debug.assert(state.hasCalledUpdateShapeSignature.has(affectedFile.resolvedPath) || ((_a = state.currentAffectedFilesSignatures) === null || _a === void 0 ? void 0 : _a.has(affectedFile.resolvedPath)), "Signature not updated for affected file: " + affectedFile.fileName);
         }
         if (!state.compilerOptions.assumeChangesOnlyAffectDirectDependencies) {
-            forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, function (state, path) { return handleDtsMayChangeOf(state, path, cancellationToken, computeHash); });
+            forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, function (state, path) { return handleDtsMayChangeOf(state, path, cancellationToken, computeHash, host); });
         }
     }
-    function handleDtsMayChangeOf(state, path, cancellationToken, computeHash) {
+    function handleDtsMayChangeOf(state, path, cancellationToken, computeHash, host) {
         removeSemanticDiagnosticsOf(state, path);
         if (!state.changedFilesSet.has(path)) {
             var program = ts.Debug.checkDefined(state.program);
             var sourceFile = program.getSourceFileByPath(path);
             if (sourceFile) {
-                ts.BuilderState.updateShapeSignature(state, program, sourceFile, ts.Debug.checkDefined(state.currentAffectedFilesSignatures), cancellationToken, computeHash, state.currentAffectedFilesExportedModulesMap, true);
+                ts.BuilderState.updateShapeSignature(state, program, sourceFile, ts.Debug.checkDefined(state.currentAffectedFilesSignatures), cancellationToken, computeHash, state.currentAffectedFilesExportedModulesMap, !host.disableUseFileVersionAsSignature);
                 if (ts.getEmitDeclarations(state.compilerOptions)) {
                     addToAffectedFilesPendingEmit(state, path, 0);
                 }
@@ -99078,8 +99144,8 @@ var ts;
             var signature = state.currentAffectedFilesSignatures && state.currentAffectedFilesSignatures.get(key);
             var actualSignature = signature !== null && signature !== void 0 ? signature : value.signature;
             return value.version === actualSignature ?
-                value.affectsGlobalScope ?
-                    { version: value.version, signature: undefined, affectsGlobalScope: true, impliedFormat: value.impliedFormat } :
+                value.affectsGlobalScope || value.impliedFormat ?
+                    { version: value.version, signature: undefined, affectsGlobalScope: value.affectsGlobalScope, impliedFormat: value.impliedFormat } :
                     value.version :
                 actualSignature !== undefined ?
                     signature === undefined ?
@@ -99312,7 +99378,7 @@ var ts;
             return ts.emitSkippedWithNoDiagnostics;
         }
         function emitNextAffectedFile(writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
-            var affected = getNextAffectedFile(state, cancellationToken, computeHash);
+            var affected = getNextAffectedFile(state, cancellationToken, computeHash, host);
             var emitKind = 1;
             var isPendingEmitFile = false;
             if (!affected) {
@@ -99338,55 +99404,49 @@ var ts;
             return toAffectedFileEmitResult(state, ts.Debug.checkDefined(state.program).emit(affected === state.program ? undefined : affected, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles || emitKind === 0, customTransformers), affected, emitKind, isPendingEmitFile);
         }
         function emit(targetSourceFile, writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers) {
-            var restorePendingEmitOnHandlingNoEmitSuccess = false;
-            var savedAffectedFilesPendingEmit;
-            var savedAffectedFilesPendingEmitKind;
-            var savedAffectedFilesPendingEmitIndex;
-            if (kind !== BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram &&
-                !targetSourceFile &&
-                !ts.outFile(state.compilerOptions) &&
-                !state.compilerOptions.noEmit &&
-                state.compilerOptions.noEmitOnError) {
-                restorePendingEmitOnHandlingNoEmitSuccess = true;
-                savedAffectedFilesPendingEmit = state.affectedFilesPendingEmit && state.affectedFilesPendingEmit.slice();
-                savedAffectedFilesPendingEmitKind = state.affectedFilesPendingEmitKind && new ts.Map(state.affectedFilesPendingEmitKind);
-                savedAffectedFilesPendingEmitIndex = state.affectedFilesPendingEmitIndex;
-            }
+            var _a;
             if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
                 assertSourceFileOkWithoutNextAffectedCall(state, targetSourceFile);
             }
             var result = ts.handleNoEmitOptions(builderProgram, targetSourceFile, writeFile, cancellationToken);
             if (result)
                 return result;
-            if (restorePendingEmitOnHandlingNoEmitSuccess) {
-                state.affectedFilesPendingEmit = savedAffectedFilesPendingEmit;
-                state.affectedFilesPendingEmitKind = savedAffectedFilesPendingEmitKind;
-                state.affectedFilesPendingEmitIndex = savedAffectedFilesPendingEmitIndex;
-            }
-            if (!targetSourceFile && kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
-                var sourceMaps = [];
-                var emitSkipped = false;
-                var diagnostics = void 0;
-                var emittedFiles = [];
-                var affectedEmitResult = void 0;
-                while (affectedEmitResult = emitNextAffectedFile(writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers)) {
-                    emitSkipped = emitSkipped || affectedEmitResult.result.emitSkipped;
-                    diagnostics = ts.addRange(diagnostics, affectedEmitResult.result.diagnostics);
-                    emittedFiles = ts.addRange(emittedFiles, affectedEmitResult.result.emittedFiles);
-                    sourceMaps = ts.addRange(sourceMaps, affectedEmitResult.result.sourceMaps);
+            if (!targetSourceFile) {
+                if (kind === BuilderProgramKind.EmitAndSemanticDiagnosticsBuilderProgram) {
+                    var sourceMaps = [];
+                    var emitSkipped = false;
+                    var diagnostics = void 0;
+                    var emittedFiles = [];
+                    var affectedEmitResult = void 0;
+                    while (affectedEmitResult = emitNextAffectedFile(writeFile, cancellationToken, emitOnlyDtsFiles, customTransformers)) {
+                        emitSkipped = emitSkipped || affectedEmitResult.result.emitSkipped;
+                        diagnostics = ts.addRange(diagnostics, affectedEmitResult.result.diagnostics);
+                        emittedFiles = ts.addRange(emittedFiles, affectedEmitResult.result.emittedFiles);
+                        sourceMaps = ts.addRange(sourceMaps, affectedEmitResult.result.sourceMaps);
+                    }
+                    return {
+                        emitSkipped: emitSkipped,
+                        diagnostics: diagnostics || ts.emptyArray,
+                        emittedFiles: emittedFiles,
+                        sourceMaps: sourceMaps
+                    };
+                }
+                else if ((_a = state.affectedFilesPendingEmitKind) === null || _a === void 0 ? void 0 : _a.size) {
+                    ts.Debug.assert(kind === BuilderProgramKind.SemanticDiagnosticsBuilderProgram);
+                    if (!emitOnlyDtsFiles
+                        || ts.every(state.affectedFilesPendingEmit, function (path, index) {
+                            return index < state.affectedFilesPendingEmitIndex ||
+                                state.affectedFilesPendingEmitKind.get(path) === 0;
+                        })) {
+                        clearAffectedFilesPendingEmit(state);
+                    }
                 }
-                return {
-                    emitSkipped: emitSkipped,
-                    diagnostics: diagnostics || ts.emptyArray,
-                    emittedFiles: emittedFiles,
-                    sourceMaps: sourceMaps
-                };
             }
             return ts.Debug.checkDefined(state.program).emit(targetSourceFile, writeFile || ts.maybeBind(host, host.writeFile), cancellationToken, emitOnlyDtsFiles, customTransformers);
         }
         function getSemanticDiagnosticsOfNextAffectedFile(cancellationToken, ignoreSourceFile) {
             while (true) {
-                var affected = getNextAffectedFile(state, cancellationToken, computeHash);
+                var affected = getNextAffectedFile(state, cancellationToken, computeHash, host);
                 if (!affected) {
                     return undefined;
                 }
@@ -102141,9 +102201,6 @@ var ts;
     function newer(date1, date2) {
         return date2 > date1 ? date2 : date1;
     }
-    function isDeclarationFile(fileName) {
-        return ts.fileExtensionIs(fileName, ".d.ts");
-    }
     function isCircularBuildOrder(buildOrder) {
         return !!buildOrder && !!buildOrder.buildOrder;
     }
@@ -102681,7 +102738,7 @@ var ts;
             outputFiles.forEach(function (_a) {
                 var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark;
                 var priorChangeTime;
-                if (!anyDtsChanged && isDeclarationFile(name)) {
+                if (!anyDtsChanged && ts.isDeclarationFileName(name)) {
                     if (host.fileExists(name) && state.readFileWithCache(name) === text) {
                         priorChangeTime = host.getModifiedTime(name);
                     }
@@ -102997,7 +103054,7 @@ var ts;
                     newestOutputFileTime = outputTime;
                     newestOutputFileName = output;
                 }
-                if (isDeclarationFile(output)) {
+                if (ts.isDeclarationFileName(output)) {
                     var outputModifiedTime = ts.getModifiedTime(host, output);
                     newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);
                 }
@@ -103137,7 +103194,7 @@ var ts;
                     reportVerbose = false;
                     reportStatus(state, verboseMessage, proj.options.configFilePath);
                 }
-                if (isDeclarationFile(file)) {
+                if (ts.isDeclarationFileName(file)) {
                     priorNewestUpdateTime = newer(priorNewestUpdateTime, ts.getModifiedTime(host, file));
                 }
                 host.setModifiedTime(file, now);