typescript 4.5.0-dev.20211014 → 4.5.0-dev.20211018

package/lib/tsserverlibrary.js

@@ -294,7 +294,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.20211014";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211018";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -323,21 +323,24 @@ var ts;
             return typeof Set !== "undefined" && "entries" in Set.prototype && new Set([0]).size === 1 ? Set : undefined;
         }
         NativeCollections.tryGetNativeSet = tryGetNativeSet;
-    })(NativeCollections = ts.NativeCollections || (ts.NativeCollections = {}));
-})(ts || (ts = {}));
-/* @internal */
-var ts;
-(function (ts) {
+    })(NativeCollections || (NativeCollections = {}));
+    /* @internal */
+    ts.Map = getCollectionImplementation("Map", "tryGetNativeMap", "createMapShim");
+    /* @internal */
+    ts.Set = getCollectionImplementation("Set", "tryGetNativeSet", "createSetShim");
+    /* @internal */
     function getCollectionImplementation(name, nativeFactory, shimFactory) {
         var _a;
         // NOTE: ts.ShimCollections will be defined for typescriptServices.js but not for tsc.js, so we must test for it.
-        var constructor = (_a = ts.NativeCollections[nativeFactory]()) !== null && _a !== void 0 ? _a : ts.ShimCollections === null || ts.ShimCollections === void 0 ? void 0 : ts.ShimCollections[shimFactory](getIterator);
+        var constructor = (_a = NativeCollections[nativeFactory]()) !== null && _a !== void 0 ? _a : ts.ShimCollections === null || ts.ShimCollections === void 0 ? void 0 : ts.ShimCollections[shimFactory](ts.getIterator);
         if (constructor)
             return constructor;
         throw new Error("TypeScript requires an environment that provides a compatible native " + name + " implementation.");
     }
-    ts.Map = getCollectionImplementation("Map", "tryGetNativeMap", "createMapShim");
-    ts.Set = getCollectionImplementation("Set", "tryGetNativeSet", "createSetShim");
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
     function getIterator(iterable) {
         if (iterable) {
             if (isArray(iterable))
@@ -8017,6 +8020,11 @@ var ts;
         }
         return sys;
     })();
+    /*@internal*/
+    function setSys(s) {
+        ts.sys = s;
+    }
+    ts.setSys = setSys;
     if (ts.sys && ts.sys.getEnvironmentVariable) {
         setCustomPollingValues(ts.sys);
         ts.Debug.setAssertionLevel(/^development$/i.test(ts.sys.getEnvironmentVariable("NODE_ENV"))
@@ -9582,7 +9590,7 @@ var ts;
         Circularity_detected_while_resolving_configuration_Colon_0: diag(18000, ts.DiagnosticCategory.Error, "Circularity_detected_while_resolving_configuration_Colon_0_18000", "Circularity detected while resolving configuration: {0}"),
         The_files_list_in_config_file_0_is_empty: diag(18002, ts.DiagnosticCategory.Error, "The_files_list_in_config_file_0_is_empty_18002", "The 'files' list in config file '{0}' is empty."),
         No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2: diag(18003, ts.DiagnosticCategory.Error, "No_inputs_were_found_in_config_file_0_Specified_include_paths_were_1_and_exclude_paths_were_2_18003", "No inputs were found in config file '{0}'. Specified 'include' paths were '{1}' and 'exclude' paths were '{2}'."),
-        File_is_a_CommonJS_module_it_may_be_converted_to_an_ES6_module: diag(80001, ts.DiagnosticCategory.Suggestion, "File_is_a_CommonJS_module_it_may_be_converted_to_an_ES6_module_80001", "File is a CommonJS module; it may be converted to an ES6 module."),
+        File_is_a_CommonJS_module_it_may_be_converted_to_an_ES_module: diag(80001, ts.DiagnosticCategory.Suggestion, "File_is_a_CommonJS_module_it_may_be_converted_to_an_ES_module_80001", "File is a CommonJS module; it may be converted to an ES module."),
         This_constructor_function_may_be_converted_to_a_class_declaration: diag(80002, ts.DiagnosticCategory.Suggestion, "This_constructor_function_may_be_converted_to_a_class_declaration_80002", "This constructor function may be converted to a class declaration."),
         Import_may_be_converted_to_a_default_import: diag(80003, ts.DiagnosticCategory.Suggestion, "Import_may_be_converted_to_a_default_import_80003", "Import may be converted to a default import."),
         JSDoc_types_may_be_moved_to_TypeScript_types: diag(80004, ts.DiagnosticCategory.Suggestion, "JSDoc_types_may_be_moved_to_TypeScript_types_80004", "JSDoc types may be moved to TypeScript types."),
@@ -9644,7 +9652,7 @@ var ts;
         Install_0: diag(95014, ts.DiagnosticCategory.Message, "Install_0_95014", "Install '{0}'"),
         Replace_import_with_0: diag(95015, ts.DiagnosticCategory.Message, "Replace_import_with_0_95015", "Replace import with '{0}'."),
         Use_synthetic_default_member: diag(95016, ts.DiagnosticCategory.Message, "Use_synthetic_default_member_95016", "Use synthetic 'default' member."),
-        Convert_to_ES6_module: diag(95017, ts.DiagnosticCategory.Message, "Convert_to_ES6_module_95017", "Convert to ES6 module"),
+        Convert_to_ES_module: diag(95017, ts.DiagnosticCategory.Message, "Convert_to_ES_module_95017", "Convert to ES module"),
         Add_undefined_type_to_property_0: diag(95018, ts.DiagnosticCategory.Message, "Add_undefined_type_to_property_0_95018", "Add 'undefined' type to property '{0}'"),
         Add_initializer_to_property_0: diag(95019, ts.DiagnosticCategory.Message, "Add_initializer_to_property_0_95019", "Add initializer to property '{0}'"),
         Add_definite_assignment_assertion_to_property_0: diag(95020, ts.DiagnosticCategory.Message, "Add_definite_assignment_assertion_to_property_0_95020", "Add definite assignment assertion to property '{0}'"),
@@ -36159,16 +36167,21 @@ var ts;
             var pos = getNodePos();
             parseExpected(129 /* AssertKeyword */);
             var openBracePosition = scanner.getTokenPos();
-            parseExpected(18 /* OpenBraceToken */);
-            var multiLine = scanner.hasPrecedingLineBreak();
-            var elements = parseDelimitedList(24 /* AssertEntries */, parseAssertEntry, /*considerSemicolonAsDelimiter*/ true);
-            if (!parseExpected(19 /* CloseBraceToken */)) {
-                var lastError = ts.lastOrUndefined(parseDiagnostics);
-                if (lastError && lastError.code === ts.Diagnostics._0_expected.code) {
-                    ts.addRelatedInfo(lastError, ts.createDetachedDiagnostic(fileName, openBracePosition, 1, ts.Diagnostics.The_parser_expected_to_find_a_to_match_the_token_here));
+            if (parseExpected(18 /* OpenBraceToken */)) {
+                var multiLine = scanner.hasPrecedingLineBreak();
+                var elements = parseDelimitedList(24 /* AssertEntries */, parseAssertEntry, /*considerSemicolonAsDelimiter*/ true);
+                if (!parseExpected(19 /* CloseBraceToken */)) {
+                    var lastError = ts.lastOrUndefined(parseDiagnostics);
+                    if (lastError && lastError.code === ts.Diagnostics._0_expected.code) {
+                        ts.addRelatedInfo(lastError, ts.createDetachedDiagnostic(fileName, openBracePosition, 1, ts.Diagnostics.The_parser_expected_to_find_a_to_match_the_token_here));
+                    }
                 }
+                return finishNode(factory.createAssertClause(elements, multiLine), pos);
+            }
+            else {
+                var elements = createNodeArray([], getNodePos(), /*end*/ undefined, /*hasTrailingComma*/ false);
+                return finishNode(factory.createAssertClause(elements, /*multiLine*/ false), pos);
             }
-            return finishNode(factory.createAssertClause(elements, multiLine), pos);
         }
         function tokenAfterImportDefinitelyProducesImportDeclaration() {
             return token() === 41 /* AsteriskToken */ || token() === 18 /* OpenBraceToken */;
@@ -37063,8 +37076,9 @@ var ts;
                     return finishNode(factory.createJSDocTypeTag(tagName, typeExpression, comments), start);
                 }
                 function parseSeeTag(start, tagName, indent, indentText) {
-                    var isLink = lookAhead(function () { return nextTokenJSDoc() === 59 /* AtToken */ && ts.tokenIsIdentifierOrKeyword(nextTokenJSDoc()) && scanner.getTokenValue() === "link"; });
-                    var nameExpression = isLink ? undefined : parseJSDocNameReference();
+                    var isMarkdownOrJSDocLink = token() === 22 /* OpenBracketToken */
+                        || lookAhead(function () { return nextTokenJSDoc() === 59 /* AtToken */ && ts.tokenIsIdentifierOrKeyword(nextTokenJSDoc()) && scanner.getTokenValue() === "link"; });
+                    var nameExpression = isMarkdownOrJSDocLink ? undefined : parseJSDocNameReference();
                     var comments = indent !== undefined && indentText !== undefined ? parseTrailingTagComments(start, getNodePos(), indent, indentText) : undefined;
                     return finishNode(factory.createJSDocSeeTag(tagName, nameExpression, comments), start);
                 }
@@ -58008,7 +58022,7 @@ var ts;
                     return false;
                 switch (node.kind) {
                     case 79 /* Identifier */:
-                        return node.escapedText === argumentsSymbol.escapedName && getResolvedSymbol(node) === argumentsSymbol;
+                        return node.escapedText === argumentsSymbol.escapedName && getReferencedValueSymbol(node) === argumentsSymbol;
                     case 166 /* PropertyDeclaration */:
                     case 168 /* MethodDeclaration */:
                     case 171 /* GetAccessor */:
@@ -67532,7 +67546,7 @@ var ts;
             var keyPropertyName = getKeyPropertyName(unionType);
             var propNode = keyPropertyName && ts.find(node.properties, function (p) { return p.symbol && p.kind === 294 /* PropertyAssignment */ &&
                 p.symbol.escapedName === keyPropertyName && isPossiblyDiscriminantValue(p.initializer); });
-            var propType = propNode && getTypeOfExpression(propNode.initializer);
+            var propType = propNode && getContextFreeTypeOfExpression(propNode.initializer);
             return propType && getConstituentTypeForKeyType(unionType, propType);
         }
         function isOrContainsMatchingReference(source, target) {
@@ -70767,7 +70781,7 @@ var ts;
             return getMatchingUnionConstituentForObjectLiteral(contextualType, node) || discriminateTypeByDiscriminableItems(contextualType, ts.concatenate(ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 294 /* PropertyAssignment */ && isPossiblyDiscriminantValue(p.initializer) && isDiscriminantProperty(contextualType, p.symbol.escapedName); }), function (prop) { return [function () { return getContextFreeTypeOfExpression(prop.initializer); }, prop.symbol.escapedName]; }), ts.map(ts.filter(getPropertiesOfType(contextualType), function (s) { var _a; return !!(s.flags & 16777216 /* Optional */) && !!((_a = node === null || node === void 0 ? void 0 : node.symbol) === null || _a === void 0 ? void 0 : _a.members) && !node.symbol.members.has(s.escapedName) && isDiscriminantProperty(contextualType, s.escapedName); }), function (s) { return [function () { return undefinedType; }, s.escapedName]; })), isTypeAssignableTo, contextualType);
         }
         function discriminateContextualTypeByJSXAttributes(node, contextualType) {
-            return discriminateTypeByDiscriminableItems(contextualType, ts.concatenate(ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 284 /* JsxAttribute */ && isDiscriminantProperty(contextualType, p.symbol.escapedName) && (!p.initializer || isPossiblyDiscriminantValue(p.initializer)); }), function (prop) { return [!prop.initializer ? (function () { return trueType; }) : (function () { return checkExpression(prop.initializer); }), prop.symbol.escapedName]; }), ts.map(ts.filter(getPropertiesOfType(contextualType), function (s) { var _a; return !!(s.flags & 16777216 /* Optional */) && !!((_a = node === null || node === void 0 ? void 0 : node.symbol) === null || _a === void 0 ? void 0 : _a.members) && !node.symbol.members.has(s.escapedName) && isDiscriminantProperty(contextualType, s.escapedName); }), function (s) { return [function () { return undefinedType; }, s.escapedName]; })), isTypeAssignableTo, contextualType);
+            return discriminateTypeByDiscriminableItems(contextualType, ts.concatenate(ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 284 /* JsxAttribute */ && isDiscriminantProperty(contextualType, p.symbol.escapedName) && (!p.initializer || isPossiblyDiscriminantValue(p.initializer)); }), function (prop) { return [!prop.initializer ? (function () { return trueType; }) : (function () { return getContextFreeTypeOfExpression(prop.initializer); }), prop.symbol.escapedName]; }), ts.map(ts.filter(getPropertiesOfType(contextualType), function (s) { var _a; return !!(s.flags & 16777216 /* Optional */) && !!((_a = node === null || node === void 0 ? void 0 : node.symbol) === null || _a === void 0 ? void 0 : _a.members) && !node.symbol.members.has(s.escapedName) && isDiscriminantProperty(contextualType, s.escapedName); }), function (s) { return [function () { return undefinedType; }, s.escapedName]; })), isTypeAssignableTo, contextualType);
         }
         // Return the contextual type for a given expression node. During overload resolution, a contextual type may temporarily
         // be "pushed" onto a node using the contextualType property.
@@ -95033,51 +95047,25 @@ var ts;
             return tagTransform(node.openingFragment, node.children, isChild, /*location*/ node);
         }
         function convertJsxChildrenToChildrenPropObject(children) {
+            var prop = convertJsxChildrenToChildrenPropAssignment(children);
+            return prop && factory.createObjectLiteralExpression([prop]);
+        }
+        function convertJsxChildrenToChildrenPropAssignment(children) {
             var nonWhitespaceChildren = ts.getSemanticJsxChildren(children);
             if (ts.length(nonWhitespaceChildren) === 1) {
                 var result_13 = transformJsxChildToExpression(nonWhitespaceChildren[0]);
-                return result_13 && factory.createObjectLiteralExpression([
-                    factory.createPropertyAssignment("children", result_13)
-                ]);
+                return result_13 && factory.createPropertyAssignment("children", result_13);
             }
             var result = ts.mapDefined(children, transformJsxChildToExpression);
-            return !result.length ? undefined : factory.createObjectLiteralExpression([
-                factory.createPropertyAssignment("children", factory.createArrayLiteralExpression(result))
-            ]);
+            return ts.length(result) ? factory.createPropertyAssignment("children", factory.createArrayLiteralExpression(result)) : undefined;
         }
         function visitJsxOpeningLikeElementJSX(node, children, isChild, location) {
             var tagName = getTagName(node);
-            var objectProperties;
+            var childrenProp = children && children.length ? convertJsxChildrenToChildrenPropAssignment(children) : undefined;
             var keyAttr = ts.find(node.attributes.properties, function (p) { return !!p.name && ts.isIdentifier(p.name) && p.name.escapedText === "key"; });
             var attrs = keyAttr ? ts.filter(node.attributes.properties, function (p) { return p !== keyAttr; }) : node.attributes.properties;
-            var segments = [];
-            if (attrs.length) {
-                // Map spans of JsxAttribute nodes into object literals and spans
-                // of JsxSpreadAttribute nodes into expressions.
-                segments = ts.flatten(ts.spanMap(attrs, ts.isJsxSpreadAttribute, function (attrs, isSpread) { return isSpread
-                    ? ts.map(attrs, transformJsxSpreadAttributeToExpression)
-                    : factory.createObjectLiteralExpression(ts.map(attrs, transformJsxAttributeToObjectLiteralElement)); }));
-                if (ts.isJsxSpreadAttribute(attrs[0])) {
-                    // We must always emit at least one object literal before a spread
-                    // argument.factory.createObjectLiteral
-                    segments.unshift(factory.createObjectLiteralExpression());
-                }
-            }
-            if (children && children.length) {
-                var result = convertJsxChildrenToChildrenPropObject(children);
-                if (result) {
-                    segments.push(result);
-                }
-            }
-            if (segments.length === 0) {
-                objectProperties = factory.createObjectLiteralExpression([]);
-                // When there are no attributes, React wants {}
-            }
-            else {
-                // Either emit one big object literal (no spread attribs), or
-                // a call to the __assign helper.
-                objectProperties = ts.singleOrUndefined(segments) || emitHelpers().createAssignHelper(segments);
-            }
+            var objectProperties = ts.length(attrs) ? transformJsxAttributesToObjectProps(attrs, childrenProp) :
+                factory.createObjectLiteralExpression(childrenProp ? [childrenProp] : ts.emptyArray); // When there are no attributes, React wants {}
             return visitJsxOpeningLikeElementOrFragmentJSX(tagName, objectProperties, keyAttr, ts.length(ts.getSemanticJsxChildren(children || ts.emptyArray)), isChild, location);
         }
         function visitJsxOpeningLikeElementOrFragmentJSX(tagName, objectProperties, keyAttr, childrenLength, isChild, location) {
@@ -95106,38 +95094,9 @@ var ts;
         }
         function visitJsxOpeningLikeElementCreateElement(node, children, isChild, location) {
             var tagName = getTagName(node);
-            var objectProperties;
             var attrs = node.attributes.properties;
-            if (attrs.length === 0) {
-                objectProperties = factory.createNull();
-                // When there are no attributes, React wants "null"
-            }
-            else {
-                var target = ts.getEmitScriptTarget(compilerOptions);
-                if (target && target >= 5 /* ES2018 */) {
-                    objectProperties = factory.createObjectLiteralExpression(ts.flatten(ts.spanMap(attrs, ts.isJsxSpreadAttribute, function (attrs, isSpread) {
-                        return isSpread ? ts.map(attrs, transformJsxSpreadAttributeToSpreadAssignment) : ts.map(attrs, transformJsxAttributeToObjectLiteralElement);
-                    })));
-                }
-                else {
-                    // Map spans of JsxAttribute nodes into object literals and spans
-                    // of JsxSpreadAttribute nodes into expressions.
-                    var segments = ts.flatten(ts.spanMap(attrs, ts.isJsxSpreadAttribute, function (attrs, isSpread) { return isSpread
-                        ? ts.map(attrs, transformJsxSpreadAttributeToExpression)
-                        : factory.createObjectLiteralExpression(ts.map(attrs, transformJsxAttributeToObjectLiteralElement)); }));
-                    if (ts.isJsxSpreadAttribute(attrs[0])) {
-                        // We must always emit at least one object literal before a spread
-                        // argument.factory.createObjectLiteral
-                        segments.unshift(factory.createObjectLiteralExpression());
-                    }
-                    // Either emit one big object literal (no spread attribs), or
-                    // a call to the __assign helper.
-                    objectProperties = ts.singleOrUndefined(segments);
-                    if (!objectProperties) {
-                        objectProperties = emitHelpers().createAssignHelper(segments);
-                    }
-                }
-            }
+            var objectProperties = ts.length(attrs) ? transformJsxAttributesToObjectProps(attrs) :
+                factory.createNull(); // When there are no attributes, React wants "null"
             var callee = currentFileState.importSpecifier === undefined
                 ? ts.createJsxFactoryExpression(factory, context.getEmitResolver().getJsxFactoryEntity(currentSourceFile), compilerOptions.reactNamespace, // TODO: GH#18217
                 node)
@@ -95170,6 +95129,36 @@ var ts;
         function transformJsxSpreadAttributeToSpreadAssignment(node) {
             return factory.createSpreadAssignment(ts.visitNode(node.expression, visitor, ts.isExpression));
         }
+        function transformJsxAttributesToObjectProps(attrs, children) {
+            var target = ts.getEmitScriptTarget(compilerOptions);
+            return target && target >= 5 /* ES2018 */ ? factory.createObjectLiteralExpression(transformJsxAttributesToProps(attrs, children)) :
+                transformJsxAttributesToExpression(attrs, children);
+        }
+        function transformJsxAttributesToProps(attrs, children) {
+            var props = ts.flatten(ts.spanMap(attrs, ts.isJsxSpreadAttribute, function (attrs, isSpread) {
+                return ts.map(attrs, function (attr) { return isSpread ? transformJsxSpreadAttributeToSpreadAssignment(attr) : transformJsxAttributeToObjectLiteralElement(attr); });
+            }));
+            if (children) {
+                props.push(children);
+            }
+            return props;
+        }
+        function transformJsxAttributesToExpression(attrs, children) {
+            // Map spans of JsxAttribute nodes into object literals and spans
+            // of JsxSpreadAttribute nodes into expressions.
+            var expressions = ts.flatten(ts.spanMap(attrs, ts.isJsxSpreadAttribute, function (attrs, isSpread) { return isSpread
+                ? ts.map(attrs, transformJsxSpreadAttributeToExpression)
+                : factory.createObjectLiteralExpression(ts.map(attrs, transformJsxAttributeToObjectLiteralElement)); }));
+            if (ts.isJsxSpreadAttribute(attrs[0])) {
+                // We must always emit at least one object literal before a spread
+                // argument.factory.createObjectLiteral
+                expressions.unshift(factory.createObjectLiteralExpression());
+            }
+            if (children) {
+                expressions.push(factory.createObjectLiteralExpression([children]));
+            }
+            return ts.singleOrUndefined(expressions) || emitHelpers().createAssignHelper(expressions);
+        }
         function transformJsxSpreadAttributeToExpression(node) {
             return ts.visitNode(node.expression, visitor, ts.isExpression);
         }
@@ -113303,7 +113292,7 @@ var ts;
                 break;
             case ts.FileIncludeKind.TypeReferenceDirective:
                 (_b = file.typeReferenceDirectives[index], pos = _b.pos, end = _b.end);
-                packageId = (_g = (_f = file.resolvedTypeReferenceDirectiveNames) === null || _f === void 0 ? void 0 : _f.get(ts.toFileNameLowerCase(file.typeReferenceDirectives[index].fileName), getModeForResolutionAtIndex(file, index))) === null || _g === void 0 ? void 0 : _g.packageId;
+                packageId = (_g = (_f = file.resolvedTypeReferenceDirectiveNames) === null || _f === void 0 ? void 0 : _f.get(ts.toFileNameLowerCase(file.typeReferenceDirectives[index].fileName), file.impliedNodeFormat)) === null || _g === void 0 ? void 0 : _g.packageId;
                 break;
             case ts.FileIncludeKind.LibReferenceDirective:
                 (_c = file.libReferenceDirectives[index], pos = _c.pos, end = _c.end);
@@ -124765,14 +124754,14 @@ var ts;
         return program.getSourceFiles().some(function (s) { return !s.isDeclarationFile && !program.isSourceFileFromExternalLibrary(s) && !!(s.externalModuleIndicator || s.commonJsModuleIndicator); });
     }
     ts.programContainsModules = programContainsModules;
-    function programContainsEs6Modules(program) {
+    function programContainsEsModules(program) {
         return program.getSourceFiles().some(function (s) { return !s.isDeclarationFile && !program.isSourceFileFromExternalLibrary(s) && !!s.externalModuleIndicator; });
     }
-    ts.programContainsEs6Modules = programContainsEs6Modules;
-    function compilerOptionsIndicateEs6Modules(compilerOptions) {
+    ts.programContainsEsModules = programContainsEsModules;
+    function compilerOptionsIndicateEsModules(compilerOptions) {
         return !!compilerOptions.module || ts.getEmitScriptTarget(compilerOptions) >= 2 /* ES2015 */ || !!compilerOptions.noEmit;
     }
-    ts.compilerOptionsIndicateEs6Modules = compilerOptionsIndicateEs6Modules;
+    ts.compilerOptionsIndicateEsModules = compilerOptionsIndicateEsModules;
     function createModuleSpecifierResolutionHost(program, host) {
         // Mix in `getSymlinkCache` from Program when host doesn't have it
         // in order for non-Project hosts to have a symlinks cache.
@@ -129902,11 +129891,11 @@ var ts;
                 // If not already a module, must have modules enabled.
                 if (!preferences.includeCompletionsForModuleExports)
                     return false;
-                // If already using ES6 modules, OK to continue using them.
+                // If already using ES modules, OK to continue using them.
                 if (sourceFile.externalModuleIndicator || sourceFile.commonJsModuleIndicator)
                     return true;
                 // If module transpilation is enabled or we're targeting es6 or above, or not emitting, OK.
-                if (ts.compilerOptionsIndicateEs6Modules(program.getCompilerOptions()))
+                if (ts.compilerOptionsIndicateEsModules(program.getCompilerOptions()))
                     return true;
                 // If some file is using ES6 modules, assume that it's OK to add more.
                 return ts.programContainsModules(program);
@@ -140197,10 +140186,12 @@ var ts;
         program.getSemanticDiagnostics(sourceFile, cancellationToken);
         var diags = [];
         var checker = program.getTypeChecker();
-        if (sourceFile.commonJsModuleIndicator &&
-            (ts.programContainsEs6Modules(program) || ts.compilerOptionsIndicateEs6Modules(program.getCompilerOptions())) &&
+        var isCommonJSFile = sourceFile.impliedNodeFormat === ts.ModuleKind.CommonJS || ts.fileExtensionIsOneOf(sourceFile.fileName, [".cts" /* Cts */, ".cjs" /* Cjs */]);
+        if (!isCommonJSFile &&
+            sourceFile.commonJsModuleIndicator &&
+            (ts.programContainsEsModules(program) || ts.compilerOptionsIndicateEsModules(program.getCompilerOptions())) &&
             containsTopLevelCommonjs(sourceFile)) {
-            diags.push(ts.createDiagnosticForNode(getErrorNodeFromCommonJsIndicator(sourceFile.commonJsModuleIndicator), ts.Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES6_module));
+            diags.push(ts.createDiagnosticForNode(getErrorNodeFromCommonJsIndicator(sourceFile.commonJsModuleIndicator), ts.Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES_module));
         }
         var isJsFile = ts.isSourceFileJS(sourceFile);
         visitedNestedConvertibleFunctions.clear();
@@ -140249,7 +140240,7 @@ var ts;
         }
     }
     ts.computeSuggestionDiagnostics = computeSuggestionDiagnostics;
-    // convertToEs6Module only works on top-level, so don't trigger it if commonjs code only appears in nested scopes.
+    // convertToEsModule only works on top-level, so don't trigger it if commonjs code only appears in nested scopes.
     function containsTopLevelCommonjs(sourceFile) {
         return sourceFile.statements.some(function (statement) {
             switch (statement.kind) {
@@ -147443,11 +147434,11 @@ var ts;
     var codefix;
     (function (codefix) {
         codefix.registerCodeFix({
-            errorCodes: [ts.Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES6_module.code],
+            errorCodes: [ts.Diagnostics.File_is_a_CommonJS_module_it_may_be_converted_to_an_ES_module.code],
             getCodeActions: function (context) {
                 var sourceFile = context.sourceFile, program = context.program, preferences = context.preferences;
                 var changes = ts.textChanges.ChangeTracker.with(context, function (changes) {
-                    var moduleExportsChangedToDefault = convertFileToEs6Module(sourceFile, program.getTypeChecker(), changes, ts.getEmitScriptTarget(program.getCompilerOptions()), ts.getQuotePreference(sourceFile, preferences));
+                    var moduleExportsChangedToDefault = convertFileToEsModule(sourceFile, program.getTypeChecker(), changes, ts.getEmitScriptTarget(program.getCompilerOptions()), ts.getQuotePreference(sourceFile, preferences));
                     if (moduleExportsChangedToDefault) {
                         for (var _i = 0, _a = program.getSourceFiles(); _i < _a.length; _i++) {
                             var importingFile = _a[_i];
@@ -147456,7 +147447,7 @@ var ts;
                     }
                 });
                 // No support for fix-all since this applies to the whole file at once anyway.
-                return [codefix.createCodeFixActionWithoutFixAll("convertToEs6Module", changes, ts.Diagnostics.Convert_to_ES6_module)];
+                return [codefix.createCodeFixActionWithoutFixAll("convertToEsModule", changes, ts.Diagnostics.Convert_to_ES_module)];
             },
         });
         function fixImportOfModuleExports(importingFile, exportingFile, changes, quotePreference) {
@@ -147480,7 +147471,7 @@ var ts;
             }
         }
         /** @returns Whether we converted a `module.exports =` to a default export. */
-        function convertFileToEs6Module(sourceFile, checker, changes, target, quotePreference) {
+        function convertFileToEsModule(sourceFile, checker, changes, target, quotePreference) {
             var identifiers = { original: collectFreeIdentifiers(sourceFile), additional: new ts.Set() };
             var exports = collectExportRenames(sourceFile, checker, identifiers);
             convertExportsAccesses(sourceFile, exports, changes);
@@ -147613,7 +147604,7 @@ var ts;
                     // `const a = require("b").c` --> `import { c as a } from "./b";
                     return convertedImports([makeSingleImport(name.text, propertyName, moduleSpecifier, quotePreference)]);
                 default:
-                    return ts.Debug.assertNever(name, "Convert to ES6 module got invalid syntax form " + name.kind);
+                    return ts.Debug.assertNever(name, "Convert to ES module got invalid syntax form " + name.kind);
             }
         }
         function convertAssignment(sourceFile, checker, assignment, changes, exports, useSitesToUnqualify) {
@@ -147798,7 +147789,7 @@ var ts;
                 case 79 /* Identifier */:
                     return convertSingleIdentifierImport(name, moduleSpecifier, checker, identifiers, quotePreference);
                 default:
-                    return ts.Debug.assertNever(name, "Convert to ES6 module got invalid name kind " + name.kind);
+                    return ts.Debug.assertNever(name, "Convert to ES module got invalid name kind " + name.kind);
             }
         }
         /**
@@ -148839,9 +148830,12 @@ var ts;
             }));
             return { fixes: fixes, symbolName: symbolName };
         }
+        function jsxModeNeedsExplicitImport(jsx) {
+            return jsx === 2 /* React */ || jsx === 3 /* ReactNative */;
+        }
         function getSymbolName(sourceFile, checker, symbolToken, compilerOptions) {
             var parent = symbolToken.parent;
-            if ((ts.isJsxOpeningLikeElement(parent) || ts.isJsxClosingElement(parent)) && parent.tagName === symbolToken && compilerOptions.jsx !== 4 /* ReactJSX */ && compilerOptions.jsx !== 5 /* ReactJSXDev */) {
+            if ((ts.isJsxOpeningLikeElement(parent) || ts.isJsxClosingElement(parent)) && parent.tagName === symbolToken && jsxModeNeedsExplicitImport(compilerOptions.jsx)) {
                 var jsxNamespace = checker.getJsxNamespace(sourceFile);
                 if (ts.isIntrinsicJsxName(symbolToken.text) || !checker.resolveName(jsxNamespace, parent, 111551 /* Value */, /*excludeGlobals*/ true)) {
                     return jsxNamespace;
@@ -156956,17 +156950,17 @@ var ts;
                 deleteMovedStatements(oldFile, toMove.ranges, changes);
                 return __spreadArray(__spreadArray([], prologueDirectives, true), toMove.all, true);
             }
-            var useEs6ModuleSyntax = !!oldFile.externalModuleIndicator;
+            var useEsModuleSyntax = !!oldFile.externalModuleIndicator;
             var quotePreference = ts.getQuotePreference(oldFile, preferences);
-            var importsFromNewFile = createOldFileImportsFromNewFile(usage.oldFileImportsFromNewFile, newModuleName, useEs6ModuleSyntax, quotePreference);
+            var importsFromNewFile = createOldFileImportsFromNewFile(usage.oldFileImportsFromNewFile, newModuleName, useEsModuleSyntax, quotePreference);
             if (importsFromNewFile) {
                 ts.insertImports(changes, oldFile, importsFromNewFile, /*blankLineBetween*/ true);
             }
             deleteUnusedOldImports(oldFile, toMove.all, changes, usage.unusedImportsFromOldFile, checker);
             deleteMovedStatements(oldFile, toMove.ranges, changes);
             updateImportsInOtherFiles(changes, program, oldFile, usage.movedSymbols, newModuleName);
-            var imports = getNewFileImportsAndAddExportInOldFile(oldFile, usage.oldImportsNeededByNewFile, usage.newFileImportsFromOldFile, changes, checker, useEs6ModuleSyntax, quotePreference);
-            var body = addExports(oldFile, toMove.all, usage.oldFileImportsFromNewFile, useEs6ModuleSyntax);
+            var imports = getNewFileImportsAndAddExportInOldFile(oldFile, usage.oldImportsNeededByNewFile, usage.newFileImportsFromOldFile, changes, checker, useEsModuleSyntax, quotePreference);
+            var body = addExports(oldFile, toMove.all, usage.oldFileImportsFromNewFile, useEsModuleSyntax);
             if (imports.length && body.length) {
                 return __spreadArray(__spreadArray(__spreadArray(__spreadArray([], prologueDirectives, true), imports, true), [
                     4 /* NewLineTrivia */
@@ -157213,7 +157207,7 @@ var ts;
                     break;
             }
         }
-        function getNewFileImportsAndAddExportInOldFile(oldFile, importsToCopy, newFileImportsFromOldFile, changes, checker, useEs6ModuleSyntax, quotePreference) {
+        function getNewFileImportsAndAddExportInOldFile(oldFile, importsToCopy, newFileImportsFromOldFile, changes, checker, useEsModuleSyntax, quotePreference) {
             var copiedOldImports = [];
             for (var _i = 0, _a = oldFile.statements; _i < _a.length; _i++) {
                 var oldStatement = _a[_i];
@@ -157238,7 +157232,7 @@ var ts;
                         continue;
                     var top = getTopLevelDeclarationStatement(decl);
                     if (markSeenTop(top)) {
-                        addExportToChanges(oldFile, top, name, changes, useEs6ModuleSyntax);
+                        addExportToChanges(oldFile, top, name, changes, useEsModuleSyntax);
                     }
                     if (ts.hasSyntacticModifier(decl, 512 /* Default */)) {
                         oldFileDefault = name;
@@ -157248,7 +157242,7 @@ var ts;
                     }
                 }
             });
-            ts.append(copiedOldImports, makeImportOrRequire(oldFileDefault, oldFileNamedImports, ts.removeFileExtension(ts.getBaseFileName(oldFile.fileName)), useEs6ModuleSyntax, quotePreference));
+            ts.append(copiedOldImports, makeImportOrRequire(oldFileDefault, oldFileNamedImports, ts.removeFileExtension(ts.getBaseFileName(oldFile.fileName)), useEsModuleSyntax, quotePreference));
             return copiedOldImports;
         }
         function makeUniqueModuleName(moduleName, extension, inDirectory, host) {