typescript 5.4.0-dev.20240216 → 5.4.0-dev.20240218

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20240216`;
+var version = `${versionMajorMinor}.0-dev.20240218`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -57358,7 +57358,7 @@ function createTypeChecker(host) {
     return target.objectFlags & 8 /* Tuple */ ? createNormalizedTupleType(target, typeArguments) : createTypeReference(target, typeArguments);
   }
   function createNormalizedTupleType(target, elementTypes) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (!(target.combinedFlags & 14 /* NonRequired */)) {
       return createTypeReference(target, elementTypes);
     }
@@ -57378,8 +57378,10 @@ function createTypeChecker(host) {
       const type = elementTypes[i];
       const flags = target.elementFlags[i];
       if (flags & 8 /* Variadic */) {
-        if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
-          addElement(type, 8 /* Variadic */, (_a = target.labeledElementDeclarations) == null ? void 0 : _a[i]);
+        if (type.flags & 1 /* Any */) {
+          addElement(type, 4 /* Rest */, (_a = target.labeledElementDeclarations) == null ? void 0 : _a[i]);
+        } else if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
+          addElement(type, 8 /* Variadic */, (_b = target.labeledElementDeclarations) == null ? void 0 : _b[i]);
         } else if (isTupleType(type)) {
           const elements = getElementTypes(type);
           if (elements.length + expandedTypes.length >= 1e4) {
@@ -57394,10 +57396,10 @@ function createTypeChecker(host) {
             return addElement(t, type.target.elementFlags[n], (_a2 = type.target.labeledElementDeclarations) == null ? void 0 : _a2[n]);
           });
         } else {
-          addElement(isArrayLikeType(type) && getIndexTypeOfType(type, numberType) || errorType, 4 /* Rest */, (_b = target.labeledElementDeclarations) == null ? void 0 : _b[i]);
+          addElement(isArrayLikeType(type) && getIndexTypeOfType(type, numberType) || errorType, 4 /* Rest */, (_c = target.labeledElementDeclarations) == null ? void 0 : _c[i]);
         }
       } else {
-        addElement(type, flags, (_c = target.labeledElementDeclarations) == null ? void 0 : _c[i]);
+        addElement(type, flags, (_d = target.labeledElementDeclarations) == null ? void 0 : _d[i]);
       }
     }
     for (let i = 0; i < lastRequiredIndex; i++) {
@@ -58761,10 +58763,6 @@ function createTypeChecker(host) {
     }
     return type;
   }
-  function maybeCloneTypeParameter(p) {
-    const constraint = getConstraintOfTypeParameter(p);
-    return constraint && (isGenericObjectType(constraint) || isGenericIndexType(constraint)) ? cloneTypeParameter(p) : p;
-  }
   function isSimpleTupleType(node) {
     return isTupleTypeNode(node) && length(node.elements) > 0 && !some(node.elements, (e) => isOptionalTypeNode(e) || isRestTypeNode(e) || isNamedTupleMember(e) && !!(e.questionToken || e.dotDotDotToken));
   }
@@ -58794,27 +58792,19 @@ function createTypeChecker(host) {
       const checkTypeDeferred = isDeferredType(checkType, checkTuples);
       let combinedMapper;
       if (root.inferTypeParameters) {
-        const freshParams = sameMap(root.inferTypeParameters, maybeCloneTypeParameter);
-        const freshMapper = freshParams !== root.inferTypeParameters ? createTypeMapper(root.inferTypeParameters, freshParams) : void 0;
         const context = createInferenceContext(
-          freshParams,
+          root.inferTypeParameters,
           /*signature*/
           void 0,
           0 /* None */
         );
-        if (freshMapper) {
-          const freshCombinedMapper = combineTypeMappers(mapper, freshMapper);
-          for (let i = 0; i < freshParams.length; i++) {
-            if (freshParams[i] !== root.inferTypeParameters[i]) {
-              freshParams[i].mapper = freshCombinedMapper;
-            }
-          }
+        if (mapper) {
+          context.nonFixingMapper = combineTypeMappers(context.nonFixingMapper, mapper);
         }
         if (!checkTypeDeferred) {
-          inferTypes(context.inferences, checkType, instantiateType(extendsType, freshMapper), 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
+          inferTypes(context.inferences, checkType, extendsType, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
         }
-        const innerMapper = combineTypeMappers(freshMapper, context.mapper);
-        combinedMapper = mapper ? combineTypeMappers(innerMapper, mapper) : innerMapper;
+        combinedMapper = mapper ? combineTypeMappers(context.mapper, mapper) : context.mapper;
       }
       const inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
       if (!checkTypeDeferred && !isDeferredType(inferredExtendsType, checkTuples)) {

package/lib/tsserver.js

@@ -2340,7 +2340,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20240216`;
+var version = `${versionMajorMinor}.0-dev.20240218`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -62102,7 +62102,7 @@ function createTypeChecker(host) {
     return target.objectFlags & 8 /* Tuple */ ? createNormalizedTupleType(target, typeArguments) : createTypeReference(target, typeArguments);
   }
   function createNormalizedTupleType(target, elementTypes) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (!(target.combinedFlags & 14 /* NonRequired */)) {
       return createTypeReference(target, elementTypes);
     }
@@ -62122,8 +62122,10 @@ function createTypeChecker(host) {
       const type = elementTypes[i];
       const flags = target.elementFlags[i];
       if (flags & 8 /* Variadic */) {
-        if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
-          addElement(type, 8 /* Variadic */, (_a = target.labeledElementDeclarations) == null ? void 0 : _a[i]);
+        if (type.flags & 1 /* Any */) {
+          addElement(type, 4 /* Rest */, (_a = target.labeledElementDeclarations) == null ? void 0 : _a[i]);
+        } else if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
+          addElement(type, 8 /* Variadic */, (_b = target.labeledElementDeclarations) == null ? void 0 : _b[i]);
         } else if (isTupleType(type)) {
           const elements = getElementTypes(type);
           if (elements.length + expandedTypes.length >= 1e4) {
@@ -62138,10 +62140,10 @@ function createTypeChecker(host) {
             return addElement(t, type.target.elementFlags[n], (_a2 = type.target.labeledElementDeclarations) == null ? void 0 : _a2[n]);
           });
         } else {
-          addElement(isArrayLikeType(type) && getIndexTypeOfType(type, numberType) || errorType, 4 /* Rest */, (_b = target.labeledElementDeclarations) == null ? void 0 : _b[i]);
+          addElement(isArrayLikeType(type) && getIndexTypeOfType(type, numberType) || errorType, 4 /* Rest */, (_c = target.labeledElementDeclarations) == null ? void 0 : _c[i]);
         }
       } else {
-        addElement(type, flags, (_c = target.labeledElementDeclarations) == null ? void 0 : _c[i]);
+        addElement(type, flags, (_d = target.labeledElementDeclarations) == null ? void 0 : _d[i]);
       }
     }
     for (let i = 0; i < lastRequiredIndex; i++) {
@@ -63505,10 +63507,6 @@ function createTypeChecker(host) {
     }
     return type;
   }
-  function maybeCloneTypeParameter(p) {
-    const constraint = getConstraintOfTypeParameter(p);
-    return constraint && (isGenericObjectType(constraint) || isGenericIndexType(constraint)) ? cloneTypeParameter(p) : p;
-  }
   function isSimpleTupleType(node) {
     return isTupleTypeNode(node) && length(node.elements) > 0 && !some(node.elements, (e) => isOptionalTypeNode(e) || isRestTypeNode(e) || isNamedTupleMember(e) && !!(e.questionToken || e.dotDotDotToken));
   }
@@ -63538,27 +63536,19 @@ function createTypeChecker(host) {
       const checkTypeDeferred = isDeferredType(checkType, checkTuples);
       let combinedMapper;
       if (root.inferTypeParameters) {
-        const freshParams = sameMap(root.inferTypeParameters, maybeCloneTypeParameter);
-        const freshMapper = freshParams !== root.inferTypeParameters ? createTypeMapper(root.inferTypeParameters, freshParams) : void 0;
         const context = createInferenceContext(
-          freshParams,
+          root.inferTypeParameters,
           /*signature*/
           void 0,
           0 /* None */
         );
-        if (freshMapper) {
-          const freshCombinedMapper = combineTypeMappers(mapper, freshMapper);
-          for (let i = 0; i < freshParams.length; i++) {
-            if (freshParams[i] !== root.inferTypeParameters[i]) {
-              freshParams[i].mapper = freshCombinedMapper;
-            }
-          }
+        if (mapper) {
+          context.nonFixingMapper = combineTypeMappers(context.nonFixingMapper, mapper);
         }
         if (!checkTypeDeferred) {
-          inferTypes(context.inferences, checkType, instantiateType(extendsType, freshMapper), 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
+          inferTypes(context.inferences, checkType, extendsType, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
         }
-        const innerMapper = combineTypeMappers(freshMapper, context.mapper);
-        combinedMapper = mapper ? combineTypeMappers(innerMapper, mapper) : innerMapper;
+        combinedMapper = mapper ? combineTypeMappers(context.mapper, mapper) : context.mapper;
       }
       const inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
       if (!checkTypeDeferred && !isDeferredType(inferredExtendsType, checkTuples)) {
@@ -139662,6 +139652,7 @@ __export(ts_refactor_exports, {
   addExports: () => addExports,
   addNewFileToTsconfig: () => addNewFileToTsconfig,
   addOrRemoveBracesToArrowFunction: () => ts_refactor_addOrRemoveBracesToArrowFunction_exports,
+  containsJsx: () => containsJsx,
   convertArrowFunctionOrFunctionExpression: () => ts_refactor_convertArrowFunctionOrFunctionExpression_exports,
   convertParamsToDestructuredObject: () => ts_refactor_convertParamsToDestructuredObject_exports,
   convertStringOrTemplateLiteral: () => ts_refactor_convertStringOrTemplateLiteral_exports,
@@ -140722,14 +140713,14 @@ registerRefactor(refactorName5, {
   getEditsForAction: function getRefactorEditsToMoveToNewFile(context, actionName2) {
     Debug.assert(actionName2 === refactorName5, "Wrong refactor invoked");
     const statements = Debug.checkDefined(getStatementsToMove(context));
-    const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange3(context.file, context.program, statements, t, context.host, context.preferences, context));
+    const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange3(context.file, context.program, statements, t, context.host, context.preferences));
     return { edits, renameFilename: void 0, renameLocation: void 0 };
   }
 });
-function doChange3(oldFile, program, toMove, changes, host, preferences, context) {
+function doChange3(oldFile, program, toMove, changes, host, preferences) {
   const checker = program.getTypeChecker();
   const usage = getUsageInfo(oldFile, toMove.all, checker);
-  const newFilename = createNewFileName(oldFile, program, context, host);
+  const newFilename = createNewFileName(oldFile, program, host, toMove);
   changes.createNewFile(oldFile, newFilename, getNewStatementsAndRemoveFromOldFile(oldFile, usage, changes, toMove, program, host, newFilename, preferences));
   addNewFileToTsconfig(program, changes, oldFile.fileName, newFilename, hostGetCanonicalFileName(host));
 }
@@ -141442,12 +141433,10 @@ function addExportToChanges(sourceFile, decl, name, changes, useEs6Exports) {
       changes.insertNodesAfter(sourceFile, decl, names.map(createExportAssignment));
   }
 }
-function createNewFileName(oldFile, program, context, host) {
+function createNewFileName(oldFile, program, host, toMove) {
   const checker = program.getTypeChecker();
-  const toMove = getStatementsToMove(context);
-  let usage;
   if (toMove) {
-    usage = getUsageInfo(oldFile, toMove.all, checker);
+    const usage = getUsageInfo(oldFile, toMove.all, checker);
     const currentDirectory = getDirectoryPath(oldFile.fileName);
     const extension = extensionFromPath(oldFile.fileName);
     const newFileName = combinePaths(
@@ -141505,6 +141494,9 @@ function getStatementsToMove(context) {
   });
   return all.length === 0 ? void 0 : { all, ranges };
 }
+function containsJsx(statements) {
+  return find(statements, (statement) => !!(statement.transformFlags & 2 /* ContainsJsx */));
+}
 function isAllowedStatementToMove(statement) {
   return !isPureImport(statement) && !isPrologueDirective(statement);
 }
@@ -141528,8 +141520,7 @@ function getUsageInfo(oldFile, toMove, checker, existingTargetLocals = /* @__PUR
   const movedSymbols = /* @__PURE__ */ new Set();
   const oldImportsNeededByTargetFile = /* @__PURE__ */ new Map();
   const targetFileImportsFromOldFile = /* @__PURE__ */ new Set();
-  const containsJsx = find(toMove, (statement) => !!(statement.transformFlags & 2 /* ContainsJsx */));
-  const jsxNamespaceSymbol = getJsxNamespaceSymbol(containsJsx);
+  const jsxNamespaceSymbol = getJsxNamespaceSymbol(containsJsx(toMove));
   if (jsxNamespaceSymbol) {
     oldImportsNeededByTargetFile.set(jsxNamespaceSymbol, false);
   }
@@ -147257,9 +147248,14 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
     const sourceFile = getValidSourceFile(fileName);
     const allFiles = Debug.checkDefined(program.getSourceFiles());
     const extension = extensionFromPath(fileName);
-    const files = mapDefined(allFiles, (file) => !(program == null ? void 0 : program.isSourceFileFromExternalLibrary(sourceFile)) && !(sourceFile === getValidSourceFile(file.fileName) || extension === ".ts" /* Ts */ && extensionFromPath(file.fileName) === ".d.ts" /* Dts */ || extension === ".d.ts" /* Dts */ && startsWith(getBaseFileName(file.fileName), "lib.") && extensionFromPath(file.fileName) === ".d.ts" /* Dts */) && extension === extensionFromPath(file.fileName) ? file.fileName : void 0);
-    const newFileName = createNewFileName(sourceFile, program, getRefactorContext(sourceFile, positionOrRange, preferences, emptyOptions), host);
-    return { newFileName, files };
+    const toMove = getStatementsToMove(getRefactorContext(sourceFile, positionOrRange, preferences, emptyOptions));
+    const toMoveContainsJsx = containsJsx(toMove == null ? void 0 : toMove.all);
+    const files = mapDefined(allFiles, (file) => {
+      const fileNameExtension = extensionFromPath(file.fileName);
+      const isValidSourceFile = !(program == null ? void 0 : program.isSourceFileFromExternalLibrary(sourceFile)) && !(sourceFile === getValidSourceFile(file.fileName) || extension === ".ts" /* Ts */ && fileNameExtension === ".d.ts" /* Dts */ || extension === ".d.ts" /* Dts */ && startsWith(getBaseFileName(file.fileName), "lib.") && fileNameExtension === ".d.ts" /* Dts */);
+      return isValidSourceFile && (extension === fileNameExtension || (extension === ".tsx" /* Tsx */ && fileNameExtension === ".ts" /* Ts */ || extension === ".jsx" /* Jsx */ && fileNameExtension === ".js" /* Js */) && !toMoveContainsJsx) ? file.fileName : void 0;
+    });
+    return { newFileName: createNewFileName(sourceFile, program, host, toMove), files };
   }
   function getEditsForRefactor2(fileName, formatOptions, positionOrRange, refactorName14, actionName2, preferences = emptyOptions, interactiveRefactorArguments) {
     synchronizeHostData();
@@ -162287,7 +162283,7 @@ function isClassMemberCompletionKeyword(kind) {
   }
 }
 function isFunctionLikeBodyKeyword(kind) {
-  return kind === 134 /* AsyncKeyword */ || kind === 135 /* AwaitKeyword */ || kind === 130 /* AsKeyword */ || kind === 152 /* SatisfiesKeyword */ || kind === 156 /* TypeKeyword */ || !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
+  return kind === 134 /* AsyncKeyword */ || kind === 135 /* AwaitKeyword */ || kind === 160 /* UsingKeyword */ || kind === 130 /* AsKeyword */ || kind === 152 /* SatisfiesKeyword */ || kind === 156 /* TypeKeyword */ || !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
 }
 function keywordForNode(node) {
   return isIdentifier(node) ? identifierToKeywordKind(node) ?? 0 /* Unknown */ : node.kind;

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.4";
-      version = `${versionMajorMinor}.0-dev.20240216`;
+      version = `${versionMajorMinor}.0-dev.20240218`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -59857,7 +59857,7 @@ ${lanes.join("\n")}
       return target.objectFlags & 8 /* Tuple */ ? createNormalizedTupleType(target, typeArguments) : createTypeReference(target, typeArguments);
     }
     function createNormalizedTupleType(target, elementTypes) {
-      var _a, _b, _c;
+      var _a, _b, _c, _d;
       if (!(target.combinedFlags & 14 /* NonRequired */)) {
         return createTypeReference(target, elementTypes);
       }
@@ -59877,8 +59877,10 @@ ${lanes.join("\n")}
         const type = elementTypes[i];
         const flags = target.elementFlags[i];
         if (flags & 8 /* Variadic */) {
-          if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
-            addElement(type, 8 /* Variadic */, (_a = target.labeledElementDeclarations) == null ? void 0 : _a[i]);
+          if (type.flags & 1 /* Any */) {
+            addElement(type, 4 /* Rest */, (_a = target.labeledElementDeclarations) == null ? void 0 : _a[i]);
+          } else if (type.flags & 58982400 /* InstantiableNonPrimitive */ || isGenericMappedType(type)) {
+            addElement(type, 8 /* Variadic */, (_b = target.labeledElementDeclarations) == null ? void 0 : _b[i]);
           } else if (isTupleType(type)) {
             const elements = getElementTypes(type);
             if (elements.length + expandedTypes.length >= 1e4) {
@@ -59893,10 +59895,10 @@ ${lanes.join("\n")}
               return addElement(t, type.target.elementFlags[n], (_a2 = type.target.labeledElementDeclarations) == null ? void 0 : _a2[n]);
             });
           } else {
-            addElement(isArrayLikeType(type) && getIndexTypeOfType(type, numberType) || errorType, 4 /* Rest */, (_b = target.labeledElementDeclarations) == null ? void 0 : _b[i]);
+            addElement(isArrayLikeType(type) && getIndexTypeOfType(type, numberType) || errorType, 4 /* Rest */, (_c = target.labeledElementDeclarations) == null ? void 0 : _c[i]);
           }
         } else {
-          addElement(type, flags, (_c = target.labeledElementDeclarations) == null ? void 0 : _c[i]);
+          addElement(type, flags, (_d = target.labeledElementDeclarations) == null ? void 0 : _d[i]);
         }
       }
       for (let i = 0; i < lastRequiredIndex; i++) {
@@ -61260,10 +61262,6 @@ ${lanes.join("\n")}
       }
       return type;
     }
-    function maybeCloneTypeParameter(p) {
-      const constraint = getConstraintOfTypeParameter(p);
-      return constraint && (isGenericObjectType(constraint) || isGenericIndexType(constraint)) ? cloneTypeParameter(p) : p;
-    }
     function isSimpleTupleType(node) {
       return isTupleTypeNode(node) && length(node.elements) > 0 && !some(node.elements, (e) => isOptionalTypeNode(e) || isRestTypeNode(e) || isNamedTupleMember(e) && !!(e.questionToken || e.dotDotDotToken));
     }
@@ -61293,27 +61291,19 @@ ${lanes.join("\n")}
         const checkTypeDeferred = isDeferredType(checkType, checkTuples);
         let combinedMapper;
         if (root.inferTypeParameters) {
-          const freshParams = sameMap(root.inferTypeParameters, maybeCloneTypeParameter);
-          const freshMapper = freshParams !== root.inferTypeParameters ? createTypeMapper(root.inferTypeParameters, freshParams) : void 0;
           const context = createInferenceContext(
-            freshParams,
+            root.inferTypeParameters,
             /*signature*/
             void 0,
             0 /* None */
           );
-          if (freshMapper) {
-            const freshCombinedMapper = combineTypeMappers(mapper, freshMapper);
-            for (let i = 0; i < freshParams.length; i++) {
-              if (freshParams[i] !== root.inferTypeParameters[i]) {
-                freshParams[i].mapper = freshCombinedMapper;
-              }
-            }
+          if (mapper) {
+            context.nonFixingMapper = combineTypeMappers(context.nonFixingMapper, mapper);
           }
           if (!checkTypeDeferred) {
-            inferTypes(context.inferences, checkType, instantiateType(extendsType, freshMapper), 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
+            inferTypes(context.inferences, checkType, extendsType, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
           }
-          const innerMapper = combineTypeMappers(freshMapper, context.mapper);
-          combinedMapper = mapper ? combineTypeMappers(innerMapper, mapper) : innerMapper;
+          combinedMapper = mapper ? combineTypeMappers(context.mapper, mapper) : context.mapper;
         }
         const inferredExtendsType = combinedMapper ? instantiateType(root.extendsType, combinedMapper) : extendsType;
         if (!checkTypeDeferred && !isDeferredType(inferredExtendsType, checkTuples)) {
@@ -139098,10 +139088,10 @@ ${lanes.join("\n")}
   });
 
   // src/services/refactors/moveToNewFile.ts
-  function doChange3(oldFile, program, toMove, changes, host, preferences, context) {
+  function doChange3(oldFile, program, toMove, changes, host, preferences) {
     const checker = program.getTypeChecker();
     const usage = getUsageInfo(oldFile, toMove.all, checker);
-    const newFilename = createNewFileName(oldFile, program, context, host);
+    const newFilename = createNewFileName(oldFile, program, host, toMove);
     changes.createNewFile(oldFile, newFilename, getNewStatementsAndRemoveFromOldFile(oldFile, usage, changes, toMove, program, host, newFilename, preferences));
     addNewFileToTsconfig(program, changes, oldFile.fileName, newFilename, hostGetCanonicalFileName(host));
   }
@@ -139206,7 +139196,7 @@ ${lanes.join("\n")}
         getEditsForAction: function getRefactorEditsToMoveToNewFile(context, actionName2) {
           Debug.assert(actionName2 === refactorName5, "Wrong refactor invoked");
           const statements = Debug.checkDefined(getStatementsToMove(context));
-          const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange3(context.file, context.program, statements, t, context.host, context.preferences, context));
+          const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange3(context.file, context.program, statements, t, context.host, context.preferences));
           return { edits, renameFilename: void 0, renameLocation: void 0 };
         }
       });
@@ -139810,12 +139800,10 @@ ${lanes.join("\n")}
         changes.insertNodesAfter(sourceFile, decl, names.map(createExportAssignment));
     }
   }
-  function createNewFileName(oldFile, program, context, host) {
+  function createNewFileName(oldFile, program, host, toMove) {
     const checker = program.getTypeChecker();
-    const toMove = getStatementsToMove(context);
-    let usage;
     if (toMove) {
-      usage = getUsageInfo(oldFile, toMove.all, checker);
+      const usage = getUsageInfo(oldFile, toMove.all, checker);
       const currentDirectory = getDirectoryPath(oldFile.fileName);
       const extension = extensionFromPath(oldFile.fileName);
       const newFileName = combinePaths(
@@ -139873,6 +139861,9 @@ ${lanes.join("\n")}
     });
     return all.length === 0 ? void 0 : { all, ranges };
   }
+  function containsJsx(statements) {
+    return find(statements, (statement) => !!(statement.transformFlags & 2 /* ContainsJsx */));
+  }
   function isAllowedStatementToMove(statement) {
     return !isPureImport(statement) && !isPrologueDirective(statement);
   }
@@ -139896,8 +139887,7 @@ ${lanes.join("\n")}
     const movedSymbols = /* @__PURE__ */ new Set();
     const oldImportsNeededByTargetFile = /* @__PURE__ */ new Map();
     const targetFileImportsFromOldFile = /* @__PURE__ */ new Set();
-    const containsJsx = find(toMove, (statement) => !!(statement.transformFlags & 2 /* ContainsJsx */));
-    const jsxNamespaceSymbol = getJsxNamespaceSymbol(containsJsx);
+    const jsxNamespaceSymbol = getJsxNamespaceSymbol(containsJsx(toMove));
     if (jsxNamespaceSymbol) {
       oldImportsNeededByTargetFile.set(jsxNamespaceSymbol, false);
     }
@@ -143614,6 +143604,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     addExports: () => addExports,
     addNewFileToTsconfig: () => addNewFileToTsconfig,
     addOrRemoveBracesToArrowFunction: () => ts_refactor_addOrRemoveBracesToArrowFunction_exports,
+    containsJsx: () => containsJsx,
     convertArrowFunctionOrFunctionExpression: () => ts_refactor_convertArrowFunctionOrFunctionExpression_exports,
     convertParamsToDestructuredObject: () => ts_refactor_convertParamsToDestructuredObject_exports,
     convertStringOrTemplateLiteral: () => ts_refactor_convertStringOrTemplateLiteral_exports,
@@ -145189,9 +145180,14 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       const sourceFile = getValidSourceFile(fileName);
       const allFiles = Debug.checkDefined(program.getSourceFiles());
       const extension = extensionFromPath(fileName);
-      const files = mapDefined(allFiles, (file) => !(program == null ? void 0 : program.isSourceFileFromExternalLibrary(sourceFile)) && !(sourceFile === getValidSourceFile(file.fileName) || extension === ".ts" /* Ts */ && extensionFromPath(file.fileName) === ".d.ts" /* Dts */ || extension === ".d.ts" /* Dts */ && startsWith(getBaseFileName(file.fileName), "lib.") && extensionFromPath(file.fileName) === ".d.ts" /* Dts */) && extension === extensionFromPath(file.fileName) ? file.fileName : void 0);
-      const newFileName = createNewFileName(sourceFile, program, getRefactorContext(sourceFile, positionOrRange, preferences, emptyOptions), host);
-      return { newFileName, files };
+      const toMove = getStatementsToMove(getRefactorContext(sourceFile, positionOrRange, preferences, emptyOptions));
+      const toMoveContainsJsx = containsJsx(toMove == null ? void 0 : toMove.all);
+      const files = mapDefined(allFiles, (file) => {
+        const fileNameExtension = extensionFromPath(file.fileName);
+        const isValidSourceFile = !(program == null ? void 0 : program.isSourceFileFromExternalLibrary(sourceFile)) && !(sourceFile === getValidSourceFile(file.fileName) || extension === ".ts" /* Ts */ && fileNameExtension === ".d.ts" /* Dts */ || extension === ".d.ts" /* Dts */ && startsWith(getBaseFileName(file.fileName), "lib.") && fileNameExtension === ".d.ts" /* Dts */);
+        return isValidSourceFile && (extension === fileNameExtension || (extension === ".tsx" /* Tsx */ && fileNameExtension === ".ts" /* Ts */ || extension === ".jsx" /* Jsx */ && fileNameExtension === ".js" /* Js */) && !toMoveContainsJsx) ? file.fileName : void 0;
+      });
+      return { newFileName: createNewFileName(sourceFile, program, host, toMove), files };
     }
     function getEditsForRefactor2(fileName, formatOptions, positionOrRange, refactorName14, actionName2, preferences = emptyOptions, interactiveRefactorArguments) {
       synchronizeHostData();
@@ -161488,7 +161484,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     }
   }
   function isFunctionLikeBodyKeyword(kind) {
-    return kind === 134 /* AsyncKeyword */ || kind === 135 /* AwaitKeyword */ || kind === 130 /* AsKeyword */ || kind === 152 /* SatisfiesKeyword */ || kind === 156 /* TypeKeyword */ || !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
+    return kind === 134 /* AsyncKeyword */ || kind === 135 /* AwaitKeyword */ || kind === 160 /* UsingKeyword */ || kind === 130 /* AsKeyword */ || kind === 152 /* SatisfiesKeyword */ || kind === 156 /* TypeKeyword */ || !isContextualKeyword(kind) && !isClassMemberCompletionKeyword(kind);
   }
   function keywordForNode(node) {
     return isIdentifier(node) ? identifierToKeywordKind(node) ?? 0 /* Unknown */ : node.kind;

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20240216`;
+var version = `${versionMajorMinor}.0-dev.20240218`;
 
 // 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.4.0-dev.20240216",
+    "version": "5.4.0-dev.20240218",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -113,5 +113,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "c4de2afcc289d42b7bef3df30911e120e8bd6d39"
+    "gitHead": "86a16636cac9599c8752f8588f4b9518860b47ff"
 }