typescript 4.7.0-dev.20220402 → 4.7.0-dev.20220405

package/lib/tsserverlibrary.js

@@ -294,7 +294,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20220402";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220405";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -16991,7 +16991,11 @@ var ts;
     ts.getEffectiveContainerForJSDocTemplateTag = getEffectiveContainerForJSDocTemplateTag;
     function getHostSignatureFromJSDoc(node) {
         var host = getEffectiveJSDocHost(node);
-        return host && ts.isFunctionLike(host) ? host : undefined;
+        if (host) {
+            return ts.isPropertySignature(host) && host.type && ts.isFunctionLike(host.type) ? host.type :
+                ts.isFunctionLike(host) ? host : undefined;
+        }
+        return undefined;
     }
     ts.getHostSignatureFromJSDoc = getHostSignatureFromJSDoc;
     function getEffectiveJSDocHost(node) {
@@ -32757,7 +32761,6 @@ var ts;
                 default: return [undefined]; // TODO: GH#18217 `default: Debug.assertNever(context);`
             }
         }
-        // Parses a comma-delimited list of elements
         function parseDelimitedList(kind, parseElement, considerSemicolonAsDelimiter) {
             var saveParsingContext = parsingContext;
             parsingContext |= 1 << kind;
@@ -32767,7 +32770,11 @@ var ts;
             while (true) {
                 if (isListElement(kind, /*inErrorRecovery*/ false)) {
                     var startPos = scanner.getStartPos();
-                    list.push(parseListElement(kind, parseElement));
+                    var result = parseListElement(kind, parseElement);
+                    if (!result) {
+                        return undefined;
+                    }
+                    list.push(result);
                     commaStart = scanner.getTokenPos();
                     if (parseOptional(27 /* CommaToken */)) {
                         // No need to check for a zero length node since we know we parsed a comma
@@ -33172,13 +33179,20 @@ var ts;
             }
             return name;
         }
-        function parseParameterInOuterAwaitContext() {
-            return parseParameterWorker(/*inOuterAwaitContext*/ true);
+        function isParameterNameStart() {
+            // Be permissive about await and yield by calling isBindingIdentifier instead of isIdentifier; disallowing
+            // them during a speculative parse leads to many more follow-on errors than allowing the function to parse then later
+            // complaining about the use of the keywords.
+            return isBindingIdentifier() || token() === 22 /* OpenBracketToken */ || token() === 18 /* OpenBraceToken */;
         }
-        function parseParameter() {
-            return parseParameterWorker(/*inOuterAwaitContext*/ false);
+        function parseParameter(inOuterAwaitContext) {
+            return parseParameterWorker(inOuterAwaitContext);
         }
-        function parseParameterWorker(inOuterAwaitContext) {
+        function parseParameterForSpeculation(inOuterAwaitContext) {
+            return parseParameterWorker(inOuterAwaitContext, /*allowAmbiguity*/ false);
+        }
+        function parseParameterWorker(inOuterAwaitContext, allowAmbiguity) {
+            if (allowAmbiguity === void 0) { allowAmbiguity = true; }
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             // FormalParameter [Yield,Await]:
@@ -33199,7 +33213,11 @@ var ts;
             var savedTopLevel = topLevel;
             topLevel = false;
             var modifiers = parseModifiers();
-            var node = withJSDoc(finishNode(factory.createParameterDeclaration(decorators, modifiers, parseOptionalToken(25 /* DotDotDotToken */), parseNameOfParameter(modifiers), parseOptionalToken(57 /* QuestionToken */), parseTypeAnnotation(), parseInitializer()), pos), hasJSDoc);
+            var dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
+            if (!allowAmbiguity && !isParameterNameStart()) {
+                return undefined;
+            }
+            var node = withJSDoc(finishNode(factory.createParameterDeclaration(decorators, modifiers, dotDotDotToken, parseNameOfParameter(modifiers), parseOptionalToken(57 /* QuestionToken */), parseTypeAnnotation(), parseInitializer()), pos), hasJSDoc);
             topLevel = savedTopLevel;
             return node;
         }
@@ -33224,7 +33242,7 @@ var ts;
             }
             return false;
         }
-        function parseParametersWorker(flags) {
+        function parseParametersWorker(flags, allowAmbiguity) {
             // FormalParameters [Yield,Await]: (modified)
             //      [empty]
             //      FormalParameterList[?Yield,Await]
@@ -33244,7 +33262,7 @@ var ts;
             setAwaitContext(!!(flags & 2 /* Await */));
             var parameters = flags & 32 /* JSDoc */ ?
                 parseDelimitedList(17 /* JSDocParameters */, parseJSDocParameter) :
-                parseDelimitedList(16 /* Parameters */, savedAwaitContext ? parseParameterInOuterAwaitContext : parseParameter);
+                parseDelimitedList(16 /* Parameters */, function () { return allowAmbiguity ? parseParameter(savedAwaitContext) : parseParameterForSpeculation(savedAwaitContext); });
             setYieldContext(savedYieldContext);
             setAwaitContext(savedAwaitContext);
             return parameters;
@@ -33266,7 +33284,7 @@ var ts;
             if (!parseExpected(20 /* OpenParenToken */)) {
                 return createMissingList();
             }
-            var parameters = parseParametersWorker(flags);
+            var parameters = parseParametersWorker(flags, /*allowAmbiguity*/ true);
             parseExpected(21 /* CloseParenToken */);
             return parameters;
         }
@@ -33348,7 +33366,7 @@ var ts;
             return token() === 58 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 23 /* CloseBracketToken */;
         }
         function parseIndexSignatureDeclaration(pos, hasJSDoc, decorators, modifiers) {
-            var parameters = parseBracketedList(16 /* Parameters */, parseParameter, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */);
+            var parameters = parseBracketedList(16 /* Parameters */, function () { return parseParameter(/*inOuterAwaitContext*/ false); }, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */);
             var type = parseTypeAnnotation();
             parseTypeMemberSemicolon();
             var node = factory.createIndexSignature(decorators, modifiers, parameters, type);
@@ -34398,7 +34416,16 @@ var ts;
                 parameters = createMissingList();
             }
             else {
-                parameters = parseParametersWorker(isAsync);
+                if (!allowAmbiguity) {
+                    var maybeParameters = parseParametersWorker(isAsync, allowAmbiguity);
+                    if (!maybeParameters) {
+                        return undefined;
+                    }
+                    parameters = maybeParameters;
+                }
+                else {
+                    parameters = parseParametersWorker(isAsync, allowAmbiguity);
+                }
                 if (!parseExpected(21 /* CloseParenToken */) && !allowAmbiguity) {
                     return undefined;
                 }
@@ -61958,7 +61985,11 @@ var ts;
             return !root.isDistributive && isSingletonTupleType(root.node.checkType) && isSingletonTupleType(root.node.extendsType);
         }
         function isSingletonTupleType(node) {
-            return ts.isTupleTypeNode(node) && ts.length(node.elements) === 1 && !ts.isOptionalTypeNode(node.elements[0]) && !ts.isRestTypeNode(node.elements[0]);
+            return ts.isTupleTypeNode(node) &&
+                ts.length(node.elements) === 1 &&
+                !ts.isOptionalTypeNode(node.elements[0]) &&
+                !ts.isRestTypeNode(node.elements[0]) &&
+                !(ts.isNamedTupleMember(node.elements[0]) && (node.elements[0].questionToken || node.elements[0].dotDotDotToken));
         }
         /**
          * We syntactually check for common nondistributive conditional shapes and unwrap them into
@@ -66478,6 +66509,9 @@ var ts;
         function createMarkerType(symbol, source, target) {
             var mapper = makeUnaryTypeMapper(source, target);
             var type = getDeclaredTypeOfSymbol(symbol);
+            if (isErrorType(type)) {
+                return type;
+            }
             var result = symbol.flags & 524288 /* TypeAlias */ ?
                 getTypeAliasInstantiation(symbol, instantiateTypes(getSymbolLinks(symbol).typeParameters, mapper)) :
                 createTypeReference(type, instantiateTypes(type.typeParameters, mapper));
@@ -117873,21 +117907,6 @@ var ts;
             return resolvedRef;
         }
         function verifyCompilerOptions() {
-            var isNightly = ts.stringContains(ts.version, "-dev") || ts.stringContains(ts.version, "-insiders");
-            if (!isNightly) {
-                if (ts.getEmitModuleKind(options) === ts.ModuleKind.Node12) {
-                    createOptionValueDiagnostic("module", ts.Diagnostics.Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next, "module", "node12");
-                }
-                else if (ts.getEmitModuleKind(options) === ts.ModuleKind.NodeNext) {
-                    createOptionValueDiagnostic("module", ts.Diagnostics.Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next, "module", "nodenext");
-                }
-                else if (ts.getEmitModuleResolutionKind(options) === ts.ModuleResolutionKind.Node12) {
-                    createOptionValueDiagnostic("moduleResolution", ts.Diagnostics.Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next, "moduleResolution", "node12");
-                }
-                else if (ts.getEmitModuleResolutionKind(options) === ts.ModuleResolutionKind.NodeNext) {
-                    createOptionValueDiagnostic("moduleResolution", ts.Diagnostics.Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next, "moduleResolution", "nodenext");
-                }
-            }
             if (options.strictPropertyInitialization && !ts.getStrictOptionValue(options, "strictNullChecks")) {
                 createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "strictPropertyInitialization", "strictNullChecks");
             }
@@ -142895,10 +142914,13 @@ var ts;
             var contextualType = info.contextualType, argumentIndex = info.argumentIndex, argumentCount = info.argumentCount, argumentsSpan = info.argumentsSpan;
             // for optional function condition.
             var nonNullableContextualType = contextualType.getNonNullableType();
-            var signatures = nonNullableContextualType.getCallSignatures();
-            if (signatures.length !== 1)
+            var symbol = nonNullableContextualType.symbol;
+            if (symbol === undefined)
+                return undefined;
+            var signature = ts.lastOrUndefined(nonNullableContextualType.getCallSignatures());
+            if (signature === undefined)
                 return undefined;
-            var invocation = { kind: 2 /* Contextual */, signature: ts.first(signatures), node: startingToken, symbol: chooseBetterSymbol(nonNullableContextualType.symbol) };
+            var invocation = { kind: 2 /* Contextual */, signature: signature, node: startingToken, symbol: chooseBetterSymbol(symbol) };
             return { isTypeParameterList: false, invocation: invocation, argumentsSpan: argumentsSpan, argumentIndex: argumentIndex, argumentCount: argumentCount };
         }
         function getContextualSignatureLocationInfo(startingToken, sourceFile, position, checker) {
@@ -147068,9 +147090,9 @@ var ts;
                 // for block indentation, we should look for a line which contains something that's not
                 // whitespace.
                 var currentToken = ts.getTokenAtPosition(sourceFile, position);
-                // for object literal, we want to the indentation work like block
-                // if { starts in any position (can be in the middle of line)
-                // the following indentation should treat { as starting of that line (including leading whitespace)
+                // For object literals, we want indentation to work just like with blocks.
+                // If the `{` starts in any position (even in the middle of a line), then
+                // the following indentation should treat `{` as the start of that line (including leading whitespace).
                 // ```
                 //     const a: { x: undefined, y: undefined } = {}       // leading 4 whitespaces and { starts in the middle of line
                 // ->
@@ -147088,7 +147110,8 @@ var ts;
                 //          y: undefined,
                 //      }
                 // ```
-                if (options.indentStyle === ts.IndentStyle.Block || currentToken.kind === 18 /* OpenBraceToken */) {
+                var isObjectLiteral = currentToken.kind === 18 /* OpenBraceToken */ && currentToken.parent.kind === 205 /* ObjectLiteralExpression */;
+                if (options.indentStyle === ts.IndentStyle.Block || isObjectLiteral) {
                     return getBlockIndent(sourceFile, position, options);
                 }
                 if (precedingToken.kind === 27 /* CommaToken */ && precedingToken.parent.kind !== 221 /* BinaryExpression */) {
@@ -147101,7 +147124,9 @@ var ts;
                 var containerList = getListByPosition(position, precedingToken.parent, sourceFile);
                 // use list position if the preceding token is before any list items
                 if (containerList && !ts.rangeContainsRange(containerList, precedingToken)) {
-                    return getActualIndentationForListStartLine(containerList, sourceFile, options) + options.indentSize; // TODO: GH#18217
+                    var useTheSameBaseIndentation = [213 /* FunctionExpression */, 214 /* ArrowFunction */].indexOf(currentToken.parent.kind) !== -1;
+                    var indentSize = useTheSameBaseIndentation ? 0 : options.indentSize;
+                    return getActualIndentationForListStartLine(containerList, sourceFile, options) + indentSize; // TODO: GH#18217
                 }
                 return getSmartIndent(sourceFile, position, precedingToken, lineAtPosition, assumeNewLineBeforeCloseBrace, options);
             }
@@ -153667,7 +153692,7 @@ var ts;
                 var param = signature.parameters[argIndex].valueDeclaration;
                 if (!(param && ts.isParameter(param) && ts.isIdentifier(param.name)))
                     return undefined;
-                var properties = ts.arrayFrom(checker.getUnmatchedProperties(checker.getTypeAtLocation(parent), checker.getTypeAtLocation(param), /* requireOptionalProperties */ false, /* matchDiscriminantProperties */ false));
+                var properties = ts.arrayFrom(checker.getUnmatchedProperties(checker.getTypeAtLocation(parent), checker.getParameterType(signature, argIndex), /* requireOptionalProperties */ false, /* matchDiscriminantProperties */ false));
                 if (!ts.length(properties))
                     return undefined;
                 return { kind: 3 /* ObjectLiteral */, token: param.name, properties: properties, parentDeclaration: parent };
@@ -156675,7 +156700,11 @@ var ts;
             var program = context.program;
             var checker = program.getTypeChecker();
             var scriptTarget = ts.getEmitScriptTarget(program.getCompilerOptions());
-            var flags = 1 /* NoTruncation */ | 1073741824 /* NoUndefinedOptionalParameterType */ | 256 /* SuppressAnyReturnType */ | (quotePreference === 0 /* Single */ ? 268435456 /* UseSingleQuotesForStringLiteralType */ : 0);
+            var flags = 1 /* NoTruncation */
+                | 1073741824 /* NoUndefinedOptionalParameterType */
+                | 256 /* SuppressAnyReturnType */
+                | 524288 /* AllowEmptyTuple */
+                | (quotePreference === 0 /* Single */ ? 268435456 /* UseSingleQuotesForStringLiteralType */ : 0 /* None */);
             var signatureDeclaration = checker.signatureToSignatureDeclaration(signature, kind, enclosingDeclaration, flags, getNoopSymbolTrackerWithResolver(context));
             if (!signatureDeclaration) {
                 return undefined;
@@ -159409,7 +159438,8 @@ var ts;
                 return undefined;
             }
             function isScope(node) {
-                return ts.isFunctionLikeDeclaration(node) || ts.isSourceFile(node) || ts.isModuleBlock(node) || ts.isClassLike(node);
+                return ts.isArrowFunction(node) ? ts.isFunctionBody(node.body) :
+                    ts.isFunctionLikeDeclaration(node) || ts.isSourceFile(node) || ts.isModuleBlock(node) || ts.isClassLike(node);
             }
             /**
              * Computes possible places we could extract the function into. For example,

package/lib/typescript.d.ts

@@ -1983,7 +1983,7 @@ declare namespace ts {
         Label = 12,
         Condition = 96
     }
-    export type FlowNode = FlowStart | FlowLabel | FlowAssignment | FlowCall | FlowCondition | FlowSwitchClause | FlowArrayMutation | FlowCall | FlowReduceLabel;
+    export type FlowNode = FlowStart | FlowLabel | FlowAssignment | FlowCondition | FlowSwitchClause | FlowArrayMutation | FlowCall | FlowReduceLabel;
     export interface FlowNodeBase {
         flags: FlowFlags;
         id?: number;

package/lib/typescript.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.20220402";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220405";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -16991,7 +16991,11 @@ var ts;
     ts.getEffectiveContainerForJSDocTemplateTag = getEffectiveContainerForJSDocTemplateTag;
     function getHostSignatureFromJSDoc(node) {
         var host = getEffectiveJSDocHost(node);
-        return host && ts.isFunctionLike(host) ? host : undefined;
+        if (host) {
+            return ts.isPropertySignature(host) && host.type && ts.isFunctionLike(host.type) ? host.type :
+                ts.isFunctionLike(host) ? host : undefined;
+        }
+        return undefined;
     }
     ts.getHostSignatureFromJSDoc = getHostSignatureFromJSDoc;
     function getEffectiveJSDocHost(node) {
@@ -32757,7 +32761,6 @@ var ts;
                 default: return [undefined]; // TODO: GH#18217 `default: Debug.assertNever(context);`
             }
         }
-        // Parses a comma-delimited list of elements
         function parseDelimitedList(kind, parseElement, considerSemicolonAsDelimiter) {
             var saveParsingContext = parsingContext;
             parsingContext |= 1 << kind;
@@ -32767,7 +32770,11 @@ var ts;
             while (true) {
                 if (isListElement(kind, /*inErrorRecovery*/ false)) {
                     var startPos = scanner.getStartPos();
-                    list.push(parseListElement(kind, parseElement));
+                    var result = parseListElement(kind, parseElement);
+                    if (!result) {
+                        return undefined;
+                    }
+                    list.push(result);
                     commaStart = scanner.getTokenPos();
                     if (parseOptional(27 /* CommaToken */)) {
                         // No need to check for a zero length node since we know we parsed a comma
@@ -33172,13 +33179,20 @@ var ts;
             }
             return name;
         }
-        function parseParameterInOuterAwaitContext() {
-            return parseParameterWorker(/*inOuterAwaitContext*/ true);
+        function isParameterNameStart() {
+            // Be permissive about await and yield by calling isBindingIdentifier instead of isIdentifier; disallowing
+            // them during a speculative parse leads to many more follow-on errors than allowing the function to parse then later
+            // complaining about the use of the keywords.
+            return isBindingIdentifier() || token() === 22 /* OpenBracketToken */ || token() === 18 /* OpenBraceToken */;
         }
-        function parseParameter() {
-            return parseParameterWorker(/*inOuterAwaitContext*/ false);
+        function parseParameter(inOuterAwaitContext) {
+            return parseParameterWorker(inOuterAwaitContext);
         }
-        function parseParameterWorker(inOuterAwaitContext) {
+        function parseParameterForSpeculation(inOuterAwaitContext) {
+            return parseParameterWorker(inOuterAwaitContext, /*allowAmbiguity*/ false);
+        }
+        function parseParameterWorker(inOuterAwaitContext, allowAmbiguity) {
+            if (allowAmbiguity === void 0) { allowAmbiguity = true; }
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             // FormalParameter [Yield,Await]:
@@ -33199,7 +33213,11 @@ var ts;
             var savedTopLevel = topLevel;
             topLevel = false;
             var modifiers = parseModifiers();
-            var node = withJSDoc(finishNode(factory.createParameterDeclaration(decorators, modifiers, parseOptionalToken(25 /* DotDotDotToken */), parseNameOfParameter(modifiers), parseOptionalToken(57 /* QuestionToken */), parseTypeAnnotation(), parseInitializer()), pos), hasJSDoc);
+            var dotDotDotToken = parseOptionalToken(25 /* DotDotDotToken */);
+            if (!allowAmbiguity && !isParameterNameStart()) {
+                return undefined;
+            }
+            var node = withJSDoc(finishNode(factory.createParameterDeclaration(decorators, modifiers, dotDotDotToken, parseNameOfParameter(modifiers), parseOptionalToken(57 /* QuestionToken */), parseTypeAnnotation(), parseInitializer()), pos), hasJSDoc);
             topLevel = savedTopLevel;
             return node;
         }
@@ -33224,7 +33242,7 @@ var ts;
             }
             return false;
         }
-        function parseParametersWorker(flags) {
+        function parseParametersWorker(flags, allowAmbiguity) {
             // FormalParameters [Yield,Await]: (modified)
             //      [empty]
             //      FormalParameterList[?Yield,Await]
@@ -33244,7 +33262,7 @@ var ts;
             setAwaitContext(!!(flags & 2 /* Await */));
             var parameters = flags & 32 /* JSDoc */ ?
                 parseDelimitedList(17 /* JSDocParameters */, parseJSDocParameter) :
-                parseDelimitedList(16 /* Parameters */, savedAwaitContext ? parseParameterInOuterAwaitContext : parseParameter);
+                parseDelimitedList(16 /* Parameters */, function () { return allowAmbiguity ? parseParameter(savedAwaitContext) : parseParameterForSpeculation(savedAwaitContext); });
             setYieldContext(savedYieldContext);
             setAwaitContext(savedAwaitContext);
             return parameters;
@@ -33266,7 +33284,7 @@ var ts;
             if (!parseExpected(20 /* OpenParenToken */)) {
                 return createMissingList();
             }
-            var parameters = parseParametersWorker(flags);
+            var parameters = parseParametersWorker(flags, /*allowAmbiguity*/ true);
             parseExpected(21 /* CloseParenToken */);
             return parameters;
         }
@@ -33348,7 +33366,7 @@ var ts;
             return token() === 58 /* ColonToken */ || token() === 27 /* CommaToken */ || token() === 23 /* CloseBracketToken */;
         }
         function parseIndexSignatureDeclaration(pos, hasJSDoc, decorators, modifiers) {
-            var parameters = parseBracketedList(16 /* Parameters */, parseParameter, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */);
+            var parameters = parseBracketedList(16 /* Parameters */, function () { return parseParameter(/*inOuterAwaitContext*/ false); }, 22 /* OpenBracketToken */, 23 /* CloseBracketToken */);
             var type = parseTypeAnnotation();
             parseTypeMemberSemicolon();
             var node = factory.createIndexSignature(decorators, modifiers, parameters, type);
@@ -34398,7 +34416,16 @@ var ts;
                 parameters = createMissingList();
             }
             else {
-                parameters = parseParametersWorker(isAsync);
+                if (!allowAmbiguity) {
+                    var maybeParameters = parseParametersWorker(isAsync, allowAmbiguity);
+                    if (!maybeParameters) {
+                        return undefined;
+                    }
+                    parameters = maybeParameters;
+                }
+                else {
+                    parameters = parseParametersWorker(isAsync, allowAmbiguity);
+                }
                 if (!parseExpected(21 /* CloseParenToken */) && !allowAmbiguity) {
                     return undefined;
                 }
@@ -61958,7 +61985,11 @@ var ts;
             return !root.isDistributive && isSingletonTupleType(root.node.checkType) && isSingletonTupleType(root.node.extendsType);
         }
         function isSingletonTupleType(node) {
-            return ts.isTupleTypeNode(node) && ts.length(node.elements) === 1 && !ts.isOptionalTypeNode(node.elements[0]) && !ts.isRestTypeNode(node.elements[0]);
+            return ts.isTupleTypeNode(node) &&
+                ts.length(node.elements) === 1 &&
+                !ts.isOptionalTypeNode(node.elements[0]) &&
+                !ts.isRestTypeNode(node.elements[0]) &&
+                !(ts.isNamedTupleMember(node.elements[0]) && (node.elements[0].questionToken || node.elements[0].dotDotDotToken));
         }
         /**
          * We syntactually check for common nondistributive conditional shapes and unwrap them into
@@ -66478,6 +66509,9 @@ var ts;
         function createMarkerType(symbol, source, target) {
             var mapper = makeUnaryTypeMapper(source, target);
             var type = getDeclaredTypeOfSymbol(symbol);
+            if (isErrorType(type)) {
+                return type;
+            }
             var result = symbol.flags & 524288 /* TypeAlias */ ?
                 getTypeAliasInstantiation(symbol, instantiateTypes(getSymbolLinks(symbol).typeParameters, mapper)) :
                 createTypeReference(type, instantiateTypes(type.typeParameters, mapper));
@@ -117873,21 +117907,6 @@ var ts;
             return resolvedRef;
         }
         function verifyCompilerOptions() {
-            var isNightly = ts.stringContains(ts.version, "-dev") || ts.stringContains(ts.version, "-insiders");
-            if (!isNightly) {
-                if (ts.getEmitModuleKind(options) === ts.ModuleKind.Node12) {
-                    createOptionValueDiagnostic("module", ts.Diagnostics.Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next, "module", "node12");
-                }
-                else if (ts.getEmitModuleKind(options) === ts.ModuleKind.NodeNext) {
-                    createOptionValueDiagnostic("module", ts.Diagnostics.Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next, "module", "nodenext");
-                }
-                else if (ts.getEmitModuleResolutionKind(options) === ts.ModuleResolutionKind.Node12) {
-                    createOptionValueDiagnostic("moduleResolution", ts.Diagnostics.Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next, "moduleResolution", "node12");
-                }
-                else if (ts.getEmitModuleResolutionKind(options) === ts.ModuleResolutionKind.NodeNext) {
-                    createOptionValueDiagnostic("moduleResolution", ts.Diagnostics.Compiler_option_0_of_value_1_is_unstable_Use_nightly_TypeScript_to_silence_this_error_Try_updating_with_npm_install_D_typescript_next, "moduleResolution", "nodenext");
-                }
-            }
             if (options.strictPropertyInitialization && !ts.getStrictOptionValue(options, "strictNullChecks")) {
                 createDiagnosticForOptionName(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "strictPropertyInitialization", "strictNullChecks");
             }
@@ -142895,10 +142914,13 @@ var ts;
             var contextualType = info.contextualType, argumentIndex = info.argumentIndex, argumentCount = info.argumentCount, argumentsSpan = info.argumentsSpan;
             // for optional function condition.
             var nonNullableContextualType = contextualType.getNonNullableType();
-            var signatures = nonNullableContextualType.getCallSignatures();
-            if (signatures.length !== 1)
+            var symbol = nonNullableContextualType.symbol;
+            if (symbol === undefined)
+                return undefined;
+            var signature = ts.lastOrUndefined(nonNullableContextualType.getCallSignatures());
+            if (signature === undefined)
                 return undefined;
-            var invocation = { kind: 2 /* Contextual */, signature: ts.first(signatures), node: startingToken, symbol: chooseBetterSymbol(nonNullableContextualType.symbol) };
+            var invocation = { kind: 2 /* Contextual */, signature: signature, node: startingToken, symbol: chooseBetterSymbol(symbol) };
             return { isTypeParameterList: false, invocation: invocation, argumentsSpan: argumentsSpan, argumentIndex: argumentIndex, argumentCount: argumentCount };
         }
         function getContextualSignatureLocationInfo(startingToken, sourceFile, position, checker) {
@@ -147068,9 +147090,9 @@ var ts;
                 // for block indentation, we should look for a line which contains something that's not
                 // whitespace.
                 var currentToken = ts.getTokenAtPosition(sourceFile, position);
-                // for object literal, we want to the indentation work like block
-                // if { starts in any position (can be in the middle of line)
-                // the following indentation should treat { as starting of that line (including leading whitespace)
+                // For object literals, we want indentation to work just like with blocks.
+                // If the `{` starts in any position (even in the middle of a line), then
+                // the following indentation should treat `{` as the start of that line (including leading whitespace).
                 // ```
                 //     const a: { x: undefined, y: undefined } = {}       // leading 4 whitespaces and { starts in the middle of line
                 // ->
@@ -147088,7 +147110,8 @@ var ts;
                 //          y: undefined,
                 //      }
                 // ```
-                if (options.indentStyle === ts.IndentStyle.Block || currentToken.kind === 18 /* OpenBraceToken */) {
+                var isObjectLiteral = currentToken.kind === 18 /* OpenBraceToken */ && currentToken.parent.kind === 205 /* ObjectLiteralExpression */;
+                if (options.indentStyle === ts.IndentStyle.Block || isObjectLiteral) {
                     return getBlockIndent(sourceFile, position, options);
                 }
                 if (precedingToken.kind === 27 /* CommaToken */ && precedingToken.parent.kind !== 221 /* BinaryExpression */) {
@@ -147101,7 +147124,9 @@ var ts;
                 var containerList = getListByPosition(position, precedingToken.parent, sourceFile);
                 // use list position if the preceding token is before any list items
                 if (containerList && !ts.rangeContainsRange(containerList, precedingToken)) {
-                    return getActualIndentationForListStartLine(containerList, sourceFile, options) + options.indentSize; // TODO: GH#18217
+                    var useTheSameBaseIndentation = [213 /* FunctionExpression */, 214 /* ArrowFunction */].indexOf(currentToken.parent.kind) !== -1;
+                    var indentSize = useTheSameBaseIndentation ? 0 : options.indentSize;
+                    return getActualIndentationForListStartLine(containerList, sourceFile, options) + indentSize; // TODO: GH#18217
                 }
                 return getSmartIndent(sourceFile, position, precedingToken, lineAtPosition, assumeNewLineBeforeCloseBrace, options);
             }
@@ -153667,7 +153692,7 @@ var ts;
                 var param = signature.parameters[argIndex].valueDeclaration;
                 if (!(param && ts.isParameter(param) && ts.isIdentifier(param.name)))
                     return undefined;
-                var properties = ts.arrayFrom(checker.getUnmatchedProperties(checker.getTypeAtLocation(parent), checker.getTypeAtLocation(param), /* requireOptionalProperties */ false, /* matchDiscriminantProperties */ false));
+                var properties = ts.arrayFrom(checker.getUnmatchedProperties(checker.getTypeAtLocation(parent), checker.getParameterType(signature, argIndex), /* requireOptionalProperties */ false, /* matchDiscriminantProperties */ false));
                 if (!ts.length(properties))
                     return undefined;
                 return { kind: 3 /* ObjectLiteral */, token: param.name, properties: properties, parentDeclaration: parent };
@@ -156675,7 +156700,11 @@ var ts;
             var program = context.program;
             var checker = program.getTypeChecker();
             var scriptTarget = ts.getEmitScriptTarget(program.getCompilerOptions());
-            var flags = 1 /* NoTruncation */ | 1073741824 /* NoUndefinedOptionalParameterType */ | 256 /* SuppressAnyReturnType */ | (quotePreference === 0 /* Single */ ? 268435456 /* UseSingleQuotesForStringLiteralType */ : 0);
+            var flags = 1 /* NoTruncation */
+                | 1073741824 /* NoUndefinedOptionalParameterType */
+                | 256 /* SuppressAnyReturnType */
+                | 524288 /* AllowEmptyTuple */
+                | (quotePreference === 0 /* Single */ ? 268435456 /* UseSingleQuotesForStringLiteralType */ : 0 /* None */);
             var signatureDeclaration = checker.signatureToSignatureDeclaration(signature, kind, enclosingDeclaration, flags, getNoopSymbolTrackerWithResolver(context));
             if (!signatureDeclaration) {
                 return undefined;
@@ -159409,7 +159438,8 @@ var ts;
                 return undefined;
             }
             function isScope(node) {
-                return ts.isFunctionLikeDeclaration(node) || ts.isSourceFile(node) || ts.isModuleBlock(node) || ts.isClassLike(node);
+                return ts.isArrowFunction(node) ? ts.isFunctionBody(node.body) :
+                    ts.isFunctionLikeDeclaration(node) || ts.isSourceFile(node) || ts.isModuleBlock(node) || ts.isClassLike(node);
             }
             /**
              * Computes possible places we could extract the function into. For example,

package/lib/typescriptServices.d.ts

@@ -1983,7 +1983,7 @@ declare namespace ts {
         Label = 12,
         Condition = 96
     }
-    export type FlowNode = FlowStart | FlowLabel | FlowAssignment | FlowCall | FlowCondition | FlowSwitchClause | FlowArrayMutation | FlowCall | FlowReduceLabel;
+    export type FlowNode = FlowStart | FlowLabel | FlowAssignment | FlowCondition | FlowSwitchClause | FlowArrayMutation | FlowCall | FlowReduceLabel;
     export interface FlowNodeBase {
         flags: FlowFlags;
         id?: number;