typescript 5.4.0-dev.20240131 → 5.4.0-dev.20240202

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.20240131`;
+var version = `${versionMajorMinor}.0-dev.20240202`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -88604,9 +88604,50 @@ function transformTypeScript(context) {
         return visitorWorker(node);
     }
   }
-  function visitElidableStatement(node) {
+  function isElisionBlocked(node) {
     const parsed = getParseTreeNode(node);
-    if (parsed !== node) {
+    if (parsed === node || isExportAssignment(node)) {
+      return false;
+    }
+    if (!parsed || parsed.kind !== node.kind) {
+      return true;
+    }
+    switch (node.kind) {
+      case 272 /* ImportDeclaration */:
+        Debug.assertNode(parsed, isImportDeclaration);
+        if (node.importClause !== parsed.importClause) {
+          return true;
+        }
+        if (node.attributes !== parsed.attributes) {
+          return true;
+        }
+        break;
+      case 271 /* ImportEqualsDeclaration */:
+        Debug.assertNode(parsed, isImportEqualsDeclaration);
+        if (node.name !== parsed.name) {
+          return true;
+        }
+        if (node.isTypeOnly !== parsed.isTypeOnly) {
+          return true;
+        }
+        if (node.moduleReference !== parsed.moduleReference && (isEntityName(node.moduleReference) || isEntityName(parsed.moduleReference))) {
+          return true;
+        }
+        break;
+      case 278 /* ExportDeclaration */:
+        Debug.assertNode(parsed, isExportDeclaration);
+        if (node.exportClause !== parsed.exportClause) {
+          return true;
+        }
+        if (node.attributes !== parsed.attributes) {
+          return true;
+        }
+        break;
+    }
+    return false;
+  }
+  function visitElidableStatement(node) {
+    if (isElisionBlocked(node)) {
       if (node.transformFlags & 1 /* ContainsTypeScript */) {
         return visitEachChild(node, visitor, context);
       }

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.20240131`;
+var version = `${versionMajorMinor}.0-dev.20240202`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -93510,9 +93510,50 @@ function transformTypeScript(context) {
         return visitorWorker(node);
     }
   }
-  function visitElidableStatement(node) {
+  function isElisionBlocked(node) {
     const parsed = getParseTreeNode(node);
-    if (parsed !== node) {
+    if (parsed === node || isExportAssignment(node)) {
+      return false;
+    }
+    if (!parsed || parsed.kind !== node.kind) {
+      return true;
+    }
+    switch (node.kind) {
+      case 272 /* ImportDeclaration */:
+        Debug.assertNode(parsed, isImportDeclaration);
+        if (node.importClause !== parsed.importClause) {
+          return true;
+        }
+        if (node.attributes !== parsed.attributes) {
+          return true;
+        }
+        break;
+      case 271 /* ImportEqualsDeclaration */:
+        Debug.assertNode(parsed, isImportEqualsDeclaration);
+        if (node.name !== parsed.name) {
+          return true;
+        }
+        if (node.isTypeOnly !== parsed.isTypeOnly) {
+          return true;
+        }
+        if (node.moduleReference !== parsed.moduleReference && (isEntityName(node.moduleReference) || isEntityName(parsed.moduleReference))) {
+          return true;
+        }
+        break;
+      case 278 /* ExportDeclaration */:
+        Debug.assertNode(parsed, isExportDeclaration);
+        if (node.exportClause !== parsed.exportClause) {
+          return true;
+        }
+        if (node.attributes !== parsed.attributes) {
+          return true;
+        }
+        break;
+    }
+    return false;
+  }
+  function visitElidableStatement(node) {
+    if (isElisionBlocked(node)) {
       if (node.transformFlags & 1 /* ContainsTypeScript */) {
         return visitEachChild(node, visitor, context);
       }
@@ -167864,84 +167905,98 @@ function coalesceImportsWorker(importGroup, comparer, sourceFile, preferences) {
   if (importGroup.length === 0) {
     return importGroup;
   }
-  const { importWithoutClause, typeOnlyImports, regularImports } = getCategorizedImports(importGroup);
-  const coalescedImports = [];
-  if (importWithoutClause) {
-    coalescedImports.push(importWithoutClause);
-  }
-  for (const group2 of [regularImports, typeOnlyImports]) {
-    const isTypeOnly = group2 === typeOnlyImports;
-    const { defaultImports, namespaceImports, namedImports } = group2;
-    if (!isTypeOnly && defaultImports.length === 1 && namespaceImports.length === 1 && namedImports.length === 0) {
-      const defaultImport = defaultImports[0];
-      coalescedImports.push(
-        updateImportDeclarationAndClause(defaultImport, defaultImport.importClause.name, namespaceImports[0].importClause.namedBindings)
-      );
-      continue;
-    }
-    const sortedNamespaceImports = stableSort(namespaceImports, (i1, i2) => comparer(i1.importClause.namedBindings.name.text, i2.importClause.namedBindings.name.text));
-    for (const namespaceImport of sortedNamespaceImports) {
-      coalescedImports.push(
-        updateImportDeclarationAndClause(
-          namespaceImport,
-          /*name*/
-          void 0,
-          namespaceImport.importClause.namedBindings
-        )
-      );
-    }
-    const firstDefaultImport = firstOrUndefined(defaultImports);
-    const firstNamedImport = firstOrUndefined(namedImports);
-    const importDecl = firstDefaultImport ?? firstNamedImport;
-    if (!importDecl) {
-      continue;
+  const importGroupsByAttributes = groupBy(importGroup, (decl) => {
+    if (decl.attributes) {
+      let attrs = decl.attributes.token + " ";
+      for (const x of sort(decl.attributes.elements, (x2, y) => compareStringsCaseSensitive(x2.name.text, y.name.text))) {
+        attrs += x.name.text + ":";
+        attrs += isStringLiteralLike(x.value) ? `"${x.value.text}"` : x.value.getText() + " ";
+      }
+      return attrs;
     }
-    let newDefaultImport;
-    const newImportSpecifiers = [];
-    if (defaultImports.length === 1) {
-      newDefaultImport = defaultImports[0].importClause.name;
-    } else {
-      for (const defaultImport of defaultImports) {
-        newImportSpecifiers.push(
-          factory.createImportSpecifier(
-            /*isTypeOnly*/
-            false,
-            factory.createIdentifier("default"),
-            defaultImport.importClause.name
+    return "";
+  });
+  const coalescedImports = [];
+  for (const attribute in importGroupsByAttributes) {
+    const importGroupSameAttrs = importGroupsByAttributes[attribute];
+    const { importWithoutClause, typeOnlyImports, regularImports } = getCategorizedImports(importGroupSameAttrs);
+    if (importWithoutClause) {
+      coalescedImports.push(importWithoutClause);
+    }
+    for (const group2 of [regularImports, typeOnlyImports]) {
+      const isTypeOnly = group2 === typeOnlyImports;
+      const { defaultImports, namespaceImports, namedImports } = group2;
+      if (!isTypeOnly && defaultImports.length === 1 && namespaceImports.length === 1 && namedImports.length === 0) {
+        const defaultImport = defaultImports[0];
+        coalescedImports.push(
+          updateImportDeclarationAndClause(defaultImport, defaultImport.importClause.name, namespaceImports[0].importClause.namedBindings)
+        );
+        continue;
+      }
+      const sortedNamespaceImports = stableSort(namespaceImports, (i1, i2) => comparer(i1.importClause.namedBindings.name.text, i2.importClause.namedBindings.name.text));
+      for (const namespaceImport of sortedNamespaceImports) {
+        coalescedImports.push(
+          updateImportDeclarationAndClause(
+            namespaceImport,
+            /*name*/
+            void 0,
+            namespaceImport.importClause.namedBindings
           )
         );
       }
-    }
-    newImportSpecifiers.push(...getNewImportSpecifiers(namedImports));
-    const sortedImportSpecifiers = factory.createNodeArray(
-      sortSpecifiers(newImportSpecifiers, comparer, preferences),
-      firstNamedImport == null ? void 0 : firstNamedImport.importClause.namedBindings.elements.hasTrailingComma
-    );
-    const newNamedImports = sortedImportSpecifiers.length === 0 ? newDefaultImport ? void 0 : factory.createNamedImports(emptyArray) : firstNamedImport ? factory.updateNamedImports(firstNamedImport.importClause.namedBindings, sortedImportSpecifiers) : factory.createNamedImports(sortedImportSpecifiers);
-    if (sourceFile && newNamedImports && (firstNamedImport == null ? void 0 : firstNamedImport.importClause.namedBindings) && !rangeIsOnSingleLine(firstNamedImport.importClause.namedBindings, sourceFile)) {
-      setEmitFlags(newNamedImports, 2 /* MultiLine */);
-    }
-    if (isTypeOnly && newDefaultImport && newNamedImports) {
-      coalescedImports.push(
-        updateImportDeclarationAndClause(
-          importDecl,
-          newDefaultImport,
-          /*namedBindings*/
-          void 0
-        )
-      );
-      coalescedImports.push(
-        updateImportDeclarationAndClause(
-          firstNamedImport ?? importDecl,
-          /*name*/
-          void 0,
-          newNamedImports
-        )
-      );
-    } else {
-      coalescedImports.push(
-        updateImportDeclarationAndClause(importDecl, newDefaultImport, newNamedImports)
+      const firstDefaultImport = firstOrUndefined(defaultImports);
+      const firstNamedImport = firstOrUndefined(namedImports);
+      const importDecl = firstDefaultImport ?? firstNamedImport;
+      if (!importDecl) {
+        continue;
+      }
+      let newDefaultImport;
+      const newImportSpecifiers = [];
+      if (defaultImports.length === 1) {
+        newDefaultImport = defaultImports[0].importClause.name;
+      } else {
+        for (const defaultImport of defaultImports) {
+          newImportSpecifiers.push(
+            factory.createImportSpecifier(
+              /*isTypeOnly*/
+              false,
+              factory.createIdentifier("default"),
+              defaultImport.importClause.name
+            )
+          );
+        }
+      }
+      newImportSpecifiers.push(...getNewImportSpecifiers(namedImports));
+      const sortedImportSpecifiers = factory.createNodeArray(
+        sortSpecifiers(newImportSpecifiers, comparer, preferences),
+        firstNamedImport == null ? void 0 : firstNamedImport.importClause.namedBindings.elements.hasTrailingComma
       );
+      const newNamedImports = sortedImportSpecifiers.length === 0 ? newDefaultImport ? void 0 : factory.createNamedImports(emptyArray) : firstNamedImport ? factory.updateNamedImports(firstNamedImport.importClause.namedBindings, sortedImportSpecifiers) : factory.createNamedImports(sortedImportSpecifiers);
+      if (sourceFile && newNamedImports && (firstNamedImport == null ? void 0 : firstNamedImport.importClause.namedBindings) && !rangeIsOnSingleLine(firstNamedImport.importClause.namedBindings, sourceFile)) {
+        setEmitFlags(newNamedImports, 2 /* MultiLine */);
+      }
+      if (isTypeOnly && newDefaultImport && newNamedImports) {
+        coalescedImports.push(
+          updateImportDeclarationAndClause(
+            importDecl,
+            newDefaultImport,
+            /*namedBindings*/
+            void 0
+          )
+        );
+        coalescedImports.push(
+          updateImportDeclarationAndClause(
+            firstNamedImport ?? importDecl,
+            /*name*/
+            void 0,
+            newNamedImports
+          )
+        );
+      } else {
+        coalescedImports.push(
+          updateImportDeclarationAndClause(importDecl, newDefaultImport, newNamedImports)
+        );
+      }
     }
   }
   return coalescedImports;
@@ -178434,6 +178489,7 @@ var Project3 = class _Project {
     /**
      * Current project's program version. (incremented everytime new program is created that is not complete reuse from the old one)
      * This property is changed in 'updateGraph' based on the set of files in program
+     * @internal
      */
     this.projectProgramVersion = 0;
     /**
@@ -178441,6 +178497,7 @@ var Project3 = class _Project {
      * - new root file was added/removed
      * - edit happen in some file that is currently included in the project.
      * This property is different from projectStructureVersion since in most cases edits don't affect set of files in the project
+     * @internal
      */
     this.projectStateVersion = 0;
     this.isInitialLoadPending = returnFalse;
@@ -179478,7 +179535,7 @@ var Project3 = class _Project {
     );
     const elapsed = timestamp() - start2;
     this.sendPerformanceEvent("UpdateGraph", elapsed);
-    this.writeLog(`Finishing updateGraphWorker: Project: ${this.getProjectName()} Version: ${this.getProjectVersion()} structureChanged: ${hasNewProgram}${this.program ? ` structureIsReused:: ${StructureIsReused[this.program.structureIsReused]}` : ""} Elapsed: ${elapsed}ms`);
+    this.writeLog(`Finishing updateGraphWorker: Project: ${this.getProjectName()} projectStateVersion: ${this.projectStateVersion} projectProgramVersion: ${this.projectProgramVersion} structureChanged: ${hasNewProgram}${this.program ? ` structureIsReused:: ${StructureIsReused[this.program.structureIsReused]}` : ""} Elapsed: ${elapsed}ms`);
     if (this.projectService.logger.isTestLogger) {
       if (this.program !== oldProgram) {
         this.print(
@@ -179641,6 +179698,7 @@ var Project3 = class _Project {
   }
   /** @internal */
   print(writeProjectFileNames, writeFileExplaination, writeFileVersionAndText) {
+    var _a;
     this.writeLog(`Project '${this.projectName}' (${ProjectKind[this.projectKind]})`);
     this.writeLog(this.filesToStringWorker(
       writeProjectFileNames && this.projectService.logger.hasLevel(3 /* verbose */),
@@ -179658,6 +179716,14 @@ var Project3 = class _Project {
         false
       );
     }
+    (_a = this.noDtsResolutionProject) == null ? void 0 : _a.print(
+      /*writeProjectFileNames*/
+      false,
+      /*writeFileExplaination*/
+      false,
+      /*writeFileVersionAndText*/
+      false
+    );
   }
   setCompilerOptions(compilerOptions) {
     var _a;
@@ -181098,6 +181164,8 @@ var _ProjectService = class _ProjectService {
     /** @internal */
     this.extendedConfigCache = /* @__PURE__ */ new Map();
     /** @internal */
+    this.baseline = noop;
+    /** @internal */
     this.verifyDocumentRegistry = noop;
     /** @internal */
     this.verifyProgram = noop;
@@ -183087,6 +183155,8 @@ Dynamic files must always be opened with service's current directory or service
     });
     this.inferredProjects.forEach((project) => this.clearSemanticCache(project));
     this.ensureProjectForOpenFiles();
+    this.logger.info("After reloading projects..");
+    this.printProjects();
   }
   /**
    * This function goes through all the openFiles and tries to file the config file for them.
@@ -183612,7 +183682,7 @@ Dynamic files must always be opened with service's current directory or service
       }
     }
   }
-  closeExternalProject(uncheckedFileName) {
+  closeExternalProject(uncheckedFileName, print) {
     const fileName = toNormalizedPath(uncheckedFileName);
     const configFiles = this.externalProjectToConfiguredProjectMap.get(fileName);
     if (configFiles) {
@@ -183626,6 +183696,8 @@ Dynamic files must always be opened with service's current directory or service
         this.removeProject(externalProject);
       }
     }
+    if (print)
+      this.printProjects();
   }
   openExternalProjects(projects) {
     const projectsToClose = arrayToMap(this.externalProjects, (p) => p.getProjectName(), (_) => true);
@@ -183633,12 +183705,21 @@ Dynamic files must always be opened with service's current directory or service
       projectsToClose.set(externalProjectName, true);
     });
     for (const externalProject of projects) {
-      this.openExternalProject(externalProject);
+      this.openExternalProject(
+        externalProject,
+        /*print*/
+        false
+      );
       projectsToClose.delete(externalProject.projectFileName);
     }
     forEachKey(projectsToClose, (externalProjectName) => {
-      this.closeExternalProject(externalProjectName);
+      this.closeExternalProject(
+        externalProjectName,
+        /*print*/
+        false
+      );
     });
+    this.printProjects();
   }
   static escapeFilenameForRegex(filename) {
     return filename.replace(this.filenameEscapeRegexp, "\\$&");
@@ -183731,7 +183812,7 @@ Dynamic files must always be opened with service's current directory or service
     proj.rootFiles = filesToKeep;
     return excludedFiles;
   }
-  openExternalProject(proj) {
+  openExternalProject(proj, print) {
     proj.typeAcquisition = proj.typeAcquisition || {};
     proj.typeAcquisition.include = proj.typeAcquisition.include || [];
     proj.typeAcquisition.exclude = proj.typeAcquisition.exclude || [];
@@ -183770,12 +183851,22 @@ Dynamic files must always be opened with service's current directory or service
         externalProject.setProjectErrors(watchOptionsAndErrors == null ? void 0 : watchOptionsAndErrors.errors);
         this.updateRootAndOptionsOfNonInferredProject(externalProject, proj.rootFiles, externalFilePropertyReader, compilerOptions, proj.typeAcquisition, proj.options.compileOnSave, watchOptionsAndErrors == null ? void 0 : watchOptionsAndErrors.watchOptions);
         externalProject.updateGraph();
+        if (print)
+          this.printProjects();
         return;
       }
-      this.closeExternalProject(proj.projectFileName);
+      this.closeExternalProject(
+        proj.projectFileName,
+        /*print*/
+        false
+      );
     } else if (this.externalProjectToConfiguredProjectMap.get(proj.projectFileName)) {
       if (!tsConfigFiles) {
-        this.closeExternalProject(proj.projectFileName);
+        this.closeExternalProject(
+          proj.projectFileName,
+          /*print*/
+          false
+        );
       } else {
         const oldConfigFiles = this.externalProjectToConfiguredProjectMap.get(proj.projectFileName);
         let iNew = 0;
@@ -183815,6 +183906,8 @@ Dynamic files must always be opened with service's current directory or service
       const project = this.createExternalProject(proj.projectFileName, rootFiles, proj.options, proj.typeAcquisition, excludedFiles);
       project.updateGraph();
     }
+    if (print)
+      this.printProjects();
   }
   hasDeferredExtension() {
     for (const extension of this.hostConfiguration.extraFileExtensions) {
@@ -184741,7 +184834,11 @@ var Session3 = class _Session {
         return this.requiredResponse(response);
       },
       ["openExternalProject" /* OpenExternalProject */]: (request) => {
-        this.projectService.openExternalProject(request.arguments);
+        this.projectService.openExternalProject(
+          request.arguments,
+          /*print*/
+          true
+        );
         return this.requiredResponse(
           /*response*/
           true
@@ -184755,7 +184852,11 @@ var Session3 = class _Session {
         );
       },
       ["closeExternalProject" /* CloseExternalProject */]: (request) => {
-        this.projectService.closeExternalProject(request.arguments.projectFileName);
+        this.projectService.closeExternalProject(
+          request.arguments.projectFileName,
+          /*print*/
+          true
+        );
         return this.requiredResponse(
           /*response*/
           true

package/lib/typescript.d.ts

@@ -3332,18 +3332,6 @@ declare namespace ts {
              * Last version that was reported.
              */
             private lastReportedVersion;
-            /**
-             * Current project's program version. (incremented everytime new program is created that is not complete reuse from the old one)
-             * This property is changed in 'updateGraph' based on the set of files in program
-             */
-            private projectProgramVersion;
-            /**
-             * Current version of the project state. It is changed when:
-             * - new root file was added/removed
-             * - edit happen in some file that is currently included in the project.
-             * This property is different from projectStructureVersion since in most cases edits don't affect set of files in the project
-             */
-            private projectStateVersion;
             protected projectErrors: Diagnostic[] | undefined;
             protected isInitialLoadPending: () => boolean;
             private readonly cancellationToken;

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.4";
-      version = `${versionMajorMinor}.0-dev.20240131`;
+      version = `${versionMajorMinor}.0-dev.20240202`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -91445,9 +91445,50 @@ ${lanes.join("\n")}
           return visitorWorker(node);
       }
     }
-    function visitElidableStatement(node) {
+    function isElisionBlocked(node) {
       const parsed = getParseTreeNode(node);
-      if (parsed !== node) {
+      if (parsed === node || isExportAssignment(node)) {
+        return false;
+      }
+      if (!parsed || parsed.kind !== node.kind) {
+        return true;
+      }
+      switch (node.kind) {
+        case 272 /* ImportDeclaration */:
+          Debug.assertNode(parsed, isImportDeclaration);
+          if (node.importClause !== parsed.importClause) {
+            return true;
+          }
+          if (node.attributes !== parsed.attributes) {
+            return true;
+          }
+          break;
+        case 271 /* ImportEqualsDeclaration */:
+          Debug.assertNode(parsed, isImportEqualsDeclaration);
+          if (node.name !== parsed.name) {
+            return true;
+          }
+          if (node.isTypeOnly !== parsed.isTypeOnly) {
+            return true;
+          }
+          if (node.moduleReference !== parsed.moduleReference && (isEntityName(node.moduleReference) || isEntityName(parsed.moduleReference))) {
+            return true;
+          }
+          break;
+        case 278 /* ExportDeclaration */:
+          Debug.assertNode(parsed, isExportDeclaration);
+          if (node.exportClause !== parsed.exportClause) {
+            return true;
+          }
+          if (node.attributes !== parsed.attributes) {
+            return true;
+          }
+          break;
+      }
+      return false;
+    }
+    function visitElidableStatement(node) {
+      if (isElisionBlocked(node)) {
         if (node.transformFlags & 1 /* ContainsTypeScript */) {
           return visitEachChild(node, visitor, context);
         }
@@ -167224,84 +167265,98 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     if (importGroup.length === 0) {
       return importGroup;
     }
-    const { importWithoutClause, typeOnlyImports, regularImports } = getCategorizedImports(importGroup);
-    const coalescedImports = [];
-    if (importWithoutClause) {
-      coalescedImports.push(importWithoutClause);
-    }
-    for (const group2 of [regularImports, typeOnlyImports]) {
-      const isTypeOnly = group2 === typeOnlyImports;
-      const { defaultImports, namespaceImports, namedImports } = group2;
-      if (!isTypeOnly && defaultImports.length === 1 && namespaceImports.length === 1 && namedImports.length === 0) {
-        const defaultImport = defaultImports[0];
-        coalescedImports.push(
-          updateImportDeclarationAndClause(defaultImport, defaultImport.importClause.name, namespaceImports[0].importClause.namedBindings)
-        );
-        continue;
-      }
-      const sortedNamespaceImports = stableSort(namespaceImports, (i1, i2) => comparer(i1.importClause.namedBindings.name.text, i2.importClause.namedBindings.name.text));
-      for (const namespaceImport of sortedNamespaceImports) {
-        coalescedImports.push(
-          updateImportDeclarationAndClause(
-            namespaceImport,
-            /*name*/
-            void 0,
-            namespaceImport.importClause.namedBindings
-          )
-        );
-      }
-      const firstDefaultImport = firstOrUndefined(defaultImports);
-      const firstNamedImport = firstOrUndefined(namedImports);
-      const importDecl = firstDefaultImport ?? firstNamedImport;
-      if (!importDecl) {
-        continue;
+    const importGroupsByAttributes = groupBy(importGroup, (decl) => {
+      if (decl.attributes) {
+        let attrs = decl.attributes.token + " ";
+        for (const x of sort(decl.attributes.elements, (x2, y) => compareStringsCaseSensitive(x2.name.text, y.name.text))) {
+          attrs += x.name.text + ":";
+          attrs += isStringLiteralLike(x.value) ? `"${x.value.text}"` : x.value.getText() + " ";
+        }
+        return attrs;
       }
-      let newDefaultImport;
-      const newImportSpecifiers = [];
-      if (defaultImports.length === 1) {
-        newDefaultImport = defaultImports[0].importClause.name;
-      } else {
-        for (const defaultImport of defaultImports) {
-          newImportSpecifiers.push(
-            factory.createImportSpecifier(
-              /*isTypeOnly*/
-              false,
-              factory.createIdentifier("default"),
-              defaultImport.importClause.name
+      return "";
+    });
+    const coalescedImports = [];
+    for (const attribute in importGroupsByAttributes) {
+      const importGroupSameAttrs = importGroupsByAttributes[attribute];
+      const { importWithoutClause, typeOnlyImports, regularImports } = getCategorizedImports(importGroupSameAttrs);
+      if (importWithoutClause) {
+        coalescedImports.push(importWithoutClause);
+      }
+      for (const group2 of [regularImports, typeOnlyImports]) {
+        const isTypeOnly = group2 === typeOnlyImports;
+        const { defaultImports, namespaceImports, namedImports } = group2;
+        if (!isTypeOnly && defaultImports.length === 1 && namespaceImports.length === 1 && namedImports.length === 0) {
+          const defaultImport = defaultImports[0];
+          coalescedImports.push(
+            updateImportDeclarationAndClause(defaultImport, defaultImport.importClause.name, namespaceImports[0].importClause.namedBindings)
+          );
+          continue;
+        }
+        const sortedNamespaceImports = stableSort(namespaceImports, (i1, i2) => comparer(i1.importClause.namedBindings.name.text, i2.importClause.namedBindings.name.text));
+        for (const namespaceImport of sortedNamespaceImports) {
+          coalescedImports.push(
+            updateImportDeclarationAndClause(
+              namespaceImport,
+              /*name*/
+              void 0,
+              namespaceImport.importClause.namedBindings
             )
           );
         }
-      }
-      newImportSpecifiers.push(...getNewImportSpecifiers(namedImports));
-      const sortedImportSpecifiers = factory.createNodeArray(
-        sortSpecifiers(newImportSpecifiers, comparer, preferences),
-        firstNamedImport == null ? void 0 : firstNamedImport.importClause.namedBindings.elements.hasTrailingComma
-      );
-      const newNamedImports = sortedImportSpecifiers.length === 0 ? newDefaultImport ? void 0 : factory.createNamedImports(emptyArray) : firstNamedImport ? factory.updateNamedImports(firstNamedImport.importClause.namedBindings, sortedImportSpecifiers) : factory.createNamedImports(sortedImportSpecifiers);
-      if (sourceFile && newNamedImports && (firstNamedImport == null ? void 0 : firstNamedImport.importClause.namedBindings) && !rangeIsOnSingleLine(firstNamedImport.importClause.namedBindings, sourceFile)) {
-        setEmitFlags(newNamedImports, 2 /* MultiLine */);
-      }
-      if (isTypeOnly && newDefaultImport && newNamedImports) {
-        coalescedImports.push(
-          updateImportDeclarationAndClause(
-            importDecl,
-            newDefaultImport,
-            /*namedBindings*/
-            void 0
-          )
-        );
-        coalescedImports.push(
-          updateImportDeclarationAndClause(
-            firstNamedImport ?? importDecl,
-            /*name*/
-            void 0,
-            newNamedImports
-          )
-        );
-      } else {
-        coalescedImports.push(
-          updateImportDeclarationAndClause(importDecl, newDefaultImport, newNamedImports)
+        const firstDefaultImport = firstOrUndefined(defaultImports);
+        const firstNamedImport = firstOrUndefined(namedImports);
+        const importDecl = firstDefaultImport ?? firstNamedImport;
+        if (!importDecl) {
+          continue;
+        }
+        let newDefaultImport;
+        const newImportSpecifiers = [];
+        if (defaultImports.length === 1) {
+          newDefaultImport = defaultImports[0].importClause.name;
+        } else {
+          for (const defaultImport of defaultImports) {
+            newImportSpecifiers.push(
+              factory.createImportSpecifier(
+                /*isTypeOnly*/
+                false,
+                factory.createIdentifier("default"),
+                defaultImport.importClause.name
+              )
+            );
+          }
+        }
+        newImportSpecifiers.push(...getNewImportSpecifiers(namedImports));
+        const sortedImportSpecifiers = factory.createNodeArray(
+          sortSpecifiers(newImportSpecifiers, comparer, preferences),
+          firstNamedImport == null ? void 0 : firstNamedImport.importClause.namedBindings.elements.hasTrailingComma
         );
+        const newNamedImports = sortedImportSpecifiers.length === 0 ? newDefaultImport ? void 0 : factory.createNamedImports(emptyArray) : firstNamedImport ? factory.updateNamedImports(firstNamedImport.importClause.namedBindings, sortedImportSpecifiers) : factory.createNamedImports(sortedImportSpecifiers);
+        if (sourceFile && newNamedImports && (firstNamedImport == null ? void 0 : firstNamedImport.importClause.namedBindings) && !rangeIsOnSingleLine(firstNamedImport.importClause.namedBindings, sourceFile)) {
+          setEmitFlags(newNamedImports, 2 /* MultiLine */);
+        }
+        if (isTypeOnly && newDefaultImport && newNamedImports) {
+          coalescedImports.push(
+            updateImportDeclarationAndClause(
+              importDecl,
+              newDefaultImport,
+              /*namedBindings*/
+              void 0
+            )
+          );
+          coalescedImports.push(
+            updateImportDeclarationAndClause(
+              firstNamedImport ?? importDecl,
+              /*name*/
+              void 0,
+              newNamedImports
+            )
+          );
+        } else {
+          coalescedImports.push(
+            updateImportDeclarationAndClause(importDecl, newDefaultImport, newNamedImports)
+          );
+        }
       }
     }
     return coalescedImports;
@@ -175754,6 +175809,7 @@ ${options.prefix}` : "\n" : options.prefix
           /**
            * Current project's program version. (incremented everytime new program is created that is not complete reuse from the old one)
            * This property is changed in 'updateGraph' based on the set of files in program
+           * @internal
            */
           this.projectProgramVersion = 0;
           /**
@@ -175761,6 +175817,7 @@ ${options.prefix}` : "\n" : options.prefix
            * - new root file was added/removed
            * - edit happen in some file that is currently included in the project.
            * This property is different from projectStructureVersion since in most cases edits don't affect set of files in the project
+           * @internal
            */
           this.projectStateVersion = 0;
           this.isInitialLoadPending = returnFalse;
@@ -176798,7 +176855,7 @@ ${options.prefix}` : "\n" : options.prefix
           );
           const elapsed = timestamp() - start;
           this.sendPerformanceEvent("UpdateGraph", elapsed);
-          this.writeLog(`Finishing updateGraphWorker: Project: ${this.getProjectName()} Version: ${this.getProjectVersion()} structureChanged: ${hasNewProgram}${this.program ? ` structureIsReused:: ${StructureIsReused[this.program.structureIsReused]}` : ""} Elapsed: ${elapsed}ms`);
+          this.writeLog(`Finishing updateGraphWorker: Project: ${this.getProjectName()} projectStateVersion: ${this.projectStateVersion} projectProgramVersion: ${this.projectProgramVersion} structureChanged: ${hasNewProgram}${this.program ? ` structureIsReused:: ${StructureIsReused[this.program.structureIsReused]}` : ""} Elapsed: ${elapsed}ms`);
           if (this.projectService.logger.isTestLogger) {
             if (this.program !== oldProgram) {
               this.print(
@@ -176961,6 +177018,7 @@ ${options.prefix}` : "\n" : options.prefix
         }
         /** @internal */
         print(writeProjectFileNames, writeFileExplaination, writeFileVersionAndText) {
+          var _a;
           this.writeLog(`Project '${this.projectName}' (${ProjectKind[this.projectKind]})`);
           this.writeLog(this.filesToStringWorker(
             writeProjectFileNames && this.projectService.logger.hasLevel(3 /* verbose */),
@@ -176978,6 +177036,14 @@ ${options.prefix}` : "\n" : options.prefix
               false
             );
           }
+          (_a = this.noDtsResolutionProject) == null ? void 0 : _a.print(
+            /*writeProjectFileNames*/
+            false,
+            /*writeFileExplaination*/
+            false,
+            /*writeFileVersionAndText*/
+            false
+          );
         }
         setCompilerOptions(compilerOptions) {
           var _a;
@@ -178417,6 +178483,8 @@ ${options.prefix}` : "\n" : options.prefix
           /** @internal */
           this.extendedConfigCache = /* @__PURE__ */ new Map();
           /** @internal */
+          this.baseline = noop;
+          /** @internal */
           this.verifyDocumentRegistry = noop;
           /** @internal */
           this.verifyProgram = noop;
@@ -180406,6 +180474,8 @@ Dynamic files must always be opened with service's current directory or service
           });
           this.inferredProjects.forEach((project) => this.clearSemanticCache(project));
           this.ensureProjectForOpenFiles();
+          this.logger.info("After reloading projects..");
+          this.printProjects();
         }
         /**
          * This function goes through all the openFiles and tries to file the config file for them.
@@ -180931,7 +181001,7 @@ Dynamic files must always be opened with service's current directory or service
             }
           }
         }
-        closeExternalProject(uncheckedFileName) {
+        closeExternalProject(uncheckedFileName, print) {
           const fileName = toNormalizedPath(uncheckedFileName);
           const configFiles = this.externalProjectToConfiguredProjectMap.get(fileName);
           if (configFiles) {
@@ -180945,6 +181015,8 @@ Dynamic files must always be opened with service's current directory or service
               this.removeProject(externalProject);
             }
           }
+          if (print)
+            this.printProjects();
         }
         openExternalProjects(projects) {
           const projectsToClose = arrayToMap(this.externalProjects, (p) => p.getProjectName(), (_) => true);
@@ -180952,12 +181024,21 @@ Dynamic files must always be opened with service's current directory or service
             projectsToClose.set(externalProjectName, true);
           });
           for (const externalProject of projects) {
-            this.openExternalProject(externalProject);
+            this.openExternalProject(
+              externalProject,
+              /*print*/
+              false
+            );
             projectsToClose.delete(externalProject.projectFileName);
           }
           forEachKey(projectsToClose, (externalProjectName) => {
-            this.closeExternalProject(externalProjectName);
+            this.closeExternalProject(
+              externalProjectName,
+              /*print*/
+              false
+            );
           });
+          this.printProjects();
         }
         static escapeFilenameForRegex(filename) {
           return filename.replace(this.filenameEscapeRegexp, "\\$&");
@@ -181050,7 +181131,7 @@ Dynamic files must always be opened with service's current directory or service
           proj.rootFiles = filesToKeep;
           return excludedFiles;
         }
-        openExternalProject(proj) {
+        openExternalProject(proj, print) {
           proj.typeAcquisition = proj.typeAcquisition || {};
           proj.typeAcquisition.include = proj.typeAcquisition.include || [];
           proj.typeAcquisition.exclude = proj.typeAcquisition.exclude || [];
@@ -181089,12 +181170,22 @@ Dynamic files must always be opened with service's current directory or service
               externalProject.setProjectErrors(watchOptionsAndErrors == null ? void 0 : watchOptionsAndErrors.errors);
               this.updateRootAndOptionsOfNonInferredProject(externalProject, proj.rootFiles, externalFilePropertyReader, compilerOptions, proj.typeAcquisition, proj.options.compileOnSave, watchOptionsAndErrors == null ? void 0 : watchOptionsAndErrors.watchOptions);
               externalProject.updateGraph();
+              if (print)
+                this.printProjects();
               return;
             }
-            this.closeExternalProject(proj.projectFileName);
+            this.closeExternalProject(
+              proj.projectFileName,
+              /*print*/
+              false
+            );
           } else if (this.externalProjectToConfiguredProjectMap.get(proj.projectFileName)) {
             if (!tsConfigFiles) {
-              this.closeExternalProject(proj.projectFileName);
+              this.closeExternalProject(
+                proj.projectFileName,
+                /*print*/
+                false
+              );
             } else {
               const oldConfigFiles = this.externalProjectToConfiguredProjectMap.get(proj.projectFileName);
               let iNew = 0;
@@ -181134,6 +181225,8 @@ Dynamic files must always be opened with service's current directory or service
             const project = this.createExternalProject(proj.projectFileName, rootFiles, proj.options, proj.typeAcquisition, excludedFiles);
             project.updateGraph();
           }
+          if (print)
+            this.printProjects();
         }
         hasDeferredExtension() {
           for (const extension of this.hostConfiguration.extraFileExtensions) {
@@ -182129,7 +182222,11 @@ ${json}${newLine}`;
               return this.requiredResponse(response);
             },
             ["openExternalProject" /* OpenExternalProject */]: (request) => {
-              this.projectService.openExternalProject(request.arguments);
+              this.projectService.openExternalProject(
+                request.arguments,
+                /*print*/
+                true
+              );
               return this.requiredResponse(
                 /*response*/
                 true
@@ -182143,7 +182240,11 @@ ${json}${newLine}`;
               );
             },
             ["closeExternalProject" /* CloseExternalProject */]: (request) => {
-              this.projectService.closeExternalProject(request.arguments.projectFileName);
+              this.projectService.closeExternalProject(
+                request.arguments.projectFileName,
+                /*print*/
+                true
+              );
               return this.requiredResponse(
                 /*response*/
                 true

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.20240131`;
+var version = `${versionMajorMinor}.0-dev.20240202`;
 
 // 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.20240131",
+    "version": "5.4.0-dev.20240202",
     "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": "104b0a6495cd6903a455f8438d9cdda20adeafff"
+    "gitHead": "593af47fa122a8017b956580856faa0e87aab4b6"
 }