@typescript-deploys/pr-build 5.0.0-pr-52217-7 → 5.0.0-pr-52213-4

package/lib/tsc.js

@@ -6058,6 +6058,7 @@ var Diagnostics = {
   An_import_alias_cannot_reference_a_declaration_that_was_imported_using_import_type: diag(1380, 1 /* Error */, "An_import_alias_cannot_reference_a_declaration_that_was_imported_using_import_type_1380", "An import alias cannot reference a declaration that was imported using 'import type'."),
   Unexpected_token_Did_you_mean_or_rbrace: diag(1381, 1 /* Error */, "Unexpected_token_Did_you_mean_or_rbrace_1381", "Unexpected token. Did you mean `{'}'}` or `}`?"),
   Unexpected_token_Did_you_mean_or_gt: diag(1382, 1 /* Error */, "Unexpected_token_Did_you_mean_or_gt_1382", "Unexpected token. Did you mean `{'>'}` or `>`?"),
+  Only_named_exports_may_use_export_type: diag(1383, 1 /* Error */, "Only_named_exports_may_use_export_type_1383", "Only named exports may use 'export type'."),
   Function_type_notation_must_be_parenthesized_when_used_in_a_union_type: diag(1385, 1 /* Error */, "Function_type_notation_must_be_parenthesized_when_used_in_a_union_type_1385", "Function type notation must be parenthesized when used in a union type."),
   Constructor_type_notation_must_be_parenthesized_when_used_in_a_union_type: diag(1386, 1 /* Error */, "Constructor_type_notation_must_be_parenthesized_when_used_in_a_union_type_1386", "Constructor type notation must be parenthesized when used in a union type."),
   Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type: diag(1387, 1 /* Error */, "Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type_1387", "Function type notation must be parenthesized when used in an intersection type."),
@@ -10576,31 +10577,19 @@ function isTemplateMiddleOrTemplateTail(node) {
 function isImportOrExportSpecifier(node) {
   return isImportSpecifier(node) || isExportSpecifier(node);
 }
-function isTypeOnlyImportDeclaration(node) {
+function isTypeOnlyImportOrExportDeclaration(node) {
   switch (node.kind) {
     case 273 /* ImportSpecifier */:
+    case 278 /* ExportSpecifier */:
       return node.isTypeOnly || node.parent.parent.isTypeOnly;
     case 271 /* NamespaceImport */:
       return node.parent.isTypeOnly;
     case 270 /* ImportClause */:
     case 268 /* ImportEqualsDeclaration */:
       return node.isTypeOnly;
+    default:
+      return false;
   }
-  return false;
-}
-function isTypeOnlyExportDeclaration(node) {
-  switch (node.kind) {
-    case 278 /* ExportSpecifier */:
-      return node.isTypeOnly || node.parent.parent.isTypeOnly;
-    case 275 /* ExportDeclaration */:
-      return node.isTypeOnly && !!node.moduleSpecifier && !node.exportClause;
-    case 277 /* NamespaceExport */:
-      return node.parent.isTypeOnly;
-  }
-  return false;
-}
-function isTypeOnlyImportOrExportDeclaration(node) {
-  return isTypeOnlyImportDeclaration(node) || isTypeOnlyExportDeclaration(node);
 }
 function isAssertionKey(node) {
   return isStringLiteral(node) || isIdentifier(node);
@@ -43430,7 +43419,7 @@ function createTypeChecker(host) {
         if (result && errorLocation && meaning & 111551 /* Value */ && result.flags & 2097152 /* Alias */ && !(result.flags & 111551 /* Value */) && !isValidTypeOnlyAliasUseSite(errorLocation)) {
           const typeOnlyDeclaration = getTypeOnlyAliasDeclaration(result, 111551 /* Value */);
           if (typeOnlyDeclaration) {
-            const message = typeOnlyDeclaration.kind === 278 /* ExportSpecifier */ || typeOnlyDeclaration.kind === 275 /* ExportDeclaration */ || typeOnlyDeclaration.kind === 277 /* NamespaceExport */ ? Diagnostics._0_cannot_be_used_as_a_value_because_it_was_exported_using_export_type : Diagnostics._0_cannot_be_used_as_a_value_because_it_was_imported_using_import_type;
+            const message = typeOnlyDeclaration.kind === 278 /* ExportSpecifier */ ? Diagnostics._0_cannot_be_used_as_a_value_because_it_was_exported_using_export_type : Diagnostics._0_cannot_be_used_as_a_value_because_it_was_imported_using_import_type;
             const unescapedName = unescapeLeadingUnderscores(name);
             addTypeOnlyDeclarationRelatedInfo(
               error(errorLocation, message, unescapedName),
@@ -43450,7 +43439,7 @@ function createTypeChecker(host) {
       diagnostic,
       createDiagnosticForNode(
         typeOnlyDeclaration,
-        typeOnlyDeclaration.kind === 278 /* ExportSpecifier */ || typeOnlyDeclaration.kind === 275 /* ExportDeclaration */ || typeOnlyDeclaration.kind === 277 /* NamespaceExport */ ? Diagnostics._0_was_exported_here : Diagnostics._0_was_imported_here,
+        typeOnlyDeclaration.kind === 278 /* ExportSpecifier */ ? Diagnostics._0_was_exported_here : Diagnostics._0_was_imported_here,
         unescapedName
       )
     );
@@ -43829,10 +43818,10 @@ function createTypeChecker(host) {
       false
     ) && !node.isTypeOnly) {
       const typeOnlyDeclaration = getTypeOnlyAliasDeclaration(getSymbolOfDeclaration(node));
-      const isExport = typeOnlyDeclaration.kind === 278 /* ExportSpecifier */ || typeOnlyDeclaration.kind === 275 /* ExportDeclaration */;
+      const isExport = typeOnlyDeclaration.kind === 278 /* ExportSpecifier */;
       const message = isExport ? Diagnostics.An_import_alias_cannot_reference_a_declaration_that_was_exported_using_export_type : Diagnostics.An_import_alias_cannot_reference_a_declaration_that_was_imported_using_import_type;
       const relatedMessage = isExport ? Diagnostics._0_was_exported_here : Diagnostics._0_was_imported_here;
-      const name = typeOnlyDeclaration.kind === 275 /* ExportDeclaration */ ? "*" : unescapeLeadingUnderscores(typeOnlyDeclaration.name.escapedText);
+      const name = unescapeLeadingUnderscores(typeOnlyDeclaration.name.escapedText);
       addRelatedInfo(error(node.moduleReference, message), createDiagnosticForNode(typeOnlyDeclaration, relatedMessage, name));
     }
   }
@@ -44063,19 +44052,15 @@ function createTypeChecker(host) {
     return result;
   }
   function getExportOfModule(symbol, name, specifier, dontResolveAlias) {
-    var _a2;
     if (symbol.flags & 1536 /* Module */) {
       const exportSymbol = getExportsOfSymbol(symbol).get(name.escapedText);
       const resolved = resolveSymbol(exportSymbol, dontResolveAlias);
-      const exportStarDeclaration = (_a2 = getSymbolLinks(symbol).typeOnlyExportStarMap) == null ? void 0 : _a2.get(name.escapedText);
       markSymbolOfAliasDeclarationIfTypeOnly(
         specifier,
         exportSymbol,
         resolved,
         /*overwriteEmpty*/
-        false,
-        exportStarDeclaration,
-        name.escapedText
+        false
       );
       return resolved;
     }
@@ -44402,7 +44387,7 @@ function createTypeChecker(host) {
     }
     return flags;
   }
-  function markSymbolOfAliasDeclarationIfTypeOnly(aliasDeclaration, immediateTarget, finalTarget, overwriteEmpty, exportStarDeclaration, exportStarName) {
+  function markSymbolOfAliasDeclarationIfTypeOnly(aliasDeclaration, immediateTarget, finalTarget, overwriteEmpty) {
     if (!aliasDeclaration || isPropertyAccessExpression(aliasDeclaration))
       return false;
     const sourceSymbol = getSymbolOfDeclaration(aliasDeclaration);
@@ -44411,14 +44396,6 @@ function createTypeChecker(host) {
       links2.typeOnlyDeclaration = aliasDeclaration;
       return true;
     }
-    if (exportStarDeclaration) {
-      const links2 = getSymbolLinks(sourceSymbol);
-      links2.typeOnlyDeclaration = exportStarDeclaration;
-      if (sourceSymbol.escapedName !== exportStarName) {
-        links2.typeOnlyExportStarName = exportStarName;
-      }
-      return true;
-    }
     const links = getSymbolLinks(sourceSymbol);
     return markSymbolOfAliasDeclarationIfTypeOnlyWorker(links, immediateTarget, overwriteEmpty) || markSymbolOfAliasDeclarationIfTypeOnlyWorker(links, finalTarget, overwriteEmpty);
   }
@@ -44440,8 +44417,7 @@ function createTypeChecker(host) {
       return links.typeOnlyDeclaration || void 0;
     }
     if (links.typeOnlyDeclaration) {
-      const resolved = links.typeOnlyDeclaration.kind === 275 /* ExportDeclaration */ ? resolveSymbol(getExportsOfModule(links.typeOnlyDeclaration.symbol.parent).get(links.typeOnlyExportStarName || symbol.escapedName)) : resolveAlias(links.typeOnlyDeclaration.symbol);
-      return getAllSymbolFlags(resolved) & include ? links.typeOnlyDeclaration : void 0;
+      return getAllSymbolFlags(resolveAlias(links.typeOnlyDeclaration.symbol)) & include ? links.typeOnlyDeclaration : void 0;
     }
     return void 0;
   }
@@ -45095,12 +45071,7 @@ function createTypeChecker(host) {
   }
   function getExportsOfModule(moduleSymbol) {
     const links = getSymbolLinks(moduleSymbol);
-    if (!links.resolvedExports) {
-      const { exports, typeOnlyExportStarMap } = getExportsOfModuleWorker(moduleSymbol);
-      links.resolvedExports = exports;
-      links.typeOnlyExportStarMap = typeOnlyExportStarMap;
-    }
-    return links.resolvedExports;
+    return links.resolvedExports || (links.resolvedExports = getExportsOfModuleWorker(moduleSymbol));
   }
   function extendExportSymbols(target, source, lookupTable, exportNode) {
     if (!source)
@@ -45128,21 +45099,9 @@ function createTypeChecker(host) {
   }
   function getExportsOfModuleWorker(moduleSymbol) {
     const visitedSymbols = [];
-    let typeOnlyExportStarMap;
-    const nonTypeOnlyNames = /* @__PURE__ */ new Set();
     moduleSymbol = resolveExternalModuleSymbol(moduleSymbol);
-    const exports = visit(moduleSymbol) || emptySymbols;
-    if (typeOnlyExportStarMap) {
-      nonTypeOnlyNames.forEach((name) => typeOnlyExportStarMap.delete(name));
-    }
-    return {
-      exports,
-      typeOnlyExportStarMap
-    };
-    function visit(symbol, exportStar, isTypeOnly) {
-      if (!isTypeOnly && (symbol == null ? void 0 : symbol.exports)) {
-        symbol.exports.forEach((_, name) => nonTypeOnlyNames.add(name));
-      }
+    return visit(moduleSymbol) || emptySymbols;
+    function visit(symbol) {
       if (!(symbol && symbol.exports && pushIfUnique(visitedSymbols, symbol))) {
         return;
       }
@@ -45154,7 +45113,7 @@ function createTypeChecker(host) {
         if (exportStars.declarations) {
           for (const node of exportStars.declarations) {
             const resolvedModule = resolveExternalModuleName(node, node.moduleSpecifier);
-            const exportedSymbols = visit(resolvedModule, node, isTypeOnly || node.isTypeOnly);
+            const exportedSymbols = visit(resolvedModule);
             extendExportSymbols(
               nestedSymbols,
               exportedSymbols,
@@ -45178,13 +45137,6 @@ function createTypeChecker(host) {
         });
         extendExportSymbols(symbols, nestedSymbols);
       }
-      if (exportStar == null ? void 0 : exportStar.isTypeOnly) {
-        typeOnlyExportStarMap != null ? typeOnlyExportStarMap : typeOnlyExportStarMap = /* @__PURE__ */ new Map();
-        symbols.forEach((_, escapedName) => typeOnlyExportStarMap.set(
-          escapedName,
-          exportStar
-        ));
-      }
       return symbols;
     }
   }
@@ -51413,7 +51365,7 @@ function createTypeChecker(host) {
     const links = getSymbolLinks(symbol);
     if (!links[resolutionKind]) {
       const isStatic2 = resolutionKind === "resolvedExports" /* resolvedExports */;
-      const earlySymbols = !isStatic2 ? symbol.members : symbol.flags & 1536 /* Module */ ? getExportsOfModuleWorker(symbol).exports : symbol.exports;
+      const earlySymbols = !isStatic2 ? symbol.members : symbol.flags & 1536 /* Module */ ? getExportsOfModuleWorker(symbol) : symbol.exports;
       links[resolutionKind] = earlySymbols || emptySymbols;
       const lateSymbols = createSymbolTable();
       for (const decl of symbol.declarations || emptyArray) {
@@ -52402,7 +52354,7 @@ function createTypeChecker(host) {
   }
   function isConstTypeVariable(type) {
     var _a2;
-    return !!(type.flags & 262144 /* TypeParameter */ && some((_a2 = type.symbol) == null ? void 0 : _a2.declarations, (d) => hasSyntacticModifier(d, 2048 /* Const */)) || type.flags & 8388608 /* IndexedAccess */ && isConstTypeVariable(type.objectType));
+    return !!(type.flags & 262144 /* TypeParameter */ && some((_a2 = type.symbol) == null ? void 0 : _a2.declarations, (d) => hasSyntacticModifier(d, 2048 /* Const */)) || isGenericTupleType(type) && findIndex(getTypeArguments(type), (t, i) => !!(type.target.elementFlags[i] & 8 /* Variadic */) && isConstTypeVariable(t)) >= 0 || type.flags & 8388608 /* IndexedAccess */ && isConstTypeVariable(type.objectType));
   }
   function getConstraintOfIndexedAccess(type) {
     return hasNonCircularBaseConstraint(type) ? getConstraintFromIndexedAccess(type) : void 0;
@@ -64318,6 +64270,7 @@ function createTypeChecker(host) {
     }
   }
   function getNarrowedTypeOfSymbol(symbol, location) {
+    var _a2;
     const type = getTypeOfSymbol(symbol);
     const declaration = symbol.valueDeclaration;
     if (declaration) {
@@ -64353,7 +64306,7 @@ function createTypeChecker(host) {
         if (func.parameters.length >= 2 && isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
           const contextualSignature = getContextualSignature(func);
           if (contextualSignature && contextualSignature.parameters.length === 1 && signatureHasRestParameter(contextualSignature)) {
-            const restType = getReducedApparentType(getTypeOfSymbol(contextualSignature.parameters[0]));
+            const restType = getReducedApparentType(instantiateType(getTypeOfSymbol(contextualSignature.parameters[0]), (_a2 = getInferenceContext(func)) == null ? void 0 : _a2.nonFixingMapper));
             if (restType.flags & 1048576 /* Union */ && everyType(restType, isTupleType) && !isSymbolAssigned(symbol)) {
               const narrowedType = getFlowTypeOfReference(
                 func,
@@ -65574,7 +65527,9 @@ function createTypeChecker(host) {
     }
     const index = findContextualNode(node);
     if (index >= 0) {
-      return contextualTypes[index];
+      const cached = contextualTypes[index];
+      if (cached || !contextFlags)
+        return cached;
     }
     const { parent } = node;
     switch (parent.kind) {
@@ -77163,8 +77118,12 @@ function createTypeChecker(host) {
   }
   function checkGrammarExportDeclaration(node) {
     var _a2;
-    if (node.isTypeOnly && ((_a2 = node.exportClause) == null ? void 0 : _a2.kind) === 276 /* NamedExports */) {
-      return checkGrammarNamedImportsOrExports(node.exportClause);
+    if (node.isTypeOnly) {
+      if (((_a2 = node.exportClause) == null ? void 0 : _a2.kind) === 276 /* NamedExports */) {
+        return checkGrammarNamedImportsOrExports(node.exportClause);
+      } else {
+        return grammarErrorOnNode(node, Diagnostics.Only_named_exports_may_use_export_type);
+      }
     }
     return false;
   }

package/lib/tsserver.js

@@ -1929,8 +1929,6 @@ __export(server_exports, {
   isTypeNodeKind: () => isTypeNodeKind,
   isTypeNodeOrTypeParameterDeclaration: () => isTypeNodeOrTypeParameterDeclaration,
   isTypeOfExpression: () => isTypeOfExpression,
-  isTypeOnlyExportDeclaration: () => isTypeOnlyExportDeclaration,
-  isTypeOnlyImportDeclaration: () => isTypeOnlyImportDeclaration,
   isTypeOnlyImportOrExportDeclaration: () => isTypeOnlyImportOrExportDeclaration,
   isTypeOperatorNode: () => isTypeOperatorNode,
   isTypeParameterDeclaration: () => isTypeParameterDeclaration,
@@ -9874,6 +9872,7 @@ var Diagnostics = {
   An_import_alias_cannot_reference_a_declaration_that_was_imported_using_import_type: diag(1380, 1 /* Error */, "An_import_alias_cannot_reference_a_declaration_that_was_imported_using_import_type_1380", "An import alias cannot reference a declaration that was imported using 'import type'."),
   Unexpected_token_Did_you_mean_or_rbrace: diag(1381, 1 /* Error */, "Unexpected_token_Did_you_mean_or_rbrace_1381", "Unexpected token. Did you mean `{'}'}` or `}`?"),
   Unexpected_token_Did_you_mean_or_gt: diag(1382, 1 /* Error */, "Unexpected_token_Did_you_mean_or_gt_1382", "Unexpected token. Did you mean `{'>'}` or `>`?"),
+  Only_named_exports_may_use_export_type: diag(1383, 1 /* Error */, "Only_named_exports_may_use_export_type_1383", "Only named exports may use 'export type'."),
   Function_type_notation_must_be_parenthesized_when_used_in_a_union_type: diag(1385, 1 /* Error */, "Function_type_notation_must_be_parenthesized_when_used_in_a_union_type_1385", "Function type notation must be parenthesized when used in a union type."),
   Constructor_type_notation_must_be_parenthesized_when_used_in_a_union_type: diag(1386, 1 /* Error */, "Constructor_type_notation_must_be_parenthesized_when_used_in_a_union_type_1386", "Constructor type notation must be parenthesized when used in a union type."),
   Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type: diag(1387, 1 /* Error */, "Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type_1387", "Function type notation must be parenthesized when used in an intersection type."),
@@ -14529,31 +14528,19 @@ function isTemplateMiddleOrTemplateTail(node) {
 function isImportOrExportSpecifier(node) {
   return isImportSpecifier(node) || isExportSpecifier(node);
 }
-function isTypeOnlyImportDeclaration(node) {
+function isTypeOnlyImportOrExportDeclaration(node) {
   switch (node.kind) {
     case 273 /* ImportSpecifier */:
+    case 278 /* ExportSpecifier */:
       return node.isTypeOnly || node.parent.parent.isTypeOnly;
     case 271 /* NamespaceImport */:
       return node.parent.isTypeOnly;
     case 270 /* ImportClause */:
     case 268 /* ImportEqualsDeclaration */:
       return node.isTypeOnly;
+    default:
+      return false;
   }
-  return false;
-}
-function isTypeOnlyExportDeclaration(node) {
-  switch (node.kind) {
-    case 278 /* ExportSpecifier */:
-      return node.isTypeOnly || node.parent.parent.isTypeOnly;
-    case 275 /* ExportDeclaration */:
-      return node.isTypeOnly && !!node.moduleSpecifier && !node.exportClause;
-    case 277 /* NamespaceExport */:
-      return node.parent.isTypeOnly;
-  }
-  return false;
-}
-function isTypeOnlyImportOrExportDeclaration(node) {
-  return isTypeOnlyImportDeclaration(node) || isTypeOnlyExportDeclaration(node);
 }
 function isAssertionKey(node) {
   return isStringLiteral(node) || isIdentifier(node);
@@ -48358,7 +48345,7 @@ function createTypeChecker(host) {
         if (result && errorLocation && meaning & 111551 /* Value */ && result.flags & 2097152 /* Alias */ && !(result.flags & 111551 /* Value */) && !isValidTypeOnlyAliasUseSite(errorLocation)) {
           const typeOnlyDeclaration = getTypeOnlyAliasDeclaration(result, 111551 /* Value */);
           if (typeOnlyDeclaration) {
-            const message = typeOnlyDeclaration.kind === 278 /* ExportSpecifier */ || typeOnlyDeclaration.kind === 275 /* ExportDeclaration */ || typeOnlyDeclaration.kind === 277 /* NamespaceExport */ ? Diagnostics._0_cannot_be_used_as_a_value_because_it_was_exported_using_export_type : Diagnostics._0_cannot_be_used_as_a_value_because_it_was_imported_using_import_type;
+            const message = typeOnlyDeclaration.kind === 278 /* ExportSpecifier */ ? Diagnostics._0_cannot_be_used_as_a_value_because_it_was_exported_using_export_type : Diagnostics._0_cannot_be_used_as_a_value_because_it_was_imported_using_import_type;
             const unescapedName = unescapeLeadingUnderscores(name);
             addTypeOnlyDeclarationRelatedInfo(
               error(errorLocation, message, unescapedName),
@@ -48378,7 +48365,7 @@ function createTypeChecker(host) {
       diagnostic,
       createDiagnosticForNode(
         typeOnlyDeclaration,
-        typeOnlyDeclaration.kind === 278 /* ExportSpecifier */ || typeOnlyDeclaration.kind === 275 /* ExportDeclaration */ || typeOnlyDeclaration.kind === 277 /* NamespaceExport */ ? Diagnostics._0_was_exported_here : Diagnostics._0_was_imported_here,
+        typeOnlyDeclaration.kind === 278 /* ExportSpecifier */ ? Diagnostics._0_was_exported_here : Diagnostics._0_was_imported_here,
         unescapedName
       )
     );
@@ -48757,10 +48744,10 @@ function createTypeChecker(host) {
       false
     ) && !node.isTypeOnly) {
       const typeOnlyDeclaration = getTypeOnlyAliasDeclaration(getSymbolOfDeclaration(node));
-      const isExport = typeOnlyDeclaration.kind === 278 /* ExportSpecifier */ || typeOnlyDeclaration.kind === 275 /* ExportDeclaration */;
+      const isExport = typeOnlyDeclaration.kind === 278 /* ExportSpecifier */;
       const message = isExport ? Diagnostics.An_import_alias_cannot_reference_a_declaration_that_was_exported_using_export_type : Diagnostics.An_import_alias_cannot_reference_a_declaration_that_was_imported_using_import_type;
       const relatedMessage = isExport ? Diagnostics._0_was_exported_here : Diagnostics._0_was_imported_here;
-      const name = typeOnlyDeclaration.kind === 275 /* ExportDeclaration */ ? "*" : unescapeLeadingUnderscores(typeOnlyDeclaration.name.escapedText);
+      const name = unescapeLeadingUnderscores(typeOnlyDeclaration.name.escapedText);
       addRelatedInfo(error(node.moduleReference, message), createDiagnosticForNode(typeOnlyDeclaration, relatedMessage, name));
     }
   }
@@ -48991,19 +48978,15 @@ function createTypeChecker(host) {
     return result;
   }
   function getExportOfModule(symbol, name, specifier, dontResolveAlias) {
-    var _a2;
     if (symbol.flags & 1536 /* Module */) {
       const exportSymbol = getExportsOfSymbol(symbol).get(name.escapedText);
       const resolved = resolveSymbol(exportSymbol, dontResolveAlias);
-      const exportStarDeclaration = (_a2 = getSymbolLinks(symbol).typeOnlyExportStarMap) == null ? void 0 : _a2.get(name.escapedText);
       markSymbolOfAliasDeclarationIfTypeOnly(
         specifier,
         exportSymbol,
         resolved,
         /*overwriteEmpty*/
-        false,
-        exportStarDeclaration,
-        name.escapedText
+        false
       );
       return resolved;
     }
@@ -49330,7 +49313,7 @@ function createTypeChecker(host) {
     }
     return flags;
   }
-  function markSymbolOfAliasDeclarationIfTypeOnly(aliasDeclaration, immediateTarget, finalTarget, overwriteEmpty, exportStarDeclaration, exportStarName) {
+  function markSymbolOfAliasDeclarationIfTypeOnly(aliasDeclaration, immediateTarget, finalTarget, overwriteEmpty) {
     if (!aliasDeclaration || isPropertyAccessExpression(aliasDeclaration))
       return false;
     const sourceSymbol = getSymbolOfDeclaration(aliasDeclaration);
@@ -49339,14 +49322,6 @@ function createTypeChecker(host) {
       links2.typeOnlyDeclaration = aliasDeclaration;
       return true;
     }
-    if (exportStarDeclaration) {
-      const links2 = getSymbolLinks(sourceSymbol);
-      links2.typeOnlyDeclaration = exportStarDeclaration;
-      if (sourceSymbol.escapedName !== exportStarName) {
-        links2.typeOnlyExportStarName = exportStarName;
-      }
-      return true;
-    }
     const links = getSymbolLinks(sourceSymbol);
     return markSymbolOfAliasDeclarationIfTypeOnlyWorker(links, immediateTarget, overwriteEmpty) || markSymbolOfAliasDeclarationIfTypeOnlyWorker(links, finalTarget, overwriteEmpty);
   }
@@ -49368,8 +49343,7 @@ function createTypeChecker(host) {
       return links.typeOnlyDeclaration || void 0;
     }
     if (links.typeOnlyDeclaration) {
-      const resolved = links.typeOnlyDeclaration.kind === 275 /* ExportDeclaration */ ? resolveSymbol(getExportsOfModule(links.typeOnlyDeclaration.symbol.parent).get(links.typeOnlyExportStarName || symbol.escapedName)) : resolveAlias(links.typeOnlyDeclaration.symbol);
-      return getAllSymbolFlags(resolved) & include ? links.typeOnlyDeclaration : void 0;
+      return getAllSymbolFlags(resolveAlias(links.typeOnlyDeclaration.symbol)) & include ? links.typeOnlyDeclaration : void 0;
     }
     return void 0;
   }
@@ -50023,12 +49997,7 @@ function createTypeChecker(host) {
   }
   function getExportsOfModule(moduleSymbol) {
     const links = getSymbolLinks(moduleSymbol);
-    if (!links.resolvedExports) {
-      const { exports, typeOnlyExportStarMap } = getExportsOfModuleWorker(moduleSymbol);
-      links.resolvedExports = exports;
-      links.typeOnlyExportStarMap = typeOnlyExportStarMap;
-    }
-    return links.resolvedExports;
+    return links.resolvedExports || (links.resolvedExports = getExportsOfModuleWorker(moduleSymbol));
   }
   function extendExportSymbols(target, source, lookupTable, exportNode) {
     if (!source)
@@ -50056,21 +50025,9 @@ function createTypeChecker(host) {
   }
   function getExportsOfModuleWorker(moduleSymbol) {
     const visitedSymbols = [];
-    let typeOnlyExportStarMap;
-    const nonTypeOnlyNames = /* @__PURE__ */ new Set();
     moduleSymbol = resolveExternalModuleSymbol(moduleSymbol);
-    const exports = visit(moduleSymbol) || emptySymbols;
-    if (typeOnlyExportStarMap) {
-      nonTypeOnlyNames.forEach((name) => typeOnlyExportStarMap.delete(name));
-    }
-    return {
-      exports,
-      typeOnlyExportStarMap
-    };
-    function visit(symbol, exportStar, isTypeOnly) {
-      if (!isTypeOnly && (symbol == null ? void 0 : symbol.exports)) {
-        symbol.exports.forEach((_, name) => nonTypeOnlyNames.add(name));
-      }
+    return visit(moduleSymbol) || emptySymbols;
+    function visit(symbol) {
       if (!(symbol && symbol.exports && pushIfUnique(visitedSymbols, symbol))) {
         return;
       }
@@ -50082,7 +50039,7 @@ function createTypeChecker(host) {
         if (exportStars.declarations) {
           for (const node of exportStars.declarations) {
             const resolvedModule = resolveExternalModuleName(node, node.moduleSpecifier);
-            const exportedSymbols = visit(resolvedModule, node, isTypeOnly || node.isTypeOnly);
+            const exportedSymbols = visit(resolvedModule);
             extendExportSymbols(
               nestedSymbols,
               exportedSymbols,
@@ -50106,13 +50063,6 @@ function createTypeChecker(host) {
         });
         extendExportSymbols(symbols, nestedSymbols);
       }
-      if (exportStar == null ? void 0 : exportStar.isTypeOnly) {
-        typeOnlyExportStarMap != null ? typeOnlyExportStarMap : typeOnlyExportStarMap = /* @__PURE__ */ new Map();
-        symbols.forEach((_, escapedName) => typeOnlyExportStarMap.set(
-          escapedName,
-          exportStar
-        ));
-      }
       return symbols;
     }
   }
@@ -56341,7 +56291,7 @@ function createTypeChecker(host) {
     const links = getSymbolLinks(symbol);
     if (!links[resolutionKind]) {
       const isStatic2 = resolutionKind === "resolvedExports" /* resolvedExports */;
-      const earlySymbols = !isStatic2 ? symbol.members : symbol.flags & 1536 /* Module */ ? getExportsOfModuleWorker(symbol).exports : symbol.exports;
+      const earlySymbols = !isStatic2 ? symbol.members : symbol.flags & 1536 /* Module */ ? getExportsOfModuleWorker(symbol) : symbol.exports;
       links[resolutionKind] = earlySymbols || emptySymbols;
       const lateSymbols = createSymbolTable();
       for (const decl of symbol.declarations || emptyArray) {
@@ -57330,7 +57280,7 @@ function createTypeChecker(host) {
   }
   function isConstTypeVariable(type) {
     var _a2;
-    return !!(type.flags & 262144 /* TypeParameter */ && some((_a2 = type.symbol) == null ? void 0 : _a2.declarations, (d) => hasSyntacticModifier(d, 2048 /* Const */)) || type.flags & 8388608 /* IndexedAccess */ && isConstTypeVariable(type.objectType));
+    return !!(type.flags & 262144 /* TypeParameter */ && some((_a2 = type.symbol) == null ? void 0 : _a2.declarations, (d) => hasSyntacticModifier(d, 2048 /* Const */)) || isGenericTupleType(type) && findIndex(getTypeArguments(type), (t, i) => !!(type.target.elementFlags[i] & 8 /* Variadic */) && isConstTypeVariable(t)) >= 0 || type.flags & 8388608 /* IndexedAccess */ && isConstTypeVariable(type.objectType));
   }
   function getConstraintOfIndexedAccess(type) {
     return hasNonCircularBaseConstraint(type) ? getConstraintFromIndexedAccess(type) : void 0;
@@ -69246,6 +69196,7 @@ function createTypeChecker(host) {
     }
   }
   function getNarrowedTypeOfSymbol(symbol, location) {
+    var _a2;
     const type = getTypeOfSymbol(symbol);
     const declaration = symbol.valueDeclaration;
     if (declaration) {
@@ -69281,7 +69232,7 @@ function createTypeChecker(host) {
         if (func.parameters.length >= 2 && isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
           const contextualSignature = getContextualSignature(func);
           if (contextualSignature && contextualSignature.parameters.length === 1 && signatureHasRestParameter(contextualSignature)) {
-            const restType = getReducedApparentType(getTypeOfSymbol(contextualSignature.parameters[0]));
+            const restType = getReducedApparentType(instantiateType(getTypeOfSymbol(contextualSignature.parameters[0]), (_a2 = getInferenceContext(func)) == null ? void 0 : _a2.nonFixingMapper));
             if (restType.flags & 1048576 /* Union */ && everyType(restType, isTupleType) && !isSymbolAssigned(symbol)) {
               const narrowedType = getFlowTypeOfReference(
                 func,
@@ -70502,7 +70453,9 @@ function createTypeChecker(host) {
     }
     const index = findContextualNode(node);
     if (index >= 0) {
-      return contextualTypes[index];
+      const cached = contextualTypes[index];
+      if (cached || !contextFlags)
+        return cached;
     }
     const { parent: parent2 } = node;
     switch (parent2.kind) {
@@ -82091,8 +82044,12 @@ function createTypeChecker(host) {
   }
   function checkGrammarExportDeclaration(node) {
     var _a2;
-    if (node.isTypeOnly && ((_a2 = node.exportClause) == null ? void 0 : _a2.kind) === 276 /* NamedExports */) {
-      return checkGrammarNamedImportsOrExports(node.exportClause);
+    if (node.isTypeOnly) {
+      if (((_a2 = node.exportClause) == null ? void 0 : _a2.kind) === 276 /* NamedExports */) {
+        return checkGrammarNamedImportsOrExports(node.exportClause);
+      } else {
+        return grammarErrorOnNode(node, Diagnostics.Only_named_exports_may_use_export_type);
+      }
     }
     return false;
   }
@@ -125219,8 +125176,6 @@ __export(ts_exports3, {
   isTypeNodeKind: () => isTypeNodeKind,
   isTypeNodeOrTypeParameterDeclaration: () => isTypeNodeOrTypeParameterDeclaration,
   isTypeOfExpression: () => isTypeOfExpression,
-  isTypeOnlyExportDeclaration: () => isTypeOnlyExportDeclaration,
-  isTypeOnlyImportDeclaration: () => isTypeOnlyImportDeclaration,
   isTypeOnlyImportOrExportDeclaration: () => isTypeOnlyImportOrExportDeclaration,
   isTypeOperatorNode: () => isTypeOperatorNode,
   isTypeParameterDeclaration: () => isTypeParameterDeclaration,
@@ -149007,7 +148962,7 @@ function getCompletionData(program, log, sourceFile, compilerOptions, position,
         symbolToSortTextMap[getSymbolId(symbol)] = SortText.GlobalsOrKeywords;
       }
       if (typeOnlyAliasNeedsPromotion && !(symbol.flags & 111551 /* Value */)) {
-        const typeOnlyAliasDeclaration = symbol.declarations && find(symbol.declarations, isTypeOnlyImportDeclaration);
+        const typeOnlyAliasDeclaration = symbol.declarations && find(symbol.declarations, isTypeOnlyImportOrExportDeclaration);
         if (typeOnlyAliasDeclaration) {
           const origin = { kind: 64 /* TypeOnlyAlias */, declaration: typeOnlyAliasDeclaration };
           symbolToOriginInfoMap[i] = origin;
@@ -150065,14 +150020,14 @@ function tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken
     case 27 /* CommaToken */:
       return tryCast(contextToken.parent, isObjectTypeDeclaration);
     default:
-      if (!isFromObjectTypeDeclaration(contextToken)) {
-        if (getLineAndCharacterOfPosition(sourceFile, contextToken.getEnd()).line !== getLineAndCharacterOfPosition(sourceFile, position).line && isObjectTypeDeclaration(location)) {
+      if (isObjectTypeDeclaration(location)) {
+        if (getLineAndCharacterOfPosition(sourceFile, contextToken.getEnd()).line !== getLineAndCharacterOfPosition(sourceFile, position).line) {
           return location;
         }
-        return void 0;
+        const isValidKeyword = isClassLike(contextToken.parent.parent) ? isClassMemberCompletionKeyword : isInterfaceOrTypeLiteralCompletionKeyword;
+        return isValidKeyword(contextToken.kind) || contextToken.kind === 41 /* AsteriskToken */ || isIdentifier(contextToken) && isValidKeyword((_a2 = identifierToKeywordKind(contextToken)) != null ? _a2 : 0 /* Unknown */) ? contextToken.parent.parent : void 0;
       }
-      const isValidKeyword = isClassLike(contextToken.parent.parent) ? isClassMemberCompletionKeyword : isInterfaceOrTypeLiteralCompletionKeyword;
-      return isValidKeyword(contextToken.kind) || contextToken.kind === 41 /* AsteriskToken */ || isIdentifier(contextToken) && isValidKeyword((_a2 = identifierToKeywordKind(contextToken)) != null ? _a2 : 0 /* Unknown */) ? contextToken.parent.parent : void 0;
+      return void 0;
   }
 }
 function tryGetTypeLiteralNode(node) {
@@ -180858,8 +180813,6 @@ start(initializeNodeSystem(), require("os").platform());
   isTypeNodeKind,
   isTypeNodeOrTypeParameterDeclaration,
   isTypeOfExpression,
-  isTypeOnlyExportDeclaration,
-  isTypeOnlyImportDeclaration,
   isTypeOnlyImportOrExportDeclaration,
   isTypeOperatorNode,
   isTypeParameterDeclaration,

package/lib/tsserverlibrary.d.ts

@@ -5717,8 +5717,8 @@ declare namespace ts {
         readonly name: Identifier;
     }
     type ImportOrExportSpecifier = ImportSpecifier | ExportSpecifier;
-    type TypeOnlyCompatibleAliasDeclaration = ImportClause | ImportEqualsDeclaration | NamespaceImport | ImportOrExportSpecifier | ExportDeclaration | NamespaceExport;
-    type TypeOnlyImportDeclaration = ImportClause & {
+    type TypeOnlyCompatibleAliasDeclaration = ImportClause | ImportEqualsDeclaration | NamespaceImport | ImportOrExportSpecifier;
+    type TypeOnlyAliasDeclaration = ImportClause & {
         readonly isTypeOnly: true;
         readonly name: Identifier;
     } | ImportEqualsDeclaration & {
@@ -5735,8 +5735,7 @@ declare namespace ts {
                 readonly isTypeOnly: true;
             };
         };
-    });
-    type TypeOnlyExportDeclaration = ExportSpecifier & ({
+    }) | ExportSpecifier & ({
         readonly isTypeOnly: true;
     } | {
         readonly parent: NamedExports & {
@@ -5744,14 +5743,7 @@ declare namespace ts {
                 readonly isTypeOnly: true;
             };
         };
-    }) | ExportDeclaration & {
-        readonly isTypeOnly: true;
-    } | NamespaceExport & {
-        readonly parent: ExportDeclaration & {
-            readonly isTypeOnly: true;
-        };
-    };
-    type TypeOnlyAliasDeclaration = TypeOnlyImportDeclaration | TypeOnlyExportDeclaration;
+    });
     /**
      * This is either an `export =` or an `export default` declaration.
      * Unless `isExportEquals` is set, this node was parsed as an `export default`.
@@ -8749,8 +8741,6 @@ declare namespace ts {
     function isTemplateLiteralToken(node: Node): node is TemplateLiteralToken;
     function isTemplateMiddleOrTemplateTail(node: Node): node is TemplateMiddle | TemplateTail;
     function isImportOrExportSpecifier(node: Node): node is ImportSpecifier | ExportSpecifier;
-    function isTypeOnlyImportDeclaration(node: Node): node is TypeOnlyImportDeclaration;
-    function isTypeOnlyExportDeclaration(node: Node): node is TypeOnlyExportDeclaration;
     function isTypeOnlyImportOrExportDeclaration(node: Node): node is TypeOnlyAliasDeclaration;
     function isAssertionKey(node: Node): node is AssertionKey;
     function isStringTextContainingNode(node: Node): node is StringLiteral | TemplateLiteralToken;

package/lib/tsserverlibrary.js

@@ -7318,6 +7318,7 @@ ${lanes.join("\n")}
         An_import_alias_cannot_reference_a_declaration_that_was_imported_using_import_type: diag(1380, 1 /* Error */, "An_import_alias_cannot_reference_a_declaration_that_was_imported_using_import_type_1380", "An import alias cannot reference a declaration that was imported using 'import type'."),
         Unexpected_token_Did_you_mean_or_rbrace: diag(1381, 1 /* Error */, "Unexpected_token_Did_you_mean_or_rbrace_1381", "Unexpected token. Did you mean `{'}'}` or `}`?"),
         Unexpected_token_Did_you_mean_or_gt: diag(1382, 1 /* Error */, "Unexpected_token_Did_you_mean_or_gt_1382", "Unexpected token. Did you mean `{'>'}` or `>`?"),
+        Only_named_exports_may_use_export_type: diag(1383, 1 /* Error */, "Only_named_exports_may_use_export_type_1383", "Only named exports may use 'export type'."),
         Function_type_notation_must_be_parenthesized_when_used_in_a_union_type: diag(1385, 1 /* Error */, "Function_type_notation_must_be_parenthesized_when_used_in_a_union_type_1385", "Function type notation must be parenthesized when used in a union type."),
         Constructor_type_notation_must_be_parenthesized_when_used_in_a_union_type: diag(1386, 1 /* Error */, "Constructor_type_notation_must_be_parenthesized_when_used_in_a_union_type_1386", "Constructor type notation must be parenthesized when used in a union type."),
         Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type: diag(1387, 1 /* Error */, "Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type_1387", "Function type notation must be parenthesized when used in an intersection type."),
@@ -11980,31 +11981,19 @@ ${lanes.join("\n")}
   function isImportOrExportSpecifier(node) {
     return isImportSpecifier(node) || isExportSpecifier(node);
   }
-  function isTypeOnlyImportDeclaration(node) {
+  function isTypeOnlyImportOrExportDeclaration(node) {
     switch (node.kind) {
       case 273 /* ImportSpecifier */:
+      case 278 /* ExportSpecifier */:
         return node.isTypeOnly || node.parent.parent.isTypeOnly;
       case 271 /* NamespaceImport */:
         return node.parent.isTypeOnly;
       case 270 /* ImportClause */:
       case 268 /* ImportEqualsDeclaration */:
         return node.isTypeOnly;
+      default:
+        return false;
     }
-    return false;
-  }
-  function isTypeOnlyExportDeclaration(node) {
-    switch (node.kind) {
-      case 278 /* ExportSpecifier */:
-        return node.isTypeOnly || node.parent.parent.isTypeOnly;
-      case 275 /* ExportDeclaration */:
-        return node.isTypeOnly && !!node.moduleSpecifier && !node.exportClause;
-      case 277 /* NamespaceExport */:
-        return node.parent.isTypeOnly;
-    }
-    return false;
-  }
-  function isTypeOnlyImportOrExportDeclaration(node) {
-    return isTypeOnlyImportDeclaration(node) || isTypeOnlyExportDeclaration(node);
   }
   function isAssertionKey(node) {
     return isStringLiteral(node) || isIdentifier(node);
@@ -45789,7 +45778,7 @@ ${lanes.join("\n")}
           if (result && errorLocation && meaning & 111551 /* Value */ && result.flags & 2097152 /* Alias */ && !(result.flags & 111551 /* Value */) && !isValidTypeOnlyAliasUseSite(errorLocation)) {
             const typeOnlyDeclaration = getTypeOnlyAliasDeclaration(result, 111551 /* Value */);
             if (typeOnlyDeclaration) {
-              const message = typeOnlyDeclaration.kind === 278 /* ExportSpecifier */ || typeOnlyDeclaration.kind === 275 /* ExportDeclaration */ || typeOnlyDeclaration.kind === 277 /* NamespaceExport */ ? Diagnostics._0_cannot_be_used_as_a_value_because_it_was_exported_using_export_type : Diagnostics._0_cannot_be_used_as_a_value_because_it_was_imported_using_import_type;
+              const message = typeOnlyDeclaration.kind === 278 /* ExportSpecifier */ ? Diagnostics._0_cannot_be_used_as_a_value_because_it_was_exported_using_export_type : Diagnostics._0_cannot_be_used_as_a_value_because_it_was_imported_using_import_type;
               const unescapedName = unescapeLeadingUnderscores(name);
               addTypeOnlyDeclarationRelatedInfo(
                 error(errorLocation, message, unescapedName),
@@ -45809,7 +45798,7 @@ ${lanes.join("\n")}
         diagnostic,
         createDiagnosticForNode(
           typeOnlyDeclaration,
-          typeOnlyDeclaration.kind === 278 /* ExportSpecifier */ || typeOnlyDeclaration.kind === 275 /* ExportDeclaration */ || typeOnlyDeclaration.kind === 277 /* NamespaceExport */ ? Diagnostics._0_was_exported_here : Diagnostics._0_was_imported_here,
+          typeOnlyDeclaration.kind === 278 /* ExportSpecifier */ ? Diagnostics._0_was_exported_here : Diagnostics._0_was_imported_here,
           unescapedName
         )
       );
@@ -46188,10 +46177,10 @@ ${lanes.join("\n")}
         false
       ) && !node.isTypeOnly) {
         const typeOnlyDeclaration = getTypeOnlyAliasDeclaration(getSymbolOfDeclaration(node));
-        const isExport = typeOnlyDeclaration.kind === 278 /* ExportSpecifier */ || typeOnlyDeclaration.kind === 275 /* ExportDeclaration */;
+        const isExport = typeOnlyDeclaration.kind === 278 /* ExportSpecifier */;
         const message = isExport ? Diagnostics.An_import_alias_cannot_reference_a_declaration_that_was_exported_using_export_type : Diagnostics.An_import_alias_cannot_reference_a_declaration_that_was_imported_using_import_type;
         const relatedMessage = isExport ? Diagnostics._0_was_exported_here : Diagnostics._0_was_imported_here;
-        const name = typeOnlyDeclaration.kind === 275 /* ExportDeclaration */ ? "*" : unescapeLeadingUnderscores(typeOnlyDeclaration.name.escapedText);
+        const name = unescapeLeadingUnderscores(typeOnlyDeclaration.name.escapedText);
         addRelatedInfo(error(node.moduleReference, message), createDiagnosticForNode(typeOnlyDeclaration, relatedMessage, name));
       }
     }
@@ -46422,19 +46411,15 @@ ${lanes.join("\n")}
       return result;
     }
     function getExportOfModule(symbol, name, specifier, dontResolveAlias) {
-      var _a2;
       if (symbol.flags & 1536 /* Module */) {
         const exportSymbol = getExportsOfSymbol(symbol).get(name.escapedText);
         const resolved = resolveSymbol(exportSymbol, dontResolveAlias);
-        const exportStarDeclaration = (_a2 = getSymbolLinks(symbol).typeOnlyExportStarMap) == null ? void 0 : _a2.get(name.escapedText);
         markSymbolOfAliasDeclarationIfTypeOnly(
           specifier,
           exportSymbol,
           resolved,
           /*overwriteEmpty*/
-          false,
-          exportStarDeclaration,
-          name.escapedText
+          false
         );
         return resolved;
       }
@@ -46761,7 +46746,7 @@ ${lanes.join("\n")}
       }
       return flags;
     }
-    function markSymbolOfAliasDeclarationIfTypeOnly(aliasDeclaration, immediateTarget, finalTarget, overwriteEmpty, exportStarDeclaration, exportStarName) {
+    function markSymbolOfAliasDeclarationIfTypeOnly(aliasDeclaration, immediateTarget, finalTarget, overwriteEmpty) {
       if (!aliasDeclaration || isPropertyAccessExpression(aliasDeclaration))
         return false;
       const sourceSymbol = getSymbolOfDeclaration(aliasDeclaration);
@@ -46770,14 +46755,6 @@ ${lanes.join("\n")}
         links2.typeOnlyDeclaration = aliasDeclaration;
         return true;
       }
-      if (exportStarDeclaration) {
-        const links2 = getSymbolLinks(sourceSymbol);
-        links2.typeOnlyDeclaration = exportStarDeclaration;
-        if (sourceSymbol.escapedName !== exportStarName) {
-          links2.typeOnlyExportStarName = exportStarName;
-        }
-        return true;
-      }
       const links = getSymbolLinks(sourceSymbol);
       return markSymbolOfAliasDeclarationIfTypeOnlyWorker(links, immediateTarget, overwriteEmpty) || markSymbolOfAliasDeclarationIfTypeOnlyWorker(links, finalTarget, overwriteEmpty);
     }
@@ -46799,8 +46776,7 @@ ${lanes.join("\n")}
         return links.typeOnlyDeclaration || void 0;
       }
       if (links.typeOnlyDeclaration) {
-        const resolved = links.typeOnlyDeclaration.kind === 275 /* ExportDeclaration */ ? resolveSymbol(getExportsOfModule(links.typeOnlyDeclaration.symbol.parent).get(links.typeOnlyExportStarName || symbol.escapedName)) : resolveAlias(links.typeOnlyDeclaration.symbol);
-        return getAllSymbolFlags(resolved) & include ? links.typeOnlyDeclaration : void 0;
+        return getAllSymbolFlags(resolveAlias(links.typeOnlyDeclaration.symbol)) & include ? links.typeOnlyDeclaration : void 0;
       }
       return void 0;
     }
@@ -47454,12 +47430,7 @@ ${lanes.join("\n")}
     }
     function getExportsOfModule(moduleSymbol) {
       const links = getSymbolLinks(moduleSymbol);
-      if (!links.resolvedExports) {
-        const { exports, typeOnlyExportStarMap } = getExportsOfModuleWorker(moduleSymbol);
-        links.resolvedExports = exports;
-        links.typeOnlyExportStarMap = typeOnlyExportStarMap;
-      }
-      return links.resolvedExports;
+      return links.resolvedExports || (links.resolvedExports = getExportsOfModuleWorker(moduleSymbol));
     }
     function extendExportSymbols(target, source, lookupTable, exportNode) {
       if (!source)
@@ -47487,21 +47458,9 @@ ${lanes.join("\n")}
     }
     function getExportsOfModuleWorker(moduleSymbol) {
       const visitedSymbols = [];
-      let typeOnlyExportStarMap;
-      const nonTypeOnlyNames = /* @__PURE__ */ new Set();
       moduleSymbol = resolveExternalModuleSymbol(moduleSymbol);
-      const exports = visit(moduleSymbol) || emptySymbols;
-      if (typeOnlyExportStarMap) {
-        nonTypeOnlyNames.forEach((name) => typeOnlyExportStarMap.delete(name));
-      }
-      return {
-        exports,
-        typeOnlyExportStarMap
-      };
-      function visit(symbol, exportStar, isTypeOnly) {
-        if (!isTypeOnly && (symbol == null ? void 0 : symbol.exports)) {
-          symbol.exports.forEach((_, name) => nonTypeOnlyNames.add(name));
-        }
+      return visit(moduleSymbol) || emptySymbols;
+      function visit(symbol) {
         if (!(symbol && symbol.exports && pushIfUnique(visitedSymbols, symbol))) {
           return;
         }
@@ -47513,7 +47472,7 @@ ${lanes.join("\n")}
           if (exportStars.declarations) {
             for (const node of exportStars.declarations) {
               const resolvedModule = resolveExternalModuleName(node, node.moduleSpecifier);
-              const exportedSymbols = visit(resolvedModule, node, isTypeOnly || node.isTypeOnly);
+              const exportedSymbols = visit(resolvedModule);
               extendExportSymbols(
                 nestedSymbols,
                 exportedSymbols,
@@ -47537,13 +47496,6 @@ ${lanes.join("\n")}
           });
           extendExportSymbols(symbols, nestedSymbols);
         }
-        if (exportStar == null ? void 0 : exportStar.isTypeOnly) {
-          typeOnlyExportStarMap != null ? typeOnlyExportStarMap : typeOnlyExportStarMap = /* @__PURE__ */ new Map();
-          symbols.forEach((_, escapedName) => typeOnlyExportStarMap.set(
-            escapedName,
-            exportStar
-          ));
-        }
         return symbols;
       }
     }
@@ -53772,7 +53724,7 @@ ${lanes.join("\n")}
       const links = getSymbolLinks(symbol);
       if (!links[resolutionKind]) {
         const isStatic2 = resolutionKind === "resolvedExports" /* resolvedExports */;
-        const earlySymbols = !isStatic2 ? symbol.members : symbol.flags & 1536 /* Module */ ? getExportsOfModuleWorker(symbol).exports : symbol.exports;
+        const earlySymbols = !isStatic2 ? symbol.members : symbol.flags & 1536 /* Module */ ? getExportsOfModuleWorker(symbol) : symbol.exports;
         links[resolutionKind] = earlySymbols || emptySymbols;
         const lateSymbols = createSymbolTable();
         for (const decl of symbol.declarations || emptyArray) {
@@ -54761,7 +54713,7 @@ ${lanes.join("\n")}
     }
     function isConstTypeVariable(type) {
       var _a2;
-      return !!(type.flags & 262144 /* TypeParameter */ && some((_a2 = type.symbol) == null ? void 0 : _a2.declarations, (d) => hasSyntacticModifier(d, 2048 /* Const */)) || type.flags & 8388608 /* IndexedAccess */ && isConstTypeVariable(type.objectType));
+      return !!(type.flags & 262144 /* TypeParameter */ && some((_a2 = type.symbol) == null ? void 0 : _a2.declarations, (d) => hasSyntacticModifier(d, 2048 /* Const */)) || isGenericTupleType(type) && findIndex(getTypeArguments(type), (t, i) => !!(type.target.elementFlags[i] & 8 /* Variadic */) && isConstTypeVariable(t)) >= 0 || type.flags & 8388608 /* IndexedAccess */ && isConstTypeVariable(type.objectType));
     }
     function getConstraintOfIndexedAccess(type) {
       return hasNonCircularBaseConstraint(type) ? getConstraintFromIndexedAccess(type) : void 0;
@@ -66677,6 +66629,7 @@ ${lanes.join("\n")}
       }
     }
     function getNarrowedTypeOfSymbol(symbol, location) {
+      var _a2;
       const type = getTypeOfSymbol(symbol);
       const declaration = symbol.valueDeclaration;
       if (declaration) {
@@ -66712,7 +66665,7 @@ ${lanes.join("\n")}
           if (func.parameters.length >= 2 && isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
             const contextualSignature = getContextualSignature(func);
             if (contextualSignature && contextualSignature.parameters.length === 1 && signatureHasRestParameter(contextualSignature)) {
-              const restType = getReducedApparentType(getTypeOfSymbol(contextualSignature.parameters[0]));
+              const restType = getReducedApparentType(instantiateType(getTypeOfSymbol(contextualSignature.parameters[0]), (_a2 = getInferenceContext(func)) == null ? void 0 : _a2.nonFixingMapper));
               if (restType.flags & 1048576 /* Union */ && everyType(restType, isTupleType) && !isSymbolAssigned(symbol)) {
                 const narrowedType = getFlowTypeOfReference(
                   func,
@@ -67933,7 +67886,9 @@ ${lanes.join("\n")}
       }
       const index = findContextualNode(node);
       if (index >= 0) {
-        return contextualTypes[index];
+        const cached = contextualTypes[index];
+        if (cached || !contextFlags)
+          return cached;
       }
       const { parent: parent2 } = node;
       switch (parent2.kind) {
@@ -79522,8 +79477,12 @@ ${lanes.join("\n")}
     }
     function checkGrammarExportDeclaration(node) {
       var _a2;
-      if (node.isTypeOnly && ((_a2 = node.exportClause) == null ? void 0 : _a2.kind) === 276 /* NamedExports */) {
-        return checkGrammarNamedImportsOrExports(node.exportClause);
+      if (node.isTypeOnly) {
+        if (((_a2 = node.exportClause) == null ? void 0 : _a2.kind) === 276 /* NamedExports */) {
+          return checkGrammarNamedImportsOrExports(node.exportClause);
+        } else {
+          return grammarErrorOnNode(node, Diagnostics.Only_named_exports_may_use_export_type);
+        }
       }
       return false;
     }
@@ -145034,7 +144993,7 @@ ${lanes.join("\n")}
           symbolToSortTextMap[getSymbolId(symbol)] = SortText.GlobalsOrKeywords;
         }
         if (typeOnlyAliasNeedsPromotion && !(symbol.flags & 111551 /* Value */)) {
-          const typeOnlyAliasDeclaration = symbol.declarations && find(symbol.declarations, isTypeOnlyImportDeclaration);
+          const typeOnlyAliasDeclaration = symbol.declarations && find(symbol.declarations, isTypeOnlyImportOrExportDeclaration);
           if (typeOnlyAliasDeclaration) {
             const origin = { kind: 64 /* TypeOnlyAlias */, declaration: typeOnlyAliasDeclaration };
             symbolToOriginInfoMap[i] = origin;
@@ -146079,14 +146038,14 @@ ${lanes.join("\n")}
       case 27 /* CommaToken */:
         return tryCast(contextToken.parent, isObjectTypeDeclaration);
       default:
-        if (!isFromObjectTypeDeclaration(contextToken)) {
-          if (getLineAndCharacterOfPosition(sourceFile, contextToken.getEnd()).line !== getLineAndCharacterOfPosition(sourceFile, position).line && isObjectTypeDeclaration(location)) {
+        if (isObjectTypeDeclaration(location)) {
+          if (getLineAndCharacterOfPosition(sourceFile, contextToken.getEnd()).line !== getLineAndCharacterOfPosition(sourceFile, position).line) {
             return location;
           }
-          return void 0;
+          const isValidKeyword = isClassLike(contextToken.parent.parent) ? isClassMemberCompletionKeyword : isInterfaceOrTypeLiteralCompletionKeyword;
+          return isValidKeyword(contextToken.kind) || contextToken.kind === 41 /* AsteriskToken */ || isIdentifier(contextToken) && isValidKeyword((_a2 = identifierToKeywordKind(contextToken)) != null ? _a2 : 0 /* Unknown */) ? contextToken.parent.parent : void 0;
         }
-        const isValidKeyword = isClassLike(contextToken.parent.parent) ? isClassMemberCompletionKeyword : isInterfaceOrTypeLiteralCompletionKeyword;
-        return isValidKeyword(contextToken.kind) || contextToken.kind === 41 /* AsteriskToken */ || isIdentifier(contextToken) && isValidKeyword((_a2 = identifierToKeywordKind(contextToken)) != null ? _a2 : 0 /* Unknown */) ? contextToken.parent.parent : void 0;
+        return void 0;
     }
   }
   function tryGetTypeLiteralNode(node) {
@@ -176973,8 +176932,6 @@ ${e.message}`;
     isTypeNodeKind: () => isTypeNodeKind,
     isTypeNodeOrTypeParameterDeclaration: () => isTypeNodeOrTypeParameterDeclaration,
     isTypeOfExpression: () => isTypeOfExpression,
-    isTypeOnlyExportDeclaration: () => isTypeOnlyExportDeclaration,
-    isTypeOnlyImportDeclaration: () => isTypeOnlyImportDeclaration,
     isTypeOnlyImportOrExportDeclaration: () => isTypeOnlyImportOrExportDeclaration,
     isTypeOperatorNode: () => isTypeOperatorNode,
     isTypeParameterDeclaration: () => isTypeParameterDeclaration,
@@ -179625,8 +179582,6 @@ ${e.message}`;
     isTypeNodeKind: () => isTypeNodeKind,
     isTypeNodeOrTypeParameterDeclaration: () => isTypeNodeOrTypeParameterDeclaration,
     isTypeOfExpression: () => isTypeOfExpression,
-    isTypeOnlyExportDeclaration: () => isTypeOnlyExportDeclaration,
-    isTypeOnlyImportDeclaration: () => isTypeOnlyImportDeclaration,
     isTypeOnlyImportOrExportDeclaration: () => isTypeOnlyImportOrExportDeclaration,
     isTypeOperatorNode: () => isTypeOperatorNode,
     isTypeParameterDeclaration: () => isTypeParameterDeclaration,

package/lib/typescript.d.ts

@@ -1782,8 +1782,8 @@ declare namespace ts {
         readonly name: Identifier;
     }
     type ImportOrExportSpecifier = ImportSpecifier | ExportSpecifier;
-    type TypeOnlyCompatibleAliasDeclaration = ImportClause | ImportEqualsDeclaration | NamespaceImport | ImportOrExportSpecifier | ExportDeclaration | NamespaceExport;
-    type TypeOnlyImportDeclaration = ImportClause & {
+    type TypeOnlyCompatibleAliasDeclaration = ImportClause | ImportEqualsDeclaration | NamespaceImport | ImportOrExportSpecifier;
+    type TypeOnlyAliasDeclaration = ImportClause & {
         readonly isTypeOnly: true;
         readonly name: Identifier;
     } | ImportEqualsDeclaration & {
@@ -1800,8 +1800,7 @@ declare namespace ts {
                 readonly isTypeOnly: true;
             };
         };
-    });
-    type TypeOnlyExportDeclaration = ExportSpecifier & ({
+    }) | ExportSpecifier & ({
         readonly isTypeOnly: true;
     } | {
         readonly parent: NamedExports & {
@@ -1809,14 +1808,7 @@ declare namespace ts {
                 readonly isTypeOnly: true;
             };
         };
-    }) | ExportDeclaration & {
-        readonly isTypeOnly: true;
-    } | NamespaceExport & {
-        readonly parent: ExportDeclaration & {
-            readonly isTypeOnly: true;
-        };
-    };
-    type TypeOnlyAliasDeclaration = TypeOnlyImportDeclaration | TypeOnlyExportDeclaration;
+    });
     /**
      * This is either an `export =` or an `export default` declaration.
      * Unless `isExportEquals` is set, this node was parsed as an `export default`.
@@ -4814,8 +4806,6 @@ declare namespace ts {
     function isTemplateLiteralToken(node: Node): node is TemplateLiteralToken;
     function isTemplateMiddleOrTemplateTail(node: Node): node is TemplateMiddle | TemplateTail;
     function isImportOrExportSpecifier(node: Node): node is ImportSpecifier | ExportSpecifier;
-    function isTypeOnlyImportDeclaration(node: Node): node is TypeOnlyImportDeclaration;
-    function isTypeOnlyExportDeclaration(node: Node): node is TypeOnlyExportDeclaration;
     function isTypeOnlyImportOrExportDeclaration(node: Node): node is TypeOnlyAliasDeclaration;
     function isAssertionKey(node: Node): node is AssertionKey;
     function isStringTextContainingNode(node: Node): node is StringLiteral | TemplateLiteralToken;

package/lib/typescript.js

@@ -7318,6 +7318,7 @@ ${lanes.join("\n")}
         An_import_alias_cannot_reference_a_declaration_that_was_imported_using_import_type: diag(1380, 1 /* Error */, "An_import_alias_cannot_reference_a_declaration_that_was_imported_using_import_type_1380", "An import alias cannot reference a declaration that was imported using 'import type'."),
         Unexpected_token_Did_you_mean_or_rbrace: diag(1381, 1 /* Error */, "Unexpected_token_Did_you_mean_or_rbrace_1381", "Unexpected token. Did you mean `{'}'}` or `}`?"),
         Unexpected_token_Did_you_mean_or_gt: diag(1382, 1 /* Error */, "Unexpected_token_Did_you_mean_or_gt_1382", "Unexpected token. Did you mean `{'>'}` or `>`?"),
+        Only_named_exports_may_use_export_type: diag(1383, 1 /* Error */, "Only_named_exports_may_use_export_type_1383", "Only named exports may use 'export type'."),
         Function_type_notation_must_be_parenthesized_when_used_in_a_union_type: diag(1385, 1 /* Error */, "Function_type_notation_must_be_parenthesized_when_used_in_a_union_type_1385", "Function type notation must be parenthesized when used in a union type."),
         Constructor_type_notation_must_be_parenthesized_when_used_in_a_union_type: diag(1386, 1 /* Error */, "Constructor_type_notation_must_be_parenthesized_when_used_in_a_union_type_1386", "Constructor type notation must be parenthesized when used in a union type."),
         Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type: diag(1387, 1 /* Error */, "Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type_1387", "Function type notation must be parenthesized when used in an intersection type."),
@@ -11980,31 +11981,19 @@ ${lanes.join("\n")}
   function isImportOrExportSpecifier(node) {
     return isImportSpecifier(node) || isExportSpecifier(node);
   }
-  function isTypeOnlyImportDeclaration(node) {
+  function isTypeOnlyImportOrExportDeclaration(node) {
     switch (node.kind) {
       case 273 /* ImportSpecifier */:
+      case 278 /* ExportSpecifier */:
         return node.isTypeOnly || node.parent.parent.isTypeOnly;
       case 271 /* NamespaceImport */:
         return node.parent.isTypeOnly;
       case 270 /* ImportClause */:
       case 268 /* ImportEqualsDeclaration */:
         return node.isTypeOnly;
+      default:
+        return false;
     }
-    return false;
-  }
-  function isTypeOnlyExportDeclaration(node) {
-    switch (node.kind) {
-      case 278 /* ExportSpecifier */:
-        return node.isTypeOnly || node.parent.parent.isTypeOnly;
-      case 275 /* ExportDeclaration */:
-        return node.isTypeOnly && !!node.moduleSpecifier && !node.exportClause;
-      case 277 /* NamespaceExport */:
-        return node.parent.isTypeOnly;
-    }
-    return false;
-  }
-  function isTypeOnlyImportOrExportDeclaration(node) {
-    return isTypeOnlyImportDeclaration(node) || isTypeOnlyExportDeclaration(node);
   }
   function isAssertionKey(node) {
     return isStringLiteral(node) || isIdentifier(node);
@@ -45789,7 +45778,7 @@ ${lanes.join("\n")}
           if (result && errorLocation && meaning & 111551 /* Value */ && result.flags & 2097152 /* Alias */ && !(result.flags & 111551 /* Value */) && !isValidTypeOnlyAliasUseSite(errorLocation)) {
             const typeOnlyDeclaration = getTypeOnlyAliasDeclaration(result, 111551 /* Value */);
             if (typeOnlyDeclaration) {
-              const message = typeOnlyDeclaration.kind === 278 /* ExportSpecifier */ || typeOnlyDeclaration.kind === 275 /* ExportDeclaration */ || typeOnlyDeclaration.kind === 277 /* NamespaceExport */ ? Diagnostics._0_cannot_be_used_as_a_value_because_it_was_exported_using_export_type : Diagnostics._0_cannot_be_used_as_a_value_because_it_was_imported_using_import_type;
+              const message = typeOnlyDeclaration.kind === 278 /* ExportSpecifier */ ? Diagnostics._0_cannot_be_used_as_a_value_because_it_was_exported_using_export_type : Diagnostics._0_cannot_be_used_as_a_value_because_it_was_imported_using_import_type;
               const unescapedName = unescapeLeadingUnderscores(name);
               addTypeOnlyDeclarationRelatedInfo(
                 error(errorLocation, message, unescapedName),
@@ -45809,7 +45798,7 @@ ${lanes.join("\n")}
         diagnostic,
         createDiagnosticForNode(
           typeOnlyDeclaration,
-          typeOnlyDeclaration.kind === 278 /* ExportSpecifier */ || typeOnlyDeclaration.kind === 275 /* ExportDeclaration */ || typeOnlyDeclaration.kind === 277 /* NamespaceExport */ ? Diagnostics._0_was_exported_here : Diagnostics._0_was_imported_here,
+          typeOnlyDeclaration.kind === 278 /* ExportSpecifier */ ? Diagnostics._0_was_exported_here : Diagnostics._0_was_imported_here,
           unescapedName
         )
       );
@@ -46188,10 +46177,10 @@ ${lanes.join("\n")}
         false
       ) && !node.isTypeOnly) {
         const typeOnlyDeclaration = getTypeOnlyAliasDeclaration(getSymbolOfDeclaration(node));
-        const isExport = typeOnlyDeclaration.kind === 278 /* ExportSpecifier */ || typeOnlyDeclaration.kind === 275 /* ExportDeclaration */;
+        const isExport = typeOnlyDeclaration.kind === 278 /* ExportSpecifier */;
         const message = isExport ? Diagnostics.An_import_alias_cannot_reference_a_declaration_that_was_exported_using_export_type : Diagnostics.An_import_alias_cannot_reference_a_declaration_that_was_imported_using_import_type;
         const relatedMessage = isExport ? Diagnostics._0_was_exported_here : Diagnostics._0_was_imported_here;
-        const name = typeOnlyDeclaration.kind === 275 /* ExportDeclaration */ ? "*" : unescapeLeadingUnderscores(typeOnlyDeclaration.name.escapedText);
+        const name = unescapeLeadingUnderscores(typeOnlyDeclaration.name.escapedText);
         addRelatedInfo(error(node.moduleReference, message), createDiagnosticForNode(typeOnlyDeclaration, relatedMessage, name));
       }
     }
@@ -46422,19 +46411,15 @@ ${lanes.join("\n")}
       return result;
     }
     function getExportOfModule(symbol, name, specifier, dontResolveAlias) {
-      var _a2;
       if (symbol.flags & 1536 /* Module */) {
         const exportSymbol = getExportsOfSymbol(symbol).get(name.escapedText);
         const resolved = resolveSymbol(exportSymbol, dontResolveAlias);
-        const exportStarDeclaration = (_a2 = getSymbolLinks(symbol).typeOnlyExportStarMap) == null ? void 0 : _a2.get(name.escapedText);
         markSymbolOfAliasDeclarationIfTypeOnly(
           specifier,
           exportSymbol,
           resolved,
           /*overwriteEmpty*/
-          false,
-          exportStarDeclaration,
-          name.escapedText
+          false
         );
         return resolved;
       }
@@ -46761,7 +46746,7 @@ ${lanes.join("\n")}
       }
       return flags;
     }
-    function markSymbolOfAliasDeclarationIfTypeOnly(aliasDeclaration, immediateTarget, finalTarget, overwriteEmpty, exportStarDeclaration, exportStarName) {
+    function markSymbolOfAliasDeclarationIfTypeOnly(aliasDeclaration, immediateTarget, finalTarget, overwriteEmpty) {
       if (!aliasDeclaration || isPropertyAccessExpression(aliasDeclaration))
         return false;
       const sourceSymbol = getSymbolOfDeclaration(aliasDeclaration);
@@ -46770,14 +46755,6 @@ ${lanes.join("\n")}
         links2.typeOnlyDeclaration = aliasDeclaration;
         return true;
       }
-      if (exportStarDeclaration) {
-        const links2 = getSymbolLinks(sourceSymbol);
-        links2.typeOnlyDeclaration = exportStarDeclaration;
-        if (sourceSymbol.escapedName !== exportStarName) {
-          links2.typeOnlyExportStarName = exportStarName;
-        }
-        return true;
-      }
       const links = getSymbolLinks(sourceSymbol);
       return markSymbolOfAliasDeclarationIfTypeOnlyWorker(links, immediateTarget, overwriteEmpty) || markSymbolOfAliasDeclarationIfTypeOnlyWorker(links, finalTarget, overwriteEmpty);
     }
@@ -46799,8 +46776,7 @@ ${lanes.join("\n")}
         return links.typeOnlyDeclaration || void 0;
       }
       if (links.typeOnlyDeclaration) {
-        const resolved = links.typeOnlyDeclaration.kind === 275 /* ExportDeclaration */ ? resolveSymbol(getExportsOfModule(links.typeOnlyDeclaration.symbol.parent).get(links.typeOnlyExportStarName || symbol.escapedName)) : resolveAlias(links.typeOnlyDeclaration.symbol);
-        return getAllSymbolFlags(resolved) & include ? links.typeOnlyDeclaration : void 0;
+        return getAllSymbolFlags(resolveAlias(links.typeOnlyDeclaration.symbol)) & include ? links.typeOnlyDeclaration : void 0;
       }
       return void 0;
     }
@@ -47454,12 +47430,7 @@ ${lanes.join("\n")}
     }
     function getExportsOfModule(moduleSymbol) {
       const links = getSymbolLinks(moduleSymbol);
-      if (!links.resolvedExports) {
-        const { exports, typeOnlyExportStarMap } = getExportsOfModuleWorker(moduleSymbol);
-        links.resolvedExports = exports;
-        links.typeOnlyExportStarMap = typeOnlyExportStarMap;
-      }
-      return links.resolvedExports;
+      return links.resolvedExports || (links.resolvedExports = getExportsOfModuleWorker(moduleSymbol));
     }
     function extendExportSymbols(target, source, lookupTable, exportNode) {
       if (!source)
@@ -47487,21 +47458,9 @@ ${lanes.join("\n")}
     }
     function getExportsOfModuleWorker(moduleSymbol) {
       const visitedSymbols = [];
-      let typeOnlyExportStarMap;
-      const nonTypeOnlyNames = /* @__PURE__ */ new Set();
       moduleSymbol = resolveExternalModuleSymbol(moduleSymbol);
-      const exports = visit(moduleSymbol) || emptySymbols;
-      if (typeOnlyExportStarMap) {
-        nonTypeOnlyNames.forEach((name) => typeOnlyExportStarMap.delete(name));
-      }
-      return {
-        exports,
-        typeOnlyExportStarMap
-      };
-      function visit(symbol, exportStar, isTypeOnly) {
-        if (!isTypeOnly && (symbol == null ? void 0 : symbol.exports)) {
-          symbol.exports.forEach((_, name) => nonTypeOnlyNames.add(name));
-        }
+      return visit(moduleSymbol) || emptySymbols;
+      function visit(symbol) {
         if (!(symbol && symbol.exports && pushIfUnique(visitedSymbols, symbol))) {
           return;
         }
@@ -47513,7 +47472,7 @@ ${lanes.join("\n")}
           if (exportStars.declarations) {
             for (const node of exportStars.declarations) {
               const resolvedModule = resolveExternalModuleName(node, node.moduleSpecifier);
-              const exportedSymbols = visit(resolvedModule, node, isTypeOnly || node.isTypeOnly);
+              const exportedSymbols = visit(resolvedModule);
               extendExportSymbols(
                 nestedSymbols,
                 exportedSymbols,
@@ -47537,13 +47496,6 @@ ${lanes.join("\n")}
           });
           extendExportSymbols(symbols, nestedSymbols);
         }
-        if (exportStar == null ? void 0 : exportStar.isTypeOnly) {
-          typeOnlyExportStarMap != null ? typeOnlyExportStarMap : typeOnlyExportStarMap = /* @__PURE__ */ new Map();
-          symbols.forEach((_, escapedName) => typeOnlyExportStarMap.set(
-            escapedName,
-            exportStar
-          ));
-        }
         return symbols;
       }
     }
@@ -53772,7 +53724,7 @@ ${lanes.join("\n")}
       const links = getSymbolLinks(symbol);
       if (!links[resolutionKind]) {
         const isStatic2 = resolutionKind === "resolvedExports" /* resolvedExports */;
-        const earlySymbols = !isStatic2 ? symbol.members : symbol.flags & 1536 /* Module */ ? getExportsOfModuleWorker(symbol).exports : symbol.exports;
+        const earlySymbols = !isStatic2 ? symbol.members : symbol.flags & 1536 /* Module */ ? getExportsOfModuleWorker(symbol) : symbol.exports;
         links[resolutionKind] = earlySymbols || emptySymbols;
         const lateSymbols = createSymbolTable();
         for (const decl of symbol.declarations || emptyArray) {
@@ -54761,7 +54713,7 @@ ${lanes.join("\n")}
     }
     function isConstTypeVariable(type) {
       var _a2;
-      return !!(type.flags & 262144 /* TypeParameter */ && some((_a2 = type.symbol) == null ? void 0 : _a2.declarations, (d) => hasSyntacticModifier(d, 2048 /* Const */)) || type.flags & 8388608 /* IndexedAccess */ && isConstTypeVariable(type.objectType));
+      return !!(type.flags & 262144 /* TypeParameter */ && some((_a2 = type.symbol) == null ? void 0 : _a2.declarations, (d) => hasSyntacticModifier(d, 2048 /* Const */)) || isGenericTupleType(type) && findIndex(getTypeArguments(type), (t, i) => !!(type.target.elementFlags[i] & 8 /* Variadic */) && isConstTypeVariable(t)) >= 0 || type.flags & 8388608 /* IndexedAccess */ && isConstTypeVariable(type.objectType));
     }
     function getConstraintOfIndexedAccess(type) {
       return hasNonCircularBaseConstraint(type) ? getConstraintFromIndexedAccess(type) : void 0;
@@ -66677,6 +66629,7 @@ ${lanes.join("\n")}
       }
     }
     function getNarrowedTypeOfSymbol(symbol, location) {
+      var _a2;
       const type = getTypeOfSymbol(symbol);
       const declaration = symbol.valueDeclaration;
       if (declaration) {
@@ -66712,7 +66665,7 @@ ${lanes.join("\n")}
           if (func.parameters.length >= 2 && isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
             const contextualSignature = getContextualSignature(func);
             if (contextualSignature && contextualSignature.parameters.length === 1 && signatureHasRestParameter(contextualSignature)) {
-              const restType = getReducedApparentType(getTypeOfSymbol(contextualSignature.parameters[0]));
+              const restType = getReducedApparentType(instantiateType(getTypeOfSymbol(contextualSignature.parameters[0]), (_a2 = getInferenceContext(func)) == null ? void 0 : _a2.nonFixingMapper));
               if (restType.flags & 1048576 /* Union */ && everyType(restType, isTupleType) && !isSymbolAssigned(symbol)) {
                 const narrowedType = getFlowTypeOfReference(
                   func,
@@ -67933,7 +67886,9 @@ ${lanes.join("\n")}
       }
       const index = findContextualNode(node);
       if (index >= 0) {
-        return contextualTypes[index];
+        const cached = contextualTypes[index];
+        if (cached || !contextFlags)
+          return cached;
       }
       const { parent: parent2 } = node;
       switch (parent2.kind) {
@@ -79522,8 +79477,12 @@ ${lanes.join("\n")}
     }
     function checkGrammarExportDeclaration(node) {
       var _a2;
-      if (node.isTypeOnly && ((_a2 = node.exportClause) == null ? void 0 : _a2.kind) === 276 /* NamedExports */) {
-        return checkGrammarNamedImportsOrExports(node.exportClause);
+      if (node.isTypeOnly) {
+        if (((_a2 = node.exportClause) == null ? void 0 : _a2.kind) === 276 /* NamedExports */) {
+          return checkGrammarNamedImportsOrExports(node.exportClause);
+        } else {
+          return grammarErrorOnNode(node, Diagnostics.Only_named_exports_may_use_export_type);
+        }
       }
       return false;
     }
@@ -145048,7 +145007,7 @@ ${lanes.join("\n")}
           symbolToSortTextMap[getSymbolId(symbol)] = SortText.GlobalsOrKeywords;
         }
         if (typeOnlyAliasNeedsPromotion && !(symbol.flags & 111551 /* Value */)) {
-          const typeOnlyAliasDeclaration = symbol.declarations && find(symbol.declarations, isTypeOnlyImportDeclaration);
+          const typeOnlyAliasDeclaration = symbol.declarations && find(symbol.declarations, isTypeOnlyImportOrExportDeclaration);
           if (typeOnlyAliasDeclaration) {
             const origin = { kind: 64 /* TypeOnlyAlias */, declaration: typeOnlyAliasDeclaration };
             symbolToOriginInfoMap[i] = origin;
@@ -146093,14 +146052,14 @@ ${lanes.join("\n")}
       case 27 /* CommaToken */:
         return tryCast(contextToken.parent, isObjectTypeDeclaration);
       default:
-        if (!isFromObjectTypeDeclaration(contextToken)) {
-          if (getLineAndCharacterOfPosition(sourceFile, contextToken.getEnd()).line !== getLineAndCharacterOfPosition(sourceFile, position).line && isObjectTypeDeclaration(location)) {
+        if (isObjectTypeDeclaration(location)) {
+          if (getLineAndCharacterOfPosition(sourceFile, contextToken.getEnd()).line !== getLineAndCharacterOfPosition(sourceFile, position).line) {
             return location;
           }
-          return void 0;
+          const isValidKeyword = isClassLike(contextToken.parent.parent) ? isClassMemberCompletionKeyword : isInterfaceOrTypeLiteralCompletionKeyword;
+          return isValidKeyword(contextToken.kind) || contextToken.kind === 41 /* AsteriskToken */ || isIdentifier(contextToken) && isValidKeyword((_a2 = identifierToKeywordKind(contextToken)) != null ? _a2 : 0 /* Unknown */) ? contextToken.parent.parent : void 0;
         }
-        const isValidKeyword = isClassLike(contextToken.parent.parent) ? isClassMemberCompletionKeyword : isInterfaceOrTypeLiteralCompletionKeyword;
-        return isValidKeyword(contextToken.kind) || contextToken.kind === 41 /* AsteriskToken */ || isIdentifier(contextToken) && isValidKeyword((_a2 = identifierToKeywordKind(contextToken)) != null ? _a2 : 0 /* Unknown */) ? contextToken.parent.parent : void 0;
+        return void 0;
     }
   }
   function tryGetTypeLiteralNode(node) {
@@ -166139,8 +166098,6 @@ ${options.prefix}` : "\n" : options.prefix
     isTypeNodeKind: () => isTypeNodeKind,
     isTypeNodeOrTypeParameterDeclaration: () => isTypeNodeOrTypeParameterDeclaration,
     isTypeOfExpression: () => isTypeOfExpression,
-    isTypeOnlyExportDeclaration: () => isTypeOnlyExportDeclaration,
-    isTypeOnlyImportDeclaration: () => isTypeOnlyImportDeclaration,
     isTypeOnlyImportOrExportDeclaration: () => isTypeOnlyImportOrExportDeclaration,
     isTypeOperatorNode: () => isTypeOperatorNode,
     isTypeParameterDeclaration: () => isTypeParameterDeclaration,

package/lib/typingsInstaller.js

@@ -5502,6 +5502,7 @@ var Diagnostics = {
   An_import_alias_cannot_reference_a_declaration_that_was_imported_using_import_type: diag(1380, 1 /* Error */, "An_import_alias_cannot_reference_a_declaration_that_was_imported_using_import_type_1380", "An import alias cannot reference a declaration that was imported using 'import type'."),
   Unexpected_token_Did_you_mean_or_rbrace: diag(1381, 1 /* Error */, "Unexpected_token_Did_you_mean_or_rbrace_1381", "Unexpected token. Did you mean `{'}'}` or `}`?"),
   Unexpected_token_Did_you_mean_or_gt: diag(1382, 1 /* Error */, "Unexpected_token_Did_you_mean_or_gt_1382", "Unexpected token. Did you mean `{'>'}` or `>`?"),
+  Only_named_exports_may_use_export_type: diag(1383, 1 /* Error */, "Only_named_exports_may_use_export_type_1383", "Only named exports may use 'export type'."),
   Function_type_notation_must_be_parenthesized_when_used_in_a_union_type: diag(1385, 1 /* Error */, "Function_type_notation_must_be_parenthesized_when_used_in_a_union_type_1385", "Function type notation must be parenthesized when used in a union type."),
   Constructor_type_notation_must_be_parenthesized_when_used_in_a_union_type: diag(1386, 1 /* Error */, "Constructor_type_notation_must_be_parenthesized_when_used_in_a_union_type_1386", "Constructor type notation must be parenthesized when used in a union type."),
   Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type: diag(1387, 1 /* Error */, "Function_type_notation_must_be_parenthesized_when_used_in_an_intersection_type_1387", "Function type notation must be parenthesized when used in an intersection type."),

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.0.0-pr-52217-7",
+  "version": "5.0.0-pr-52213-4",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -77,9 +77,12 @@
     "ms": "^2.1.3",
     "node-fetch": "^3.2.10",
     "source-map-support": "latest",
-    "typescript": "^4.8.4",
+    "typescript": "5.0.0-dev.20230112",
     "which": "^2.0.2"
   },
+  "overrides": {
+    "typescript@*": "$typescript"
+  },
   "scripts": {
     "test": "hereby runtests-parallel --light=false",
     "test:eslint-rules": "hereby run-eslint-rules-tests",