typescript 4.3.1-rc → 4.3.2

package/lib/tsc.js

@@ -65,7 +65,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.3";
-    ts.version = "4.3.1-rc";
+    ts.version = "4.3.2";
     var NativeCollections;
     (function (NativeCollections) {
         function tryGetNativeMap() {
@@ -4987,7 +4987,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_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."),
+        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."),
         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."),
@@ -24209,20 +24209,17 @@ var ts;
             return inContext(32768);
         }
         function parseErrorAtCurrentToken(message, arg0) {
-            return parseErrorAt(scanner.getTokenPos(), scanner.getTextPos(), message, arg0);
+            parseErrorAt(scanner.getTokenPos(), scanner.getTextPos(), message, arg0);
         }
         function parseErrorAtPosition(start, length, message, arg0) {
             var lastError = ts.lastOrUndefined(parseDiagnostics);
-            var result;
             if (!lastError || start !== lastError.start) {
-                result = ts.createDetachedDiagnostic(fileName, start, length, message, arg0);
-                parseDiagnostics.push(result);
+                parseDiagnostics.push(ts.createDetachedDiagnostic(fileName, start, length, message, arg0));
             }
             parseErrorBeforeNextFinishedNode = true;
-            return result;
         }
         function parseErrorAt(start, end, message, arg0) {
-            return parseErrorAtPosition(start, end - start, message, arg0);
+            parseErrorAtPosition(start, end - start, message, arg0);
         }
         function parseErrorAtRange(range, message, arg0) {
             parseErrorAt(range.pos, range.end, message, arg0);
@@ -24345,16 +24342,6 @@ var ts;
             parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(kind));
             return false;
         }
-        function parseExpectedMatchingBrackets(openKind, closeKind, openPosition) {
-            if (token() === closeKind) {
-                nextToken();
-                return;
-            }
-            var lastError = parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(closeKind));
-            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();
@@ -26976,11 +26963,10 @@ var ts;
         }
         function parseArrayLiteralExpression() {
             var pos = getNodePos();
-            var openBracketPosition = scanner.getTokenPos();
             parseExpected(22);
             var multiLine = scanner.hasPrecedingLineBreak();
             var elements = parseDelimitedList(15, parseArgumentOrArrayLiteralElement);
-            parseExpectedMatchingBrackets(22, 23, openBracketPosition);
+            parseExpected(23);
             return finishNode(factory.createArrayLiteralExpression(elements, multiLine), pos);
         }
         function parseObjectLiteralElement() {
@@ -27031,7 +27017,12 @@ var ts;
             parseExpected(18);
             var multiLine = scanner.hasPrecedingLineBreak();
             var properties = parseDelimitedList(12, parseObjectLiteralElement, true);
-            parseExpectedMatchingBrackets(18, 19, openBracePosition);
+            if (!parseExpected(19)) {
+                var lastError = ts.lastOrUndefined(parseDiagnostics);
+                if (lastError && lastError.code === ts.Diagnostics._0_expected.code) {
+                    ts.addRelatedInfo(lastError, ts.createDetachedDiagnostic(fileName, openBracePosition, 1, ts.Diagnostics.The_parser_expected_to_find_a_to_match_the_token_here));
+                }
+            }
             return finishNode(factory.createObjectLiteralExpression(properties, multiLine), pos);
         }
         function parseFunctionExpression() {
@@ -27099,7 +27090,12 @@ var ts;
             if (parseExpected(18, diagnosticMessage) || ignoreMissingOpenBrace) {
                 var multiLine = scanner.hasPrecedingLineBreak();
                 var statements = parseList(1, parseStatement);
-                parseExpectedMatchingBrackets(18, 19, openBracePosition);
+                if (!parseExpected(19)) {
+                    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));
+                    }
+                }
                 var result = withJSDoc(finishNode(factory.createBlock(statements, multiLine), pos), hasJSDoc);
                 if (token() === 62) {
                     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);
@@ -27142,10 +27138,9 @@ var ts;
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(98);
-            var openParenPosition = scanner.getTokenPos();
             parseExpected(20);
             var expression = allowInAnd(parseExpression);
-            parseExpectedMatchingBrackets(20, 21, openParenPosition);
+            parseExpected(21);
             var thenStatement = parseStatement();
             var elseStatement = parseOptional(90) ? parseStatement() : undefined;
             return withJSDoc(finishNode(factory.createIfStatement(expression, thenStatement, elseStatement), pos), hasJSDoc);
@@ -27156,10 +27151,9 @@ var ts;
             parseExpected(89);
             var statement = parseStatement();
             parseExpected(114);
-            var openParenPosition = scanner.getTokenPos();
             parseExpected(20);
             var expression = allowInAnd(parseExpression);
-            parseExpectedMatchingBrackets(20, 21, openParenPosition);
+            parseExpected(21);
             parseOptional(26);
             return withJSDoc(finishNode(factory.createDoStatement(statement, expression), pos), hasJSDoc);
         }
@@ -27167,10 +27161,9 @@ var ts;
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(114);
-            var openParenPosition = scanner.getTokenPos();
             parseExpected(20);
             var expression = allowInAnd(parseExpression);
-            parseExpectedMatchingBrackets(20, 21, openParenPosition);
+            parseExpected(21);
             var statement = parseStatement();
             return withJSDoc(finishNode(factory.createWhileStatement(expression, statement), pos), hasJSDoc);
         }
@@ -27237,10 +27230,9 @@ var ts;
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(115);
-            var openParenPosition = scanner.getTokenPos();
             parseExpected(20);
             var expression = allowInAnd(parseExpression);
-            parseExpectedMatchingBrackets(20, 21, openParenPosition);
+            parseExpected(21);
             var statement = doInsideOfContext(16777216, parseStatement);
             return withJSDoc(finishNode(factory.createWithStatement(expression, statement), pos), hasJSDoc);
         }
@@ -28988,7 +28980,8 @@ var ts;
                             hasChildren = true;
                             if (child.kind === 333) {
                                 if (childTypeTag) {
-                                    var lastError = parseErrorAtCurrentToken(ts.Diagnostics.A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags);
+                                    parseErrorAtCurrentToken(ts.Diagnostics.A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags);
+                                    var lastError = ts.lastOrUndefined(parseDiagnostics);
                                     if (lastError) {
                                         ts.addRelatedInfo(lastError, ts.createDetachedDiagnostic(fileName, 0, 0, ts.Diagnostics.The_tag_was_first_specified_here));
                                     }
@@ -46288,6 +46281,10 @@ var ts;
             var indexSymbol = symbol && getIndexSymbol(symbol);
             return indexSymbol && getIndexDeclarationOfIndexSymbol(indexSymbol, kind);
         }
+        function getIndexDeclarationOfSymbolTable(symbolTable, kind) {
+            var indexSymbol = symbolTable && getIndexSymbolFromSymbolTable(symbolTable);
+            return indexSymbol && getIndexDeclarationOfIndexSymbol(indexSymbol, kind);
+        }
         function getIndexDeclarationOfIndexSymbol(indexSymbol, kind) {
             var syntaxKind = kind === 1 ? 144 : 147;
             if (indexSymbol === null || indexSymbol === void 0 ? void 0 : indexSymbol.declarations) {
@@ -52621,13 +52618,13 @@ var ts;
             return type.flags & 32768 ? type : getUnionType([type, undefinedType]);
         }
         function getGlobalNonNullableTypeInstantiation(type) {
+            var reducedType = getTypeWithFacts(type, 2097152);
             if (!deferredGlobalNonNullableTypeAlias) {
                 deferredGlobalNonNullableTypeAlias = getGlobalSymbol("NonNullable", 524288, undefined) || unknownSymbol;
             }
-            if (deferredGlobalNonNullableTypeAlias !== unknownSymbol) {
-                return getTypeAliasInstantiation(deferredGlobalNonNullableTypeAlias, [type]);
-            }
-            return getTypeWithFacts(type, 2097152);
+            return deferredGlobalNonNullableTypeAlias !== unknownSymbol ?
+                getTypeAliasInstantiation(deferredGlobalNonNullableTypeAlias, [reducedType]) :
+                reducedType;
         }
         function getNonNullableType(type) {
             return strictNullChecks ? getGlobalNonNullableTypeInstantiation(type) : type;
@@ -55764,7 +55761,7 @@ var ts;
                     !isGenericIndexType(getTypeOfExpression(parent.argumentExpression));
         }
         function isGenericTypeWithUnionConstraint(type) {
-            return !!(type.flags & 465829888 && getBaseConstraintOrType(type).flags & 1048576);
+            return !!(type.flags & 465829888 && getBaseConstraintOrType(type).flags & (98304 | 1048576));
         }
         function containsGenericType(type) {
             return !!(type.flags & 465829888 || type.flags & 3145728 && ts.some(type.types, containsGenericType));
@@ -65466,21 +65463,24 @@ var ts;
                 checkBlock(node.finallyBlock);
             }
         }
-        function checkIndexConstraints(type) {
-            var declaredNumberIndexer = getIndexDeclarationOfSymbol(type.symbol, 1);
-            var declaredStringIndexer = getIndexDeclarationOfSymbol(type.symbol, 0);
+        function checkIndexConstraints(type, isStatic) {
+            var _a, _b, _c, _d;
+            var declaredNumberIndexer = getIndexDeclarationOfSymbolTable(isStatic ? (_a = type.symbol) === null || _a === void 0 ? void 0 : _a.exports : (_b = type.symbol) === null || _b === void 0 ? void 0 : _b.members, 1);
+            var declaredStringIndexer = getIndexDeclarationOfSymbolTable(isStatic ? (_c = type.symbol) === null || _c === void 0 ? void 0 : _c.exports : (_d = type.symbol) === null || _d === void 0 ? void 0 : _d.members, 0);
             var stringIndexType = getIndexTypeOfType(type, 0);
             var numberIndexType = getIndexTypeOfType(type, 1);
             if (stringIndexType || numberIndexType) {
                 ts.forEach(getPropertiesOfObjectType(type), function (prop) {
+                    if (isStatic && prop.flags & 4194304)
+                        return;
                     var propType = getTypeOfSymbol(prop);
                     checkIndexConstraintForProperty(prop, propType, type, declaredStringIndexer, stringIndexType, 0);
                     checkIndexConstraintForProperty(prop, propType, type, declaredNumberIndexer, numberIndexType, 1);
                 });
                 var classDeclaration = type.symbol.valueDeclaration;
                 if (ts.getObjectFlags(type) & 1 && classDeclaration && ts.isClassLike(classDeclaration)) {
-                    for (var _i = 0, _a = classDeclaration.members; _i < _a.length; _i++) {
-                        var member = _a[_i];
+                    for (var _i = 0, _e = classDeclaration.members; _i < _e.length; _i++) {
+                        var member = _e[_i];
                         if (!ts.hasSyntacticModifier(member, 32) && !hasBindableName(member)) {
                             var symbol = getSymbolOfNode(member);
                             var propType = getTypeOfSymbol(symbol);
@@ -65774,7 +65774,7 @@ var ts;
             }
             if (produceDiagnostics) {
                 checkIndexConstraints(type);
-                checkIndexConstraints(staticType);
+                checkIndexConstraints(staticType, true);
                 checkTypeForDuplicateIndexSignatures(node);
                 checkPropertyInitialization(node);
             }
@@ -73991,16 +73991,20 @@ var ts;
                 return ts.visitEachChild(node, visitor, context);
             }
             var staticProperties = ts.getProperties(node, false, true);
+            var pendingPrivateStateAssignment;
             if (shouldTransformPrivateElements && ts.some(node.members, function (m) { return ts.hasStaticModifier(m) && !!m.name && ts.isPrivateIdentifier(m.name); })) {
                 var temp = factory.createTempVariable(hoistVariableDeclaration, true);
                 getPrivateIdentifierEnvironment().classConstructor = factory.cloneNode(temp);
-                getPendingExpressions().push(factory.createAssignment(temp, factory.getInternalName(node)));
+                pendingPrivateStateAssignment = factory.createAssignment(temp, factory.getInternalName(node));
             }
             var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
             var isDerivedClass = !!(extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 103);
             var statements = [
                 factory.updateClassDeclaration(node, undefined, node.modifiers, node.name, undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, isDerivedClass))
             ];
+            if (pendingPrivateStateAssignment) {
+                getPendingExpressions().unshift(pendingPrivateStateAssignment);
+            }
             if (ts.some(pendingExpressions)) {
                 statements.push(factory.createExpressionStatement(factory.inlineExpressions(pendingExpressions)));
             }

package/lib/tsserver.js

@@ -96,7 +96,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 = "4.3.1-rc";
+    ts.version = "4.3.2";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -7689,7 +7689,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_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."),
+        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."),
         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."),
@@ -30030,23 +30030,20 @@ var ts;
             return inContext(32768 /* AwaitContext */);
         }
         function parseErrorAtCurrentToken(message, arg0) {
-            return parseErrorAt(scanner.getTokenPos(), scanner.getTextPos(), message, arg0);
+            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) {
-                result = ts.createDetachedDiagnostic(fileName, start, length, message, arg0);
-                parseDiagnostics.push(result);
+                parseDiagnostics.push(ts.createDetachedDiagnostic(fileName, start, length, message, arg0));
             }
             // 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) {
-            return parseErrorAtPosition(start, end - start, message, arg0);
+            parseErrorAtPosition(start, end - start, message, arg0);
         }
         function parseErrorAtRange(range, message, arg0) {
             parseErrorAt(range.pos, range.end, message, arg0);
@@ -30203,16 +30200,6 @@ var ts;
             parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(kind));
             return false;
         }
-        function parseExpectedMatchingBrackets(openKind, closeKind, openPosition) {
-            if (token() === closeKind) {
-                nextToken();
-                return;
-            }
-            var lastError = parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(closeKind));
-            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();
@@ -33580,11 +33567,10 @@ var ts;
         }
         function parseArrayLiteralExpression() {
             var pos = getNodePos();
-            var openBracketPosition = scanner.getTokenPos();
             parseExpected(22 /* OpenBracketToken */);
             var multiLine = scanner.hasPrecedingLineBreak();
             var elements = parseDelimitedList(15 /* ArrayLiteralMembers */, parseArgumentOrArrayLiteralElement);
-            parseExpectedMatchingBrackets(22 /* OpenBracketToken */, 23 /* CloseBracketToken */, openBracketPosition);
+            parseExpected(23 /* CloseBracketToken */);
             return finishNode(factory.createArrayLiteralExpression(elements, multiLine), pos);
         }
         function parseObjectLiteralElement() {
@@ -33644,7 +33630,12 @@ var ts;
             parseExpected(18 /* OpenBraceToken */);
             var multiLine = scanner.hasPrecedingLineBreak();
             var properties = parseDelimitedList(12 /* ObjectLiteralMembers */, parseObjectLiteralElement, /*considerSemicolonAsDelimiter*/ true);
-            parseExpectedMatchingBrackets(18 /* OpenBraceToken */, 19 /* CloseBraceToken */, openBracePosition);
+            if (!parseExpected(19 /* CloseBraceToken */)) {
+                var lastError = ts.lastOrUndefined(parseDiagnostics);
+                if (lastError && lastError.code === ts.Diagnostics._0_expected.code) {
+                    ts.addRelatedInfo(lastError, ts.createDetachedDiagnostic(fileName, openBracePosition, 1, ts.Diagnostics.The_parser_expected_to_find_a_to_match_the_token_here));
+                }
+            }
             return finishNode(factory.createObjectLiteralExpression(properties, multiLine), pos);
         }
         function parseFunctionExpression() {
@@ -33718,7 +33709,12 @@ var ts;
             if (parseExpected(18 /* OpenBraceToken */, diagnosticMessage) || ignoreMissingOpenBrace) {
                 var multiLine = scanner.hasPrecedingLineBreak();
                 var statements = parseList(1 /* BlockStatements */, parseStatement);
-                parseExpectedMatchingBrackets(18 /* OpenBraceToken */, 19 /* CloseBraceToken */, openBracePosition);
+                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));
+                    }
+                }
                 var result = withJSDoc(finishNode(factory.createBlock(statements, multiLine), pos), hasJSDoc);
                 if (token() === 62 /* 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);
@@ -33763,10 +33759,9 @@ var ts;
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(98 /* IfKeyword */);
-            var openParenPosition = scanner.getTokenPos();
             parseExpected(20 /* OpenParenToken */);
             var expression = allowInAnd(parseExpression);
-            parseExpectedMatchingBrackets(20 /* OpenParenToken */, 21 /* CloseParenToken */, openParenPosition);
+            parseExpected(21 /* CloseParenToken */);
             var thenStatement = parseStatement();
             var elseStatement = parseOptional(90 /* ElseKeyword */) ? parseStatement() : undefined;
             return withJSDoc(finishNode(factory.createIfStatement(expression, thenStatement, elseStatement), pos), hasJSDoc);
@@ -33777,10 +33772,9 @@ var ts;
             parseExpected(89 /* DoKeyword */);
             var statement = parseStatement();
             parseExpected(114 /* WhileKeyword */);
-            var openParenPosition = scanner.getTokenPos();
             parseExpected(20 /* OpenParenToken */);
             var expression = allowInAnd(parseExpression);
-            parseExpectedMatchingBrackets(20 /* OpenParenToken */, 21 /* CloseParenToken */, openParenPosition);
+            parseExpected(21 /* CloseParenToken */);
             // 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
@@ -33792,10 +33786,9 @@ var ts;
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(114 /* WhileKeyword */);
-            var openParenPosition = scanner.getTokenPos();
             parseExpected(20 /* OpenParenToken */);
             var expression = allowInAnd(parseExpression);
-            parseExpectedMatchingBrackets(20 /* OpenParenToken */, 21 /* CloseParenToken */, openParenPosition);
+            parseExpected(21 /* CloseParenToken */);
             var statement = parseStatement();
             return withJSDoc(finishNode(factory.createWhileStatement(expression, statement), pos), hasJSDoc);
         }
@@ -33862,10 +33855,9 @@ var ts;
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(115 /* WithKeyword */);
-            var openParenPosition = scanner.getTokenPos();
             parseExpected(20 /* OpenParenToken */);
             var expression = allowInAnd(parseExpression);
-            parseExpectedMatchingBrackets(20 /* OpenParenToken */, 21 /* CloseParenToken */, openParenPosition);
+            parseExpected(21 /* CloseParenToken */);
             var statement = doInsideOfContext(16777216 /* InWithStatement */, parseStatement);
             return withJSDoc(finishNode(factory.createWithStatement(expression, statement), pos), hasJSDoc);
         }
@@ -35856,7 +35848,8 @@ var ts;
                             hasChildren = true;
                             if (child.kind === 333 /* JSDocTypeTag */) {
                                 if (childTypeTag) {
-                                    var lastError = parseErrorAtCurrentToken(ts.Diagnostics.A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags);
+                                    parseErrorAtCurrentToken(ts.Diagnostics.A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags);
+                                    var lastError = ts.lastOrUndefined(parseDiagnostics);
                                     if (lastError) {
                                         ts.addRelatedInfo(lastError, ts.createDetachedDiagnostic(fileName, 0, 0, ts.Diagnostics.The_tag_was_first_specified_here));
                                     }
@@ -56017,6 +56010,10 @@ var ts;
             var indexSymbol = symbol && getIndexSymbol(symbol);
             return indexSymbol && getIndexDeclarationOfIndexSymbol(indexSymbol, kind);
         }
+        function getIndexDeclarationOfSymbolTable(symbolTable, kind) {
+            var indexSymbol = symbolTable && getIndexSymbolFromSymbolTable(symbolTable);
+            return indexSymbol && getIndexDeclarationOfIndexSymbol(indexSymbol, kind);
+        }
         function getIndexDeclarationOfIndexSymbol(indexSymbol, kind) {
             var syntaxKind = kind === 1 /* Number */ ? 144 /* NumberKeyword */ : 147 /* StringKeyword */;
             if (indexSymbol === null || indexSymbol === void 0 ? void 0 : indexSymbol.declarations) {
@@ -63225,14 +63222,17 @@ var ts;
             return type.flags & 32768 /* Undefined */ ? type : getUnionType([type, undefinedType]);
         }
         function getGlobalNonNullableTypeInstantiation(type) {
+            // First reduce away any constituents that are assignable to 'undefined' or 'null'. This not only eliminates
+            // 'undefined' and 'null', but also higher-order types such as a type parameter 'U extends undefined | null'
+            // that isn't eliminated by a NonNullable<T> instantiation.
+            var reducedType = getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
             if (!deferredGlobalNonNullableTypeAlias) {
                 deferredGlobalNonNullableTypeAlias = getGlobalSymbol("NonNullable", 524288 /* TypeAlias */, /*diagnostic*/ undefined) || unknownSymbol;
             }
-            // Use NonNullable global type alias if available to improve quick info/declaration emit
-            if (deferredGlobalNonNullableTypeAlias !== unknownSymbol) {
-                return getTypeAliasInstantiation(deferredGlobalNonNullableTypeAlias, [type]);
-            }
-            return getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */); // Type alias unavailable, fall back to non-higher-order behavior
+            // If the NonNullable<T> type is available, return an instantiation. Otherwise just return the reduced type.
+            return deferredGlobalNonNullableTypeAlias !== unknownSymbol ?
+                getTypeAliasInstantiation(deferredGlobalNonNullableTypeAlias, [reducedType]) :
+                reducedType;
         }
         function getNonNullableType(type) {
             return strictNullChecks ? getGlobalNonNullableTypeInstantiation(type) : type;
@@ -66820,7 +66820,7 @@ var ts;
                     !isGenericIndexType(getTypeOfExpression(parent.argumentExpression));
         }
         function isGenericTypeWithUnionConstraint(type) {
-            return !!(type.flags & 465829888 /* Instantiable */ && getBaseConstraintOrType(type).flags & 1048576 /* Union */);
+            return !!(type.flags & 465829888 /* Instantiable */ && getBaseConstraintOrType(type).flags & (98304 /* Nullable */ | 1048576 /* Union */));
         }
         function containsGenericType(type) {
             return !!(type.flags & 465829888 /* Instantiable */ || type.flags & 3145728 /* UnionOrIntersection */ && ts.some(type.types, containsGenericType));
@@ -78294,21 +78294,24 @@ var ts;
                 checkBlock(node.finallyBlock);
             }
         }
-        function checkIndexConstraints(type) {
-            var declaredNumberIndexer = getIndexDeclarationOfSymbol(type.symbol, 1 /* Number */);
-            var declaredStringIndexer = getIndexDeclarationOfSymbol(type.symbol, 0 /* String */);
+        function checkIndexConstraints(type, isStatic) {
+            var _a, _b, _c, _d;
+            var declaredNumberIndexer = getIndexDeclarationOfSymbolTable(isStatic ? (_a = type.symbol) === null || _a === void 0 ? void 0 : _a.exports : (_b = type.symbol) === null || _b === void 0 ? void 0 : _b.members, 1 /* Number */);
+            var declaredStringIndexer = getIndexDeclarationOfSymbolTable(isStatic ? (_c = type.symbol) === null || _c === void 0 ? void 0 : _c.exports : (_d = type.symbol) === null || _d === void 0 ? void 0 : _d.members, 0 /* String */);
             var stringIndexType = getIndexTypeOfType(type, 0 /* String */);
             var numberIndexType = getIndexTypeOfType(type, 1 /* Number */);
             if (stringIndexType || numberIndexType) {
                 ts.forEach(getPropertiesOfObjectType(type), function (prop) {
+                    if (isStatic && prop.flags & 4194304 /* Prototype */)
+                        return;
                     var propType = getTypeOfSymbol(prop);
                     checkIndexConstraintForProperty(prop, propType, type, declaredStringIndexer, stringIndexType, 0 /* String */);
                     checkIndexConstraintForProperty(prop, propType, type, declaredNumberIndexer, numberIndexType, 1 /* Number */);
                 });
                 var classDeclaration = type.symbol.valueDeclaration;
                 if (ts.getObjectFlags(type) & 1 /* Class */ && classDeclaration && ts.isClassLike(classDeclaration)) {
-                    for (var _i = 0, _a = classDeclaration.members; _i < _a.length; _i++) {
-                        var member = _a[_i];
+                    for (var _i = 0, _e = classDeclaration.members; _i < _e.length; _i++) {
+                        var member = _e[_i];
                         // Only process instance properties with computed names here.
                         // Static properties cannot be in conflict with indexers,
                         // and properties with literal names were already checked.
@@ -78638,7 +78641,7 @@ var ts;
             }
             if (produceDiagnostics) {
                 checkIndexConstraints(type);
-                checkIndexConstraints(staticType);
+                checkIndexConstraints(staticType, /*isStatic*/ true);
                 checkTypeForDuplicateIndexSignatures(node);
                 checkPropertyInitialization(node);
             }
@@ -88697,10 +88700,11 @@ var ts;
                 return ts.visitEachChild(node, visitor, context);
             }
             var staticProperties = ts.getProperties(node, /*requireInitializer*/ false, /*isStatic*/ true);
+            var pendingPrivateStateAssignment;
             if (shouldTransformPrivateElements && ts.some(node.members, function (m) { return ts.hasStaticModifier(m) && !!m.name && ts.isPrivateIdentifier(m.name); })) {
                 var temp = factory.createTempVariable(hoistVariableDeclaration, /* reservedInNestedScopes */ true);
                 getPrivateIdentifierEnvironment().classConstructor = factory.cloneNode(temp);
-                getPendingExpressions().push(factory.createAssignment(temp, factory.getInternalName(node)));
+                pendingPrivateStateAssignment = factory.createAssignment(temp, factory.getInternalName(node));
             }
             var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
             var isDerivedClass = !!(extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 103 /* NullKeyword */);
@@ -88709,6 +88713,9 @@ var ts;
                 /*decorators*/ undefined, node.modifiers, node.name, 
                 /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, isDerivedClass))
             ];
+            if (pendingPrivateStateAssignment) {
+                getPendingExpressions().unshift(pendingPrivateStateAssignment);
+            }
             // Write any pending expressions from elided or moved computed property names
             if (ts.some(pendingExpressions)) {
                 statements.push(factory.createExpressionStatement(factory.inlineExpressions(pendingExpressions)));
@@ -123168,6 +123175,8 @@ var ts;
                     return jsdocCompletionInfo(ts.JsDoc.getJSDocTagCompletions());
                 case 3 /* JsDocParameterName */:
                     return jsdocCompletionInfo(ts.JsDoc.getJSDocParameterNameCompletions(completionData.tag));
+                case 4 /* Keywords */:
+                    return specificKeywordCompletionInfo(completionData.keywords);
                 default:
                     return ts.Debug.assertNever(completionData);
             }
@@ -123176,6 +123185,19 @@ var ts;
         function jsdocCompletionInfo(entries) {
             return { isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: false, entries: entries };
         }
+        function specificKeywordCompletionInfo(keywords) {
+            return {
+                isGlobalCompletion: false,
+                isMemberCompletion: false,
+                isNewIdentifierLocation: false,
+                entries: keywords.map(function (k) { return ({
+                    name: ts.tokenToString(k),
+                    kind: "keyword" /* keyword */,
+                    kindModifiers: "" /* none */,
+                    sortText: SortText.GlobalsOrKeywords,
+                }); }),
+            };
+        }
         function getOptionalReplacementSpan(location) {
             // StringLiteralLike locations are handled separately in stringCompletions.ts
             return (location === null || location === void 0 ? void 0 : location.kind) === 78 /* Identifier */ ? ts.createTextSpanFromNode(location) : undefined;
@@ -123600,6 +123622,8 @@ var ts;
                             return ts.JsDoc.getJSDocTagCompletionDetails(name);
                         case 3 /* JsDocParameterName */:
                             return ts.JsDoc.getJSDocParameterNameCompletionDetails(name);
+                        case 4 /* Keywords */:
+                            return request.keywords.indexOf(ts.stringToToken(name)) > -1 ? createSimpleDetails(name, "keyword" /* keyword */, ts.SymbolDisplayPartKind.keyword) : undefined;
                         default:
                             return ts.Debug.assertNever(request);
                     }
@@ -123658,6 +123682,7 @@ var ts;
             CompletionDataKind[CompletionDataKind["JsDocTagName"] = 1] = "JsDocTagName";
             CompletionDataKind[CompletionDataKind["JsDocTag"] = 2] = "JsDocTag";
             CompletionDataKind[CompletionDataKind["JsDocParameterName"] = 3] = "JsDocParameterName";
+            CompletionDataKind[CompletionDataKind["Keywords"] = 4] = "Keywords";
         })(CompletionDataKind || (CompletionDataKind = {}));
         var CompletionKind;
         (function (CompletionKind) {
@@ -123818,13 +123843,17 @@ var ts;
             var importCompletionNode;
             var location = ts.getTouchingPropertyName(sourceFile, position);
             if (contextToken) {
+                var importCompletionCandidate = getImportCompletionNode(contextToken);
+                if (importCompletionCandidate === 153 /* FromKeyword */) {
+                    return { kind: 4 /* Keywords */, keywords: [153 /* FromKeyword */] };
+                }
                 // Import statement completions use `insertText`, and also require the `data` property of `CompletionEntryIdentifier`
                 // added in TypeScript 4.3 to be sent back from the client during `getCompletionEntryDetails`. Since this feature
                 // is not backward compatible with older clients, the language service defaults to disabling it, allowing newer clients
                 // to opt in with the `includeCompletionsForImportStatements` user preference.
-                importCompletionNode = preferences.includeCompletionsForImportStatements && preferences.includeCompletionsWithInsertText
-                    ? getImportCompletionNode(contextToken)
-                    : undefined;
+                if (importCompletionCandidate && preferences.includeCompletionsForImportStatements && preferences.includeCompletionsWithInsertText) {
+                    importCompletionNode = importCompletionCandidate;
+                }
                 // Bail out if this is a known invalid completion location
                 if (!importCompletionNode && isCompletionListBlocker(contextToken)) {
                     log("Returning an empty list because completion was requested in an invalid position.");
@@ -125578,16 +125607,20 @@ var ts;
         }
         function getImportCompletionNode(contextToken) {
             var candidate = getCandidate();
-            return candidate && ts.rangeIsOnSingleLine(candidate, candidate.getSourceFile()) ? candidate : undefined;
+            return candidate === 153 /* FromKeyword */ || candidate && ts.rangeIsOnSingleLine(candidate, candidate.getSourceFile()) ? candidate : undefined;
             function getCandidate() {
                 var parent = contextToken.parent;
                 if (ts.isImportEqualsDeclaration(parent)) {
                     return isModuleSpecifierMissingOrEmpty(parent.moduleReference) ? parent : undefined;
                 }
                 if (ts.isNamedImports(parent) || ts.isNamespaceImport(parent)) {
-                    return isModuleSpecifierMissingOrEmpty(parent.parent.parent.moduleSpecifier) && (ts.isNamespaceImport(parent) || parent.elements.length < 2) && !parent.parent.name
-                        ? parent.parent.parent
-                        : undefined;
+                    if (isModuleSpecifierMissingOrEmpty(parent.parent.parent.moduleSpecifier) && (ts.isNamespaceImport(parent) || parent.elements.length < 2) && !parent.parent.name) {
+                        // At `import { ... } |` or `import * as Foo |`, the only possible completion is `from`
+                        return contextToken.kind === 19 /* CloseBraceToken */ || contextToken.kind === 78 /* Identifier */
+                            ? 153 /* FromKeyword */
+                            : parent.parent.parent;
+                    }
+                    return undefined;
                 }
                 if (ts.isImportKeyword(contextToken) && ts.isSourceFile(parent)) {
                     // A lone import keyword with nothing following it does not parse as a statement at all