typescript 4.8.0-dev.20220731 → 4.8.0-dev.20220803

package/lib/typingsInstaller.js

@@ -89,7 +89,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220731";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220803";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -8551,6 +8551,10 @@ var ts;
         resolution_mode_is_the_only_valid_key_for_type_import_assertions: diag(1455, ts.DiagnosticCategory.Error, "resolution_mode_is_the_only_valid_key_for_type_import_assertions_1455", "`resolution-mode` is the only valid key for type import assertions."),
         Type_import_assertions_should_have_exactly_one_key_resolution_mode_with_value_import_or_require: diag(1456, ts.DiagnosticCategory.Error, "Type_import_assertions_should_have_exactly_one_key_resolution_mode_with_value_import_or_require_1456", "Type import assertions should have exactly one key - `resolution-mode` - with value `import` or `require`."),
         Matched_by_default_include_pattern_Asterisk_Asterisk_Slash_Asterisk: diag(1457, ts.DiagnosticCategory.Message, "Matched_by_default_include_pattern_Asterisk_Asterisk_Slash_Asterisk_1457", "Matched by default include pattern '**/*'"),
+        File_is_ECMAScript_module_because_0_has_field_type_with_value_module: diag(1458, ts.DiagnosticCategory.Message, "File_is_ECMAScript_module_because_0_has_field_type_with_value_module_1458", "File is ECMAScript module because '{0}' has field \"type\" with value \"module\""),
+        File_is_CommonJS_module_because_0_has_field_type_whose_value_is_not_module: diag(1459, ts.DiagnosticCategory.Message, "File_is_CommonJS_module_because_0_has_field_type_whose_value_is_not_module_1459", "File is CommonJS module because '{0}' has field \"type\" whose value is not \"module\""),
+        File_is_CommonJS_module_because_0_does_not_have_field_type: diag(1460, ts.DiagnosticCategory.Message, "File_is_CommonJS_module_because_0_does_not_have_field_type_1460", "File is CommonJS module because '{0}' does not have field \"type\""),
+        File_is_CommonJS_module_because_package_json_was_not_found: diag(1461, ts.DiagnosticCategory.Message, "File_is_CommonJS_module_because_package_json_was_not_found_1461", "File is CommonJS module because 'package.json' was not found"),
         The_import_meta_meta_property_is_not_allowed_in_files_which_will_build_into_CommonJS_output: diag(1470, ts.DiagnosticCategory.Error, "The_import_meta_meta_property_is_not_allowed_in_files_which_will_build_into_CommonJS_output_1470", "The 'import.meta' meta-property is not allowed in files which will build into CommonJS output."),
         Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_cannot_be_imported_synchronously_Use_dynamic_import_instead: diag(1471, ts.DiagnosticCategory.Error, "Module_0_cannot_be_imported_using_this_construct_The_specifier_only_resolves_to_an_ES_module_which_c_1471", "Module '{0}' cannot be imported using this construct. The specifier only resolves to an ES module, which cannot be imported synchronously. Use dynamic import instead."),
         catch_or_finally_expected: diag(1472, ts.DiagnosticCategory.Error, "catch_or_finally_expected_1472", "'catch' or 'finally' expected."),
@@ -43228,7 +43232,7 @@ var ts;
     ts.createCacheWithRedirects = createCacheWithRedirects;
     function createPackageJsonInfoCache(currentDirectory, getCanonicalFileName) {
         var cache;
-        return { getPackageJsonInfo: getPackageJsonInfo, setPackageJsonInfo: setPackageJsonInfo, clear: clear, entries: entries };
+        return { getPackageJsonInfo: getPackageJsonInfo, setPackageJsonInfo: setPackageJsonInfo, clear: clear, entries: entries, getInternalMap: getInternalMap };
         function getPackageJsonInfo(packageJsonPath) {
             return cache === null || cache === void 0 ? void 0 : cache.get(ts.toPath(packageJsonPath, currentDirectory, getCanonicalFileName));
         }
@@ -43242,6 +43246,9 @@ var ts;
             var iter = cache === null || cache === void 0 ? void 0 : cache.entries();
             return iter ? ts.arrayFrom(iter) : [];
         }
+        function getInternalMap() {
+            return cache;
+        }
     }
     function getOrCreateCache(cacheWithRedirects, redirectedReference, key, create) {
         var cache = cacheWithRedirects.getOrCreateMapOfCacheRedirects(redirectedReference);
@@ -43345,15 +43352,18 @@ var ts;
     }
     ts.zipToModeAwareCache = zipToModeAwareCache;
     function createModuleResolutionCache(currentDirectory, getCanonicalFileName, options, directoryToModuleNameMap, moduleNameToDirectoryMap) {
-        var preDirectoryResolutionCache = createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap || (directoryToModuleNameMap = createCacheWithRedirects(options)));
+        var perDirectoryResolutionCache = createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap || (directoryToModuleNameMap = createCacheWithRedirects(options)));
         moduleNameToDirectoryMap || (moduleNameToDirectoryMap = createCacheWithRedirects(options));
         var packageJsonInfoCache = createPackageJsonInfoCache(currentDirectory, getCanonicalFileName);
-        return __assign(__assign(__assign({}, packageJsonInfoCache), preDirectoryResolutionCache), { getOrCreateCacheForModuleName: getOrCreateCacheForModuleName, clear: clear, update: update, getPackageJsonInfoCache: function () { return packageJsonInfoCache; } });
+        return __assign(__assign(__assign({}, packageJsonInfoCache), perDirectoryResolutionCache), { getOrCreateCacheForModuleName: getOrCreateCacheForModuleName, clear: clear, update: update, getPackageJsonInfoCache: function () { return packageJsonInfoCache; }, clearAllExceptPackageJsonInfoCache: clearAllExceptPackageJsonInfoCache });
         function clear() {
-            preDirectoryResolutionCache.clear();
-            moduleNameToDirectoryMap.clear();
+            clearAllExceptPackageJsonInfoCache();
             packageJsonInfoCache.clear();
         }
+        function clearAllExceptPackageJsonInfoCache() {
+            perDirectoryResolutionCache.clear();
+            moduleNameToDirectoryMap.clear();
+        }
         function update(options) {
             updateRedirectsMap(options, directoryToModuleNameMap, moduleNameToDirectoryMap);
         }
@@ -43429,13 +43439,16 @@ var ts;
     }
     ts.createModuleResolutionCache = createModuleResolutionCache;
     function createTypeReferenceDirectiveResolutionCache(currentDirectory, getCanonicalFileName, options, packageJsonInfoCache, directoryToModuleNameMap) {
-        var preDirectoryResolutionCache = createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap || (directoryToModuleNameMap = createCacheWithRedirects(options)));
+        var perDirectoryResolutionCache = createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap || (directoryToModuleNameMap = createCacheWithRedirects(options)));
         packageJsonInfoCache || (packageJsonInfoCache = createPackageJsonInfoCache(currentDirectory, getCanonicalFileName));
-        return __assign(__assign(__assign({}, packageJsonInfoCache), preDirectoryResolutionCache), { clear: clear });
+        return __assign(__assign(__assign({}, packageJsonInfoCache), perDirectoryResolutionCache), { clear: clear, clearAllExceptPackageJsonInfoCache: clearAllExceptPackageJsonInfoCache });
         function clear() {
-            preDirectoryResolutionCache.clear();
+            clearAllExceptPackageJsonInfoCache();
             packageJsonInfoCache.clear();
         }
+        function clearAllExceptPackageJsonInfoCache() {
+            perDirectoryResolutionCache.clear();
+        }
     }
     ts.createTypeReferenceDirectiveResolutionCache = createTypeReferenceDirectiveResolutionCache;
     function resolveModuleNameFromCache(moduleName, containingFile, cache, mode) {
@@ -51223,10 +51236,6 @@ var ts;
             checkExpressionCached(expression);
             return getNodeLinks(expression).resolvedSymbol;
         }
-        function getTargetOfPropertyAssignment(node, dontRecursivelyResolve) {
-            var expression = node.initializer;
-            return getTargetOfAliasLikeExpression(expression, dontRecursivelyResolve);
-        }
         function getTargetOfAccessExpression(node, dontRecursivelyResolve) {
             if (!(ts.isBinaryExpression(node.parent) && node.parent.left === node && node.parent.operatorToken.kind === 63 /* EqualsToken */)) {
                 return undefined;
@@ -51258,7 +51267,7 @@ var ts;
                 case 297 /* ShorthandPropertyAssignment */:
                     return resolveEntityName(node.name, 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */, /*ignoreErrors*/ true, dontRecursivelyResolve);
                 case 296 /* PropertyAssignment */:
-                    return getTargetOfPropertyAssignment(node, dontRecursivelyResolve);
+                    return getTargetOfAliasLikeExpression(node.initializer, dontRecursivelyResolve);
                 case 207 /* ElementAccessExpression */:
                 case 206 /* PropertyAccessExpression */:
                     return getTargetOfAccessExpression(node, dontRecursivelyResolve);
@@ -56783,7 +56792,7 @@ var ts;
                 (resolvedSymbol || symbol).exports.forEach(function (s, name) {
                     var _a;
                     var exportedMember = members_4.get(name);
-                    if (exportedMember && exportedMember !== s) {
+                    if (exportedMember && exportedMember !== s && !(s.flags & 2097152 /* Alias */)) {
                         if (s.flags & 111551 /* Value */ && exportedMember.flags & 111551 /* Value */) {
                             // If the member has an additional value-like declaration, union the types from the two declarations,
                             // but issue an error if they occurred in two different files. The purpose is to support a JS file with
@@ -63275,6 +63284,7 @@ var ts;
             }
         }
         function getTypeFromImportTypeNode(node) {
+            var _a;
             var links = getNodeLinks(node);
             if (!links.resolvedType) {
                 if (node.isTypeOf && node.typeArguments) { // Only the non-typeof form can make use of type arguments
@@ -63294,6 +63304,7 @@ var ts;
                     links.resolvedSymbol = unknownSymbol;
                     return links.resolvedType = errorType;
                 }
+                var isExportEquals = !!((_a = innerModuleSymbol.exports) === null || _a === void 0 ? void 0 : _a.get("export=" /* ExportEquals */));
                 var moduleSymbol = resolveExternalModuleSymbol(innerModuleSymbol, /*dontResolveAlias*/ false);
                 if (!ts.nodeIsMissing(node.qualifier)) {
                     var nameStack = getIdentifierChain(node.qualifier);
@@ -63305,9 +63316,11 @@ var ts;
                         // That, in turn, ultimately uses `getPropertyOfType` on the type of the symbol, which differs slightly from
                         // the `exports` lookup process that only looks up namespace members which is used for most type references
                         var mergedResolvedSymbol = getMergedSymbol(resolveSymbol(currentNamespace));
-                        var next = node.isTypeOf
+                        var symbolFromVariable = node.isTypeOf || ts.isInJSFile(node) && isExportEquals
                             ? getPropertyOfType(getTypeOfSymbol(mergedResolvedSymbol), current.escapedText, /*skipObjectFunctionPropertyAugment*/ false, /*includeTypeOnlyMembers*/ true)
-                            : getSymbol(getExportsOfSymbol(mergedResolvedSymbol), current.escapedText, meaning);
+                            : undefined;
+                        var symbolFromModule = node.isTypeOf ? undefined : getSymbol(getExportsOfSymbol(mergedResolvedSymbol), current.escapedText, meaning);
+                        var next = symbolFromModule !== null && symbolFromModule !== void 0 ? symbolFromModule : symbolFromVariable;
                         if (!next) {
                             error(current, ts.Diagnostics.Namespace_0_has_no_exported_member_1, getFullyQualifiedName(currentNamespace), ts.declarationNameToString(current));
                             return links.resolvedType = errorType;
@@ -66165,6 +66178,26 @@ var ts;
             function structuredTypeRelatedTo(source, target, reportErrors, intersectionState) {
                 var saveErrorInfo = captureErrorCalculationState();
                 var result = structuredTypeRelatedToWorker(source, target, reportErrors, intersectionState, saveErrorInfo);
+                if (!result && (source.flags & 2097152 /* Intersection */ || source.flags & 262144 /* TypeParameter */ && target.flags & 1048576 /* Union */)) {
+                    // The combined constraint of an intersection type is the intersection of the constraints of
+                    // the constituents. When an intersection type contains instantiable types with union type
+                    // constraints, there are situations where we need to examine the combined constraint. One is
+                    // when the target is a union type. Another is when the intersection contains types belonging
+                    // to one of the disjoint domains. For example, given type variables T and U, each with the
+                    // constraint 'string | number', the combined constraint of 'T & U' is 'string | number' and
+                    // we need to check this constraint against a union on the target side. Also, given a type
+                    // variable V constrained to 'string | number', 'V & number' has a combined constraint of
+                    // 'string & number | number & number' which reduces to just 'number'.
+                    // This also handles type parameters, as a type parameter with a union constraint compared against a union
+                    // needs to have its constraint hoisted into an intersection with said type parameter, this way
+                    // the type param can be compared with itself in the target (with the influence of its constraint to match other parts)
+                    // For example, if `T extends 1 | 2` and `U extends 2 | 3` and we compare `T & U` to `T & U & (1 | 2 | 3)`
+                    var constraint = getEffectiveConstraintOfIntersection(source.flags & 2097152 /* Intersection */ ? source.types : [source], !!(target.flags & 1048576 /* Union */));
+                    if (constraint && everyType(constraint, function (c) { return c !== source; })) { // Skip comparison if expansion contains the source itself
+                        // TODO: Stack errors so we get a pyramid for the "normal" comparison above, _and_ a second for this
+                        result = isRelatedTo(constraint, target, 1 /* Source */, /*reportErrors*/ false, /*headMessage*/ undefined, intersectionState);
+                    }
+                }
                 if (result) {
                     resetErrorInfo(saveErrorInfo);
                 }
@@ -66222,28 +66255,6 @@ var ts;
                     if (result = unionOrIntersectionRelatedTo(source, target, reportErrors, intersectionState)) {
                         return result;
                     }
-                    if (source.flags & 2097152 /* Intersection */ || source.flags & 262144 /* TypeParameter */ && target.flags & 1048576 /* Union */) {
-                        // The combined constraint of an intersection type is the intersection of the constraints of
-                        // the constituents. When an intersection type contains instantiable types with union type
-                        // constraints, there are situations where we need to examine the combined constraint. One is
-                        // when the target is a union type. Another is when the intersection contains types belonging
-                        // to one of the disjoint domains. For example, given type variables T and U, each with the
-                        // constraint 'string | number', the combined constraint of 'T & U' is 'string | number' and
-                        // we need to check this constraint against a union on the target side. Also, given a type
-                        // variable V constrained to 'string | number', 'V & number' has a combined constraint of
-                        // 'string & number | number & number' which reduces to just 'number'.
-                        // This also handles type parameters, as a type parameter with a union constraint compared against a union
-                        // needs to have its constraint hoisted into an intersection with said type parameter, this way
-                        // the type param can be compared with itself in the target (with the influence of its constraint to match other parts)
-                        // For example, if `T extends 1 | 2` and `U extends 2 | 3` and we compare `T & U` to `T & U & (1 | 2 | 3)`
-                        var constraint = getEffectiveConstraintOfIntersection(source.flags & 2097152 /* Intersection */ ? source.types : [source], !!(target.flags & 1048576 /* Union */));
-                        if (constraint && everyType(constraint, function (c) { return c !== source; })) { // Skip comparison if expansion contains the source itself
-                            // TODO: Stack errors so we get a pyramid for the "normal" comparison above, _and_ a second for this
-                            if (result = isRelatedTo(constraint, target, 1 /* Source */, /*reportErrors*/ false, /*headMessage*/ undefined, intersectionState)) {
-                                return result;
-                            }
-                        }
-                    }
                     // The ordered decomposition above doesn't handle all cases. Specifically, we also need to handle:
                     // Source is instantiable (e.g. source has union or intersection constraint).
                     // Source is an object, target is a union (e.g. { a, b: boolean } <=> { a, b: true } | { a, b: false }).
@@ -82097,9 +82108,11 @@ var ts;
             // We only need `Awaited<T>` if `T` contains possibly non-primitive types.
             if (isGenericObjectType(type)) {
                 var baseConstraint = getBaseConstraintOfType(type);
-                // We only need `Awaited<T>` if `T` has no base constraint, or the base constraint of `T` is `any`, `unknown`, `{}`, `object`,
+                // We only need `Awaited<T>` if `T` is a type variable that has no base constraint, or the base constraint of `T` is `any`, `unknown`, `{}`, `object`,
                 // or is promise-like.
-                if (!baseConstraint || (baseConstraint.flags & 3 /* AnyOrUnknown */) || isEmptyObjectType(baseConstraint) || isThenableType(baseConstraint)) {
+                if (baseConstraint ?
+                    baseConstraint.flags & 3 /* AnyOrUnknown */ || isEmptyObjectType(baseConstraint) || isThenableType(baseConstraint) :
+                    maybeTypeOfKind(type, 8650752 /* TypeVariable */)) {
                     return true;
                 }
             }
@@ -94871,10 +94884,11 @@ var ts;
         }
         function visitPreOrPostfixUnaryExpression(node, valueIsDiscarded) {
             if (node.operator === 45 /* PlusPlusToken */ || node.operator === 46 /* MinusMinusToken */) {
-                if (shouldTransformPrivateElementsOrClassStaticBlocks && ts.isPrivateIdentifierPropertyAccessExpression(node.operand)) {
+                var operand = ts.skipParentheses(node.operand);
+                if (shouldTransformPrivateElementsOrClassStaticBlocks && ts.isPrivateIdentifierPropertyAccessExpression(operand)) {
                     var info = void 0;
-                    if (info = accessPrivateIdentifier(node.operand.name)) {
-                        var receiver = ts.visitNode(node.operand.expression, visitor, ts.isExpression);
+                    if (info = accessPrivateIdentifier(operand.name)) {
+                        var receiver = ts.visitNode(operand.expression, visitor, ts.isExpression);
                         var _a = createCopiableReceiverExpr(receiver), readExpression = _a.readExpression, initializeExpression = _a.initializeExpression;
                         var expression = createPrivateIdentifierAccess(info, readExpression);
                         var temp = ts.isPrefixUnaryExpression(node) || valueIsDiscarded ? undefined : factory.createTempVariable(hoistVariableDeclaration);
@@ -94890,7 +94904,7 @@ var ts;
                     }
                 }
                 else if (shouldTransformSuperInStaticInitializers &&
-                    ts.isSuperProperty(node.operand) &&
+                    ts.isSuperProperty(operand) &&
                     currentStaticPropertyDeclarationOrStaticBlock &&
                     currentClassLexicalEnvironment) {
                     // converts `++super.a` into `(Reflect.set(_baseTemp, "a", (_a = Reflect.get(_baseTemp, "a", _classTemp), _b = ++_a), _classTemp), _b)`
@@ -94903,31 +94917,31 @@ var ts;
                     // converts `super[f()]--` into `(Reflect.set(_baseTemp, _a = f(), (_b = Reflect.get(_baseTemp, _a, _classTemp), _c = _b--), _classTemp), _c)`
                     var classConstructor = currentClassLexicalEnvironment.classConstructor, superClassReference = currentClassLexicalEnvironment.superClassReference, facts = currentClassLexicalEnvironment.facts;
                     if (facts & 1 /* ClassWasDecorated */) {
-                        var operand = visitInvalidSuperProperty(node.operand);
+                        var expression = visitInvalidSuperProperty(operand);
                         return ts.isPrefixUnaryExpression(node) ?
-                            factory.updatePrefixUnaryExpression(node, operand) :
-                            factory.updatePostfixUnaryExpression(node, operand);
+                            factory.updatePrefixUnaryExpression(node, expression) :
+                            factory.updatePostfixUnaryExpression(node, expression);
                     }
                     if (classConstructor && superClassReference) {
                         var setterName = void 0;
                         var getterName = void 0;
-                        if (ts.isPropertyAccessExpression(node.operand)) {
-                            if (ts.isIdentifier(node.operand.name)) {
-                                getterName = setterName = factory.createStringLiteralFromNode(node.operand.name);
+                        if (ts.isPropertyAccessExpression(operand)) {
+                            if (ts.isIdentifier(operand.name)) {
+                                getterName = setterName = factory.createStringLiteralFromNode(operand.name);
                             }
                         }
                         else {
-                            if (ts.isSimpleInlineableExpression(node.operand.argumentExpression)) {
-                                getterName = setterName = node.operand.argumentExpression;
+                            if (ts.isSimpleInlineableExpression(operand.argumentExpression)) {
+                                getterName = setterName = operand.argumentExpression;
                             }
                             else {
                                 getterName = factory.createTempVariable(hoistVariableDeclaration);
-                                setterName = factory.createAssignment(getterName, ts.visitNode(node.operand.argumentExpression, visitor, ts.isExpression));
+                                setterName = factory.createAssignment(getterName, ts.visitNode(operand.argumentExpression, visitor, ts.isExpression));
                             }
                         }
                         if (setterName && getterName) {
                             var expression = factory.createReflectGetCall(superClassReference, getterName, classConstructor);
-                            ts.setTextRange(expression, node.operand);
+                            ts.setTextRange(expression, operand);
                             var temp = valueIsDiscarded ? undefined : factory.createTempVariable(hoistVariableDeclaration);
                             expression = ts.expandPreOrPostfixIncrementOrDecrementExpression(factory, node, expression, hoistVariableDeclaration, temp);
                             expression = factory.createReflectSetCall(superClassReference, setterName, expression, classConstructor);
@@ -117682,6 +117696,12 @@ var ts;
      * @returns `undefined` if the path has no relevant implied format, `ModuleKind.ESNext` for esm format, and `ModuleKind.CommonJS` for cjs format
      */
     function getImpliedNodeFormatForFile(fileName, packageJsonInfoCache, host, options) {
+        var result = getImpliedNodeFormatForFileWorker(fileName, packageJsonInfoCache, host, options);
+        return typeof result === "object" ? result.impliedNodeFormat : result;
+    }
+    ts.getImpliedNodeFormatForFile = getImpliedNodeFormatForFile;
+    /*@internal*/
+    function getImpliedNodeFormatForFileWorker(fileName, packageJsonInfoCache, host, options) {
         switch (ts.getEmitModuleResolutionKind(options)) {
             case ts.ModuleResolutionKind.Node16:
             case ts.ModuleResolutionKind.NodeNext:
@@ -117693,11 +117713,16 @@ var ts;
                 return undefined;
         }
         function lookupFromPackageJson() {
-            var scope = ts.getPackageScopeForPath(fileName, ts.getTemporaryModuleResolutionState(packageJsonInfoCache, host, options));
-            return (scope === null || scope === void 0 ? void 0 : scope.packageJsonContent.type) === "module" ? ts.ModuleKind.ESNext : ts.ModuleKind.CommonJS;
+            var state = ts.getTemporaryModuleResolutionState(packageJsonInfoCache, host, options);
+            var packageJsonLocations = [];
+            state.failedLookupLocations = packageJsonLocations;
+            state.affectingLocations = packageJsonLocations;
+            var packageJsonScope = ts.getPackageScopeForPath(fileName, state);
+            var impliedNodeFormat = (packageJsonScope === null || packageJsonScope === void 0 ? void 0 : packageJsonScope.packageJsonContent.type) === "module" ? ts.ModuleKind.ESNext : ts.ModuleKind.CommonJS;
+            return { impliedNodeFormat: impliedNodeFormat, packageJsonLocations: packageJsonLocations, packageJsonScope: packageJsonScope };
         }
     }
-    ts.getImpliedNodeFormatForFile = getImpliedNodeFormatForFile;
+    ts.getImpliedNodeFormatForFileWorker = getImpliedNodeFormatForFileWorker;
     /** @internal */
     ts.plainJSErrors = new ts.Set([
         // binder errors
@@ -118022,7 +118047,7 @@ var ts;
             for (var _i = 0, oldSourceFiles_1 = oldSourceFiles; _i < oldSourceFiles_1.length; _i++) {
                 var oldSourceFile = oldSourceFiles_1[_i];
                 var newFile = getSourceFileByPath(oldSourceFile.resolvedPath);
-                if (shouldCreateNewSourceFile || !newFile ||
+                if (shouldCreateNewSourceFile || !newFile || newFile.impliedNodeFormat !== oldSourceFile.impliedNodeFormat ||
                     // old file wasn't redirect but new file is
                     (oldSourceFile.resolvedPath === oldSourceFile.path && newFile.resolvedPath !== oldSourceFile.path)) {
                     host.onReleaseOldSourceFile(oldSourceFile, oldProgram.getCompilerOptions(), !!getSourceFileByPath(oldSourceFile.path));
@@ -118415,7 +118440,7 @@ var ts;
             });
         }
         function tryReuseStructureFromOldProgram() {
-            var _a;
+            var _a, _b;
             if (!oldProgram) {
                 return 0 /* Not */;
             }
@@ -118456,12 +118481,15 @@ var ts;
             var seenPackageNames = new ts.Map();
             for (var _i = 0, oldSourceFiles_2 = oldSourceFiles; _i < oldSourceFiles_2.length; _i++) {
                 var oldSourceFile = oldSourceFiles_2[_i];
+                var sourceFileOptions = getCreateSourceFileOptions(oldSourceFile.fileName, moduleResolutionCache, host, options);
                 var newSourceFile = host.getSourceFileByPath
-                    ? host.getSourceFileByPath(oldSourceFile.fileName, oldSourceFile.resolvedPath, getCreateSourceFileOptions(oldSourceFile.fileName, moduleResolutionCache, host, options), /*onError*/ undefined, shouldCreateNewSourceFile)
-                    : host.getSourceFile(oldSourceFile.fileName, getCreateSourceFileOptions(oldSourceFile.fileName, moduleResolutionCache, host, options), /*onError*/ undefined, shouldCreateNewSourceFile); // TODO: GH#18217
+                    ? host.getSourceFileByPath(oldSourceFile.fileName, oldSourceFile.resolvedPath, sourceFileOptions, /*onError*/ undefined, shouldCreateNewSourceFile || sourceFileOptions.impliedNodeFormat !== oldSourceFile.impliedNodeFormat)
+                    : host.getSourceFile(oldSourceFile.fileName, sourceFileOptions, /*onError*/ undefined, shouldCreateNewSourceFile || sourceFileOptions.impliedNodeFormat !== oldSourceFile.impliedNodeFormat); // TODO: GH#18217
                 if (!newSourceFile) {
                     return 0 /* Not */;
                 }
+                newSourceFile.packageJsonLocations = ((_a = sourceFileOptions.packageJsonLocations) === null || _a === void 0 ? void 0 : _a.length) ? sourceFileOptions.packageJsonLocations : undefined;
+                newSourceFile.packageJsonScope = sourceFileOptions.packageJsonScope;
                 ts.Debug.assert(!newSourceFile.redirectInfo, "Host should not return a redirect source file from `getSourceFile`");
                 var fileChanged = void 0;
                 if (oldSourceFile.redirectInfo) {
@@ -118501,38 +118529,43 @@ var ts;
                     seenPackageNames.set(packageName, newKind);
                 }
                 if (fileChanged) {
+                    if (oldSourceFile.impliedNodeFormat !== newSourceFile.impliedNodeFormat) {
+                        structureIsReused = 1 /* SafeModules */;
+                    }
                     // The `newSourceFile` object was created for the new program.
-                    if (!ts.arrayIsEqualTo(oldSourceFile.libReferenceDirectives, newSourceFile.libReferenceDirectives, fileReferenceIsEqualTo)) {
+                    else if (!ts.arrayIsEqualTo(oldSourceFile.libReferenceDirectives, newSourceFile.libReferenceDirectives, fileReferenceIsEqualTo)) {
                         // 'lib' references has changed. Matches behavior in changesAffectModuleResolution
                         structureIsReused = 1 /* SafeModules */;
                     }
-                    if (oldSourceFile.hasNoDefaultLib !== newSourceFile.hasNoDefaultLib) {
+                    else if (oldSourceFile.hasNoDefaultLib !== newSourceFile.hasNoDefaultLib) {
                         // value of no-default-lib has changed
                         // this will affect if default library is injected into the list of files
                         structureIsReused = 1 /* SafeModules */;
                     }
                     // check tripleslash references
-                    if (!ts.arrayIsEqualTo(oldSourceFile.referencedFiles, newSourceFile.referencedFiles, fileReferenceIsEqualTo)) {
+                    else if (!ts.arrayIsEqualTo(oldSourceFile.referencedFiles, newSourceFile.referencedFiles, fileReferenceIsEqualTo)) {
                         // tripleslash references has changed
                         structureIsReused = 1 /* SafeModules */;
                     }
-                    // check imports and module augmentations
-                    collectExternalModuleReferences(newSourceFile);
-                    if (!ts.arrayIsEqualTo(oldSourceFile.imports, newSourceFile.imports, moduleNameIsEqualTo)) {
-                        // imports has changed
-                        structureIsReused = 1 /* SafeModules */;
-                    }
-                    if (!ts.arrayIsEqualTo(oldSourceFile.moduleAugmentations, newSourceFile.moduleAugmentations, moduleNameIsEqualTo)) {
-                        // moduleAugmentations has changed
-                        structureIsReused = 1 /* SafeModules */;
-                    }
-                    if ((oldSourceFile.flags & 6291456 /* PermanentlySetIncrementalFlags */) !== (newSourceFile.flags & 6291456 /* PermanentlySetIncrementalFlags */)) {
-                        // dynamicImport has changed
-                        structureIsReused = 1 /* SafeModules */;
-                    }
-                    if (!ts.arrayIsEqualTo(oldSourceFile.typeReferenceDirectives, newSourceFile.typeReferenceDirectives, fileReferenceIsEqualTo)) {
-                        // 'types' references has changed
-                        structureIsReused = 1 /* SafeModules */;
+                    else {
+                        // check imports and module augmentations
+                        collectExternalModuleReferences(newSourceFile);
+                        if (!ts.arrayIsEqualTo(oldSourceFile.imports, newSourceFile.imports, moduleNameIsEqualTo)) {
+                            // imports has changed
+                            structureIsReused = 1 /* SafeModules */;
+                        }
+                        else if (!ts.arrayIsEqualTo(oldSourceFile.moduleAugmentations, newSourceFile.moduleAugmentations, moduleNameIsEqualTo)) {
+                            // moduleAugmentations has changed
+                            structureIsReused = 1 /* SafeModules */;
+                        }
+                        else if ((oldSourceFile.flags & 6291456 /* PermanentlySetIncrementalFlags */) !== (newSourceFile.flags & 6291456 /* PermanentlySetIncrementalFlags */)) {
+                            // dynamicImport has changed
+                            structureIsReused = 1 /* SafeModules */;
+                        }
+                        else if (!ts.arrayIsEqualTo(oldSourceFile.typeReferenceDirectives, newSourceFile.typeReferenceDirectives, fileReferenceIsEqualTo)) {
+                            // 'types' references has changed
+                            structureIsReused = 1 /* SafeModules */;
+                        }
                     }
                     // tentatively approve the file
                     modifiedSourceFiles.push({ oldFile: oldSourceFile, newFile: newSourceFile });
@@ -118550,18 +118583,18 @@ var ts;
                 return structureIsReused;
             }
             var modifiedFiles = modifiedSourceFiles.map(function (f) { return f.oldFile; });
-            for (var _b = 0, oldSourceFiles_3 = oldSourceFiles; _b < oldSourceFiles_3.length; _b++) {
-                var oldFile = oldSourceFiles_3[_b];
+            for (var _c = 0, oldSourceFiles_3 = oldSourceFiles; _c < oldSourceFiles_3.length; _c++) {
+                var oldFile = oldSourceFiles_3[_c];
                 if (!ts.contains(modifiedFiles, oldFile)) {
-                    for (var _c = 0, _d = oldFile.ambientModuleNames; _c < _d.length; _c++) {
-                        var moduleName = _d[_c];
+                    for (var _d = 0, _e = oldFile.ambientModuleNames; _d < _e.length; _d++) {
+                        var moduleName = _e[_d];
                         ambientModuleNameToUnmodifiedFileName.set(moduleName, oldFile.fileName);
                     }
                 }
             }
             // try to verify results of module resolution
-            for (var _e = 0, modifiedSourceFiles_1 = modifiedSourceFiles; _e < modifiedSourceFiles_1.length; _e++) {
-                var _f = modifiedSourceFiles_1[_e], oldSourceFile = _f.oldFile, newSourceFile = _f.newFile;
+            for (var _f = 0, modifiedSourceFiles_1 = modifiedSourceFiles; _f < modifiedSourceFiles_1.length; _f++) {
+                var _g = modifiedSourceFiles_1[_f], oldSourceFile = _g.oldFile, newSourceFile = _g.newFile;
                 var moduleNames = getModuleNames(newSourceFile);
                 var resolutions = resolveModuleNamesReusingOldState(moduleNames, newSourceFile);
                 // ensure that module resolution results are still correct
@@ -118588,14 +118621,14 @@ var ts;
             if (structureIsReused !== 2 /* Completely */) {
                 return structureIsReused;
             }
-            if (ts.changesAffectingProgramStructure(oldOptions, options) || ((_a = host.hasChangedAutomaticTypeDirectiveNames) === null || _a === void 0 ? void 0 : _a.call(host))) {
+            if (ts.changesAffectingProgramStructure(oldOptions, options) || ((_b = host.hasChangedAutomaticTypeDirectiveNames) === null || _b === void 0 ? void 0 : _b.call(host))) {
                 return 1 /* SafeModules */;
             }
             missingFilePaths = oldProgram.getMissingFilePaths();
             // update fileName -> file mapping
             ts.Debug.assert(newSourceFiles.length === oldProgram.getSourceFiles().length);
-            for (var _g = 0, newSourceFiles_1 = newSourceFiles; _g < newSourceFiles_1.length; _g++) {
-                var newSourceFile = newSourceFiles_1[_g];
+            for (var _h = 0, newSourceFiles_1 = newSourceFiles; _h < newSourceFiles_1.length; _h++) {
+                var newSourceFile = newSourceFiles_1[_h];
                 filesByName.set(newSourceFile.path, newSourceFile);
             }
             var oldFilesByNameMap = oldProgram.getFilesByNameMap();
@@ -119378,13 +119411,16 @@ var ts;
                 addFilePreprocessingFileExplainingDiagnostic(existingFile, reason, ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, [fileName, existingFile.fileName]);
             }
         }
-        function createRedirectSourceFile(redirectTarget, unredirected, fileName, path, resolvedPath, originalFileName) {
+        function createRedirectSourceFile(redirectTarget, unredirected, fileName, path, resolvedPath, originalFileName, sourceFileOptions) {
+            var _a;
             var redirect = Object.create(redirectTarget);
             redirect.fileName = fileName;
             redirect.path = path;
             redirect.resolvedPath = resolvedPath;
             redirect.originalFileName = originalFileName;
             redirect.redirectInfo = { redirectTarget: redirectTarget, unredirected: unredirected };
+            redirect.packageJsonLocations = ((_a = sourceFileOptions.packageJsonLocations) === null || _a === void 0 ? void 0 : _a.length) ? sourceFileOptions.packageJsonLocations : undefined;
+            redirect.packageJsonScope = sourceFileOptions.packageJsonScope;
             sourceFilesFoundSearchingNodeModules.set(path, currentNodeModulesDepth > 0);
             Object.defineProperties(redirect, {
                 id: {
@@ -119413,14 +119449,14 @@ var ts;
             // It's a _little odd_ that we can't set `impliedNodeFormat` until the program step - but it's the first and only time we have a resolution cache
             // and a freshly made source file node on hand at the same time, and we need both to set the field. Persisting the resolution cache all the way
             // to the check and emit steps would be bad - so we much prefer detecting and storing the format information on the source file node upfront.
-            var impliedNodeFormat = getImpliedNodeFormatForFile(toPath(fileName), moduleResolutionCache === null || moduleResolutionCache === void 0 ? void 0 : moduleResolutionCache.getPackageJsonInfoCache(), host, options);
-            return {
-                languageVersion: ts.getEmitScriptTarget(options),
-                impliedNodeFormat: impliedNodeFormat,
-                setExternalModuleIndicator: ts.getSetExternalModuleIndicator(options)
-            };
+            var result = getImpliedNodeFormatForFileWorker(toPath(fileName), moduleResolutionCache === null || moduleResolutionCache === void 0 ? void 0 : moduleResolutionCache.getPackageJsonInfoCache(), host, options);
+            var languageVersion = ts.getEmitScriptTarget(options);
+            var setExternalModuleIndicator = ts.getSetExternalModuleIndicator(options);
+            return typeof result === "object" ? __assign(__assign({}, result), { languageVersion: languageVersion, setExternalModuleIndicator: setExternalModuleIndicator }) :
+                { languageVersion: languageVersion, impliedNodeFormat: result, setExternalModuleIndicator: setExternalModuleIndicator };
         }
         function findSourceFileWorker(fileName, isDefaultLib, ignoreNoDefaultLib, reason, packageId) {
+            var _a, _b;
             var path = toPath(fileName);
             if (useSourceOfProjectReferenceRedirect) {
                 var source = getSourceOfProjectReferenceRedirect(path);
@@ -119507,14 +119543,15 @@ var ts;
                 }
             }
             // We haven't looked for this file, do so now and cache result
-            var file = host.getSourceFile(fileName, getCreateSourceFileOptions(fileName, moduleResolutionCache, host, options), function (hostErrorMessage) { return addFilePreprocessingFileExplainingDiagnostic(/*file*/ undefined, reason, ts.Diagnostics.Cannot_read_file_0_Colon_1, [fileName, hostErrorMessage]); }, shouldCreateNewSourceFile);
+            var sourceFileOptions = getCreateSourceFileOptions(fileName, moduleResolutionCache, host, options);
+            var file = host.getSourceFile(fileName, sourceFileOptions, function (hostErrorMessage) { return addFilePreprocessingFileExplainingDiagnostic(/*file*/ undefined, reason, ts.Diagnostics.Cannot_read_file_0_Colon_1, [fileName, hostErrorMessage]); }, shouldCreateNewSourceFile || (((_a = oldProgram === null || oldProgram === void 0 ? void 0 : oldProgram.getSourceFileByPath(toPath(fileName))) === null || _a === void 0 ? void 0 : _a.impliedNodeFormat) !== sourceFileOptions.impliedNodeFormat));
             if (packageId) {
                 var packageIdKey = ts.packageIdToString(packageId);
                 var fileFromPackageId = packageIdToSourceFile.get(packageIdKey);
                 if (fileFromPackageId) {
                     // Some other SourceFile already exists with this package name and version.
                     // Instead of creating a duplicate, just redirect to the existing one.
-                    var dupFile = createRedirectSourceFile(fileFromPackageId, file, fileName, path, toPath(fileName), originalFileName); // TODO: GH#18217
+                    var dupFile = createRedirectSourceFile(fileFromPackageId, file, fileName, path, toPath(fileName), originalFileName, sourceFileOptions);
                     redirectTargetsMap.add(fileFromPackageId.path, fileName);
                     addFileToFilesByName(dupFile, path, redirectedPath);
                     addFileIncludeReason(dupFile, reason);
@@ -119535,6 +119572,8 @@ var ts;
                 file.path = path;
                 file.resolvedPath = toPath(fileName);
                 file.originalFileName = originalFileName;
+                file.packageJsonLocations = ((_b = sourceFileOptions.packageJsonLocations) === null || _b === void 0 ? void 0 : _b.length) ? sourceFileOptions.packageJsonLocations : undefined;
+                file.packageJsonScope = sourceFileOptions.packageJsonScope;
                 addFileIncludeReason(file, reason);
                 if (host.useCaseSensitiveFileNames()) {
                     var pathLowerCase = ts.toFileNameLowerCase(path);
@@ -120165,7 +120204,7 @@ var ts;
                 fileIncludeReasons = undefined;
             var location = locationReason && getReferencedFileLocation(getSourceFileByPath, locationReason);
             var fileIncludeReasonDetails = fileIncludeReasons && ts.chainDiagnosticMessages(fileIncludeReasons, ts.Diagnostics.The_file_is_in_the_program_because_Colon);
-            var redirectInfo = file && ts.explainIfFileIsRedirect(file);
+            var redirectInfo = file && ts.explainIfFileIsRedirectAndImpliedFormat(file);
             var chain = ts.chainDiagnosticMessages.apply(void 0, __spreadArray([redirectInfo ? fileIncludeReasonDetails ? __spreadArray([fileIncludeReasonDetails], redirectInfo, true) : redirectInfo : fileIncludeReasonDetails, diagnostic], args || ts.emptyArray, false));
             return location && isReferenceFileLocation(location) ?
                 ts.createFileDiagnosticFromMessageChain(location.file, location.pos, location.end - location.pos, chain, relatedInfo) :
@@ -122470,7 +122509,7 @@ var ts;
      * "c:/", "c:/users", "c:/users/username", "c:/users/username/folderAtRoot", "c:/folderAtRoot"
      * @param dirPath
      */
-    function canWatchDirectory(dirPath) {
+    function canWatchDirectoryOrFile(dirPath) {
         var rootLength = ts.getRootLength(dirPath);
         if (dirPath.length === rootLength) {
             // Ignore "/", "c:/"
@@ -122507,7 +122546,7 @@ var ts;
         }
         return true;
     }
-    ts.canWatchDirectory = canWatchDirectory;
+    ts.canWatchDirectoryOrFile = canWatchDirectoryOrFile;
     function createResolutionCache(resolutionHost, rootDirForResolution, logChangesWhenResolvingModule) {
         var filesWithChangedSetOfUnresolvedImports;
         var filesWithInvalidatedResolutions;
@@ -122516,7 +122555,9 @@ var ts;
         var resolutionsWithFailedLookups = [];
         var resolutionsWithOnlyAffectingLocations = [];
         var resolvedFileToResolution = ts.createMultiMap();
+        var impliedFormatPackageJsons = new ts.Map();
         var hasChangedAutomaticTypeDirectiveNames = false;
+        var affectingPathChecksForFile;
         var affectingPathChecks;
         var failedLookupChecks;
         var startsWithPathChecks;
@@ -122556,7 +122597,7 @@ var ts;
             finishRecordingFilesWithChangedResolutions: finishRecordingFilesWithChangedResolutions,
             // perDirectoryResolvedModuleNames and perDirectoryResolvedTypeReferenceDirectives could be non empty if there was exception during program update
             // (between startCachingPerDirectoryResolution and finishCachingPerDirectoryResolution)
-            startCachingPerDirectoryResolution: clearPerDirectoryResolutions,
+            startCachingPerDirectoryResolution: startCachingPerDirectoryResolution,
             finishCachingPerDirectoryResolution: finishCachingPerDirectoryResolution,
             resolveModuleNames: resolveModuleNames,
             getResolvedModuleWithFailedLookupLocationsFromCache: getResolvedModuleWithFailedLookupLocationsFromCache,
@@ -122600,9 +122641,10 @@ var ts;
             startsWithPathChecks = undefined;
             isInDirectoryChecks = undefined;
             affectingPathChecks = undefined;
-            // perDirectoryResolvedModuleNames and perDirectoryResolvedTypeReferenceDirectives could be non empty if there was exception during program update
-            // (between startCachingPerDirectoryResolution and finishCachingPerDirectoryResolution)
-            clearPerDirectoryResolutions();
+            affectingPathChecksForFile = undefined;
+            moduleResolutionCache.clear();
+            typeReferenceDirectiveResolutionCache.clear();
+            impliedFormatPackageJsons.clear();
             hasChangedAutomaticTypeDirectiveNames = false;
         }
         function startRecordingFilesWithChangedResolutions() {
@@ -122634,15 +122676,44 @@ var ts;
             return function (path) { return (!!collected && collected.has(path)) ||
                 isFileWithInvalidatedNonRelativeUnresolvedImports(path); };
         }
-        function clearPerDirectoryResolutions() {
-            moduleResolutionCache.clear();
-            typeReferenceDirectiveResolutionCache.clear();
+        function startCachingPerDirectoryResolution() {
+            moduleResolutionCache.clearAllExceptPackageJsonInfoCache();
+            typeReferenceDirectiveResolutionCache.clearAllExceptPackageJsonInfoCache();
+            // perDirectoryResolvedModuleNames and perDirectoryResolvedTypeReferenceDirectives could be non empty if there was exception during program update
+            // (between startCachingPerDirectoryResolution and finishCachingPerDirectoryResolution)
             nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfNonRelativeModuleResolutions);
             nonRelativeExternalModuleResolutions.clear();
         }
-        function finishCachingPerDirectoryResolution() {
+        function finishCachingPerDirectoryResolution(newProgram, oldProgram) {
             filesWithInvalidatedNonRelativeUnresolvedImports = undefined;
-            clearPerDirectoryResolutions();
+            nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfNonRelativeModuleResolutions);
+            nonRelativeExternalModuleResolutions.clear();
+            // Update file watches
+            if (newProgram !== oldProgram) {
+                newProgram === null || newProgram === void 0 ? void 0 : newProgram.getSourceFiles().forEach(function (newFile) {
+                    var _a, _b, _c;
+                    var expected = ts.isExternalOrCommonJsModule(newFile) ? (_b = (_a = newFile.packageJsonLocations) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0 : 0;
+                    var existing = (_c = impliedFormatPackageJsons.get(newFile.path)) !== null && _c !== void 0 ? _c : ts.emptyArray;
+                    for (var i = existing.length; i < expected; i++) {
+                        createFileWatcherOfAffectingLocation(newFile.packageJsonLocations[i], /*forResolution*/ false);
+                    }
+                    if (existing.length > expected) {
+                        for (var i = expected; i < existing.length; i++) {
+                            fileWatchesOfAffectingLocations.get(existing[i]).files--;
+                        }
+                    }
+                    if (expected)
+                        impliedFormatPackageJsons.set(newFile.path, newFile.packageJsonLocations);
+                    else
+                        impliedFormatPackageJsons.delete(newFile.path);
+                });
+                impliedFormatPackageJsons.forEach(function (existing, path) {
+                    if (!(newProgram === null || newProgram === void 0 ? void 0 : newProgram.getSourceFileByPath(path))) {
+                        existing.forEach(function (location) { return fileWatchesOfAffectingLocations.get(location).files--; });
+                        impliedFormatPackageJsons.delete(path);
+                    }
+                });
+            }
             directoryWatchesOfFailedLookups.forEach(function (watcher, path) {
                 if (watcher.refCount === 0) {
                     directoryWatchesOfFailedLookups.delete(path);
@@ -122650,7 +122721,7 @@ var ts;
                 }
             });
             fileWatchesOfAffectingLocations.forEach(function (watcher, path) {
-                if (watcher.refCount === 0) {
+                if (watcher.files === 0 && watcher.resolutions === 0) {
                     fileWatchesOfAffectingLocations.delete(path);
                     watcher.watcher.close();
                     // Ensure when watching symlinked package.json, we can close the actual file watcher only once
@@ -122881,7 +122952,7 @@ var ts;
             }
             // If the directory is node_modules use it to watch, always watch it recursively
             if (ts.isNodeModulesDirectory(dirPath)) {
-                return canWatchDirectory(ts.getDirectoryPath(dirPath)) ? { dir: dir, dirPath: dirPath } : undefined;
+                return canWatchDirectoryOrFile(ts.getDirectoryPath(dirPath)) ? { dir: dir, dirPath: dirPath } : undefined;
             }
             var nonRecursive = true;
             // Use some ancestor of the root directory
@@ -122899,7 +122970,7 @@ var ts;
                     dir = ts.getDirectoryPath(dir);
                 }
             }
-            return canWatchDirectory(dirPath) ? { dir: subDirectory || dir, dirPath: subDirectoryPath || dirPath, nonRecursive: nonRecursive } : undefined;
+            return canWatchDirectoryOrFile(dirPath) ? { dir: subDirectory || dir, dirPath: subDirectoryPath || dirPath, nonRecursive: nonRecursive } : undefined;
         }
         function isPathWithDefaultFailedLookupExtension(path) {
             return ts.fileExtensionIsOneOf(path, failedLookupDefaultExtensions);
@@ -122970,46 +123041,58 @@ var ts;
             // Watch package json
             for (var _i = 0, affectingLocations_1 = affectingLocations; _i < affectingLocations_1.length; _i++) {
                 var affectingLocation = affectingLocations_1[_i];
-                createFileWatcherOfAffectingLocation(affectingLocation);
+                createFileWatcherOfAffectingLocation(affectingLocation, /*forResolution*/ true);
             }
         }
-        function createFileWatcherOfAffectingLocation(affectingLocation) {
-            var path = resolutionHost.toPath(affectingLocation);
-            var fileWatcher = fileWatchesOfAffectingLocations.get(path);
+        function createFileWatcherOfAffectingLocation(affectingLocation, forResolution) {
+            var fileWatcher = fileWatchesOfAffectingLocations.get(affectingLocation);
             if (fileWatcher) {
-                fileWatcher.refCount++;
+                if (forResolution)
+                    fileWatcher.resolutions++;
+                else
+                    fileWatcher.files++;
                 return;
             }
             var locationToWatch = affectingLocation;
-            var locationToWatchPath = path;
             if (resolutionHost.realpath) {
                 locationToWatch = resolutionHost.realpath(affectingLocation);
-                locationToWatchPath = resolutionHost.toPath(locationToWatch);
-                if (path !== locationToWatchPath) {
-                    var fileWatcher_1 = fileWatchesOfAffectingLocations.get(locationToWatchPath);
+                if (affectingLocation !== locationToWatch) {
+                    var fileWatcher_1 = fileWatchesOfAffectingLocations.get(locationToWatch);
                     if (fileWatcher_1) {
-                        fileWatcher_1.refCount++;
-                        fileWatcher_1.paths.add(path);
-                        fileWatchesOfAffectingLocations.set(path, fileWatcher_1);
+                        if (forResolution)
+                            fileWatcher_1.resolutions++;
+                        else
+                            fileWatcher_1.files++;
+                        fileWatcher_1.paths.add(affectingLocation);
+                        fileWatchesOfAffectingLocations.set(affectingLocation, fileWatcher_1);
                         return;
                     }
                 }
             }
             var paths = new ts.Set();
-            paths.add(locationToWatchPath);
+            paths.add(locationToWatch);
             var watcher = {
-                watcher: resolutionHost.watchAffectingFileLocation(locationToWatch, function (fileName, eventKind) {
-                    cachedDirectoryStructureHost === null || cachedDirectoryStructureHost === void 0 ? void 0 : cachedDirectoryStructureHost.addOrDeleteFile(fileName, path, eventKind);
-                    paths.forEach(function (path) { return (affectingPathChecks || (affectingPathChecks = new ts.Set())).add(path); });
-                    resolutionHost.scheduleInvalidateResolutionsOfFailedLookupLocations();
-                }),
-                refCount: 1,
+                watcher: canWatchDirectoryOrFile(resolutionHost.toPath(locationToWatch)) ?
+                    resolutionHost.watchAffectingFileLocation(locationToWatch, function (fileName, eventKind) {
+                        cachedDirectoryStructureHost === null || cachedDirectoryStructureHost === void 0 ? void 0 : cachedDirectoryStructureHost.addOrDeleteFile(fileName, resolutionHost.toPath(locationToWatch), eventKind);
+                        paths.forEach(function (path) {
+                            var _a;
+                            if (watcher.resolutions)
+                                (affectingPathChecks !== null && affectingPathChecks !== void 0 ? affectingPathChecks : (affectingPathChecks = new ts.Set())).add(path);
+                            if (watcher.files)
+                                (affectingPathChecksForFile !== null && affectingPathChecksForFile !== void 0 ? affectingPathChecksForFile : (affectingPathChecksForFile = new ts.Set())).add(path);
+                            (_a = moduleResolutionCache.getPackageJsonInfoCache().getInternalMap()) === null || _a === void 0 ? void 0 : _a.delete(resolutionHost.toPath(path));
+                        });
+                        resolutionHost.scheduleInvalidateResolutionsOfFailedLookupLocations();
+                    }) : ts.noopFileWatcher,
+                resolutions: forResolution ? 1 : 0,
+                files: forResolution ? 0 : 1,
                 paths: paths,
             };
-            fileWatchesOfAffectingLocations.set(locationToWatchPath, watcher);
-            if (path !== locationToWatchPath) {
-                fileWatchesOfAffectingLocations.set(path, watcher);
-                paths.add(path);
+            fileWatchesOfAffectingLocations.set(locationToWatch, watcher);
+            if (affectingLocation !== locationToWatch) {
+                fileWatchesOfAffectingLocations.set(affectingLocation, watcher);
+                paths.add(affectingLocation);
             }
         }
         function watchFailedLookupLocationOfNonRelativeModuleResolutions(resolutions, name) {
@@ -123077,8 +123160,8 @@ var ts;
             }
             for (var _a = 0, affectingLocations_2 = affectingLocations; _a < affectingLocations_2.length; _a++) {
                 var affectingLocation = affectingLocations_2[_a];
-                var watcher = fileWatchesOfAffectingLocations.get(resolutionHost.toPath(affectingLocation));
-                watcher.refCount--;
+                var watcher = fileWatchesOfAffectingLocations.get(affectingLocation);
+                watcher.resolutions--;
             }
         }
         function removeDirectoryWatcher(dirPath) {
@@ -123132,7 +123215,7 @@ var ts;
                 resolution.isInvalidated = invalidated = true;
                 for (var _a = 0, _b = ts.Debug.checkDefined(resolution.files); _a < _b.length; _a++) {
                     var containingFilePath = _b[_a];
-                    (filesWithInvalidatedResolutions || (filesWithInvalidatedResolutions = new ts.Set())).add(containingFilePath);
+                    (filesWithInvalidatedResolutions !== null && filesWithInvalidatedResolutions !== void 0 ? filesWithInvalidatedResolutions : (filesWithInvalidatedResolutions = new ts.Set())).add(containingFilePath);
                     // When its a file with inferred types resolution, invalidate type reference directive resolution
                     hasChangedAutomaticTypeDirectiveNames = hasChangedAutomaticTypeDirectiveNames || ts.endsWith(containingFilePath, ts.inferredTypesContainingFile);
                 }
@@ -123199,10 +123282,25 @@ var ts;
             resolutionHost.scheduleInvalidateResolutionsOfFailedLookupLocations();
         }
         function invalidateResolutionsOfFailedLookupLocations() {
+            var _a;
+            var invalidated = false;
+            if (affectingPathChecksForFile) {
+                (_a = resolutionHost.getCurrentProgram()) === null || _a === void 0 ? void 0 : _a.getSourceFiles().forEach(function (f) {
+                    if (ts.some(f.packageJsonLocations, function (location) { return affectingPathChecksForFile.has(location); })) {
+                        (filesWithInvalidatedResolutions !== null && filesWithInvalidatedResolutions !== void 0 ? filesWithInvalidatedResolutions : (filesWithInvalidatedResolutions = new ts.Set())).add(f.path);
+                        invalidated = true;
+                    }
+                });
+                affectingPathChecksForFile = undefined;
+            }
             if (!failedLookupChecks && !startsWithPathChecks && !isInDirectoryChecks && !affectingPathChecks) {
-                return false;
+                return invalidated;
+            }
+            invalidated = invalidateResolutions(resolutionsWithFailedLookups, canInvalidateFailedLookupResolution) || invalidated;
+            var packageJsonMap = moduleResolutionCache.getPackageJsonInfoCache().getInternalMap();
+            if (packageJsonMap && (failedLookupChecks || startsWithPathChecks || isInDirectoryChecks)) {
+                packageJsonMap.forEach(function (_value, path) { return isInvalidatedFailedLookup(path) ? packageJsonMap.delete(path) : undefined; });
             }
-            var invalidated = invalidateResolutions(resolutionsWithFailedLookups, canInvalidateFailedLookupResolution);
             failedLookupChecks = undefined;
             startsWithPathChecks = undefined;
             isInDirectoryChecks = undefined;
@@ -123215,17 +123313,15 @@ var ts;
                 return true;
             if (!failedLookupChecks && !startsWithPathChecks && !isInDirectoryChecks)
                 return false;
-            return resolution.failedLookupLocations.some(function (location) {
-                var locationPath = resolutionHost.toPath(location);
-                return (failedLookupChecks === null || failedLookupChecks === void 0 ? void 0 : failedLookupChecks.has(locationPath)) ||
-                    ts.firstDefinedIterator((startsWithPathChecks === null || startsWithPathChecks === void 0 ? void 0 : startsWithPathChecks.keys()) || ts.emptyIterator, function (fileOrDirectoryPath) { return ts.startsWith(locationPath, fileOrDirectoryPath) ? true : undefined; }) ||
-                    ts.firstDefinedIterator((isInDirectoryChecks === null || isInDirectoryChecks === void 0 ? void 0 : isInDirectoryChecks.keys()) || ts.emptyIterator, function (fileOrDirectoryPath) { return isInDirectoryPath(fileOrDirectoryPath, locationPath) ? true : undefined; });
-            });
+            return resolution.failedLookupLocations.some(function (location) { return isInvalidatedFailedLookup(resolutionHost.toPath(location)); });
+        }
+        function isInvalidatedFailedLookup(locationPath) {
+            return (failedLookupChecks === null || failedLookupChecks === void 0 ? void 0 : failedLookupChecks.has(locationPath)) ||
+                ts.firstDefinedIterator((startsWithPathChecks === null || startsWithPathChecks === void 0 ? void 0 : startsWithPathChecks.keys()) || ts.emptyIterator, function (fileOrDirectoryPath) { return ts.startsWith(locationPath, fileOrDirectoryPath) ? true : undefined; }) ||
+                ts.firstDefinedIterator((isInDirectoryChecks === null || isInDirectoryChecks === void 0 ? void 0 : isInDirectoryChecks.keys()) || ts.emptyIterator, function (fileOrDirectoryPath) { return isInDirectoryPath(fileOrDirectoryPath, locationPath) ? true : undefined; });
         }
         function canInvalidatedFailedLookupResolutionWithAffectingLocation(resolution) {
-            return !!affectingPathChecks && resolution.affectingLocations.some(function (location) {
-                return affectingPathChecks.has(resolutionHost.toPath(location));
-            });
+            return !!affectingPathChecks && resolution.affectingLocations.some(function (location) { return affectingPathChecks.has(location); });
         }
         function closeTypeRootsWatch() {
             ts.clearMap(typeRootsWatches, ts.closeFileWatcher);
@@ -123291,7 +123387,7 @@ var ts;
         function directoryExistsForTypeRootWatch(nodeTypesDirectory) {
             var dir = ts.getDirectoryPath(ts.getDirectoryPath(nodeTypesDirectory));
             var dirPath = resolutionHost.toPath(dir);
-            return dirPath === rootPath || canWatchDirectory(dirPath);
+            return dirPath === rootPath || canWatchDirectoryOrFile(dirPath);
         }
     }
     ts.createResolutionCache = createResolutionCache;
@@ -124264,23 +124360,46 @@ var ts;
             var file = _c[_i];
             write("" + toFileName(file, relativeFileName));
             (_a = reasons.get(file.path)) === null || _a === void 0 ? void 0 : _a.forEach(function (reason) { return write("  " + fileIncludeReasonToDiagnostics(program, reason, relativeFileName).messageText); });
-            (_b = explainIfFileIsRedirect(file, relativeFileName)) === null || _b === void 0 ? void 0 : _b.forEach(function (d) { return write("  " + d.messageText); });
+            (_b = explainIfFileIsRedirectAndImpliedFormat(file, relativeFileName)) === null || _b === void 0 ? void 0 : _b.forEach(function (d) { return write("  " + d.messageText); });
         }
     }
     ts.explainFiles = explainFiles;
-    function explainIfFileIsRedirect(file, fileNameConvertor) {
+    function explainIfFileIsRedirectAndImpliedFormat(file, fileNameConvertor) {
+        var _a;
         var result;
         if (file.path !== file.resolvedPath) {
-            (result || (result = [])).push(ts.chainDiagnosticMessages(
+            (result !== null && result !== void 0 ? result : (result = [])).push(ts.chainDiagnosticMessages(
             /*details*/ undefined, ts.Diagnostics.File_is_output_of_project_reference_source_0, toFileName(file.originalFileName, fileNameConvertor)));
         }
         if (file.redirectInfo) {
-            (result || (result = [])).push(ts.chainDiagnosticMessages(
+            (result !== null && result !== void 0 ? result : (result = [])).push(ts.chainDiagnosticMessages(
             /*details*/ undefined, ts.Diagnostics.File_redirects_to_file_0, toFileName(file.redirectInfo.redirectTarget, fileNameConvertor)));
         }
+        if (ts.isExternalOrCommonJsModule(file)) {
+            switch (file.impliedNodeFormat) {
+                case ts.ModuleKind.ESNext:
+                    if (file.packageJsonScope) {
+                        (result !== null && result !== void 0 ? result : (result = [])).push(ts.chainDiagnosticMessages(
+                        /*details*/ undefined, ts.Diagnostics.File_is_ECMAScript_module_because_0_has_field_type_with_value_module, toFileName(ts.last(file.packageJsonLocations), fileNameConvertor)));
+                    }
+                    break;
+                case ts.ModuleKind.CommonJS:
+                    if (file.packageJsonScope) {
+                        (result !== null && result !== void 0 ? result : (result = [])).push(ts.chainDiagnosticMessages(
+                        /*details*/ undefined, file.packageJsonScope.packageJsonContent.type ?
+                            ts.Diagnostics.File_is_CommonJS_module_because_0_has_field_type_whose_value_is_not_module :
+                            ts.Diagnostics.File_is_CommonJS_module_because_0_does_not_have_field_type, toFileName(ts.last(file.packageJsonLocations), fileNameConvertor)));
+                    }
+                    else if ((_a = file.packageJsonLocations) === null || _a === void 0 ? void 0 : _a.length) {
+                        (result !== null && result !== void 0 ? result : (result = [])).push(ts.chainDiagnosticMessages(
+                        /*details*/ undefined, ts.Diagnostics.File_is_CommonJS_module_because_package_json_was_not_found));
+                    }
+                    break;
+            }
+        }
         return result;
     }
-    ts.explainIfFileIsRedirect = explainIfFileIsRedirect;
+    ts.explainIfFileIsRedirectAndImpliedFormat = explainIfFileIsRedirectAndImpliedFormat;
     function getMatchedFileSpec(program, fileName) {
         var _a;
         var configFile = program.getCompilerOptions().configFile;
@@ -124490,6 +124609,7 @@ var ts;
         MissingFile: "Missing file",
         WildcardDirectory: "Wild card directory",
         FailedLookupLocations: "Failed Lookup Locations",
+        AffectingFileLocation: "File location affecting resolution",
         TypeRoots: "Type roots",
         ConfigFileOfReferencedProject: "Config file of referened project",
         ExtendedConfigOfReferencedProject: "Extended config file of referenced project",
@@ -124813,7 +124933,7 @@ var ts;
         compilerHost.getCompilationSettings = function () { return compilerOptions; };
         compilerHost.useSourceOfProjectReferenceRedirect = ts.maybeBind(host, host.useSourceOfProjectReferenceRedirect);
         compilerHost.watchDirectoryOfFailedLookupLocation = function (dir, cb, flags) { return watchDirectory(dir, cb, flags, watchOptions, ts.WatchType.FailedLookupLocations); };
-        compilerHost.watchAffectingFileLocation = function (file, cb) { return watchFile(file, cb, ts.PollingInterval.High, watchOptions, ts.WatchType.PackageJson); };
+        compilerHost.watchAffectingFileLocation = function (file, cb) { return watchFile(file, cb, ts.PollingInterval.High, watchOptions, ts.WatchType.AffectingFileLocation); };
         compilerHost.watchTypeRootsDirectory = function (dir, cb, flags) { return watchDirectory(dir, cb, flags, watchOptions, ts.WatchType.TypeRoots); };
         compilerHost.getCachedDirectoryStructureHost = function () { return cachedDirectoryStructureHost; };
         compilerHost.scheduleInvalidateResolutionsOfFailedLookupLocations = scheduleInvalidateResolutionsOfFailedLookupLocations;
@@ -124847,6 +124967,9 @@ var ts;
                 return host.resolveTypeReferenceDirectives.apply(host, args);
             }) :
             (function (typeDirectiveNames, containingFile, redirectedReference, _options, containingFileMode) { return resolutionCache.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile, redirectedReference, containingFileMode); });
+        compilerHost.getModuleResolutionCache = host.resolveModuleNames ?
+            ts.maybeBind(host, host.getModuleResolutionCache) :
+            (function () { return resolutionCache.getModuleResolutionCache(); });
         var userProvidedResolution = !!host.resolveModuleNames || !!host.resolveTypeReferenceDirectives;
         builderProgram = readBuilderProgram(compilerOptions, compilerHost);
         synchronizeProgram();
@@ -124949,8 +125072,9 @@ var ts;
             resolutionCache.startCachingPerDirectoryResolution();
             compilerHost.hasInvalidatedResolution = hasInvalidatedResolution;
             compilerHost.hasChangedAutomaticTypeDirectiveNames = hasChangedAutomaticTypeDirectiveNames;
+            var oldProgram = getCurrentProgram();
             builderProgram = createProgram(rootFileNames, compilerOptions, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
-            resolutionCache.finishCachingPerDirectoryResolution();
+            resolutionCache.finishCachingPerDirectoryResolution(builderProgram.getProgram(), oldProgram);
             // Update watches
             ts.updateMissingFilePathsWatch(builderProgram.getProgram(), missingFilesMap || (missingFilesMap = new ts.Map()), watchMissingFilePath);
             if (needsUpdateInTypeRootWatch) {
@@ -125032,9 +125156,6 @@ var ts;
                         sourceFilesCache.set(path, false);
                     }
                 }
-                if (sourceFile) {
-                    sourceFile.impliedNodeFormat = ts.getImpliedNodeFormatForFile(path, resolutionCache.getModuleResolutionCache().getPackageJsonInfoCache(), compilerHost, compilerHost.getCompilationSettings());
-                }
                 return sourceFile;
             }
             return hostSourceFile.sourceFile;
@@ -125550,6 +125671,7 @@ var ts;
         compilerHost.getParsedCommandLine = function (fileName) { return parseConfigFile(state, fileName, toResolvedConfigFilePath(state, fileName)); };
         compilerHost.resolveModuleNames = ts.maybeBind(host, host.resolveModuleNames);
         compilerHost.resolveTypeReferenceDirectives = ts.maybeBind(host, host.resolveTypeReferenceDirectives);
+        compilerHost.getModuleResolutionCache = ts.maybeBind(host, host.getModuleResolutionCache);
         var moduleResolutionCache = !compilerHost.resolveModuleNames ? ts.createModuleResolutionCache(currentDirectory, getCanonicalFileName) : undefined;
         var typeReferenceDirectiveResolutionCache = !compilerHost.resolveTypeReferenceDirectives ? ts.createTypeReferenceDirectiveResolutionCache(currentDirectory, getCanonicalFileName, /*options*/ undefined, moduleResolutionCache === null || moduleResolutionCache === void 0 ? void 0 : moduleResolutionCache.getPackageJsonInfoCache()) : undefined;
         if (!compilerHost.resolveModuleNames) {