typescript 5.4.0-dev.20231109 → 5.4.0-dev.20231111

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.20231109`;
+var version = `${versionMajorMinor}.0-dev.20231111`;
 
 // src/compiler/core.ts
 var emptyArray = [];

package/lib/tsserver.js

@@ -2330,7 +2330,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.4";
-var version = `${versionMajorMinor}.0-dev.20231109`;
+var version = `${versionMajorMinor}.0-dev.20231111`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -145046,6 +145046,13 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
     return sourceFile;
   }
   function synchronizeHostData() {
+    if (host.updateFromProject && !host.updateFromProjectInProgress) {
+      host.updateFromProject();
+    } else {
+      synchronizeHostDataWorker();
+    }
+  }
+  function synchronizeHostDataWorker() {
     var _a2, _b, _c;
     Debug.assert(languageServiceMode !== 2 /* Syntactic */);
     if (host.getProjectVersion) {
@@ -175413,6 +175420,35 @@ var TypingsInstaller = class {
       }
     }
   }
+  /** @internal */
+  installPackage(req) {
+    const { fileName, packageName, projectName, projectRootPath } = req;
+    const cwd = forEachAncestorDirectory(getDirectoryPath(fileName), (directory) => {
+      if (this.installTypingHost.fileExists(combinePaths(directory, "package.json"))) {
+        return directory;
+      }
+    }) || projectRootPath;
+    if (cwd) {
+      this.installWorker(-1, [packageName], cwd, (success) => {
+        const message = success ? `Package ${packageName} installed.` : `There was an error installing ${packageName}.`;
+        const response = {
+          kind: ActionPackageInstalled,
+          projectName,
+          success,
+          message
+        };
+        this.sendResponse(response);
+      });
+    } else {
+      const response = {
+        kind: ActionPackageInstalled,
+        projectName,
+        success: false,
+        message: "Could not determine a project root path."
+      };
+      this.sendResponse(response);
+    }
+  }
   initializeSafeList() {
     if (this.typesMapLocation) {
       const safeListFromMap = ts_JsTyping_exports.loadTypesMap(this.installTypingHost, this.typesMapLocation);
@@ -176788,6 +176824,8 @@ var Project3 = class _Project {
     this.createHash = maybeBind(this.projectService.host, this.projectService.host.createHash);
     /** @internal */
     this.globalCacheResolutionModuleName = ts_JsTyping_exports.nonRelativeModuleNameForTypingCache;
+    /** @internal */
+    this.updateFromProjectInProgress = false;
     this.projectName = projectName;
     this.directoryStructureHost = directoryStructureHost;
     this.currentDirectory = this.projectService.getNormalizedAbsolutePath(currentDirectory);
@@ -177532,6 +177570,10 @@ var Project3 = class _Project {
   onDiscoveredSymlink() {
     this.hasAddedOrRemovedSymlinks = true;
   }
+  /** @internal */
+  updateFromProject() {
+    updateProjectIfDirty(this);
+  }
   /**
    * Updates set of files that contribute to this project
    * @returns: true if set of files in the project stays the same and false - otherwise.
@@ -177549,7 +177591,7 @@ var Project3 = class _Project {
     for (const file of changedFiles) {
       this.cachedUnresolvedImportsPerFile.delete(file);
     }
-    if (this.languageServiceEnabled && this.projectService.serverMode === 0 /* Semantic */) {
+    if (this.languageServiceEnabled && this.projectService.serverMode === 0 /* Semantic */ && !this.isOrphan()) {
       if (hasNewProgram || changedFiles.length) {
         this.lastCachedUnresolvedImportsList = getUnresolvedImports(this.program, this.cachedUnresolvedImportsPerFile);
       }
@@ -177690,8 +177732,10 @@ var Project3 = class _Project {
     this.hasInvalidatedResolutions = hasInvalidatedResolutions;
     this.hasInvalidatedLibResolutions = hasInvalidatedLibResolutions;
     this.resolutionCache.startCachingPerDirectoryResolution();
-    this.program = this.languageService.getProgram();
     this.dirty = false;
+    this.updateFromProjectInProgress = true;
+    this.program = this.languageService.getProgram();
+    this.updateFromProjectInProgress = false;
     (_a = tracing) == null ? void 0 : _a.push(tracing.Phase.Session, "finishCachingPerDirectoryResolution");
     this.resolutionCache.finishCachingPerDirectoryResolution(this.program, oldProgram);
     (_b = tracing) == null ? void 0 : _b.pop();
@@ -183807,9 +183851,10 @@ var Session3 = class _Session {
     }
   }
   projectsUpdatedInBackgroundEvent(openFiles) {
-    this.projectService.logger.info(`got projects updated in background, updating diagnostics for ${openFiles}`);
+    this.projectService.logger.info(`got projects updated in background ${openFiles}`);
     if (openFiles.length) {
       if (!this.suppressDiagnosticEvents && !this.noGetErrOnBackgroundUpdate) {
+        this.projectService.logger.info(`Queueing diagnostics update for ${openFiles}`);
         this.errorCheck.startNew((next) => this.updateErrorCheck(
           next,
           openFiles,
@@ -183880,7 +183925,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
   send(msg) {
     if (msg.type === "event" && !this.canUseEvents) {
       if (this.logger.hasLevel(3 /* verbose */)) {
-        this.logger.info(`Session does not support events: ignored event: ${JSON.stringify(msg)}`);
+        this.logger.info(`Session does not support events: ignored event: ${stringifyIndented(msg)}`);
       }
       return;
     }

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.4";
-      version = `${versionMajorMinor}.0-dev.20231109`;
+      version = `${versionMajorMinor}.0-dev.20231111`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -142987,6 +142987,13 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       return sourceFile;
     }
     function synchronizeHostData() {
+      if (host.updateFromProject && !host.updateFromProjectInProgress) {
+        host.updateFromProject();
+      } else {
+        synchronizeHostDataWorker();
+      }
+    }
+    function synchronizeHostDataWorker() {
       var _a2, _b, _c;
       Debug.assert(languageServiceMode !== 2 /* Syntactic */);
       if (host.getProjectVersion) {
@@ -172628,6 +172635,35 @@ ${options.prefix}` : "\n" : options.prefix
             }
           }
         }
+        /** @internal */
+        installPackage(req) {
+          const { fileName, packageName, projectName, projectRootPath } = req;
+          const cwd = forEachAncestorDirectory(getDirectoryPath(fileName), (directory) => {
+            if (this.installTypingHost.fileExists(combinePaths(directory, "package.json"))) {
+              return directory;
+            }
+          }) || projectRootPath;
+          if (cwd) {
+            this.installWorker(-1, [packageName], cwd, (success) => {
+              const message = success ? `Package ${packageName} installed.` : `There was an error installing ${packageName}.`;
+              const response = {
+                kind: ActionPackageInstalled,
+                projectName,
+                success,
+                message
+              };
+              this.sendResponse(response);
+            });
+          } else {
+            const response = {
+              kind: ActionPackageInstalled,
+              projectName,
+              success: false,
+              message: "Could not determine a project root path."
+            };
+            this.sendResponse(response);
+          }
+        }
         initializeSafeList() {
           if (this.typesMapLocation) {
             const safeListFromMap = ts_JsTyping_exports.loadTypesMap(this.installTypingHost, this.typesMapLocation);
@@ -174119,6 +174155,8 @@ ${options.prefix}` : "\n" : options.prefix
           this.createHash = maybeBind(this.projectService.host, this.projectService.host.createHash);
           /** @internal */
           this.globalCacheResolutionModuleName = ts_JsTyping_exports.nonRelativeModuleNameForTypingCache;
+          /** @internal */
+          this.updateFromProjectInProgress = false;
           this.projectName = projectName;
           this.directoryStructureHost = directoryStructureHost;
           this.currentDirectory = this.projectService.getNormalizedAbsolutePath(currentDirectory);
@@ -174863,6 +174901,10 @@ ${options.prefix}` : "\n" : options.prefix
         onDiscoveredSymlink() {
           this.hasAddedOrRemovedSymlinks = true;
         }
+        /** @internal */
+        updateFromProject() {
+          updateProjectIfDirty(this);
+        }
         /**
          * Updates set of files that contribute to this project
          * @returns: true if set of files in the project stays the same and false - otherwise.
@@ -174880,7 +174922,7 @@ ${options.prefix}` : "\n" : options.prefix
           for (const file of changedFiles) {
             this.cachedUnresolvedImportsPerFile.delete(file);
           }
-          if (this.languageServiceEnabled && this.projectService.serverMode === 0 /* Semantic */) {
+          if (this.languageServiceEnabled && this.projectService.serverMode === 0 /* Semantic */ && !this.isOrphan()) {
             if (hasNewProgram || changedFiles.length) {
               this.lastCachedUnresolvedImportsList = getUnresolvedImports(this.program, this.cachedUnresolvedImportsPerFile);
             }
@@ -175021,8 +175063,10 @@ ${options.prefix}` : "\n" : options.prefix
           this.hasInvalidatedResolutions = hasInvalidatedResolutions;
           this.hasInvalidatedLibResolutions = hasInvalidatedLibResolutions;
           this.resolutionCache.startCachingPerDirectoryResolution();
-          this.program = this.languageService.getProgram();
           this.dirty = false;
+          this.updateFromProjectInProgress = true;
+          this.program = this.languageService.getProgram();
+          this.updateFromProjectInProgress = false;
           (_a = tracing) == null ? void 0 : _a.push(tracing.Phase.Session, "finishCachingPerDirectoryResolution");
           this.resolutionCache.finishCachingPerDirectoryResolution(this.program, oldProgram);
           (_b = tracing) == null ? void 0 : _b.pop();
@@ -181206,9 +181250,10 @@ ${json}${newLine}`;
           }
         }
         projectsUpdatedInBackgroundEvent(openFiles) {
-          this.projectService.logger.info(`got projects updated in background, updating diagnostics for ${openFiles}`);
+          this.projectService.logger.info(`got projects updated in background ${openFiles}`);
           if (openFiles.length) {
             if (!this.suppressDiagnosticEvents && !this.noGetErrOnBackgroundUpdate) {
+              this.projectService.logger.info(`Queueing diagnostics update for ${openFiles}`);
               this.errorCheck.startNew((next) => this.updateErrorCheck(
                 next,
                 openFiles,
@@ -181279,7 +181324,7 @@ Project '${project.projectName}' (${ProjectKind[project.projectKind]}) ${counter
         send(msg) {
           if (msg.type === "event" && !this.canUseEvents) {
             if (this.logger.hasLevel(3 /* verbose */)) {
-              this.logger.info(`Session does not support events: ignored event: ${JSON.stringify(msg)}`);
+              this.logger.info(`Session does not support events: ignored event: ${stringifyIndented(msg)}`);
             }
             return;
           }

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.20231109`;
+var version = `${versionMajorMinor}.0-dev.20231111`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -31902,6 +31902,35 @@ var TypingsInstaller = class {
       }
     }
   }
+  /** @internal */
+  installPackage(req) {
+    const { fileName, packageName, projectName, projectRootPath } = req;
+    const cwd = forEachAncestorDirectory(getDirectoryPath(fileName), (directory) => {
+      if (this.installTypingHost.fileExists(combinePaths(directory, "package.json"))) {
+        return directory;
+      }
+    }) || projectRootPath;
+    if (cwd) {
+      this.installWorker(-1, [packageName], cwd, (success) => {
+        const message = success ? `Package ${packageName} installed.` : `There was an error installing ${packageName}.`;
+        const response = {
+          kind: ActionPackageInstalled,
+          projectName,
+          success,
+          message
+        };
+        this.sendResponse(response);
+      });
+    } else {
+      const response = {
+        kind: ActionPackageInstalled,
+        projectName,
+        success: false,
+        message: "Could not determine a project root path."
+      };
+      this.sendResponse(response);
+    }
+  }
   initializeSafeList() {
     if (this.typesMapLocation) {
       const safeListFromMap = ts_JsTyping_exports.loadTypesMap(this.installTypingHost, this.typesMapLocation);
@@ -32252,18 +32281,7 @@ var NodeTypingsInstaller = class extends TypingsInstaller {
         break;
       }
       case "installPackage": {
-        const { fileName, packageName, projectName, projectRootPath } = req;
-        const cwd = getDirectoryOfPackageJson(fileName, this.installTypingHost) || projectRootPath;
-        if (cwd) {
-          this.installWorker(-1, [packageName], cwd, (success) => {
-            const message = success ? `Package ${packageName} installed.` : `There was an error installing ${packageName}.`;
-            const response = { kind: ActionPackageInstalled, projectName, success, message };
-            this.sendResponse(response);
-          });
-        } else {
-          const response = { kind: ActionPackageInstalled, projectName, success: false, message: "Could not determine a project root path." };
-          this.sendResponse(response);
-        }
+        this.installPackage(req);
         break;
       }
       default:
@@ -32281,7 +32299,7 @@ var NodeTypingsInstaller = class extends TypingsInstaller {
   }
   installWorker(requestId, packageNames, cwd, onRequestCompleted) {
     if (this.log.isEnabled()) {
-      this.log.writeLine(`#${requestId} with arguments'${JSON.stringify(packageNames)}'.`);
+      this.log.writeLine(`#${requestId} with cwd: ${cwd} arguments: ${JSON.stringify(packageNames)}`);
     }
     const start = Date.now();
     const hasError = installNpmPackages(this.npmPath, version, packageNames, (command) => this.execSyncAndLog(command, { cwd }));
@@ -32308,13 +32326,6 @@ var NodeTypingsInstaller = class extends TypingsInstaller {
     }
   }
 };
-function getDirectoryOfPackageJson(fileName, host) {
-  return forEachAncestorDirectory(getDirectoryPath(fileName), (directory) => {
-    if (host.fileExists(combinePaths(directory, "package.json"))) {
-      return directory;
-    }
-  });
-}
 var logFilePath = findArgument(Arguments.LogFile);
 var globalTypingsCacheLocation = findArgument(Arguments.GlobalCacheLocation);
 var typingSafeListLocation = findArgument(Arguments.TypingSafeListLocation);

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.4.0-dev.20231109",
+    "version": "5.4.0-dev.20231111",
     "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": "8e1fb5789abcd93592d8e437df8f7261295613fc"
+    "gitHead": "ca7a3af5e607a6c8589f5f600d6c4960a8bc07d4"
 }