typescript 5.1.0-dev.20230425 → 5.1.0-dev.20230427

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-dev.20230425`;
+      version = `${versionMajorMinor}.0-dev.20230427`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -51715,7 +51715,7 @@ ${lanes.join("\n")}
           if (symbol.flags & 524288 /* TypeAlias */) {
             serializeTypeAlias(symbol, symbolName2, modifierFlags);
           }
-          if (symbol.flags & (2 /* BlockScopedVariable */ | 1 /* FunctionScopedVariable */ | 4 /* Property */) && symbol.escapedName !== "export=" /* ExportEquals */ && !(symbol.flags & 4194304 /* Prototype */) && !(symbol.flags & 32 /* Class */) && !(symbol.flags & 8192 /* Method */) && !isConstMergedWithNSPrintableAsSignatureMerge) {
+          if (symbol.flags & (2 /* BlockScopedVariable */ | 1 /* FunctionScopedVariable */ | 4 /* Property */ | 98304 /* Accessor */) && symbol.escapedName !== "export=" /* ExportEquals */ && !(symbol.flags & 4194304 /* Prototype */) && !(symbol.flags & 32 /* Class */) && !(symbol.flags & 8192 /* Method */) && !isConstMergedWithNSPrintableAsSignatureMerge) {
             if (propertyAsAlias) {
               const createdExport = serializeMaybeAliasAssignment(symbol);
               if (createdExport) {
@@ -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]
           )
@@ -106319,6 +106327,8 @@ ${lanes.join("\n")}
           return visitLabeledStatement(node);
         case 253 /* WithStatement */:
           return visitWithStatement(node);
+        case 244 /* IfStatement */:
+          return visitIfStatement(node);
         case 254 /* SwitchStatement */:
           return visitSwitchStatement(node);
         case 268 /* CaseBlock */:
@@ -106424,6 +106434,14 @@ ${lanes.join("\n")}
         Debug.checkDefined(visitNode(node.statement, topLevelNestedVisitor, isStatement, factory2.liftToBlock))
       );
     }
+    function visitIfStatement(node) {
+      return factory2.updateIfStatement(
+        node,
+        visitNode(node.expression, visitor, isExpression),
+        Debug.checkDefined(visitNode(node.thenStatement, topLevelNestedVisitor, isStatement, factory2.liftToBlock)),
+        visitNode(node.elseStatement, topLevelNestedVisitor, isStatement, factory2.liftToBlock)
+      );
+    }
     function visitSwitchStatement(node) {
       return factory2.updateSwitchStatement(
         node,
@@ -122891,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"
       };
     }
   });
@@ -126108,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";
@@ -126120,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";
@@ -126145,6 +126166,7 @@ ${lanes.join("\n")}
     ActionInvalidate: () => ActionInvalidate,
     ActionPackageInstalled: () => ActionPackageInstalled,
     ActionSet: () => ActionSet,
+    ActionWatchTypingLocations: () => ActionWatchTypingLocations,
     Arguments: () => Arguments,
     EventBeginInstallTypes: () => EventBeginInstallTypes,
     EventEndInstallTypes: () => EventEndInstallTypes,

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-dev.20230425`;
+var version = `${versionMajorMinor}.0-dev.20230427`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -3689,9 +3689,6 @@ var curSysLog = noop;
 function sysLog(s) {
   return curSysLog(s);
 }
-function setSysLog(logger) {
-  curSysLog = logger;
-}
 function createDirectoryWatcherSupportingRecursive({
   watchDirectory,
   useCaseSensitiveFileNames,
@@ -10005,10 +10002,15 @@ function createSingleLineStringWriter() {
     clear: () => str = ""
   };
 }
-function copyEntries(source, target) {
-  source.forEach((value, key) => {
-    target.set(key, value);
-  });
+function forEachKey(map2, callback) {
+  const iterator = map2.keys();
+  for (const key of iterator) {
+    const result = callback(key);
+    if (result) {
+      return result;
+    }
+  }
+  return void 0;
 }
 function getFullWidth(node) {
   return node.end - node.pos;
@@ -10969,10 +10971,6 @@ function directoryProbablyExists(directoryName, host) {
 function closeFileWatcher(watcher) {
   watcher.close();
 }
-function clearMap(map2, onDeleteValue) {
-  map2.forEach(onDeleteValue);
-  map2.clear();
-}
 function getLastChild(node) {
   let lastChild;
   forEachChild(
@@ -30464,104 +30462,6 @@ function createBracketsMap() {
 }
 
 // src/compiler/watchUtilities.ts
-function getWatchFactory(host, watchLogLevel, log2, getDetailWatchInfo2) {
-  setSysLog(watchLogLevel === 2 /* Verbose */ ? log2 : noop);
-  const plainInvokeFactory = {
-    watchFile: (file, callback, pollingInterval, options) => host.watchFile(file, callback, pollingInterval, options),
-    watchDirectory: (directory, callback, flags, options) => host.watchDirectory(directory, callback, (flags & 1 /* Recursive */) !== 0, options)
-  };
-  const triggerInvokingFactory = watchLogLevel !== 0 /* None */ ? {
-    watchFile: createTriggerLoggingAddWatch("watchFile"),
-    watchDirectory: createTriggerLoggingAddWatch("watchDirectory")
-  } : void 0;
-  const factory2 = watchLogLevel === 2 /* Verbose */ ? {
-    watchFile: createFileWatcherWithLogging,
-    watchDirectory: createDirectoryWatcherWithLogging
-  } : triggerInvokingFactory || plainInvokeFactory;
-  const excludeWatcherFactory = watchLogLevel === 2 /* Verbose */ ? createExcludeWatcherWithLogging : returnNoopFileWatcher;
-  return {
-    watchFile: createExcludeHandlingAddWatch("watchFile"),
-    watchDirectory: createExcludeHandlingAddWatch("watchDirectory")
-  };
-  function createExcludeHandlingAddWatch(key) {
-    return (file, cb, flags, options, detailInfo1, detailInfo2) => {
-      var _a;
-      return !matchesExclude(file, key === "watchFile" ? options == null ? void 0 : options.excludeFiles : options == null ? void 0 : options.excludeDirectories, useCaseSensitiveFileNames(), ((_a = host.getCurrentDirectory) == null ? void 0 : _a.call(host)) || "") ? factory2[key].call(
-        /*thisArgs*/
-        void 0,
-        file,
-        cb,
-        flags,
-        options,
-        detailInfo1,
-        detailInfo2
-      ) : excludeWatcherFactory(file, flags, options, detailInfo1, detailInfo2);
-    };
-  }
-  function useCaseSensitiveFileNames() {
-    return typeof host.useCaseSensitiveFileNames === "boolean" ? host.useCaseSensitiveFileNames : host.useCaseSensitiveFileNames();
-  }
-  function createExcludeWatcherWithLogging(file, flags, options, detailInfo1, detailInfo2) {
-    log2(`ExcludeWatcher:: Added:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`);
-    return {
-      close: () => log2(`ExcludeWatcher:: Close:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`)
-    };
-  }
-  function createFileWatcherWithLogging(file, cb, flags, options, detailInfo1, detailInfo2) {
-    log2(`FileWatcher:: Added:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`);
-    const watcher = triggerInvokingFactory.watchFile(file, cb, flags, options, detailInfo1, detailInfo2);
-    return {
-      close: () => {
-        log2(`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, getDetailWatchInfo2)}`;
-    log2(watchInfo);
-    const start = timestamp();
-    const watcher = triggerInvokingFactory.watchDirectory(file, cb, flags, options, detailInfo1, detailInfo2);
-    const elapsed = timestamp() - start;
-    log2(`Elapsed:: ${elapsed}ms ${watchInfo}`);
-    return {
-      close: () => {
-        const watchInfo2 = `DirectoryWatcher:: Close:: ${getWatchInfo(file, flags, options, detailInfo1, detailInfo2, getDetailWatchInfo2)}`;
-        log2(watchInfo2);
-        const start2 = timestamp();
-        watcher.close();
-        const elapsed2 = timestamp() - start2;
-        log2(`Elapsed:: ${elapsed2}ms ${watchInfo2}`);
-      }
-    };
-  }
-  function createTriggerLoggingAddWatch(key) {
-    return (file, cb, flags, options, detailInfo1, detailInfo2) => plainInvokeFactory[key].call(
-      /*thisArgs*/
-      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, getDetailWatchInfo2)}`;
-        log2(triggerredInfo);
-        const start = timestamp();
-        cb.call(
-          /*thisArg*/
-          void 0,
-          ...args
-        );
-        const elapsed = timestamp() - start;
-        log2(`Elapsed:: ${elapsed}ms ${triggerredInfo}`);
-      },
-      flags,
-      options,
-      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) {
   const fallbackPolling = options == null ? void 0 : options.fallbackPolling;
   return {
@@ -31140,8 +31040,6 @@ var screenStartingMessageCodes = [
   Diagnostics.Starting_compilation_in_watch_mode.code,
   Diagnostics.File_change_detected_Starting_incremental_compilation.code
 ];
-var noopFileWatcher = { close: noop };
-var returnNoopFileWatcher = () => noopFileWatcher;
 
 // src/jsTyping/_namespaces/ts.JsTyping.ts
 var ts_JsTyping_exports = {};
@@ -31466,11 +31364,11 @@ function renderPackageNameValidationFailureWorker(typing, result, name, isScopeN
 
 // src/jsTyping/shared.ts
 var ActionSet = "action::set";
-var ActionInvalidate = "action::invalidate";
 var ActionPackageInstalled = "action::packageInstalled";
 var EventTypesRegistry = "event::typesRegistry";
 var EventBeginInstallTypes = "event::beginInstallTypes";
 var EventEndInstallTypes = "event::endInstallTypes";
+var ActionWatchTypingLocations = "action::watchTypingLocations";
 var Arguments;
 ((Arguments2) => {
   Arguments2.GlobalCacheLocation = "--globalTypingsCacheLocation";
@@ -31530,19 +31428,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, typesMapLocation2, throttleLimit, log2 = nullLog) {
     this.installTypingHost = installTypingHost;
@@ -31560,13 +31445,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 ${typesMapLocation2}`);
     }
-    this.watchFactory = getWatchFactory(this.installTypingHost, isLoggingEnabled ? 2 /* Verbose */ : 0 /* None */, (s) => this.log.writeLine(s), getDetailWatchInfo);
     this.processCacheLocation(this.globalCachePath);
   }
   closeProject(req) {
@@ -31583,8 +31465,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.`);
     }
@@ -31617,7 +31499,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 {
@@ -31818,75 +31700,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);
-    }
-    watchers.isInvoked = false;
-    const isLoggingEnabled = this.log.isEnabled();
-    const createProjectWatcher = (path2, projectWatcherType) => {
-      const canonicalPath = this.toCanonicalFileName(path2);
-      toRemove.delete(canonicalPath);
-      if (watchers.has(canonicalPath)) {
-        return;
-      }
-      if (isLoggingEnabled) {
-        this.log.writeLine(`${projectWatcherType}:: Added:: WatchInfo: ${path2}`);
-      }
-      const watcher = projectWatcherType === "FileWatcher" /* FileWatcher */ ? this.watchFactory.watchFile(path2, () => {
-        if (!watchers.isInvoked) {
-          watchers.isInvoked = true;
-          this.sendResponse({ projectName, kind: ActionInvalidate });
-        }
-      }, 2e3 /* High */, options, projectName, watchers) : this.watchFactory.watchDirectory(path2, (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: ${path2}`);
-          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, path2) => {
-      watch.close();
-      watchers.delete(path2);
-    });
   }
   createSetTypings(request, typings) {
     return {

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.1.0-dev.20230425",
+    "version": "5.1.0-dev.20230427",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -115,5 +115,5 @@
         "node": "14.21.1",
         "npm": "8.19.3"
     },
-    "gitHead": "2234d07de60878c5ef9286c3fcaf6f92a20ffd4a"
+    "gitHead": "157753520520fd0936bff280de30af56e15f94ee"
 }