typescript 5.3.0-dev.20231030 → 5.3.0-dev.20231101

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-dev.20231030`;
+var version = `${versionMajorMinor}.0-dev.20231101`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -30689,7 +30689,8 @@ var Parser;
     parseExpected(21 /* OpenParenToken */);
     let initializer;
     if (token() !== 27 /* SemicolonToken */) {
-      if (token() === 115 /* VarKeyword */ || token() === 121 /* LetKeyword */ || token() === 87 /* ConstKeyword */ || token() === 160 /* UsingKeyword */ && lookAhead(nextTokenIsBindingIdentifierOrStartOfDestructuringOnSameLineDisallowOf) || token() === 135 /* AwaitKeyword */ && lookAhead(nextTokenIsUsingKeywordThenBindingIdentifierOrStartOfObjectDestructuringOnSameLineDisallowOf)) {
+      if (token() === 115 /* VarKeyword */ || token() === 121 /* LetKeyword */ || token() === 87 /* ConstKeyword */ || token() === 160 /* UsingKeyword */ && lookAhead(nextTokenIsBindingIdentifierOrStartOfDestructuringOnSameLineDisallowOf) || // this one is meant to allow of
+      token() === 135 /* AwaitKeyword */ && lookAhead(nextTokenIsUsingKeywordThenBindingIdentifierOrStartOfObjectDestructuringOnSameLine)) {
         initializer = parseVariableDeclarationList(
           /*inForStatementInitializer*/
           true
@@ -31010,12 +31011,6 @@ var Parser;
   function isUsingDeclaration() {
     return lookAhead(nextTokenIsBindingIdentifierOrStartOfDestructuringOnSameLine);
   }
-  function nextTokenIsUsingKeywordThenBindingIdentifierOrStartOfObjectDestructuringOnSameLineDisallowOf() {
-    return nextTokenIsUsingKeywordThenBindingIdentifierOrStartOfObjectDestructuringOnSameLine(
-      /*disallowOf*/
-      true
-    );
-  }
   function nextTokenIsUsingKeywordThenBindingIdentifierOrStartOfObjectDestructuringOnSameLine(disallowOf) {
     if (nextToken() === 160 /* UsingKeyword */) {
       return nextTokenIsBindingIdentifierOrStartOfDestructuringOnSameLine(disallowOf);
@@ -37200,8 +37195,7 @@ function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFil
   if (resolutionMode === 99 /* ESNext */ && (3 /* Node16 */ <= moduleResolution && moduleResolution <= 99 /* NodeNext */)) {
     features |= 32 /* EsmMode */;
   }
-  const useImportCondition = resolutionMode === 99 /* ESNext */ || (resolutionMode !== void 0 ? false : void 0);
-  const conditions = features & 8 /* Exports */ ? getConditions(options, useImportCondition) : [];
+  const conditions = features & 8 /* Exports */ ? getConditions(options, resolutionMode) : [];
   const diagnostics = [];
   const moduleResolutionState = {
     compilerOptions: options,
@@ -37369,16 +37363,16 @@ function getNodeResolutionFeatures(options) {
   }
   return features;
 }
-function getConditions(options, esmMode) {
+function getConditions(options, resolutionMode) {
   const moduleResolution = getEmitModuleResolutionKind(options);
-  if (esmMode === void 0) {
+  if (resolutionMode === void 0) {
     if (moduleResolution === 100 /* Bundler */) {
-      esmMode ?? (esmMode = moduleResolution === 100 /* Bundler */);
+      resolutionMode = 99 /* ESNext */;
     } else if (moduleResolution === 2 /* Node10 */) {
       return [];
     }
   }
-  const conditions = esmMode ? ["import"] : ["require"];
+  const conditions = resolutionMode === 99 /* ESNext */ ? ["import"] : ["require"];
   if (!options.noDtsResolution) {
     conditions.push("types");
   }
@@ -37802,13 +37796,13 @@ function resolveModuleName(moduleName, containingFile, compilerOptions, host, ca
         result = nodeNextModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode);
         break;
       case 2 /* Node10 */:
-        result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode ? getConditions(compilerOptions, resolutionMode === 99 /* ESNext */) : void 0);
+        result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode ? getConditions(compilerOptions, resolutionMode) : void 0);
         break;
       case 1 /* Classic */:
         result = classicNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference);
         break;
       case 100 /* Bundler */:
-        result = bundlerModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode ? getConditions(compilerOptions, resolutionMode === 99 /* ESNext */) : void 0);
+        result = bundlerModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode ? getConditions(compilerOptions, resolutionMode) : void 0);
         break;
       default:
         return Debug.fail(`Unexpected moduleResolution: ${moduleResolution}`);
@@ -38073,7 +38067,7 @@ function nodeModuleNameResolverWorker(features, moduleName, containingDirectory,
   const moduleResolution = getEmitModuleResolutionKind(compilerOptions);
   conditions ?? (conditions = getConditions(
     compilerOptions,
-    moduleResolution === 100 /* Bundler */ || moduleResolution === 2 /* Node10 */ ? void 0 : !!(features & 32 /* EsmMode */)
+    moduleResolution === 100 /* Bundler */ || moduleResolution === 2 /* Node10 */ ? void 0 : features & 32 /* EsmMode */ ? 99 /* ESNext */ : 1 /* CommonJS */
   ));
   const diagnostics = [];
   const state = {
@@ -42920,7 +42914,7 @@ function tryGetModuleNameAsNodeModule({ path, isRedirect }, { getCanonicalFileNa
       if (getResolvePackageJsonExports(options)) {
         const nodeModulesDirectoryName2 = packageRootPath.substring(parts.topLevelPackageNameIndex + 1);
         const packageName2 = getPackageNameFromTypesPackageName(nodeModulesDirectoryName2);
-        const conditions = getConditions(options, importMode === 99 /* ESNext */);
+        const conditions = getConditions(options, importMode);
         const fromExports = packageJsonContent.exports ? tryGetModuleNameFromExports(options, path, packageRootPath, packageName2, packageJsonContent.exports, conditions) : void 0;
         if (fromExports) {
           const withJsExtension = !hasTSFileExtension(fromExports.moduleFileToTry) ? fromExports : { moduleFileToTry: removeFileExtension(fromExports.moduleFileToTry) + tryGetJSExtensionForFile(fromExports.moduleFileToTry, options) };
@@ -77749,7 +77743,7 @@ function createTypeChecker(host) {
       }
       forEach(node.name.elements, checkSourceElement);
     }
-    if (isParameter(node) && node.initializer && nodeIsMissing(getContainingFunction(node).body)) {
+    if (node.initializer && isParameterDeclaration(node) && nodeIsMissing(getContainingFunction(node).body)) {
       error(node, Diagnostics.A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation);
       return;
     }

package/lib/tsserver.js

@@ -2328,7 +2328,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-dev.20231030`;
+var version = `${versionMajorMinor}.0-dev.20231101`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -35093,7 +35093,8 @@ var Parser;
     parseExpected(21 /* OpenParenToken */);
     let initializer;
     if (token() !== 27 /* SemicolonToken */) {
-      if (token() === 115 /* VarKeyword */ || token() === 121 /* LetKeyword */ || token() === 87 /* ConstKeyword */ || token() === 160 /* UsingKeyword */ && lookAhead(nextTokenIsBindingIdentifierOrStartOfDestructuringOnSameLineDisallowOf) || token() === 135 /* AwaitKeyword */ && lookAhead(nextTokenIsUsingKeywordThenBindingIdentifierOrStartOfObjectDestructuringOnSameLineDisallowOf)) {
+      if (token() === 115 /* VarKeyword */ || token() === 121 /* LetKeyword */ || token() === 87 /* ConstKeyword */ || token() === 160 /* UsingKeyword */ && lookAhead(nextTokenIsBindingIdentifierOrStartOfDestructuringOnSameLineDisallowOf) || // this one is meant to allow of
+      token() === 135 /* AwaitKeyword */ && lookAhead(nextTokenIsUsingKeywordThenBindingIdentifierOrStartOfObjectDestructuringOnSameLine)) {
         initializer = parseVariableDeclarationList(
           /*inForStatementInitializer*/
           true
@@ -35414,12 +35415,6 @@ var Parser;
   function isUsingDeclaration() {
     return lookAhead(nextTokenIsBindingIdentifierOrStartOfDestructuringOnSameLine);
   }
-  function nextTokenIsUsingKeywordThenBindingIdentifierOrStartOfObjectDestructuringOnSameLineDisallowOf() {
-    return nextTokenIsUsingKeywordThenBindingIdentifierOrStartOfObjectDestructuringOnSameLine(
-      /*disallowOf*/
-      true
-    );
-  }
   function nextTokenIsUsingKeywordThenBindingIdentifierOrStartOfObjectDestructuringOnSameLine(disallowOf) {
     if (nextToken() === 160 /* UsingKeyword */) {
       return nextTokenIsBindingIdentifierOrStartOfDestructuringOnSameLine(disallowOf);
@@ -41689,8 +41684,7 @@ function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFil
   if (resolutionMode === 99 /* ESNext */ && (3 /* Node16 */ <= moduleResolution && moduleResolution <= 99 /* NodeNext */)) {
     features |= 32 /* EsmMode */;
   }
-  const useImportCondition = resolutionMode === 99 /* ESNext */ || (resolutionMode !== void 0 ? false : void 0);
-  const conditions = features & 8 /* Exports */ ? getConditions(options, useImportCondition) : [];
+  const conditions = features & 8 /* Exports */ ? getConditions(options, resolutionMode) : [];
   const diagnostics = [];
   const moduleResolutionState = {
     compilerOptions: options,
@@ -41858,16 +41852,16 @@ function getNodeResolutionFeatures(options) {
   }
   return features;
 }
-function getConditions(options, esmMode) {
+function getConditions(options, resolutionMode) {
   const moduleResolution = getEmitModuleResolutionKind(options);
-  if (esmMode === void 0) {
+  if (resolutionMode === void 0) {
     if (moduleResolution === 100 /* Bundler */) {
-      esmMode ?? (esmMode = moduleResolution === 100 /* Bundler */);
+      resolutionMode = 99 /* ESNext */;
     } else if (moduleResolution === 2 /* Node10 */) {
       return [];
     }
   }
-  const conditions = esmMode ? ["import"] : ["require"];
+  const conditions = resolutionMode === 99 /* ESNext */ ? ["import"] : ["require"];
   if (!options.noDtsResolution) {
     conditions.push("types");
   }
@@ -42316,13 +42310,13 @@ function resolveModuleName(moduleName, containingFile, compilerOptions, host, ca
         result = nodeNextModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode);
         break;
       case 2 /* Node10 */:
-        result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode ? getConditions(compilerOptions, resolutionMode === 99 /* ESNext */) : void 0);
+        result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode ? getConditions(compilerOptions, resolutionMode) : void 0);
         break;
       case 1 /* Classic */:
         result = classicNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference);
         break;
       case 100 /* Bundler */:
-        result = bundlerModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode ? getConditions(compilerOptions, resolutionMode === 99 /* ESNext */) : void 0);
+        result = bundlerModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode ? getConditions(compilerOptions, resolutionMode) : void 0);
         break;
       default:
         return Debug.fail(`Unexpected moduleResolution: ${moduleResolution}`);
@@ -42600,7 +42594,7 @@ function nodeModuleNameResolverWorker(features, moduleName, containingDirectory,
   const moduleResolution = getEmitModuleResolutionKind(compilerOptions);
   conditions ?? (conditions = getConditions(
     compilerOptions,
-    moduleResolution === 100 /* Bundler */ || moduleResolution === 2 /* Node10 */ ? void 0 : !!(features & 32 /* EsmMode */)
+    moduleResolution === 100 /* Bundler */ || moduleResolution === 2 /* Node10 */ ? void 0 : features & 32 /* EsmMode */ ? 99 /* ESNext */ : 1 /* CommonJS */
   ));
   const diagnostics = [];
   const state = {
@@ -42911,15 +42905,7 @@ function getEntrypointsFromPackageJsonInfo(packageJsonInfo, options, host, cache
   entrypoints = append(entrypoints, mainResolution == null ? void 0 : mainResolution.path);
   if (features & 8 /* Exports */ && packageJsonInfo.contents.packageJsonContent.exports) {
     const conditionSets = deduplicate(
-      [getConditions(
-        options,
-        /*esmMode*/
-        true
-      ), getConditions(
-        options,
-        /*esmMode*/
-        false
-      )],
+      [getConditions(options, 99 /* ESNext */), getConditions(options, 1 /* CommonJS */)],
       arrayIsEqualTo
     );
     for (const conditions of conditionSets) {
@@ -47632,7 +47618,7 @@ function tryGetModuleNameAsNodeModule({ path, isRedirect }, { getCanonicalFileNa
       if (getResolvePackageJsonExports(options)) {
         const nodeModulesDirectoryName2 = packageRootPath.substring(parts.topLevelPackageNameIndex + 1);
         const packageName2 = getPackageNameFromTypesPackageName(nodeModulesDirectoryName2);
-        const conditions = getConditions(options, importMode === 99 /* ESNext */);
+        const conditions = getConditions(options, importMode);
         const fromExports = packageJsonContent.exports ? tryGetModuleNameFromExports(options, path, packageRootPath, packageName2, packageJsonContent.exports, conditions) : void 0;
         if (fromExports) {
           const withJsExtension = !hasTSFileExtension(fromExports.moduleFileToTry) ? fromExports : { moduleFileToTry: removeFileExtension(fromExports.moduleFileToTry) + tryGetJSExtensionForFile(fromExports.moduleFileToTry, options) };
@@ -82461,7 +82447,7 @@ function createTypeChecker(host) {
       }
       forEach(node.name.elements, checkSourceElement);
     }
-    if (isParameter(node) && node.initializer && nodeIsMissing(getContainingFunction(node).body)) {
+    if (node.initializer && isParameterDeclaration(node) && nodeIsMissing(getContainingFunction(node).body)) {
       error2(node, Diagnostics.A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation);
       return;
     }
@@ -139449,14 +139435,13 @@ function error(notApplicableReason) {
 }
 function doChange4(context, oldFile, targetFile, program, toMove, changes, host, preferences) {
   const checker = program.getTypeChecker();
-  const usage = getUsageInfo(oldFile, toMove.all, checker);
   if (!host.fileExists(targetFile)) {
-    changes.createNewFile(oldFile, targetFile, getNewStatementsAndRemoveFromOldFile2(oldFile, targetFile, usage, changes, toMove, program, host, preferences));
+    changes.createNewFile(oldFile, targetFile, getNewStatementsAndRemoveFromOldFile2(oldFile, targetFile, getUsageInfo(oldFile, toMove.all, checker), changes, toMove, program, host, preferences));
     addNewFileToTsconfig(program, changes, oldFile.fileName, targetFile, hostGetCanonicalFileName(host));
   } else {
     const targetSourceFile = Debug.checkDefined(program.getSourceFile(targetFile));
     const importAdder = ts_codefix_exports.createImportAdder(targetSourceFile, context.program, context.preferences, context.host);
-    getNewStatementsAndRemoveFromOldFile2(oldFile, targetSourceFile, usage, changes, toMove, program, host, preferences, importAdder);
+    getNewStatementsAndRemoveFromOldFile2(oldFile, targetSourceFile, getUsageInfo(oldFile, toMove.all, checker, getExistingImports(targetSourceFile, checker)), changes, toMove, program, host, preferences, importAdder);
   }
 }
 function getNewStatementsAndRemoveFromOldFile2(oldFile, targetFile, usage, changes, toMove, program, host, preferences, importAdder) {
@@ -140122,7 +140107,7 @@ function isPureImport(node) {
       return false;
   }
 }
-function getUsageInfo(oldFile, toMove, checker) {
+function getUsageInfo(oldFile, toMove, checker, existingTargetImports = /* @__PURE__ */ new Set()) {
   const movedSymbols = /* @__PURE__ */ new Set();
   const oldImportsNeededByTargetFile = /* @__PURE__ */ new Map();
   const targetFileImportsFromOldFile = /* @__PURE__ */ new Set();
@@ -140136,10 +140121,16 @@ function getUsageInfo(oldFile, toMove, checker) {
       movedSymbols.add(Debug.checkDefined(isExpressionStatement(decl) ? checker.getSymbolAtLocation(decl.expression.left) : decl.symbol, "Need a symbol here"));
     });
   }
+  const unusedImportsFromOldFile = /* @__PURE__ */ new Set();
   for (const statement of toMove) {
     forEachReference(statement, checker, (symbol, isValidTypeOnlyUseSite) => {
-      if (!symbol.declarations)
+      if (!symbol.declarations) {
+        return;
+      }
+      if (existingTargetImports.has(skipAlias(symbol, checker))) {
+        unusedImportsFromOldFile.add(symbol);
         return;
+      }
       for (const decl of symbol.declarations) {
         if (isInImport(decl)) {
           const prevIsTypeOnly = oldImportsNeededByTargetFile.get(symbol);
@@ -140150,7 +140141,9 @@ function getUsageInfo(oldFile, toMove, checker) {
       }
     });
   }
-  const unusedImportsFromOldFile = new Set(oldImportsNeededByTargetFile.keys());
+  for (const unusedImport of oldImportsNeededByTargetFile.keys()) {
+    unusedImportsFromOldFile.add(unusedImport);
+  }
   const oldFileImportsFromTargetFile = /* @__PURE__ */ new Set();
   for (const statement of oldFile.statements) {
     if (contains(toMove, statement))
@@ -140336,6 +140329,29 @@ function getOverloadRangeToMove(sourceFile, statement) {
   }
   return void 0;
 }
+function getExistingImports(sourceFile, checker) {
+  const imports = /* @__PURE__ */ new Set();
+  for (const moduleSpecifier of sourceFile.imports) {
+    const declaration = importFromModuleSpecifier(moduleSpecifier);
+    if (isImportDeclaration(declaration) && declaration.importClause && declaration.importClause.namedBindings && isNamedImports(declaration.importClause.namedBindings)) {
+      for (const e of declaration.importClause.namedBindings.elements) {
+        const symbol = checker.getSymbolAtLocation(e.propertyName || e.name);
+        if (symbol) {
+          imports.add(skipAlias(symbol, checker));
+        }
+      }
+    }
+    if (isVariableDeclarationInitializedToRequire(declaration.parent) && isObjectBindingPattern(declaration.parent.name)) {
+      for (const e of declaration.parent.name.elements) {
+        const symbol = checker.getSymbolAtLocation(e.propertyName || e.name);
+        if (symbol) {
+          imports.add(skipAlias(symbol, checker));
+        }
+      }
+    }
+  }
+  return imports;
+}
 
 // src/services/_namespaces/ts.refactor.addOrRemoveBracesToArrowFunction.ts
 var ts_refactor_addOrRemoveBracesToArrowFunction_exports = {};
@@ -161549,7 +161565,7 @@ function getCompletionEntriesForNonRelativeModules(fragment, scriptPath, mode, c
               }
               const keys = getOwnKeys(exports);
               const fragmentSubpath = components.join("/") + (components.length && hasTrailingDirectorySeparator(fragment) ? "/" : "");
-              const conditions = getConditions(compilerOptions, mode === 99 /* ESNext */);
+              const conditions = getConditions(compilerOptions, mode);
               addCompletionEntriesFromPathsOrExports(
                 result,
                 fragmentSubpath,

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.3";
-      version = `${versionMajorMinor}.0-dev.20231030`;
+      version = `${versionMajorMinor}.0-dev.20231101`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -33165,7 +33165,8 @@ ${lanes.join("\n")}
           parseExpected(21 /* OpenParenToken */);
           let initializer;
           if (token() !== 27 /* SemicolonToken */) {
-            if (token() === 115 /* VarKeyword */ || token() === 121 /* LetKeyword */ || token() === 87 /* ConstKeyword */ || token() === 160 /* UsingKeyword */ && lookAhead(nextTokenIsBindingIdentifierOrStartOfDestructuringOnSameLineDisallowOf) || token() === 135 /* AwaitKeyword */ && lookAhead(nextTokenIsUsingKeywordThenBindingIdentifierOrStartOfObjectDestructuringOnSameLineDisallowOf)) {
+            if (token() === 115 /* VarKeyword */ || token() === 121 /* LetKeyword */ || token() === 87 /* ConstKeyword */ || token() === 160 /* UsingKeyword */ && lookAhead(nextTokenIsBindingIdentifierOrStartOfDestructuringOnSameLineDisallowOf) || // this one is meant to allow of
+            token() === 135 /* AwaitKeyword */ && lookAhead(nextTokenIsUsingKeywordThenBindingIdentifierOrStartOfObjectDestructuringOnSameLine)) {
               initializer = parseVariableDeclarationList(
                 /*inForStatementInitializer*/
                 true
@@ -33486,12 +33487,6 @@ ${lanes.join("\n")}
         function isUsingDeclaration() {
           return lookAhead(nextTokenIsBindingIdentifierOrStartOfDestructuringOnSameLine);
         }
-        function nextTokenIsUsingKeywordThenBindingIdentifierOrStartOfObjectDestructuringOnSameLineDisallowOf() {
-          return nextTokenIsUsingKeywordThenBindingIdentifierOrStartOfObjectDestructuringOnSameLine(
-            /*disallowOf*/
-            true
-          );
-        }
         function nextTokenIsUsingKeywordThenBindingIdentifierOrStartOfObjectDestructuringOnSameLine(disallowOf) {
           if (nextToken() === 160 /* UsingKeyword */) {
             return nextTokenIsBindingIdentifierOrStartOfDestructuringOnSameLine(disallowOf);
@@ -39547,8 +39542,7 @@ ${lanes.join("\n")}
     if (resolutionMode === 99 /* ESNext */ && (3 /* Node16 */ <= moduleResolution && moduleResolution <= 99 /* NodeNext */)) {
       features |= 32 /* EsmMode */;
     }
-    const useImportCondition = resolutionMode === 99 /* ESNext */ || (resolutionMode !== void 0 ? false : void 0);
-    const conditions = features & 8 /* Exports */ ? getConditions(options, useImportCondition) : [];
+    const conditions = features & 8 /* Exports */ ? getConditions(options, resolutionMode) : [];
     const diagnostics = [];
     const moduleResolutionState = {
       compilerOptions: options,
@@ -39716,16 +39710,16 @@ ${lanes.join("\n")}
     }
     return features;
   }
-  function getConditions(options, esmMode) {
+  function getConditions(options, resolutionMode) {
     const moduleResolution = getEmitModuleResolutionKind(options);
-    if (esmMode === void 0) {
+    if (resolutionMode === void 0) {
       if (moduleResolution === 100 /* Bundler */) {
-        esmMode ?? (esmMode = moduleResolution === 100 /* Bundler */);
+        resolutionMode = 99 /* ESNext */;
       } else if (moduleResolution === 2 /* Node10 */) {
         return [];
       }
     }
-    const conditions = esmMode ? ["import"] : ["require"];
+    const conditions = resolutionMode === 99 /* ESNext */ ? ["import"] : ["require"];
     if (!options.noDtsResolution) {
       conditions.push("types");
     }
@@ -40174,13 +40168,13 @@ ${lanes.join("\n")}
           result = nodeNextModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode);
           break;
         case 2 /* Node10 */:
-          result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode ? getConditions(compilerOptions, resolutionMode === 99 /* ESNext */) : void 0);
+          result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode ? getConditions(compilerOptions, resolutionMode) : void 0);
           break;
         case 1 /* Classic */:
           result = classicNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference);
           break;
         case 100 /* Bundler */:
-          result = bundlerModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode ? getConditions(compilerOptions, resolutionMode === 99 /* ESNext */) : void 0);
+          result = bundlerModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode ? getConditions(compilerOptions, resolutionMode) : void 0);
           break;
         default:
           return Debug.fail(`Unexpected moduleResolution: ${moduleResolution}`);
@@ -40445,7 +40439,7 @@ ${lanes.join("\n")}
     const moduleResolution = getEmitModuleResolutionKind(compilerOptions);
     conditions ?? (conditions = getConditions(
       compilerOptions,
-      moduleResolution === 100 /* Bundler */ || moduleResolution === 2 /* Node10 */ ? void 0 : !!(features & 32 /* EsmMode */)
+      moduleResolution === 100 /* Bundler */ || moduleResolution === 2 /* Node10 */ ? void 0 : features & 32 /* EsmMode */ ? 99 /* ESNext */ : 1 /* CommonJS */
     ));
     const diagnostics = [];
     const state = {
@@ -40755,15 +40749,7 @@ ${lanes.join("\n")}
     entrypoints = append(entrypoints, mainResolution == null ? void 0 : mainResolution.path);
     if (features & 8 /* Exports */ && packageJsonInfo.contents.packageJsonContent.exports) {
       const conditionSets = deduplicate(
-        [getConditions(
-          options,
-          /*esmMode*/
-          true
-        ), getConditions(
-          options,
-          /*esmMode*/
-          false
-        )],
+        [getConditions(options, 99 /* ESNext */), getConditions(options, 1 /* CommonJS */)],
         arrayIsEqualTo
       );
       for (const conditions of conditionSets) {
@@ -45497,7 +45483,7 @@ ${lanes.join("\n")}
         if (getResolvePackageJsonExports(options)) {
           const nodeModulesDirectoryName2 = packageRootPath.substring(parts.topLevelPackageNameIndex + 1);
           const packageName2 = getPackageNameFromTypesPackageName(nodeModulesDirectoryName2);
-          const conditions = getConditions(options, importMode === 99 /* ESNext */);
+          const conditions = getConditions(options, importMode);
           const fromExports = packageJsonContent.exports ? tryGetModuleNameFromExports(options, path, packageRootPath, packageName2, packageJsonContent.exports, conditions) : void 0;
           if (fromExports) {
             const withJsExtension = !hasTSFileExtension(fromExports.moduleFileToTry) ? fromExports : { moduleFileToTry: removeFileExtension(fromExports.moduleFileToTry) + tryGetJSExtensionForFile(fromExports.moduleFileToTry, options) };
@@ -80228,7 +80214,7 @@ ${lanes.join("\n")}
         }
         forEach(node.name.elements, checkSourceElement);
       }
-      if (isParameter(node) && node.initializer && nodeIsMissing(getContainingFunction(node).body)) {
+      if (node.initializer && isParameterDeclaration(node) && nodeIsMissing(getContainingFunction(node).body)) {
         error2(node, Diagnostics.A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation);
         return;
       }
@@ -137828,14 +137814,13 @@ ${lanes.join("\n")}
   }
   function doChange4(context, oldFile, targetFile, program, toMove, changes, host, preferences) {
     const checker = program.getTypeChecker();
-    const usage = getUsageInfo(oldFile, toMove.all, checker);
     if (!host.fileExists(targetFile)) {
-      changes.createNewFile(oldFile, targetFile, getNewStatementsAndRemoveFromOldFile2(oldFile, targetFile, usage, changes, toMove, program, host, preferences));
+      changes.createNewFile(oldFile, targetFile, getNewStatementsAndRemoveFromOldFile2(oldFile, targetFile, getUsageInfo(oldFile, toMove.all, checker), changes, toMove, program, host, preferences));
       addNewFileToTsconfig(program, changes, oldFile.fileName, targetFile, hostGetCanonicalFileName(host));
     } else {
       const targetSourceFile = Debug.checkDefined(program.getSourceFile(targetFile));
       const importAdder = ts_codefix_exports.createImportAdder(targetSourceFile, context.program, context.preferences, context.host);
-      getNewStatementsAndRemoveFromOldFile2(oldFile, targetSourceFile, usage, changes, toMove, program, host, preferences, importAdder);
+      getNewStatementsAndRemoveFromOldFile2(oldFile, targetSourceFile, getUsageInfo(oldFile, toMove.all, checker, getExistingImports(targetSourceFile, checker)), changes, toMove, program, host, preferences, importAdder);
     }
   }
   function getNewStatementsAndRemoveFromOldFile2(oldFile, targetFile, usage, changes, toMove, program, host, preferences, importAdder) {
@@ -138501,7 +138486,7 @@ ${lanes.join("\n")}
         return false;
     }
   }
-  function getUsageInfo(oldFile, toMove, checker) {
+  function getUsageInfo(oldFile, toMove, checker, existingTargetImports = /* @__PURE__ */ new Set()) {
     const movedSymbols = /* @__PURE__ */ new Set();
     const oldImportsNeededByTargetFile = /* @__PURE__ */ new Map();
     const targetFileImportsFromOldFile = /* @__PURE__ */ new Set();
@@ -138515,10 +138500,16 @@ ${lanes.join("\n")}
         movedSymbols.add(Debug.checkDefined(isExpressionStatement(decl) ? checker.getSymbolAtLocation(decl.expression.left) : decl.symbol, "Need a symbol here"));
       });
     }
+    const unusedImportsFromOldFile = /* @__PURE__ */ new Set();
     for (const statement of toMove) {
       forEachReference(statement, checker, (symbol, isValidTypeOnlyUseSite) => {
-        if (!symbol.declarations)
+        if (!symbol.declarations) {
+          return;
+        }
+        if (existingTargetImports.has(skipAlias(symbol, checker))) {
+          unusedImportsFromOldFile.add(symbol);
           return;
+        }
         for (const decl of symbol.declarations) {
           if (isInImport(decl)) {
             const prevIsTypeOnly = oldImportsNeededByTargetFile.get(symbol);
@@ -138529,7 +138520,9 @@ ${lanes.join("\n")}
         }
       });
     }
-    const unusedImportsFromOldFile = new Set(oldImportsNeededByTargetFile.keys());
+    for (const unusedImport of oldImportsNeededByTargetFile.keys()) {
+      unusedImportsFromOldFile.add(unusedImport);
+    }
     const oldFileImportsFromTargetFile = /* @__PURE__ */ new Set();
     for (const statement of oldFile.statements) {
       if (contains(toMove, statement))
@@ -138715,6 +138708,29 @@ ${lanes.join("\n")}
     }
     return void 0;
   }
+  function getExistingImports(sourceFile, checker) {
+    const imports = /* @__PURE__ */ new Set();
+    for (const moduleSpecifier of sourceFile.imports) {
+      const declaration = importFromModuleSpecifier(moduleSpecifier);
+      if (isImportDeclaration(declaration) && declaration.importClause && declaration.importClause.namedBindings && isNamedImports(declaration.importClause.namedBindings)) {
+        for (const e of declaration.importClause.namedBindings.elements) {
+          const symbol = checker.getSymbolAtLocation(e.propertyName || e.name);
+          if (symbol) {
+            imports.add(skipAlias(symbol, checker));
+          }
+        }
+      }
+      if (isVariableDeclarationInitializedToRequire(declaration.parent) && isObjectBindingPattern(declaration.parent.name)) {
+        for (const e of declaration.parent.name.elements) {
+          const symbol = checker.getSymbolAtLocation(e.propertyName || e.name);
+          if (symbol) {
+            imports.add(skipAlias(symbol, checker));
+          }
+        }
+      }
+    }
+    return imports;
+  }
   var refactorNameForMoveToFile, description2, moveToFileAction;
   var init_moveToFile = __esm({
     "src/services/refactors/moveToFile.ts"() {
@@ -160818,7 +160834,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
                 }
                 const keys = getOwnKeys(exports);
                 const fragmentSubpath = components.join("/") + (components.length && hasTrailingDirectorySeparator(fragment) ? "/" : "");
-                const conditions = getConditions(compilerOptions, mode === 99 /* ESNext */);
+                const conditions = getConditions(compilerOptions, mode);
                 addCompletionEntriesFromPathsOrExports(
                   result,
                   fragmentSubpath,

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-dev.20231030`;
+var version = `${versionMajorMinor}.0-dev.20231101`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -22502,7 +22502,8 @@ var Parser;
     parseExpected(21 /* OpenParenToken */);
     let initializer;
     if (token() !== 27 /* SemicolonToken */) {
-      if (token() === 115 /* VarKeyword */ || token() === 121 /* LetKeyword */ || token() === 87 /* ConstKeyword */ || token() === 160 /* UsingKeyword */ && lookAhead(nextTokenIsBindingIdentifierOrStartOfDestructuringOnSameLineDisallowOf) || token() === 135 /* AwaitKeyword */ && lookAhead(nextTokenIsUsingKeywordThenBindingIdentifierOrStartOfObjectDestructuringOnSameLineDisallowOf)) {
+      if (token() === 115 /* VarKeyword */ || token() === 121 /* LetKeyword */ || token() === 87 /* ConstKeyword */ || token() === 160 /* UsingKeyword */ && lookAhead(nextTokenIsBindingIdentifierOrStartOfDestructuringOnSameLineDisallowOf) || // this one is meant to allow of
+      token() === 135 /* AwaitKeyword */ && lookAhead(nextTokenIsUsingKeywordThenBindingIdentifierOrStartOfObjectDestructuringOnSameLine)) {
         initializer = parseVariableDeclarationList(
           /*inForStatementInitializer*/
           true
@@ -22823,12 +22824,6 @@ var Parser;
   function isUsingDeclaration() {
     return lookAhead(nextTokenIsBindingIdentifierOrStartOfDestructuringOnSameLine);
   }
-  function nextTokenIsUsingKeywordThenBindingIdentifierOrStartOfObjectDestructuringOnSameLineDisallowOf() {
-    return nextTokenIsUsingKeywordThenBindingIdentifierOrStartOfObjectDestructuringOnSameLine(
-      /*disallowOf*/
-      true
-    );
-  }
   function nextTokenIsUsingKeywordThenBindingIdentifierOrStartOfObjectDestructuringOnSameLine(disallowOf) {
     if (nextToken() === 160 /* UsingKeyword */) {
       return nextTokenIsBindingIdentifierOrStartOfDestructuringOnSameLine(disallowOf);
@@ -27615,16 +27610,16 @@ function getNodeResolutionFeatures(options) {
   }
   return features;
 }
-function getConditions(options, esmMode) {
+function getConditions(options, resolutionMode) {
   const moduleResolution = getEmitModuleResolutionKind(options);
-  if (esmMode === void 0) {
+  if (resolutionMode === void 0) {
     if (moduleResolution === 100 /* Bundler */) {
-      esmMode ?? (esmMode = moduleResolution === 100 /* Bundler */);
+      resolutionMode = 99 /* ESNext */;
     } else if (moduleResolution === 2 /* Node10 */) {
       return [];
     }
   }
-  const conditions = esmMode ? ["import"] : ["require"];
+  const conditions = resolutionMode === 99 /* ESNext */ ? ["import"] : ["require"];
   if (!options.noDtsResolution) {
     conditions.push("types");
   }
@@ -27685,13 +27680,13 @@ function resolveModuleName(moduleName, containingFile, compilerOptions, host, ca
         result = nodeNextModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode);
         break;
       case 2 /* Node10 */:
-        result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode ? getConditions(compilerOptions, resolutionMode === 99 /* ESNext */) : void 0);
+        result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode ? getConditions(compilerOptions, resolutionMode) : void 0);
         break;
       case 1 /* Classic */:
         result = classicNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference);
         break;
       case 100 /* Bundler */:
-        result = bundlerModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode ? getConditions(compilerOptions, resolutionMode === 99 /* ESNext */) : void 0);
+        result = bundlerModuleNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference, resolutionMode ? getConditions(compilerOptions, resolutionMode) : void 0);
         break;
       default:
         return Debug.fail(`Unexpected moduleResolution: ${moduleResolution}`);
@@ -27938,7 +27933,7 @@ function nodeModuleNameResolverWorker(features, moduleName, containingDirectory,
   const moduleResolution = getEmitModuleResolutionKind(compilerOptions);
   conditions ?? (conditions = getConditions(
     compilerOptions,
-    moduleResolution === 100 /* Bundler */ || moduleResolution === 2 /* Node10 */ ? void 0 : !!(features & 32 /* EsmMode */)
+    moduleResolution === 100 /* Bundler */ || moduleResolution === 2 /* Node10 */ ? void 0 : features & 32 /* EsmMode */ ? 99 /* ESNext */ : 1 /* CommonJS */
   ));
   const diagnostics = [];
   const state = {

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.3.0-dev.20231030",
+    "version": "5.3.0-dev.20231101",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -114,5 +114,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "f0374ce2a9c465e27a15b7fa4a347e2bd9079450"
+    "gitHead": "73bc0eba5fd35c3a31cc9a4e6d28d3e89564ce6f"
 }