typescript 5.7.0-dev.20241029 → 5.7.0-dev.20241030

package/lib/_tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.7";
-var version = `${versionMajorMinor}.0-dev.20241029`;
+var version = `${versionMajorMinor}.0-dev.20241030`;
 
 // src/compiler/core.ts
 var emptyArray = [];

package/lib/typescript.js

@@ -2277,7 +2277,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.7";
-var version = `${versionMajorMinor}.0-dev.20241029`;
+var version = `${versionMajorMinor}.0-dev.20241030`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -177288,6 +177288,7 @@ __export(ts_textChanges_exports, {
   assignPositionsToNode: () => assignPositionsToNode,
   createWriter: () => createWriter,
   deleteNode: () => deleteNode,
+  getAdjustedEndPosition: () => getAdjustedEndPosition,
   isThisTypeAnnotatable: () => isThisTypeAnnotatable,
   isValidLocationToAddComment: () => isValidLocationToAddComment
 });
@@ -181448,11 +181449,13 @@ function pasteEdits(targetFile, pastedText, pasteLocations, copiedFrom, host, pr
         }
         statements.push(...statementsInSourceFile.slice(startNodeIndex, endNodeIndex === -1 ? statementsInSourceFile.length : endNodeIndex + 1));
       });
-      const usage = getUsageInfo(copiedFrom.file, statements, originalProgram.getTypeChecker(), getExistingLocals(updatedFile, statements, originalProgram.getTypeChecker()), { pos: copiedFrom.range[0].pos, end: copiedFrom.range[copiedFrom.range.length - 1].end });
-      Debug.assertIsDefined(originalProgram);
+      Debug.assertIsDefined(originalProgram, "no original program found");
+      const originalProgramTypeChecker = originalProgram.getTypeChecker();
+      const usageInfoRange = getUsageInfoRangeForPasteEdits(copiedFrom);
+      const usage = getUsageInfo(copiedFrom.file, statements, originalProgramTypeChecker, getExistingLocals(updatedFile, statements, originalProgramTypeChecker), usageInfoRange);
       const useEsModuleSyntax = !fileShouldUseJavaScriptRequire(targetFile.fileName, originalProgram, host, !!copiedFrom.file.commonJsModuleIndicator);
       addExportsInOldFile(copiedFrom.file, usage.targetFileImportsFromOldFile, changes, useEsModuleSyntax);
-      addTargetFileImports(copiedFrom.file, usage.oldImportsNeededByTargetFile, usage.targetFileImportsFromOldFile, originalProgram.getTypeChecker(), updatedProgram, importAdder);
+      addTargetFileImports(copiedFrom.file, usage.oldImportsNeededByTargetFile, usage.targetFileImportsFromOldFile, originalProgramTypeChecker, updatedProgram, importAdder);
     } else {
       const context = {
         sourceFile: updatedFile,
@@ -181508,6 +181511,16 @@ function pasteEdits(targetFile, pastedText, pasteLocations, copiedFrom, host, pr
     );
   });
 }
+function getUsageInfoRangeForPasteEdits({ file: sourceFile, range }) {
+  const pos = range[0].pos;
+  const end = range[range.length - 1].end;
+  const startToken = getTokenAtPosition(sourceFile, pos);
+  const endToken = findTokenOnLeftOfPosition(sourceFile, pos) ?? getTokenAtPosition(sourceFile, end);
+  return {
+    pos: isIdentifier(startToken) && pos <= startToken.getStart(sourceFile) ? startToken.getFullStart() : pos,
+    end: isIdentifier(endToken) && end === endToken.getEnd() ? ts_textChanges_exports.getAdjustedEndPosition(sourceFile, endToken, {}) : end
+  };
+}
 
 // src/server/_namespaces/ts.ts
 var ts_exports2 = {};

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.7.0-dev.20241029",
+    "version": "5.7.0-dev.20241030",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -116,5 +116,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "cb44488fcec4348a448434afbf2ebcbf2b423c61"
+    "gitHead": "21618934bf91855e5800d94d34463f29526811cb"
 }