typescript 4.7.0-dev.20220311 → 4.7.0-dev.20220314

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.20220311";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220314";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -1457,6 +1457,159 @@ var ts;
         return createMultiMap();
     }
     ts.createUnderscoreEscapedMultiMap = createUnderscoreEscapedMultiMap;
+    /**
+     * Creates a Set with custom equality and hash code functionality.  This is useful when you
+     * want to use something looser than object identity - e.g. "has the same span".
+     *
+     * If `equals(a, b)`, it must be the case that `getHashCode(a) === getHashCode(b)`.
+     * The converse is not required.
+     *
+     * To facilitate a perf optimization (lazy allocation of bucket arrays), `TElement` is
+     * assumed not to be an array type.
+     */
+    function createSet(getHashCode, equals) {
+        var multiMap = new ts.Map();
+        var size = 0;
+        function getElementIterator() {
+            var valueIt = multiMap.values();
+            var arrayIt;
+            return {
+                next: function () {
+                    while (true) {
+                        if (arrayIt) {
+                            var n = arrayIt.next();
+                            if (!n.done) {
+                                return { value: n.value };
+                            }
+                            arrayIt = undefined;
+                        }
+                        else {
+                            var n = valueIt.next();
+                            if (n.done) {
+                                return { value: undefined, done: true };
+                            }
+                            if (!isArray(n.value)) {
+                                return { value: n.value };
+                            }
+                            arrayIt = arrayIterator(n.value);
+                        }
+                    }
+                }
+            };
+        }
+        var set = {
+            has: function (element) {
+                var hash = getHashCode(element);
+                if (!multiMap.has(hash))
+                    return false;
+                var candidates = multiMap.get(hash);
+                if (!isArray(candidates))
+                    return equals(candidates, element);
+                for (var _i = 0, candidates_1 = candidates; _i < candidates_1.length; _i++) {
+                    var candidate = candidates_1[_i];
+                    if (equals(candidate, element)) {
+                        return true;
+                    }
+                }
+                return false;
+            },
+            add: function (element) {
+                var hash = getHashCode(element);
+                if (multiMap.has(hash)) {
+                    var values = multiMap.get(hash);
+                    if (isArray(values)) {
+                        if (!contains(values, element, equals)) {
+                            values.push(element);
+                            size++;
+                        }
+                    }
+                    else {
+                        var value = values;
+                        if (!equals(value, element)) {
+                            multiMap.set(hash, [value, element]);
+                            size++;
+                        }
+                    }
+                }
+                else {
+                    multiMap.set(hash, element);
+                    size++;
+                }
+                return this;
+            },
+            delete: function (element) {
+                var hash = getHashCode(element);
+                if (!multiMap.has(hash))
+                    return false;
+                var candidates = multiMap.get(hash);
+                if (isArray(candidates)) {
+                    for (var i = 0; i < candidates.length; i++) {
+                        if (equals(candidates[i], element)) {
+                            if (candidates.length === 1) {
+                                multiMap.delete(hash);
+                            }
+                            else if (candidates.length === 2) {
+                                multiMap.set(hash, candidates[1 - i]);
+                            }
+                            else {
+                                unorderedRemoveItemAt(candidates, i);
+                            }
+                            size--;
+                            return true;
+                        }
+                    }
+                }
+                else {
+                    var candidate = candidates;
+                    if (equals(candidate, element)) {
+                        multiMap.delete(hash);
+                        size--;
+                        return true;
+                    }
+                }
+                return false;
+            },
+            clear: function () {
+                multiMap.clear();
+                size = 0;
+            },
+            get size() {
+                return size;
+            },
+            forEach: function (action) {
+                for (var _i = 0, _a = arrayFrom(multiMap.values()); _i < _a.length; _i++) {
+                    var elements = _a[_i];
+                    if (isArray(elements)) {
+                        for (var _b = 0, elements_1 = elements; _b < elements_1.length; _b++) {
+                            var element = elements_1[_b];
+                            action(element, element);
+                        }
+                    }
+                    else {
+                        var element = elements;
+                        action(element, element);
+                    }
+                }
+            },
+            keys: function () {
+                return getElementIterator();
+            },
+            values: function () {
+                return getElementIterator();
+            },
+            entries: function () {
+                var it = getElementIterator();
+                return {
+                    next: function () {
+                        var n = it.next();
+                        return n.done ? n : { value: [n.value, n.value] };
+                    }
+                };
+            },
+        };
+        return set;
+    }
+    ts.createSet = createSet;
     /**
      * Tests whether a value is an array.
      */
@@ -1850,8 +2003,8 @@ var ts;
         var maximumLengthDifference = Math.min(2, Math.floor(name.length * 0.34));
         var bestDistance = Math.floor(name.length * 0.4) + 1; // If the best result is worse than this, don't bother.
         var bestCandidate;
-        for (var _i = 0, candidates_1 = candidates; _i < candidates_1.length; _i++) {
-            var candidate = candidates_1[_i];
+        for (var _i = 0, candidates_2 = candidates; _i < candidates_2.length; _i++) {
+            var candidate = candidates_2[_i];
             var candidateName = getName(candidate);
             if (candidateName !== undefined && Math.abs(candidateName.length - name.length) <= maximumLengthDifference) {
                 if (candidateName === name) {
@@ -2088,13 +2241,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;
@@ -5114,6 +5269,21 @@ var ts;
         ModuleResolutionKind[ModuleResolutionKind["Node12"] = 3] = "Node12";
         ModuleResolutionKind[ModuleResolutionKind["NodeNext"] = 99] = "NodeNext";
     })(ModuleResolutionKind = ts.ModuleResolutionKind || (ts.ModuleResolutionKind = {}));
+    var ModuleDetectionKind;
+    (function (ModuleDetectionKind) {
+        /**
+         * Files with imports, exports and/or import.meta are considered modules
+         */
+        ModuleDetectionKind[ModuleDetectionKind["Legacy"] = 1] = "Legacy";
+        /**
+         * Legacy, but also files with jsx under react-jsx or react-jsxdev and esm mode files under moduleResolution: node12+
+         */
+        ModuleDetectionKind[ModuleDetectionKind["Auto"] = 2] = "Auto";
+        /**
+         * Consider all non-declaration files modules, regardless of present syntax
+         */
+        ModuleDetectionKind[ModuleDetectionKind["Force"] = 3] = "Force";
+    })(ModuleDetectionKind = ts.ModuleDetectionKind || (ts.ModuleDetectionKind = {}));
     var WatchFileKind;
     (function (WatchFileKind) {
         WatchFileKind[WatchFileKind["FixedPollingInterval"] = 0] = "FixedPollingInterval";
@@ -8211,6 +8381,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.", /*reportsUnnecessary*/ undefined, /*elidedInCompatabilityPyramid*/ true),
@@ -19720,6 +19892,61 @@ var ts;
         return scriptKind === 4 /* TSX */ || scriptKind === 2 /* JSX */ || scriptKind === 1 /* JS */ || scriptKind === 6 /* JSON */ ? 1 /* JSX */ : 0 /* Standard */;
     }
     ts.getLanguageVariant = getLanguageVariant;
+    /**
+     * This is a somewhat unavoidable full tree walk to locate a JSX tag - `import.meta` requires the same,
+     * but we avoid that walk (or parts of it) if at all possible using the `PossiblyContainsImportMeta` node flag.
+     * Unfortunately, there's no `NodeFlag` space to do the same for JSX.
+     */
+    function walkTreeForJSXTags(node) {
+        if (!(node.transformFlags & 2 /* ContainsJsx */))
+            return undefined;
+        return ts.isJsxOpeningLikeElement(node) || ts.isJsxFragment(node) ? node : ts.forEachChild(node, walkTreeForJSXTags);
+    }
+    function isFileModuleFromUsingJSXTag(file) {
+        // Excludes declaration files - they still require an explicit `export {}` or the like
+        // for back compat purposes. (not that declaration files should contain JSX tags!)
+        return !file.isDeclarationFile ? walkTreeForJSXTags(file) : undefined;
+    }
+    /**
+     * Note that this requires file.impliedNodeFormat be set already; meaning it must be set very early on
+     * in SourceFile construction.
+     */
+    function isFileForcedToBeModuleByFormat(file) {
+        // Excludes declaration files - they still require an explicit `export {}` or the like
+        // for back compat purposes.
+        return file.impliedNodeFormat === ts.ModuleKind.ESNext && !file.isDeclarationFile ? true : undefined;
+    }
+    function getSetExternalModuleIndicator(options) {
+        // TODO: Should this callback be cached?
+        switch (getEmitModuleDetectionKind(options)) {
+            case ts.ModuleDetectionKind.Force:
+                // All non-declaration files are modules, declaration files still do the usual isFileProbablyExternalModule
+                return function (file) {
+                    file.externalModuleIndicator = !file.isDeclarationFile || ts.isFileProbablyExternalModule(file);
+                };
+            case ts.ModuleDetectionKind.Legacy:
+                // Files are modules if they have imports, exports, or import.meta
+                return function (file) {
+                    file.externalModuleIndicator = ts.isFileProbablyExternalModule(file);
+                };
+            case ts.ModuleDetectionKind.Auto:
+                // If module is nodenext or node12, all esm format files are modules
+                // If jsx is react-jsx or react-jsxdev then jsx tags force module-ness
+                // otherwise, the presence of import or export statments (or import.meta) implies module-ness
+                var checks = [ts.isFileProbablyExternalModule];
+                if (options.jsx === 4 /* ReactJSX */ || options.jsx === 5 /* ReactJSXDev */) {
+                    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 /* ES2020 */) ||
@@ -19754,6 +19981,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:
@@ -29924,6 +30155,36 @@ var ts;
             text.charCodeAt(start + 3) !== 47 /* slash */;
     }
     ts.isJSDocLikeText = isJSDocLikeText;
+    /*@internal*/
+    function isFileProbablyExternalModule(sourceFile) {
+        // Try to use the first top-level import/export when available, then
+        // fall back to looking for an 'import.meta' somewhere in the tree if necessary.
+        return ts.forEach(sourceFile.statements, isAnExternalModuleIndicatorNode) ||
+            getImportMetaIfNecessary(sourceFile);
+    }
+    ts.isFileProbablyExternalModule = isFileProbablyExternalModule;
+    function isAnExternalModuleIndicatorNode(node) {
+        return hasModifierOfKind(node, 93 /* ExportKeyword */)
+            || 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 /* PossiblyContainsImportMeta */ ?
+            walkTreeForImportMeta(sourceFile) :
+            undefined;
+    }
+    function walkTreeForImportMeta(node) {
+        return isImportMeta(node) ? node : forEachChild(node, walkTreeForImportMeta);
+    }
+    /** Do not use hasModifier inside the parser; it relies on parent pointers. Use this instead. */
+    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 /* ImportKeyword */ && node.name.escapedText === "meta";
+    }
     /**
      * Invokes a callback for each child of the given node. The 'cbNode' callback is invoked for all child nodes
      * stored in properties. If a 'cbNodes' callback is specified, it is invoked for embedded arrays; otherwise,
@@ -30505,17 +30766,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" /* Parse */, "createSourceFile", { path: fileName }, /*separateBeginAndEnd*/ 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 /* JSON */) {
-            result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, 6 /* JSON */);
+            result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, 6 /* JSON */, ts.noop);
         }
         else {
-            result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, scriptKind);
+            var setIndicator = format === undefined ? overrideSetExternalModuleIndicator : function (file) {
+                file.impliedNodeFormat = format;
+                return (overrideSetExternalModuleIndicator || setExternalModuleIndicator)(file);
+            };
+            result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, scriptKind, setIndicator);
         }
         ts.perfLogger.logStopParseSourceFile();
         ts.performance.mark("afterParse");
@@ -30701,7 +30970,7 @@ var ts;
         // Note: any errors at the end of the file that do not precede a regular node, should get
         // attached to the EOF token.
         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);
@@ -30717,7 +30986,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;
         }
@@ -30801,7 +31070,7 @@ var ts;
                 endOfFileToken = parseExpectedToken(1 /* EndOfFileToken */, ts.Diagnostics.Unexpected_token);
             }
             // Set source file so that errors will be reported with this file name
-            var sourceFile = createSourceFile(fileName, 2 /* ES2015 */, 6 /* JSON */, /*isDeclaration*/ false, statements, endOfFileToken, sourceFlags);
+            var sourceFile = createSourceFile(fileName, 2 /* ES2015 */, 6 /* JSON */, /*isDeclaration*/ false, statements, endOfFileToken, sourceFlags, ts.noop);
             if (setParentNodes) {
                 fixupParentReferences(sourceFile);
             }
@@ -30875,7 +31144,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 /* Ambient */;
@@ -30886,7 +31155,7 @@ var ts;
             var statements = parseList(0 /* SourceElements */, parseStatement);
             ts.Debug.assert(token() === 1 /* EndOfFileToken */);
             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);
             // A member of ReadonlyArray<T> isn't assignable to a member of T[] (and prevents a direct cast) - but this is where we set up those members so they can be readonly in the future
             processCommentPragmas(sourceFile, sourceText);
             processPragmasIntoFields(sourceFile, reportPragmaDiagnostic);
@@ -31023,25 +31292,30 @@ var ts;
             ts.setParentRecursive(rootNode, /*incremental*/ true);
         }
         Parser.fixupParentReferences = fixupParentReferences;
-        function createSourceFile(fileName, languageVersion, scriptKind, isDeclarationFile, statements, endOfFileToken, flags) {
+        function createSourceFile(fileName, languageVersion, scriptKind, isDeclarationFile, statements, endOfFileToken, flags, setExternalModuleIndicator) {
             // code from createNode is inlined here so createNode won't have to deal with special case of creating source files
             // this is quite rare comparing to other nodes and createNode should be as fast as possible
             var sourceFile = factory.createSourceFile(statements, endOfFileToken, flags);
             ts.setTextRangePosWidth(sourceFile, 0, sourceText.length);
-            setExternalModuleIndicator(sourceFile);
+            setFields(sourceFile);
             // If we parsed this as an external module, it may contain top-level await
             if (!isDeclarationFile && isExternalModule(sourceFile) && sourceFile.transformFlags & 16777216 /* ContainsPossibleTopLevelAwait */) {
                 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) {
@@ -36524,35 +36798,6 @@ var ts;
             var node = factory.createExportAssignment(decorators, modifiers, isExportEquals, expression);
             return withJSDoc(finishNode(node, pos), hasJSDoc);
         }
-        function setExternalModuleIndicator(sourceFile) {
-            // Try to use the first top-level import/export when available, then
-            // fall back to looking for an 'import.meta' somewhere in the tree if necessary.
-            sourceFile.externalModuleIndicator =
-                ts.forEach(sourceFile.statements, isAnExternalModuleIndicatorNode) ||
-                    getImportMetaIfNecessary(sourceFile);
-        }
-        function isAnExternalModuleIndicatorNode(node) {
-            return hasModifierOfKind(node, 93 /* ExportKeyword */)
-                || 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 /* PossiblyContainsImportMeta */ ?
-                walkTreeForExternalModuleIndicators(sourceFile) :
-                undefined;
-        }
-        function walkTreeForExternalModuleIndicators(node) {
-            return isImportMeta(node) ? node : forEachChild(node, walkTreeForExternalModuleIndicators);
-        }
-        /** Do not use hasModifier inside the parser; it relies on parent pointers. Use this instead. */
-        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 /* ImportKeyword */ && node.name.escapedText === "meta";
-        }
         var ParsingContext;
         (function (ParsingContext) {
             ParsingContext[ParsingContext["SourceElements"] = 0] = "SourceElements";
@@ -36595,7 +36840,7 @@ var ts;
                 scanner.setText(content, start, length);
                 currentToken = scanner.scan();
                 var jsDocTypeExpression = parseJSDocTypeExpression();
-                var sourceFile = createSourceFile("file.js", 99 /* Latest */, 1 /* JS */, /*isDeclarationFile*/ false, [], factory.createToken(1 /* EndOfFileToken */), 0 /* None */);
+                var sourceFile = createSourceFile("file.js", 99 /* Latest */, 1 /* JS */, /*isDeclarationFile*/ false, [], factory.createToken(1 /* EndOfFileToken */), 0 /* None */, ts.noop);
                 var diagnostics = ts.attachFileToDiagnostics(parseDiagnostics, sourceFile);
                 if (jsDocDiagnostics) {
                     sourceFile.jsDocDiagnostics = ts.attachFileToDiagnostics(jsDocDiagnostics, sourceFile);
@@ -37556,7 +37801,7 @@ var ts;
             if (sourceFile.statements.length === 0) {
                 // If we don't have any statements in the current source file, then there's no real
                 // way to incrementally parse.  So just do a full parse instead.
-                return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, /*syntaxCursor*/ undefined, /*setParentNodes*/ true, sourceFile.scriptKind);
+                return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, /*syntaxCursor*/ undefined, /*setParentNodes*/ true, sourceFile.scriptKind, sourceFile.setExternalModuleIndicator);
             }
             // Make sure we're not trying to incrementally update a source file more than once.  Once
             // we do an update the original source file is considered unusable from that point onwards.
@@ -37613,7 +37858,7 @@ var ts;
             // inconsistent tree.  Setting the parents on the new tree should be very fast.  We
             // will immediately bail out of walking any subtrees when we can see that their parents
             // are already correct.
-            var result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, /*setParentNodes*/ true, sourceFile.scriptKind);
+            var result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, /*setParentNodes*/ 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;
@@ -39529,6 +39774,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,
+        }
     ];
     /* @internal */
     ts.optionDeclarations = __spreadArray(__spreadArray([], ts.commonOptionsWithBuild, true), commandOptionsWithoutBuild, true);
@@ -63482,7 +63739,8 @@ var ts;
                     return true;
                 }
             }
-            else {
+            else if (!((source.flags | target.flags) & (3145728 /* UnionOrIntersection */ | 8388608 /* IndexedAccess */ | 16777216 /* Conditional */ | 33554432 /* Substitution */))) {
+                // We have excluded types that may simplify to other forms, so types must have identical flags
                 if (source.flags !== target.flags)
                     return false;
                 if (source.flags & 67358815 /* Singleton */)
@@ -69558,7 +69816,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)) {
                     // When the reference is a binding pattern or function or arrow expression, we are narrowing a pesudo-reference in
                     // getNarrowedTypeOfSymbol. An identifier for a destructuring variable declared in the same binding pattern or
                     // parameter declared in the same parameter list is a candidate.
@@ -76530,6 +76788,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");
+            }
         }
         // When contextual typing assigns a type to a parameter that contains a binding pattern, we also need to push
         // the destructured type into the contained binding elements.
@@ -87422,8 +87683,8 @@ var ts;
             }
             else {
                 var elements = name.elements;
-                for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
-                    var element = elements_1[_i];
+                for (var _i = 0, elements_2 = elements; _i < elements_2.length; _i++) {
+                    var element = elements_2[_i];
                     if (!ts.isOmittedExpression(element)) {
                         return checkESModuleMarker(element.name);
                     }
@@ -87439,8 +87700,8 @@ var ts;
             }
             else {
                 var elements = name.elements;
-                for (var _i = 0, elements_2 = elements; _i < elements_2.length; _i++) {
-                    var element = elements_2[_i];
+                for (var _i = 0, elements_3 = elements; _i < elements_3.length; _i++) {
+                    var element = elements_3[_i];
                     if (!ts.isOmittedExpression(element)) {
                         checkGrammarNameInLetOrConstDeclarations(element.name);
                     }
@@ -89694,8 +89955,8 @@ var ts;
     }
     function bindingOrAssignmentPatternAssignsToName(pattern, escapedName) {
         var elements = ts.getElementsOfBindingOrAssignmentPattern(pattern);
-        for (var _i = 0, elements_3 = elements; _i < elements_3.length; _i++) {
-            var element = elements_3[_i];
+        for (var _i = 0, elements_4 = elements; _i < elements_4.length; _i++) {
+            var element = elements_4[_i];
             if (bindingOrAssignmentElementAssignsToName(element, escapedName)) {
                 return true;
             }
@@ -95313,8 +95574,8 @@ var ts;
         function chunkObjectLiteralElements(elements) {
             var chunkObject;
             var objects = [];
-            for (var _i = 0, elements_4 = elements; _i < elements_4.length; _i++) {
-                var e = elements_4[_i];
+            for (var _i = 0, elements_5 = elements; _i < elements_5.length; _i++) {
+                var e = elements_5[_i];
                 if (e.kind === 297 /* SpreadAssignment */) {
                     if (chunkObject) {
                         objects.push(factory.createObjectLiteralExpression(chunkObject));
@@ -114335,7 +114596,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");
@@ -114349,7 +114610,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)) {
@@ -115755,8 +116016,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), /*onError*/ undefined, shouldCreateNewSourceFile)
-                    : host.getSourceFile(oldSourceFile.fileName, ts.getEmitScriptTarget(options), /*onError*/ undefined, shouldCreateNewSourceFile); // TODO: GH#18217
+                    ? 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
                 if (!newSourceFile) {
                     return 0 /* Not */;
                 }
@@ -115787,7 +116048,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) {
                     // If there are 2 different source files for the same package name and at least one of them changes,
@@ -116706,6 +116966,17 @@ var ts;
             ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
             return result;
         }
+        function getCreateSourceFileOptions(fileName, moduleResolutionCache, host, options) {
+            // 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)
+            };
+        }
         function findSourceFileWorker(fileName, isDefaultLib, ignoreNoDefaultLib, reason, packageId) {
             var path = toPath(fileName);
             if (useSourceOfProjectReferenceRedirect) {
@@ -116793,7 +117064,7 @@ var ts;
                 }
             }
             // We haven't looked for this file, do so now and cache result
-            var file = host.getSourceFile(fileName, ts.getEmitScriptTarget(options), function (hostErrorMessage) { return addFilePreprocessingFileExplainingDiagnostic(/*file*/ 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(/*file*/ 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);
@@ -116821,10 +117092,6 @@ var ts;
                 file.path = path;
                 file.resolvedPath = toPath(fileName);
                 file.originalFileName = originalFileName;
-                // 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.
-                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);
@@ -117326,7 +117593,7 @@ var ts;
             }
             else if (firstNonAmbientExternalModuleSourceFile && languageVersion < 2 /* ES2015 */ && options.module === ts.ModuleKind.None) {
                 // We cannot use createDiagnosticFromNode because nodes do not have parents yet
-                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));
             }
             // Cannot specify module gen that isn't amd or system with --out
@@ -117335,7 +117602,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"));
                 }
             }
@@ -121597,7 +121864,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");
@@ -121611,7 +121878,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); },
@@ -122079,7 +122346,7 @@ 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);
             // No source file on the host
             if (isFileMissingOnHost(hostSourceFile)) {
@@ -122087,7 +122354,7 @@ var ts;
             }
             // Create new source file if requested or the versions dont match
             if (hostSourceFile === undefined || shouldCreateNewSourceFile || isFilePresenceUnknownOnHost(hostSourceFile)) {
-                var sourceFile = getNewSourceFile(fileName, languageVersion, onError);
+                var sourceFile = getNewSourceFile(fileName, languageVersionOrOptions, onError);
                 if (hostSourceFile) {
                     if (sourceFile) {
                         // Set the source file and create file watcher now that file was present on the disk