typescript 4.8.0-dev.20220525 → 4.8.0-dev.20220528

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.8";
-    ts.version = ts.versionMajorMinor + ".0-dev.20220525";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220528";
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -5598,6 +5598,7 @@ var ts;
         Construct_signatures_with_no_arguments_have_incompatible_return_types_0_and_1: diag(2205, ts.DiagnosticCategory.Error, "Construct_signatures_with_no_arguments_have_incompatible_return_types_0_and_1_2205", "Construct signatures with no arguments have incompatible return types '{0}' and '{1}'.", undefined, true),
         The_type_modifier_cannot_be_used_on_a_named_import_when_import_type_is_used_on_its_import_statement: diag(2206, ts.DiagnosticCategory.Error, "The_type_modifier_cannot_be_used_on_a_named_import_when_import_type_is_used_on_its_import_statement_2206", "The 'type' modifier cannot be used on a named import when 'import type' is used on its import statement."),
         The_type_modifier_cannot_be_used_on_a_named_export_when_export_type_is_used_on_its_export_statement: diag(2207, ts.DiagnosticCategory.Error, "The_type_modifier_cannot_be_used_on_a_named_export_when_export_type_is_used_on_its_export_statement_2207", "The 'type' modifier cannot be used on a named export when 'export type' is used on its export statement."),
+        This_type_parameter_probably_needs_an_extends_object_constraint: diag(2208, ts.DiagnosticCategory.Error, "This_type_parameter_probably_needs_an_extends_object_constraint_2208", "This type parameter probably needs an `extends object` constraint."),
         The_project_root_is_ambiguous_but_is_required_to_resolve_export_map_entry_0_in_file_1_Supply_the_rootDir_compiler_option_to_disambiguate: diag(2209, ts.DiagnosticCategory.Error, "The_project_root_is_ambiguous_but_is_required_to_resolve_export_map_entry_0_in_file_1_Supply_the_roo_2209", "The project root is ambiguous, but is required to resolve export map entry '{0}' in file '{1}'. Supply the `rootDir` compiler option to disambiguate."),
         The_project_root_is_ambiguous_but_is_required_to_resolve_import_map_entry_0_in_file_1_Supply_the_rootDir_compiler_option_to_disambiguate: diag(2210, ts.DiagnosticCategory.Error, "The_project_root_is_ambiguous_but_is_required_to_resolve_import_map_entry_0_in_file_1_Supply_the_roo_2210", "The project root is ambiguous, but is required to resolve import map entry '{0}' in file '{1}'. Supply the `rootDir` compiler option to disambiguate."),
         Duplicate_identifier_0: diag(2300, ts.DiagnosticCategory.Error, "Duplicate_identifier_0_2300", "Duplicate identifier '{0}'."),
@@ -12599,9 +12600,6 @@ var ts;
     }
     ts.isVariableDeclarationInitializedToBareOrAccessedRequire = isVariableDeclarationInitializedToBareOrAccessedRequire;
     function isVariableDeclarationInitializedWithRequireHelper(node, allowAccessedRequire) {
-        if (node.kind === 203) {
-            node = node.parent.parent;
-        }
         return ts.isVariableDeclaration(node) &&
             !!node.initializer &&
             isRequireCall(allowAccessedRequire ? getLeftmostAccessExpression(node.initializer) : node.initializer, true);
@@ -15861,13 +15859,13 @@ var ts;
         return !file.isDeclarationFile ? walkTreeForJSXTags(file) : undefined;
     }
     function isFileForcedToBeModuleByFormat(file) {
-        return file.impliedNodeFormat === ts.ModuleKind.ESNext && !file.isDeclarationFile ? true : undefined;
+        return (file.impliedNodeFormat === ts.ModuleKind.ESNext || (ts.fileExtensionIsOneOf(file.fileName, [".cjs", ".cts"]))) && !file.isDeclarationFile ? true : undefined;
     }
     function getSetExternalModuleIndicator(options) {
         switch (getEmitModuleDetectionKind(options)) {
             case ts.ModuleDetectionKind.Force:
                 return function (file) {
-                    file.externalModuleIndicator = !file.isDeclarationFile || ts.isFileProbablyExternalModule(file);
+                    file.externalModuleIndicator = ts.isFileProbablyExternalModule(file) || !file.isDeclarationFile || undefined;
                 };
             case ts.ModuleDetectionKind.Legacy:
                 return function (file) {
@@ -15923,7 +15921,8 @@ var ts;
     }
     ts.getEmitModuleResolutionKind = getEmitModuleResolutionKind;
     function getEmitModuleDetectionKind(options) {
-        return options.moduleDetection || ts.ModuleDetectionKind.Auto;
+        return options.moduleDetection ||
+            (getEmitModuleKind(options) === ts.ModuleKind.Node16 || getEmitModuleKind(options) === ts.ModuleKind.NodeNext ? ts.ModuleDetectionKind.Force : ts.ModuleDetectionKind.Auto);
     }
     ts.getEmitModuleDetectionKind = getEmitModuleDetectionKind;
     function hasJsonModuleEmitEnabled(options) {
@@ -34266,7 +34265,7 @@ var ts;
         }
         if (ts.isImplicitGlob(spec.substring(spec.lastIndexOf(ts.directorySeparator) + 1))) {
             return {
-                key: useCaseSensitiveFileNames ? spec : ts.toFileNameLowerCase(spec),
+                key: ts.removeTrailingDirectorySeparator(useCaseSensitiveFileNames ? spec : ts.toFileNameLowerCase(spec)),
                 flags: 1
             };
         }
@@ -35199,15 +35198,19 @@ var ts;
     function nodeNextModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode) {
         return nodeNextModuleNameResolverWorker(NodeResolutionFeatures.NodeNextDefault, moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode);
     }
-    function nodeNextModuleNameResolverWorker(features, moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode) {
-        var containingDirectory = ts.getDirectoryPath(containingFile);
-        var esmMode = resolutionMode === ts.ModuleKind.ESNext ? NodeResolutionFeatures.EsmMode : 0;
-        return nodeModuleNameResolverWorker(features | esmMode, moduleName, containingDirectory, compilerOptions, host, cache, compilerOptions.resolveJsonModule ? tsPlusJsonExtensions : tsExtensions, redirectedReference);
-    }
     var jsOnlyExtensions = [Extensions.JavaScript];
     var tsExtensions = [Extensions.TypeScript, Extensions.JavaScript];
     var tsPlusJsonExtensions = __spreadArray(__spreadArray([], tsExtensions, true), [Extensions.Json], false);
     var tsconfigExtensions = [Extensions.TSConfig];
+    function nodeNextModuleNameResolverWorker(features, moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode) {
+        var containingDirectory = ts.getDirectoryPath(containingFile);
+        var esmMode = resolutionMode === ts.ModuleKind.ESNext ? NodeResolutionFeatures.EsmMode : 0;
+        var extensions = compilerOptions.noDtsResolution ? [Extensions.TsOnly, Extensions.JavaScript] : tsExtensions;
+        if (compilerOptions.resolveJsonModule) {
+            extensions = __spreadArray(__spreadArray([], extensions, true), [Extensions.Json], false);
+        }
+        return nodeModuleNameResolverWorker(features | esmMode, moduleName, containingDirectory, compilerOptions, host, cache, extensions, redirectedReference);
+    }
     function tryResolveJSModuleWorker(moduleName, initialDir, host) {
         return nodeModuleNameResolverWorker(NodeResolutionFeatures.None, moduleName, initialDir, { moduleResolution: ts.ModuleResolutionKind.NodeJs, allowJs: true }, host, undefined, jsOnlyExtensions, undefined);
     }
@@ -38487,12 +38490,14 @@ var ts;
             }
         }
         function setCommonJsModuleIndicator(node) {
-            if (file.externalModuleIndicator) {
+            if (file.externalModuleIndicator && file.externalModuleIndicator !== true) {
                 return false;
             }
             if (!file.commonJsModuleIndicator) {
                 file.commonJsModuleIndicator = node;
-                bindSourceFileAsExternalModule();
+                if (!file.externalModuleIndicator) {
+                    bindSourceFileAsExternalModule();
+                }
             }
             return true;
         }
@@ -38845,7 +38850,11 @@ var ts;
                 checkStrictModeEvalOrArguments(node, node.name);
             }
             if (!ts.isBindingPattern(node.name)) {
-                if (ts.isInJSFile(node) && ts.isVariableDeclarationInitializedToBareOrAccessedRequire(node) && !ts.getJSDocTypeTag(node) && !(ts.getCombinedModifierFlags(node) & 1)) {
+                var possibleVariableDecl = node.kind === 254 ? node : node.parent.parent;
+                if (ts.isInJSFile(node) &&
+                    ts.isVariableDeclarationInitializedToBareOrAccessedRequire(possibleVariableDecl) &&
+                    !ts.getJSDocTypeTag(node) &&
+                    !(ts.getCombinedModifierFlags(node) & 1)) {
                     declareSymbolAndAddToSymbolTable(node, 2097152, 2097152);
                 }
                 else if (ts.isBlockOrCatchScoped(node)) {
@@ -39743,6 +39752,7 @@ var ts;
         var emptyTypeLiteralSymbol = createSymbol(2048, "__type");
         emptyTypeLiteralSymbol.members = ts.createSymbolTable();
         var emptyTypeLiteralType = createAnonymousType(emptyTypeLiteralSymbol, emptySymbols, ts.emptyArray, ts.emptyArray, ts.emptyArray);
+        var unknownUnionType = strictNullChecks ? getUnionType([undefinedType, nullType, createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, ts.emptyArray)]) : unknownType;
         var emptyGenericType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, ts.emptyArray);
         emptyGenericType.instantiations = new ts.Map();
         var anyFunctionType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, ts.emptyArray);
@@ -41158,7 +41168,8 @@ var ts;
                     && isAliasableOrJsExpression(node.parent.right)
                 || node.kind === 297
                 || node.kind === 296 && isAliasableOrJsExpression(node.initializer)
-                || ts.isVariableDeclarationInitializedToBareOrAccessedRequire(node);
+                || node.kind === 254 && ts.isVariableDeclarationInitializedToBareOrAccessedRequire(node)
+                || node.kind === 203 && ts.isVariableDeclarationInitializedToBareOrAccessedRequire(node.parent.parent);
         }
         function isAliasableOrJsExpression(e) {
             return ts.isAliasableExpression(e) || ts.isFunctionExpression(e) && isJSConstructor(e);
@@ -41239,7 +41250,7 @@ var ts;
             if (!ts.isSourceFileJS(file)) {
                 return hasExportAssignmentSymbol(moduleSymbol);
             }
-            return !file.externalModuleIndicator && !resolveExportByName(moduleSymbol, ts.escapeLeadingUnderscores("__esModule"), undefined, dontResolveAlias);
+            return typeof file.externalModuleIndicator !== "object" && !resolveExportByName(moduleSymbol, ts.escapeLeadingUnderscores("__esModule"), undefined, dontResolveAlias);
         }
         function getTargetOfImportClause(node, dontResolveAlias) {
             var _a;
@@ -48551,7 +48562,7 @@ var ts;
                         }
                     }
                 }
-                else if (t.flags & 469892092) {
+                else if (t.flags & 469892092 || isEmptyAnonymousObjectType(t)) {
                     hasDisjointDomainType = true;
                 }
             }
@@ -48559,7 +48570,7 @@ var ts;
                 if (hasDisjointDomainType) {
                     for (var _a = 0, types_6 = types; _a < types_6.length; _a++) {
                         var t = types_6[_a];
-                        if (t.flags & 469892092) {
+                        if (t.flags & 469892092 || isEmptyAnonymousObjectType(t)) {
                             constraints = ts.append(constraints, t);
                         }
                     }
@@ -50829,7 +50840,7 @@ var ts;
             }
             return includes;
         }
-        function removeRedundantPrimitiveTypes(types, includes) {
+        function removeRedundantSupertypes(types, includes) {
             var i = types.length;
             while (i > 0) {
                 i--;
@@ -50837,7 +50848,9 @@ var ts;
                 var remove = t.flags & 4 && includes & (128 | 134217728 | 268435456) ||
                     t.flags & 8 && includes & 256 ||
                     t.flags & 64 && includes & 2048 ||
-                    t.flags & 4096 && includes & 8192;
+                    t.flags & 4096 && includes & 8192 ||
+                    t.flags & 16384 && includes & 32768 ||
+                    isEmptyAnonymousObjectType(t) && includes & 470302716;
                 if (remove) {
                     ts.orderedRemoveItemAt(types, i);
                 }
@@ -50932,7 +50945,7 @@ var ts;
             result.aliasTypeArguments = aliasTypeArguments;
             return result;
         }
-        function getIntersectionType(types, aliasSymbol, aliasTypeArguments) {
+        function getIntersectionType(types, aliasSymbol, aliasTypeArguments, noSupertypeReduction) {
             var typeMembershipMap = new ts.Map();
             var includes = addTypesToIntersection(typeMembershipMap, 0, types);
             var typeSet = ts.arrayFrom(typeMembershipMap.values());
@@ -50960,11 +50973,11 @@ var ts;
             if (includes & 4 && includes & (128 | 134217728 | 268435456) ||
                 includes & 8 && includes & 256 ||
                 includes & 64 && includes & 2048 ||
-                includes & 4096 && includes & 8192) {
-                removeRedundantPrimitiveTypes(typeSet, includes);
-            }
-            if (includes & 16777216 && includes & 524288) {
-                ts.orderedRemoveItemAt(typeSet, ts.findIndex(typeSet, isEmptyAnonymousObjectType));
+                includes & 4096 && includes & 8192 ||
+                includes & 16384 && includes & 32768 ||
+                includes & 16777216 && includes & 470302716) {
+                if (!noSupertypeReduction)
+                    removeRedundantSupertypes(typeSet, includes);
             }
             if (includes & 262144) {
                 typeSet[typeSet.indexOf(undefinedType)] = missingType;
@@ -50996,7 +51009,7 @@ var ts;
                             return errorType;
                         }
                         var constituents = getCrossProductIntersections(typeSet);
-                        var origin = ts.some(constituents, function (t) { return !!(t.flags & 2097152); }) ? createOriginUnionOrIntersectionType(2097152, typeSet) : undefined;
+                        var origin = ts.some(constituents, function (t) { return !!(t.flags & 2097152); }) && getConstituentCountOfTypes(constituents) > getConstituentCountOfTypes(typeSet) ? createOriginUnionOrIntersectionType(2097152, typeSet) : undefined;
                         result = getUnionType(constituents, 1, aliasSymbol, aliasTypeArguments, origin);
                     }
                 }
@@ -51039,11 +51052,21 @@ var ts;
             }
             return intersections;
         }
+        function getConstituentCount(type) {
+            return !(type.flags & 3145728) || type.aliasSymbol ? 1 :
+                type.flags & 1048576 && type.origin ? getConstituentCount(type.origin) :
+                    getConstituentCountOfTypes(type.types);
+        }
+        function getConstituentCountOfTypes(types) {
+            return ts.reduceLeft(types, function (n, t) { return n + getConstituentCount(t); }, 0);
+        }
         function getTypeFromIntersectionTypeNode(node) {
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 var aliasSymbol = getAliasSymbolForTypeNode(node);
-                links.resolvedType = getIntersectionType(ts.map(node.types, getTypeFromTypeNode), aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol));
+                var types = ts.map(node.types, getTypeFromTypeNode);
+                var noSupertypeReduction = types.length === 2 && !!(types[0].flags & (4 | 8 | 64)) && types[1] === emptyTypeLiteralType;
+                links.resolvedType = getIntersectionType(types, aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol), noSupertypeReduction);
             }
             return links.resolvedType;
         }
@@ -53522,6 +53545,17 @@ var ts;
             return !!(ts.getObjectFlags(type) & 16 && (type.members && isEmptyResolvedType(type) ||
                 type.symbol && type.symbol.flags & 2048 && getMembersOfSymbol(type.symbol).size === 0));
         }
+        function isUnknownLikeUnionType(type) {
+            if (strictNullChecks && type.flags & 1048576) {
+                if (!(type.objectFlags & 33554432)) {
+                    var types = type.types;
+                    type.objectFlags |= 33554432 | (types.length >= 3 && types[0].flags & 32768 &&
+                        types[1].flags & 65536 && ts.some(types, isEmptyAnonymousObjectType) ? 67108864 : 0);
+                }
+                return !!(type.objectFlags & 67108864);
+            }
+            return false;
+        }
         function isStringIndexSignatureOnlyType(type) {
             return type.flags & 524288 && !isGenericMappedType(type) && getPropertiesOfType(type).length === 0 && getIndexInfosOfType(type).length === 1 && !!getIndexInfoOfType(type, stringType) ||
                 type.flags & 3145728 && ts.every(type.types, isStringIndexSignatureOnlyType) ||
@@ -53599,13 +53633,15 @@ var ts;
                 return true;
             if (s & 65536 && (!strictNullChecks && !(t & 3145728) || t & 65536))
                 return true;
-            if (s & 524288 && t & 67108864)
+            if (s & 524288 && t & 67108864 && !(relation === strictSubtypeRelation && isEmptyAnonymousObjectType(source)))
                 return true;
             if (relation === assignableRelation || relation === comparableRelation) {
                 if (s & 1)
                     return true;
                 if (s & (8 | 256) && !(s & 1024) && (t & 32 || relation === assignableRelation && t & 256 && t & 1024))
                     return true;
+                if (isUnknownLikeUnionType(target))
+                    return true;
             }
             return false;
         }
@@ -53647,16 +53683,27 @@ var ts;
         function getNormalizedType(type, writing) {
             while (true) {
                 var t = isFreshLiteralType(type) ? type.regularType :
-                    ts.getObjectFlags(type) & 4 && type.node ? createTypeReference(type.target, getTypeArguments(type)) :
-                        type.flags & 3145728 ? getReducedType(type) :
+                    ts.getObjectFlags(type) & 4 ? type.node ? createTypeReference(type.target, getTypeArguments(type)) : getSingleBaseForNonAugmentingSubtype(type) || type :
+                        type.flags & 3145728 ? getNormalizedUnionOrIntersectionType(type, writing) :
                             type.flags & 33554432 ? writing ? type.baseType : type.substitute :
                                 type.flags & 25165824 ? getSimplifiedType(type, writing) :
                                     type;
-                t = getSingleBaseForNonAugmentingSubtype(t) || t;
                 if (t === type)
-                    break;
+                    return t;
                 type = t;
             }
+        }
+        function getNormalizedUnionOrIntersectionType(type, writing) {
+            var reduced = getReducedType(type);
+            if (reduced !== type) {
+                return reduced;
+            }
+            if (type.flags & 2097152) {
+                var normalizedTypes = ts.sameMap(type.types, function (t) { return getNormalizedType(t, writing); });
+                if (normalizedTypes !== type.types) {
+                    return getIntersectionType(normalizedTypes);
+                }
+            }
             return type;
         }
         function checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain, errorOutputContainer) {
@@ -54031,6 +54078,7 @@ var ts;
                 return 0;
             }
             function reportErrorResults(originalSource, originalTarget, source, target, headMessage) {
+                var _a, _b;
                 var sourceHasBase = !!getSingleBaseForNonAugmentingSubtype(originalSource);
                 var targetHasBase = !!getSingleBaseForNonAugmentingSubtype(originalTarget);
                 source = (originalSource.aliasSymbol || sourceHasBase) ? originalSource : source;
@@ -54069,6 +54117,9 @@ var ts;
                     return;
                 }
                 reportRelationError(headMessage, source, target);
+                if (strictNullChecks && source.flags & 8650752 && ((_b = (_a = source.symbol) === null || _a === void 0 ? void 0 : _a.declarations) === null || _b === void 0 ? void 0 : _b[0]) && !getConstraintOfType(source) && isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864))) {
+                    associateRelatedInfo(ts.createDiagnosticForNode(source.symbol.declarations[0], ts.Diagnostics.This_type_parameter_probably_needs_an_extends_object_constraint));
+                }
             }
             function traceUnionsOrIntersectionsTooLarge(source, target) {
                 if (!ts.tracing) {
@@ -54710,12 +54761,6 @@ var ts;
                 if (sourceFlags & 8650752) {
                     if (!(sourceFlags & 8388608 && targetFlags & 8388608)) {
                         var constraint = getConstraintOfType(source) || unknownType;
-                        if (!getConstraintOfType(source) || (sourceFlags & 262144 && constraint.flags & 1)) {
-                            if (result = isRelatedTo(emptyObjectType, extractTypesOfKind(target, ~67108864), 3)) {
-                                resetErrorInfo(saveErrorInfo);
-                                return result;
-                            }
-                        }
                         if (result = isRelatedTo(constraint, target, 1, false, undefined, intersectionState)) {
                             resetErrorInfo(saveErrorInfo);
                             return result;
@@ -55971,9 +56016,11 @@ var ts;
                 return getSupertypeOrUnion(types);
             }
             var primaryTypes = ts.filter(types, function (t) { return !(t.flags & 98304); });
-            return primaryTypes.length ?
-                getNullableType(getSupertypeOrUnion(primaryTypes), getFalsyFlagsOfTypes(types) & 98304) :
-                getUnionType(types, 2);
+            if (primaryTypes.length) {
+                var supertypeOrUnion = getSupertypeOrUnion(primaryTypes);
+                return primaryTypes === types ? supertypeOrUnion : getUnionType(__spreadArray([supertypeOrUnion], ts.filter(types, function (t) { return !!(t.flags & 98304); }), true));
+            }
+            return getUnionType(types, 2);
         }
         function getCommonSubtype(types) {
             return ts.reduceLeft(types, function (s, t) { return isTypeSubtypeOf(t, s) ? t : s; });
@@ -56160,12 +56207,13 @@ var ts;
             return result;
         }
         function getFalsyFlags(type) {
-            return type.flags & 1048576 ? getFalsyFlagsOfTypes(type.types) :
-                type.flags & 128 ? type.value === "" ? 128 : 0 :
-                    type.flags & 256 ? type.value === 0 ? 256 : 0 :
-                        type.flags & 2048 ? isZeroBigInt(type) ? 2048 : 0 :
-                            type.flags & 512 ? (type === falseType || type === regularFalseType) ? 512 : 0 :
-                                type.flags & 117724;
+            var t = type.flags & 2097152 ? getBaseConstraintOrType(type) : type;
+            return t.flags & 1048576 ? getFalsyFlagsOfTypes(t.types) :
+                t.flags & 128 ? t.value === "" ? 128 : 0 :
+                    t.flags & 256 ? t.value === 0 ? 256 : 0 :
+                        t.flags & 2048 ? isZeroBigInt(t) ? 2048 : 0 :
+                            t.flags & 512 ? (t === falseType || t === regularFalseType) ? 512 : 0 :
+                                t.flags & 117724;
         }
         function removeDefinitelyFalsyTypes(type) {
             return getFalsyFlags(type) & 117632 ?
@@ -56200,16 +56248,19 @@ var ts;
             return type.flags & 32768 ? type : getUnionType([type, isProperty ? missingType : undefinedType]);
         }
         function getGlobalNonNullableTypeInstantiation(type) {
-            var reducedType = getTypeWithFacts(type, 2097152);
             if (!deferredGlobalNonNullableTypeAlias) {
                 deferredGlobalNonNullableTypeAlias = getGlobalSymbol("NonNullable", 524288, undefined) || unknownSymbol;
             }
             return deferredGlobalNonNullableTypeAlias !== unknownSymbol ?
-                getTypeAliasInstantiation(deferredGlobalNonNullableTypeAlias, [reducedType]) :
-                reducedType;
+                getTypeAliasInstantiation(deferredGlobalNonNullableTypeAlias, [type]) :
+                getIntersectionType([type, emptyObjectType]);
         }
         function getNonNullableType(type) {
-            return strictNullChecks ? getGlobalNonNullableTypeInstantiation(type) : type;
+            if (strictNullChecks) {
+                var reducedType = getTypeWithFacts(type, 2097152);
+                return maybeTypeOfKind(reducedType, 465829888) ? getGlobalNonNullableTypeInstantiation(reducedType) : reducedType;
+            }
+            return type;
         }
         function addOptionalTypeMarker(type) {
             return strictNullChecks ? getUnionType([type, optionalType]) : type;
@@ -56803,17 +56854,32 @@ var ts;
             return sourceStart.slice(0, startLen) !== targetStart.slice(0, startLen) ||
                 sourceEnd.slice(sourceEnd.length - endLen) !== targetEnd.slice(targetEnd.length - endLen);
         }
-        function isValidBigIntString(s) {
+        function isValidNumberString(s, roundTripOnly) {
+            if (s === "")
+                return false;
+            var n = +s;
+            return isFinite(n) && (!roundTripOnly || "" + n === s);
+        }
+        function parseBigIntLiteralType(text) {
+            var negative = text.startsWith("-");
+            var base10Value = ts.parsePseudoBigInt((negative ? text.slice(1) : text) + "n");
+            return getBigIntLiteralType({ negative: negative, base10Value: base10Value });
+        }
+        function isValidBigIntString(s, roundTripOnly) {
+            if (s === "")
+                return false;
             var scanner = ts.createScanner(99, false);
             var success = true;
             scanner.setOnError(function () { return success = false; });
             scanner.setText(s + "n");
             var result = scanner.scan();
-            if (result === 40) {
+            var negative = result === 40;
+            if (negative) {
                 result = scanner.scan();
             }
             var flags = scanner.getTokenFlags();
-            return success && result === 9 && scanner.getTextPos() === (s.length + 1) && !(flags & 512);
+            return success && result === 9 && scanner.getTextPos() === (s.length + 1) && !(flags & 512)
+                && (!roundTripOnly || s === ts.pseudoBigIntToString({ negative: negative, base10Value: ts.parsePseudoBigInt(scanner.getTokenValue()) }));
         }
         function isValidTypeForTemplateLiteralPlaceholder(source, target) {
             if (source === target || target.flags & (1 | 4)) {
@@ -56821,8 +56887,8 @@ var ts;
             }
             if (source.flags & 128) {
                 var value = source.value;
-                return !!(target.flags & 8 && value !== "" && isFinite(+value) ||
-                    target.flags & 64 && value !== "" && isValidBigIntString(value) ||
+                return !!(target.flags & 8 && isValidNumberString(value, false) ||
+                    target.flags & 64 && isValidBigIntString(value, false) ||
                     target.flags & (512 | 98304) && value === target.intrinsicName);
             }
             if (source.flags & 134217728) {
@@ -57287,8 +57353,51 @@ var ts;
                 var matches = inferTypesFromTemplateLiteralType(source, target);
                 var types = target.types;
                 if (matches || ts.every(target.texts, function (s) { return s.length === 0; })) {
+                    var _loop_23 = function (i) {
+                        var source_1 = matches ? matches[i] : neverType;
+                        var target_3 = types[i];
+                        if (source_1.flags & 128 && target_3.flags & 8650752) {
+                            var inferenceContext = getInferenceInfoForType(target_3);
+                            var constraint = inferenceContext ? getBaseConstraintOfType(inferenceContext.typeParameter) : undefined;
+                            if (constraint && !isTypeAny(constraint)) {
+                                var constraintTypes = constraint.flags & 1048576 ? constraint.types : [constraint];
+                                var allTypeFlags_1 = ts.reduceLeft(constraintTypes, function (flags, t) { return flags | t.flags; }, 0);
+                                if (!(allTypeFlags_1 & 4)) {
+                                    var str_1 = source_1.value;
+                                    if (allTypeFlags_1 & 296 && !isValidNumberString(str_1, true)) {
+                                        allTypeFlags_1 &= ~296;
+                                    }
+                                    if (allTypeFlags_1 & 2112 && !isValidBigIntString(str_1, true)) {
+                                        allTypeFlags_1 &= ~2112;
+                                    }
+                                    var matchingType = ts.reduceLeft(constraintTypes, function (left, right) {
+                                        return !(right.flags & allTypeFlags_1) ? left :
+                                            left.flags & 4 ? left : right.flags & 4 ? source_1 :
+                                                left.flags & 134217728 ? left : right.flags & 134217728 && isTypeMatchedByTemplateLiteralType(source_1, right) ? source_1 :
+                                                    left.flags & 268435456 ? left : right.flags & 268435456 && str_1 === applyStringMapping(right.symbol, str_1) ? source_1 :
+                                                        left.flags & 128 ? left : right.flags & 128 && right.value === str_1 ? right :
+                                                            left.flags & 8 ? left : right.flags & 8 ? getNumberLiteralType(+str_1) :
+                                                                left.flags & 32 ? left : right.flags & 32 ? getNumberLiteralType(+str_1) :
+                                                                    left.flags & 256 ? left : right.flags & 256 && right.value === +str_1 ? right :
+                                                                        left.flags & 64 ? left : right.flags & 64 ? parseBigIntLiteralType(str_1) :
+                                                                            left.flags & 2048 ? left : right.flags & 2048 && ts.pseudoBigIntToString(right.value) === str_1 ? right :
+                                                                                left.flags & 16 ? left : right.flags & 16 ? str_1 === "true" ? trueType : str_1 === "false" ? falseType : booleanType :
+                                                                                    left.flags & 512 ? left : right.flags & 512 && right.intrinsicName === str_1 ? right :
+                                                                                        left.flags & 32768 ? left : right.flags & 32768 && right.intrinsicName === str_1 ? right :
+                                                                                            left.flags & 65536 ? left : right.flags & 65536 && right.intrinsicName === str_1 ? right :
+                                                                                                left;
+                                    }, neverType);
+                                    if (!(matchingType.flags & 131072)) {
+                                        inferFromTypes(matchingType, target_3);
+                                        return "continue";
+                                    }
+                                }
+                            }
+                        }
+                        inferFromTypes(source_1, target_3);
+                    };
                     for (var i = 0; i < types.length; i++) {
-                        inferFromTypes(matches ? matches[i] : neverType, types[i]);
+                        _loop_23(i);
                     }
                 }
             }
@@ -57758,7 +57867,7 @@ var ts;
         function mapTypesByKeyProperty(types, name) {
             var map = new ts.Map();
             var count = 0;
-            var _loop_23 = function (type) {
+            var _loop_24 = function (type) {
                 if (type.flags & (524288 | 2097152 | 58982400)) {
                     var discriminant = getTypeOfPropertyOfType(type, name);
                     if (discriminant) {
@@ -57784,7 +57893,7 @@ var ts;
             };
             for (var _i = 0, types_16 = types; _i < types_16.length; _i++) {
                 var type = types_16[_i];
-                var state_9 = _loop_23(type);
+                var state_9 = _loop_24(type);
                 if (typeof state_9 === "object")
                     return state_9.value;
             }
@@ -57972,6 +58081,24 @@ var ts;
         function getTypeWithFacts(type, include) {
             return filterType(type, function (t) { return (getTypeFacts(t) & include) !== 0; });
         }
+        function getIntersectionWithFacts(type, facts) {
+            var reduced = recombineUnknownType(getTypeWithFacts(strictNullChecks && type.flags & 2 ? unknownUnionType : type, facts));
+            if (strictNullChecks) {
+                switch (facts) {
+                    case 524288:
+                        return mapType(reduced, function (t) { return getTypeFacts(t) & 65536 ? getIntersectionType([t, getTypeFacts(t) & 131072 && !maybeTypeOfKind(reduced, 65536) ? getUnionType([emptyObjectType, nullType]) : emptyObjectType]) : t; });
+                    case 1048576:
+                        return mapType(reduced, function (t) { return getTypeFacts(t) & 131072 ? getIntersectionType([t, getTypeFacts(t) & 65536 && !maybeTypeOfKind(reduced, 32768) ? getUnionType([emptyObjectType, undefinedType]) : emptyObjectType]) : t; });
+                    case 2097152:
+                    case 4194304:
+                        return mapType(reduced, function (t) { return getTypeFacts(t) & 262144 ? getGlobalNonNullableTypeInstantiation(t) : t; });
+                }
+            }
+            return reduced;
+        }
+        function recombineUnknownType(type) {
+            return type === unknownUnionType ? unknownType : type;
+        }
         function getTypeWithDefault(type, defaultExpression) {
             return defaultExpression ?
                 getUnionType([getNonUndefinedType(type), getTypeOfExpression(defaultExpression)]) :
@@ -58912,7 +59039,7 @@ var ts;
                 if (isEvolvingArrayTypeList(types)) {
                     return getEvolvingArrayType(getUnionType(ts.map(types, getElementTypeOfEvolvingArrayType)));
                 }
-                var result = getUnionType(ts.sameMap(types, finalizeEvolvingArrayType), subtypeReduction);
+                var result = recombineUnknownType(getUnionType(ts.sameMap(types, finalizeEvolvingArrayType), subtypeReduction));
                 if (result !== declaredType && result.flags & declaredType.flags & 1048576 && ts.arraysEqual(result.types, declaredType.types)) {
                     return declaredType;
                 }
@@ -59008,8 +59135,7 @@ var ts;
             }
             function narrowTypeByTruthiness(type, expr, assumeTrue) {
                 if (isMatchingReference(reference, expr)) {
-                    return type.flags & 2 && assumeTrue ? nonNullUnknownType :
-                        getTypeWithFacts(type, assumeTrue ? 4194304 : 8388608);
+                    return getIntersectionWithFacts(type, assumeTrue ? 4194304 : 8388608);
                 }
                 if (strictNullChecks && assumeTrue && optionalChainContainsReference(expr, reference)) {
                     type = getTypeWithFacts(type, 2097152);
@@ -59149,9 +59275,6 @@ var ts;
                     assumeTrue = !assumeTrue;
                 }
                 var valueType = getTypeOfExpression(value);
-                if (assumeTrue && (type.flags & 2) && (operator === 34 || operator === 35) && (valueType.flags & 65536)) {
-                    return getUnionType([nullType, undefinedType]);
-                }
                 if ((type.flags & 2) && assumeTrue && (operator === 36 || operator === 37)) {
                     if (valueType.flags & (131068 | 67108864)) {
                         return valueType;
@@ -59171,7 +59294,7 @@ var ts;
                         valueType.flags & 65536 ?
                             assumeTrue ? 131072 : 1048576 :
                             assumeTrue ? 65536 : 524288;
-                    return type.flags & 2 && facts & (1048576 | 2097152) ? nonNullUnknownType : getTypeWithFacts(type, facts);
+                    return getIntersectionWithFacts(type, facts);
                 }
                 if (assumeTrue) {
                     var filterFn = operator === 34 ?
@@ -59198,14 +59321,11 @@ var ts;
                 if (type.flags & 1 && literal.text === "function") {
                     return type;
                 }
-                if (assumeTrue && type.flags & 2 && literal.text === "object") {
-                    return type === nonNullUnknownType ? nonPrimitiveType : getUnionType([nonPrimitiveType, nullType]);
-                }
                 var facts = assumeTrue ?
                     typeofEQFacts.get(literal.text) || 128 :
                     typeofNEFacts.get(literal.text) || 32768;
                 var impliedType = getImpliedTypeFromTypeofGuard(type, literal.text);
-                return getTypeWithFacts(assumeTrue && impliedType ? mapType(type, narrowUnionMemberByTypeof(impliedType)) : type, facts);
+                return getTypeWithFacts(assumeTrue && impliedType ? narrowTypeByImpliedType(type, impliedType) : type, facts);
             }
             function narrowTypeBySwitchOptionalChainContainment(type, switchStatement, clauseStart, clauseEnd, clauseCheck) {
                 var everyClauseChecks = clauseStart !== clauseEnd && ts.every(getSwitchClauseTypes(switchStatement).slice(clauseStart, clauseEnd), clauseCheck);
@@ -59250,30 +59370,35 @@ var ts;
             }
             function getImpliedTypeFromTypeofGuard(type, text) {
                 switch (text) {
+                    case "object":
+                        return type.flags & 1 ? type : getUnionType([nullType, nonPrimitiveType]);
                     case "function":
                         return type.flags & 1 ? type : globalFunctionType;
-                    case "object":
-                        return type.flags & 2 ? getUnionType([nonPrimitiveType, nullType]) : type;
                     default:
                         return typeofTypesByName.get(text);
                 }
             }
-            function narrowUnionMemberByTypeof(candidate) {
-                return function (type) {
-                    if (isTypeSubtypeOf(type, candidate)) {
-                        return type;
-                    }
-                    if (isTypeSubtypeOf(candidate, type)) {
-                        return candidate;
+            function narrowTypeByImpliedType(type, candidate) {
+                if (type.flags & 3) {
+                    return candidate;
+                }
+                return mapType(type, function (t) {
+                    if (isTypeRelatedTo(t, candidate, strictSubtypeRelation)) {
+                        return t;
                     }
-                    if (type.flags & 465829888) {
-                        var constraint = getBaseConstraintOfType(type) || anyType;
-                        if (isTypeSubtypeOf(candidate, constraint)) {
-                            return getIntersectionType([type, candidate]);
+                    return mapType(candidate, function (c) {
+                        if (!areTypesComparable(t, c)) {
+                            return neverType;
                         }
-                    }
-                    return type;
-                };
+                        if (c.flags & 131068 && t.flags & 524288 && !isEmptyAnonymousObjectType(t)) {
+                            return isTypeSubtypeOf(c, t) ? c : neverType;
+                        }
+                        if (c === globalFunctionType && isTypeSubtypeOf(c, t)) {
+                            return c;
+                        }
+                        return getIntersectionType([t, c]);
+                    });
+                });
             }
             function narrowBySwitchOnTypeOf(type, switchStatement, clauseStart, clauseEnd) {
                 var switchWitnesses = getSwitchClauseTypeOfWitnesses(switchStatement, true);
@@ -59299,7 +59424,7 @@ var ts;
                     return filterType(type, function (t) { return (getTypeFacts(t) & switchFacts) === switchFacts; });
                 }
                 var impliedType = getTypeWithFacts(getUnionType(clauseWitnesses.map(function (text) { return getImpliedTypeFromTypeofGuard(type, text) || type; })), switchFacts);
-                return getTypeWithFacts(mapType(type, narrowUnionMemberByTypeof(impliedType)), switchFacts);
+                return getTypeWithFacts(narrowTypeByImpliedType(type, impliedType), switchFacts);
             }
             function isMatchingConstructorReference(expr) {
                 return (ts.isPropertyAccessExpression(expr) && ts.idText(expr.name) === "constructor" ||
@@ -59560,7 +59685,9 @@ var ts;
                     !(someType(type, isGenericTypeWithoutNullableConstraint) && isGenericIndexType(getTypeOfExpression(parent.argumentExpression)));
         }
         function isGenericTypeWithUnionConstraint(type) {
-            return !!(type.flags & 465829888 && getBaseConstraintOrType(type).flags & (98304 | 1048576));
+            return type.flags & 2097152 ?
+                ts.some(type.types, isGenericTypeWithUnionConstraint) :
+                !!(type.flags & 465829888 && getBaseConstraintOrType(type).flags & (98304 | 1048576));
         }
         function isGenericTypeWithoutNullableConstraint(type) {
             return !!(type.flags & 465829888 && !maybeTypeOfKind(getBaseConstraintOrType(type), 98304));
@@ -59577,7 +59704,7 @@ var ts;
             var substituteConstraints = !(checkMode && checkMode & 2) &&
                 someType(type, isGenericTypeWithUnionConstraint) &&
                 (isConstraintPosition(type, reference) || hasContextualTypeWithNoGenericTypes(reference, checkMode));
-            return substituteConstraints ? mapType(type, function (t) { return t.flags & 465829888 ? getBaseConstraintOrType(t) : t; }) : type;
+            return substituteConstraints ? mapType(type, getBaseConstraintOrType) : type;
         }
         function isExportOrExportExpression(location) {
             return !!ts.findAncestor(location, function (n) {
@@ -63207,7 +63334,7 @@ var ts;
             var spreadIndex = getSpreadArgumentIndex(args);
             if (spreadIndex >= 0) {
                 var effectiveArgs_1 = args.slice(0, spreadIndex);
-                var _loop_24 = function (i) {
+                var _loop_25 = function (i) {
                     var arg = args[i];
                     var spreadType = arg.kind === 225 && (flowLoopCount ? checkExpression(arg.expression) : checkExpressionCached(arg.expression));
                     if (spreadType && isTupleType(spreadType)) {
@@ -63223,7 +63350,7 @@ var ts;
                     }
                 };
                 for (var i = spreadIndex; i < args.length; i++) {
-                    _loop_24(i);
+                    _loop_25(i);
                 }
                 return effectiveArgs_1;
             }
@@ -63471,7 +63598,7 @@ var ts;
                         var min_3 = Number.MAX_VALUE;
                         var minIndex = 0;
                         var i_1 = 0;
-                        var _loop_25 = function (c) {
+                        var _loop_26 = function (c) {
                             var chain_2 = function () { return ts.chainDiagnosticMessages(undefined, ts.Diagnostics.Overload_0_of_1_2_gave_the_following_error, i_1 + 1, candidates.length, signatureToString(c)); };
                             var diags_2 = getSignatureApplicabilityError(node, args, c, assignableRelation, 0, true, chain_2);
                             if (diags_2) {
@@ -63489,7 +63616,7 @@ var ts;
                         };
                         for (var _a = 0, candidatesForArgumentError_1 = candidatesForArgumentError; _a < candidatesForArgumentError_1.length; _a++) {
                             var c = candidatesForArgumentError_1[_a];
-                            _loop_25(c);
+                            _loop_26(c);
                         }
                         var diags_3 = max > 1 ? allDiagnostics[minIndex] : ts.flatten(allDiagnostics);
                         ts.Debug.assert(diags_3.length > 0, "No errors reported for 3 or fewer overload signatures");
@@ -63632,7 +63759,7 @@ var ts;
             }
             var _a = ts.minAndMax(candidates, getNumNonRestParameters), minArgumentCount = _a.min, maxNonRestParam = _a.max;
             var parameters = [];
-            var _loop_26 = function (i) {
+            var _loop_27 = function (i) {
                 var symbols = ts.mapDefined(candidates, function (s) { return signatureHasRestParameter(s) ?
                     i < s.parameters.length - 1 ? s.parameters[i] : ts.last(s.parameters) :
                     i < s.parameters.length ? s.parameters[i] : undefined; });
@@ -63640,7 +63767,7 @@ var ts;
                 parameters.push(createCombinedSymbolFromTypes(symbols, ts.mapDefined(candidates, function (candidate) { return tryGetTypeAtPosition(candidate, i); })));
             };
             for (var i = 0; i < maxNonRestParam; i++) {
-                _loop_26(i);
+                _loop_27(i);
             }
             var restParameterSymbols = ts.mapDefined(candidates, function (c) { return signatureHasRestParameter(c) ? ts.last(c.parameters) : undefined; });
             var flags = 0;
@@ -67236,7 +67363,7 @@ var ts;
             var indexSymbol = getIndexSymbol(getSymbolOfNode(node));
             if (indexSymbol === null || indexSymbol === void 0 ? void 0 : indexSymbol.declarations) {
                 var indexSignatureMap_1 = new ts.Map();
-                var _loop_27 = function (declaration) {
+                var _loop_28 = function (declaration) {
                     if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
                         forEachType(getTypeFromTypeNode(declaration.parameters[0].type), function (type) {
                             var entry = indexSignatureMap_1.get(getTypeId(type));
@@ -67251,7 +67378,7 @@ var ts;
                 };
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
-                    _loop_27(declaration);
+                    _loop_28(declaration);
                 }
                 indexSignatureMap_1.forEach(function (entry) {
                     if (entry.declarations.length > 1) {
@@ -69077,7 +69204,7 @@ var ts;
                 return;
             }
             var symbol = getSymbolOfNode(node);
-            if (symbol.flags & 2097152 && ts.isVariableDeclarationInitializedToBareOrAccessedRequire(node)) {
+            if (symbol.flags & 2097152 && ts.isVariableDeclarationInitializedToBareOrAccessedRequire(node.kind === 203 ? node.parent.parent : node)) {
                 checkAliasSymbol(node);
                 return;
             }
@@ -70071,7 +70198,7 @@ var ts;
             var interfaceDeclaration = ts.getObjectFlags(type) & 2 ? ts.getDeclarationOfKind(type.symbol, 258) : undefined;
             var localPropDeclaration = declaration && declaration.kind === 221 ||
                 name && name.kind === 162 || getParentOfSymbol(prop) === type.symbol ? declaration : undefined;
-            var _loop_28 = function (info) {
+            var _loop_29 = function (info) {
                 var localIndexDeclaration = info.declaration && getParentOfSymbol(getSymbolOfNode(info.declaration)) === type.symbol ? info.declaration : undefined;
                 var errorNode = localPropDeclaration || localIndexDeclaration ||
                     (interfaceDeclaration && !ts.some(getBaseTypes(type), function (base) { return !!getPropertyOfObjectType(base, prop.escapedName) && !!getIndexTypeOfType(base, info.keyType); }) ? interfaceDeclaration : undefined);
@@ -70081,7 +70208,7 @@ var ts;
             };
             for (var _i = 0, indexInfos_9 = indexInfos; _i < indexInfos_9.length; _i++) {
                 var info = indexInfos_9[_i];
-                _loop_28(info);
+                _loop_29(info);
             }
         }
         function checkIndexConstraintForIndexSignature(type, checkInfo) {
@@ -70089,7 +70216,7 @@ var ts;
             var indexInfos = getApplicableIndexInfos(type, checkInfo.keyType);
             var interfaceDeclaration = ts.getObjectFlags(type) & 2 ? ts.getDeclarationOfKind(type.symbol, 258) : undefined;
             var localCheckDeclaration = declaration && getParentOfSymbol(getSymbolOfNode(declaration)) === type.symbol ? declaration : undefined;
-            var _loop_29 = function (info) {
+            var _loop_30 = function (info) {
                 if (info === checkInfo)
                     return "continue";
                 var localIndexDeclaration = info.declaration && getParentOfSymbol(getSymbolOfNode(info.declaration)) === type.symbol ? info.declaration : undefined;
@@ -70101,7 +70228,7 @@ var ts;
             };
             for (var _i = 0, indexInfos_10 = indexInfos; _i < indexInfos_10.length; _i++) {
                 var info = indexInfos_10[_i];
-                _loop_29(info);
+                _loop_30(info);
             }
         }
         function checkTypeNameIsReserved(name, message) {
@@ -70395,7 +70522,7 @@ var ts;
             var baseTypes = baseTypeNode && getBaseTypes(type);
             var baseWithThis = (baseTypes === null || baseTypes === void 0 ? void 0 : baseTypes.length) ? getTypeWithThisArgument(ts.first(baseTypes), type.thisType) : undefined;
             var baseStaticType = getBaseConstructorTypeOfClass(type);
-            var _loop_30 = function (member) {
+            var _loop_31 = function (member) {
                 if (ts.hasAmbientModifier(member)) {
                     return "continue";
                 }
@@ -70410,7 +70537,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_30(member);
+                _loop_31(member);
             }
         }
         function checkExistingMemberForOverrideModifier(node, staticType, baseStaticType, baseWithThis, type, typeWithThis, member, memberIsParameterProperty, reportErrors) {
@@ -70485,7 +70612,7 @@ var ts;
         }
         function issueMemberSpecificError(node, typeWithThis, baseWithThis, broadDiag) {
             var issuedMemberError = false;
-            var _loop_31 = function (member) {
+            var _loop_32 = function (member) {
                 if (ts.isStatic(member)) {
                     return "continue";
                 }
@@ -70503,7 +70630,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_31(member);
+                _loop_32(member);
             }
             if (!issuedMemberError) {
                 checkTypeAssignableTo(typeWithThis, baseWithThis, node.name || node, broadDiag);
@@ -100995,7 +101122,7 @@ var ts;
                 importedFileFromNodeModules = importedFileFromNodeModules || isInNodeModules;
             });
             var sortedPaths = [];
-            var _loop_32 = function (directory) {
+            var _loop_33 = function (directory) {
                 var directoryStart = ts.ensureTrailingDirectorySeparator(directory);
                 var pathsInDirectory;
                 allFileNames.forEach(function (_a, fileName) {
@@ -101019,7 +101146,7 @@ var ts;
             };
             var out_directory_1;
             for (var directory = ts.getDirectoryPath(importingFileName); allFileNames.size !== 0;) {
-                var state_10 = _loop_32(directory);
+                var state_10 = _loop_33(directory);
                 directory = out_directory_1;
                 if (state_10 === "break")
                     break;
@@ -102345,6 +102472,7 @@ var ts;
         }
         function reloadFileNamesFromConfigFile() {
             writeLog("Reloading new file names and options");
+            reloadLevel = ts.ConfigFileProgramReloadLevel.None;
             rootFileNames = ts.getFileNamesFromConfigSpecs(compilerOptions.configFile.configFileSpecs, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), currentDirectory), compilerOptions, parseConfigFileHost, extraFileExtensions);
             if (ts.updateErrorForNoInputFiles(rootFileNames, ts.getNormalizedAbsolutePath(configFileName, currentDirectory), compilerOptions.configFile.configFileSpecs, configFileParsingDiagnostics, canConfigFileJsonReportNoInputFiles)) {
                 hasChangedConfigFileParsingErrors = true;