typescript 4.1.1-rc → 4.1.5

package/lib/lib.es5.d.ts

@@ -1396,7 +1396,7 @@ interface ArrayConstructor {
     (arrayLength?: number): any[];
     <T>(arrayLength: number): T[];
     <T>(...items: T[]): T[];
-    isArray<T>(arg: T | {}): arg is T extends readonly any[] ? (unknown extends T ? never : readonly any[]) : any[];
+    isArray(arg: any): arg is any[];
     readonly prototype: any[];
 }
 

package/lib/protocol.d.ts

@@ -2569,7 +2569,9 @@ declare namespace ts.server.protocol {
         None = "None",
         Preserve = "Preserve",
         ReactNative = "ReactNative",
-        React = "React"
+        React = "React",
+        ReactJSX = "ReactJSX",
+        ReactJSXDev = "ReactJSXDev"
     }
     const enum ModuleKind {
         None = "None",
@@ -2579,6 +2581,7 @@ declare namespace ts.server.protocol {
         System = "System",
         ES6 = "ES6",
         ES2015 = "ES2015",
+        ES2020 = "ES2020",
         ESNext = "ESNext"
     }
     const enum ModuleResolutionKind {
@@ -2599,6 +2602,7 @@ declare namespace ts.server.protocol {
         ES2018 = "ES2018",
         ES2019 = "ES2019",
         ES2020 = "ES2020",
+        JSON = "JSON",
         ESNext = "ESNext"
     }
 }

package/lib/tsc.js

@@ -67,7 +67,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.1";
-    ts.version = "4.1.1-rc";
+    ts.version = "4.1.5";
     var NativeCollections;
     (function (NativeCollections) {
         function tryGetNativeMap() {
@@ -5154,8 +5154,6 @@ var ts;
         Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type: diag(1387, ts.DiagnosticCategory.Error, "Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type_1387", "Function type notation must be parenthesized when used in an intersection type."),
         Constructor_type_notation_must_be_parenthesized_when_used_in_an_intersection_type: diag(1388, ts.DiagnosticCategory.Error, "Constructor_type_notation_must_be_parenthesized_when_used_in_an_intersection_type_1388", "Constructor type notation must be parenthesized when used in an intersection type."),
         _0_is_not_allowed_as_a_variable_declaration_name: diag(1389, ts.DiagnosticCategory.Error, "_0_is_not_allowed_as_a_variable_declaration_name_1389", "'{0}' is not allowed as a variable declaration name."),
-        Provides_a_root_package_name_when_using_outFile_with_declarations: diag(1390, ts.DiagnosticCategory.Message, "Provides_a_root_package_name_when_using_outFile_with_declarations_1390", "Provides a root package name when using outFile with declarations."),
-        The_bundledPackageName_option_must_be_provided_when_using_outFile_and_node_module_resolution_with_declaration_emit: diag(1391, ts.DiagnosticCategory.Error, "The_bundledPackageName_option_must_be_provided_when_using_outFile_and_node_module_resolution_with_de_1391", "The `bundledPackageName` option must be provided when using outFile and node module resolution with declaration emit."),
         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),
@@ -10703,6 +10701,18 @@ var ts;
         };
     }
     ts.createDiagnosticForNodeFromMessageChain = createDiagnosticForNodeFromMessageChain;
+    function createDiagnosticForFileFromMessageChain(sourceFile, messageChain, relatedInformation) {
+        return {
+            file: sourceFile,
+            start: 0,
+            length: 0,
+            code: messageChain.code,
+            category: messageChain.category,
+            messageText: messageChain.next ? messageChain : messageChain.messageText,
+            relatedInformation: relatedInformation
+        };
+    }
+    ts.createDiagnosticForFileFromMessageChain = createDiagnosticForFileFromMessageChain;
     function createDiagnosticForRange(sourceFile, range, message) {
         return {
             file: sourceFile,
@@ -13195,16 +13205,7 @@ var ts;
         var filePath = ts.getNormalizedAbsolutePath(fileName, host.getCurrentDirectory());
         var relativePath = ts.getRelativePathToDirectoryOrUrl(dir, filePath, dir, getCanonicalFileName, false);
         var extensionless = removeFileExtension(relativePath);
-        if (referencePath) {
-            return ts.ensurePathIsNonModuleName(extensionless);
-        }
-        var options = host.getCompilerOptions();
-        var rootPkgName = options.bundledPackageName || "";
-        var newPath = ts.combinePaths(rootPkgName, extensionless);
-        if (rootPkgName && getEmitModuleResolutionKind(options) === ts.ModuleResolutionKind.NodeJs && ts.endsWith(newPath, "/index")) {
-            return newPath.slice(0, newPath.length - "/index".length);
-        }
-        return newPath;
+        return referencePath ? ts.ensurePathIsNonModuleName(extensionless) : extensionless;
     }
     ts.getExternalModuleNameFromPath = getExternalModuleNameFromPath;
     function getOwnEmitOutputFilePath(fileName, host, extension) {
@@ -29658,13 +29659,6 @@ var ts;
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Emit_class_fields_with_Define_instead_of_Set,
         },
-        {
-            name: "bundledPackageName",
-            type: "string",
-            affectsEmit: true,
-            category: ts.Diagnostics.Advanced_Options,
-            description: ts.Diagnostics.Provides_a_root_package_name_when_using_outFile_with_declarations,
-        },
         {
             name: "keyofStringsOnly",
             type: "boolean",
@@ -36021,6 +36015,14 @@ var ts;
             }
         }
         function errorOrSuggestion(isError, location, message, arg0, arg1, arg2, arg3) {
+            if (location.pos < 0 || location.end < 0) {
+                if (!isError) {
+                    return;
+                }
+                var file = ts.getSourceFileOfNode(location);
+                addErrorOrSuggestion(isError, "message" in message ? ts.createFileDiagnostic(file, 0, 0, message, arg0, arg1, arg2, arg3) : ts.createDiagnosticForFileFromMessageChain(file, message));
+                return;
+            }
             addErrorOrSuggestion(isError, "message" in message ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2, arg3) : ts.createDiagnosticForNodeFromMessageChain(location, message));
         }
         function errorAndMaybeSuggestAwait(location, maybeMissingAwait, message, arg0, arg1, arg2, arg3) {
@@ -37351,7 +37353,7 @@ var ts;
             var resolved = getExternalModuleMember(root, commonJSPropertyAccess || node, dontResolveAlias);
             var name = node.propertyName || node.name;
             if (commonJSPropertyAccess && resolved && ts.isIdentifier(name)) {
-                return getPropertyOfType(getTypeOfSymbol(resolved), name.escapedText);
+                return resolveSymbol(getPropertyOfType(getTypeOfSymbol(resolved), name.escapedText), dontResolveAlias);
             }
             markSymbolOfAliasDeclarationIfTypeOnly(node, undefined, resolved, false);
             return resolved;
@@ -38591,7 +38593,6 @@ var ts;
                             getProjectReferenceRedirect: function (fileName) { return host.getProjectReferenceRedirect(fileName); },
                             isSourceOfProjectReferenceRedirect: function (fileName) { return host.isSourceOfProjectReferenceRedirect(fileName); },
                             fileExists: function (fileName) { return host.fileExists(fileName); },
-                            getCompilerOptions: function () { return host.getCompilerOptions(); }
                         } : undefined },
                     encounteredError: false,
                     visitedTypes: undefined,
@@ -39973,8 +39974,7 @@ var ts;
                                     var resolverHost = {
                                         getCanonicalFileName: getCanonicalFileName,
                                         getCurrentDirectory: function () { return context.tracker.moduleResolverHost.getCurrentDirectory(); },
-                                        getCommonSourceDirectory: function () { return context.tracker.moduleResolverHost.getCommonSourceDirectory(); },
-                                        getCompilerOptions: function () { return context.tracker.moduleResolverHost.getCompilerOptions(); }
+                                        getCommonSourceDirectory: function () { return context.tracker.moduleResolverHost.getCommonSourceDirectory(); }
                                     };
                                     var newName = ts.getResolvedExternalModuleName(resolverHost, targetFile);
                                     return ts.factory.createStringLiteral(newName);
@@ -52612,6 +52612,7 @@ var ts;
                     return errorType;
                 }
                 flowDepth++;
+                var sharedFlow;
                 while (true) {
                     var flags = flow.flags;
                     if (flags & 4096) {
@@ -52621,6 +52622,7 @@ var ts;
                                 return sharedFlowTypes[i];
                             }
                         }
+                        sharedFlow = flow;
                     }
                     var type = void 0;
                     if (flags & 16) {
@@ -52680,8 +52682,8 @@ var ts;
                     else {
                         type = convertAutoToAny(declaredType);
                     }
-                    if (flags & 4096) {
-                        sharedFlowNodes[sharedFlowCount] = flow;
+                    if (sharedFlow) {
+                        sharedFlowNodes[sharedFlowCount] = sharedFlow;
                         sharedFlowTypes[sharedFlowCount] = type;
                         sharedFlowCount++;
                     }
@@ -55286,10 +55288,10 @@ var ts;
                 return links.jsxNamespace;
             }
             if (!links || links.jsxNamespace !== false) {
-                var namespaceName = getJsxNamespace(location);
-                var resolvedNamespace = resolveName(location, namespaceName, 1920, undefined, namespaceName, false);
+                var resolvedNamespace = getJsxNamespaceContainerForImplicitImport(location);
                 if (!resolvedNamespace || resolvedNamespace === unknownSymbol) {
-                    resolvedNamespace = getJsxNamespaceContainerForImplicitImport(location);
+                    var namespaceName = getJsxNamespace(location);
+                    resolvedNamespace = resolveName(location, namespaceName, 1920, undefined, namespaceName, false);
                 }
                 if (resolvedNamespace) {
                     var candidate = resolveSymbol(getSymbol(getExportsOfSymbol(resolveSymbol(resolvedNamespace)), JsxNames.JSX, 1920));
@@ -55457,17 +55459,19 @@ var ts;
                 checkGrammarJsxElement(node);
             }
             checkJsxPreconditions(node);
-            var jsxFactoryRefErr = diagnostics && compilerOptions.jsx === 2 ? ts.Diagnostics.Cannot_find_name_0 : undefined;
-            var jsxFactoryNamespace = getJsxNamespace(node);
-            var jsxFactoryLocation = isNodeOpeningLikeElement ? node.tagName : node;
-            var jsxFactorySym;
-            if (!(ts.isJsxOpeningFragment(node) && jsxFactoryNamespace === "null")) {
-                jsxFactorySym = resolveName(jsxFactoryLocation, jsxFactoryNamespace, 111551, jsxFactoryRefErr, jsxFactoryNamespace, true);
-            }
-            if (jsxFactorySym) {
-                jsxFactorySym.isReferenced = 67108863;
-                if (jsxFactorySym.flags & 2097152 && !getTypeOnlyAliasDeclaration(jsxFactorySym)) {
-                    markAliasSymbolAsReferenced(jsxFactorySym);
+            if (!getJsxNamespaceContainerForImplicitImport(node)) {
+                var jsxFactoryRefErr = diagnostics && compilerOptions.jsx === 2 ? ts.Diagnostics.Cannot_find_name_0 : undefined;
+                var jsxFactoryNamespace = getJsxNamespace(node);
+                var jsxFactoryLocation = isNodeOpeningLikeElement ? node.tagName : node;
+                var jsxFactorySym = void 0;
+                if (!(ts.isJsxOpeningFragment(node) && jsxFactoryNamespace === "null")) {
+                    jsxFactorySym = resolveName(jsxFactoryLocation, jsxFactoryNamespace, 111551, jsxFactoryRefErr, jsxFactoryNamespace, true);
+                }
+                if (jsxFactorySym) {
+                    jsxFactorySym.isReferenced = 67108863;
+                    if (jsxFactorySym.flags & 2097152 && !getTypeOnlyAliasDeclaration(jsxFactorySym)) {
+                        markAliasSymbolAsReferenced(jsxFactorySym);
+                    }
                 }
             }
             if (isNodeOpeningLikeElement) {
@@ -57017,9 +57021,9 @@ var ts;
                 var oldCandidatesForArgumentError = candidatesForArgumentError;
                 var oldCandidateForArgumentArityError = candidateForArgumentArityError;
                 var oldCandidateForTypeArgumentError = candidateForTypeArgumentError;
-                var declCount = ts.length((_a = failed.declaration) === null || _a === void 0 ? void 0 : _a.symbol.declarations);
-                var isOverload = declCount > 1;
-                var implDecl = isOverload ? ts.find(((_b = failed.declaration) === null || _b === void 0 ? void 0 : _b.symbol.declarations) || ts.emptyArray, function (d) { return ts.isFunctionLikeDeclaration(d) && ts.nodeIsPresent(d.body); }) : undefined;
+                var failedSignatureDeclarations = ((_b = (_a = failed.declaration) === null || _a === void 0 ? void 0 : _a.symbol) === null || _b === void 0 ? void 0 : _b.declarations) || ts.emptyArray;
+                var isOverload = failedSignatureDeclarations.length > 1;
+                var implDecl = isOverload ? ts.find(failedSignatureDeclarations, function (d) { return ts.isFunctionLikeDeclaration(d) && ts.nodeIsPresent(d.body); }) : undefined;
                 if (implDecl) {
                     var candidate = getSignatureFromDeclaration(implDecl);
                     var isSingleNonGenericCandidate_1 = !candidate.typeParameters;
@@ -88061,9 +88065,6 @@ var ts;
                     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"));
                 }
             }
-            if (outputFile && ts.getEmitDeclarations(options) && ts.getEmitModuleResolutionKind(options) === ts.ModuleResolutionKind.NodeJs && !options.bundledPackageName) {
-                createDiagnosticForOptionName(ts.Diagnostics.The_bundledPackageName_option_must_be_provided_when_using_outFile_and_node_module_resolution_with_declaration_emit, options.out ? "out" : "outFile");
-            }
             if (options.resolveJsonModule) {
                 if (ts.getEmitModuleResolutionKind(options) !== ts.ModuleResolutionKind.NodeJs) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_resolveJsonModule_cannot_be_specified_without_node_module_resolution_strategy, "resolveJsonModule");
@@ -90458,7 +90459,7 @@ var ts;
         function getLocalModuleSpecifier(moduleFileName, _a, compilerOptions, host, _b) {
             var getCanonicalFileName = _a.getCanonicalFileName, sourceDirectory = _a.sourceDirectory;
             var ending = _b.ending, relativePreference = _b.relativePreference;
-            var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths, rootDirs = compilerOptions.rootDirs, bundledPackageName = compilerOptions.bundledPackageName;
+            var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths, rootDirs = compilerOptions.rootDirs;
             var relativePath = rootDirs && tryGetModuleNameFromRootDirs(rootDirs, moduleFileName, sourceDirectory, getCanonicalFileName, ending, compilerOptions) ||
                 removeExtensionAndIndexPostFix(ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(sourceDirectory, moduleFileName, getCanonicalFileName)), ending, compilerOptions);
             if (!baseUrl && !paths || relativePreference === 0) {
@@ -90469,9 +90470,8 @@ var ts;
             if (!relativeToBaseUrl) {
                 return relativePath;
             }
-            var bundledPkgReference = bundledPackageName ? ts.combinePaths(bundledPackageName, relativeToBaseUrl) : relativeToBaseUrl;
-            var importRelativeToBaseUrl = removeExtensionAndIndexPostFix(bundledPkgReference, ending, compilerOptions);
-            var fromPaths = paths && tryGetModuleNameFromPaths(ts.removeFileExtension(bundledPkgReference), importRelativeToBaseUrl, paths);
+            var importRelativeToBaseUrl = removeExtensionAndIndexPostFix(relativeToBaseUrl, ending, compilerOptions);
+            var fromPaths = paths && tryGetModuleNameFromPaths(ts.removeFileExtension(relativeToBaseUrl), importRelativeToBaseUrl, paths);
             var nonRelative = fromPaths === undefined && baseUrl !== undefined ? importRelativeToBaseUrl : fromPaths;
             if (!nonRelative) {
                 return relativePath;

package/lib/tsserver.js

@@ -94,7 +94,7 @@ var ts;
     // If changing the text in this section, be sure to test `configurePrerelease` too.
     ts.versionMajorMinor = "4.1";
     /** The version of the TypeScript compiler release */
-    ts.version = "4.1.1-rc";
+    ts.version = "4.1.5";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -7797,8 +7797,6 @@ var ts;
         Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type: diag(1387, ts.DiagnosticCategory.Error, "Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type_1387", "Function type notation must be parenthesized when used in an intersection type."),
         Constructor_type_notation_must_be_parenthesized_when_used_in_an_intersection_type: diag(1388, ts.DiagnosticCategory.Error, "Constructor_type_notation_must_be_parenthesized_when_used_in_an_intersection_type_1388", "Constructor type notation must be parenthesized when used in an intersection type."),
         _0_is_not_allowed_as_a_variable_declaration_name: diag(1389, ts.DiagnosticCategory.Error, "_0_is_not_allowed_as_a_variable_declaration_name_1389", "'{0}' is not allowed as a variable declaration name."),
-        Provides_a_root_package_name_when_using_outFile_with_declarations: diag(1390, ts.DiagnosticCategory.Message, "Provides_a_root_package_name_when_using_outFile_with_declarations_1390", "Provides a root package name when using outFile with declarations."),
-        The_bundledPackageName_option_must_be_provided_when_using_outFile_and_node_module_resolution_with_declaration_emit: diag(1391, ts.DiagnosticCategory.Error, "The_bundledPackageName_option_must_be_provided_when_using_outFile_and_node_module_resolution_with_de_1391", "The `bundledPackageName` option must be provided when using outFile and node module resolution with declaration emit."),
         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),
@@ -14047,6 +14045,18 @@ var ts;
         };
     }
     ts.createDiagnosticForNodeFromMessageChain = createDiagnosticForNodeFromMessageChain;
+    function createDiagnosticForFileFromMessageChain(sourceFile, messageChain, relatedInformation) {
+        return {
+            file: sourceFile,
+            start: 0,
+            length: 0,
+            code: messageChain.code,
+            category: messageChain.category,
+            messageText: messageChain.next ? messageChain : messageChain.messageText,
+            relatedInformation: relatedInformation
+        };
+    }
+    ts.createDiagnosticForFileFromMessageChain = createDiagnosticForFileFromMessageChain;
     function createDiagnosticForRange(sourceFile, range, message) {
         return {
             file: sourceFile,
@@ -16956,16 +16966,7 @@ var ts;
         var filePath = ts.getNormalizedAbsolutePath(fileName, host.getCurrentDirectory());
         var relativePath = ts.getRelativePathToDirectoryOrUrl(dir, filePath, dir, getCanonicalFileName, /*isAbsolutePathAnUrl*/ false);
         var extensionless = removeFileExtension(relativePath);
-        if (referencePath) {
-            return ts.ensurePathIsNonModuleName(extensionless);
-        }
-        var options = host.getCompilerOptions();
-        var rootPkgName = options.bundledPackageName || "";
-        var newPath = ts.combinePaths(rootPkgName, extensionless);
-        if (rootPkgName && getEmitModuleResolutionKind(options) === ts.ModuleResolutionKind.NodeJs && ts.endsWith(newPath, "/index")) {
-            return newPath.slice(0, newPath.length - "/index".length);
-        }
-        return newPath;
+        return referencePath ? ts.ensurePathIsNonModuleName(extensionless) : extensionless;
     }
     ts.getExternalModuleNameFromPath = getExternalModuleNameFromPath;
     function getOwnEmitOutputFilePath(fileName, host, extension) {
@@ -36547,13 +36548,6 @@ var ts;
             category: ts.Diagnostics.Advanced_Options,
             description: ts.Diagnostics.Emit_class_fields_with_Define_instead_of_Set,
         },
-        {
-            name: "bundledPackageName",
-            type: "string",
-            affectsEmit: true,
-            category: ts.Diagnostics.Advanced_Options,
-            description: ts.Diagnostics.Provides_a_root_package_name_when_using_outFile_with_declarations,
-        },
         {
             name: "keyofStringsOnly",
             type: "boolean",
@@ -44115,6 +44109,16 @@ var ts;
             }
         }
         function errorOrSuggestion(isError, location, message, arg0, arg1, arg2, arg3) {
+            // Pseudo-synthesized input node
+            if (location.pos < 0 || location.end < 0) {
+                if (!isError) {
+                    return; // Drop suggestions (we have no span to suggest on)
+                }
+                // Issue errors globally
+                var file = ts.getSourceFileOfNode(location);
+                addErrorOrSuggestion(isError, "message" in message ? ts.createFileDiagnostic(file, 0, 0, message, arg0, arg1, arg2, arg3) : ts.createDiagnosticForFileFromMessageChain(file, message)); // eslint-disable-line no-in-operator
+                return;
+            }
             addErrorOrSuggestion(isError, "message" in message ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2, arg3) : ts.createDiagnosticForNodeFromMessageChain(location, message)); // eslint-disable-line no-in-operator
         }
         function errorAndMaybeSuggestAwait(location, maybeMissingAwait, message, arg0, arg1, arg2, arg3) {
@@ -45690,7 +45694,7 @@ var ts;
             var resolved = getExternalModuleMember(root, commonJSPropertyAccess || node, dontResolveAlias);
             var name = node.propertyName || node.name;
             if (commonJSPropertyAccess && resolved && ts.isIdentifier(name)) {
-                return getPropertyOfType(getTypeOfSymbol(resolved), name.escapedText);
+                return resolveSymbol(getPropertyOfType(getTypeOfSymbol(resolved), name.escapedText), dontResolveAlias);
             }
             markSymbolOfAliasDeclarationIfTypeOnly(node, /*immediateTarget*/ undefined, resolved, /*overwriteEmpty*/ false);
             return resolved;
@@ -47117,7 +47121,6 @@ var ts;
                             getProjectReferenceRedirect: function (fileName) { return host.getProjectReferenceRedirect(fileName); },
                             isSourceOfProjectReferenceRedirect: function (fileName) { return host.isSourceOfProjectReferenceRedirect(fileName); },
                             fileExists: function (fileName) { return host.fileExists(fileName); },
-                            getCompilerOptions: function () { return host.getCompilerOptions(); }
                         } : undefined },
                     encounteredError: false,
                     visitedTypes: undefined,
@@ -48596,8 +48599,7 @@ var ts;
                                     var resolverHost = {
                                         getCanonicalFileName: getCanonicalFileName,
                                         getCurrentDirectory: function () { return context.tracker.moduleResolverHost.getCurrentDirectory(); },
-                                        getCommonSourceDirectory: function () { return context.tracker.moduleResolverHost.getCommonSourceDirectory(); },
-                                        getCompilerOptions: function () { return context.tracker.moduleResolverHost.getCompilerOptions(); }
+                                        getCommonSourceDirectory: function () { return context.tracker.moduleResolverHost.getCommonSourceDirectory(); }
                                     };
                                     var newName = ts.getResolvedExternalModuleName(resolverHost, targetFile);
                                     return ts.factory.createStringLiteral(newName);
@@ -63121,6 +63123,7 @@ var ts;
                     return errorType;
                 }
                 flowDepth++;
+                var sharedFlow;
                 while (true) {
                     var flags = flow.flags;
                     if (flags & 4096 /* Shared */) {
@@ -63133,6 +63136,7 @@ var ts;
                                 return sharedFlowTypes[i];
                             }
                         }
+                        sharedFlow = flow;
                     }
                     var type = void 0;
                     if (flags & 16 /* Assignment */) {
@@ -63196,9 +63200,9 @@ var ts;
                         // simply return the non-auto declared type to reduce follow-on errors.
                         type = convertAutoToAny(declaredType);
                     }
-                    if (flags & 4096 /* Shared */) {
+                    if (sharedFlow) {
                         // Record visited node and the associated type in the cache.
-                        sharedFlowNodes[sharedFlowCount] = flow;
+                        sharedFlowNodes[sharedFlowCount] = sharedFlow;
                         sharedFlowTypes[sharedFlowCount] = type;
                         sharedFlowCount++;
                     }
@@ -66326,10 +66330,10 @@ var ts;
                 return links.jsxNamespace;
             }
             if (!links || links.jsxNamespace !== false) {
-                var namespaceName = getJsxNamespace(location);
-                var resolvedNamespace = resolveName(location, namespaceName, 1920 /* Namespace */, /*diagnosticMessage*/ undefined, namespaceName, /*isUse*/ false);
+                var resolvedNamespace = getJsxNamespaceContainerForImplicitImport(location);
                 if (!resolvedNamespace || resolvedNamespace === unknownSymbol) {
-                    resolvedNamespace = getJsxNamespaceContainerForImplicitImport(location);
+                    var namespaceName = getJsxNamespace(location);
+                    resolvedNamespace = resolveName(location, namespaceName, 1920 /* Namespace */, /*diagnosticMessage*/ undefined, namespaceName, /*isUse*/ false);
                 }
                 if (resolvedNamespace) {
                     var candidate = resolveSymbol(getSymbol(getExportsOfSymbol(resolveSymbol(resolvedNamespace)), JsxNames.JSX, 1920 /* Namespace */));
@@ -66536,23 +66540,25 @@ var ts;
                 checkGrammarJsxElement(node);
             }
             checkJsxPreconditions(node);
-            // The reactNamespace/jsxFactory's root symbol should be marked as 'used' so we don't incorrectly elide its import.
-            // And if there is no reactNamespace/jsxFactory's symbol in scope when targeting React emit, we should issue an error.
-            var jsxFactoryRefErr = diagnostics && compilerOptions.jsx === 2 /* React */ ? ts.Diagnostics.Cannot_find_name_0 : undefined;
-            var jsxFactoryNamespace = getJsxNamespace(node);
-            var jsxFactoryLocation = isNodeOpeningLikeElement ? node.tagName : node;
-            // allow null as jsxFragmentFactory
-            var jsxFactorySym;
-            if (!(ts.isJsxOpeningFragment(node) && jsxFactoryNamespace === "null")) {
-                jsxFactorySym = resolveName(jsxFactoryLocation, jsxFactoryNamespace, 111551 /* Value */, jsxFactoryRefErr, jsxFactoryNamespace, /*isUse*/ true);
-            }
-            if (jsxFactorySym) {
-                // Mark local symbol as referenced here because it might not have been marked
-                // if jsx emit was not jsxFactory as there wont be error being emitted
-                jsxFactorySym.isReferenced = 67108863 /* All */;
-                // If react/jsxFactory symbol is alias, mark it as refereced
-                if (jsxFactorySym.flags & 2097152 /* Alias */ && !getTypeOnlyAliasDeclaration(jsxFactorySym)) {
-                    markAliasSymbolAsReferenced(jsxFactorySym);
+            if (!getJsxNamespaceContainerForImplicitImport(node)) {
+                // The reactNamespace/jsxFactory's root symbol should be marked as 'used' so we don't incorrectly elide its import.
+                // And if there is no reactNamespace/jsxFactory's symbol in scope when targeting React emit, we should issue an error.
+                var jsxFactoryRefErr = diagnostics && compilerOptions.jsx === 2 /* React */ ? ts.Diagnostics.Cannot_find_name_0 : undefined;
+                var jsxFactoryNamespace = getJsxNamespace(node);
+                var jsxFactoryLocation = isNodeOpeningLikeElement ? node.tagName : node;
+                // allow null as jsxFragmentFactory
+                var jsxFactorySym = void 0;
+                if (!(ts.isJsxOpeningFragment(node) && jsxFactoryNamespace === "null")) {
+                    jsxFactorySym = resolveName(jsxFactoryLocation, jsxFactoryNamespace, 111551 /* Value */, jsxFactoryRefErr, jsxFactoryNamespace, /*isUse*/ true);
+                }
+                if (jsxFactorySym) {
+                    // Mark local symbol as referenced here because it might not have been marked
+                    // if jsx emit was not jsxFactory as there wont be error being emitted
+                    jsxFactorySym.isReferenced = 67108863 /* All */;
+                    // If react/jsxFactory symbol is alias, mark it as refereced
+                    if (jsxFactorySym.flags & 2097152 /* Alias */ && !getTypeOnlyAliasDeclaration(jsxFactorySym)) {
+                        markAliasSymbolAsReferenced(jsxFactorySym);
+                    }
                 }
             }
             if (isNodeOpeningLikeElement) {
@@ -68363,9 +68369,9 @@ var ts;
                 var oldCandidatesForArgumentError = candidatesForArgumentError;
                 var oldCandidateForArgumentArityError = candidateForArgumentArityError;
                 var oldCandidateForTypeArgumentError = candidateForTypeArgumentError;
-                var declCount = ts.length((_a = failed.declaration) === null || _a === void 0 ? void 0 : _a.symbol.declarations);
-                var isOverload = declCount > 1;
-                var implDecl = isOverload ? ts.find(((_b = failed.declaration) === null || _b === void 0 ? void 0 : _b.symbol.declarations) || ts.emptyArray, function (d) { return ts.isFunctionLikeDeclaration(d) && ts.nodeIsPresent(d.body); }) : undefined;
+                var failedSignatureDeclarations = ((_b = (_a = failed.declaration) === null || _a === void 0 ? void 0 : _a.symbol) === null || _b === void 0 ? void 0 : _b.declarations) || ts.emptyArray;
+                var isOverload = failedSignatureDeclarations.length > 1;
+                var implDecl = isOverload ? ts.find(failedSignatureDeclarations, function (d) { return ts.isFunctionLikeDeclaration(d) && ts.nodeIsPresent(d.body); }) : undefined;
                 if (implDecl) {
                     var candidate = getSignatureFromDeclaration(implDecl);
                     var isSingleNonGenericCandidate_1 = !candidate.typeParameters;
@@ -107200,10 +107206,6 @@ var ts;
                     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"));
                 }
             }
-            // Without a package name, for multiple files being bundled into a .d.ts file you basically get a file which doesn't wrk
-            if (outputFile && ts.getEmitDeclarations(options) && ts.getEmitModuleResolutionKind(options) === ts.ModuleResolutionKind.NodeJs && !options.bundledPackageName) {
-                createDiagnosticForOptionName(ts.Diagnostics.The_bundledPackageName_option_must_be_provided_when_using_outFile_and_node_module_resolution_with_declaration_emit, options.out ? "out" : "outFile");
-            }
             if (options.resolveJsonModule) {
                 if (ts.getEmitModuleResolutionKind(options) !== ts.ModuleResolutionKind.NodeJs) {
                     createDiagnosticForOptionName(ts.Diagnostics.Option_resolveJsonModule_cannot_be_specified_without_node_module_resolution_strategy, "resolveJsonModule");
@@ -110060,7 +110062,7 @@ var ts;
         function getLocalModuleSpecifier(moduleFileName, _a, compilerOptions, host, _b) {
             var getCanonicalFileName = _a.getCanonicalFileName, sourceDirectory = _a.sourceDirectory;
             var ending = _b.ending, relativePreference = _b.relativePreference;
-            var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths, rootDirs = compilerOptions.rootDirs, bundledPackageName = compilerOptions.bundledPackageName;
+            var baseUrl = compilerOptions.baseUrl, paths = compilerOptions.paths, rootDirs = compilerOptions.rootDirs;
             var relativePath = rootDirs && tryGetModuleNameFromRootDirs(rootDirs, moduleFileName, sourceDirectory, getCanonicalFileName, ending, compilerOptions) ||
                 removeExtensionAndIndexPostFix(ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(sourceDirectory, moduleFileName, getCanonicalFileName)), ending, compilerOptions);
             if (!baseUrl && !paths || relativePreference === 0 /* Relative */) {
@@ -110071,9 +110073,8 @@ var ts;
             if (!relativeToBaseUrl) {
                 return relativePath;
             }
-            var bundledPkgReference = bundledPackageName ? ts.combinePaths(bundledPackageName, relativeToBaseUrl) : relativeToBaseUrl;
-            var importRelativeToBaseUrl = removeExtensionAndIndexPostFix(bundledPkgReference, ending, compilerOptions);
-            var fromPaths = paths && tryGetModuleNameFromPaths(ts.removeFileExtension(bundledPkgReference), importRelativeToBaseUrl, paths);
+            var importRelativeToBaseUrl = removeExtensionAndIndexPostFix(relativeToBaseUrl, ending, compilerOptions);
+            var fromPaths = paths && tryGetModuleNameFromPaths(ts.removeFileExtension(relativeToBaseUrl), importRelativeToBaseUrl, paths);
             var nonRelative = fromPaths === undefined && baseUrl !== undefined ? importRelativeToBaseUrl : fromPaths;
             if (!nonRelative) {
                 return relativePath;
@@ -114848,8 +114849,7 @@ var ts;
             getSourceFiles: function () { return program.getSourceFiles(); },
             redirectTargetsMap: program.redirectTargetsMap,
             getProjectReferenceRedirect: function (fileName) { return program.getProjectReferenceRedirect(fileName); },
-            isSourceOfProjectReferenceRedirect: function (fileName) { return program.isSourceOfProjectReferenceRedirect(fileName); },
-            getCompilerOptions: function () { return program.getCompilerOptions(); }
+            isSourceOfProjectReferenceRedirect: function (fileName) { return program.isSourceOfProjectReferenceRedirect(fileName); }
         };
     }
     ts.createModuleSpecifierResolutionHost = createModuleSpecifierResolutionHost;
@@ -149983,6 +149983,8 @@ var ts;
                 JsxEmit["Preserve"] = "Preserve";
                 JsxEmit["ReactNative"] = "ReactNative";
                 JsxEmit["React"] = "React";
+                JsxEmit["ReactJSX"] = "ReactJSX";
+                JsxEmit["ReactJSXDev"] = "ReactJSXDev";
             })(JsxEmit = protocol.JsxEmit || (protocol.JsxEmit = {}));
             var ModuleKind;
             (function (ModuleKind) {
@@ -149993,6 +149995,7 @@ var ts;
                 ModuleKind["System"] = "System";
                 ModuleKind["ES6"] = "ES6";
                 ModuleKind["ES2015"] = "ES2015";
+                ModuleKind["ES2020"] = "ES2020";
                 ModuleKind["ESNext"] = "ESNext";
             })(ModuleKind = protocol.ModuleKind || (protocol.ModuleKind = {}));
             var ModuleResolutionKind;
@@ -150016,6 +150019,7 @@ var ts;
                 ScriptTarget["ES2018"] = "ES2018";
                 ScriptTarget["ES2019"] = "ES2019";
                 ScriptTarget["ES2020"] = "ES2020";
+                ScriptTarget["JSON"] = "JSON";
                 ScriptTarget["ESNext"] = "ESNext";
             })(ScriptTarget = protocol.ScriptTarget || (protocol.ScriptTarget = {}));
         })(protocol = server.protocol || (server.protocol = {}));
@@ -151955,6 +151959,10 @@ var ts;
             Project.prototype.enablePlugin = function (pluginConfigEntry, searchPaths, pluginConfigOverrides) {
                 var _this = this;
                 this.projectService.logger.info("Enabling plugin " + pluginConfigEntry.name + " from candidate paths: " + searchPaths.join(","));
+                if (!pluginConfigEntry.name || ts.parsePackageName(pluginConfigEntry.name).rest) {
+                    this.projectService.logger.info("Skipped loading plugin " + (pluginConfigEntry.name || JSON.stringify(pluginConfigEntry)) + " because only package name is allowed plugin name");
+                    return;
+                }
                 var log = function (message) { return _this.projectService.logger.info(message); };
                 var errorLogs;
                 var logError = function (message) { (errorLogs || (errorLogs = [])).push(message); };
@@ -157080,7 +157088,7 @@ var ts;
             };
             Session.prototype.getEncodedSemanticClassifications = function (args) {
                 var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
-                return project.getLanguageService().getEncodedSemanticClassifications(file, args);
+                return project.getLanguageService().getEncodedSemanticClassifications(file, args, args.format);
             };
             Session.prototype.getProject = function (projectFileName) {
                 return projectFileName === undefined ? undefined : this.projectService.findProject(projectFileName);

package/lib/tsserverlibrary.d.ts

@@ -2790,7 +2790,6 @@ declare namespace ts {
         allowUnusedLabels?: boolean;
         alwaysStrict?: boolean;
         baseUrl?: string;
-        bundledPackageName?: string;
         charset?: string;
         checkJs?: boolean;
         declaration?: boolean;
@@ -9085,7 +9084,9 @@ declare namespace ts.server.protocol {
         None = "None",
         Preserve = "Preserve",
         ReactNative = "ReactNative",
-        React = "React"
+        React = "React",
+        ReactJSX = "ReactJSX",
+        ReactJSXDev = "ReactJSXDev"
     }
     enum ModuleKind {
         None = "None",
@@ -9095,6 +9096,7 @@ declare namespace ts.server.protocol {
         System = "System",
         ES6 = "ES6",
         ES2015 = "ES2015",
+        ES2020 = "ES2020",
         ESNext = "ESNext"
     }
     enum ModuleResolutionKind {
@@ -9115,6 +9117,7 @@ declare namespace ts.server.protocol {
         ES2018 = "ES2018",
         ES2019 = "ES2019",
         ES2020 = "ES2020",
+        JSON = "JSON",
         ESNext = "ESNext"
     }
 }