typescript 4.8.0-dev.20220807 → 4.9.0-dev.20220811

package/lib/tsserver.js

@@ -105,11 +105,11 @@ var ts;
 (function (ts) {
     // WARNING: The script `configurePrerelease.ts` uses a regexp to parse out these values.
     // If changing the text in this section, be sure to test `configurePrerelease` too.
-    ts.versionMajorMinor = "4.8";
+    ts.versionMajorMinor = "4.9";
     // 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.20220807";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220811";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -131,7 +131,11 @@ var ts;
             // Internet Explorer's Map doesn't support iteration, so don't use it.
             var gMap = globals === null || globals === void 0 ? void 0 : globals.Map;
             // eslint-disable-next-line no-in-operator
-            return typeof gMap !== "undefined" && "entries" in gMap.prototype && new gMap([[0, 0]]).size === 1 ? gMap : undefined;
+            var constructor = typeof gMap !== "undefined" && "entries" in gMap.prototype && new gMap([[0, 0]]).size === 1 ? gMap : undefined;
+            if (!constructor) {
+                throw new Error("No compatible Map implementation found.");
+            }
+            return constructor;
         }
         NativeCollections.tryGetNativeMap = tryGetNativeMap;
         /**
@@ -141,23 +145,18 @@ var ts;
             // Internet Explorer's Set doesn't support iteration, so don't use it.
             var gSet = globals === null || globals === void 0 ? void 0 : globals.Set;
             // eslint-disable-next-line no-in-operator
-            return typeof gSet !== "undefined" && "entries" in gSet.prototype && new gSet([0]).size === 1 ? gSet : undefined;
+            var constructor = typeof gSet !== "undefined" && "entries" in gSet.prototype && new gSet([0]).size === 1 ? gSet : undefined;
+            if (!constructor) {
+                throw new Error("No compatible Set implementation found.");
+            }
+            return constructor;
         }
         NativeCollections.tryGetNativeSet = tryGetNativeSet;
     })(NativeCollections || (NativeCollections = {}));
     /* @internal */
-    ts.Map = getCollectionImplementation("Map", "tryGetNativeMap", "createMapShim");
+    ts.Map = NativeCollections.tryGetNativeMap();
     /* @internal */
-    ts.Set = getCollectionImplementation("Set", "tryGetNativeSet", "createSetShim");
-    /* @internal */
-    function getCollectionImplementation(name, nativeFactory, shimFactory) {
-        var _a;
-        // NOTE: ts.ShimCollections will be defined for typescriptServices.js but not for tsc.js, so we must test for it.
-        var constructor = (_a = NativeCollections[nativeFactory]()) !== null && _a !== void 0 ? _a : ts.ShimCollections === null || ts.ShimCollections === void 0 ? void 0 : ts.ShimCollections[shimFactory](ts.getIterator);
-        if (constructor)
-            return constructor;
-        throw new Error("TypeScript requires an environment that provides a compatible native " + name + " implementation.");
-    }
+    ts.Set = NativeCollections.tryGetNativeSet();
 })(ts || (ts = {}));
 /* @internal */
 var ts;
@@ -873,15 +872,18 @@ var ts;
     function insertSorted(array, insert, compare, allowDuplicates) {
         if (array.length === 0) {
             array.push(insert);
-            return;
+            return true;
         }
         var insertIndex = binarySearch(array, insert, identity, compare);
         if (insertIndex < 0) {
             array.splice(~insertIndex, 0, insert);
+            return true;
         }
-        else if (allowDuplicates) {
+        if (allowDuplicates) {
             array.splice(insertIndex, 0, insert);
+            return true;
         }
+        return false;
     }
     ts.insertSorted = insertSorted;
     function sortAndDeduplicate(array, comparer, equalityComparer) {
@@ -7842,12 +7844,9 @@ var ts;
      * Normalize path separators, converting `\` into `/`.
      */
     function normalizeSlashes(path) {
-        var index = path.indexOf("\\");
-        if (index === -1) {
-            return path;
-        }
-        backslashRegExp.lastIndex = index; // prime regex with known position
-        return path.replace(backslashRegExp, ts.directorySeparator);
+        return path.indexOf("\\") !== -1
+            ? path.replace(backslashRegExp, ts.directorySeparator)
+            : path;
     }
     ts.normalizeSlashes = normalizeSlashes;
     /**
@@ -9548,6 +9547,7 @@ var ts;
         Reusing_resolution_of_type_reference_directive_0_from_1_found_in_cache_from_location_2_it_was_not_resolved: diag(6398, ts.DiagnosticCategory.Message, "Reusing_resolution_of_type_reference_directive_0_from_1_found_in_cache_from_location_2_it_was_not_re_6398", "Reusing resolution of type reference directive '{0}' from '{1}' found in cache from location '{2}', it was not resolved."),
         Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_were_not_emitted: diag(6399, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_were_not_emitte_6399", "Project '{0}' is out of date because buildinfo file '{1}' indicates that some of the changes were not emitted"),
         Project_0_is_up_to_date_but_needs_to_update_timestamps_of_output_files_that_are_older_than_input_files: diag(6400, ts.DiagnosticCategory.Message, "Project_0_is_up_to_date_but_needs_to_update_timestamps_of_output_files_that_are_older_than_input_fil_6400", "Project '{0}' is up to date but needs to update timestamps of output files that are older than input files"),
+        Project_0_is_out_of_date_because_there_was_error_reading_file_1: diag(6401, ts.DiagnosticCategory.Message, "Project_0_is_out_of_date_because_there_was_error_reading_file_1_6401", "Project '{0}' is out of date because there was error reading file '{1}'"),
         The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1: diag(6500, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_property_0_which_is_declared_here_on_type_1_6500", "The expected type comes from property '{0}' which is declared here on type '{1}'"),
         The_expected_type_comes_from_this_index_signature: diag(6501, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_this_index_signature_6501", "The expected type comes from this index signature."),
         The_expected_type_comes_from_the_return_type_of_this_signature: diag(6502, ts.DiagnosticCategory.Message, "The_expected_type_comes_from_the_return_type_of_this_signature_6502", "The expected type comes from the return type of this signature."),
@@ -19391,21 +19391,17 @@ var ts;
         return getStringFromExpandedCharCodes(expandedCharCodes);
     }
     ts.base64decode = base64decode;
+    function readJsonOrUndefined(path, hostOrText) {
+        var jsonText = ts.isString(hostOrText) ? hostOrText : hostOrText.readFile(path);
+        if (!jsonText)
+            return undefined;
+        // gracefully handle if readFile fails or returns not JSON
+        var result = ts.parseConfigFileTextToJson(path, jsonText);
+        return !result.error ? result.config : undefined;
+    }
+    ts.readJsonOrUndefined = readJsonOrUndefined;
     function readJson(path, host) {
-        try {
-            var jsonText = host.readFile(path);
-            if (!jsonText)
-                return {};
-            var result = ts.parseConfigFileTextToJson(path, jsonText);
-            if (result.error) {
-                return {};
-            }
-            return result.config;
-        }
-        catch (e) {
-            // gracefully handle if readFile fails or returns not JSON
-            return {};
-        }
+        return readJsonOrUndefined(path, host) || {};
     }
     ts.readJson = readJson;
     function directoryProbablyExists(directoryName, host) {
@@ -27756,9 +27752,10 @@ var ts;
             };
             var buildInfo_1;
             var getAndCacheBuildInfo_1 = function (getText) {
+                var _a;
                 if (buildInfo_1 === undefined) {
                     var result = getText();
-                    buildInfo_1 = result !== undefined ? ts.getBuildInfo(result) : false;
+                    buildInfo_1 = result !== undefined ? (_a = ts.getBuildInfo(node.buildInfoPath, result)) !== null && _a !== void 0 ? _a : false : false;
                 }
                 return buildInfo_1 || undefined;
             };
@@ -45818,6 +45815,9 @@ var ts;
                 case 203 /* BindingElement */:
                     bindBindingElementFlow(node);
                     break;
+                case 164 /* Parameter */:
+                    bindParameterFlow(node);
+                    break;
                 case 205 /* ObjectLiteralExpression */:
                 case 204 /* ArrayLiteralExpression */:
                 case 296 /* PropertyAssignment */:
@@ -46558,20 +46558,38 @@ var ts;
             }
         }
         function bindBindingElementFlow(node) {
-            if (ts.isBindingPattern(node.name)) {
-                // When evaluating a binding pattern, the initializer is evaluated before the binding pattern, per:
-                // - https://tc39.es/ecma262/#sec-destructuring-binding-patterns-runtime-semantics-iteratorbindinginitialization
-                //   - `BindingElement: BindingPattern Initializer?`
-                // - https://tc39.es/ecma262/#sec-runtime-semantics-keyedbindinginitialization
-                //   - `BindingElement: BindingPattern Initializer?`
-                bind(node.dotDotDotToken);
-                bind(node.propertyName);
-                bind(node.initializer);
-                bind(node.name);
+            // When evaluating a binding pattern, the initializer is evaluated before the binding pattern, per:
+            // - https://tc39.es/ecma262/#sec-destructuring-binding-patterns-runtime-semantics-iteratorbindinginitialization
+            //   - `BindingElement: BindingPattern Initializer?`
+            // - https://tc39.es/ecma262/#sec-runtime-semantics-keyedbindinginitialization
+            //   - `BindingElement: BindingPattern Initializer?`
+            bind(node.dotDotDotToken);
+            bind(node.propertyName);
+            bindInitializer(node.initializer);
+            bind(node.name);
+        }
+        function bindParameterFlow(node) {
+            bindEach(node.modifiers);
+            bind(node.dotDotDotToken);
+            bind(node.questionToken);
+            bind(node.type);
+            bindInitializer(node.initializer);
+            bind(node.name);
+        }
+        // a BindingElement/Parameter does not have side effects if initializers are not evaluated and used. (see GH#49759)
+        function bindInitializer(node) {
+            if (!node) {
+                return;
             }
-            else {
-                bindEachChild(node);
+            var entryFlow = currentFlow;
+            bind(node);
+            if (entryFlow === unreachableFlow || entryFlow === currentFlow) {
+                return;
             }
+            var exitFlow = createBranchLabel();
+            addAntecedent(exitFlow, entryFlow);
+            addAntecedent(exitFlow, currentFlow);
+            currentFlow = finishFlowLabel(exitFlow);
         }
         function bindJSDocTypeAlias(node) {
             bind(node.tagName);
@@ -49742,7 +49760,7 @@ var ts;
             if (unidirectional === void 0) { unidirectional = false; }
             source.forEach(function (sourceSymbol, id) {
                 var targetSymbol = target.get(id);
-                target.set(id, targetSymbol ? mergeSymbol(targetSymbol, sourceSymbol, unidirectional) : sourceSymbol);
+                target.set(id, targetSymbol ? mergeSymbol(targetSymbol, sourceSymbol, unidirectional) : getMergedSymbol(sourceSymbol));
             });
         }
         function mergeModuleAugmentation(moduleName) {
@@ -56533,11 +56551,9 @@ var ts;
                         return getReturnTypeOfSignature(getterSignature);
                     }
                 }
-                if (ts.isInJSFile(declaration)) {
-                    var type_1 = getParameterTypeOfTypeTag(func, declaration);
-                    if (type_1)
-                        return type_1;
-                }
+                var parameterTypeOfTypeTag = getParameterTypeOfTypeTag(func, declaration);
+                if (parameterTypeOfTypeTag)
+                    return parameterTypeOfTypeTag;
                 // Use contextual parameter type if one is available
                 var type = declaration.symbol.escapedName === "this" /* This */ ? getContextualThisParameterType(func) : getContextuallyTypedParameterType(declaration);
                 if (type) {
@@ -57113,9 +57129,9 @@ var ts;
                 if (typeNode === undefined) {
                     return useUnknownInCatchVariables ? unknownType : anyType;
                 }
-                var type_2 = getTypeOfNode(typeNode);
+                var type_1 = getTypeOfNode(typeNode);
                 // an errorType will make `checkTryStatement` issue an error
-                return isTypeAny(type_2) || type_2 === unknownType ? type_2 : errorType;
+                return isTypeAny(type_1) || type_1 === unknownType ? type_1 : errorType;
             }
             // Handle export default expressions
             if (ts.isSourceFile(declaration) && ts.isJsonSourceFile(declaration)) {
@@ -57325,11 +57341,11 @@ var ts;
                         return errorType;
                     }
                     var exportEquals = getMergedSymbol(symbol.exports.get("export=" /* ExportEquals */));
-                    var type_3 = getWidenedTypeForAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule);
+                    var type_2 = getWidenedTypeForAssignmentDeclaration(exportEquals, exportEquals === resolvedModule ? undefined : resolvedModule);
                     if (!popTypeResolution()) {
                         return reportCircularityError(symbol);
                     }
-                    return type_3;
+                    return type_2;
                 }
             }
             var type = createObjectType(16 /* Anonymous */, symbol);
@@ -59552,10 +59568,10 @@ var ts;
                     var baseTypes = [];
                     var different = false;
                     for (var _i = 0, types_7 = types; _i < types_7.length; _i++) {
-                        var type_4 = types_7[_i];
-                        var baseType = getBaseConstraint(type_4);
+                        var type_3 = types_7[_i];
+                        var baseType = getBaseConstraint(type_3);
                         if (baseType) {
-                            if (baseType !== type_4) {
+                            if (baseType !== type_3) {
                                 different = true;
                             }
                             baseTypes.push(baseType);
@@ -60346,7 +60362,12 @@ var ts;
                         continue;
                     }
                 }
-                result.push(getSignatureFromDeclaration(decl));
+                // If this is a function or method declaration, get the signature from the @type tag for the sake of optional parameters.
+                // Exclude contextually-typed kinds because we already apply the @type tag to the context, plus applying it here to the initializer would supress checks that the two are compatible.
+                result.push((!ts.isFunctionExpressionOrArrowFunction(decl) &&
+                    !ts.isObjectLiteralMethod(decl) &&
+                    getSignatureOfTypeTag(decl)) ||
+                    getSignatureFromDeclaration(decl));
             }
             return result;
         }
@@ -60377,7 +60398,7 @@ var ts;
                 else {
                     var type = signature.declaration && ts.getEffectiveReturnTypeNode(signature.declaration);
                     var jsdocPredicate = void 0;
-                    if (!type && ts.isInJSFile(signature.declaration)) {
+                    if (!type) {
                         var jsdocSignature = getSignatureOfTypeTag(signature.declaration);
                         if (jsdocSignature && signature !== jsdocSignature) {
                             jsdocPredicate = getTypePredicateOfSignature(jsdocSignature);
@@ -64403,15 +64424,14 @@ var ts;
             return false;
         }
         function isContextSensitiveFunctionLikeDeclaration(node) {
-            return (!ts.isFunctionDeclaration(node) || ts.isInJSFile(node) && !!getTypeForDeclarationFromJSDocComment(node)) &&
-                (ts.hasContextSensitiveParameters(node) || hasContextSensitiveReturnExpression(node));
+            return ts.hasContextSensitiveParameters(node) || hasContextSensitiveReturnExpression(node);
         }
         function hasContextSensitiveReturnExpression(node) {
             // TODO(anhans): A block should be context-sensitive if it has a context-sensitive return value.
             return !node.typeParameters && !ts.getEffectiveReturnTypeNode(node) && !!node.body && node.body.kind !== 235 /* Block */ && isContextSensitive(node.body);
         }
         function isContextSensitiveFunctionOrObjectLiteralMethod(func) {
-            return (ts.isInJSFile(func) && ts.isFunctionDeclaration(func) || ts.isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) &&
+            return (ts.isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) &&
                 isContextSensitiveFunctionLikeDeclaration(func);
         }
         function getTypeWithoutSignatures(type) {
@@ -73469,9 +73489,11 @@ var ts;
                 case 1 /* ExportsProperty */:
                 case 6 /* Prototype */:
                 case 3 /* PrototypeProperty */:
-                    var valueDeclaration = (_a = binaryExpression.left.symbol) === null || _a === void 0 ? void 0 : _a.valueDeclaration;
-                // falls through
                 case 2 /* ModuleExports */:
+                    var valueDeclaration = void 0;
+                    if (kind !== 2 /* ModuleExports */) {
+                        valueDeclaration = (_a = binaryExpression.left.symbol) === null || _a === void 0 ? void 0 : _a.valueDeclaration;
+                    }
                     valueDeclaration || (valueDeclaration = (_b = binaryExpression.symbol) === null || _b === void 0 ? void 0 : _b.valueDeclaration);
                     var annotated = valueDeclaration && ts.getEffectiveTypeAnnotationNode(valueDeclaration);
                     return annotated ? getTypeFromTypeNode(annotated) : undefined;
@@ -73949,9 +73971,18 @@ var ts;
                 if (!isErrorType(intrinsicClassAttribs)) {
                     var typeParams = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(intrinsicClassAttribs.symbol);
                     var hostClassType = getReturnTypeOfSignature(sig);
-                    apparentAttributesType = intersectTypes(typeParams
-                        ? createTypeReference(intrinsicClassAttribs, fillMissingTypeArguments([hostClassType], typeParams, getMinTypeArgumentCount(typeParams), ts.isInJSFile(context)))
-                        : intrinsicClassAttribs, apparentAttributesType);
+                    var libraryManagedAttributeType = void 0;
+                    if (typeParams && typeParams.length === 1) {
+                        var inferredArgs = fillMissingTypeArguments([hostClassType], typeParams, getMinTypeArgumentCount(typeParams), ts.isInJSFile(context));
+                        libraryManagedAttributeType = instantiateType(intrinsicClassAttribs, createTypeMapper(typeParams, inferredArgs));
+                    }
+                    else if (typeParams)
+                        libraryManagedAttributeType = undefined;
+                    else
+                        libraryManagedAttributeType = intrinsicClassAttribs;
+                    if (libraryManagedAttributeType) {
+                        apparentAttributesType = intersectTypes(libraryManagedAttributeType, apparentAttributesType);
+                    }
                 }
                 var intrinsicAttribs = getJsxType(JsxNames.IntrinsicAttributes, context);
                 if (!isErrorType(intrinsicAttribs)) {
@@ -74456,16 +74487,30 @@ var ts;
             // If object literal is contextually typed by the implied type of a binding pattern, augment the result
             // type with those properties for which the binding pattern specifies a default value.
             // If the object literal is spread into another object literal, skip this step and let the top-level object
-            // literal handle it instead.
-            if (contextualTypeHasPattern && node.parent.kind !== 298 /* SpreadAssignment */) {
-                for (var _d = 0, _e = getPropertiesOfType(contextualType); _d < _e.length; _d++) {
-                    var prop = _e[_d];
-                    if (!propertiesTable.get(prop.escapedName) && !getPropertyOfType(spread, prop.escapedName)) {
-                        if (!(prop.flags & 16777216 /* Optional */)) {
-                            error(prop.valueDeclaration || prop.bindingElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
+            // literal handle it instead. Note that this might require full traversal to the root pattern's parent
+            // as it's the guaranteed to be the common ancestor of the pattern node and the current object node.
+            // It's not possible to check if the immediate parent node is a spread assignment
+            // since the type flows in non-obvious ways through conditional expressions, IIFEs and more.
+            if (contextualTypeHasPattern) {
+                var rootPatternParent_1 = ts.findAncestor(contextualType.pattern.parent, function (n) {
+                    return n.kind === 254 /* VariableDeclaration */ ||
+                        n.kind === 221 /* BinaryExpression */ ||
+                        n.kind === 164 /* Parameter */;
+                });
+                var spreadOrOutsideRootObject = ts.findAncestor(node, function (n) {
+                    return n === rootPatternParent_1 ||
+                        n.kind === 298 /* SpreadAssignment */;
+                });
+                if (spreadOrOutsideRootObject.kind !== 298 /* SpreadAssignment */) {
+                    for (var _d = 0, _e = getPropertiesOfType(contextualType); _d < _e.length; _d++) {
+                        var prop = _e[_d];
+                        if (!propertiesTable.get(prop.escapedName) && !getPropertyOfType(spread, prop.escapedName)) {
+                            if (!(prop.flags & 16777216 /* Optional */)) {
+                                error(prop.valueDeclaration || prop.bindingElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
+                            }
+                            propertiesTable.set(prop.escapedName, prop);
+                            propertiesArray.push(prop);
                         }
-                        propertiesTable.set(prop.escapedName, prop);
-                        propertiesArray.push(prop);
                     }
                 }
             }
@@ -77764,12 +77809,15 @@ var ts;
                 return false;
             }
             var func = ts.isFunctionDeclaration(node) || ts.isFunctionExpression(node) ? node :
-                ts.isVariableDeclaration(node) && node.initializer && ts.isFunctionExpression(node.initializer) ? node.initializer :
+                (ts.isVariableDeclaration(node) || ts.isPropertyAssignment(node)) && node.initializer && ts.isFunctionExpression(node.initializer) ? node.initializer :
                     undefined;
             if (func) {
-                // If the node has a @class tag, treat it like a constructor.
+                // If the node has a @class or @constructor tag, treat it like a constructor.
                 if (ts.getJSDocClassTag(node))
                     return true;
+                // If the node is a property of an object literal.
+                if (ts.isPropertyAssignment(ts.walkUpParenthesizedExpressions(func.parent)))
+                    return false;
                 // If the symbol of the node has members, treat it like a constructor.
                 var symbol = getSymbolOfNode(func);
                 return !!((_a = symbol === null || symbol === void 0 ? void 0 : symbol.members) === null || _a === void 0 ? void 0 : _a.size);
@@ -78017,8 +78065,8 @@ var ts;
             if (hasDefaultOnly && type && !isErrorType(type)) {
                 var synthType = type;
                 if (!synthType.defaultOnlyType) {
-                    var type_5 = createDefaultPropertyWrapperForModule(symbol, originalSymbol);
-                    synthType.defaultOnlyType = type_5;
+                    var type_4 = createDefaultPropertyWrapperForModule(symbol, originalSymbol);
+                    synthType.defaultOnlyType = type_4;
                 }
                 return synthType.defaultOnlyType;
             }
@@ -87355,6 +87403,12 @@ var ts;
                             return resolveJSDocMemberName(name, /*ignoreErrors*/ false, getSymbolOfNode(container));
                         }
                     }
+                    if (result && isJSDoc_1) {
+                        var container = ts.getJSDocHost(name);
+                        if (container && ts.isEnumMember(container) && container === result.valueDeclaration) {
+                            return resolveEntityName(name, meaning, /*ignoreErrors*/ true, /* dontResolveAlias */ true, ts.getSourceFileOfNode(container)) || result;
+                        }
+                    }
                     return result;
                 }
                 else if (ts.isPrivateIdentifier(name)) {
@@ -107516,6 +107570,13 @@ var ts;
                             ts.Debug.assert(importVariableName !== undefined);
                             // save import into the local
                             statements.push(factory.createExpressionStatement(factory.createAssignment(importVariableName, parameterName)));
+                            if (ts.hasSyntacticModifier(entry, 1 /* Export */)) {
+                                statements.push(factory.createExpressionStatement(factory.createCallExpression(exportFunction, 
+                                /*typeArguments*/ undefined, [
+                                    factory.createStringLiteral(ts.idText(importVariableName)),
+                                    parameterName,
+                                ])));
+                            }
                             break;
                         case 272 /* ExportDeclaration */:
                             ts.Debug.assert(importVariableName !== undefined);
@@ -110358,8 +110419,12 @@ var ts;
             }
             var previousNeedsDeclare = needsDeclare;
             switch (input.kind) {
-                case 259 /* TypeAliasDeclaration */: // Type aliases get `declare`d if need be (for legacy support), but that's all
-                    return cleanup(factory.updateTypeAliasDeclaration(input, ensureModifiers(input), input.name, ts.visitNodes(input.typeParameters, visitDeclarationSubtree, ts.isTypeParameterDeclaration), ts.visitNode(input.type, visitDeclarationSubtree, ts.isTypeNode)));
+                case 259 /* TypeAliasDeclaration */: {
+                    needsDeclare = false;
+                    var clean = cleanup(factory.updateTypeAliasDeclaration(input, ensureModifiers(input), input.name, ts.visitNodes(input.typeParameters, visitDeclarationSubtree, ts.isTypeParameterDeclaration), ts.visitNode(input.type, visitDeclarationSubtree, ts.isTypeNode)));
+                    needsDeclare = previousNeedsDeclare;
+                    return clean;
+                }
                 case 258 /* InterfaceDeclaration */: {
                     return cleanup(factory.updateInterfaceDeclaration(input, ensureModifiers(input), input.name, ensureTypeParams(input, input.typeParameters), transformHeritageClauses(input.heritageClauses), ts.visitNodes(input.members, visitDeclarationSubtree)));
                 }
@@ -111863,8 +111928,8 @@ var ts;
     }
     ts.getBuildInfoText = getBuildInfoText;
     /*@internal*/
-    function getBuildInfo(buildInfoText) {
-        return JSON.parse(buildInfoText);
+    function getBuildInfo(buildInfoFile, buildInfoText) {
+        return ts.readJsonOrUndefined(buildInfoFile, buildInfoText);
     }
     ts.getBuildInfo = getBuildInfo;
     /*@internal*/
@@ -111942,17 +112007,16 @@ var ts;
         var buildInfo;
         if (host.getBuildInfo) {
             // If host directly provides buildinfo we can get it directly. This allows host to cache the buildinfo
-            var hostBuildInfo = host.getBuildInfo(buildInfoPath, config.options.configFilePath);
-            if (!hostBuildInfo)
-                return buildInfoPath;
-            buildInfo = hostBuildInfo;
+            buildInfo = host.getBuildInfo(buildInfoPath, config.options.configFilePath);
         }
         else {
             var buildInfoText = host.readFile(buildInfoPath);
             if (!buildInfoText)
                 return buildInfoPath;
-            buildInfo = getBuildInfo(buildInfoText);
+            buildInfo = getBuildInfo(buildInfoPath, buildInfoText);
         }
+        if (!buildInfo)
+            return buildInfoPath;
         if (!buildInfo.bundle || !buildInfo.bundle.js || (declarationFilePath && !buildInfo.bundle.dts))
             return buildInfoPath;
         var jsFileText = host.readFile(ts.Debug.checkDefined(jsFilePath));
@@ -116610,7 +116674,16 @@ var ts;
             return cachedReadDirectoryResult.get(ts.ensureTrailingDirectorySeparator(rootDirPath));
         }
         function getCachedFileSystemEntriesForBaseDir(path) {
-            return getCachedFileSystemEntries(ts.getDirectoryPath(path));
+            var entries = getCachedFileSystemEntries(ts.getDirectoryPath(path));
+            if (!entries) {
+                return entries;
+            }
+            // If we're looking for the base directory, we're definitely going to search the entries
+            if (!entries.sortedAndCanonicalizedFiles) {
+                entries.sortedAndCanonicalizedFiles = entries.files.map(getCanonicalFileName).sort();
+                entries.sortedAndCanonicalizedDirectories = entries.directories.map(getCanonicalFileName).sort();
+            }
+            return entries;
         }
         function getBaseNameOfFileName(fileName) {
             return ts.getBaseFileName(ts.normalizePath(fileName));
@@ -116653,21 +116726,10 @@ var ts;
                 return undefined;
             }
         }
-        function fileNameEqual(name1, name2) {
-            return getCanonicalFileName(name1) === getCanonicalFileName(name2);
-        }
         function hasEntry(entries, name) {
-            return ts.some(entries, function (file) { return fileNameEqual(file, name); });
-        }
-        function updateFileSystemEntry(entries, baseName, isValid) {
-            if (hasEntry(entries, baseName)) {
-                if (!isValid) {
-                    return ts.filterMutate(entries, function (entry) { return !fileNameEqual(entry, baseName); });
-                }
-            }
-            else if (isValid) {
-                return entries.push(baseName);
-            }
+            // Case-sensitive comparison since already canonicalized
+            var index = ts.binarySearch(entries, name, ts.identity, ts.compareStringsCaseSensitive);
+            return index >= 0;
         }
         function writeFile(fileName, data, writeByteOrderMark) {
             var path = toPath(fileName);
@@ -116680,7 +116742,7 @@ var ts;
         function fileExists(fileName) {
             var path = toPath(fileName);
             var result = getCachedFileSystemEntriesForBaseDir(path);
-            return result && hasEntry(result.files, getBaseNameOfFileName(fileName)) ||
+            return result && hasEntry(result.sortedAndCanonicalizedFiles, getCanonicalFileName(getBaseNameOfFileName(fileName))) ||
                 host.fileExists(fileName);
         }
         function directoryExists(dirPath) {
@@ -116690,9 +116752,14 @@ var ts;
         function createDirectory(dirPath) {
             var path = toPath(dirPath);
             var result = getCachedFileSystemEntriesForBaseDir(path);
-            var baseFileName = getBaseNameOfFileName(dirPath);
             if (result) {
-                updateFileSystemEntry(result.directories, baseFileName, /*isValid*/ true);
+                var baseName = getBaseNameOfFileName(dirPath);
+                var canonicalizedBaseName = getCanonicalFileName(baseName);
+                var canonicalizedDirectories = result.sortedAndCanonicalizedDirectories;
+                // Case-sensitive comparison since already canonicalized
+                if (ts.insertSorted(canonicalizedDirectories, canonicalizedBaseName, ts.compareStringsCaseSensitive)) {
+                    result.directories.push(baseName);
+                }
             }
             host.createDirectory(dirPath);
         }
@@ -116761,7 +116828,7 @@ var ts;
                 fileExists: host.fileExists(fileOrDirectoryPath),
                 directoryExists: host.directoryExists(fileOrDirectoryPath)
             };
-            if (fsQueryResult.directoryExists || hasEntry(parentResult.directories, baseName)) {
+            if (fsQueryResult.directoryExists || hasEntry(parentResult.sortedAndCanonicalizedDirectories, getCanonicalFileName(baseName))) {
                 // Folder added or removed, clear the cache instead of updating the folder and its structure
                 clearCache();
             }
@@ -116781,7 +116848,23 @@ var ts;
             }
         }
         function updateFilesOfFileSystemEntry(parentResult, baseName, fileExists) {
-            updateFileSystemEntry(parentResult.files, baseName, fileExists);
+            var canonicalizedFiles = parentResult.sortedAndCanonicalizedFiles;
+            var canonicalizedBaseName = getCanonicalFileName(baseName);
+            if (fileExists) {
+                // Case-sensitive comparison since already canonicalized
+                if (ts.insertSorted(canonicalizedFiles, canonicalizedBaseName, ts.compareStringsCaseSensitive)) {
+                    parentResult.files.push(baseName);
+                }
+            }
+            else {
+                // Case-sensitive comparison since already canonicalized
+                var sortedIndex = ts.binarySearch(canonicalizedFiles, canonicalizedBaseName, ts.identity, ts.compareStringsCaseSensitive);
+                if (sortedIndex >= 0) {
+                    canonicalizedFiles.splice(sortedIndex, 1);
+                    var unsortedIndex = parentResult.files.findIndex(function (entry) { return getCanonicalFileName(entry) === canonicalizedBaseName; });
+                    parentResult.files.splice(unsortedIndex, 1);
+                }
+            }
         }
         function clearCache() {
             cachedReadDirectoryResult.clear();
@@ -125019,18 +125102,14 @@ var ts;
         if (host.getBuildInfo) {
             // host provides buildinfo, get it from there. This allows host to cache it
             buildInfo = host.getBuildInfo(buildInfoPath, compilerOptions.configFilePath);
-            if (!buildInfo)
-                return undefined;
         }
         else {
             var content = host.readFile(buildInfoPath);
             if (!content)
                 return undefined;
-            buildInfo = ts.getBuildInfo(content);
+            buildInfo = ts.getBuildInfo(buildInfoPath, content);
         }
-        if (buildInfo.version !== ts.version)
-            return undefined;
-        if (!buildInfo.program)
+        if (!buildInfo || buildInfo.version !== ts.version || !buildInfo.program)
             return undefined;
         return ts.createBuilderProgramUsingProgramBuildInfo(buildInfo.program, buildInfoPath, host);
     }
@@ -125252,7 +125331,8 @@ var ts;
             }
             // All resolutions are invalid if user provided resolutions
             var hasInvalidatedResolution = resolutionCache.createHasInvalidatedResolution(userProvidedResolution);
-            if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
+            var _a = ts.changeCompilerHostLikeToUseCache(compilerHost, toPath), originalReadFile = _a.originalReadFile, originalFileExists = _a.originalFileExists, originalDirectoryExists = _a.originalDirectoryExists, originalCreateDirectory = _a.originalCreateDirectory, originalWriteFile = _a.originalWriteFile;
+            if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, function (fileName) { return compilerHost.fileExists(fileName); }, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
                 if (hasChangedConfigFileParsingErrors) {
                     if (reportFileChangeDetectedOnCreateProgram) {
                         reportWatchDiagnostic(ts.Diagnostics.File_change_detected_Starting_incremental_compilation);
@@ -125271,6 +125351,11 @@ var ts;
             if (host.afterProgramCreate && program !== builderProgram) {
                 host.afterProgramCreate(builderProgram);
             }
+            compilerHost.readFile = originalReadFile;
+            compilerHost.fileExists = originalFileExists;
+            compilerHost.directoryExists = originalDirectoryExists;
+            compilerHost.createDirectory = originalCreateDirectory;
+            compilerHost.writeFile = originalWriteFile;
             return builderProgram;
         }
         function createNewProgram(hasInvalidatedResolution) {
@@ -125748,19 +125833,20 @@ var ts;
          */
         UpToDateStatusType[UpToDateStatusType["OutOfDateWithPrepend"] = 3] = "OutOfDateWithPrepend";
         UpToDateStatusType[UpToDateStatusType["OutputMissing"] = 4] = "OutputMissing";
-        UpToDateStatusType[UpToDateStatusType["OutOfDateWithSelf"] = 5] = "OutOfDateWithSelf";
-        UpToDateStatusType[UpToDateStatusType["OutOfDateWithUpstream"] = 6] = "OutOfDateWithUpstream";
-        UpToDateStatusType[UpToDateStatusType["OutOfDateBuildInfo"] = 7] = "OutOfDateBuildInfo";
-        UpToDateStatusType[UpToDateStatusType["UpstreamOutOfDate"] = 8] = "UpstreamOutOfDate";
-        UpToDateStatusType[UpToDateStatusType["UpstreamBlocked"] = 9] = "UpstreamBlocked";
-        UpToDateStatusType[UpToDateStatusType["ComputingUpstream"] = 10] = "ComputingUpstream";
-        UpToDateStatusType[UpToDateStatusType["TsVersionOutputOfDate"] = 11] = "TsVersionOutputOfDate";
-        UpToDateStatusType[UpToDateStatusType["UpToDateWithInputFileText"] = 12] = "UpToDateWithInputFileText";
+        UpToDateStatusType[UpToDateStatusType["ErrorReadingFile"] = 5] = "ErrorReadingFile";
+        UpToDateStatusType[UpToDateStatusType["OutOfDateWithSelf"] = 6] = "OutOfDateWithSelf";
+        UpToDateStatusType[UpToDateStatusType["OutOfDateWithUpstream"] = 7] = "OutOfDateWithUpstream";
+        UpToDateStatusType[UpToDateStatusType["OutOfDateBuildInfo"] = 8] = "OutOfDateBuildInfo";
+        UpToDateStatusType[UpToDateStatusType["UpstreamOutOfDate"] = 9] = "UpstreamOutOfDate";
+        UpToDateStatusType[UpToDateStatusType["UpstreamBlocked"] = 10] = "UpstreamBlocked";
+        UpToDateStatusType[UpToDateStatusType["ComputingUpstream"] = 11] = "ComputingUpstream";
+        UpToDateStatusType[UpToDateStatusType["TsVersionOutputOfDate"] = 12] = "TsVersionOutputOfDate";
+        UpToDateStatusType[UpToDateStatusType["UpToDateWithInputFileText"] = 13] = "UpToDateWithInputFileText";
         /**
          * Projects with no outputs (i.e. "solution" files)
          */
-        UpToDateStatusType[UpToDateStatusType["ContainerOnly"] = 13] = "ContainerOnly";
-        UpToDateStatusType[UpToDateStatusType["ForceBuild"] = 14] = "ForceBuild";
+        UpToDateStatusType[UpToDateStatusType["ContainerOnly"] = 14] = "ContainerOnly";
+        UpToDateStatusType[UpToDateStatusType["ForceBuild"] = 15] = "ForceBuild";
     })(UpToDateStatusType = ts.UpToDateStatusType || (ts.UpToDateStatusType = {}));
     function resolveConfigFileProjectName(project) {
         if (ts.fileExtensionIs(project, ".json" /* Json */)) {
@@ -126462,13 +126548,13 @@ var ts;
             var emitterDiagnostics = ts.createDiagnosticCollection();
             var emittedOutputs = new ts.Map();
             var resultFlags = BuildResultFlags.DeclarationOutputUnchanged;
-            var existingBuildInfo = state.buildInfoCache.get(projectPath).buildInfo;
+            var existingBuildInfo = state.buildInfoCache.get(projectPath).buildInfo || undefined;
             outputFiles.forEach(function (_a) {
                 var _b, _c;
                 var name = _a.name, text = _a.text, writeByteOrderMark = _a.writeByteOrderMark, buildInfo = _a.buildInfo;
                 emittedOutputs.set(toPath(state, name), name);
                 if (buildInfo) {
-                    if (((_b = buildInfo.program) === null || _b === void 0 ? void 0 : _b.outSignature) !== ((_c = existingBuildInfo.program) === null || _c === void 0 ? void 0 : _c.outSignature)) {
+                    if (((_b = buildInfo.program) === null || _b === void 0 ? void 0 : _b.outSignature) !== ((_c = existingBuildInfo === null || existingBuildInfo === void 0 ? void 0 : existingBuildInfo.program) === null || _c === void 0 ? void 0 : _c.outSignature)) {
                         resultFlags &= ~BuildResultFlags.DeclarationOutputUnchanged;
                     }
                     setBuildInfo(state, buildInfo, projectPath, config.options, resultFlags);
@@ -126761,8 +126847,7 @@ var ts;
             return existing.buildInfo || undefined;
         }
         var value = state.readFileWithCache(buildInfoPath);
-        var buildInfo = value ? ts.getBuildInfo(value) : undefined;
-        ts.Debug.assert(modifiedTime || !buildInfo);
+        var buildInfo = value ? ts.getBuildInfo(buildInfoPath, value) : undefined;
         state.buildInfoCache.set(resolvedConfigPath, { path: path, buildInfo: buildInfo || false, modifiedTime: modifiedTime || ts.missingFileModifiedTime });
         return buildInfo;
     }
@@ -126847,7 +126932,14 @@ var ts;
                     missingOutputFileName: buildInfoPath
                 };
             }
-            var buildInfo = ts.Debug.checkDefined(getBuildInfo(state, buildInfoPath, resolvedPath, buildInfoTime));
+            var buildInfo = getBuildInfo(state, buildInfoPath, resolvedPath, buildInfoTime);
+            if (!buildInfo) {
+                // Error reading buildInfo
+                return {
+                    type: ts.UpToDateStatusType.ErrorReadingFile,
+                    fileName: buildInfoPath
+                };
+            }
             if ((buildInfo.bundle || buildInfo.program) && buildInfo.version !== ts.version) {
                 return {
                     type: ts.UpToDateStatusType.TsVersionOutputOfDate,
@@ -127505,6 +127597,8 @@ var ts;
                 return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_1_is_older_than_input_2, relName(state, configFileName), relName(state, status.outOfDateOutputFileName), relName(state, status.newerProjectName));
             case ts.UpToDateStatusType.OutputMissing:
                 return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_output_file_1_does_not_exist, relName(state, configFileName), relName(state, status.missingOutputFileName));
+            case ts.UpToDateStatusType.ErrorReadingFile:
+                return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_there_was_error_reading_file_1, relName(state, configFileName), relName(state, status.fileName));
             case ts.UpToDateStatusType.OutOfDateBuildInfo:
                 return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_buildinfo_file_1_indicates_that_some_of_the_changes_were_not_emitted, relName(state, configFileName), relName(state, status.buildInfoFile));
             case ts.UpToDateStatusType.UpToDate:
@@ -156539,6 +156633,15 @@ var ts;
             ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1.code,
             ts.Diagnostics.Cannot_find_name_0.code
         ];
+        var InfoKind;
+        (function (InfoKind) {
+            InfoKind[InfoKind["TypeLikeDeclaration"] = 0] = "TypeLikeDeclaration";
+            InfoKind[InfoKind["Enum"] = 1] = "Enum";
+            InfoKind[InfoKind["Function"] = 2] = "Function";
+            InfoKind[InfoKind["ObjectLiteral"] = 3] = "ObjectLiteral";
+            InfoKind[InfoKind["JsxAttributes"] = 4] = "JsxAttributes";
+            InfoKind[InfoKind["Signature"] = 5] = "Signature";
+        })(InfoKind || (InfoKind = {}));
         codefix.registerCodeFix({
             errorCodes: errorCodes,
             getCodeActions: function (context) {
@@ -156547,19 +156650,19 @@ var ts;
                 if (!info) {
                     return undefined;
                 }
-                if (info.kind === 3 /* ObjectLiteral */) {
+                if (info.kind === InfoKind.ObjectLiteral) {
                     var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addObjectLiteralProperties(t, context, info); });
                     return [codefix.createCodeFixAction(fixMissingProperties, changes, ts.Diagnostics.Add_missing_properties, fixMissingProperties, ts.Diagnostics.Add_all_missing_properties)];
                 }
-                if (info.kind === 4 /* JsxAttributes */) {
+                if (info.kind === InfoKind.JsxAttributes) {
                     var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addJsxAttributes(t, context, info); });
                     return [codefix.createCodeFixAction(fixMissingAttributes, changes, ts.Diagnostics.Add_missing_attributes, fixMissingAttributes, ts.Diagnostics.Add_all_missing_attributes)];
                 }
-                if (info.kind === 2 /* Function */) {
+                if (info.kind === InfoKind.Function || info.kind === InfoKind.Signature) {
                     var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addFunctionDeclaration(t, context, info); });
                     return [codefix.createCodeFixAction(fixMissingFunctionDeclaration, changes, [ts.Diagnostics.Add_missing_function_declaration_0, info.token.text], fixMissingFunctionDeclaration, ts.Diagnostics.Add_all_missing_function_declarations)];
                 }
-                if (info.kind === 1 /* Enum */) {
+                if (info.kind === InfoKind.Enum) {
                     var changes = ts.textChanges.ChangeTracker.with(context, function (t) { return addEnumMemberDeclaration(t, context.program.getTypeChecker(), info); });
                     return [codefix.createCodeFixAction(fixMissingMember, changes, [ts.Diagnostics.Add_missing_enum_member_0, info.token.text], fixMissingMember, ts.Diagnostics.Add_all_missing_members)];
                 }
@@ -156577,20 +156680,20 @@ var ts;
                         if (!info || !ts.addToSeen(seen, ts.getNodeId(info.parentDeclaration) + "#" + info.token.text)) {
                             return;
                         }
-                        if (fixId === fixMissingFunctionDeclaration && info.kind === 2 /* Function */) {
+                        if (fixId === fixMissingFunctionDeclaration && (info.kind === InfoKind.Function || info.kind === InfoKind.Signature)) {
                             addFunctionDeclaration(changes, context, info);
                         }
-                        else if (fixId === fixMissingProperties && info.kind === 3 /* ObjectLiteral */) {
+                        else if (fixId === fixMissingProperties && info.kind === InfoKind.ObjectLiteral) {
                             addObjectLiteralProperties(changes, context, info);
                         }
-                        else if (fixId === fixMissingAttributes && info.kind === 4 /* JsxAttributes */) {
+                        else if (fixId === fixMissingAttributes && info.kind === InfoKind.JsxAttributes) {
                             addJsxAttributes(changes, context, info);
                         }
                         else {
-                            if (info.kind === 1 /* Enum */) {
+                            if (info.kind === InfoKind.Enum) {
                                 addEnumMemberDeclaration(changes, checker, info);
                             }
-                            if (info.kind === 0 /* TypeLikeDeclaration */) {
+                            if (info.kind === InfoKind.TypeLikeDeclaration) {
                                 var parentDeclaration = info.parentDeclaration, token_1 = info.token;
                                 var infos = ts.getOrUpdate(typeDeclToMembers, parentDeclaration, function () { return []; });
                                 if (!infos.some(function (i) { return i.token.text === token_1.text; })) {
@@ -156634,14 +156737,6 @@ var ts;
                 }));
             },
         });
-        var InfoKind;
-        (function (InfoKind) {
-            InfoKind[InfoKind["TypeLikeDeclaration"] = 0] = "TypeLikeDeclaration";
-            InfoKind[InfoKind["Enum"] = 1] = "Enum";
-            InfoKind[InfoKind["Function"] = 2] = "Function";
-            InfoKind[InfoKind["ObjectLiteral"] = 3] = "ObjectLiteral";
-            InfoKind[InfoKind["JsxAttributes"] = 4] = "JsxAttributes";
-        })(InfoKind || (InfoKind = {}));
         function getInfo(sourceFile, tokenPos, errorCode, checker, program) {
             // The identifier of the missing property. eg:
             // this.missing = 1;
@@ -156663,7 +156758,7 @@ var ts;
                 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 };
+                return { kind: InfoKind.ObjectLiteral, token: param.name, properties: properties, parentDeclaration: parent };
             }
             if (!ts.isMemberName(token))
                 return undefined;
@@ -156671,17 +156766,26 @@ var ts;
                 var properties = ts.arrayFrom(checker.getUnmatchedProperties(checker.getTypeAtLocation(parent.initializer), checker.getTypeAtLocation(token), /* requireOptionalProperties */ false, /* matchDiscriminantProperties */ false));
                 if (!ts.length(properties))
                     return undefined;
-                return { kind: 3 /* ObjectLiteral */, token: token, properties: properties, parentDeclaration: parent.initializer };
+                return { kind: InfoKind.ObjectLiteral, token: token, properties: properties, parentDeclaration: parent.initializer };
             }
             if (ts.isIdentifier(token) && ts.isJsxOpeningLikeElement(token.parent)) {
                 var target = ts.getEmitScriptTarget(program.getCompilerOptions());
                 var attributes = getUnmatchedAttributes(checker, target, token.parent);
                 if (!ts.length(attributes))
                     return undefined;
-                return { kind: 4 /* JsxAttributes */, token: token, attributes: attributes, parentDeclaration: token.parent };
+                return { kind: InfoKind.JsxAttributes, token: token, attributes: attributes, parentDeclaration: token.parent };
             }
-            if (ts.isIdentifier(token) && ts.isCallExpression(parent) && parent.expression === token) {
-                return { kind: 2 /* Function */, token: token, call: parent, sourceFile: sourceFile, modifierFlags: 0 /* None */, parentDeclaration: sourceFile };
+            if (ts.isIdentifier(token)) {
+                var type = checker.getContextualType(token);
+                if (type && ts.getObjectFlags(type) & 16 /* Anonymous */) {
+                    var signature = ts.firstOrUndefined(checker.getSignaturesOfType(type, 0 /* Call */));
+                    if (signature === undefined)
+                        return undefined;
+                    return { kind: InfoKind.Signature, token: token, signature: signature, sourceFile: sourceFile, parentDeclaration: findScope(token) };
+                }
+                if (ts.isCallExpression(parent) && parent.expression === token) {
+                    return { kind: InfoKind.Function, token: token, call: parent, sourceFile: sourceFile, modifierFlags: 0 /* None */, parentDeclaration: findScope(token) };
+                }
             }
             if (!ts.isPropertyAccessExpression(parent))
                 return undefined;
@@ -156693,13 +156797,13 @@ var ts;
                 var moduleDeclaration = ts.find(symbol.declarations, ts.isModuleDeclaration);
                 var moduleDeclarationSourceFile = moduleDeclaration === null || moduleDeclaration === void 0 ? void 0 : moduleDeclaration.getSourceFile();
                 if (moduleDeclaration && moduleDeclarationSourceFile && !isSourceFileFromLibrary(program, moduleDeclarationSourceFile)) {
-                    return { kind: 2 /* Function */, token: token, call: parent.parent, sourceFile: sourceFile, modifierFlags: 1 /* Export */, parentDeclaration: moduleDeclaration };
+                    return { kind: InfoKind.Function, token: token, call: parent.parent, sourceFile: sourceFile, modifierFlags: 1 /* Export */, parentDeclaration: moduleDeclaration };
                 }
                 var moduleSourceFile = ts.find(symbol.declarations, ts.isSourceFile);
                 if (sourceFile.commonJsModuleIndicator)
                     return undefined;
                 if (moduleSourceFile && !isSourceFileFromLibrary(program, moduleSourceFile)) {
-                    return { kind: 2 /* Function */, token: token, call: parent.parent, sourceFile: moduleSourceFile, modifierFlags: 1 /* Export */, parentDeclaration: moduleSourceFile };
+                    return { kind: InfoKind.Function, token: token, call: parent.parent, sourceFile: moduleSourceFile, modifierFlags: 1 /* Export */, parentDeclaration: moduleSourceFile };
                 }
             }
             var classDeclaration = ts.find(symbol.declarations, ts.isClassLike);
@@ -156717,11 +156821,11 @@ var ts;
                     (makeStatic ? 32 /* Static */ : 0 /* None */) | (ts.startsWithUnderscore(token.text) ? 8 /* Private */ : 0 /* None */);
                 var isJSFile = ts.isSourceFileJS(declSourceFile);
                 var call = ts.tryCast(parent.parent, ts.isCallExpression);
-                return { kind: 0 /* TypeLikeDeclaration */, token: token, call: call, modifierFlags: modifierFlags, parentDeclaration: declaration, declSourceFile: declSourceFile, isJSFile: isJSFile };
+                return { kind: InfoKind.TypeLikeDeclaration, token: token, call: call, modifierFlags: modifierFlags, parentDeclaration: declaration, declSourceFile: declSourceFile, isJSFile: isJSFile };
             }
             var enumDeclaration = ts.find(symbol.declarations, ts.isEnumDeclaration);
             if (enumDeclaration && !ts.isPrivateIdentifier(token) && !isSourceFileFromLibrary(program, enumDeclaration.getSourceFile())) {
-                return { kind: 1 /* Enum */, token: token, parentDeclaration: enumDeclaration };
+                return { kind: InfoKind.Enum, token: token, parentDeclaration: enumDeclaration };
             }
             return undefined;
         }
@@ -156897,9 +157001,17 @@ var ts;
             });
         }
         function addFunctionDeclaration(changes, context, info) {
+            var quotePreference = ts.getQuotePreference(context.sourceFile, context.preferences);
             var importAdder = codefix.createImportAdder(context.sourceFile, context.program, context.preferences, context.host);
-            var functionDeclaration = codefix.createSignatureDeclarationFromCallExpression(256 /* FunctionDeclaration */, context, importAdder, info.call, ts.idText(info.token), info.modifierFlags, info.parentDeclaration);
-            changes.insertNodeAtEndOfScope(info.sourceFile, info.parentDeclaration, functionDeclaration);
+            var functionDeclaration = info.kind === InfoKind.Function
+                ? codefix.createSignatureDeclarationFromCallExpression(256 /* FunctionDeclaration */, context, importAdder, info.call, ts.idText(info.token), info.modifierFlags, info.parentDeclaration)
+                : codefix.createSignatureDeclarationFromSignature(256 /* FunctionDeclaration */, context, quotePreference, info.signature, codefix.createStubbedBody(ts.Diagnostics.Function_not_implemented.message, quotePreference), info.token, /*modifiers*/ undefined, /*optional*/ undefined, /*enclosingDeclaration*/ undefined, importAdder);
+            if (functionDeclaration === undefined) {
+                ts.Debug.fail("fixMissingFunctionDeclaration codefix got unexpected error.");
+            }
+            ts.isReturnStatement(info.parentDeclaration)
+                ? changes.insertNodeBefore(info.sourceFile, info.parentDeclaration, functionDeclaration, /*blankLineBetween*/ true)
+                : changes.insertNodeAtEndOfScope(info.sourceFile, info.parentDeclaration, functionDeclaration);
             importAdder.writeFixes(changes);
         }
         function addJsxAttributes(changes, context, info) {
@@ -157057,6 +157169,14 @@ var ts;
             }
             return ts.createPropertyNameNodeForIdentifierOrLiteral(symbol.name, target, quotePreference === 0 /* Single */);
         }
+        function findScope(node) {
+            if (ts.findAncestor(node, ts.isJsxExpression)) {
+                var returnStatement = ts.findAncestor(node.parent, ts.isReturnStatement);
+                if (returnStatement)
+                    return returnStatement;
+            }
+            return ts.getSourceFileOfNode(node);
+        }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
 /* @internal */
@@ -159746,6 +159866,9 @@ var ts;
             if (ts.isMethodDeclaration(signatureDeclaration)) {
                 return ts.factory.updateMethodDeclaration(signatureDeclaration, modifiers, asteriskToken, name !== null && name !== void 0 ? name : ts.factory.createIdentifier(""), questionToken, typeParameters, parameters, type, body);
             }
+            if (ts.isFunctionDeclaration(signatureDeclaration)) {
+                return ts.factory.updateFunctionDeclaration(signatureDeclaration, modifiers, signatureDeclaration.asteriskToken, ts.tryCast(name, ts.isIdentifier), typeParameters, parameters, type, body !== null && body !== void 0 ? body : signatureDeclaration.body);
+            }
             return undefined;
         }
         codefix.createSignatureDeclarationFromSignature = createSignatureDeclarationFromSignature;
@@ -167048,6 +167171,10 @@ var ts;
                 getCurrentDirectory: compilerHost.getCurrentDirectory,
                 onUnRecoverableConfigFileDiagnostic: ts.noop,
             };
+            // The call to isProgramUptoDate below may refer back to documentRegistryBucketKey;
+            // calculate this early so it's not undefined if downleveled to a var (or, if emitted
+            // as a const variable without downleveling, doesn't crash).
+            var documentRegistryBucketKey = documentRegistry.getKeyForCompilationSettings(newSettings);
             // If the program is already up-to-date, we can reuse it
             if (ts.isProgramUptoDate(program, rootFileNames, newSettings, function (_path, fileName) { return host.getScriptVersion(fileName); }, function (fileName) { return compilerHost.fileExists(fileName); }, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
                 return;
@@ -167057,7 +167184,6 @@ var ts;
             // instance.  If we cancel midway through, we may end up in an inconsistent state where
             // the program points to old source files that have been invalidated because of
             // incremental parsing.
-            var documentRegistryBucketKey = documentRegistry.getKeyForCompilationSettings(newSettings);
             var options = {
                 rootNames: rootFileNames,
                 options: newSettings,