@typescript-deploys/pr-build 4.7.0-pr-48168-8 → 4.7.0-pr-47657-5

package/lib/lib.es2022.object.d.ts

@@ -18,7 +18,7 @@ and limitations under the License.
 /// <reference no-default-lib="true"/>
 
 
-interface Object {
+interface ObjectConstructor {
     /**
      * Determines whether an object has a property with the specified name.
      * @param o An object.

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.7";
-    ts.version = ts.versionMajorMinor + ".0-insiders.20220309";
+    ts.version = ts.versionMajorMinor + ".0-insiders.20220311";
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -1733,13 +1733,15 @@ var ts;
             for (var _i = 0; _i < arguments.length; _i++) {
                 args[_i] = arguments[_i];
             }
+            var lastResult;
             for (var _a = 0, fs_1 = fs; _a < fs_1.length; _a++) {
                 var f = fs_1[_a];
-                if (f.apply(void 0, args)) {
-                    return true;
+                lastResult = f.apply(void 0, args);
+                if (lastResult) {
+                    return lastResult;
                 }
             }
-            return false;
+            return lastResult;
         };
     }
     ts.or = or;
@@ -3263,6 +3265,12 @@ var ts;
         ModuleResolutionKind[ModuleResolutionKind["Node12"] = 3] = "Node12";
         ModuleResolutionKind[ModuleResolutionKind["NodeNext"] = 99] = "NodeNext";
     })(ModuleResolutionKind = ts.ModuleResolutionKind || (ts.ModuleResolutionKind = {}));
+    var ModuleDetectionKind;
+    (function (ModuleDetectionKind) {
+        ModuleDetectionKind[ModuleDetectionKind["Legacy"] = 1] = "Legacy";
+        ModuleDetectionKind[ModuleDetectionKind["Auto"] = 2] = "Auto";
+        ModuleDetectionKind[ModuleDetectionKind["Force"] = 3] = "Force";
+    })(ModuleDetectionKind = ts.ModuleDetectionKind || (ts.ModuleDetectionKind = {}));
     var WatchFileKind;
     (function (WatchFileKind) {
         WatchFileKind[WatchFileKind["FixedPollingInterval"] = 0] = "FixedPollingInterval";
@@ -5428,6 +5436,8 @@ var ts;
         catch_or_finally_expected: diag(1472, ts.DiagnosticCategory.Error, "catch_or_finally_expected_1472", "'catch' or 'finally' expected."),
         An_import_declaration_can_only_be_used_at_the_top_level_of_a_module: diag(1473, ts.DiagnosticCategory.Error, "An_import_declaration_can_only_be_used_at_the_top_level_of_a_module_1473", "An import declaration can only be used at the top level of a module."),
         An_export_declaration_can_only_be_used_at_the_top_level_of_a_module: diag(1474, ts.DiagnosticCategory.Error, "An_export_declaration_can_only_be_used_at_the_top_level_of_a_module_1474", "An export declaration can only be used at the top level of a module."),
+        Control_what_method_is_used_to_detect_module_format_JS_files: diag(1475, ts.DiagnosticCategory.Message, "Control_what_method_is_used_to_detect_module_format_JS_files_1475", "Control what method is used to detect module-format JS files."),
+        auto_Colon_Treat_files_with_imports_exports_import_meta_jsx_with_jsx_Colon_react_jsx_or_esm_format_with_module_Colon_node12_as_modules: diag(1476, ts.DiagnosticCategory.Message, "auto_Colon_Treat_files_with_imports_exports_import_meta_jsx_with_jsx_Colon_react_jsx_or_esm_format_w_1476", "\"auto\": Treat files with imports, exports, import.meta, jsx (with jsx: react-jsx), or esm format (with module: node12+) as modules."),
         The_types_of_0_are_incompatible_between_these_types: diag(2200, ts.DiagnosticCategory.Error, "The_types_of_0_are_incompatible_between_these_types_2200", "The types of '{0}' are incompatible between these types."),
         The_types_returned_by_0_are_incompatible_between_these_types: diag(2201, ts.DiagnosticCategory.Error, "The_types_returned_by_0_are_incompatible_between_these_types_2201", "The types returned by '{0}' are incompatible between these types."),
         Call_signature_return_types_0_and_1_are_incompatible: diag(2202, ts.DiagnosticCategory.Error, "Call_signature_return_types_0_and_1_are_incompatible_2202", "Call signature return types '{0}' and '{1}' are incompatible.", undefined, true),
@@ -15604,6 +15614,42 @@ var ts;
         return scriptKind === 4 || scriptKind === 2 || scriptKind === 1 || scriptKind === 6 ? 1 : 0;
     }
     ts.getLanguageVariant = getLanguageVariant;
+    function walkTreeForJSXTags(node) {
+        if (!(node.transformFlags & 2))
+            return undefined;
+        return ts.isJsxOpeningLikeElement(node) || ts.isJsxFragment(node) ? node : ts.forEachChild(node, walkTreeForJSXTags);
+    }
+    function isFileModuleFromUsingJSXTag(file) {
+        return !file.isDeclarationFile ? walkTreeForJSXTags(file) : undefined;
+    }
+    function isFileForcedToBeModuleByFormat(file) {
+        return file.impliedNodeFormat === ts.ModuleKind.ESNext && !file.isDeclarationFile ? true : undefined;
+    }
+    function getSetExternalModuleIndicator(options) {
+        switch (getEmitModuleDetectionKind(options)) {
+            case ts.ModuleDetectionKind.Force:
+                return function (file) {
+                    file.externalModuleIndicator = !file.isDeclarationFile || ts.isFileProbablyExternalModule(file);
+                };
+            case ts.ModuleDetectionKind.Legacy:
+                return function (file) {
+                    file.externalModuleIndicator = ts.isFileProbablyExternalModule(file);
+                };
+            case ts.ModuleDetectionKind.Auto:
+                var checks = [ts.isFileProbablyExternalModule];
+                if (options.jsx === 4 || options.jsx === 5) {
+                    checks.push(isFileModuleFromUsingJSXTag);
+                }
+                var moduleKind = getEmitModuleKind(options);
+                if (moduleKind === ts.ModuleKind.Node12 || moduleKind === ts.ModuleKind.NodeNext) {
+                    checks.push(isFileForcedToBeModuleByFormat);
+                }
+                var combined_1 = ts.or.apply(void 0, checks);
+                var callback = function (file) { return void (file.externalModuleIndicator = combined_1(file)); };
+                return callback;
+        }
+    }
+    ts.getSetExternalModuleIndicator = getSetExternalModuleIndicator;
     function getEmitScriptTarget(compilerOptions) {
         return compilerOptions.target ||
             (compilerOptions.module === ts.ModuleKind.Node12 && 7) ||
@@ -15638,6 +15684,10 @@ var ts;
         return moduleResolution;
     }
     ts.getEmitModuleResolutionKind = getEmitModuleResolutionKind;
+    function getEmitModuleDetectionKind(options) {
+        return options.moduleDetection || ts.ModuleDetectionKind.Auto;
+    }
+    ts.getEmitModuleDetectionKind = getEmitModuleDetectionKind;
     function hasJsonModuleEmitEnabled(options) {
         switch (getEmitModuleKind(options)) {
             case ts.ModuleKind.CommonJS:
@@ -24073,6 +24123,32 @@ var ts;
             text.charCodeAt(start + 3) !== 47;
     }
     ts.isJSDocLikeText = isJSDocLikeText;
+    function isFileProbablyExternalModule(sourceFile) {
+        return ts.forEach(sourceFile.statements, isAnExternalModuleIndicatorNode) ||
+            getImportMetaIfNecessary(sourceFile);
+    }
+    ts.isFileProbablyExternalModule = isFileProbablyExternalModule;
+    function isAnExternalModuleIndicatorNode(node) {
+        return hasModifierOfKind(node, 93)
+            || ts.isImportEqualsDeclaration(node) && ts.isExternalModuleReference(node.moduleReference)
+            || ts.isImportDeclaration(node)
+            || ts.isExportAssignment(node)
+            || ts.isExportDeclaration(node) ? node : undefined;
+    }
+    function getImportMetaIfNecessary(sourceFile) {
+        return sourceFile.flags & 2097152 ?
+            walkTreeForImportMeta(sourceFile) :
+            undefined;
+    }
+    function walkTreeForImportMeta(node) {
+        return isImportMeta(node) ? node : forEachChild(node, walkTreeForImportMeta);
+    }
+    function hasModifierOfKind(node, kind) {
+        return ts.some(node.modifiers, function (m) { return m.kind === kind; });
+    }
+    function isImportMeta(node) {
+        return ts.isMetaProperty(node) && node.keywordToken === 100 && node.name.escapedText === "meta";
+    }
     function forEachChild(node, cbNode, cbNodes) {
         if (!node || node.kind <= 159) {
             return;
@@ -24626,17 +24702,25 @@ var ts;
             children.unshift(n);
         }
     }
-    function createSourceFile(fileName, sourceText, languageVersion, setParentNodes, scriptKind) {
+    function setExternalModuleIndicator(sourceFile) {
+        sourceFile.externalModuleIndicator = isFileProbablyExternalModule(sourceFile);
+    }
+    function createSourceFile(fileName, sourceText, languageVersionOrOptions, setParentNodes, scriptKind) {
         if (setParentNodes === void 0) { setParentNodes = false; }
         ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("parse", "createSourceFile", { path: fileName }, true);
         ts.performance.mark("beforeParse");
         var result;
         ts.perfLogger.logStartParseSourceFile(fileName);
+        var _a = typeof languageVersionOrOptions === "object" ? languageVersionOrOptions : { languageVersion: languageVersionOrOptions }, languageVersion = _a.languageVersion, overrideSetExternalModuleIndicator = _a.setExternalModuleIndicator, format = _a.impliedNodeFormat;
         if (languageVersion === 100) {
-            result = Parser.parseSourceFile(fileName, sourceText, languageVersion, undefined, setParentNodes, 6);
+            result = Parser.parseSourceFile(fileName, sourceText, languageVersion, undefined, setParentNodes, 6, ts.noop);
         }
         else {
-            result = Parser.parseSourceFile(fileName, sourceText, languageVersion, undefined, setParentNodes, scriptKind);
+            var setIndicator = format === undefined ? overrideSetExternalModuleIndicator : function (file) {
+                file.impliedNodeFormat = format;
+                return (overrideSetExternalModuleIndicator || setExternalModuleIndicator)(file);
+            };
+            result = Parser.parseSourceFile(fileName, sourceText, languageVersion, undefined, setParentNodes, scriptKind, setIndicator);
         }
         ts.perfLogger.logStopParseSourceFile();
         ts.performance.mark("afterParse");
@@ -24716,7 +24800,7 @@ var ts;
         var contextFlags;
         var topLevel = true;
         var parseErrorBeforeNextFinishedNode = false;
-        function parseSourceFile(fileName, sourceText, languageVersion, syntaxCursor, setParentNodes, scriptKind) {
+        function parseSourceFile(fileName, sourceText, languageVersion, syntaxCursor, setParentNodes, scriptKind, setExternalModuleIndicatorOverride) {
             var _a;
             if (setParentNodes === void 0) { setParentNodes = false; }
             scriptKind = ts.ensureScriptKind(fileName, scriptKind);
@@ -24732,7 +24816,7 @@ var ts;
                 return result_3;
             }
             initializeState(fileName, sourceText, languageVersion, syntaxCursor, scriptKind);
-            var result = parseSourceFileWorker(languageVersion, setParentNodes, scriptKind);
+            var result = parseSourceFileWorker(languageVersion, setParentNodes, scriptKind, setExternalModuleIndicatorOverride || setExternalModuleIndicator);
             clearState();
             return result;
         }
@@ -24808,7 +24892,7 @@ var ts;
                 statements = createNodeArray([statement], pos);
                 endOfFileToken = parseExpectedToken(1, ts.Diagnostics.Unexpected_token);
             }
-            var sourceFile = createSourceFile(fileName, 2, 6, false, statements, endOfFileToken, sourceFlags);
+            var sourceFile = createSourceFile(fileName, 2, 6, false, statements, endOfFileToken, sourceFlags, ts.noop);
             if (setParentNodes) {
                 fixupParentReferences(sourceFile);
             }
@@ -24879,7 +24963,7 @@ var ts;
             notParenthesizedArrow = undefined;
             topLevel = true;
         }
-        function parseSourceFileWorker(languageVersion, setParentNodes, scriptKind) {
+        function parseSourceFileWorker(languageVersion, setParentNodes, scriptKind, setExternalModuleIndicator) {
             var isDeclarationFile = isDeclarationFileName(fileName);
             if (isDeclarationFile) {
                 contextFlags |= 8388608;
@@ -24889,7 +24973,7 @@ var ts;
             var statements = parseList(0, parseStatement);
             ts.Debug.assert(token() === 1);
             var endOfFileToken = addJSDocComment(parseTokenNode());
-            var sourceFile = createSourceFile(fileName, languageVersion, scriptKind, isDeclarationFile, statements, endOfFileToken, sourceFlags);
+            var sourceFile = createSourceFile(fileName, languageVersion, scriptKind, isDeclarationFile, statements, endOfFileToken, sourceFlags, setExternalModuleIndicator);
             processCommentPragmas(sourceFile, sourceText);
             processPragmasIntoFields(sourceFile, reportPragmaDiagnostic);
             sourceFile.commentDirectives = scanner.getCommentDirectives();
@@ -25013,22 +25097,27 @@ var ts;
             ts.setParentRecursive(rootNode, true);
         }
         Parser.fixupParentReferences = fixupParentReferences;
-        function createSourceFile(fileName, languageVersion, scriptKind, isDeclarationFile, statements, endOfFileToken, flags) {
+        function createSourceFile(fileName, languageVersion, scriptKind, isDeclarationFile, statements, endOfFileToken, flags, setExternalModuleIndicator) {
             var sourceFile = factory.createSourceFile(statements, endOfFileToken, flags);
             ts.setTextRangePosWidth(sourceFile, 0, sourceText.length);
-            setExternalModuleIndicator(sourceFile);
+            setFields(sourceFile);
             if (!isDeclarationFile && isExternalModule(sourceFile) && sourceFile.transformFlags & 16777216) {
                 sourceFile = reparseTopLevelAwait(sourceFile);
+                setFields(sourceFile);
             }
-            sourceFile.text = sourceText;
-            sourceFile.bindDiagnostics = [];
-            sourceFile.bindSuggestionDiagnostics = undefined;
-            sourceFile.languageVersion = languageVersion;
-            sourceFile.fileName = fileName;
-            sourceFile.languageVariant = ts.getLanguageVariant(scriptKind);
-            sourceFile.isDeclarationFile = isDeclarationFile;
-            sourceFile.scriptKind = scriptKind;
             return sourceFile;
+            function setFields(sourceFile) {
+                sourceFile.text = sourceText;
+                sourceFile.bindDiagnostics = [];
+                sourceFile.bindSuggestionDiagnostics = undefined;
+                sourceFile.languageVersion = languageVersion;
+                sourceFile.fileName = fileName;
+                sourceFile.languageVariant = ts.getLanguageVariant(scriptKind);
+                sourceFile.isDeclarationFile = isDeclarationFile;
+                sourceFile.scriptKind = scriptKind;
+                setExternalModuleIndicator(sourceFile);
+                sourceFile.setExternalModuleIndicator = setExternalModuleIndicator;
+            }
         }
         function setContextFlag(val, flag) {
             if (val) {
@@ -29473,32 +29562,6 @@ var ts;
             var node = factory.createExportAssignment(decorators, modifiers, isExportEquals, expression);
             return withJSDoc(finishNode(node, pos), hasJSDoc);
         }
-        function setExternalModuleIndicator(sourceFile) {
-            sourceFile.externalModuleIndicator =
-                ts.forEach(sourceFile.statements, isAnExternalModuleIndicatorNode) ||
-                    getImportMetaIfNecessary(sourceFile);
-        }
-        function isAnExternalModuleIndicatorNode(node) {
-            return hasModifierOfKind(node, 93)
-                || ts.isImportEqualsDeclaration(node) && ts.isExternalModuleReference(node.moduleReference)
-                || ts.isImportDeclaration(node)
-                || ts.isExportAssignment(node)
-                || ts.isExportDeclaration(node) ? node : undefined;
-        }
-        function getImportMetaIfNecessary(sourceFile) {
-            return sourceFile.flags & 2097152 ?
-                walkTreeForExternalModuleIndicators(sourceFile) :
-                undefined;
-        }
-        function walkTreeForExternalModuleIndicators(node) {
-            return isImportMeta(node) ? node : forEachChild(node, walkTreeForExternalModuleIndicators);
-        }
-        function hasModifierOfKind(node, kind) {
-            return ts.some(node.modifiers, function (m) { return m.kind === kind; });
-        }
-        function isImportMeta(node) {
-            return ts.isMetaProperty(node) && node.keywordToken === 100 && node.name.escapedText === "meta";
-        }
         var JSDocParser;
         (function (JSDocParser) {
             function parseJSDocTypeExpressionForTests(content, start, length) {
@@ -29506,7 +29569,7 @@ var ts;
                 scanner.setText(content, start, length);
                 currentToken = scanner.scan();
                 var jsDocTypeExpression = parseJSDocTypeExpression();
-                var sourceFile = createSourceFile("file.js", 99, 1, false, [], factory.createToken(1), 0);
+                var sourceFile = createSourceFile("file.js", 99, 1, false, [], factory.createToken(1), 0, ts.noop);
                 var diagnostics = ts.attachFileToDiagnostics(parseDiagnostics, sourceFile);
                 if (jsDocDiagnostics) {
                     sourceFile.jsDocDiagnostics = ts.attachFileToDiagnostics(jsDocDiagnostics, sourceFile);
@@ -30402,7 +30465,7 @@ var ts;
                 return sourceFile;
             }
             if (sourceFile.statements.length === 0) {
-                return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, undefined, true, sourceFile.scriptKind);
+                return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, undefined, true, sourceFile.scriptKind, sourceFile.setExternalModuleIndicator);
             }
             var incrementalSourceFile = sourceFile;
             ts.Debug.assert(!incrementalSourceFile.hasBeenIncrementallyParsed);
@@ -30417,7 +30480,7 @@ var ts;
             ts.Debug.assert(ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)) === ts.textSpanEnd(ts.textChangeRangeNewSpan(textChangeRange)));
             var delta = ts.textChangeRangeNewSpan(changeRange).length - changeRange.span.length;
             updateTokenPositionsAndMarkElements(incrementalSourceFile, changeRange.span.start, ts.textSpanEnd(changeRange.span), ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)), delta, oldText, newText, aggressiveChecks);
-            var result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, true, sourceFile.scriptKind);
+            var result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, true, sourceFile.scriptKind, sourceFile.setExternalModuleIndicator);
             result.commentDirectives = getNewCommentDirectives(sourceFile.commentDirectives, result.commentDirectives, changeRange.span.start, ts.textSpanEnd(changeRange.span), delta, oldText, newText, aggressiveChecks);
             result.impliedNodeFormat = sourceFile.impliedNodeFormat;
             return result;
@@ -32129,6 +32192,18 @@ var ts;
             description: ts.Diagnostics.Specify_a_list_of_language_service_plugins_to_include,
             category: ts.Diagnostics.Editor_Support,
         },
+        {
+            name: "moduleDetection",
+            type: new ts.Map(ts.getEntries({
+                auto: ts.ModuleDetectionKind.Auto,
+                legacy: ts.ModuleDetectionKind.Legacy,
+                force: ts.ModuleDetectionKind.Force,
+            })),
+            affectsModuleResolution: true,
+            description: ts.Diagnostics.Control_what_method_is_used_to_detect_module_format_JS_files,
+            category: ts.Diagnostics.Language_and_Environment,
+            defaultValueDescription: ts.Diagnostics.auto_Colon_Treat_files_with_imports_exports_import_meta_jsx_with_jsx_Colon_react_jsx_or_esm_format_with_module_Colon_node12_as_modules,
+        }
     ];
     ts.optionDeclarations = __spreadArray(__spreadArray([], ts.commonOptionsWithBuild, true), commandOptionsWithoutBuild, true);
     ts.semanticDiagnosticsOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsSemanticDiagnostics; });
@@ -52874,7 +52949,7 @@ var ts;
                     return true;
                 }
             }
-            else {
+            else if (!((source.flags | target.flags) & (3145728 | 8388608 | 16777216 | 33554432))) {
                 if (source.flags !== target.flags)
                     return false;
                 if (source.flags & 67358815)
@@ -58120,7 +58195,7 @@ var ts;
                 return result;
             }
             function getCandidateDiscriminantPropertyAccess(expr) {
-                if (ts.isBindingPattern(reference) || ts.isFunctionExpressionOrArrowFunction(reference)) {
+                if (ts.isBindingPattern(reference) || ts.isFunctionExpressionOrArrowFunction(reference) || ts.isObjectLiteralMethod(reference)) {
                     if (ts.isIdentifier(expr)) {
                         var symbol = getResolvedSymbol(expr);
                         var declaration = symbol.valueDeclaration;
@@ -64044,6 +64119,9 @@ var ts;
                     assignBindingElementTypes(declaration.name, links.type);
                 }
             }
+            else if (type) {
+                ts.Debug.assertEqual(links.type, type, "Parameter symbol already has a cached type which differs from newly assigned type");
+            }
         }
         function assignBindingElementTypes(pattern, parentType) {
             for (var _i = 0, _a = pattern.elements; _i < _a.length; _i++) {
@@ -94284,7 +94362,7 @@ var ts;
         var existingDirectories = new ts.Map();
         var getCanonicalFileName = ts.createGetCanonicalFileName(system.useCaseSensitiveFileNames);
         var computeHash = ts.maybeBind(system, system.createHash) || ts.generateDjb2Hash;
-        function getSourceFile(fileName, languageVersion, onError) {
+        function getSourceFile(fileName, languageVersionOrOptions, onError) {
             var text;
             try {
                 ts.performance.mark("beforeIORead");
@@ -94298,7 +94376,7 @@ var ts;
                 }
                 text = "";
             }
-            return text !== undefined ? ts.createSourceFile(fileName, text, languageVersion, setParentNodes) : undefined;
+            return text !== undefined ? ts.createSourceFile(fileName, text, languageVersionOrOptions, setParentNodes) : undefined;
         }
         function directoryExists(directoryPath) {
             if (existingDirectories.has(directoryPath)) {
@@ -95519,8 +95597,8 @@ var ts;
             for (var _i = 0, oldSourceFiles_2 = oldSourceFiles; _i < oldSourceFiles_2.length; _i++) {
                 var oldSourceFile = oldSourceFiles_2[_i];
                 var newSourceFile = host.getSourceFileByPath
-                    ? host.getSourceFileByPath(oldSourceFile.fileName, oldSourceFile.resolvedPath, ts.getEmitScriptTarget(options), undefined, shouldCreateNewSourceFile)
-                    : host.getSourceFile(oldSourceFile.fileName, ts.getEmitScriptTarget(options), undefined, shouldCreateNewSourceFile);
+                    ? host.getSourceFileByPath(oldSourceFile.fileName, oldSourceFile.resolvedPath, getCreateSourceFileOptions(oldSourceFile.fileName, moduleResolutionCache, host, options), undefined, shouldCreateNewSourceFile)
+                    : host.getSourceFile(oldSourceFile.fileName, getCreateSourceFileOptions(oldSourceFile.fileName, moduleResolutionCache, host, options), undefined, shouldCreateNewSourceFile);
                 if (!newSourceFile) {
                     return 0;
                 }
@@ -95546,7 +95624,6 @@ var ts;
                 newSourceFile.originalFileName = oldSourceFile.originalFileName;
                 newSourceFile.resolvedPath = oldSourceFile.resolvedPath;
                 newSourceFile.fileName = oldSourceFile.fileName;
-                newSourceFile.impliedNodeFormat = oldSourceFile.impliedNodeFormat;
                 var packageName = oldProgram.sourceFileToPackageName.get(oldSourceFile.path);
                 if (packageName !== undefined) {
                     var prevKind = seenPackageNames.get(packageName);
@@ -96353,6 +96430,14 @@ var ts;
             ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
             return result;
         }
+        function getCreateSourceFileOptions(fileName, moduleResolutionCache, host, options) {
+            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)
+            };
+        }
         function findSourceFileWorker(fileName, isDefaultLib, ignoreNoDefaultLib, reason, packageId) {
             var path = toPath(fileName);
             if (useSourceOfProjectReferenceRedirect) {
@@ -96423,7 +96508,7 @@ var ts;
                     redirectedPath = toPath(redirect);
                 }
             }
-            var file = host.getSourceFile(fileName, ts.getEmitScriptTarget(options), function (hostErrorMessage) { return addFilePreprocessingFileExplainingDiagnostic(undefined, reason, ts.Diagnostics.Cannot_read_file_0_Colon_1, [fileName, hostErrorMessage]); }, shouldCreateNewSourceFile);
+            var file = host.getSourceFile(fileName, getCreateSourceFileOptions(fileName, moduleResolutionCache, host, options), function (hostErrorMessage) { return addFilePreprocessingFileExplainingDiagnostic(undefined, reason, ts.Diagnostics.Cannot_read_file_0_Colon_1, [fileName, hostErrorMessage]); }, shouldCreateNewSourceFile);
             if (packageId) {
                 var packageIdKey = ts.packageIdToString(packageId);
                 var fileFromPackageId = packageIdToSourceFile.get(packageIdKey);
@@ -96448,7 +96533,6 @@ var ts;
                 file.path = path;
                 file.resolvedPath = toPath(fileName);
                 file.originalFileName = originalFileName;
-                file.impliedNodeFormat = getImpliedNodeFormatForFile(file.resolvedPath, moduleResolutionCache === null || moduleResolutionCache === void 0 ? void 0 : moduleResolutionCache.getPackageJsonInfoCache(), host, options);
                 addFileIncludeReason(file, reason);
                 if (host.useCaseSensitiveFileNames()) {
                     var pathLowerCase = ts.toFileNameLowerCase(path);
@@ -96909,7 +96993,7 @@ var ts;
                 }
             }
             else if (firstNonAmbientExternalModuleSourceFile && languageVersion < 2 && options.module === ts.ModuleKind.None) {
-                var span = ts.getErrorSpanForNode(firstNonAmbientExternalModuleSourceFile, firstNonAmbientExternalModuleSourceFile.externalModuleIndicator);
+                var span = ts.getErrorSpanForNode(firstNonAmbientExternalModuleSourceFile, typeof firstNonAmbientExternalModuleSourceFile.externalModuleIndicator === "boolean" ? firstNonAmbientExternalModuleSourceFile : firstNonAmbientExternalModuleSourceFile.externalModuleIndicator);
                 programDiagnostics.add(ts.createFileDiagnostic(firstNonAmbientExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_use_imports_exports_or_module_augmentations_when_module_is_none));
             }
             if (outputFile && !options.emitDeclarationOnly) {
@@ -96917,7 +97001,7 @@ var ts;
                     createDiagnosticForOptionName(ts.Diagnostics.Only_amd_and_system_modules_are_supported_alongside_0, options.out ? "out" : "outFile", "module");
                 }
                 else if (options.module === undefined && firstNonAmbientExternalModuleSourceFile) {
-                    var span = ts.getErrorSpanForNode(firstNonAmbientExternalModuleSourceFile, firstNonAmbientExternalModuleSourceFile.externalModuleIndicator);
+                    var span = ts.getErrorSpanForNode(firstNonAmbientExternalModuleSourceFile, typeof firstNonAmbientExternalModuleSourceFile.externalModuleIndicator === "boolean" ? firstNonAmbientExternalModuleSourceFile : firstNonAmbientExternalModuleSourceFile.externalModuleIndicator);
                     programDiagnostics.add(ts.createFileDiagnostic(firstNonAmbientExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system, options.out ? "out" : "outFile"));
                 }
             }
@@ -100581,7 +100665,7 @@ var ts;
         var useCaseSensitiveFileNames = host.useCaseSensitiveFileNames();
         var hostGetNewLine = ts.memoize(function () { return host.getNewLine(); });
         return {
-            getSourceFile: function (fileName, languageVersion, onError) {
+            getSourceFile: function (fileName, languageVersionOrOptions, onError) {
                 var text;
                 try {
                     ts.performance.mark("beforeIORead");
@@ -100595,7 +100679,7 @@ var ts;
                     }
                     text = "";
                 }
-                return text !== undefined ? ts.createSourceFile(fileName, text, languageVersion) : undefined;
+                return text !== undefined ? ts.createSourceFile(fileName, text, languageVersionOrOptions) : undefined;
             },
             getDefaultLibLocation: ts.maybeBind(host, host.getDefaultLibLocation),
             getDefaultLibFileName: function (options) { return host.getDefaultLibFileName(options); },
@@ -101026,13 +101110,13 @@ var ts;
             }
             return directoryStructureHost.fileExists(fileName);
         }
-        function getVersionedSourceFileByPath(fileName, path, languageVersion, onError, shouldCreateNewSourceFile) {
+        function getVersionedSourceFileByPath(fileName, path, languageVersionOrOptions, onError, shouldCreateNewSourceFile) {
             var hostSourceFile = sourceFilesCache.get(path);
             if (isFileMissingOnHost(hostSourceFile)) {
                 return undefined;
             }
             if (hostSourceFile === undefined || shouldCreateNewSourceFile || isFilePresenceUnknownOnHost(hostSourceFile)) {
-                var sourceFile = getNewSourceFile(fileName, languageVersion, onError);
+                var sourceFile = getNewSourceFile(fileName, languageVersionOrOptions, onError);
                 if (hostSourceFile) {
                     if (sourceFile) {
                         hostSourceFile.sourceFile = sourceFile;