typescript 5.1.0-dev.20230426 → 5.1.0-dev.20230427

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230426`;
+var version = `${versionMajorMinor}.0-dev.20230427`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -54540,16 +54540,16 @@ function createTypeChecker(host) {
     if (declaration.kind === 175 /* Constructor */) {
       return getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol));
     }
+    const typeNode = getEffectiveReturnTypeNode(declaration);
     if (isJSDocSignature(declaration)) {
       const root = getJSDocRoot(declaration);
-      if (root && isConstructorDeclaration(root.parent)) {
+      if (root && isConstructorDeclaration(root.parent) && !typeNode) {
         return getDeclaredTypeOfClassOrInterface(getMergedSymbol(root.parent.parent.symbol));
       }
     }
     if (isJSDocConstructSignature(declaration)) {
       return getTypeFromTypeNode(declaration.parameters[0].type);
     }
-    const typeNode = getEffectiveReturnTypeNode(declaration);
     if (typeNode) {
       return getTypeFromTypeNode(typeNode);
     }
@@ -66976,6 +66976,7 @@ function createTypeChecker(host) {
     );
   }
   function discriminateContextualTypeByJSXAttributes(node, contextualType) {
+    const jsxChildrenPropertyName = getJsxElementChildrenPropertyName(getJsxNamespaceAt(node));
     return discriminateTypeByDiscriminableItems(
       contextualType,
       concatenate(
@@ -66986,7 +66987,14 @@ function createTypeChecker(host) {
         map(
           filter(getPropertiesOfType(contextualType), (s) => {
             var _a;
-            return !!(s.flags & 16777216 /* Optional */) && !!((_a = node == null ? void 0 : node.symbol) == null ? void 0 : _a.members) && !node.symbol.members.has(s.escapedName) && isDiscriminantProperty(contextualType, s.escapedName);
+            if (!(s.flags & 16777216 /* Optional */) || !((_a = node == null ? void 0 : node.symbol) == null ? void 0 : _a.members)) {
+              return false;
+            }
+            const element = node.parent.parent;
+            if (s.escapedName === jsxChildrenPropertyName && isJsxElement(element) && getSemanticJsxChildren(element.children).length) {
+              return false;
+            }
+            return !node.symbol.members.has(s.escapedName) && isDiscriminantProperty(contextualType, s.escapedName);
           }),
           (s) => [() => undefinedType, s.escapedName]
         )
@@ -119633,7 +119641,9 @@ var WatchType = {
   MissingSourceMapFile: "Missing source map file",
   NoopConfigFileForInferredRoot: "Noop Config file for the inferred project root",
   MissingGeneratedFile: "Missing generated file",
-  NodeModulesForModuleSpecifierCache: "node_modules for module specifier cache invalidation"
+  NodeModulesForModuleSpecifierCache: "node_modules for module specifier cache invalidation",
+  TypingInstallerLocationFile: "File location for typing installer",
+  TypingInstallerLocationDirectory: "Directory location for typing installer"
 };
 function createWatchFactory(host, options) {
   const watchLogLevel = host.trace ? options.extendedDiagnostics ? 2 /* Verbose */ : options.diagnostics ? 1 /* TriggerOnly */ : 0 /* None */ : 0 /* None */;

package/lib/tsserver.js

@@ -2303,7 +2303,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230426`;
+var version = `${versionMajorMinor}.0-dev.20230427`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -6951,10 +6951,10 @@ var LanguageVariant = /* @__PURE__ */ ((LanguageVariant4) => {
   LanguageVariant4[LanguageVariant4["JSX"] = 1] = "JSX";
   return LanguageVariant4;
 })(LanguageVariant || {});
-var WatchDirectoryFlags = /* @__PURE__ */ ((WatchDirectoryFlags4) => {
-  WatchDirectoryFlags4[WatchDirectoryFlags4["None"] = 0] = "None";
-  WatchDirectoryFlags4[WatchDirectoryFlags4["Recursive"] = 1] = "Recursive";
-  return WatchDirectoryFlags4;
+var WatchDirectoryFlags = /* @__PURE__ */ ((WatchDirectoryFlags3) => {
+  WatchDirectoryFlags3[WatchDirectoryFlags3["None"] = 0] = "None";
+  WatchDirectoryFlags3[WatchDirectoryFlags3["Recursive"] = 1] = "Recursive";
+  return WatchDirectoryFlags3;
 })(WatchDirectoryFlags || {});
 var CharacterCodes = /* @__PURE__ */ ((CharacterCodes2) => {
   CharacterCodes2[CharacterCodes2["nullCharacter"] = 0] = "nullCharacter";
@@ -59190,16 +59190,16 @@ function createTypeChecker(host) {
     if (declaration.kind === 175 /* Constructor */) {
       return getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol));
     }
+    const typeNode = getEffectiveReturnTypeNode(declaration);
     if (isJSDocSignature(declaration)) {
       const root = getJSDocRoot(declaration);
-      if (root && isConstructorDeclaration(root.parent)) {
+      if (root && isConstructorDeclaration(root.parent) && !typeNode) {
         return getDeclaredTypeOfClassOrInterface(getMergedSymbol(root.parent.parent.symbol));
       }
     }
     if (isJSDocConstructSignature(declaration)) {
       return getTypeFromTypeNode(declaration.parameters[0].type);
     }
-    const typeNode = getEffectiveReturnTypeNode(declaration);
     if (typeNode) {
       return getTypeFromTypeNode(typeNode);
     }
@@ -71626,6 +71626,7 @@ function createTypeChecker(host) {
     );
   }
   function discriminateContextualTypeByJSXAttributes(node, contextualType) {
+    const jsxChildrenPropertyName = getJsxElementChildrenPropertyName(getJsxNamespaceAt(node));
     return discriminateTypeByDiscriminableItems(
       contextualType,
       concatenate(
@@ -71636,7 +71637,14 @@ function createTypeChecker(host) {
         map(
           filter(getPropertiesOfType(contextualType), (s) => {
             var _a;
-            return !!(s.flags & 16777216 /* Optional */) && !!((_a = node == null ? void 0 : node.symbol) == null ? void 0 : _a.members) && !node.symbol.members.has(s.escapedName) && isDiscriminantProperty(contextualType, s.escapedName);
+            if (!(s.flags & 16777216 /* Optional */) || !((_a = node == null ? void 0 : node.symbol) == null ? void 0 : _a.members)) {
+              return false;
+            }
+            const element = node.parent.parent;
+            if (s.escapedName === jsxChildrenPropertyName && isJsxElement(element) && getSemanticJsxChildren(element.children).length) {
+              return false;
+            }
+            return !node.symbol.members.has(s.escapedName) && isDiscriminantProperty(contextualType, s.escapedName);
           }),
           (s) => [() => undefinedType, s.escapedName]
         )
@@ -117327,7 +117335,7 @@ var WatchLogLevel = /* @__PURE__ */ ((WatchLogLevel2) => {
   WatchLogLevel2[WatchLogLevel2["Verbose"] = 2] = "Verbose";
   return WatchLogLevel2;
 })(WatchLogLevel || {});
-function getWatchFactory(host, watchLogLevel, log, getDetailWatchInfo3) {
+function getWatchFactory(host, watchLogLevel, log, getDetailWatchInfo2) {
   setSysLog(watchLogLevel === 2 /* Verbose */ ? log : noop);
   const plainInvokeFactory = {
     watchFile: (file, callback, pollingInterval, options) => host.watchFile(file, callback, pollingInterval, options),
@@ -117365,23 +117373,23 @@ function getWatchFactory(host, watchLogLevel, log, getDetailWatchInfo3) {
     return typeof host.useCaseSensitiveFileNames === "boolean" ? host.useCaseSensitiveFileNames : host.useCaseSensitiveFileNames();
   }
   function createExcludeWatcherWithLogging(file, flags, options, detailInfo1, detailInfo2) {
-    log(`ExcludeWatcher:: Added:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo3)}`);
+    log(`ExcludeWatcher:: Added:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`);
     return {
-      close: () => log(`ExcludeWatcher:: Close:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo3)}`)
+      close: () => log(`ExcludeWatcher:: Close:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`)
     };
   }
   function createFileWatcherWithLogging(file, cb, flags, options, detailInfo1, detailInfo2) {
-    log(`FileWatcher:: Added:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo3)}`);
+    log(`FileWatcher:: Added:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`);
     const watcher = triggerInvokingFactory.watchFile(file, cb, flags, options, detailInfo1, detailInfo2);
     return {
       close: () => {
-        log(`FileWatcher:: Close:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo3)}`);
+        log(`FileWatcher:: Close:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`);
         watcher.close();
       }
     };
   }
   function createDirectoryWatcherWithLogging(file, cb, flags, options, detailInfo1, detailInfo2) {
-    const watchInfo = `DirectoryWatcher:: Added:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo3)}`;
+    const watchInfo = `DirectoryWatcher:: Added:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`;
     log(watchInfo);
     const start2 = timestamp();
     const watcher = triggerInvokingFactory.watchDirectory(file, cb, flags, options, detailInfo1, detailInfo2);
@@ -117389,7 +117397,7 @@ function getWatchFactory(host, watchLogLevel, log, getDetailWatchInfo3) {
     log(`Elapsed:: ${elapsed}ms ${watchInfo}`);
     return {
       close: () => {
-        const watchInfo2 = `DirectoryWatcher:: Close:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo3)}`;
+        const watchInfo2 = `DirectoryWatcher:: Close:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`;
         log(watchInfo2);
         const start3 = timestamp();
         watcher.close();
@@ -117404,7 +117412,7 @@ function getWatchFactory(host, watchLogLevel, log, getDetailWatchInfo3) {
       void 0,
       file,
       (...args) => {
-        const triggerredInfo = `${key === "watchFile" ? "FileWatcher" : "DirectoryWatcher"}:: Triggered with ${args[0]} ${args[1] !== void 0 ? args[1] : ""}:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo3)}`;
+        const triggerredInfo = `${key === "watchFile" ? "FileWatcher" : "DirectoryWatcher"}:: Triggered with ${args[0]} ${args[1] !== void 0 ? args[1] : ""}:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`;
         log(triggerredInfo);
         const start2 = timestamp();
         cb.call(
@@ -117421,8 +117429,8 @@ function getWatchFactory(host, watchLogLevel, log, getDetailWatchInfo3) {
       detailInfo2
     );
   }
-  function getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo4) {
-    return `WatchInfo: ${file} ${flags} ${JSON.stringify(options)} ${getDetailWatchInfo4 ? getDetailWatchInfo4(detailInfo1, detailInfo2) : detailInfo2 === void 0 ? detailInfo1 : `${detailInfo1} ${detailInfo2}`}`;
+  function getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo3) {
+    return `WatchInfo: ${file} ${flags} ${JSON.stringify(options)} ${getDetailWatchInfo3 ? getDetailWatchInfo3(detailInfo1, detailInfo2) : detailInfo2 === void 0 ? detailInfo1 : `${detailInfo1} ${detailInfo2}`}`;
   }
 }
 function getFallbackOptions(options) {
@@ -124554,7 +124562,9 @@ var WatchType = {
   MissingSourceMapFile: "Missing source map file",
   NoopConfigFileForInferredRoot: "Noop Config file for the inferred project root",
   MissingGeneratedFile: "Missing generated file",
-  NodeModulesForModuleSpecifierCache: "node_modules for module specifier cache invalidation"
+  NodeModulesForModuleSpecifierCache: "node_modules for module specifier cache invalidation",
+  TypingInstallerLocationFile: "File location for typing installer",
+  TypingInstallerLocationDirectory: "Directory location for typing installer"
 };
 function createWatchFactory(host, options) {
   const watchLogLevel = host.trace ? options.extendedDiagnostics ? 2 /* Verbose */ : options.diagnostics ? 1 /* TriggerOnly */ : 0 /* None */ : 0 /* None */;
@@ -127834,6 +127844,7 @@ var EventTypesRegistry = "event::typesRegistry";
 var EventBeginInstallTypes = "event::beginInstallTypes";
 var EventEndInstallTypes = "event::endInstallTypes";
 var EventInitializationFailed = "event::initializationFailed";
+var ActionWatchTypingLocations = "action::watchTypingLocations";
 var Arguments;
 ((Arguments2) => {
   Arguments2.GlobalCacheLocation = "--globalTypingsCacheLocation";
@@ -171595,6 +171606,7 @@ __export(ts_server_exports3, {
   ActionInvalidate: () => ActionInvalidate,
   ActionPackageInstalled: () => ActionPackageInstalled,
   ActionSet: () => ActionSet,
+  ActionWatchTypingLocations: () => ActionWatchTypingLocations,
   Arguments: () => Arguments,
   AutoImportProviderProject: () => AutoImportProviderProject,
   CharRangeSection: () => CharRangeSection,
@@ -171728,19 +171740,6 @@ function getNpmCommandForInstallation(npmPath, tsVersion, packageNames, remainin
   }
   return { command, remaining: remaining - toSlice };
 }
-function endsWith2(str, suffix, caseSensitive) {
-  const expectedPos = str.length - suffix.length;
-  return expectedPos >= 0 && (str.indexOf(suffix, expectedPos) === expectedPos || !caseSensitive && compareStringsCaseInsensitive(str.substr(expectedPos), suffix) === 0 /* EqualTo */);
-}
-function isPackageOrBowerJson(fileName, caseSensitive) {
-  return endsWith2(fileName, "/package.json", caseSensitive) || endsWith2(fileName, "/bower.json", caseSensitive);
-}
-function sameFiles(a, b, caseSensitive) {
-  return a === b || !caseSensitive && compareStringsCaseInsensitive(a, b) === 0 /* EqualTo */;
-}
-function getDetailWatchInfo(projectName, watchers) {
-  return `Project: ${projectName} watcher already invoked: ${watchers == null ? void 0 : watchers.isInvoked}`;
-}
 var TypingsInstaller = class {
   constructor(installTypingHost, globalCachePath, safeListPath, typesMapLocation, throttleLimit, log = nullLog) {
     this.installTypingHost = installTypingHost;
@@ -171758,13 +171757,10 @@ var TypingsInstaller = class {
     this.installRunCount = 1;
     this.inFlightRequestCount = 0;
     this.latestDistTag = "latest";
-    this.toCanonicalFileName = createGetCanonicalFileName(installTypingHost.useCaseSensitiveFileNames);
-    this.globalCachePackageJsonPath = combinePaths(globalCachePath, "package.json");
     const isLoggingEnabled = this.log.isEnabled();
     if (isLoggingEnabled) {
       this.log.writeLine(`Global cache location '${globalCachePath}', safe file path '${safeListPath}', types map path ${typesMapLocation}`);
     }
-    this.watchFactory = getWatchFactory(this.installTypingHost, isLoggingEnabled ? 2 /* Verbose */ : 0 /* None */, (s) => this.log.writeLine(s), getDetailWatchInfo);
     this.processCacheLocation(this.globalCachePath);
   }
   closeProject(req) {
@@ -171781,8 +171777,8 @@ var TypingsInstaller = class {
       }
       return;
     }
-    clearMap(watchers, closeFileWatcher);
     this.projectWatchers.delete(projectName);
+    this.sendResponse({ kind: ActionWatchTypingLocations, projectName, files: [] });
     if (this.log.isEnabled()) {
       this.log.writeLine(`Closing file watchers for project '${projectName}' - done.`);
     }
@@ -171815,7 +171811,7 @@ var TypingsInstaller = class {
     if (this.log.isEnabled()) {
       this.log.writeLine(`Finished typings discovery: ${JSON.stringify(discoverTypingsResult)}`);
     }
-    this.watchFiles(req.projectName, discoverTypingsResult.filesToWatch, req.projectRootPath, req.watchOptions);
+    this.watchFiles(req.projectName, discoverTypingsResult.filesToWatch);
     if (discoverTypingsResult.newTypingNames.length) {
       this.installTypings(req, req.cachePath || this.globalCachePath, discoverTypingsResult.cachedTypingPaths, discoverTypingsResult.newTypingNames);
     } else {
@@ -172016,75 +172012,19 @@ var TypingsInstaller = class {
       host.createDirectory(directory);
     }
   }
-  watchFiles(projectName, files, projectRootPath, options) {
+  watchFiles(projectName, files) {
     if (!files.length) {
       this.closeWatchers(projectName);
       return;
     }
-    let watchers = this.projectWatchers.get(projectName);
-    const toRemove = /* @__PURE__ */ new Map();
-    if (!watchers) {
-      watchers = /* @__PURE__ */ new Map();
-      this.projectWatchers.set(projectName, watchers);
+    const existing = this.projectWatchers.get(projectName);
+    const newSet = new Set(files);
+    if (!existing || forEachKey(newSet, (s) => !existing.has(s)) || forEachKey(existing, (s) => !newSet.has(s))) {
+      this.projectWatchers.set(projectName, newSet);
+      this.sendResponse({ kind: ActionWatchTypingLocations, projectName, files });
     } else {
-      copyEntries(watchers, toRemove);
+      this.sendResponse({ kind: ActionWatchTypingLocations, projectName, files: void 0 });
     }
-    watchers.isInvoked = false;
-    const isLoggingEnabled = this.log.isEnabled();
-    const createProjectWatcher = (path, projectWatcherType) => {
-      const canonicalPath = this.toCanonicalFileName(path);
-      toRemove.delete(canonicalPath);
-      if (watchers.has(canonicalPath)) {
-        return;
-      }
-      if (isLoggingEnabled) {
-        this.log.writeLine(`${projectWatcherType}:: Added:: WatchInfo: ${path}`);
-      }
-      const watcher = projectWatcherType === "FileWatcher" /* FileWatcher */ ? this.watchFactory.watchFile(path, () => {
-        if (!watchers.isInvoked) {
-          watchers.isInvoked = true;
-          this.sendResponse({ projectName, kind: ActionInvalidate });
-        }
-      }, 2e3 /* High */, options, projectName, watchers) : this.watchFactory.watchDirectory(path, (f) => {
-        if (watchers.isInvoked || !fileExtensionIs(f, ".json" /* Json */)) {
-          return;
-        }
-        if (isPackageOrBowerJson(f, this.installTypingHost.useCaseSensitiveFileNames) && !sameFiles(f, this.globalCachePackageJsonPath, this.installTypingHost.useCaseSensitiveFileNames)) {
-          watchers.isInvoked = true;
-          this.sendResponse({ projectName, kind: ActionInvalidate });
-        }
-      }, 1 /* Recursive */, options, projectName, watchers);
-      watchers.set(canonicalPath, isLoggingEnabled ? {
-        close: () => {
-          this.log.writeLine(`${projectWatcherType}:: Closed:: WatchInfo: ${path}`);
-          watcher.close();
-        }
-      } : watcher);
-    };
-    for (const file of files) {
-      if (file.endsWith("/package.json") || file.endsWith("/bower.json")) {
-        createProjectWatcher(file, "FileWatcher" /* FileWatcher */);
-        continue;
-      }
-      if (containsPath(projectRootPath, file, projectRootPath, !this.installTypingHost.useCaseSensitiveFileNames)) {
-        const subDirectory = file.indexOf(directorySeparator, projectRootPath.length + 1);
-        if (subDirectory !== -1) {
-          createProjectWatcher(file.substr(0, subDirectory), "DirectoryWatcher" /* DirectoryWatcher */);
-        } else {
-          createProjectWatcher(file, "DirectoryWatcher" /* DirectoryWatcher */);
-        }
-        continue;
-      }
-      if (containsPath(this.globalCachePath, file, projectRootPath, !this.installTypingHost.useCaseSensitiveFileNames)) {
-        createProjectWatcher(this.globalCachePath, "DirectoryWatcher" /* DirectoryWatcher */);
-        continue;
-      }
-      createProjectWatcher(file, "DirectoryWatcher" /* DirectoryWatcher */);
-    }
-    toRemove.forEach((watch, path) => {
-      watch.close();
-      watchers.delete(path);
-    });
   }
   createSetTypings(request, typings) {
     return {
@@ -172141,7 +172081,6 @@ function createInstallTypingsRequest(project, typeAcquisition, unresolvedImports
       true
     ).concat(project.getExcludedFiles()),
     compilerOptions: project.getCompilationSettings(),
-    watchOptions: project.projectService.getWatchOptions(project),
     typeAcquisition,
     unresolvedImports,
     projectRootPath: project.getCurrentDirectory(),
@@ -173759,6 +173698,8 @@ var Project3 = class {
     return path === options.configFilePath ? options.configFile : this.getSourceFile(path);
   }
   close() {
+    this.projectService.typingsCache.onProjectClosed(this);
+    this.closeWatchingTypingLocations();
     if (this.program) {
       for (const f of this.program.getSourceFiles()) {
         this.detachScriptInfoIfNotRoot(f.fileName);
@@ -174049,6 +173990,89 @@ var Project3 = class {
     }
   }
   /** @internal */
+  closeWatchingTypingLocations() {
+    if (this.typingWatchers)
+      clearMap(this.typingWatchers, closeFileWatcher);
+    this.typingWatchers = void 0;
+  }
+  /** @internal */
+  onTypingInstallerWatchInvoke() {
+    this.typingWatchers.isInvoked = true;
+    this.projectService.updateTypingsForProject({ projectName: this.getProjectName(), kind: ActionInvalidate });
+  }
+  /** @internal */
+  watchTypingLocations(files) {
+    if (!files) {
+      this.typingWatchers.isInvoked = false;
+      return;
+    }
+    if (!files.length) {
+      this.closeWatchingTypingLocations();
+      return;
+    }
+    const toRemove = new Map(this.typingWatchers);
+    if (!this.typingWatchers)
+      this.typingWatchers = /* @__PURE__ */ new Map();
+    this.typingWatchers.isInvoked = false;
+    const createProjectWatcher = (path, typingsWatcherType) => {
+      const canonicalPath = this.toPath(path);
+      toRemove.delete(canonicalPath);
+      if (!this.typingWatchers.has(canonicalPath)) {
+        this.typingWatchers.set(
+          canonicalPath,
+          typingsWatcherType === "FileWatcher" /* FileWatcher */ ? this.projectService.watchFactory.watchFile(
+            path,
+            () => !this.typingWatchers.isInvoked ? this.onTypingInstallerWatchInvoke() : this.writeLog(`TypingWatchers already invoked`),
+            2e3 /* High */,
+            this.projectService.getWatchOptions(this),
+            WatchType.TypingInstallerLocationFile,
+            this
+          ) : this.projectService.watchFactory.watchDirectory(
+            path,
+            (f) => {
+              if (this.typingWatchers.isInvoked)
+                return this.writeLog(`TypingWatchers already invoked`);
+              if (!fileExtensionIs(f, ".json" /* Json */))
+                return this.writeLog(`Ignoring files that are not *.json`);
+              if (comparePaths(f, combinePaths(this.projectService.typingsInstaller.globalTypingsCacheLocation, "package.json"), !this.useCaseSensitiveFileNames()))
+                return this.writeLog(`Ignoring package.json change at global typings location`);
+              this.onTypingInstallerWatchInvoke();
+            },
+            1 /* Recursive */,
+            this.projectService.getWatchOptions(this),
+            WatchType.TypingInstallerLocationDirectory,
+            this
+          )
+        );
+      }
+    };
+    for (const file of files) {
+      const basename = getBaseFileName(file);
+      if (basename === "package.json" || basename === "bower.json") {
+        createProjectWatcher(file, "FileWatcher" /* FileWatcher */);
+        continue;
+      }
+      if (containsPath(this.currentDirectory, file, this.currentDirectory, !this.useCaseSensitiveFileNames())) {
+        const subDirectory = file.indexOf(directorySeparator, this.currentDirectory.length + 1);
+        if (subDirectory !== -1) {
+          createProjectWatcher(file.substr(0, subDirectory), "DirectoryWatcher" /* DirectoryWatcher */);
+        } else {
+          createProjectWatcher(file, "DirectoryWatcher" /* DirectoryWatcher */);
+        }
+        continue;
+      }
+      if (containsPath(this.projectService.typingsInstaller.globalTypingsCacheLocation, file, this.currentDirectory, !this.useCaseSensitiveFileNames())) {
+        createProjectWatcher(this.projectService.typingsInstaller.globalTypingsCacheLocation, "DirectoryWatcher" /* DirectoryWatcher */);
+        continue;
+      }
+      createProjectWatcher(file, "DirectoryWatcher" /* DirectoryWatcher */);
+    }
+    toRemove.forEach((watch, path) => {
+      watch.close();
+      this.typingWatchers.delete(path);
+    });
+  }
+  /** @internal */
   getCurrentProgram() {
     return this.program;
   }
@@ -175613,7 +175637,7 @@ function forEachReferencedProject(project, cb) {
     (potentialProjectRef) => callbackRefProject(project, cb, potentialProjectRef)
   );
 }
-function getDetailWatchInfo2(watchType, project) {
+function getDetailWatchInfo(watchType, project) {
   return `${isString(project) ? `Config: ${project} ` : project ? `Project: ${project.getProjectName()} ` : ""}WatchType: ${watchType}`;
 }
 function isScriptInfoWatchedFromNodeModules(info) {
@@ -175759,7 +175783,7 @@ var _ProjectService = class {
     this.watchFactory = this.serverMode !== 0 /* Semantic */ ? {
       watchFile: returnNoopFileWatcher,
       watchDirectory: returnNoopFileWatcher
-    } : getWatchFactory(this.host, watchLogLevel, log, getDetailWatchInfo2);
+    } : getWatchFactory(this.host, watchLogLevel, log, getDetailWatchInfo);
   }
   toPath(fileName) {
     return toPath(fileName, this.currentDirectory, this.toCanonicalFileName);
@@ -175845,6 +175869,11 @@ var _ProjectService = class {
     }
   }
   /** @internal */
+  watchTypingLocations(response) {
+    var _a;
+    (_a = this.findProject(response.projectName)) == null ? void 0 : _a.watchTypingLocations(response.files);
+  }
+  /** @internal */
   delayEnsureProjectForOpenFiles() {
     if (!this.openFiles.size)
       return;
@@ -182804,6 +182833,7 @@ __export(ts_server_exports4, {
   ActionInvalidate: () => ActionInvalidate,
   ActionPackageInstalled: () => ActionPackageInstalled,
   ActionSet: () => ActionSet,
+  ActionWatchTypingLocations: () => ActionWatchTypingLocations,
   Arguments: () => Arguments,
   AutoImportProviderProject: () => AutoImportProviderProject,
   CharRangeSection: () => CharRangeSection,
@@ -183415,6 +183445,9 @@ function startNodeSession(options, logger, cancellationToken) {
           this.event(response, "setTypings");
           break;
         }
+        case ActionWatchTypingLocations:
+          this.projectService.watchTypingLocations(response);
+          break;
         default:
           assertType(response);
       }

package/lib/tsserverlibrary.d.ts

@@ -22,8 +22,9 @@ declare namespace ts {
         type EventBeginInstallTypes = "event::beginInstallTypes";
         type EventEndInstallTypes = "event::endInstallTypes";
         type EventInitializationFailed = "event::initializationFailed";
+        type ActionWatchTypingLocations = "action::watchTypingLocations";
         interface TypingInstallerResponse {
-            readonly kind: ActionSet | ActionInvalidate | EventTypesRegistry | ActionPackageInstalled | EventBeginInstallTypes | EventEndInstallTypes | EventInitializationFailed;
+            readonly kind: ActionSet | ActionInvalidate | EventTypesRegistry | ActionPackageInstalled | EventBeginInstallTypes | EventEndInstallTypes | EventInitializationFailed | ActionWatchTypingLocations;
         }
         interface TypingInstallerRequestWithProjectName {
             readonly projectName: string;
@@ -32,7 +33,6 @@ declare namespace ts {
             readonly fileNames: string[];
             readonly projectRootPath: Path;
             readonly compilerOptions: CompilerOptions;
-            readonly watchOptions?: WatchOptions;
             readonly typeAcquisition: TypeAcquisition;
             readonly unresolvedImports: SortedReadonlyArray<string>;
             readonly cachePath?: string;
@@ -84,8 +84,6 @@ declare namespace ts {
             writeFile(path: string, content: string): void;
             createDirectory(path: string): void;
             getCurrentDirectory?(): string;
-            watchFile?(path: string, callback: FileWatcherCallback, pollingInterval?: number, options?: WatchOptions): FileWatcher;
-            watchDirectory?(path: string, callback: DirectoryWatcherCallback, recursive?: boolean, options?: WatchOptions): FileWatcher;
         }
         interface SetTypings extends ProjectResponse {
             readonly typeAcquisition: TypeAcquisition;
@@ -94,6 +92,11 @@ declare namespace ts {
             readonly unresolvedImports: SortedReadonlyArray<string>;
             readonly kind: ActionSet;
         }
+        interface WatchTypingLocations extends ProjectResponse {
+            /** if files is undefined, retain same set of watchers */
+            readonly files: readonly string[] | undefined;
+            readonly kind: ActionWatchTypingLocations;
+        }
         namespace protocol {
             enum CommandTypes {
                 JsxClosingTag = "jsxClosingTag",
@@ -3044,8 +3047,6 @@ declare namespace ts {
                 private readonly knownCachesSet;
                 private readonly projectWatchers;
                 private safeList;
-                private readonly toCanonicalFileName;
-                private readonly globalCachePackageJsonPath;
                 private installRunCount;
                 private inFlightRequestCount;
                 abstract readonly typesRegistry: Map<string, MapLike<string>>;
@@ -3064,7 +3065,7 @@ declare namespace ts {
                 private installTypingsAsync;
                 private executeWithThrottling;
                 protected abstract installWorker(requestId: number, packageNames: string[], cwd: string, onRequestCompleted: RequestCompletedAction): void;
-                protected abstract sendResponse(response: SetTypings | InvalidateCachedTypings | BeginInstallTypes | EndInstallTypes): void;
+                protected abstract sendResponse(response: SetTypings | InvalidateCachedTypings | BeginInstallTypes | EndInstallTypes | WatchTypingLocations): void;
                 protected readonly latestDistTag = "latest";
             }
         }