typescript 4.7.0-dev.20220315 → 4.7.0-dev.20220318

package/lib/typescriptServices.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.20220315";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220318";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -8228,7 +8228,7 @@ var ts;
         Identifier_expected: diag(1003, ts.DiagnosticCategory.Error, "Identifier_expected_1003", "Identifier expected."),
         _0_expected: diag(1005, ts.DiagnosticCategory.Error, "_0_expected_1005", "'{0}' expected."),
         A_file_cannot_have_a_reference_to_itself: diag(1006, ts.DiagnosticCategory.Error, "A_file_cannot_have_a_reference_to_itself_1006", "A file cannot have a reference to itself."),
-        The_parser_expected_to_find_a_to_match_the_token_here: diag(1007, ts.DiagnosticCategory.Error, "The_parser_expected_to_find_a_to_match_the_token_here_1007", "The parser expected to find a '}' to match the '{' token here."),
+        The_parser_expected_to_find_a_1_to_match_the_0_token_here: diag(1007, ts.DiagnosticCategory.Error, "The_parser_expected_to_find_a_1_to_match_the_0_token_here_1007", "The parser expected to find a '{1}' to match the '{0}' token here."),
         Trailing_comma_not_allowed: diag(1009, ts.DiagnosticCategory.Error, "Trailing_comma_not_allowed_1009", "Trailing comma not allowed."),
         Asterisk_Slash_expected: diag(1010, ts.DiagnosticCategory.Error, "Asterisk_Slash_expected_1010", "'*/' expected."),
         An_element_access_expression_should_take_an_argument: diag(1011, ts.DiagnosticCategory.Error, "An_element_access_expression_should_take_an_argument_1011", "An element access expression should take an argument."),
@@ -8444,6 +8444,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."),
@@ -31620,20 +31621,23 @@ var ts;
             return inContext(32768 /* AwaitContext */);
         }
         function parseErrorAtCurrentToken(message, arg0) {
-            parseErrorAt(scanner.getTokenPos(), scanner.getTextPos(), message, arg0);
+            return parseErrorAt(scanner.getTokenPos(), scanner.getTextPos(), message, arg0);
         }
         function parseErrorAtPosition(start, length, message, arg0) {
             // Don't report another error if it would just be at the same position as the last error.
             var lastError = ts.lastOrUndefined(parseDiagnostics);
+            var result;
             if (!lastError || start !== lastError.start) {
-                parseDiagnostics.push(ts.createDetachedDiagnostic(fileName, start, length, message, arg0));
+                result = ts.createDetachedDiagnostic(fileName, start, length, message, arg0);
+                parseDiagnostics.push(result);
             }
             // Mark that we've encountered an error.  We'll set an appropriate bit on the next
             // node we finish so that it can't be reused incrementally.
             parseErrorBeforeNextFinishedNode = true;
+            return result;
         }
         function parseErrorAt(start, end, message, arg0) {
-            parseErrorAtPosition(start, end - start, message, arg0);
+            return parseErrorAtPosition(start, end - start, message, arg0);
         }
         function parseErrorAtRange(range, message, arg0) {
             parseErrorAt(range.pos, range.end, message, arg0);
@@ -31906,6 +31910,19 @@ var ts;
             parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(kind));
             return false;
         }
+        function parseExpectedMatchingBrackets(openKind, closeKind, openParsed, openPosition) {
+            if (token() === closeKind) {
+                nextToken();
+                return;
+            }
+            var lastError = parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(closeKind));
+            if (!openParsed) {
+                return;
+            }
+            if (lastError) {
+                ts.addRelatedInfo(lastError, ts.createDetachedDiagnostic(fileName, openPosition, 1, ts.Diagnostics.The_parser_expected_to_find_a_1_to_match_the_0_token_here, ts.tokenToString(openKind), ts.tokenToString(closeKind)));
+            }
+        }
         function parseOptional(t) {
             if (token() === t) {
                 nextToken();
@@ -33554,7 +33571,7 @@ var ts;
             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));
+                    ts.addRelatedInfo(lastError, ts.createDetachedDiagnostic(fileName, openBracePosition, 1, ts.Diagnostics.The_parser_expected_to_find_a_1_to_match_the_0_token_here, "{", "}"));
                 }
             }
             return finishNode(factory.createImportTypeAssertionContainer(clause, multiLine), pos);
@@ -35364,10 +35381,11 @@ var ts;
         }
         function parseArrayLiteralExpression() {
             var pos = getNodePos();
-            parseExpected(22 /* OpenBracketToken */);
+            var openBracketPosition = scanner.getTokenPos();
+            var openBracketParsed = parseExpected(22 /* OpenBracketToken */);
             var multiLine = scanner.hasPrecedingLineBreak();
             var elements = parseDelimitedList(15 /* ArrayLiteralMembers */, parseArgumentOrArrayLiteralElement);
-            parseExpected(23 /* CloseBracketToken */);
+            parseExpectedMatchingBrackets(22 /* OpenBracketToken */, 23 /* CloseBracketToken */, openBracketParsed, openBracketPosition);
             return finishNode(factory.createArrayLiteralExpression(elements, multiLine), pos);
         }
         function parseObjectLiteralElement() {
@@ -35424,15 +35442,10 @@ var ts;
         function parseObjectLiteralExpression() {
             var pos = getNodePos();
             var openBracePosition = scanner.getTokenPos();
-            parseExpected(18 /* OpenBraceToken */);
+            var openBraceParsed = parseExpected(18 /* OpenBraceToken */);
             var multiLine = scanner.hasPrecedingLineBreak();
             var properties = parseDelimitedList(12 /* ObjectLiteralMembers */, parseObjectLiteralElement, /*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));
-                }
-            }
+            parseExpectedMatchingBrackets(18 /* OpenBraceToken */, 19 /* CloseBraceToken */, openBraceParsed, openBracePosition);
             return finishNode(factory.createObjectLiteralExpression(properties, multiLine), pos);
         }
         function parseFunctionExpression() {
@@ -35488,15 +35501,11 @@ var ts;
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             var openBracePosition = scanner.getTokenPos();
-            if (parseExpected(18 /* OpenBraceToken */, diagnosticMessage) || ignoreMissingOpenBrace) {
+            var openBraceParsed = parseExpected(18 /* OpenBraceToken */, diagnosticMessage);
+            if (openBraceParsed || ignoreMissingOpenBrace) {
                 var multiLine = scanner.hasPrecedingLineBreak();
                 var statements = parseList(1 /* BlockStatements */, parseStatement);
-                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));
-                    }
-                }
+                parseExpectedMatchingBrackets(18 /* OpenBraceToken */, 19 /* CloseBraceToken */, openBraceParsed, openBracePosition);
                 var result = withJSDoc(finishNode(factory.createBlock(statements, multiLine), pos), hasJSDoc);
                 if (token() === 63 /* EqualsToken */) {
                     parseErrorAtCurrentToken(ts.Diagnostics.Declaration_or_statement_expected_This_follows_a_block_of_statements_so_if_you_intended_to_write_a_destructuring_assignment_you_might_need_to_wrap_the_the_whole_assignment_in_parentheses);
@@ -35541,9 +35550,10 @@ var ts;
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(99 /* IfKeyword */);
-            parseExpected(20 /* OpenParenToken */);
+            var openParenPosition = scanner.getTokenPos();
+            var openParenParsed = parseExpected(20 /* OpenParenToken */);
             var expression = allowInAnd(parseExpression);
-            parseExpected(21 /* CloseParenToken */);
+            parseExpectedMatchingBrackets(20 /* OpenParenToken */, 21 /* CloseParenToken */, openParenParsed, openParenPosition);
             var thenStatement = parseStatement();
             var elseStatement = parseOptional(91 /* ElseKeyword */) ? parseStatement() : undefined;
             return withJSDoc(finishNode(factory.createIfStatement(expression, thenStatement, elseStatement), pos), hasJSDoc);
@@ -35554,9 +35564,10 @@ var ts;
             parseExpected(90 /* DoKeyword */);
             var statement = parseStatement();
             parseExpected(115 /* WhileKeyword */);
-            parseExpected(20 /* OpenParenToken */);
+            var openParenPosition = scanner.getTokenPos();
+            var openParenParsed = parseExpected(20 /* OpenParenToken */);
             var expression = allowInAnd(parseExpression);
-            parseExpected(21 /* CloseParenToken */);
+            parseExpectedMatchingBrackets(20 /* OpenParenToken */, 21 /* CloseParenToken */, openParenParsed, openParenPosition);
             // From: https://mail.mozilla.org/pipermail/es-discuss/2011-August/016188.html
             // 157 min --- All allen at wirfs-brock.com CONF --- "do{;}while(false)false" prohibited in
             // spec but allowed in consensus reality. Approved -- this is the de-facto standard whereby
@@ -35568,9 +35579,10 @@ var ts;
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(115 /* WhileKeyword */);
-            parseExpected(20 /* OpenParenToken */);
+            var openParenPosition = scanner.getTokenPos();
+            var openParenParsed = parseExpected(20 /* OpenParenToken */);
             var expression = allowInAnd(parseExpression);
-            parseExpected(21 /* CloseParenToken */);
+            parseExpectedMatchingBrackets(20 /* OpenParenToken */, 21 /* CloseParenToken */, openParenParsed, openParenPosition);
             var statement = parseStatement();
             return withJSDoc(finishNode(factory.createWhileStatement(expression, statement), pos), hasJSDoc);
         }
@@ -35637,9 +35649,10 @@ var ts;
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(116 /* WithKeyword */);
-            parseExpected(20 /* OpenParenToken */);
+            var openParenPosition = scanner.getTokenPos();
+            var openParenParsed = parseExpected(20 /* OpenParenToken */);
             var expression = allowInAnd(parseExpression);
-            parseExpected(21 /* CloseParenToken */);
+            parseExpectedMatchingBrackets(20 /* OpenParenToken */, 21 /* CloseParenToken */, openParenParsed, openParenPosition);
             var statement = doInsideOfContext(16777216 /* InWithStatement */, parseStatement);
             return withJSDoc(finishNode(factory.createWithStatement(expression, statement), pos), hasJSDoc);
         }
@@ -36773,7 +36786,7 @@ var ts;
                 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));
+                        ts.addRelatedInfo(lastError, ts.createDetachedDiagnostic(fileName, openBracePosition, 1, ts.Diagnostics.The_parser_expected_to_find_a_1_to_match_the_0_token_here, "{", "}"));
                     }
                 }
                 return finishNode(factory.createAssertClause(elements, multiLine), pos);
@@ -37749,8 +37762,7 @@ var ts;
                             hasChildren = true;
                             if (child.kind === 342 /* JSDocTypeTag */) {
                                 if (childTypeTag) {
-                                    parseErrorAtCurrentToken(ts.Diagnostics.A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags);
-                                    var lastError = ts.lastOrUndefined(parseDiagnostics);
+                                    var lastError = parseErrorAtCurrentToken(ts.Diagnostics.A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags);
                                     if (lastError) {
                                         ts.addRelatedInfo(lastError, ts.createDetachedDiagnostic(fileName, 0, 0, ts.Diagnostics.The_tag_was_first_specified_here));
                                     }
@@ -41078,7 +41090,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*/
@@ -58488,8 +58503,10 @@ var ts;
             return type;
         }
         function isMappedTypeGenericIndexedAccess(type) {
-            return type.flags & 8388608 /* IndexedAccess */ && ts.getObjectFlags(type.objectType) & 32 /* Mapped */ &&
-                !isGenericMappedType(type.objectType) && isGenericIndexType(type.indexType);
+            var objectType;
+            return !!(type.flags & 8388608 /* IndexedAccess */ && ts.getObjectFlags(objectType = type.objectType) & 32 /* Mapped */ &&
+                !isGenericMappedType(objectType) && isGenericIndexType(type.indexType) &&
+                !objectType.declaration.questionToken && !objectType.declaration.nameType);
         }
         /**
          * For a type parameter, return the base constraint of the type parameter. For the string, number,
@@ -59077,7 +59094,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();
@@ -61674,7 +61703,7 @@ var ts;
             // If the object type is a mapped type { [P in K]: E }, where K is generic, instantiate E using a mapper
             // that substitutes the index type for P. For example, for an index access { [P in K]: Box<T[P]> }[X], we
             // construct the type Box<T[X]>.
-            if (isGenericMappedType(objectType)) {
+            if (isGenericMappedType(objectType) && !objectType.declaration.nameType) {
                 return type[cache] = mapType(substituteIndexedMappedType(objectType, type.indexType), function (t) { return getSimplifiedType(t, writing); });
             }
             return type[cache] = type;
@@ -63747,7 +63776,7 @@ var ts;
                 var targetReturnType = isResolvingReturnTypeOfSignature(target) ? anyType
                     : target.declaration && isJSConstructor(target.declaration) ? getDeclaredTypeOfClassOrInterface(getMergedSymbol(target.declaration.symbol))
                         : getReturnTypeOfSignature(target);
-                if (targetReturnType === voidType) {
+                if (targetReturnType === voidType || targetReturnType === anyType) {
                     return result;
                 }
                 var sourceReturnType = isResolvingReturnTypeOfSignature(source) ? anyType
@@ -72036,7 +72065,7 @@ var ts;
         function getTypeOfPropertyOfContextualType(type, name, nameType) {
             return mapType(type, function (t) {
                 var _a;
-                if (isGenericMappedType(t)) {
+                if (isGenericMappedType(t) && !t.declaration.nameType) {
                     var constraint = getConstraintTypeFromMappedType(t);
                     var constraintOfConstraint = getBaseConstraintOfType(constraint) || constraint;
                     var propertyNameType = nameType || getStringLiteralType(ts.unescapeLeadingUnderscores(name));
@@ -76964,7 +76993,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);
                 }
@@ -76983,8 +77016,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);
@@ -80797,20 +80830,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)));
+                    }
+                }
             }
         }
         /**
@@ -80823,7 +80867,7 @@ var ts;
         function markDecoratorMedataDataTypeNodeAsReferenced(node) {
             var entityName = getEntityNameForDecoratorMetadata(node);
             if (entityName && ts.isEntityName(entityName)) {
-                markEntityNameOrEntityExpressionAsReference(entityName);
+                markEntityNameOrEntityExpressionAsReference(entityName, /*forDecoratorMetadata*/ true);
             }
         }
         function getEntityNameForDecoratorMetadata(node) {
@@ -84475,7 +84519,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 */) {
@@ -87652,10 +87696,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) {
@@ -130890,14 +130933,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) {
@@ -130909,10 +130953,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
@@ -131393,6 +131437,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;
@@ -131756,7 +131801,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;
@@ -141668,6 +141713,41 @@ var ts;
                 if (ts.scanner.getToken() === 1 /* EndOfFileToken */) {
                     break;
                 }
+                if (ts.scanner.getToken() === 15 /* TemplateHead */) {
+                    var stack = [ts.scanner.getToken()];
+                    var token = ts.scanner.scan();
+                    loop: while (ts.length(stack)) {
+                        switch (token) {
+                            case 1 /* EndOfFileToken */:
+                                break loop;
+                            case 100 /* ImportKeyword */:
+                                tryConsumeImport();
+                                break;
+                            case 15 /* TemplateHead */:
+                                stack.push(token);
+                                break;
+                            case 18 /* OpenBraceToken */:
+                                if (ts.length(stack)) {
+                                    stack.push(token);
+                                }
+                                break;
+                            case 19 /* CloseBraceToken */:
+                                if (ts.length(stack)) {
+                                    if (ts.lastOrUndefined(stack) === 15 /* TemplateHead */) {
+                                        if (ts.scanner.reScanTemplateToken(/* isTaggedTemplate */ false) === 17 /* TemplateTail */) {
+                                            stack.pop();
+                                        }
+                                    }
+                                    else {
+                                        stack.pop();
+                                    }
+                                }
+                                break;
+                        }
+                        token = ts.scanner.scan();
+                    }
+                    nextToken();
+                }
                 // check if at least one of alternative have moved scanner forward
                 if (tryConsumeDeclare() ||
                     tryConsumeImport() ||
@@ -142961,7 +143041,7 @@ var ts;
                     if (!typeDisplayString) {
                         continue;
                     }
-                    addTypeHints(typeDisplayString, param.name.end);
+                    addTypeHints(typeDisplayString, param.questionToken ? param.questionToken.end : param.name.end);
                 }
             }
             function getParameterDeclarationTypeDisplayString(symbol) {
@@ -154140,6 +154220,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) {
@@ -156707,6 +156855,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);
         }
@@ -156736,6 +156885,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);
         }
@@ -157659,20 +157809,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) {
@@ -157722,7 +157874,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();
@@ -157783,6 +157937,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)
@@ -159183,7 +159338,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
@@ -162950,10 +163107,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;