typescript 5.1.0-dev.20230303 → 5.1.0-dev.20230305

package/lib/tsc.js

@@ -23,7 +23,7 @@ var __export = (target, all) => {
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230303`;
+var version = `${versionMajorMinor}.0-dev.20230305`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -58177,6 +58177,9 @@ function createTypeChecker(host) {
   function isTypeSubtypeOf(source, target) {
     return isTypeRelatedTo(source, target, subtypeRelation);
   }
+  function isTypeStrictSubtypeOf(source, target) {
+    return isTypeRelatedTo(source, target, strictSubtypeRelation);
+  }
   function isTypeAssignableTo(source, target) {
     return isTypeRelatedTo(source, target, assignableRelation);
   }
@@ -65273,7 +65276,7 @@ function createTypeChecker(host) {
       const narrowedType = mapType(candidate, (c) => {
         const discriminant = keyPropertyName && getTypeOfPropertyOfType(c, keyPropertyName);
         const matching = discriminant && getConstituentTypeForKeyType(type, discriminant);
-        const directlyRelated = mapType(matching || type, checkDerived ? (t) => isTypeDerivedFrom(t, c) ? t : isTypeDerivedFrom(c, t) ? c : neverType : (t) => isTypeSubtypeOf(c, t) && !isTypeIdenticalTo(c, t) ? c : isTypeSubtypeOf(t, c) ? t : neverType);
+        const directlyRelated = mapType(matching || type, checkDerived ? (t) => isTypeDerivedFrom(t, c) ? t : isTypeDerivedFrom(c, t) ? c : neverType : (t) => isTypeStrictSubtypeOf(t, c) ? t : isTypeStrictSubtypeOf(c, t) ? c : isTypeSubtypeOf(t, c) ? t : isTypeSubtypeOf(c, t) ? c : neverType);
         return directlyRelated.flags & 131072 /* Never */ ? mapType(type, (t) => maybeTypeOfKind(t, 465829888 /* Instantiable */) && isRelated(c, getBaseConstraintOfType(t) || unknownType) ? getIntersectionType([t, c]) : neverType) : directlyRelated;
       });
       return !(narrowedType.flags & 131072 /* Never */) ? narrowedType : isTypeSubtypeOf(candidate, type) ? candidate : isTypeAssignableTo(type, candidate) ? type : isTypeAssignableTo(candidate, type) ? candidate : getIntersectionType([type, candidate]);

package/lib/tsserver.js

@@ -2286,7 +2286,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230303`;
+var version = `${versionMajorMinor}.0-dev.20230305`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -62782,6 +62782,9 @@ function createTypeChecker(host) {
   function isTypeSubtypeOf(source, target) {
     return isTypeRelatedTo(source, target, subtypeRelation);
   }
+  function isTypeStrictSubtypeOf(source, target) {
+    return isTypeRelatedTo(source, target, strictSubtypeRelation);
+  }
   function isTypeAssignableTo(source, target) {
     return isTypeRelatedTo(source, target, assignableRelation);
   }
@@ -69878,7 +69881,7 @@ function createTypeChecker(host) {
       const narrowedType = mapType(candidate, (c) => {
         const discriminant = keyPropertyName && getTypeOfPropertyOfType(c, keyPropertyName);
         const matching = discriminant && getConstituentTypeForKeyType(type, discriminant);
-        const directlyRelated = mapType(matching || type, checkDerived ? (t) => isTypeDerivedFrom(t, c) ? t : isTypeDerivedFrom(c, t) ? c : neverType : (t) => isTypeSubtypeOf(c, t) && !isTypeIdenticalTo(c, t) ? c : isTypeSubtypeOf(t, c) ? t : neverType);
+        const directlyRelated = mapType(matching || type, checkDerived ? (t) => isTypeDerivedFrom(t, c) ? t : isTypeDerivedFrom(c, t) ? c : neverType : (t) => isTypeStrictSubtypeOf(t, c) ? t : isTypeStrictSubtypeOf(c, t) ? c : isTypeSubtypeOf(t, c) ? t : isTypeSubtypeOf(c, t) ? c : neverType);
         return directlyRelated.flags & 131072 /* Never */ ? mapType(type, (t) => maybeTypeOfKind(t, 465829888 /* Instantiable */) && isRelated(c, getBaseConstraintOfType(t) || unknownType) ? getIntersectionType([t, c]) : neverType) : directlyRelated;
       });
       return !(narrowedType.flags & 131072 /* Never */) ? narrowedType : isTypeSubtypeOf(candidate, type) ? candidate : isTypeAssignableTo(type, candidate) ? type : isTypeAssignableTo(candidate, type) ? candidate : getIntersectionType([type, candidate]);
@@ -151437,6 +151440,8 @@ function tryGetObjectLikeCompletionContainer(contextToken) {
         break;
       case 41 /* AsteriskToken */:
         return isMethodDeclaration(parent2) ? tryCast(parent2.parent, isObjectLiteralExpression) : void 0;
+      case 132 /* AsyncKeyword */:
+        return tryCast(parent2.parent, isObjectLiteralExpression);
       case 79 /* Identifier */:
         return contextToken.text === "async" && isShorthandPropertyAssignment(contextToken.parent) ? contextToken.parent.parent : void 0;
     }
@@ -156457,7 +156462,7 @@ function organizeImports(sourceFile, formatContext, host, program, preferences,
   const shouldSort = mode === "SortAndCombine" /* SortAndCombine */ || mode === "All" /* All */;
   const shouldCombine = shouldSort;
   const shouldRemove = mode === "RemoveUnused" /* RemoveUnused */ || mode === "All" /* All */;
-  const topLevelImportGroupDecls = groupImportsByNewlineContiguous(sourceFile, sourceFile.statements.filter(isImportDeclaration));
+  const topLevelImportGroupDecls = groupByNewlineContiguous(sourceFile, sourceFile.statements.filter(isImportDeclaration));
   const comparer = getOrganizeImportsComparerWithDetection(preferences, shouldSort ? () => detectSortingWorker(topLevelImportGroupDecls, preferences) === 2 /* CaseInsensitive */ : void 0);
   const processImportsOfSameModuleSpecifier = (importGroup) => {
     if (shouldRemove)
@@ -156470,13 +156475,12 @@ function organizeImports(sourceFile, formatContext, host, program, preferences,
   };
   topLevelImportGroupDecls.forEach((importGroupDecl) => organizeImportsWorker(importGroupDecl, processImportsOfSameModuleSpecifier));
   if (mode !== "RemoveUnused" /* RemoveUnused */) {
-    const topLevelExportDecls = sourceFile.statements.filter(isExportDeclaration);
-    organizeImportsWorker(topLevelExportDecls, (group2) => coalesceExportsWorker(group2, comparer));
+    getTopLevelExportGroups(sourceFile).forEach((exportGroupDecl) => organizeImportsWorker(exportGroupDecl, (group2) => coalesceExportsWorker(group2, comparer)));
   }
   for (const ambientModule of sourceFile.statements.filter(isAmbientModule)) {
     if (!ambientModule.body)
       continue;
-    const ambientModuleImportGroupDecls = groupImportsByNewlineContiguous(sourceFile, ambientModule.body.statements.filter(isImportDeclaration));
+    const ambientModuleImportGroupDecls = groupByNewlineContiguous(sourceFile, ambientModule.body.statements.filter(isImportDeclaration));
     ambientModuleImportGroupDecls.forEach((importGroupDecl) => organizeImportsWorker(importGroupDecl, processImportsOfSameModuleSpecifier));
     if (mode !== "RemoveUnused" /* RemoveUnused */) {
       const ambientModuleExportDecls = ambientModule.body.statements.filter(isExportDeclaration);
@@ -156491,7 +156495,7 @@ function organizeImports(sourceFile, formatContext, host, program, preferences,
     suppressLeadingTrivia(oldImportDecls[0]);
     const oldImportGroups = shouldCombine ? group(oldImportDecls, (importDecl) => getExternalModuleName2(importDecl.moduleSpecifier)) : [oldImportDecls];
     const sortedImportGroups = shouldSort ? stableSort(oldImportGroups, (group1, group2) => compareModuleSpecifiersWorker(group1[0].moduleSpecifier, group2[0].moduleSpecifier, comparer)) : oldImportGroups;
-    const newImportDecls = flatMap(sortedImportGroups, (importGroup) => getExternalModuleName2(importGroup[0].moduleSpecifier) ? coalesce(importGroup) : importGroup);
+    const newImportDecls = flatMap(sortedImportGroups, (importGroup) => getExternalModuleName2(importGroup[0].moduleSpecifier) || importGroup[0].moduleSpecifier === void 0 ? coalesce(importGroup) : importGroup);
     if (newImportDecls.length === 0) {
       changeTracker.deleteNodes(
         sourceFile,
@@ -156518,29 +156522,29 @@ function organizeImports(sourceFile, formatContext, host, program, preferences,
     }
   }
 }
-function groupImportsByNewlineContiguous(sourceFile, importDecls) {
+function groupByNewlineContiguous(sourceFile, decls) {
   const scanner2 = createScanner(
     sourceFile.languageVersion,
     /*skipTrivia*/
     false,
     sourceFile.languageVariant
   );
-  const groupImports = [];
+  const group2 = [];
   let groupIndex = 0;
-  for (const topLevelImportDecl of importDecls) {
-    if (groupImports[groupIndex] && isNewGroup(sourceFile, topLevelImportDecl, scanner2)) {
+  for (const decl of decls) {
+    if (group2[groupIndex] && isNewGroup(sourceFile, decl, scanner2)) {
       groupIndex++;
     }
-    if (!groupImports[groupIndex]) {
-      groupImports[groupIndex] = [];
+    if (!group2[groupIndex]) {
+      group2[groupIndex] = [];
     }
-    groupImports[groupIndex].push(topLevelImportDecl);
+    group2[groupIndex].push(decl);
   }
-  return groupImports;
+  return group2;
 }
-function isNewGroup(sourceFile, topLevelImportDecl, scanner2) {
-  const startPos = topLevelImportDecl.getFullStart();
-  const endPos = topLevelImportDecl.getStart();
+function isNewGroup(sourceFile, decl, scanner2) {
+  const startPos = decl.getFullStart();
+  const endPos = decl.getStart();
   scanner2.setText(sourceFile.text, startPos, endPos - startPos);
   let numberOfNewLines = 0;
   while (scanner2.getTokenPos() < endPos) {
@@ -156821,7 +156825,7 @@ function getModuleSpecifierExpression(declaration) {
 }
 function detectSorting(sourceFile, preferences) {
   return detectSortingWorker(
-    groupImportsByNewlineContiguous(sourceFile, sourceFile.statements.filter(isImportDeclaration)),
+    groupByNewlineContiguous(sourceFile, sourceFile.statements.filter(isImportDeclaration)),
     preferences
   );
 }
@@ -157025,6 +157029,33 @@ function getOrganizeImportsComparerWithDetection(preferences, detectIgnoreCase)
   const ignoreCase = typeof preferences.organizeImportsIgnoreCase === "boolean" ? preferences.organizeImportsIgnoreCase : (_a2 = detectIgnoreCase == null ? void 0 : detectIgnoreCase()) != null ? _a2 : false;
   return getOrganizeImportsComparer(preferences, ignoreCase);
 }
+function getTopLevelExportGroups(sourceFile) {
+  const topLevelExportGroups = [];
+  const statements = sourceFile.statements;
+  const len = length(statements);
+  let i = 0;
+  let groupIndex = 0;
+  while (i < len) {
+    if (isExportDeclaration(statements[i])) {
+      if (topLevelExportGroups[groupIndex] === void 0) {
+        topLevelExportGroups[groupIndex] = [];
+      }
+      const exportDecl = statements[i];
+      if (exportDecl.moduleSpecifier) {
+        topLevelExportGroups[groupIndex].push(exportDecl);
+        i++;
+      } else {
+        while (i < len && isExportDeclaration(statements[i])) {
+          topLevelExportGroups[groupIndex].push(statements[i++]);
+        }
+        groupIndex++;
+      }
+    } else {
+      i++;
+    }
+  }
+  return flatMap(topLevelExportGroups, (exportGroupDecls) => groupByNewlineContiguous(sourceFile, exportGroupDecls));
+}
 
 // src/services/_namespaces/ts.OutliningElementsCollector.ts
 var ts_OutliningElementsCollector_exports = {};

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-dev.20230303`;
+      version = `${versionMajorMinor}.0-dev.20230305`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -60592,6 +60592,9 @@ ${lanes.join("\n")}
     function isTypeSubtypeOf(source, target) {
       return isTypeRelatedTo(source, target, subtypeRelation);
     }
+    function isTypeStrictSubtypeOf(source, target) {
+      return isTypeRelatedTo(source, target, strictSubtypeRelation);
+    }
     function isTypeAssignableTo(source, target) {
       return isTypeRelatedTo(source, target, assignableRelation);
     }
@@ -67688,7 +67691,7 @@ ${lanes.join("\n")}
         const narrowedType = mapType(candidate, (c) => {
           const discriminant = keyPropertyName && getTypeOfPropertyOfType(c, keyPropertyName);
           const matching = discriminant && getConstituentTypeForKeyType(type, discriminant);
-          const directlyRelated = mapType(matching || type, checkDerived ? (t) => isTypeDerivedFrom(t, c) ? t : isTypeDerivedFrom(c, t) ? c : neverType : (t) => isTypeSubtypeOf(c, t) && !isTypeIdenticalTo(c, t) ? c : isTypeSubtypeOf(t, c) ? t : neverType);
+          const directlyRelated = mapType(matching || type, checkDerived ? (t) => isTypeDerivedFrom(t, c) ? t : isTypeDerivedFrom(c, t) ? c : neverType : (t) => isTypeStrictSubtypeOf(t, c) ? t : isTypeStrictSubtypeOf(c, t) ? c : isTypeSubtypeOf(t, c) ? t : isTypeSubtypeOf(c, t) ? c : neverType);
           return directlyRelated.flags & 131072 /* Never */ ? mapType(type, (t) => maybeTypeOfKind(t, 465829888 /* Instantiable */) && isRelated(c, getBaseConstraintOfType(t) || unknownType) ? getIntersectionType([t, c]) : neverType) : directlyRelated;
         });
         return !(narrowedType.flags & 131072 /* Never */) ? narrowedType : isTypeSubtypeOf(candidate, type) ? candidate : isTypeAssignableTo(type, candidate) ? type : isTypeAssignableTo(candidate, type) ? candidate : getIntersectionType([type, candidate]);
@@ -150490,6 +150493,8 @@ ${lanes.join("\n")}
           break;
         case 41 /* AsteriskToken */:
           return isMethodDeclaration(parent2) ? tryCast(parent2.parent, isObjectLiteralExpression) : void 0;
+        case 132 /* AsyncKeyword */:
+          return tryCast(parent2.parent, isObjectLiteralExpression);
         case 79 /* Identifier */:
           return contextToken.text === "async" && isShorthandPropertyAssignment(contextToken.parent) ? contextToken.parent.parent : void 0;
       }
@@ -155654,7 +155659,7 @@ ${lanes.join("\n")}
     const shouldSort = mode === "SortAndCombine" /* SortAndCombine */ || mode === "All" /* All */;
     const shouldCombine = shouldSort;
     const shouldRemove = mode === "RemoveUnused" /* RemoveUnused */ || mode === "All" /* All */;
-    const topLevelImportGroupDecls = groupImportsByNewlineContiguous(sourceFile, sourceFile.statements.filter(isImportDeclaration));
+    const topLevelImportGroupDecls = groupByNewlineContiguous(sourceFile, sourceFile.statements.filter(isImportDeclaration));
     const comparer = getOrganizeImportsComparerWithDetection(preferences, shouldSort ? () => detectSortingWorker(topLevelImportGroupDecls, preferences) === 2 /* CaseInsensitive */ : void 0);
     const processImportsOfSameModuleSpecifier = (importGroup) => {
       if (shouldRemove)
@@ -155667,13 +155672,12 @@ ${lanes.join("\n")}
     };
     topLevelImportGroupDecls.forEach((importGroupDecl) => organizeImportsWorker(importGroupDecl, processImportsOfSameModuleSpecifier));
     if (mode !== "RemoveUnused" /* RemoveUnused */) {
-      const topLevelExportDecls = sourceFile.statements.filter(isExportDeclaration);
-      organizeImportsWorker(topLevelExportDecls, (group2) => coalesceExportsWorker(group2, comparer));
+      getTopLevelExportGroups(sourceFile).forEach((exportGroupDecl) => organizeImportsWorker(exportGroupDecl, (group2) => coalesceExportsWorker(group2, comparer)));
     }
     for (const ambientModule of sourceFile.statements.filter(isAmbientModule)) {
       if (!ambientModule.body)
         continue;
-      const ambientModuleImportGroupDecls = groupImportsByNewlineContiguous(sourceFile, ambientModule.body.statements.filter(isImportDeclaration));
+      const ambientModuleImportGroupDecls = groupByNewlineContiguous(sourceFile, ambientModule.body.statements.filter(isImportDeclaration));
       ambientModuleImportGroupDecls.forEach((importGroupDecl) => organizeImportsWorker(importGroupDecl, processImportsOfSameModuleSpecifier));
       if (mode !== "RemoveUnused" /* RemoveUnused */) {
         const ambientModuleExportDecls = ambientModule.body.statements.filter(isExportDeclaration);
@@ -155688,7 +155692,7 @@ ${lanes.join("\n")}
       suppressLeadingTrivia(oldImportDecls[0]);
       const oldImportGroups = shouldCombine ? group(oldImportDecls, (importDecl) => getExternalModuleName2(importDecl.moduleSpecifier)) : [oldImportDecls];
       const sortedImportGroups = shouldSort ? stableSort(oldImportGroups, (group1, group2) => compareModuleSpecifiersWorker(group1[0].moduleSpecifier, group2[0].moduleSpecifier, comparer)) : oldImportGroups;
-      const newImportDecls = flatMap(sortedImportGroups, (importGroup) => getExternalModuleName2(importGroup[0].moduleSpecifier) ? coalesce(importGroup) : importGroup);
+      const newImportDecls = flatMap(sortedImportGroups, (importGroup) => getExternalModuleName2(importGroup[0].moduleSpecifier) || importGroup[0].moduleSpecifier === void 0 ? coalesce(importGroup) : importGroup);
       if (newImportDecls.length === 0) {
         changeTracker.deleteNodes(
           sourceFile,
@@ -155715,29 +155719,29 @@ ${lanes.join("\n")}
       }
     }
   }
-  function groupImportsByNewlineContiguous(sourceFile, importDecls) {
+  function groupByNewlineContiguous(sourceFile, decls) {
     const scanner2 = createScanner(
       sourceFile.languageVersion,
       /*skipTrivia*/
       false,
       sourceFile.languageVariant
     );
-    const groupImports = [];
+    const group2 = [];
     let groupIndex = 0;
-    for (const topLevelImportDecl of importDecls) {
-      if (groupImports[groupIndex] && isNewGroup(sourceFile, topLevelImportDecl, scanner2)) {
+    for (const decl of decls) {
+      if (group2[groupIndex] && isNewGroup(sourceFile, decl, scanner2)) {
         groupIndex++;
       }
-      if (!groupImports[groupIndex]) {
-        groupImports[groupIndex] = [];
+      if (!group2[groupIndex]) {
+        group2[groupIndex] = [];
       }
-      groupImports[groupIndex].push(topLevelImportDecl);
+      group2[groupIndex].push(decl);
     }
-    return groupImports;
+    return group2;
   }
-  function isNewGroup(sourceFile, topLevelImportDecl, scanner2) {
-    const startPos = topLevelImportDecl.getFullStart();
-    const endPos = topLevelImportDecl.getStart();
+  function isNewGroup(sourceFile, decl, scanner2) {
+    const startPos = decl.getFullStart();
+    const endPos = decl.getStart();
     scanner2.setText(sourceFile.text, startPos, endPos - startPos);
     let numberOfNewLines = 0;
     while (scanner2.getTokenPos() < endPos) {
@@ -156018,7 +156022,7 @@ ${lanes.join("\n")}
   }
   function detectSorting(sourceFile, preferences) {
     return detectSortingWorker(
-      groupImportsByNewlineContiguous(sourceFile, sourceFile.statements.filter(isImportDeclaration)),
+      groupByNewlineContiguous(sourceFile, sourceFile.statements.filter(isImportDeclaration)),
       preferences
     );
   }
@@ -156185,6 +156189,33 @@ ${lanes.join("\n")}
     const ignoreCase = typeof preferences.organizeImportsIgnoreCase === "boolean" ? preferences.organizeImportsIgnoreCase : (_a2 = detectIgnoreCase == null ? void 0 : detectIgnoreCase()) != null ? _a2 : false;
     return getOrganizeImportsComparer(preferences, ignoreCase);
   }
+  function getTopLevelExportGroups(sourceFile) {
+    const topLevelExportGroups = [];
+    const statements = sourceFile.statements;
+    const len = length(statements);
+    let i = 0;
+    let groupIndex = 0;
+    while (i < len) {
+      if (isExportDeclaration(statements[i])) {
+        if (topLevelExportGroups[groupIndex] === void 0) {
+          topLevelExportGroups[groupIndex] = [];
+        }
+        const exportDecl = statements[i];
+        if (exportDecl.moduleSpecifier) {
+          topLevelExportGroups[groupIndex].push(exportDecl);
+          i++;
+        } else {
+          while (i < len && isExportDeclaration(statements[i])) {
+            topLevelExportGroups[groupIndex].push(statements[i++]);
+          }
+          groupIndex++;
+        }
+      } else {
+        i++;
+      }
+    }
+    return flatMap(topLevelExportGroups, (exportGroupDecls) => groupByNewlineContiguous(sourceFile, exportGroupDecls));
+  }
   var ImportSpecifierSortingCache, detectImportSpecifierSorting;
   var init_organizeImports = __esm({
     "src/services/organizeImports.ts"() {

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-dev.20230303`;
+      version = `${versionMajorMinor}.0-dev.20230305`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -60592,6 +60592,9 @@ ${lanes.join("\n")}
     function isTypeSubtypeOf(source, target) {
       return isTypeRelatedTo(source, target, subtypeRelation);
     }
+    function isTypeStrictSubtypeOf(source, target) {
+      return isTypeRelatedTo(source, target, strictSubtypeRelation);
+    }
     function isTypeAssignableTo(source, target) {
       return isTypeRelatedTo(source, target, assignableRelation);
     }
@@ -67688,7 +67691,7 @@ ${lanes.join("\n")}
         const narrowedType = mapType(candidate, (c) => {
           const discriminant = keyPropertyName && getTypeOfPropertyOfType(c, keyPropertyName);
           const matching = discriminant && getConstituentTypeForKeyType(type, discriminant);
-          const directlyRelated = mapType(matching || type, checkDerived ? (t) => isTypeDerivedFrom(t, c) ? t : isTypeDerivedFrom(c, t) ? c : neverType : (t) => isTypeSubtypeOf(c, t) && !isTypeIdenticalTo(c, t) ? c : isTypeSubtypeOf(t, c) ? t : neverType);
+          const directlyRelated = mapType(matching || type, checkDerived ? (t) => isTypeDerivedFrom(t, c) ? t : isTypeDerivedFrom(c, t) ? c : neverType : (t) => isTypeStrictSubtypeOf(t, c) ? t : isTypeStrictSubtypeOf(c, t) ? c : isTypeSubtypeOf(t, c) ? t : isTypeSubtypeOf(c, t) ? c : neverType);
           return directlyRelated.flags & 131072 /* Never */ ? mapType(type, (t) => maybeTypeOfKind(t, 465829888 /* Instantiable */) && isRelated(c, getBaseConstraintOfType(t) || unknownType) ? getIntersectionType([t, c]) : neverType) : directlyRelated;
         });
         return !(narrowedType.flags & 131072 /* Never */) ? narrowedType : isTypeSubtypeOf(candidate, type) ? candidate : isTypeAssignableTo(type, candidate) ? type : isTypeAssignableTo(candidate, type) ? candidate : getIntersectionType([type, candidate]);
@@ -150504,6 +150507,8 @@ ${lanes.join("\n")}
           break;
         case 41 /* AsteriskToken */:
           return isMethodDeclaration(parent2) ? tryCast(parent2.parent, isObjectLiteralExpression) : void 0;
+        case 132 /* AsyncKeyword */:
+          return tryCast(parent2.parent, isObjectLiteralExpression);
         case 79 /* Identifier */:
           return contextToken.text === "async" && isShorthandPropertyAssignment(contextToken.parent) ? contextToken.parent.parent : void 0;
       }
@@ -155668,7 +155673,7 @@ ${lanes.join("\n")}
     const shouldSort = mode === "SortAndCombine" /* SortAndCombine */ || mode === "All" /* All */;
     const shouldCombine = shouldSort;
     const shouldRemove = mode === "RemoveUnused" /* RemoveUnused */ || mode === "All" /* All */;
-    const topLevelImportGroupDecls = groupImportsByNewlineContiguous(sourceFile, sourceFile.statements.filter(isImportDeclaration));
+    const topLevelImportGroupDecls = groupByNewlineContiguous(sourceFile, sourceFile.statements.filter(isImportDeclaration));
     const comparer = getOrganizeImportsComparerWithDetection(preferences, shouldSort ? () => detectSortingWorker(topLevelImportGroupDecls, preferences) === 2 /* CaseInsensitive */ : void 0);
     const processImportsOfSameModuleSpecifier = (importGroup) => {
       if (shouldRemove)
@@ -155681,13 +155686,12 @@ ${lanes.join("\n")}
     };
     topLevelImportGroupDecls.forEach((importGroupDecl) => organizeImportsWorker(importGroupDecl, processImportsOfSameModuleSpecifier));
     if (mode !== "RemoveUnused" /* RemoveUnused */) {
-      const topLevelExportDecls = sourceFile.statements.filter(isExportDeclaration);
-      organizeImportsWorker(topLevelExportDecls, (group2) => coalesceExportsWorker(group2, comparer));
+      getTopLevelExportGroups(sourceFile).forEach((exportGroupDecl) => organizeImportsWorker(exportGroupDecl, (group2) => coalesceExportsWorker(group2, comparer)));
     }
     for (const ambientModule of sourceFile.statements.filter(isAmbientModule)) {
       if (!ambientModule.body)
         continue;
-      const ambientModuleImportGroupDecls = groupImportsByNewlineContiguous(sourceFile, ambientModule.body.statements.filter(isImportDeclaration));
+      const ambientModuleImportGroupDecls = groupByNewlineContiguous(sourceFile, ambientModule.body.statements.filter(isImportDeclaration));
       ambientModuleImportGroupDecls.forEach((importGroupDecl) => organizeImportsWorker(importGroupDecl, processImportsOfSameModuleSpecifier));
       if (mode !== "RemoveUnused" /* RemoveUnused */) {
         const ambientModuleExportDecls = ambientModule.body.statements.filter(isExportDeclaration);
@@ -155702,7 +155706,7 @@ ${lanes.join("\n")}
       suppressLeadingTrivia(oldImportDecls[0]);
       const oldImportGroups = shouldCombine ? group(oldImportDecls, (importDecl) => getExternalModuleName2(importDecl.moduleSpecifier)) : [oldImportDecls];
       const sortedImportGroups = shouldSort ? stableSort(oldImportGroups, (group1, group2) => compareModuleSpecifiersWorker(group1[0].moduleSpecifier, group2[0].moduleSpecifier, comparer)) : oldImportGroups;
-      const newImportDecls = flatMap(sortedImportGroups, (importGroup) => getExternalModuleName2(importGroup[0].moduleSpecifier) ? coalesce(importGroup) : importGroup);
+      const newImportDecls = flatMap(sortedImportGroups, (importGroup) => getExternalModuleName2(importGroup[0].moduleSpecifier) || importGroup[0].moduleSpecifier === void 0 ? coalesce(importGroup) : importGroup);
       if (newImportDecls.length === 0) {
         changeTracker.deleteNodes(
           sourceFile,
@@ -155729,29 +155733,29 @@ ${lanes.join("\n")}
       }
     }
   }
-  function groupImportsByNewlineContiguous(sourceFile, importDecls) {
+  function groupByNewlineContiguous(sourceFile, decls) {
     const scanner2 = createScanner(
       sourceFile.languageVersion,
       /*skipTrivia*/
       false,
       sourceFile.languageVariant
     );
-    const groupImports = [];
+    const group2 = [];
     let groupIndex = 0;
-    for (const topLevelImportDecl of importDecls) {
-      if (groupImports[groupIndex] && isNewGroup(sourceFile, topLevelImportDecl, scanner2)) {
+    for (const decl of decls) {
+      if (group2[groupIndex] && isNewGroup(sourceFile, decl, scanner2)) {
         groupIndex++;
       }
-      if (!groupImports[groupIndex]) {
-        groupImports[groupIndex] = [];
+      if (!group2[groupIndex]) {
+        group2[groupIndex] = [];
       }
-      groupImports[groupIndex].push(topLevelImportDecl);
+      group2[groupIndex].push(decl);
     }
-    return groupImports;
+    return group2;
   }
-  function isNewGroup(sourceFile, topLevelImportDecl, scanner2) {
-    const startPos = topLevelImportDecl.getFullStart();
-    const endPos = topLevelImportDecl.getStart();
+  function isNewGroup(sourceFile, decl, scanner2) {
+    const startPos = decl.getFullStart();
+    const endPos = decl.getStart();
     scanner2.setText(sourceFile.text, startPos, endPos - startPos);
     let numberOfNewLines = 0;
     while (scanner2.getTokenPos() < endPos) {
@@ -156032,7 +156036,7 @@ ${lanes.join("\n")}
   }
   function detectSorting(sourceFile, preferences) {
     return detectSortingWorker(
-      groupImportsByNewlineContiguous(sourceFile, sourceFile.statements.filter(isImportDeclaration)),
+      groupByNewlineContiguous(sourceFile, sourceFile.statements.filter(isImportDeclaration)),
       preferences
     );
   }
@@ -156199,6 +156203,33 @@ ${lanes.join("\n")}
     const ignoreCase = typeof preferences.organizeImportsIgnoreCase === "boolean" ? preferences.organizeImportsIgnoreCase : (_a2 = detectIgnoreCase == null ? void 0 : detectIgnoreCase()) != null ? _a2 : false;
     return getOrganizeImportsComparer(preferences, ignoreCase);
   }
+  function getTopLevelExportGroups(sourceFile) {
+    const topLevelExportGroups = [];
+    const statements = sourceFile.statements;
+    const len = length(statements);
+    let i = 0;
+    let groupIndex = 0;
+    while (i < len) {
+      if (isExportDeclaration(statements[i])) {
+        if (topLevelExportGroups[groupIndex] === void 0) {
+          topLevelExportGroups[groupIndex] = [];
+        }
+        const exportDecl = statements[i];
+        if (exportDecl.moduleSpecifier) {
+          topLevelExportGroups[groupIndex].push(exportDecl);
+          i++;
+        } else {
+          while (i < len && isExportDeclaration(statements[i])) {
+            topLevelExportGroups[groupIndex].push(statements[i++]);
+          }
+          groupIndex++;
+        }
+      } else {
+        i++;
+      }
+    }
+    return flatMap(topLevelExportGroups, (exportGroupDecls) => groupByNewlineContiguous(sourceFile, exportGroupDecls));
+  }
   var ImportSpecifierSortingCache, detectImportSpecifierSorting;
   var init_organizeImports = __esm({
     "src/services/organizeImports.ts"() {

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230303`;
+var version = `${versionMajorMinor}.0-dev.20230305`;
 
 // src/compiler/core.ts
 var emptyArray = [];

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.1.0-dev.20230303",
+    "version": "5.1.0-dev.20230305",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [