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

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-dev.20230426`;
+      version = `${versionMajorMinor}.0-dev.20230427`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -4737,10 +4737,10 @@ ${lanes.join("\n")}
         LanguageVariant4[LanguageVariant4["JSX"] = 1] = "JSX";
         return LanguageVariant4;
       })(LanguageVariant || {});
-      WatchDirectoryFlags = /* @__PURE__ */ ((WatchDirectoryFlags4) => {
-        WatchDirectoryFlags4[WatchDirectoryFlags4["None"] = 0] = "None";
-        WatchDirectoryFlags4[WatchDirectoryFlags4["Recursive"] = 1] = "Recursive";
-        return WatchDirectoryFlags4;
+      WatchDirectoryFlags = /* @__PURE__ */ ((WatchDirectoryFlags3) => {
+        WatchDirectoryFlags3[WatchDirectoryFlags3["None"] = 0] = "None";
+        WatchDirectoryFlags3[WatchDirectoryFlags3["Recursive"] = 1] = "Recursive";
+        return WatchDirectoryFlags3;
       })(WatchDirectoryFlags || {});
       CharacterCodes = /* @__PURE__ */ ((CharacterCodes2) => {
         CharacterCodes2[CharacterCodes2["nullCharacter"] = 0] = "nullCharacter";
@@ -56982,16 +56982,16 @@ ${lanes.join("\n")}
       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);
       }
@@ -69418,6 +69418,7 @@ ${lanes.join("\n")}
       );
     }
     function discriminateContextualTypeByJSXAttributes(node, contextualType) {
+      const jsxChildrenPropertyName = getJsxElementChildrenPropertyName(getJsxNamespaceAt(node));
       return discriminateTypeByDiscriminableItems(
         contextualType,
         concatenate(
@@ -69428,7 +69429,14 @@ ${lanes.join("\n")}
           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]
           )
@@ -115429,7 +115437,7 @@ ${lanes.join("\n")}
     }
     return program.isEmittedFile(file);
   }
-  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),
@@ -115467,23 +115475,23 @@ ${lanes.join("\n")}
       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 start = timestamp();
       const watcher = triggerInvokingFactory.watchDirectory(file, cb, flags, options, detailInfo1, detailInfo2);
@@ -115491,7 +115499,7 @@ ${lanes.join("\n")}
       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 start2 = timestamp();
           watcher.close();
@@ -115506,7 +115514,7 @@ ${lanes.join("\n")}
         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 start = timestamp();
           cb.call(
@@ -115523,8 +115531,8 @@ ${lanes.join("\n")}
         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) {
@@ -122901,7 +122909,9 @@ ${lanes.join("\n")}
         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"
       };
     }
   });
@@ -126118,7 +126128,7 @@ ${lanes.join("\n")}
     const d = /* @__PURE__ */ new Date();
     return `${padLeft(d.getHours().toString(), 2, "0")}:${padLeft(d.getMinutes().toString(), 2, "0")}:${padLeft(d.getSeconds().toString(), 2, "0")}.${padLeft(d.getMilliseconds().toString(), 3, "0")}`;
   }
-  var ActionSet, ActionInvalidate, ActionPackageInstalled, EventTypesRegistry, EventBeginInstallTypes, EventEndInstallTypes, EventInitializationFailed, Arguments;
+  var ActionSet, ActionInvalidate, ActionPackageInstalled, EventTypesRegistry, EventBeginInstallTypes, EventEndInstallTypes, EventInitializationFailed, ActionWatchTypingLocations, Arguments;
   var init_shared = __esm({
     "src/jsTyping/shared.ts"() {
       "use strict";
@@ -126130,6 +126140,7 @@ ${lanes.join("\n")}
       EventBeginInstallTypes = "event::beginInstallTypes";
       EventEndInstallTypes = "event::endInstallTypes";
       EventInitializationFailed = "event::initializationFailed";
+      ActionWatchTypingLocations = "action::watchTypingLocations";
       ((Arguments2) => {
         Arguments2.GlobalCacheLocation = "--globalTypingsCacheLocation";
         Arguments2.LogFile = "--logFile";
@@ -168972,19 +168983,6 @@ ${options.prefix}` : "\n" : options.prefix
     }
     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}`;
-  }
   function typingsName(packageName) {
     return `@types/${packageName}@ts${versionMajorMinor}`;
   }
@@ -169015,13 +169013,10 @@ ${options.prefix}` : "\n" : options.prefix
           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) {
@@ -169038,8 +169033,8 @@ ${options.prefix}` : "\n" : options.prefix
             }
             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.`);
           }
@@ -169072,7 +169067,7 @@ ${options.prefix}` : "\n" : options.prefix
           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 {
@@ -169273,75 +169268,19 @@ ${options.prefix}` : "\n" : options.prefix
             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);
-          }
-          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 */);
+            this.sendResponse({ kind: ActionWatchTypingLocations, projectName, files: void 0 });
           }
-          toRemove.forEach((watch, path) => {
-            watch.close();
-            watchers.delete(path);
-          });
         }
         createSetTypings(request, typings) {
           return {
@@ -169414,7 +169353,6 @@ ${options.prefix}` : "\n" : options.prefix
         true
       ).concat(project.getExcludedFiles()),
       compilerOptions: project.getCompilationSettings(),
-      watchOptions: project.projectService.getWatchOptions(project),
       typeAcquisition,
       unresolvedImports,
       projectRootPath: project.getCurrentDirectory(),
@@ -171126,6 +171064,8 @@ ${options.prefix}` : "\n" : options.prefix
           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);
@@ -171416,6 +171356,89 @@ ${options.prefix}` : "\n" : options.prefix
           }
         }
         /** @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;
         }
@@ -172865,7 +172888,7 @@ ${options.prefix}` : "\n" : options.prefix
       (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) {
@@ -173130,7 +173153,7 @@ ${options.prefix}` : "\n" : options.prefix
           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);
@@ -173216,6 +173239,11 @@ ${options.prefix}` : "\n" : options.prefix
           }
         }
         /** @internal */
+        watchTypingLocations(response) {
+          var _a;
+          (_a = this.findProject(response.projectName)) == null ? void 0 : _a.watchTypingLocations(response.files);
+        }
+        /** @internal */
         delayEnsureProjectForOpenFiles() {
           if (!this.openFiles.size)
             return;
@@ -180179,6 +180207,7 @@ ${e.message}`;
     ActionInvalidate: () => ActionInvalidate,
     ActionPackageInstalled: () => ActionPackageInstalled,
     ActionSet: () => ActionSet,
+    ActionWatchTypingLocations: () => ActionWatchTypingLocations,
     Arguments: () => Arguments,
     AutoImportProviderProject: () => AutoImportProviderProject,
     CharRangeSection: () => CharRangeSection,
@@ -182568,6 +182597,7 @@ ${e.message}`;
     ActionInvalidate: () => ActionInvalidate,
     ActionPackageInstalled: () => ActionPackageInstalled,
     ActionSet: () => ActionSet,
+    ActionWatchTypingLocations: () => ActionWatchTypingLocations,
     Arguments: () => Arguments,
     AutoImportProviderProject: () => AutoImportProviderProject,
     CharRangeSection: () => CharRangeSection,

package/lib/typescript.d.ts

@@ -5893,8 +5893,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;
@@ -5903,7 +5904,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;
@@ -5955,8 +5955,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;
@@ -5965,6 +5963,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;
+        }
     }
     function getDefaultFormatCodeSettings(newLineCharacter?: string): FormatCodeSettings;
     /**

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-dev.20230426`;
+      version = `${versionMajorMinor}.0-dev.20230427`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -56982,16 +56982,16 @@ ${lanes.join("\n")}
       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);
       }
@@ -69418,6 +69418,7 @@ ${lanes.join("\n")}
       );
     }
     function discriminateContextualTypeByJSXAttributes(node, contextualType) {
+      const jsxChildrenPropertyName = getJsxElementChildrenPropertyName(getJsxNamespaceAt(node));
       return discriminateTypeByDiscriminableItems(
         contextualType,
         concatenate(
@@ -69428,7 +69429,14 @@ ${lanes.join("\n")}
           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]
           )
@@ -122901,7 +122909,9 @@ ${lanes.join("\n")}
         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"
       };
     }
   });
@@ -126118,7 +126128,7 @@ ${lanes.join("\n")}
     const d = /* @__PURE__ */ new Date();
     return `${padLeft(d.getHours().toString(), 2, "0")}:${padLeft(d.getMinutes().toString(), 2, "0")}:${padLeft(d.getSeconds().toString(), 2, "0")}.${padLeft(d.getMilliseconds().toString(), 3, "0")}`;
   }
-  var ActionSet, ActionInvalidate, ActionPackageInstalled, EventTypesRegistry, EventBeginInstallTypes, EventEndInstallTypes, EventInitializationFailed, Arguments;
+  var ActionSet, ActionInvalidate, ActionPackageInstalled, EventTypesRegistry, EventBeginInstallTypes, EventEndInstallTypes, EventInitializationFailed, ActionWatchTypingLocations, Arguments;
   var init_shared = __esm({
     "src/jsTyping/shared.ts"() {
       "use strict";
@@ -126130,6 +126140,7 @@ ${lanes.join("\n")}
       EventBeginInstallTypes = "event::beginInstallTypes";
       EventEndInstallTypes = "event::endInstallTypes";
       EventInitializationFailed = "event::initializationFailed";
+      ActionWatchTypingLocations = "action::watchTypingLocations";
       ((Arguments2) => {
         Arguments2.GlobalCacheLocation = "--globalTypingsCacheLocation";
         Arguments2.LogFile = "--logFile";
@@ -126155,6 +126166,7 @@ ${lanes.join("\n")}
     ActionInvalidate: () => ActionInvalidate,
     ActionPackageInstalled: () => ActionPackageInstalled,
     ActionSet: () => ActionSet,
+    ActionWatchTypingLocations: () => ActionWatchTypingLocations,
     Arguments: () => Arguments,
     EventBeginInstallTypes: () => EventBeginInstallTypes,
     EventEndInstallTypes: () => EventEndInstallTypes,