typescript 5.1.0-dev.20230305 → 5.1.0-dev.20230307

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.20230305`;
+var version = `${versionMajorMinor}.0-dev.20230307`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -12382,7 +12382,7 @@ function getErrorSpanForArrowFunction(sourceFile, node) {
 function getErrorSpanForNode(sourceFile, node) {
   let errorNode = node;
   switch (node.kind) {
-    case 308 /* SourceFile */:
+    case 308 /* SourceFile */: {
       const pos2 = skipTrivia(
         sourceFile.text,
         0,
@@ -12393,6 +12393,7 @@ function getErrorSpanForNode(sourceFile, node) {
         return createTextSpan(0, 0);
       }
       return getSpanOfTokenAtPosition(sourceFile, pos2);
+    }
     case 257 /* VariableDeclaration */:
     case 205 /* BindingElement */:
     case 260 /* ClassDeclaration */:
@@ -12415,10 +12416,16 @@ function getErrorSpanForNode(sourceFile, node) {
     case 216 /* ArrowFunction */:
       return getErrorSpanForArrowFunction(sourceFile, node);
     case 292 /* CaseClause */:
-    case 293 /* DefaultClause */:
+    case 293 /* DefaultClause */: {
       const start = skipTrivia(sourceFile.text, node.pos);
       const end = node.statements.length > 0 ? node.statements[0].pos : node.end;
       return createTextSpanFromBounds(start, end);
+    }
+    case 250 /* ReturnStatement */:
+    case 226 /* YieldExpression */: {
+      const pos2 = skipTrivia(sourceFile.text, node.pos);
+      return getSpanOfTokenAtPosition(sourceFile, pos2);
+    }
   }
   if (errorNode === void 0) {
     return getSpanOfTokenAtPosition(sourceFile, node.pos);
@@ -38833,7 +38840,7 @@ function initFlowNode(node) {
   Debug.attachFlowNodeDebugInfo(node);
   return node;
 }
-var binder = createBinder();
+var binder = /* @__PURE__ */ createBinder();
 function bindSourceFile(file, options) {
   mark("beforeBind");
   perfLogger.logStartBindFile("" + file.fileName);

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.20230305`;
+var version = `${versionMajorMinor}.0-dev.20230307`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -16143,7 +16143,7 @@ function getErrorSpanForArrowFunction(sourceFile, node) {
 function getErrorSpanForNode(sourceFile, node) {
   let errorNode = node;
   switch (node.kind) {
-    case 308 /* SourceFile */:
+    case 308 /* SourceFile */: {
       const pos2 = skipTrivia(
         sourceFile.text,
         0,
@@ -16154,6 +16154,7 @@ function getErrorSpanForNode(sourceFile, node) {
         return createTextSpan(0, 0);
       }
       return getSpanOfTokenAtPosition(sourceFile, pos2);
+    }
     case 257 /* VariableDeclaration */:
     case 205 /* BindingElement */:
     case 260 /* ClassDeclaration */:
@@ -16176,10 +16177,16 @@ function getErrorSpanForNode(sourceFile, node) {
     case 216 /* ArrowFunction */:
       return getErrorSpanForArrowFunction(sourceFile, node);
     case 292 /* CaseClause */:
-    case 293 /* DefaultClause */:
+    case 293 /* DefaultClause */: {
       const start2 = skipTrivia(sourceFile.text, node.pos);
       const end = node.statements.length > 0 ? node.statements[0].pos : node.end;
       return createTextSpanFromBounds(start2, end);
+    }
+    case 250 /* ReturnStatement */:
+    case 226 /* YieldExpression */: {
+      const pos2 = skipTrivia(sourceFile.text, node.pos);
+      return getSpanOfTokenAtPosition(sourceFile, pos2);
+    }
   }
   if (errorNode === void 0) {
     return getSpanOfTokenAtPosition(sourceFile, node.pos);
@@ -43390,7 +43397,7 @@ function initFlowNode(node) {
   Debug.attachFlowNodeDebugInfo(node);
   return node;
 }
-var binder = createBinder();
+var binder = /* @__PURE__ */ createBinder();
 function bindSourceFile(file, options) {
   mark("beforeBind");
   perfLogger.logStartBindFile("" + file.fileName);
@@ -145106,7 +145113,7 @@ registerCodeFix({
         ];
       }
       return [
-        createDeleteFix(ts_textChanges_exports.ChangeTracker.with(context, (t) => t.delete(sourceFile, token.parent.parent)), Diagnostics.Remove_unused_destructuring_declaration)
+        createDeleteFix(ts_textChanges_exports.ChangeTracker.with(context, (t) => deleteDestructuring(context, t, sourceFile, token.parent)), Diagnostics.Remove_unused_destructuring_declaration)
       ];
     }
     if (canDeleteEntireVariableStatement(sourceFile, token)) {
@@ -145239,6 +145246,24 @@ function deleteEntireVariableStatement(changes, sourceFile, node) {
 function deleteDestructuringElements(changes, sourceFile, node) {
   forEach(node.elements, (n) => changes.delete(sourceFile, n));
 }
+function deleteDestructuring(context, changes, sourceFile, { parent: parent2 }) {
+  if (isVariableDeclaration(parent2) && parent2.initializer && isCallLikeExpression(parent2.initializer)) {
+    if (isVariableDeclarationList(parent2.parent) && length(parent2.parent.declarations) > 1) {
+      const varStatement = parent2.parent.parent;
+      const pos = varStatement.getStart(sourceFile);
+      const end = varStatement.end;
+      changes.delete(sourceFile, parent2);
+      changes.insertNodeAt(sourceFile, end, parent2.initializer, {
+        prefix: getNewLineOrDefaultFromHost(context.host, context.formatContext.options) + sourceFile.text.slice(getPrecedingNonSpaceCharacterPosition(sourceFile.text, pos - 1), pos),
+        suffix: probablyUsesSemicolons(sourceFile) ? ";" : ""
+      });
+    } else {
+      changes.replaceNode(sourceFile, parent2.parent, parent2.initializer);
+    }
+  } else {
+    changes.delete(sourceFile, parent2);
+  }
+}
 function tryPrefixDeclaration(changes, errorCode, sourceFile, token) {
   if (errorCode === Diagnostics.Property_0_is_declared_but_its_value_is_never_read.code)
     return;

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-dev.20230305`;
+      version = `${versionMajorMinor}.0-dev.20230307`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -13970,7 +13970,7 @@ ${lanes.join("\n")}
   function getErrorSpanForNode(sourceFile, node) {
     let errorNode = node;
     switch (node.kind) {
-      case 308 /* SourceFile */:
+      case 308 /* SourceFile */: {
         const pos2 = skipTrivia(
           sourceFile.text,
           0,
@@ -13981,6 +13981,7 @@ ${lanes.join("\n")}
           return createTextSpan(0, 0);
         }
         return getSpanOfTokenAtPosition(sourceFile, pos2);
+      }
       case 257 /* VariableDeclaration */:
       case 205 /* BindingElement */:
       case 260 /* ClassDeclaration */:
@@ -14003,10 +14004,16 @@ ${lanes.join("\n")}
       case 216 /* ArrowFunction */:
         return getErrorSpanForArrowFunction(sourceFile, node);
       case 292 /* CaseClause */:
-      case 293 /* DefaultClause */:
+      case 293 /* DefaultClause */: {
         const start = skipTrivia(sourceFile.text, node.pos);
         const end = node.statements.length > 0 ? node.statements[0].pos : node.end;
         return createTextSpanFromBounds(start, end);
+      }
+      case 250 /* ReturnStatement */:
+      case 226 /* YieldExpression */: {
+        const pos2 = skipTrivia(sourceFile.text, node.pos);
+        return getSpanOfTokenAtPosition(sourceFile, pos2);
+      }
     }
     if (errorNode === void 0) {
       return getSpanOfTokenAtPosition(sourceFile, node.pos);
@@ -44053,7 +44060,7 @@ ${lanes.join("\n")}
         ModuleInstanceState2[ModuleInstanceState2["ConstEnumOnly"] = 2] = "ConstEnumOnly";
         return ModuleInstanceState2;
       })(ModuleInstanceState || {});
-      binder = createBinder();
+      binder = /* @__PURE__ */ createBinder();
     }
   });
 
@@ -143873,6 +143880,24 @@ ${lanes.join("\n")}
   function deleteDestructuringElements(changes, sourceFile, node) {
     forEach(node.elements, (n) => changes.delete(sourceFile, n));
   }
+  function deleteDestructuring(context, changes, sourceFile, { parent: parent2 }) {
+    if (isVariableDeclaration(parent2) && parent2.initializer && isCallLikeExpression(parent2.initializer)) {
+      if (isVariableDeclarationList(parent2.parent) && length(parent2.parent.declarations) > 1) {
+        const varStatement = parent2.parent.parent;
+        const pos = varStatement.getStart(sourceFile);
+        const end = varStatement.end;
+        changes.delete(sourceFile, parent2);
+        changes.insertNodeAt(sourceFile, end, parent2.initializer, {
+          prefix: getNewLineOrDefaultFromHost(context.host, context.formatContext.options) + sourceFile.text.slice(getPrecedingNonSpaceCharacterPosition(sourceFile.text, pos - 1), pos),
+          suffix: probablyUsesSemicolons(sourceFile) ? ";" : ""
+        });
+      } else {
+        changes.replaceNode(sourceFile, parent2.parent, parent2.initializer);
+      }
+    } else {
+      changes.delete(sourceFile, parent2);
+    }
+  }
   function tryPrefixDeclaration(changes, errorCode, sourceFile, token) {
     if (errorCode === Diagnostics.Property_0_is_declared_but_its_value_is_never_read.code)
       return;
@@ -144062,7 +144087,7 @@ ${lanes.join("\n")}
               ];
             }
             return [
-              createDeleteFix(ts_textChanges_exports.ChangeTracker.with(context, (t) => t.delete(sourceFile, token.parent.parent)), Diagnostics.Remove_unused_destructuring_declaration)
+              createDeleteFix(ts_textChanges_exports.ChangeTracker.with(context, (t) => deleteDestructuring(context, t, sourceFile, token.parent)), Diagnostics.Remove_unused_destructuring_declaration)
             ];
           }
           if (canDeleteEntireVariableStatement(sourceFile, token)) {

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-dev.20230305`;
+      version = `${versionMajorMinor}.0-dev.20230307`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -13970,7 +13970,7 @@ ${lanes.join("\n")}
   function getErrorSpanForNode(sourceFile, node) {
     let errorNode = node;
     switch (node.kind) {
-      case 308 /* SourceFile */:
+      case 308 /* SourceFile */: {
         const pos2 = skipTrivia(
           sourceFile.text,
           0,
@@ -13981,6 +13981,7 @@ ${lanes.join("\n")}
           return createTextSpan(0, 0);
         }
         return getSpanOfTokenAtPosition(sourceFile, pos2);
+      }
       case 257 /* VariableDeclaration */:
       case 205 /* BindingElement */:
       case 260 /* ClassDeclaration */:
@@ -14003,10 +14004,16 @@ ${lanes.join("\n")}
       case 216 /* ArrowFunction */:
         return getErrorSpanForArrowFunction(sourceFile, node);
       case 292 /* CaseClause */:
-      case 293 /* DefaultClause */:
+      case 293 /* DefaultClause */: {
         const start = skipTrivia(sourceFile.text, node.pos);
         const end = node.statements.length > 0 ? node.statements[0].pos : node.end;
         return createTextSpanFromBounds(start, end);
+      }
+      case 250 /* ReturnStatement */:
+      case 226 /* YieldExpression */: {
+        const pos2 = skipTrivia(sourceFile.text, node.pos);
+        return getSpanOfTokenAtPosition(sourceFile, pos2);
+      }
     }
     if (errorNode === void 0) {
       return getSpanOfTokenAtPosition(sourceFile, node.pos);
@@ -44053,7 +44060,7 @@ ${lanes.join("\n")}
         ModuleInstanceState2[ModuleInstanceState2["ConstEnumOnly"] = 2] = "ConstEnumOnly";
         return ModuleInstanceState2;
       })(ModuleInstanceState || {});
-      binder = createBinder();
+      binder = /* @__PURE__ */ createBinder();
     }
   });
 
@@ -143887,6 +143894,24 @@ ${lanes.join("\n")}
   function deleteDestructuringElements(changes, sourceFile, node) {
     forEach(node.elements, (n) => changes.delete(sourceFile, n));
   }
+  function deleteDestructuring(context, changes, sourceFile, { parent: parent2 }) {
+    if (isVariableDeclaration(parent2) && parent2.initializer && isCallLikeExpression(parent2.initializer)) {
+      if (isVariableDeclarationList(parent2.parent) && length(parent2.parent.declarations) > 1) {
+        const varStatement = parent2.parent.parent;
+        const pos = varStatement.getStart(sourceFile);
+        const end = varStatement.end;
+        changes.delete(sourceFile, parent2);
+        changes.insertNodeAt(sourceFile, end, parent2.initializer, {
+          prefix: getNewLineOrDefaultFromHost(context.host, context.formatContext.options) + sourceFile.text.slice(getPrecedingNonSpaceCharacterPosition(sourceFile.text, pos - 1), pos),
+          suffix: probablyUsesSemicolons(sourceFile) ? ";" : ""
+        });
+      } else {
+        changes.replaceNode(sourceFile, parent2.parent, parent2.initializer);
+      }
+    } else {
+      changes.delete(sourceFile, parent2);
+    }
+  }
   function tryPrefixDeclaration(changes, errorCode, sourceFile, token) {
     if (errorCode === Diagnostics.Property_0_is_declared_but_its_value_is_never_read.code)
       return;
@@ -144076,7 +144101,7 @@ ${lanes.join("\n")}
               ];
             }
             return [
-              createDeleteFix(ts_textChanges_exports.ChangeTracker.with(context, (t) => t.delete(sourceFile, token.parent.parent)), Diagnostics.Remove_unused_destructuring_declaration)
+              createDeleteFix(ts_textChanges_exports.ChangeTracker.with(context, (t) => deleteDestructuring(context, t, sourceFile, token.parent)), Diagnostics.Remove_unused_destructuring_declaration)
             ];
           }
           if (canDeleteEntireVariableStatement(sourceFile, token)) {