typescript 4.7.0-dev.20220316 → 4.7.0-dev.20220319

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.7";
-    ts.version = ts.versionMajorMinor + ".0-dev.20220316";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220319";
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -5437,6 +5437,7 @@ var ts;
         Cannot_use_export_import_on_a_type_or_type_only_namespace_when_the_isolatedModules_flag_is_provided: diag(1269, ts.DiagnosticCategory.Error, "Cannot_use_export_import_on_a_type_or_type_only_namespace_when_the_isolatedModules_flag_is_provided_1269", "Cannot use 'export import' on a type or type-only namespace when the '--isolatedModules' flag is provided."),
         Decorator_function_return_type_0_is_not_assignable_to_type_1: diag(1270, ts.DiagnosticCategory.Error, "Decorator_function_return_type_0_is_not_assignable_to_type_1_1270", "Decorator function return type '{0}' is not assignable to type '{1}'."),
         Decorator_function_return_type_is_0_but_is_expected_to_be_void_or_any: diag(1271, ts.DiagnosticCategory.Error, "Decorator_function_return_type_is_0_but_is_expected_to_be_void_or_any_1271", "Decorator function return type is '{0}' but is expected to be 'void' or 'any'."),
+        A_type_referenced_in_a_decorated_signature_must_be_imported_with_import_type_or_a_namespace_import_when_isolatedModules_and_emitDecoratorMetadata_are_enabled: diag(1272, ts.DiagnosticCategory.Error, "A_type_referenced_in_a_decorated_signature_must_be_imported_with_import_type_or_a_namespace_import_w_1272", "A type referenced in a decorated signature must be imported with 'import type' or a namespace import when 'isolatedModules' and 'emitDecoratorMetadata' are enabled."),
         with_statements_are_not_allowed_in_an_async_function_block: diag(1300, ts.DiagnosticCategory.Error, "with_statements_are_not_allowed_in_an_async_function_block_1300", "'with' statements are not allowed in an async function block."),
         await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules: diag(1308, ts.DiagnosticCategory.Error, "await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules_1308", "'await' expressions are only allowed within async functions and at the top levels of modules."),
         Did_you_mean_to_use_a_Colon_An_can_only_follow_a_property_name_when_the_containing_object_literal_is_part_of_a_destructuring_pattern: diag(1312, ts.DiagnosticCategory.Error, "Did_you_mean_to_use_a_Colon_An_can_only_follow_a_property_name_when_the_containing_object_literal_is_1312", "Did you mean to use a ':'? An '=' can only follow a property name when the containing object literal is part of a destructuring pattern."),
@@ -33318,7 +33319,10 @@ var ts;
     }
     ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
     function parseJsonSourceFileConfigFileContent(sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache, existingWatchOptions) {
-        return parseJsonConfigFileContentWorker(undefined, sourceFile, host, basePath, existingOptions, existingWatchOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache);
+        ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("parse", "parseJsonSourceFileConfigFileContent", { path: sourceFile.fileName });
+        var result = parseJsonConfigFileContentWorker(undefined, sourceFile, host, basePath, existingOptions, existingWatchOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache);
+        ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
+        return result;
     }
     ts.parseJsonSourceFileConfigFileContent = parseJsonSourceFileConfigFileContent;
     function setConfigFileInOptions(options, configFile) {
@@ -48751,7 +48755,15 @@ var ts;
                 return p.typeExpression && ts.isJSDocVariadicType(p.typeExpression.type) ? p.typeExpression.type : undefined;
             });
             var syntheticArgsSymbol = createSymbol(3, "args", 32768);
-            syntheticArgsSymbol.type = lastParamVariadicType ? createArrayType(getTypeFromTypeNode(lastParamVariadicType.type)) : anyArrayType;
+            if (lastParamVariadicType) {
+                syntheticArgsSymbol.type = createArrayType(getTypeFromTypeNode(lastParamVariadicType.type));
+            }
+            else {
+                syntheticArgsSymbol.checkFlags |= 65536;
+                syntheticArgsSymbol.deferralParent = neverType;
+                syntheticArgsSymbol.deferralConstituents = [anyArrayType];
+                syntheticArgsSymbol.deferralWriteConstituents = [anyArrayType];
+            }
             if (lastParamVariadicType) {
                 parameters.pop();
             }
@@ -64247,7 +64259,9 @@ var ts;
             }
             if (signatureHasRestParameter(signature)) {
                 var parameter = ts.last(signature.parameters);
-                if (ts.isTransientSymbol(parameter) || !ts.getEffectiveTypeAnnotationNode(parameter.valueDeclaration)) {
+                if (parameter.valueDeclaration
+                    ? !ts.getEffectiveTypeAnnotationNode(parameter.valueDeclaration)
+                    : !!(ts.getCheckFlags(parameter) & 65536)) {
                     var contextualParameterType = getRestTypeAtPosition(context, len);
                     assignParameterType(parameter, contextualParameterType);
                 }
@@ -64266,8 +64280,8 @@ var ts;
             var links = getSymbolLinks(parameter);
             if (!links.type) {
                 var declaration = parameter.valueDeclaration;
-                links.type = type || getWidenedTypeForVariableLikeDeclaration(declaration, true);
-                if (declaration.name.kind !== 79) {
+                links.type = type || (declaration ? getWidenedTypeForVariableLikeDeclaration(declaration, true) : getTypeOfSymbol(parameter));
+                if (declaration && declaration.name.kind !== 79) {
                     if (links.type === unknownType) {
                         links.type = getTypeFromBindingPattern(declaration.name);
                     }
@@ -67527,26 +67541,37 @@ var ts;
             checkTypeAssignableTo(returnType, expectedReturnType, node, headMessage);
         }
         function markTypeNodeAsReferenced(node) {
-            markEntityNameOrEntityExpressionAsReference(node && ts.getEntityNameFromTypeNode(node));
+            markEntityNameOrEntityExpressionAsReference(node && ts.getEntityNameFromTypeNode(node), false);
         }
-        function markEntityNameOrEntityExpressionAsReference(typeName) {
+        function markEntityNameOrEntityExpressionAsReference(typeName, forDecoratorMetadata) {
             if (!typeName)
                 return;
             var rootName = ts.getFirstIdentifier(typeName);
             var meaning = (typeName.kind === 79 ? 788968 : 1920) | 2097152;
             var rootSymbol = resolveName(rootName, rootName.escapedText, meaning, undefined, undefined, true);
-            if (rootSymbol
-                && rootSymbol.flags & 2097152
-                && symbolIsValue(rootSymbol)
-                && !isConstEnumOrConstEnumOnlyModule(resolveAlias(rootSymbol))
-                && !getTypeOnlyAliasDeclaration(rootSymbol)) {
-                markAliasSymbolAsReferenced(rootSymbol);
+            if (rootSymbol && rootSymbol.flags & 2097152) {
+                if (symbolIsValue(rootSymbol)
+                    && !isConstEnumOrConstEnumOnlyModule(resolveAlias(rootSymbol))
+                    && !getTypeOnlyAliasDeclaration(rootSymbol)) {
+                    markAliasSymbolAsReferenced(rootSymbol);
+                }
+                else if (forDecoratorMetadata
+                    && compilerOptions.isolatedModules
+                    && ts.getEmitModuleKind(compilerOptions) >= ts.ModuleKind.ES2015
+                    && !symbolIsValue(rootSymbol)
+                    && !ts.some(rootSymbol.declarations, ts.isTypeOnlyImportOrExportDeclaration)) {
+                    var diag = error(typeName, ts.Diagnostics.A_type_referenced_in_a_decorated_signature_must_be_imported_with_import_type_or_a_namespace_import_when_isolatedModules_and_emitDecoratorMetadata_are_enabled);
+                    var aliasDeclaration = ts.find(rootSymbol.declarations || ts.emptyArray, isAliasSymbolDeclaration);
+                    if (aliasDeclaration) {
+                        ts.addRelatedInfo(diag, ts.createDiagnosticForNode(aliasDeclaration, ts.Diagnostics._0_was_imported_here, ts.idText(rootName)));
+                    }
+                }
             }
         }
         function markDecoratorMedataDataTypeNodeAsReferenced(node) {
             var entityName = getEntityNameForDecoratorMetadata(node);
             if (entityName && ts.isEntityName(entityName)) {
-                markEntityNameOrEntityExpressionAsReference(entityName);
+                markEntityNameOrEntityExpressionAsReference(entityName, true);
             }
         }
         function getEntityNameForDecoratorMetadata(node) {
@@ -70657,7 +70682,7 @@ var ts;
             if (checkGrammarModuleElementContext(node, ts.isInJSFile(node) ? ts.Diagnostics.An_export_declaration_can_only_be_used_at_the_top_level_of_a_module : ts.Diagnostics.An_export_declaration_can_only_be_used_at_the_top_level_of_a_namespace_or_module)) {
                 return;
             }
-            if (!checkGrammarDecoratorsAndModifiers(node) && ts.hasEffectiveModifiers(node)) {
+            if (!checkGrammarDecoratorsAndModifiers(node) && ts.hasSyntacticModifiers(node)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_declaration_cannot_have_modifiers);
             }
             if (node.moduleSpecifier && node.exportClause && ts.isNamedExports(node.exportClause) && ts.length(node.exportClause.elements) && languageVersion === 0) {
@@ -73546,9 +73571,9 @@ var ts;
                 }
                 var parent = ts.walkUpParenthesizedTypes(node.parent);
                 if (ts.isInJSFile(parent) && ts.isJSDocTypeExpression(parent)) {
-                    parent = parent.parent;
-                    if (ts.isJSDocTypeTag(parent)) {
-                        parent = parent.parent.parent;
+                    var host_2 = ts.getJSDocHost(parent);
+                    if (host_2) {
+                        parent = ts.getSingleVariableOfVariableStatement(host_2) || host_2;
                     }
                 }
                 switch (parent.kind) {

package/lib/tsserver.js

@@ -100,7 +100,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.20220316";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220319";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -8250,6 +8250,7 @@ var ts;
         Cannot_use_export_import_on_a_type_or_type_only_namespace_when_the_isolatedModules_flag_is_provided: diag(1269, ts.DiagnosticCategory.Error, "Cannot_use_export_import_on_a_type_or_type_only_namespace_when_the_isolatedModules_flag_is_provided_1269", "Cannot use 'export import' on a type or type-only namespace when the '--isolatedModules' flag is provided."),
         Decorator_function_return_type_0_is_not_assignable_to_type_1: diag(1270, ts.DiagnosticCategory.Error, "Decorator_function_return_type_0_is_not_assignable_to_type_1_1270", "Decorator function return type '{0}' is not assignable to type '{1}'."),
         Decorator_function_return_type_is_0_but_is_expected_to_be_void_or_any: diag(1271, ts.DiagnosticCategory.Error, "Decorator_function_return_type_is_0_but_is_expected_to_be_void_or_any_1271", "Decorator function return type is '{0}' but is expected to be 'void' or 'any'."),
+        A_type_referenced_in_a_decorated_signature_must_be_imported_with_import_type_or_a_namespace_import_when_isolatedModules_and_emitDecoratorMetadata_are_enabled: diag(1272, ts.DiagnosticCategory.Error, "A_type_referenced_in_a_decorated_signature_must_be_imported_with_import_type_or_a_namespace_import_w_1272", "A type referenced in a decorated signature must be imported with 'import type' or a namespace import when 'isolatedModules' and 'emitDecoratorMetadata' are enabled."),
         with_statements_are_not_allowed_in_an_async_function_block: diag(1300, ts.DiagnosticCategory.Error, "with_statements_are_not_allowed_in_an_async_function_block_1300", "'with' statements are not allowed in an async function block."),
         await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules: diag(1308, ts.DiagnosticCategory.Error, "await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules_1308", "'await' expressions are only allowed within async functions and at the top levels of modules."),
         Did_you_mean_to_use_a_Colon_An_can_only_follow_a_property_name_when_the_containing_object_literal_is_part_of_a_destructuring_pattern: diag(1312, ts.DiagnosticCategory.Error, "Did_you_mean_to_use_a_Colon_An_can_only_follow_a_property_name_when_the_containing_object_literal_is_1312", "Did you mean to use a ':'? An '=' can only follow a property name when the containing object literal is part of a destructuring pattern."),
@@ -40895,7 +40896,10 @@ var ts;
      *    file to. e.g. outDir
      */
     function parseJsonSourceFileConfigFileContent(sourceFile, host, basePath, existingOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache, existingWatchOptions) {
-        return parseJsonConfigFileContentWorker(/*json*/ undefined, sourceFile, host, basePath, existingOptions, existingWatchOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache);
+        ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("parse" /* Parse */, "parseJsonSourceFileConfigFileContent", { path: sourceFile.fileName });
+        var result = parseJsonConfigFileContentWorker(/*json*/ undefined, sourceFile, host, basePath, existingOptions, existingWatchOptions, configFileName, resolutionStack, extraFileExtensions, extendedConfigCache);
+        ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
+        return result;
     }
     ts.parseJsonSourceFileConfigFileContent = parseJsonSourceFileConfigFileContent;
     /*@internal*/
@@ -58896,7 +58900,19 @@ var ts;
                 return p.typeExpression && ts.isJSDocVariadicType(p.typeExpression.type) ? p.typeExpression.type : undefined;
             });
             var syntheticArgsSymbol = createSymbol(3 /* Variable */, "args", 32768 /* RestParameter */);
-            syntheticArgsSymbol.type = lastParamVariadicType ? createArrayType(getTypeFromTypeNode(lastParamVariadicType.type)) : anyArrayType;
+            if (lastParamVariadicType) {
+                // Parameter has effective annotation, lock in type
+                syntheticArgsSymbol.type = createArrayType(getTypeFromTypeNode(lastParamVariadicType.type));
+            }
+            else {
+                // Parameter has no annotation
+                // By using a `DeferredType` symbol, we allow the type of this rest arg to be overriden by contextual type assignment so long as its type hasn't been
+                // cached by `getTypeOfSymbol` yet.
+                syntheticArgsSymbol.checkFlags |= 65536 /* DeferredType */;
+                syntheticArgsSymbol.deferralParent = neverType;
+                syntheticArgsSymbol.deferralConstituents = [anyArrayType];
+                syntheticArgsSymbol.deferralWriteConstituents = [anyArrayType];
+            }
             if (lastParamVariadicType) {
                 // Replace the last parameter with a rest parameter.
                 parameters.pop();
@@ -76783,7 +76799,11 @@ var ts;
             if (signatureHasRestParameter(signature)) {
                 // parameter might be a transient symbol generated by use of `arguments` in the function body.
                 var parameter = ts.last(signature.parameters);
-                if (ts.isTransientSymbol(parameter) || !ts.getEffectiveTypeAnnotationNode(parameter.valueDeclaration)) {
+                if (parameter.valueDeclaration
+                    ? !ts.getEffectiveTypeAnnotationNode(parameter.valueDeclaration)
+                    // a declarationless parameter may still have a `.type` already set by its construction logic
+                    // (which may pull a type from a jsdoc) - only allow fixing on `DeferredType` parameters with a fallback type
+                    : !!(ts.getCheckFlags(parameter) & 65536 /* DeferredType */)) {
                     var contextualParameterType = getRestTypeAtPosition(context, len);
                     assignParameterType(parameter, contextualParameterType);
                 }
@@ -76802,8 +76822,8 @@ var ts;
             var links = getSymbolLinks(parameter);
             if (!links.type) {
                 var declaration = parameter.valueDeclaration;
-                links.type = type || getWidenedTypeForVariableLikeDeclaration(declaration, /*reportErrors*/ true);
-                if (declaration.name.kind !== 79 /* Identifier */) {
+                links.type = type || (declaration ? getWidenedTypeForVariableLikeDeclaration(declaration, /*reportErrors*/ true) : getTypeOfSymbol(parameter));
+                if (declaration && declaration.name.kind !== 79 /* Identifier */) {
                     // if inference didn't come up with anything but unknown, fall back to the binding pattern if present.
                     if (links.type === unknownType) {
                         links.type = getTypeFromBindingPattern(declaration.name);
@@ -80616,20 +80636,31 @@ var ts;
          * marked as referenced to prevent import elision.
          */
         function markTypeNodeAsReferenced(node) {
-            markEntityNameOrEntityExpressionAsReference(node && ts.getEntityNameFromTypeNode(node));
+            markEntityNameOrEntityExpressionAsReference(node && ts.getEntityNameFromTypeNode(node), /*forDecoratorMetadata*/ false);
         }
-        function markEntityNameOrEntityExpressionAsReference(typeName) {
+        function markEntityNameOrEntityExpressionAsReference(typeName, forDecoratorMetadata) {
             if (!typeName)
                 return;
             var rootName = ts.getFirstIdentifier(typeName);
             var meaning = (typeName.kind === 79 /* Identifier */ ? 788968 /* Type */ : 1920 /* Namespace */) | 2097152 /* Alias */;
             var rootSymbol = resolveName(rootName, rootName.escapedText, meaning, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isReference*/ true);
-            if (rootSymbol
-                && rootSymbol.flags & 2097152 /* Alias */
-                && symbolIsValue(rootSymbol)
-                && !isConstEnumOrConstEnumOnlyModule(resolveAlias(rootSymbol))
-                && !getTypeOnlyAliasDeclaration(rootSymbol)) {
-                markAliasSymbolAsReferenced(rootSymbol);
+            if (rootSymbol && rootSymbol.flags & 2097152 /* Alias */) {
+                if (symbolIsValue(rootSymbol)
+                    && !isConstEnumOrConstEnumOnlyModule(resolveAlias(rootSymbol))
+                    && !getTypeOnlyAliasDeclaration(rootSymbol)) {
+                    markAliasSymbolAsReferenced(rootSymbol);
+                }
+                else if (forDecoratorMetadata
+                    && compilerOptions.isolatedModules
+                    && ts.getEmitModuleKind(compilerOptions) >= ts.ModuleKind.ES2015
+                    && !symbolIsValue(rootSymbol)
+                    && !ts.some(rootSymbol.declarations, ts.isTypeOnlyImportOrExportDeclaration)) {
+                    var diag = error(typeName, ts.Diagnostics.A_type_referenced_in_a_decorated_signature_must_be_imported_with_import_type_or_a_namespace_import_when_isolatedModules_and_emitDecoratorMetadata_are_enabled);
+                    var aliasDeclaration = ts.find(rootSymbol.declarations || ts.emptyArray, isAliasSymbolDeclaration);
+                    if (aliasDeclaration) {
+                        ts.addRelatedInfo(diag, ts.createDiagnosticForNode(aliasDeclaration, ts.Diagnostics._0_was_imported_here, ts.idText(rootName)));
+                    }
+                }
             }
         }
         /**
@@ -80642,7 +80673,7 @@ var ts;
         function markDecoratorMedataDataTypeNodeAsReferenced(node) {
             var entityName = getEntityNameForDecoratorMetadata(node);
             if (entityName && ts.isEntityName(entityName)) {
-                markEntityNameOrEntityExpressionAsReference(entityName);
+                markEntityNameOrEntityExpressionAsReference(entityName, /*forDecoratorMetadata*/ true);
             }
         }
         function getEntityNameForDecoratorMetadata(node) {
@@ -84294,7 +84325,7 @@ var ts;
                 // If we hit an export in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
-            if (!checkGrammarDecoratorsAndModifiers(node) && ts.hasEffectiveModifiers(node)) {
+            if (!checkGrammarDecoratorsAndModifiers(node) && ts.hasSyntacticModifiers(node)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_declaration_cannot_have_modifiers);
             }
             if (node.moduleSpecifier && node.exportClause && ts.isNamedExports(node.exportClause) && ts.length(node.exportClause.elements) && languageVersion === 0 /* ES3 */) {
@@ -87471,10 +87502,9 @@ var ts;
                 }
                 var parent = ts.walkUpParenthesizedTypes(node.parent);
                 if (ts.isInJSFile(parent) && ts.isJSDocTypeExpression(parent)) {
-                    parent = parent.parent;
-                    if (ts.isJSDocTypeTag(parent)) {
-                        // walk up past JSDoc comment node
-                        parent = parent.parent.parent;
+                    var host_2 = ts.getJSDocHost(parent);
+                    if (host_2) {
+                        parent = ts.getSingleVariableOfVariableStatement(host_2) || host_2;
                     }
                 }
                 switch (parent.kind) {
@@ -130292,14 +130322,15 @@ var ts;
             SortText["SuggestedClassMembers"] = "14";
             SortText["GlobalsOrKeywords"] = "15";
             SortText["AutoImportSuggestions"] = "16";
-            SortText["JavascriptIdentifiers"] = "17";
-            SortText["DeprecatedLocalDeclarationPriority"] = "18";
-            SortText["DeprecatedLocationPriority"] = "19";
-            SortText["DeprecatedOptionalMember"] = "20";
-            SortText["DeprecatedMemberDeclaredBySpreadAssignment"] = "21";
-            SortText["DeprecatedSuggestedClassMembers"] = "22";
-            SortText["DeprecatedGlobalsOrKeywords"] = "23";
-            SortText["DeprecatedAutoImportSuggestions"] = "24";
+            SortText["ClassMemberSnippets"] = "17";
+            SortText["JavascriptIdentifiers"] = "18";
+            SortText["DeprecatedLocalDeclarationPriority"] = "19";
+            SortText["DeprecatedLocationPriority"] = "20";
+            SortText["DeprecatedOptionalMember"] = "21";
+            SortText["DeprecatedMemberDeclaredBySpreadAssignment"] = "22";
+            SortText["DeprecatedSuggestedClassMembers"] = "23";
+            SortText["DeprecatedGlobalsOrKeywords"] = "24";
+            SortText["DeprecatedAutoImportSuggestions"] = "25";
         })(SortText = Completions.SortText || (Completions.SortText = {}));
         var SortTextId;
         (function (SortTextId) {
@@ -130311,10 +130342,10 @@ var ts;
             SortTextId[SortTextId["GlobalsOrKeywords"] = 15] = "GlobalsOrKeywords";
             SortTextId[SortTextId["AutoImportSuggestions"] = 16] = "AutoImportSuggestions";
             // Don't use these directly.
-            SortTextId[SortTextId["_JavaScriptIdentifiers"] = 17] = "_JavaScriptIdentifiers";
-            SortTextId[SortTextId["_DeprecatedStart"] = 18] = "_DeprecatedStart";
+            SortTextId[SortTextId["_JavaScriptIdentifiers"] = 18] = "_JavaScriptIdentifiers";
+            SortTextId[SortTextId["_DeprecatedStart"] = 19] = "_DeprecatedStart";
             SortTextId[SortTextId["_First"] = 10] = "_First";
-            SortTextId[SortTextId["DeprecatedOffset"] = 8] = "DeprecatedOffset";
+            SortTextId[SortTextId["DeprecatedOffset"] = 9] = "DeprecatedOffset";
         })(SortTextId || (SortTextId = {}));
         /**
          * Special values for `CompletionInfo['source']` used to disambiguate
@@ -130795,6 +130826,7 @@ var ts;
                 isClassLikeMemberCompletion(symbol, location)) {
                 var importAdder = void 0;
                 (_b = getEntryForMemberCompletion(host, program, options, preferences, name, symbol, location, contextToken, formatContext), insertText = _b.insertText, isSnippet = _b.isSnippet, importAdder = _b.importAdder, replacementSpan = _b.replacementSpan);
+                sortText = SortText.ClassMemberSnippets; // sortText has to be lower priority than the sortText for keywords. See #47852.
                 if (importAdder === null || importAdder === void 0 ? void 0 : importAdder.hasFixes()) {
                     hasAction = true;
                     source = CompletionSource.ClassMemberSnippet;
@@ -131158,7 +131190,7 @@ var ts;
                 }
                 var name = info.name, needsConvertPropertyAccess = info.needsConvertPropertyAccess;
                 var sortTextId = (_a = symbolToSortTextIdMap === null || symbolToSortTextIdMap === void 0 ? void 0 : symbolToSortTextIdMap[ts.getSymbolId(symbol)]) !== null && _a !== void 0 ? _a : 11 /* LocationPriority */;
-                var sortText = (isDeprecated(symbol, typeChecker) ? 8 /* DeprecatedOffset */ + sortTextId : sortTextId).toString();
+                var sortText = (isDeprecated(symbol, typeChecker) ? 9 /* DeprecatedOffset */ + sortTextId : sortTextId).toString();
                 var entry = createCompletionEntry(symbol, sortText, replacementToken, contextToken, location, sourceFile, host, program, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importCompletionNode, useSemicolons, compilerOptions, preferences, kind, formatContext, isJsxIdentifierExpected, isRightOfOpenTag);
                 if (!entry) {
                     continue;
@@ -142398,7 +142430,7 @@ var ts;
                     if (!typeDisplayString) {
                         continue;
                     }
-                    addTypeHints(typeDisplayString, param.name.end);
+                    addTypeHints(typeDisplayString, param.questionToken ? param.questionToken.end : param.name.end);
                 }
             }
             function getParameterDeclarationTypeDisplayString(symbol) {
@@ -153577,6 +153609,74 @@ var ts;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var fixId = "fixUnreferenceableDecoratorMetadata";
+        var errorCodes = [ts.Diagnostics.A_type_referenced_in_a_decorated_signature_must_be_imported_with_import_type_or_a_namespace_import_when_isolatedModules_and_emitDecoratorMetadata_are_enabled.code];
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var importDeclaration = getImportDeclaration(context.sourceFile, context.program, context.span.start);
+                if (!importDeclaration)
+                    return;
+                var namespaceChanges = ts.textChanges.ChangeTracker.with(context, function (t) { return importDeclaration.kind === 269 /* ImportSpecifier */ && doNamespaceImportChange(t, context.sourceFile, importDeclaration, context.program); });
+                var typeOnlyChanges = ts.textChanges.ChangeTracker.with(context, function (t) { return doTypeOnlyImportChange(t, context.sourceFile, importDeclaration, context.program); });
+                var actions;
+                if (namespaceChanges.length) {
+                    actions = ts.append(actions, codefix.createCodeFixActionWithoutFixAll(fixId, namespaceChanges, ts.Diagnostics.Convert_named_imports_to_namespace_import));
+                }
+                if (typeOnlyChanges.length) {
+                    actions = ts.append(actions, codefix.createCodeFixActionWithoutFixAll(fixId, typeOnlyChanges, ts.Diagnostics.Convert_to_type_only_import));
+                }
+                return actions;
+            },
+            fixIds: [fixId],
+        });
+        function getImportDeclaration(sourceFile, program, start) {
+            var identifier = ts.tryCast(ts.getTokenAtPosition(sourceFile, start), ts.isIdentifier);
+            if (!identifier || identifier.parent.kind !== 177 /* TypeReference */)
+                return;
+            var checker = program.getTypeChecker();
+            var symbol = checker.getSymbolAtLocation(identifier);
+            return ts.find((symbol === null || symbol === void 0 ? void 0 : symbol.declarations) || ts.emptyArray, ts.or(ts.isImportClause, ts.isImportSpecifier, ts.isImportEqualsDeclaration));
+        }
+        // Converts the import declaration of the offending import to a type-only import,
+        // only if it can be done without affecting other imported names. If the conversion
+        // cannot be done cleanly, we could offer to *extract* the offending import to a
+        // new type-only import declaration, but honestly I doubt anyone will ever use this
+        // codefix at all, so it's probably not worth the lines of code.
+        function doTypeOnlyImportChange(changes, sourceFile, importDeclaration, program) {
+            if (importDeclaration.kind === 264 /* ImportEqualsDeclaration */) {
+                changes.insertModifierBefore(sourceFile, 151 /* TypeKeyword */, importDeclaration.name);
+                return;
+            }
+            var importClause = importDeclaration.kind === 266 /* ImportClause */ ? importDeclaration : importDeclaration.parent.parent;
+            if (importClause.name && importClause.namedBindings) {
+                // Cannot convert an import with a default import and named bindings to type-only
+                // (it's a grammar error).
+                return;
+            }
+            var checker = program.getTypeChecker();
+            var importsValue = !!ts.forEachImportClauseDeclaration(importClause, function (decl) {
+                if (ts.skipAlias(decl.symbol, checker).flags & 111551 /* Value */)
+                    return true;
+            });
+            if (importsValue) {
+                // Assume that if someone wrote a non-type-only import that includes some values,
+                // they intend to use those values in value positions, even if they haven't yet.
+                // Don't convert it to type-only.
+                return;
+            }
+            changes.insertModifierBefore(sourceFile, 151 /* TypeKeyword */, importClause);
+        }
+        function doNamespaceImportChange(changes, sourceFile, importDeclaration, program) {
+            ts.refactor.doChangeNamedToNamespaceOrDefault(sourceFile, program, changes, importDeclaration.parent);
+        }
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
 (function (ts) {
     var codefix;
     (function (codefix) {
@@ -156144,6 +156244,7 @@ var ts;
             return codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Add_definite_assignment_assertion_to_property_0, info.prop.getText()], fixIdAddDefiniteAssignmentAssertions, ts.Diagnostics.Add_definite_assignment_assertions_to_all_uninitialized_properties);
         }
         function addDefiniteAssignmentAssertion(changeTracker, propertyDeclarationSourceFile, propertyDeclaration) {
+            ts.suppressLeadingAndTrailingTrivia(propertyDeclaration);
             var property = ts.factory.updatePropertyDeclaration(propertyDeclaration, propertyDeclaration.decorators, propertyDeclaration.modifiers, propertyDeclaration.name, ts.factory.createToken(53 /* ExclamationToken */), propertyDeclaration.type, propertyDeclaration.initializer);
             changeTracker.replaceNode(propertyDeclarationSourceFile, propertyDeclaration, property);
         }
@@ -156173,6 +156274,7 @@ var ts;
             return codefix.createCodeFixAction(fixName, changes, [ts.Diagnostics.Add_initializer_to_property_0, info.prop.name.getText()], fixIdAddInitializer, ts.Diagnostics.Add_initializers_to_all_uninitialized_properties);
         }
         function addInitializer(changeTracker, propertyDeclarationSourceFile, propertyDeclaration, initializer) {
+            ts.suppressLeadingAndTrailingTrivia(propertyDeclaration);
             var property = ts.factory.updatePropertyDeclaration(propertyDeclaration, propertyDeclaration.decorators, propertyDeclaration.modifiers, propertyDeclaration.name, propertyDeclaration.questionToken, propertyDeclaration.type, initializer);
             changeTracker.replaceNode(propertyDeclarationSourceFile, propertyDeclaration, property);
         }
@@ -157096,20 +157198,22 @@ var ts;
             if (importClause.namedBindings.kind === 267 /* NamespaceImport */) {
                 return { convertTo: 0 /* Named */, import: importClause.namedBindings };
             }
-            var compilerOptions = context.program.getCompilerOptions();
-            var shouldUseDefault = ts.getAllowSyntheticDefaultImports(compilerOptions)
-                && isExportEqualsModule(importClause.parent.moduleSpecifier, context.program.getTypeChecker());
+            var shouldUseDefault = getShouldUseDefault(context.program, importClause);
             return shouldUseDefault
                 ? { convertTo: 1 /* Default */, import: importClause.namedBindings }
                 : { convertTo: 2 /* Namespace */, import: importClause.namedBindings };
         }
+        function getShouldUseDefault(program, importClause) {
+            return ts.getAllowSyntheticDefaultImports(program.getCompilerOptions())
+                && isExportEqualsModule(importClause.parent.moduleSpecifier, program.getTypeChecker());
+        }
         function doChange(sourceFile, program, changes, info) {
             var checker = program.getTypeChecker();
             if (info.convertTo === 0 /* Named */) {
                 doChangeNamespaceToNamed(sourceFile, checker, changes, info.import, ts.getAllowSyntheticDefaultImports(program.getCompilerOptions()));
             }
             else {
-                doChangeNamedToNamespaceOrDefault(sourceFile, checker, changes, info.import, info.convertTo === 1 /* Default */);
+                doChangeNamedToNamespaceOrDefault(sourceFile, program, changes, info.import, info.convertTo === 1 /* Default */);
             }
         }
         function doChangeNamespaceToNamed(sourceFile, checker, changes, toConvert, allowSyntheticDefaultImports) {
@@ -157159,7 +157263,9 @@ var ts;
         function getLeftOfPropertyAccessOrQualifiedName(propertyAccessOrQualifiedName) {
             return ts.isPropertyAccessExpression(propertyAccessOrQualifiedName) ? propertyAccessOrQualifiedName.expression : propertyAccessOrQualifiedName.left;
         }
-        function doChangeNamedToNamespaceOrDefault(sourceFile, checker, changes, toConvert, shouldUseDefault) {
+        function doChangeNamedToNamespaceOrDefault(sourceFile, program, changes, toConvert, shouldUseDefault) {
+            if (shouldUseDefault === void 0) { shouldUseDefault = getShouldUseDefault(program, toConvert.parent); }
+            var checker = program.getTypeChecker();
             var importDecl = toConvert.parent.parent;
             var moduleSpecifier = importDecl.moduleSpecifier;
             var toConvertSymbols = new ts.Set();
@@ -157220,6 +157326,7 @@ var ts;
                 changes.insertNodeAfter(sourceFile, toConvert.parent.parent, updateImport(importDecl, /*defaultImportName*/ undefined, newNamedImports));
             }
         }
+        refactor.doChangeNamedToNamespaceOrDefault = doChangeNamedToNamespaceOrDefault;
         function isExportEqualsModule(moduleSpecifier, checker) {
             var externalModule = checker.resolveExternalModuleName(moduleSpecifier);
             if (!externalModule)
@@ -158620,7 +158727,9 @@ var ts;
                 var checker = context.program.getTypeChecker();
                 // Make a unique name for the extracted variable
                 var file = scope.getSourceFile();
-                var localNameText = ts.getUniqueName(ts.isClassLike(scope) ? "newProperty" : "newLocal", file);
+                var localNameText = ts.isPropertyAccessExpression(node) && !ts.isClassLike(scope) && !checker.resolveName(node.name.text, node, 111551 /* Value */, /*excludeGlobals*/ false) && !ts.isPrivateIdentifier(node.name) && !ts.isKeyword(node.name.originalKeywordKind)
+                    ? node.name.text
+                    : ts.getUniqueName(ts.isClassLike(scope) ? "newProperty" : "newLocal", file);
                 var isJS = ts.isInJSFile(scope);
                 var variableType = isJS || !checker.isContextSensitive(node)
                     ? undefined
@@ -162387,10 +162496,12 @@ var ts;
             this.fileNameToEntry = new ts.Map();
             // Initialize the list with the root file names
             var rootFileNames = host.getScriptFileNames();
+            ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("session" /* Session */, "initializeHostCache", { count: rootFileNames.length });
             for (var _i = 0, rootFileNames_1 = rootFileNames; _i < rootFileNames_1.length; _i++) {
                 var fileName = rootFileNames_1[_i];
                 this.createEntry(fileName, ts.toPath(fileName, this.currentDirectory, getCanonicalFileName));
             }
+            ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
         }
         HostCache.prototype.createEntry = function (fileName, path) {
             var entry;
@@ -167878,6 +167989,7 @@ var ts;
              */
             Project.prototype.updateGraph = function () {
                 var _a;
+                ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("session" /* Session */, "updateGraph", { name: this.projectName, kind: ProjectKind[this.projectKind] });
                 ts.perfLogger.logStartUpdateGraph();
                 this.resolutionCache.startRecordingFilesWithChangedResolutions();
                 var hasNewProgram = this.updateGraphWorker();
@@ -167921,6 +168033,7 @@ var ts;
                     this.getPackageJsonAutoImportProvider();
                 }
                 ts.perfLogger.logStopUpdateGraph();
+                ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
                 return !hasNewProgram;
             };
             /*@internal*/
@@ -167953,7 +168066,9 @@ var ts;
                 this.resolutionCache.startCachingPerDirectoryResolution();
                 this.program = this.languageService.getProgram(); // TODO: GH#18217
                 this.dirty = false;
+                ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("session" /* Session */, "finishCachingPerDirectoryResolution");
                 this.resolutionCache.finishCachingPerDirectoryResolution();
+                ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
                 ts.Debug.assert(oldProgram === undefined || this.program !== undefined);
                 // bump up the version if
                 // - oldProgram is not set - this is a first time updateGraph is called
@@ -168501,13 +168616,16 @@ var ts;
                 }
                 var dependencySelection = this.includePackageJsonAutoImports();
                 if (dependencySelection) {
+                    ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("session" /* Session */, "getPackageJsonAutoImportProvider");
                     var start = ts.timestamp();
                     this.autoImportProviderHost = AutoImportProviderProject.create(dependencySelection, this, this.getModuleResolutionHostForAutoImportProvider(), this.documentRegistry);
                     if (this.autoImportProviderHost) {
                         server.updateProjectIfDirty(this.autoImportProviderHost);
                         this.sendPerformanceEvent("CreatePackageJsonAutoImportProvider", ts.timestamp() - start);
+                        ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
                         return this.autoImportProviderHost.getCurrentProgram();
                     }
+                    ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
                 }
             };
             /*@internal*/
@@ -168527,10 +168645,14 @@ var ts;
         }());
         server.Project = Project;
         function getUnresolvedImports(program, cachedUnresolvedImportsPerFile) {
+            var sourceFiles = program.getSourceFiles();
+            ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("session" /* Session */, "getUnresolvedImports", { count: sourceFiles.length });
             var ambientModules = program.getTypeChecker().getAmbientModules().map(function (mod) { return ts.stripQuotes(mod.getName()); });
-            return ts.sortAndDeduplicate(ts.flatMap(program.getSourceFiles(), function (sourceFile) {
+            var result = ts.sortAndDeduplicate(ts.flatMap(sourceFiles, function (sourceFile) {
                 return extractUnresolvedImportsFromSourceFile(sourceFile, ambientModules, cachedUnresolvedImportsPerFile);
             }));
+            ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
+            return result;
         }
         function extractUnresolvedImportsFromSourceFile(file, ambientModules, cachedUnresolvedImportsPerFile) {
             return ts.getOrUpdate(cachedUnresolvedImportsPerFile, file.path, function () {
@@ -170604,6 +170726,7 @@ var ts;
             };
             /* @internal */
             ProjectService.prototype.createConfiguredProject = function (configFileName) {
+                ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.instant("session" /* Session */, "createConfiguredProject", { configFilePath: configFileName });
                 this.logger.info("Creating configuration project " + configFileName);
                 var canonicalConfigFilePath = server.asNormalizedPath(this.toCanonicalFileName(configFileName));
                 var configFileExistenceInfo = this.configFileExistenceInfoCache.get(canonicalConfigFilePath);
@@ -170652,6 +170775,7 @@ var ts;
             /* @internal */
             ProjectService.prototype.loadConfiguredProject = function (project, reason) {
                 var _this = this;
+                ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("session" /* Session */, "loadConfiguredProject", { configFilePath: project.canonicalConfigFilePath });
                 this.sendProjectLoadingStartEvent(project, reason);
                 // Read updated contents from disk
                 var configFilename = server.asNormalizedPath(ts.normalizePath(project.getConfigFilePath()));
@@ -170687,6 +170811,7 @@ var ts;
                 project.enablePluginsWithOptions(compilerOptions, this.currentPluginConfigOverrides);
                 var filesToAdd = parsedCommandLine.fileNames.concat(project.getExternalFiles());
                 this.updateRootAndOptionsOfNonInferredProject(project, filesToAdd, fileNamePropertyReader, compilerOptions, parsedCommandLine.typeAcquisition, parsedCommandLine.compileOnSave, parsedCommandLine.watchOptions);
+                ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
             };
             /*@internal*/
             ProjectService.prototype.ensureParsedConfigUptoDate = function (configFilename, canonicalConfigFilePath, configFileExistenceInfo, forProject) {
@@ -173735,7 +173860,6 @@ var ts;
                 this.host.write(msgText);
             };
             Session.prototype.event = function (body, eventName) {
-                ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.instant("session" /* Session */, "event", { eventName: eventName });
                 this.send(toEvent(eventName, body));
             };
             // For backwards-compatibility only.
@@ -173784,16 +173908,22 @@ var ts;
                 this.send(res);
             };
             Session.prototype.semanticCheck = function (file, project) {
+                ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("session" /* Session */, "semanticCheck", { file: file, configFilePath: project.canonicalConfigFilePath }); // undefined is fine if the cast fails
                 var diags = isDeclarationFileInJSOnlyNonConfiguredProject(project, file)
                     ? server.emptyArray
                     : project.getLanguageService().getSemanticDiagnostics(file).filter(function (d) { return !!d.file; });
                 this.sendDiagnosticsEvent(file, project, diags, "semanticDiag");
+                ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
             };
             Session.prototype.syntacticCheck = function (file, project) {
+                ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("session" /* Session */, "syntacticCheck", { file: file, configFilePath: project.canonicalConfigFilePath }); // undefined is fine if the cast fails
                 this.sendDiagnosticsEvent(file, project, project.getLanguageService().getSyntacticDiagnostics(file), "syntaxDiag");
+                ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
             };
             Session.prototype.suggestionCheck = function (file, project) {
+                ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("session" /* Session */, "suggestionCheck", { file: file, configFilePath: project.canonicalConfigFilePath }); // undefined is fine if the cast fails
                 this.sendDiagnosticsEvent(file, project, project.getLanguageService().getSuggestionDiagnostics(file), "suggestionDiag");
+                ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
             };
             Session.prototype.sendDiagnosticsEvent = function (file, project, diagnostics, kind) {
                 try {