typescript 4.6.0-dev.20211203 → 4.6.0-dev.20211204

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.6";
-    ts.version = ts.versionMajorMinor + ".0-dev.20211203";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211204";
     var NativeCollections;
     (function (NativeCollections) {
         function tryGetNativeMap() {
@@ -738,7 +738,11 @@ var ts;
         }
         return deduplicated;
     }
-    function insertSorted(array, insert, compare) {
+    function createSortedArray() {
+        return [];
+    }
+    ts.createSortedArray = createSortedArray;
+    function insertSorted(array, insert, compare, allowDuplicates) {
         if (array.length === 0) {
             array.push(insert);
             return;
@@ -747,6 +751,9 @@ var ts;
         if (insertIndex < 0) {
             array.splice(~insertIndex, 0, insert);
         }
+        else if (allowDuplicates) {
+            array.splice(insertIndex, 0, insert);
+        }
     }
     ts.insertSorted = insertSorted;
     function sortAndDeduplicate(array, comparer, equalityComparer) {
@@ -5431,6 +5438,7 @@ var ts;
         Module_0_has_already_exported_a_member_named_1_Consider_explicitly_re_exporting_to_resolve_the_ambiguity: diag(2308, ts.DiagnosticCategory.Error, "Module_0_has_already_exported_a_member_named_1_Consider_explicitly_re_exporting_to_resolve_the_ambig_2308", "Module {0} has already exported a member named '{1}'. Consider explicitly re-exporting to resolve the ambiguity."),
         An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements: diag(2309, ts.DiagnosticCategory.Error, "An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements_2309", "An export assignment cannot be used in a module with other exported elements."),
         Type_0_recursively_references_itself_as_a_base_type: diag(2310, ts.DiagnosticCategory.Error, "Type_0_recursively_references_itself_as_a_base_type_2310", "Type '{0}' recursively references itself as a base type."),
+        Cannot_find_name_0_Did_you_mean_to_write_this_in_an_async_function: diag(2311, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Did_you_mean_to_write_this_in_an_async_function_2311", "Cannot find name '{0}'. Did you mean to write this in an async function?"),
         An_interface_can_only_extend_an_object_type_or_intersection_of_object_types_with_statically_known_members: diag(2312, ts.DiagnosticCategory.Error, "An_interface_can_only_extend_an_object_type_or_intersection_of_object_types_with_statically_known_me_2312", "An interface can only extend an object type or intersection of object types with statically known members."),
         Type_parameter_0_has_a_circular_constraint: diag(2313, ts.DiagnosticCategory.Error, "Type_parameter_0_has_a_circular_constraint_2313", "Type parameter '{0}' has a circular constraint."),
         Generic_type_0_requires_1_type_argument_s: diag(2314, ts.DiagnosticCategory.Error, "Generic_type_0_requires_1_type_argument_s_2314", "Generic type '{0}' requires {1} type argument(s)."),
@@ -16516,6 +16524,10 @@ var ts;
         return text.replace(/\$/gm, "\\$");
     }
     ts.escapeSnippetText = escapeSnippetText;
+    function isThisTypeParameter(type) {
+        return !!(type.flags & 262144 && type.isThisType);
+    }
+    ts.isThisTypeParameter = isThisTypeParameter;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -38297,6 +38309,7 @@ var ts;
             getIndexInfosOfType: getIndexInfosOfType,
             getSignaturesOfType: getSignaturesOfType,
             getIndexTypeOfType: function (type, kind) { return getIndexTypeOfType(type, kind === 0 ? stringType : numberType); },
+            getIndexType: function (type) { return getIndexType(type); },
             getBaseTypes: getBaseTypes,
             getBaseTypeOfLiteralType: getBaseTypeOfLiteralType,
             getWidenedType: getWidenedType,
@@ -39447,11 +39460,12 @@ var ts;
                 }
             }
         }
-        function resolveName(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals) {
+        function resolveName(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, getSpellingSuggstions) {
             if (excludeGlobals === void 0) { excludeGlobals = false; }
-            return resolveNameHelper(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, getSymbol);
+            if (getSpellingSuggstions === void 0) { getSpellingSuggstions = true; }
+            return resolveNameHelper(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, getSpellingSuggstions, getSymbol);
         }
-        function resolveNameHelper(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, lookup) {
+        function resolveNameHelper(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, getSpellingSuggestions, lookup) {
             var _a, _b, _c;
             var originalLocation = location;
             var result;
@@ -39686,7 +39700,7 @@ var ts;
                 }
             }
             if (!result) {
-                if (nameNotFoundMessage) {
+                if (nameNotFoundMessage && produceDiagnostics) {
                     if (!errorLocation ||
                         !checkAndReportErrorForMissingPrefix(errorLocation, name, nameArg) &&
                             !checkAndReportErrorForExtendingInterface(errorLocation) &&
@@ -39696,7 +39710,7 @@ var ts;
                             !checkAndReportErrorForUsingNamespaceModuleAsValue(errorLocation, name, meaning) &&
                             !checkAndReportErrorForUsingValueAsType(errorLocation, name, meaning)) {
                         var suggestion = void 0;
-                        if (suggestionCount < maximumSuggestionCount) {
+                        if (getSpellingSuggestions && suggestionCount < maximumSuggestionCount) {
                             suggestion = getSuggestedSymbolForNonexistentSymbol(originalLocation, name, meaning);
                             var isGlobalScopeAugmentationDeclaration = (suggestion === null || suggestion === void 0 ? void 0 : suggestion.valueDeclaration) && ts.isAmbientModule(suggestion.valueDeclaration) && ts.isGlobalScopeAugmentation(suggestion.valueDeclaration);
                             if (isGlobalScopeAugmentationDeclaration) {
@@ -39731,7 +39745,7 @@ var ts;
                 }
                 return undefined;
             }
-            if (nameNotFoundMessage) {
+            if (nameNotFoundMessage && produceDiagnostics) {
                 if (propertyWithInvalidInitializer && !(ts.getEmitScriptTarget(compilerOptions) === 99 && useDefineForClassFields)) {
                     var propertyName = propertyWithInvalidInitializer.name;
                     error(errorLocation, ts.Diagnostics.Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor, ts.declarationNameToString(propertyName), diagnosticName(nameArg));
@@ -41923,7 +41937,7 @@ var ts;
                     context.approximateLength += 6;
                     return ts.factory.createKeywordTypeNode(147);
                 }
-                if (isThisTypeParameter(type)) {
+                if (ts.isThisTypeParameter(type)) {
                     if (context.flags & 4194304) {
                         if (!context.encounteredError && !(context.flags & 32768)) {
                             context.encounteredError = true;
@@ -48811,7 +48825,7 @@ var ts;
             return symbol;
         }
         function getGlobalSymbol(name, meaning, diagnostic) {
-            return resolveName(undefined, name, meaning, diagnostic, name, false);
+            return resolveName(undefined, name, meaning, diagnostic, name, false, false, false);
         }
         function getGlobalType(name, arity, reportErrors) {
             var symbol = getGlobalTypeSymbol(name, reportErrors);
@@ -50240,9 +50254,6 @@ var ts;
             return (type.flags & 58982400 || isGenericMappedType(type) || isGenericTupleType(type) ? 8388608 : 0) |
                 (type.flags & (58982400 | 4194304 | 134217728 | 268435456) && !isPatternLiteralType(type) ? 16777216 : 0);
         }
-        function isThisTypeParameter(type) {
-            return !!(type.flags & 262144 && type.isThisType);
-        }
         function getSimplifiedType(type, writing) {
             return type.flags & 8388608 ? getSimplifiedIndexedAccessType(type, writing) :
                 type.flags & 16777216 ? getSimplifiedConditionalType(type, writing) :
@@ -54742,7 +54753,7 @@ var ts;
             return result;
         }
         function getFalsyFlags(type) {
-            return type.flags & 1048576 ? getFalsyFlagsOfTypes(type.types) :
+            return type.flags & 3145728 ? getFalsyFlagsOfTypes(type.types) :
                 type.flags & 128 ? type.value === "" ? 128 : 0 :
                     type.flags & 256 ? type.value === 0 ? 256 : 0 :
                         type.flags & 2048 ? isZeroBigInt(type) ? 2048 : 0 :
@@ -56130,6 +56141,10 @@ var ts;
                 case "BigInt64Array":
                 case "BigUint64Array":
                     return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_1_or_later;
+                case "await":
+                    if (ts.isCallExpression(node.parent)) {
+                        return ts.Diagnostics.Cannot_find_name_0_Did_you_mean_to_write_this_in_an_async_function;
+                    }
                 default:
                     if (node.parent.kind === 295) {
                         return ts.Diagnostics.No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer;
@@ -57534,7 +57549,7 @@ var ts;
             function narrowByInKeyword(type, name, assumeTrue) {
                 if (type.flags & 1048576
                     || type.flags & 524288 && declaredType !== type
-                    || isThisTypeParameter(type)
+                    || ts.isThisTypeParameter(type)
                     || type.flags & 2097152 && ts.every(type.types, function (t) { return t.symbol !== globalThisSymbol; })) {
                     return filterType(type, function (t) { return isTypePresencePossible(t, name, assumeTrue); });
                 }
@@ -59872,15 +59887,9 @@ var ts;
             }
         }
         function isValidSpreadType(type) {
-            if (type.flags & 465829888) {
-                var constraint = getBaseConstraintOfType(type);
-                if (constraint !== undefined) {
-                    return isValidSpreadType(constraint);
-                }
-            }
-            return !!(type.flags & (1 | 67108864 | 524288 | 58982400) ||
-                getFalsyFlags(type) & 117632 && isValidSpreadType(removeDefinitelyFalsyTypes(type)) ||
-                type.flags & 3145728 && ts.every(type.types, isValidSpreadType));
+            var t = removeDefinitelyFalsyTypes(mapType(type, getBaseConstraintOrType));
+            return !!(t.flags & (1 | 67108864 | 524288 | 58982400) ||
+                t.flags & 3145728 && ts.every(t.types, isValidSpreadType));
         }
         function checkJsxSelfClosingElementDeferred(node) {
             checkJsxOpeningLikeElementOrOpeningFragment(node);
@@ -60666,7 +60675,7 @@ var ts;
             }
             var propType;
             if (!prop) {
-                var indexInfo = !ts.isPrivateIdentifier(right) && (assignmentKind === 0 || !isGenericObjectType(leftType) || isThisTypeParameter(leftType)) ?
+                var indexInfo = !ts.isPrivateIdentifier(right) && (assignmentKind === 0 || !isGenericObjectType(leftType) || ts.isThisTypeParameter(leftType)) ?
                     getApplicableIndexInfoForName(apparentType, right.escapedText) : undefined;
                 if (!(indexInfo && indexInfo.type)) {
                     var isUncheckedJS = isUncheckedJSSuggestion(node, leftType.symbol, true);
@@ -60683,7 +60692,7 @@ var ts;
                         return anyType;
                     }
                     if (right.escapedText && !checkAndReportErrorForExtendingInterface(node)) {
-                        reportNonexistentProperty(right, isThisTypeParameter(leftType) ? apparentType : leftType, isUncheckedJS);
+                        reportNonexistentProperty(right, ts.isThisTypeParameter(leftType) ? apparentType : leftType, isUncheckedJS);
                     }
                     return errorType;
                 }
@@ -60957,7 +60966,7 @@ var ts;
         }
         function getSuggestedSymbolForNonexistentSymbol(location, outerName, meaning) {
             ts.Debug.assert(outerName !== undefined, "outername should always be defined");
-            var result = resolveNameHelper(location, outerName, meaning, undefined, outerName, false, false, function (symbols, name, meaning) {
+            var result = resolveNameHelper(location, outerName, meaning, undefined, outerName, false, false, true, function (symbols, name, meaning) {
                 ts.Debug.assertEqual(outerName, name, "name should equal outerName");
                 var symbol = getSymbol(symbols, name, meaning);
                 if (symbol)
@@ -61147,7 +61156,7 @@ var ts;
             }
             var effectiveIndexType = isForInVariableForNumericPropertyNames(indexExpression) ? numberType : indexType;
             var accessFlags = ts.isAssignmentTarget(node) ?
-                4 | (isGenericObjectType(objectType) && !isThisTypeParameter(objectType) ? 2 : 0) :
+                4 | (isGenericObjectType(objectType) && !ts.isThisTypeParameter(objectType) ? 2 : 0) :
                 32;
             var indexedAccessType = getIndexedAccessTypeOrUndefined(objectType, effectiveIndexType, accessFlags, node) || errorType;
             return checkIndexedAccessIndexType(getFlowTypeOfAccessExpression(node, getNodeLinks(node).resolvedSymbol, indexedAccessType, indexExpression, checkMode), node);

package/lib/tsserver.js

@@ -100,7 +100,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = ts.versionMajorMinor + ".0-dev.20211203";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211204";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -843,7 +843,11 @@ var ts;
         }
         return deduplicated;
     }
-    function insertSorted(array, insert, compare) {
+    function createSortedArray() {
+        return []; // TODO: GH#19873
+    }
+    ts.createSortedArray = createSortedArray;
+    function insertSorted(array, insert, compare, allowDuplicates) {
         if (array.length === 0) {
             array.push(insert);
             return;
@@ -852,6 +856,9 @@ var ts;
         if (insertIndex < 0) {
             array.splice(~insertIndex, 0, insert);
         }
+        else if (allowDuplicates) {
+            array.splice(insertIndex, 0, insert);
+        }
     }
     ts.insertSorted = insertSorted;
     function sortAndDeduplicate(array, comparer, equalityComparer) {
@@ -8217,6 +8224,7 @@ var ts;
         Module_0_has_already_exported_a_member_named_1_Consider_explicitly_re_exporting_to_resolve_the_ambiguity: diag(2308, ts.DiagnosticCategory.Error, "Module_0_has_already_exported_a_member_named_1_Consider_explicitly_re_exporting_to_resolve_the_ambig_2308", "Module {0} has already exported a member named '{1}'. Consider explicitly re-exporting to resolve the ambiguity."),
         An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements: diag(2309, ts.DiagnosticCategory.Error, "An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements_2309", "An export assignment cannot be used in a module with other exported elements."),
         Type_0_recursively_references_itself_as_a_base_type: diag(2310, ts.DiagnosticCategory.Error, "Type_0_recursively_references_itself_as_a_base_type_2310", "Type '{0}' recursively references itself as a base type."),
+        Cannot_find_name_0_Did_you_mean_to_write_this_in_an_async_function: diag(2311, ts.DiagnosticCategory.Error, "Cannot_find_name_0_Did_you_mean_to_write_this_in_an_async_function_2311", "Cannot find name '{0}'. Did you mean to write this in an async function?"),
         An_interface_can_only_extend_an_object_type_or_intersection_of_object_types_with_statically_known_members: diag(2312, ts.DiagnosticCategory.Error, "An_interface_can_only_extend_an_object_type_or_intersection_of_object_types_with_statically_known_me_2312", "An interface can only extend an object type or intersection of object types with statically known members."),
         Type_parameter_0_has_a_circular_constraint: diag(2313, ts.DiagnosticCategory.Error, "Type_parameter_0_has_a_circular_constraint_2313", "Type parameter '{0}' has a circular constraint."),
         Generic_type_0_requires_1_type_argument_s: diag(2314, ts.DiagnosticCategory.Error, "Generic_type_0_requires_1_type_argument_s_2314", "Generic type '{0}' requires {1} type argument(s)."),
@@ -20758,6 +20766,10 @@ var ts;
         return text.replace(/\$/gm, "\\$");
     }
     ts.escapeSnippetText = escapeSnippetText;
+    function isThisTypeParameter(type) {
+        return !!(type.flags & 262144 /* TypeParameter */ && type.isThisType);
+    }
+    ts.isThisTypeParameter = isThisTypeParameter;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
@@ -46840,6 +46852,7 @@ var ts;
             getIndexInfosOfType: getIndexInfosOfType,
             getSignaturesOfType: getSignaturesOfType,
             getIndexTypeOfType: function (type, kind) { return getIndexTypeOfType(type, kind === 0 /* String */ ? stringType : numberType); },
+            getIndexType: function (type) { return getIndexType(type); },
             getBaseTypes: getBaseTypes,
             getBaseTypeOfLiteralType: getBaseTypeOfLiteralType,
             getWidenedType: getWidenedType,
@@ -48097,11 +48110,12 @@ var ts;
          *
          * @param isUse If true, this will count towards --noUnusedLocals / --noUnusedParameters.
          */
-        function resolveName(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals) {
+        function resolveName(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, getSpellingSuggstions) {
             if (excludeGlobals === void 0) { excludeGlobals = false; }
-            return resolveNameHelper(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, getSymbol);
+            if (getSpellingSuggstions === void 0) { getSpellingSuggstions = true; }
+            return resolveNameHelper(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, getSpellingSuggstions, getSymbol);
         }
-        function resolveNameHelper(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, lookup) {
+        function resolveNameHelper(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, getSpellingSuggestions, lookup) {
             var _a, _b, _c;
             var originalLocation = location; // needed for did-you-mean error reporting, which gathers candidates starting from the original location
             var result;
@@ -48418,7 +48432,7 @@ var ts;
                 }
             }
             if (!result) {
-                if (nameNotFoundMessage) {
+                if (nameNotFoundMessage && produceDiagnostics) {
                     if (!errorLocation ||
                         !checkAndReportErrorForMissingPrefix(errorLocation, name, nameArg) && // TODO: GH#18217
                             !checkAndReportErrorForExtendingInterface(errorLocation) &&
@@ -48428,7 +48442,7 @@ var ts;
                             !checkAndReportErrorForUsingNamespaceModuleAsValue(errorLocation, name, meaning) &&
                             !checkAndReportErrorForUsingValueAsType(errorLocation, name, meaning)) {
                         var suggestion = void 0;
-                        if (suggestionCount < maximumSuggestionCount) {
+                        if (getSpellingSuggestions && suggestionCount < maximumSuggestionCount) {
                             suggestion = getSuggestedSymbolForNonexistentSymbol(originalLocation, name, meaning);
                             var isGlobalScopeAugmentationDeclaration = (suggestion === null || suggestion === void 0 ? void 0 : suggestion.valueDeclaration) && ts.isAmbientModule(suggestion.valueDeclaration) && ts.isGlobalScopeAugmentation(suggestion.valueDeclaration);
                             if (isGlobalScopeAugmentationDeclaration) {
@@ -48464,7 +48478,7 @@ var ts;
                 return undefined;
             }
             // Perform extra checks only if error reporting was requested
-            if (nameNotFoundMessage) {
+            if (nameNotFoundMessage && produceDiagnostics) {
                 if (propertyWithInvalidInitializer && !(ts.getEmitScriptTarget(compilerOptions) === 99 /* ESNext */ && useDefineForClassFields)) {
                     // We have a match, but the reference occurred within a property initializer and the identifier also binds
                     // to a local variable in the constructor where the code will be emitted. Note that this is actually allowed
@@ -50940,7 +50954,7 @@ var ts;
                     context.approximateLength += 6;
                     return ts.factory.createKeywordTypeNode(147 /* ObjectKeyword */);
                 }
-                if (isThisTypeParameter(type)) {
+                if (ts.isThisTypeParameter(type)) {
                     if (context.flags & 4194304 /* InObjectTypeLiteral */) {
                         if (!context.encounteredError && !(context.flags & 32768 /* AllowThisInObjectLiteral */)) {
                             context.encounteredError = true;
@@ -58885,7 +58899,7 @@ var ts;
         }
         function getGlobalSymbol(name, meaning, diagnostic) {
             // Don't track references for global symbols anyway, so value if `isReference` is arbitrary
-            return resolveName(undefined, name, meaning, diagnostic, name, /*isUse*/ false);
+            return resolveName(undefined, name, meaning, diagnostic, name, /*isUse*/ false, /*excludeGlobals*/ false, /*getSpellingSuggestions*/ false);
         }
         function getGlobalType(name, arity, reportErrors) {
             var symbol = getGlobalTypeSymbol(name, reportErrors);
@@ -60464,9 +60478,6 @@ var ts;
             return (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type) || isGenericTupleType(type) ? 8388608 /* IsGenericObjectType */ : 0) |
                 (type.flags & (58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */) && !isPatternLiteralType(type) ? 16777216 /* IsGenericIndexType */ : 0);
         }
-        function isThisTypeParameter(type) {
-            return !!(type.flags & 262144 /* TypeParameter */ && type.isThisType);
-        }
         function getSimplifiedType(type, writing) {
             return type.flags & 8388608 /* IndexedAccess */ ? getSimplifiedIndexedAccessType(type, writing) :
                 type.flags & 16777216 /* Conditional */ ? getSimplifiedConditionalType(type, writing) :
@@ -65664,7 +65675,7 @@ var ts;
         // flags for the string, number, boolean, "", 0, false, void, undefined, or null types respectively. Returns
         // no flags for all other types (including non-falsy literal types).
         function getFalsyFlags(type) {
-            return type.flags & 1048576 /* Union */ ? getFalsyFlagsOfTypes(type.types) :
+            return type.flags & 3145728 /* UnionOrIntersection */ ? getFalsyFlagsOfTypes(type.types) :
                 type.flags & 128 /* StringLiteral */ ? type.value === "" ? 128 /* StringLiteral */ : 0 :
                     type.flags & 256 /* NumberLiteral */ ? type.value === 0 ? 256 /* NumberLiteral */ : 0 :
                         type.flags & 2048 /* BigIntLiteral */ ? isZeroBigInt(type) ? 2048 /* BigIntLiteral */ : 0 :
@@ -67280,6 +67291,11 @@ var ts;
                 case "BigInt64Array":
                 case "BigUint64Array":
                     return ts.Diagnostics.Cannot_find_name_0_Do_you_need_to_change_your_target_library_Try_changing_the_lib_compiler_option_to_1_or_later;
+                case "await":
+                    if (ts.isCallExpression(node.parent)) {
+                        return ts.Diagnostics.Cannot_find_name_0_Did_you_mean_to_write_this_in_an_async_function;
+                    }
+                // falls through
                 default:
                     if (node.parent.kind === 295 /* ShorthandPropertyAssignment */) {
                         return ts.Diagnostics.No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer;
@@ -68837,7 +68853,7 @@ var ts;
             function narrowByInKeyword(type, name, assumeTrue) {
                 if (type.flags & 1048576 /* Union */
                     || type.flags & 524288 /* Object */ && declaredType !== type
-                    || isThisTypeParameter(type)
+                    || ts.isThisTypeParameter(type)
                     || type.flags & 2097152 /* Intersection */ && ts.every(type.types, function (t) { return t.symbol !== globalThisSymbol; })) {
                     return filterType(type, function (t) { return isTypePresencePossible(t, name, assumeTrue); });
                 }
@@ -71657,15 +71673,9 @@ var ts;
             }
         }
         function isValidSpreadType(type) {
-            if (type.flags & 465829888 /* Instantiable */) {
-                var constraint = getBaseConstraintOfType(type);
-                if (constraint !== undefined) {
-                    return isValidSpreadType(constraint);
-                }
-            }
-            return !!(type.flags & (1 /* Any */ | 67108864 /* NonPrimitive */ | 524288 /* Object */ | 58982400 /* InstantiableNonPrimitive */) ||
-                getFalsyFlags(type) & 117632 /* DefinitelyFalsy */ && isValidSpreadType(removeDefinitelyFalsyTypes(type)) ||
-                type.flags & 3145728 /* UnionOrIntersection */ && ts.every(type.types, isValidSpreadType));
+            var t = removeDefinitelyFalsyTypes(mapType(type, getBaseConstraintOrType));
+            return !!(t.flags & (1 /* Any */ | 67108864 /* NonPrimitive */ | 524288 /* Object */ | 58982400 /* InstantiableNonPrimitive */) ||
+                t.flags & 3145728 /* UnionOrIntersection */ && ts.every(t.types, isValidSpreadType));
         }
         function checkJsxSelfClosingElementDeferred(node) {
             checkJsxOpeningLikeElementOrOpeningFragment(node);
@@ -72616,7 +72626,7 @@ var ts;
             }
             var propType;
             if (!prop) {
-                var indexInfo = !ts.isPrivateIdentifier(right) && (assignmentKind === 0 /* None */ || !isGenericObjectType(leftType) || isThisTypeParameter(leftType)) ?
+                var indexInfo = !ts.isPrivateIdentifier(right) && (assignmentKind === 0 /* None */ || !isGenericObjectType(leftType) || ts.isThisTypeParameter(leftType)) ?
                     getApplicableIndexInfoForName(apparentType, right.escapedText) : undefined;
                 if (!(indexInfo && indexInfo.type)) {
                     var isUncheckedJS = isUncheckedJSSuggestion(node, leftType.symbol, /*excludeClasses*/ true);
@@ -72633,7 +72643,7 @@ var ts;
                         return anyType;
                     }
                     if (right.escapedText && !checkAndReportErrorForExtendingInterface(node)) {
-                        reportNonexistentProperty(right, isThisTypeParameter(leftType) ? apparentType : leftType, isUncheckedJS);
+                        reportNonexistentProperty(right, ts.isThisTypeParameter(leftType) ? apparentType : leftType, isUncheckedJS);
                     }
                     return errorType;
                 }
@@ -72926,7 +72936,7 @@ var ts;
         }
         function getSuggestedSymbolForNonexistentSymbol(location, outerName, meaning) {
             ts.Debug.assert(outerName !== undefined, "outername should always be defined");
-            var result = resolveNameHelper(location, outerName, meaning, /*nameNotFoundMessage*/ undefined, outerName, /*isUse*/ false, /*excludeGlobals*/ false, function (symbols, name, meaning) {
+            var result = resolveNameHelper(location, outerName, meaning, /*nameNotFoundMessage*/ undefined, outerName, /*isUse*/ false, /*excludeGlobals*/ false, /*getSpellingSuggestions*/ true, function (symbols, name, meaning) {
                 ts.Debug.assertEqual(outerName, name, "name should equal outerName");
                 var symbol = getSymbol(symbols, name, meaning);
                 // Sometimes the symbol is found when location is a return type of a function: `typeof x` and `x` is declared in the body of the function
@@ -73172,7 +73182,7 @@ var ts;
             }
             var effectiveIndexType = isForInVariableForNumericPropertyNames(indexExpression) ? numberType : indexType;
             var accessFlags = ts.isAssignmentTarget(node) ?
-                4 /* Writing */ | (isGenericObjectType(objectType) && !isThisTypeParameter(objectType) ? 2 /* NoIndexSignatures */ : 0) :
+                4 /* Writing */ | (isGenericObjectType(objectType) && !ts.isThisTypeParameter(objectType) ? 2 /* NoIndexSignatures */ : 0) :
                 32 /* ExpressionPosition */;
             var indexedAccessType = getIndexedAccessTypeOrUndefined(objectType, effectiveIndexType, accessFlags, node) || errorType;
             return checkIndexedAccessIndexType(getFlowTypeOfAccessExpression(node, getNodeLinks(node).resolvedSymbol, indexedAccessType, indexExpression, checkMode), node);
@@ -127615,7 +127625,7 @@ var ts;
                     case 0 /* Paths */:
                         return convertPathCompletions(completion.paths);
                     case 1 /* Properties */: {
-                        var entries = [];
+                        var entries = ts.createSortedArray();
                         Completions.getCompletionEntriesFromSymbols(completion.symbols, entries, contextToken, contextToken, sourceFile, sourceFile, host, program, 99 /* ESNext */, log, 4 /* String */, preferences, options); // Target will not be used, so arbitrary
                         return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, optionalReplacementSpan: optionalReplacementSpan, entries: entries };
                     }
@@ -127813,7 +127823,7 @@ var ts;
                 var types = ts.flatMap(candidates, function (candidate) {
                     if (!ts.signatureHasRestParameter(candidate) && argumentInfo.argumentCount > candidate.parameters.length)
                         return;
-                    var type = checker.getParameterType(candidate, argumentInfo.argumentIndex);
+                    var type = candidate.getTypeParameterAtPosition(argumentInfo.argumentIndex);
                     isNewIdentifier = isNewIdentifier || !!(type.flags & 4 /* String */);
                     return getStringLiteralTypes(type, uniques);
                 });
@@ -128497,6 +128507,29 @@ var ts;
             }
         }
         Completions.getCompletionsAtPosition = getCompletionsAtPosition;
+        // Editors will use the `sortText` and then fall back to `name` for sorting, but leave ties in response order.
+        // So, it's important that we sort those ties in the order we want them displayed if it matters. We don't
+        // strictly need to sort by name or SortText here since clients are going to do it anyway, but we have to
+        // do the work of comparing them so we can sort those ties appropriately; plus, it makes the order returned
+        // by the language service consistent with what TS Server does and what editors typically do. This also makes
+        // completions tests make more sense. We used to sort only alphabetically and only in the server layer, but
+        // this made tests really weird, since most fourslash tests don't use the server.
+        function compareCompletionEntries(entryInArray, entryToInsert) {
+            var _a, _b;
+            var result = ts.compareStringsCaseSensitiveUI(entryInArray.sortText, entryToInsert.sortText);
+            if (result === 0 /* EqualTo */) {
+                result = ts.compareStringsCaseSensitiveUI(entryInArray.name, entryToInsert.name);
+            }
+            if (result === 0 /* EqualTo */ && ((_a = entryInArray.data) === null || _a === void 0 ? void 0 : _a.moduleSpecifier) && ((_b = entryToInsert.data) === null || _b === void 0 ? void 0 : _b.moduleSpecifier)) {
+                // Sort same-named auto-imports by module specifier
+                result = ts.compareNumberOfDirectorySeparators(entryInArray.data.moduleSpecifier, entryToInsert.data.moduleSpecifier);
+            }
+            if (result === 0 /* EqualTo */) {
+                // Fall back to symbol order - if we return `EqualTo`, `insertSorted` will put later symbols first.
+                return -1 /* LessThan */;
+            }
+            return result;
+        }
         function completionEntryDataIsResolved(data) {
             return !!(data === null || data === void 0 ? void 0 : data.moduleSpecifier);
         }
@@ -128583,7 +128616,7 @@ var ts;
                     return completionInfo;
                 }
             }
-            var entries = [];
+            var entries = ts.createSortedArray();
             if (isUncheckedFile(sourceFile, compilerOptions)) {
                 var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries, 
                 /*replacementToken*/ undefined, contextToken, location, sourceFile, host, program, ts.getEmitScriptTarget(compilerOptions), log, completionKind, preferences, compilerOptions, isTypeOnlyLocation, propertyAccessToConvert, isJsxIdentifierExpected, isJsxInitializer, importCompletionNode, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextIdMap);
@@ -128601,13 +128634,13 @@ var ts;
                 for (var _i = 0, _a = getKeywordCompletions(keywordFilters, !insideJsDocTagTypeExpression && ts.isSourceFileJS(sourceFile)); _i < _a.length; _i++) {
                     var keywordEntry = _a[_i];
                     if (!entryNames.has(keywordEntry.name)) {
-                        entries.push(keywordEntry);
+                        ts.insertSorted(entries, keywordEntry, compareCompletionEntries, /*allowDuplicates*/ true);
                     }
                 }
             }
             for (var _b = 0, literals_1 = literals; _b < literals_1.length; _b++) {
                 var literal = literals_1[_b];
-                entries.push(createCompletionEntryForLiteral(sourceFile, preferences, literal));
+                ts.insertSorted(entries, createCompletionEntryForLiteral(sourceFile, preferences, literal), compareCompletionEntries, /*allowDuplicates*/ true);
             }
             return {
                 isGlobalCompletion: isInSnippetScope,
@@ -128683,13 +128716,13 @@ var ts;
                 var realName = ts.unescapeLeadingUnderscores(name);
                 if (!uniqueNames.has(realName) && ts.isIdentifierText(realName, target)) {
                     uniqueNames.add(realName);
-                    entries.push({
+                    ts.insertSorted(entries, {
                         name: realName,
                         kind: "warning" /* warning */,
                         kindModifiers: "",
                         sortText: SortText.JavascriptIdentifiers,
                         isFromUncheckedFile: true
-                    });
+                    }, compareCompletionEntries);
                 }
             });
         }
@@ -129113,7 +129146,7 @@ var ts;
                 /** True for locals; false for globals, module exports from other files, `this.` completions. */
                 var shouldShadowLaterSymbols = !origin && !(symbol.parent === undefined && !ts.some(symbol.declarations, function (d) { return d.getSourceFile() === location.getSourceFile(); }));
                 uniques.set(name, shouldShadowLaterSymbols);
-                entries.push(entry);
+                ts.insertSorted(entries, entry, compareCompletionEntries, /*allowDuplicates*/ true);
             }
             log("getCompletionsAtPosition: getCompletionEntriesFromSymbols: " + (ts.timestamp() - start));
             // Prevent consumers of this map from having to worry about
@@ -151590,6 +151623,7 @@ var ts;
         var errorCodes = [
             ts.Diagnostics.await_expressions_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules.code,
             ts.Diagnostics.for_await_loops_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules.code,
+            ts.Diagnostics.Cannot_find_name_0_Did_you_mean_to_write_this_in_an_async_function.code
         ];
         codefix.registerCodeFix({
             errorCodes: errorCodes,
@@ -159400,6 +159434,9 @@ var ts;
         TypeObject.prototype.isClass = function () {
             return !!(ts.getObjectFlags(this) & 1 /* Class */);
         };
+        TypeObject.prototype.isIndexType = function () {
+            return !!(this.flags & 4194304 /* Index */);
+        };
         Object.defineProperty(TypeObject.prototype, "typeArguments", {
             /**
              * This polyfills `referenceType.typeArguments` for API consumers
@@ -159432,6 +159469,16 @@ var ts;
         SignatureObject.prototype.getReturnType = function () {
             return this.checker.getReturnTypeOfSignature(this);
         };
+        SignatureObject.prototype.getTypeParameterAtPosition = function (pos) {
+            var type = this.checker.getParameterType(this, pos);
+            if (type.isIndexType() && ts.isThisTypeParameter(type.type)) {
+                var constraint = type.type.getConstraint();
+                if (constraint) {
+                    return this.checker.getIndexType(constraint);
+                }
+            }
+            return type;
+        };
         SignatureObject.prototype.getDocumentationComment = function () {
             return this.documentationComment || (this.documentationComment = getDocumentationComment(ts.singleElementArray(this.declaration), this.checker));
         };
@@ -171777,14 +171824,14 @@ var ts;
                 if (kind === "completions-full" /* CompletionsFull */)
                     return completions;
                 var prefix = args.prefix || "";
-                var entries = ts.stableSort(ts.mapDefined(completions.entries, function (entry) {
+                var entries = ts.mapDefined(completions.entries, function (entry) {
                     if (completions.isMemberCompletion || ts.startsWith(entry.name.toLowerCase(), prefix.toLowerCase())) {
                         var name = entry.name, kind_1 = entry.kind, kindModifiers = entry.kindModifiers, sortText = entry.sortText, insertText = entry.insertText, replacementSpan = entry.replacementSpan, hasAction = entry.hasAction, source = entry.source, sourceDisplay = entry.sourceDisplay, isSnippet = entry.isSnippet, isRecommended = entry.isRecommended, isPackageJsonImport = entry.isPackageJsonImport, isImportStatementCompletion = entry.isImportStatementCompletion, data = entry.data;
                         var convertedSpan = replacementSpan ? toProtocolTextSpan(replacementSpan, scriptInfo) : undefined;
                         // Use `hasAction || undefined` to avoid serializing `false`.
                         return { name: name, kind: kind_1, kindModifiers: kindModifiers, sortText: sortText, insertText: insertText, replacementSpan: convertedSpan, isSnippet: isSnippet, hasAction: hasAction || undefined, source: source, sourceDisplay: sourceDisplay, isRecommended: isRecommended, isPackageJsonImport: isPackageJsonImport, isImportStatementCompletion: isImportStatementCompletion, data: data };
                     }
-                }), function (a, b) { return ts.compareStringsCaseSensitiveUI(a.name, b.name); });
+                });
                 if (kind === "completions" /* Completions */) {
                     if (completions.metadata)
                         entries.metadata = completions.metadata;

package/lib/tsserverlibrary.d.ts

@@ -5560,6 +5560,7 @@ declare namespace ts {
         isTypeParameter(): this is TypeParameter;
         isClassOrInterface(): this is InterfaceType;
         isClass(): this is InterfaceType;
+        isIndexType(): this is IndexType;
     }
     interface TypeReference {
         typeArguments?: readonly Type[];
@@ -5568,6 +5569,7 @@ declare namespace ts {
         getDeclaration(): SignatureDeclaration;
         getTypeParameters(): TypeParameter[] | undefined;
         getParameters(): Symbol[];
+        getTypeParameterAtPosition(pos: number): Type;
         getReturnType(): Type;
         getDocumentationComment(typeChecker: TypeChecker | undefined): SymbolDisplayPart[];
         getJsDocTags(): JSDocTagInfo[];