@typescript-deploys/pr-build 4.7.0-pr-48094-5 → 4.7.0-pr-48264-4

package/lib/protocol.d.ts

@@ -42,6 +42,7 @@ declare namespace ts.server.protocol {
         Rename = "rename",
         Saveto = "saveto",
         SignatureHelp = "signatureHelp",
+        SourceDefinitionAndBoundSpan = "sourceDefinitionAndBoundSpan",
         Status = "status",
         TypeDefinition = "typeDefinition",
         ProjectInfo = "projectInfo",
@@ -661,6 +662,9 @@ declare namespace ts.server.protocol {
     interface DefinitionAndBoundSpanRequest extends FileLocationRequest {
         readonly command: CommandTypes.DefinitionAndBoundSpan;
     }
+    interface SourceDefinitionAndBoundSpanRequest extends FileLocationRequest {
+        readonly command: CommandTypes.SourceDefinitionAndBoundSpan;
+    }
     interface DefinitionAndBoundSpanResponse extends Response {
         readonly body: DefinitionInfoAndBoundSpan;
     }

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.7";
-    ts.version = ts.versionMajorMinor + ".0-insiders.20220314";
+    ts.version = ts.versionMajorMinor + ".0-insiders.20220316";
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -5221,7 +5221,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."),
@@ -11431,6 +11431,10 @@ var ts;
         }
     }
     ts.isAnyImportSyntax = isAnyImportSyntax;
+    function isAnyImportOrBareOrAccessedRequire(node) {
+        return isAnyImportSyntax(node) || isVariableDeclarationInitializedToBareOrAccessedRequire(node);
+    }
+    ts.isAnyImportOrBareOrAccessedRequire = isAnyImportOrBareOrAccessedRequire;
     function isLateVisibilityPaintedStatement(node) {
         switch (node.kind) {
             case 265:
@@ -12861,14 +12865,14 @@ var ts;
     }
     ts.isFunctionSymbol = isFunctionSymbol;
     function tryGetModuleSpecifierFromDeclaration(node) {
-        var _a, _b, _c;
+        var _a, _b;
         switch (node.kind) {
             case 253:
-                return node.initializer.arguments[0].text;
+                return (_a = ts.findAncestor(node.initializer, function (node) { return isRequireCall(node, true); })) === null || _a === void 0 ? void 0 : _a.arguments[0];
             case 265:
-                return (_a = ts.tryCast(node.moduleSpecifier, ts.isStringLiteralLike)) === null || _a === void 0 ? void 0 : _a.text;
+                return ts.tryCast(node.moduleSpecifier, ts.isStringLiteralLike);
             case 264:
-                return (_c = ts.tryCast((_b = ts.tryCast(node.moduleReference, ts.isExternalModuleReference)) === null || _b === void 0 ? void 0 : _b.expression, ts.isStringLiteralLike)) === null || _c === void 0 ? void 0 : _c.text;
+                return ts.tryCast((_b = ts.tryCast(node.moduleReference, ts.isExternalModuleReference)) === null || _b === void 0 ? void 0 : _b.expression, ts.isStringLiteralLike);
             default:
                 ts.Debug.assertNever(node);
         }
@@ -13343,18 +13347,22 @@ var ts;
     }
     ts.isIdentifierName = isIdentifierName;
     function isAliasSymbolDeclaration(node) {
-        return node.kind === 264 ||
+        if (node.kind === 264 ||
             node.kind === 263 ||
             node.kind === 266 && !!node.name ||
             node.kind === 267 ||
             node.kind === 273 ||
             node.kind === 269 ||
             node.kind === 274 ||
-            node.kind === 270 && exportAssignmentIsAlias(node) ||
-            ts.isBinaryExpression(node) && getAssignmentDeclarationKind(node) === 2 && exportAssignmentIsAlias(node) ||
-            ts.isPropertyAccessExpression(node) && ts.isBinaryExpression(node.parent) && node.parent.left === node && node.parent.operatorToken.kind === 63 && isAliasableExpression(node.parent.right) ||
-            node.kind === 296 ||
-            node.kind === 295 && isAliasableExpression(node.initializer);
+            node.kind === 270 && exportAssignmentIsAlias(node)) {
+            return true;
+        }
+        return isInJSFile(node) && (ts.isBinaryExpression(node) && getAssignmentDeclarationKind(node) === 2 && exportAssignmentIsAlias(node) ||
+            ts.isPropertyAccessExpression(node)
+                && ts.isBinaryExpression(node.parent)
+                && node.parent.left === node
+                && node.parent.operatorToken.kind === 63
+                && isAliasableExpression(node.parent.right));
     }
     ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
     function getAliasDeclarationFromName(node) {
@@ -13365,6 +13373,7 @@ var ts;
             case 274:
             case 270:
             case 264:
+            case 273:
                 return node.parent;
             case 160:
                 do {
@@ -25342,17 +25351,20 @@ var ts;
             return inContext(32768);
         }
         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) {
             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);
             }
             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);
@@ -25568,6 +25580,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();
@@ -26906,7 +26931,7 @@ var ts;
             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));
+                    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);
@@ -28263,10 +28288,11 @@ var ts;
         }
         function parseArrayLiteralExpression() {
             var pos = getNodePos();
-            parseExpected(22);
+            var openBracketPosition = scanner.getTokenPos();
+            var openBracketParsed = parseExpected(22);
             var multiLine = scanner.hasPrecedingLineBreak();
             var elements = parseDelimitedList(15, parseArgumentOrArrayLiteralElement);
-            parseExpected(23);
+            parseExpectedMatchingBrackets(22, 23, openBracketParsed, openBracketPosition);
             return finishNode(factory.createArrayLiteralExpression(elements, multiLine), pos);
         }
         function parseObjectLiteralElement() {
@@ -28314,15 +28340,10 @@ var ts;
         function parseObjectLiteralExpression() {
             var pos = getNodePos();
             var openBracePosition = scanner.getTokenPos();
-            parseExpected(18);
+            var openBraceParsed = parseExpected(18);
             var multiLine = scanner.hasPrecedingLineBreak();
             var properties = parseDelimitedList(12, parseObjectLiteralElement, true);
-            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));
-                }
-            }
+            parseExpectedMatchingBrackets(18, 19, openBraceParsed, openBracePosition);
             return finishNode(factory.createObjectLiteralExpression(properties, multiLine), pos);
         }
         function parseFunctionExpression() {
@@ -28371,15 +28392,11 @@ var ts;
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             var openBracePosition = scanner.getTokenPos();
-            if (parseExpected(18, diagnosticMessage) || ignoreMissingOpenBrace) {
+            var openBraceParsed = parseExpected(18, diagnosticMessage);
+            if (openBraceParsed || ignoreMissingOpenBrace) {
                 var multiLine = scanner.hasPrecedingLineBreak();
                 var statements = parseList(1, parseStatement);
-                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));
-                    }
-                }
+                parseExpectedMatchingBrackets(18, 19, openBraceParsed, openBracePosition);
                 var result = withJSDoc(finishNode(factory.createBlock(statements, multiLine), pos), hasJSDoc);
                 if (token() === 63) {
                     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);
@@ -28422,9 +28439,10 @@ var ts;
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(99);
-            parseExpected(20);
+            var openParenPosition = scanner.getTokenPos();
+            var openParenParsed = parseExpected(20);
             var expression = allowInAnd(parseExpression);
-            parseExpected(21);
+            parseExpectedMatchingBrackets(20, 21, openParenParsed, openParenPosition);
             var thenStatement = parseStatement();
             var elseStatement = parseOptional(91) ? parseStatement() : undefined;
             return withJSDoc(finishNode(factory.createIfStatement(expression, thenStatement, elseStatement), pos), hasJSDoc);
@@ -28435,9 +28453,10 @@ var ts;
             parseExpected(90);
             var statement = parseStatement();
             parseExpected(115);
-            parseExpected(20);
+            var openParenPosition = scanner.getTokenPos();
+            var openParenParsed = parseExpected(20);
             var expression = allowInAnd(parseExpression);
-            parseExpected(21);
+            parseExpectedMatchingBrackets(20, 21, openParenParsed, openParenPosition);
             parseOptional(26);
             return withJSDoc(finishNode(factory.createDoStatement(statement, expression), pos), hasJSDoc);
         }
@@ -28445,9 +28464,10 @@ var ts;
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(115);
-            parseExpected(20);
+            var openParenPosition = scanner.getTokenPos();
+            var openParenParsed = parseExpected(20);
             var expression = allowInAnd(parseExpression);
-            parseExpected(21);
+            parseExpectedMatchingBrackets(20, 21, openParenParsed, openParenPosition);
             var statement = parseStatement();
             return withJSDoc(finishNode(factory.createWhileStatement(expression, statement), pos), hasJSDoc);
         }
@@ -28514,9 +28534,10 @@ var ts;
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(116);
-            parseExpected(20);
+            var openParenPosition = scanner.getTokenPos();
+            var openParenParsed = parseExpected(20);
             var expression = allowInAnd(parseExpression);
-            parseExpected(21);
+            parseExpectedMatchingBrackets(20, 21, openParenParsed, openParenPosition);
             var statement = doInsideOfContext(16777216, parseStatement);
             return withJSDoc(finishNode(factory.createWithStatement(expression, statement), pos), hasJSDoc);
         }
@@ -29520,7 +29541,7 @@ var ts;
                 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));
+                        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);
@@ -30371,8 +30392,7 @@ var ts;
                             hasChildren = true;
                             if (child.kind === 342) {
                                 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));
                                     }
@@ -31993,6 +32013,13 @@ var ts;
             description: ts.Diagnostics.Allow_accessing_UMD_globals_from_modules,
             defaultValueDescription: false,
         },
+        {
+            name: "noDtsResolution",
+            type: "boolean",
+            affectsModuleResolution: true,
+            category: ts.Diagnostics.Modules,
+            defaultValueDescription: false,
+        },
         {
             name: "sourceRoot",
             type: "string",
@@ -34093,6 +34120,7 @@ var ts;
         Extensions[Extensions["Json"] = 2] = "Json";
         Extensions[Extensions["TSConfig"] = 3] = "TSConfig";
         Extensions[Extensions["DtsOnly"] = 4] = "DtsOnly";
+        Extensions[Extensions["TypeScriptButNotDts"] = 5] = "TypeScriptButNotDts";
     })(Extensions || (Extensions = {}));
     function resolvedTypeScriptOnly(resolved) {
         if (!resolved) {
@@ -34889,13 +34917,31 @@ var ts;
         return nodeModuleNameResolverWorker(NodeResolutionFeatures.None, moduleName, initialDir, { moduleResolution: ts.ModuleResolutionKind.NodeJs, allowJs: true }, host, undefined, jsOnlyExtensions, undefined);
     }
     function nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, lookupConfig) {
-        return nodeModuleNameResolverWorker(NodeResolutionFeatures.None, moduleName, ts.getDirectoryPath(containingFile), compilerOptions, host, cache, lookupConfig ? tsconfigExtensions : (compilerOptions.resolveJsonModule ? tsPlusJsonExtensions : tsExtensions), redirectedReference);
+        var extensions;
+        if (lookupConfig) {
+            extensions = tsconfigExtensions;
+        }
+        else if (compilerOptions.noDtsResolution) {
+            extensions = [Extensions.TypeScriptButNotDts];
+            if (compilerOptions.allowJs)
+                extensions.push(Extensions.JavaScript);
+            if (compilerOptions.resolveJsonModule)
+                extensions.push(Extensions.Json);
+        }
+        else {
+            extensions = compilerOptions.resolveJsonModule ? tsPlusJsonExtensions : tsExtensions;
+        }
+        return nodeModuleNameResolverWorker(NodeResolutionFeatures.None, moduleName, ts.getDirectoryPath(containingFile), compilerOptions, host, cache, extensions, redirectedReference);
     }
     ts.nodeModuleNameResolver = nodeModuleNameResolver;
     function nodeModuleNameResolverWorker(features, moduleName, containingDirectory, compilerOptions, host, cache, extensions, redirectedReference) {
         var _a, _b;
         var traceEnabled = isTraceEnabled(compilerOptions, host);
         var failedLookupLocations = [];
+        var conditions = features & NodeResolutionFeatures.EsmMode ? ["node", "import", "types"] : ["node", "require", "types"];
+        if (compilerOptions.noDtsResolution) {
+            conditions.pop();
+        }
         var state = {
             compilerOptions: compilerOptions,
             host: host,
@@ -34903,7 +34949,7 @@ var ts;
             failedLookupLocations: failedLookupLocations,
             packageJsonInfoCache: cache,
             features: features,
-            conditions: features & NodeResolutionFeatures.EsmMode ? ["node", "import", "types"] : ["node", "require", "types"]
+            conditions: conditions,
         };
         var result = ts.forEach(extensions, function (ext) { return tryResolve(ext); });
         return createResolvedModuleWithFailedLookupLocations((_a = result === null || result === void 0 ? void 0 : result.value) === null || _a === void 0 ? void 0 : _a.resolved, (_b = result === null || result === void 0 ? void 0 : result.value) === null || _b === void 0 ? void 0 : _b.isExternalLibraryImport, failedLookupLocations, state.resultFromCache);
@@ -35078,20 +35124,22 @@ var ts;
                     default: return tryExtension(".d.ts");
                 }
             case Extensions.TypeScript:
+            case Extensions.TypeScriptButNotDts:
+                var useDts = extensions === Extensions.TypeScript;
                 switch (originalExtension) {
                     case ".mjs":
                     case ".mts":
                     case ".d.mts":
-                        return tryExtension(".mts") || tryExtension(".d.mts");
+                        return tryExtension(".mts") || (useDts ? tryExtension(".d.mts") : undefined);
                     case ".cjs":
                     case ".cts":
                     case ".d.cts":
-                        return tryExtension(".cts") || tryExtension(".d.cts");
+                        return tryExtension(".cts") || (useDts ? tryExtension(".d.cts") : undefined);
                     case ".json":
                         candidate += ".json";
-                        return tryExtension(".d.ts");
+                        return useDts ? tryExtension(".d.ts") : undefined;
                     default:
-                        return tryExtension(".ts") || tryExtension(".tsx") || tryExtension(".d.ts");
+                        return tryExtension(".ts") || tryExtension(".tsx") || (useDts ? tryExtension(".d.ts") : undefined);
                 }
             case Extensions.JavaScript:
                 switch (originalExtension) {
@@ -35296,6 +35344,7 @@ var ts;
             switch (extensions) {
                 case Extensions.JavaScript:
                 case Extensions.Json:
+                case Extensions.TypeScriptButNotDts:
                     packageFile = readPackageJsonMainField(jsonContent, candidate, state);
                     break;
                 case Extensions.TypeScript:
@@ -35364,6 +35413,8 @@ var ts;
                 return extension === ".json";
             case Extensions.TypeScript:
                 return extension === ".ts" || extension === ".tsx" || extension === ".d.ts";
+            case Extensions.TypeScriptButNotDts:
+                return extension === ".ts" || extension === ".tsx";
             case Extensions.DtsOnly:
                 return extension === ".d.ts";
         }
@@ -45682,7 +45733,7 @@ var ts;
                         }
                     }
                     var sourceTypes = ts.some(constructorTypes, function (t) { return !!(t.flags & ~98304); }) ? constructorTypes : types;
-                    type = getUnionType(sourceTypes, 2);
+                    type = getUnionType(sourceTypes);
                 }
             }
             var widened = getWidenedType(addOptionality(type, false, definedInMethod && !definedInConstructor));
@@ -48235,8 +48286,10 @@ var ts;
             return type;
         }
         function isMappedTypeGenericIndexedAccess(type) {
-            return type.flags & 8388608 && ts.getObjectFlags(type.objectType) & 32 &&
-                !isGenericMappedType(type.objectType) && isGenericIndexType(type.indexType);
+            var objectType;
+            return !!(type.flags & 8388608 && ts.getObjectFlags(objectType = type.objectType) & 32 &&
+                !isGenericMappedType(objectType) && isGenericIndexType(type.indexType) &&
+                !objectType.declaration.questionToken && !objectType.declaration.nameType);
         }
         function getApparentType(type) {
             var t = !(type.flags & 465829888) ? type : getBaseConstraintOfType(type) || unknownType;
@@ -48738,7 +48791,15 @@ var ts;
                 return p.typeExpression && ts.isJSDocVariadicType(p.typeExpression.type) ? p.typeExpression.type : undefined;
             });
             var syntheticArgsSymbol = createSymbol(3, "args", 32768);
-            syntheticArgsSymbol.type = lastParamVariadicType ? createArrayType(getTypeFromTypeNode(lastParamVariadicType.type)) : anyArrayType;
+            if (lastParamVariadicType) {
+                syntheticArgsSymbol.type = createArrayType(getTypeFromTypeNode(lastParamVariadicType.type));
+            }
+            else {
+                syntheticArgsSymbol.checkFlags |= 65536;
+                syntheticArgsSymbol.deferralParent = neverType;
+                syntheticArgsSymbol.deferralConstituents = [anyArrayType];
+                syntheticArgsSymbol.deferralWriteConstituents = [anyArrayType];
+            }
             if (lastParamVariadicType) {
                 parameters.pop();
             }
@@ -51068,7 +51129,7 @@ var ts;
                     return type[cache] = elementType;
                 }
             }
-            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;
@@ -52905,7 +52966,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
@@ -56221,27 +56282,17 @@ var ts;
             return sourceStart.slice(0, startLen) !== targetStart.slice(0, startLen) ||
                 sourceEnd.slice(sourceEnd.length - endLen) !== targetEnd.slice(targetEnd.length - endLen);
         }
-        function isValidNumberString(s, roundTripOnly) {
-            if (s === "")
-                return false;
-            var n = +s;
-            return isFinite(n) && (!roundTripOnly || "" + n === s);
-        }
-        function isValidBigIntString(s, roundTripOnly) {
-            if (s === "")
-                return false;
+        function isValidBigIntString(s) {
             var scanner = ts.createScanner(99, false);
             var success = true;
             scanner.setOnError(function () { return success = false; });
             scanner.setText(s + "n");
             var result = scanner.scan();
-            var negative = result === 40;
-            if (negative) {
+            if (result === 40) {
                 result = scanner.scan();
             }
             var flags = scanner.getTokenFlags();
-            return success && result === 9 && scanner.getTextPos() === (s.length + 1) && !(flags & 512)
-                && (!roundTripOnly || s === ts.pseudoBigIntToString({ negative: negative, base10Value: ts.parsePseudoBigInt(scanner.getTokenValue()) }));
+            return success && result === 9 && scanner.getTextPos() === (s.length + 1) && !(flags & 512);
         }
         function isValidTypeForTemplateLiteralPlaceholder(source, target) {
             if (source === target || target.flags & (1 | 4)) {
@@ -56249,8 +56300,8 @@ var ts;
             }
             if (source.flags & 128) {
                 var value = source.value;
-                return !!(target.flags & 8 && isValidNumberString(value, false) ||
-                    target.flags & 64 && isValidBigIntString(value, false) ||
+                return !!(target.flags & 8 && value !== "" && isFinite(+value) ||
+                    target.flags & 64 && value !== "" && isValidBigIntString(value) ||
                     target.flags & (512 | 98304) && value === target.intrinsicName);
             }
             if (source.flags & 134217728) {
@@ -56716,61 +56767,7 @@ var ts;
                 var types = target.types;
                 if (matches || ts.every(target.texts, function (s) { return s.length === 0; })) {
                     for (var i = 0; i < types.length; i++) {
-                        var source_1 = matches ? matches[i] : neverType;
-                        var target_3 = types[i];
-                        var sourceTypes = void 0;
-                        if (source_1.flags & 128 && target_3.flags & 8650752) {
-                            var inferenceContext = getInferenceInfoForType(target_3);
-                            var constraint = inferenceContext ? getConstraintOfTypeParameter(inferenceContext.typeParameter) : undefined;
-                            if (inferenceContext && constraint) {
-                                var str = source_1.value;
-                                var constraintTypes = constraint.flags & 1048576 ? constraint.types : [constraint];
-                                for (var _i = 0, constraintTypes_1 = constraintTypes; _i < constraintTypes_1.length; _i++) {
-                                    var constraintType = constraintTypes_1[_i];
-                                    if (constraintType.flags & 402653316) {
-                                        sourceTypes !== null && sourceTypes !== void 0 ? sourceTypes : (sourceTypes = []);
-                                        sourceTypes.push(source_1);
-                                    }
-                                    if (constraintType.flags & 296 && isValidNumberString(str, true)) {
-                                        sourceTypes !== null && sourceTypes !== void 0 ? sourceTypes : (sourceTypes = []);
-                                        sourceTypes.push(getNumberLiteralType(+str));
-                                    }
-                                    if (constraintType.flags & 2112 && isValidBigIntString(str, true)) {
-                                        var negative = str.startsWith("-");
-                                        var base10Value = ts.parsePseudoBigInt((negative ? str.slice(1) : str) + "n");
-                                        sourceTypes !== null && sourceTypes !== void 0 ? sourceTypes : (sourceTypes = []);
-                                        sourceTypes.push(getBigIntLiteralType({ negative: negative, base10Value: base10Value }));
-                                    }
-                                    if (constraintType.flags & 528) {
-                                        if (str === trueType.intrinsicName) {
-                                            sourceTypes !== null && sourceTypes !== void 0 ? sourceTypes : (sourceTypes = []);
-                                            sourceTypes.push(trueType);
-                                        }
-                                        else if (str === falseType.intrinsicName) {
-                                            sourceTypes !== null && sourceTypes !== void 0 ? sourceTypes : (sourceTypes = []);
-                                            sourceTypes.push(falseType);
-                                        }
-                                    }
-                                    if (constraintType.flags & 65536 && str === nullType.intrinsicName) {
-                                        sourceTypes !== null && sourceTypes !== void 0 ? sourceTypes : (sourceTypes = []);
-                                        sourceTypes.push(nullType);
-                                    }
-                                    if (constraintType.flags & 32768 && str === undefinedType.intrinsicName) {
-                                        sourceTypes !== null && sourceTypes !== void 0 ? sourceTypes : (sourceTypes = []);
-                                        sourceTypes.push(undefinedType);
-                                    }
-                                }
-                            }
-                        }
-                        if (sourceTypes) {
-                            for (var _a = 0, sourceTypes_3 = sourceTypes; _a < sourceTypes_3.length; _a++) {
-                                var source_2 = sourceTypes_3[_a];
-                                inferFromTypes(source_2, target_3);
-                            }
-                        }
-                        else {
-                            inferFromTypes(source_1, target_3);
-                        }
+                        inferFromTypes(matches ? matches[i] : neverType, types[i]);
                     }
                 }
             }
@@ -60056,7 +60053,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));
@@ -64298,7 +64295,9 @@ var ts;
             }
             if (signatureHasRestParameter(signature)) {
                 var parameter = ts.last(signature.parameters);
-                if (ts.isTransientSymbol(parameter) || !ts.getEffectiveTypeAnnotationNode(parameter.valueDeclaration)) {
+                if (parameter.valueDeclaration
+                    ? !ts.getEffectiveTypeAnnotationNode(parameter.valueDeclaration)
+                    : !!(ts.getCheckFlags(parameter) & 65536)) {
                     var contextualParameterType = getRestTypeAtPosition(context, len);
                     assignParameterType(parameter, contextualParameterType);
                 }
@@ -64317,8 +64316,8 @@ var ts;
             var links = getSymbolLinks(parameter);
             if (!links.type) {
                 var declaration = parameter.valueDeclaration;
-                links.type = type || getWidenedTypeForVariableLikeDeclaration(declaration, true);
-                if (declaration.name.kind !== 79) {
+                links.type = type || (declaration ? getWidenedTypeForVariableLikeDeclaration(declaration, true) : getTypeOfSymbol(parameter));
+                if (declaration && declaration.name.kind !== 79) {
                     if (links.type === unknownType) {
                         links.type = getTypeFromBindingPattern(declaration.name);
                     }