typescript 4.9.0-dev.20220904 → 4.9.0-dev.20220908

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.9";
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220904");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220908");
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -3733,7 +3733,6 @@ var ts;
                 createPollingIntervalBasedLevels(customLevels ? __assign(__assign({}, defaultLevels), customLevels) : defaultLevels);
         }
     }
-    ts.setCustomPollingValues = setCustomPollingValues;
     function pollWatchedFileQueue(host, queue, pollIndex, chunkSize, callbackOnWatchFileStat) {
         var definedValueCopyToIndex = pollIndex;
         for (var canVisit = queue.length; chunkSize && canVisit; nextPollIndex(), canVisit--) {
@@ -3871,7 +3870,6 @@ var ts;
             pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === PollingInterval.Low ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingIntervalQueue(pollingInterval));
         }
     }
-    ts.createDynamicPriorityPollingWatchFile = createDynamicPriorityPollingWatchFile;
     function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames) {
         var fileWatcherCallbacks = ts.createMultiMap();
         var dirWatchers = new ts.Map();
@@ -3946,37 +3944,31 @@ var ts;
             pollScheduled = host.setTimeout(pollQueue, PollingInterval.High);
         }
     }
-    function createSingleFileWatcherPerName(watchFile, useCaseSensitiveFileNames) {
-        var cache = new ts.Map();
-        var callbacksCache = ts.createMultiMap();
+    function createSingleWatcherPerName(cache, useCaseSensitiveFileNames, name, callback, createWatcher) {
         var toCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
-        return function (fileName, callback, pollingInterval, options) {
-            var path = toCanonicalFileName(fileName);
-            var existing = cache.get(path);
-            if (existing) {
-                existing.refCount++;
-            }
-            else {
-                cache.set(path, {
-                    watcher: watchFile(fileName, function (fileName, eventKind, modifiedTime) { return ts.forEach(callbacksCache.get(path), function (cb) { return cb(fileName, eventKind, modifiedTime); }); }, pollingInterval, options),
-                    refCount: 1
-                });
+        var path = toCanonicalFileName(name);
+        var existing = cache.get(path);
+        if (existing) {
+            existing.callbacks.push(callback);
+        }
+        else {
+            cache.set(path, {
+                watcher: createWatcher((function (param1, param2, param3) { var _a; return (_a = cache.get(path)) === null || _a === void 0 ? void 0 : _a.callbacks.slice().forEach(function (cb) { return cb(param1, param2, param3); }); })),
+                callbacks: [callback]
+            });
+        }
+        return {
+            close: function () {
+                var watcher = cache.get(path);
+                if (!watcher)
+                    return;
+                if (!ts.orderedRemoveItem(watcher.callbacks, callback) || watcher.callbacks.length)
+                    return;
+                cache.delete(path);
+                ts.closeFileWatcherOf(watcher);
             }
-            callbacksCache.add(path, callback);
-            return {
-                close: function () {
-                    var watcher = ts.Debug.checkDefined(cache.get(path));
-                    callbacksCache.remove(path, callback);
-                    watcher.refCount--;
-                    if (watcher.refCount)
-                        return;
-                    cache.delete(path);
-                    ts.closeFileWatcherOf(watcher);
-                }
-            };
         };
     }
-    ts.createSingleFileWatcherPerName = createSingleFileWatcherPerName;
     function onWatchedFileStat(watchedFile, modifiedTime) {
         var oldTime = watchedFile.mtime.getTime();
         var newTime = modifiedTime.getTime();
@@ -3987,7 +3979,6 @@ var ts;
         }
         return false;
     }
-    ts.onWatchedFileStat = onWatchedFileStat;
     function getFileWatcherEventKind(oldTime, newTime) {
         return oldTime === 0
             ? FileWatcherEventKind.Created
@@ -4194,11 +4185,9 @@ var ts;
             return ts.stringContains(toCanonicalFilePath(path), searchPath);
         }
     }
-    ts.createDirectoryWatcherSupportingRecursive = createDirectoryWatcherSupportingRecursive;
     function createFileWatcherCallback(callback) {
         return function (_fileName, eventKind, modifiedTime) { return callback(eventKind === FileWatcherEventKind.Changed ? "change" : "rename", "", modifiedTime); };
     }
-    ts.createFileWatcherCallback = createFileWatcherCallback;
     function createFsWatchCallbackForFileWatcherCallback(fileName, callback, getModifiedTime) {
         return function (eventName, _relativeFileName, modifiedTime) {
             if (eventName === "rename") {
@@ -4225,7 +4214,10 @@ var ts;
         };
     }
     function createSystemWatchFunctions(_a) {
-        var pollingWatchFile = _a.pollingWatchFile, getModifiedTime = _a.getModifiedTime, setTimeout = _a.setTimeout, clearTimeout = _a.clearTimeout, fsWatchWorker = _a.fsWatchWorker, fileSystemEntryExists = _a.fileSystemEntryExists, useCaseSensitiveFileNames = _a.useCaseSensitiveFileNames, getCurrentDirectory = _a.getCurrentDirectory, fsSupportsRecursiveFsWatch = _a.fsSupportsRecursiveFsWatch, getAccessibleSortedChildDirectories = _a.getAccessibleSortedChildDirectories, realpath = _a.realpath, tscWatchFile = _a.tscWatchFile, useNonPollingWatchers = _a.useNonPollingWatchers, tscWatchDirectory = _a.tscWatchDirectory, defaultWatchFileKind = _a.defaultWatchFileKind, inodeWatching = _a.inodeWatching, sysLog = _a.sysLog;
+        var pollingWatchFileWorker = _a.pollingWatchFileWorker, getModifiedTime = _a.getModifiedTime, setTimeout = _a.setTimeout, clearTimeout = _a.clearTimeout, fsWatchWorker = _a.fsWatchWorker, fileSystemEntryExists = _a.fileSystemEntryExists, useCaseSensitiveFileNames = _a.useCaseSensitiveFileNames, getCurrentDirectory = _a.getCurrentDirectory, fsSupportsRecursiveFsWatch = _a.fsSupportsRecursiveFsWatch, getAccessibleSortedChildDirectories = _a.getAccessibleSortedChildDirectories, realpath = _a.realpath, tscWatchFile = _a.tscWatchFile, useNonPollingWatchers = _a.useNonPollingWatchers, tscWatchDirectory = _a.tscWatchDirectory, defaultWatchFileKind = _a.defaultWatchFileKind, inodeWatching = _a.inodeWatching, sysLog = _a.sysLog;
+        var pollingWatches = new ts.Map();
+        var fsWatches = new ts.Map();
+        var fsWatchesRecursive = new ts.Map();
         var dynamicPollingWatchFile;
         var fixedChunkSizePollingWatchFile;
         var nonPollingWatchFile;
@@ -4281,7 +4273,7 @@ var ts;
                 default:
                     return useNonPollingWatchers ?
                         generateWatchFileOptions(ts.WatchFileKind.UseFsEventsOnParentDirectory, ts.PollingWatchKind.PriorityInterval, options) :
-                        { watchFile: (defaultWatchFileKind === null || defaultWatchFileKind === void 0 ? void 0 : defaultWatchFileKind()) || ts.WatchFileKind.FixedPollingInterval };
+                        { watchFile: (defaultWatchFileKind === null || defaultWatchFileKind === void 0 ? void 0 : defaultWatchFileKind()) || ts.WatchFileKind.UseFsEvents };
             }
         }
         function generateWatchFileOptions(watchFile, fallbackPolling, options) {
@@ -4346,7 +4338,13 @@ var ts;
                     };
             }
         }
+        function pollingWatchFile(fileName, callback, pollingInterval, options) {
+            return createSingleWatcherPerName(pollingWatches, useCaseSensitiveFileNames, fileName, callback, function (cb) { return pollingWatchFileWorker(fileName, cb, pollingInterval, options); });
+        }
         function fsWatch(fileOrDirectory, entryKind, callback, recursive, fallbackPollingInterval, fallbackOptions) {
+            return createSingleWatcherPerName(recursive ? fsWatchesRecursive : fsWatches, useCaseSensitiveFileNames, fileOrDirectory, callback, function (cb) { return fsWatchHandlingExistenceOnHost(fileOrDirectory, entryKind, cb, recursive, fallbackPollingInterval, fallbackOptions); });
+        }
+        function fsWatchHandlingExistenceOnHost(fileOrDirectory, entryKind, callback, recursive, fallbackPollingInterval, fallbackOptions) {
             var lastDirectoryPartWithDirectorySeparator;
             var lastDirectoryPart;
             if (inodeWatching) {
@@ -4484,7 +4482,7 @@ var ts;
             var fsSupportsRecursiveFsWatch = isNode4OrLater && (process.platform === "win32" || process.platform === "darwin");
             var getCurrentDirectory = ts.memoize(function () { return process.cwd(); });
             var _b = createSystemWatchFunctions({
-                pollingWatchFile: createSingleFileWatcherPerName(fsWatchFileWorker, useCaseSensitiveFileNames),
+                pollingWatchFileWorker: fsWatchFileWorker,
                 getModifiedTime: getModifiedTime,
                 setTimeout: setTimeout,
                 clearTimeout: clearTimeout,
@@ -32323,6 +32321,7 @@ var ts;
             shortName: "h",
             type: "boolean",
             showInSimplifiedHelpView: true,
+            isCommandLineOnly: true,
             category: ts.Diagnostics.Command_line_Options,
             description: ts.Diagnostics.Print_this_message,
             defaultValueDescription: false,
@@ -32331,6 +32330,8 @@ var ts;
             name: "help",
             shortName: "?",
             type: "boolean",
+            isCommandLineOnly: true,
+            category: ts.Diagnostics.Command_line_Options,
             defaultValueDescription: false,
         },
         {
@@ -55814,8 +55815,8 @@ var ts;
                     if (!c.root.inferTypeParameters && !isDistributionDependent(c.root)) {
                         var skipTrue = !isTypeAssignableTo(getPermissiveInstantiation(c.checkType), getPermissiveInstantiation(c.extendsType));
                         var skipFalse = !skipTrue && isTypeAssignableTo(getRestrictiveInstantiation(c.checkType), getRestrictiveInstantiation(c.extendsType));
-                        if (result = skipTrue ? -1 : isRelatedTo(source, getTrueTypeFromConditionalType(c), 2, false)) {
-                            result &= skipFalse ? -1 : isRelatedTo(source, getFalseTypeFromConditionalType(c), 2, false);
+                        if (result = skipTrue ? -1 : isRelatedTo(source, getTrueTypeFromConditionalType(c), 2, false, undefined, intersectionState)) {
+                            result &= skipFalse ? -1 : isRelatedTo(source, getFalseTypeFromConditionalType(c), 2, false, undefined, intersectionState);
                             if (result) {
                                 return result;
                             }
@@ -76361,7 +76362,7 @@ var ts;
                 return grammarErrorOnNode(node, ts.Diagnostics.This_use_of_import_is_invalid_import_calls_can_be_written_but_they_must_have_parentheses_and_cannot_have_type_arguments);
             }
             var nodeArguments = node.arguments;
-            if (moduleKind !== ts.ModuleKind.ESNext && moduleKind !== ts.ModuleKind.NodeNext) {
+            if (moduleKind !== ts.ModuleKind.ESNext && moduleKind !== ts.ModuleKind.NodeNext && moduleKind !== ts.ModuleKind.Node16) {
                 checkGrammarForDisallowedTrailingComma(nodeArguments);
                 if (nodeArguments.length > 1) {
                     var assertionArgument = nodeArguments[1];

package/lib/tsserver.js

@@ -109,7 +109,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220904");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220908");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -6147,7 +6147,6 @@ var ts;
     var pollingChunkSize = createPollingIntervalBasedLevels(defaultChunkLevels);
     /* @internal */
     ts.unchangedPollThresholds = createPollingIntervalBasedLevels(defaultChunkLevels);
-    /* @internal */
     function setCustomPollingValues(system) {
         if (!system.getEnvironmentVariable) {
             return;
@@ -6190,7 +6189,6 @@ var ts;
                 createPollingIntervalBasedLevels(customLevels ? __assign(__assign({}, defaultLevels), customLevels) : defaultLevels);
         }
     }
-    ts.setCustomPollingValues = setCustomPollingValues;
     function pollWatchedFileQueue(host, queue, pollIndex, chunkSize, callbackOnWatchFileStat) {
         var definedValueCopyToIndex = pollIndex;
         // Max visit would be all elements of the queue
@@ -6236,7 +6234,6 @@ var ts;
             }
         }
     }
-    /* @internal */
     function createDynamicPriorityPollingWatchFile(host) {
         var watchedFiles = [];
         var changedFilesInLastPoll = [];
@@ -6345,7 +6342,6 @@ var ts;
             pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === PollingInterval.Low ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingIntervalQueue(pollingInterval));
         }
     }
-    ts.createDynamicPriorityPollingWatchFile = createDynamicPriorityPollingWatchFile;
     function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames) {
         // One file can have multiple watchers
         var fileWatcherCallbacks = ts.createMultiMap();
@@ -6424,42 +6420,38 @@ var ts;
             pollScheduled = host.setTimeout(pollQueue, PollingInterval.High);
         }
     }
-    /* @internal */
-    function createSingleFileWatcherPerName(watchFile, useCaseSensitiveFileNames) {
-        var cache = new ts.Map();
-        var callbacksCache = ts.createMultiMap();
+    function createSingleWatcherPerName(cache, useCaseSensitiveFileNames, name, callback, createWatcher) {
         var toCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
-        return function (fileName, callback, pollingInterval, options) {
-            var path = toCanonicalFileName(fileName);
-            var existing = cache.get(path);
-            if (existing) {
-                existing.refCount++;
-            }
-            else {
-                cache.set(path, {
-                    watcher: watchFile(fileName, function (fileName, eventKind, modifiedTime) { return ts.forEach(callbacksCache.get(path), function (cb) { return cb(fileName, eventKind, modifiedTime); }); }, pollingInterval, options),
-                    refCount: 1
-                });
+        var path = toCanonicalFileName(name);
+        var existing = cache.get(path);
+        if (existing) {
+            existing.callbacks.push(callback);
+        }
+        else {
+            cache.set(path, {
+                watcher: createWatcher((
+                // Cant infer types correctly so lets satisfy checker
+                function (param1, param2, param3) { var _a; return (_a = cache.get(path)) === null || _a === void 0 ? void 0 : _a.callbacks.slice().forEach(function (cb) { return cb(param1, param2, param3); }); })),
+                callbacks: [callback]
+            });
+        }
+        return {
+            close: function () {
+                var watcher = cache.get(path);
+                // Watcher is not expected to be undefined, but if it is normally its because
+                // exception was thrown somewhere else and watch state is not what it should be
+                if (!watcher)
+                    return;
+                if (!ts.orderedRemoveItem(watcher.callbacks, callback) || watcher.callbacks.length)
+                    return;
+                cache.delete(path);
+                ts.closeFileWatcherOf(watcher);
             }
-            callbacksCache.add(path, callback);
-            return {
-                close: function () {
-                    var watcher = ts.Debug.checkDefined(cache.get(path));
-                    callbacksCache.remove(path, callback);
-                    watcher.refCount--;
-                    if (watcher.refCount)
-                        return;
-                    cache.delete(path);
-                    ts.closeFileWatcherOf(watcher);
-                }
-            };
         };
     }
-    ts.createSingleFileWatcherPerName = createSingleFileWatcherPerName;
     /**
      * Returns true if file status changed
      */
-    /*@internal*/
     function onWatchedFileStat(watchedFile, modifiedTime) {
         var oldTime = watchedFile.mtime.getTime();
         var newTime = modifiedTime.getTime();
@@ -6471,7 +6463,6 @@ var ts;
         }
         return false;
     }
-    ts.onWatchedFileStat = onWatchedFileStat;
     /*@internal*/
     function getFileWatcherEventKind(oldTime, newTime) {
         return oldTime === 0
@@ -6499,7 +6490,6 @@ var ts;
      * that means if this is recursive watcher, watch the children directories as well
      * (eg on OS that dont support recursive watch using fs.watch use fs.watchFile)
      */
-    /*@internal*/
     function createDirectoryWatcherSupportingRecursive(_a) {
         var watchDirectory = _a.watchDirectory, useCaseSensitiveFileNames = _a.useCaseSensitiveFileNames, getCurrentDirectory = _a.getCurrentDirectory, getAccessibleSortedChildDirectories = _a.getAccessibleSortedChildDirectories, fileSystemEntryExists = _a.fileSystemEntryExists, realpath = _a.realpath, setTimeout = _a.setTimeout, clearTimeout = _a.clearTimeout;
         var cache = new ts.Map();
@@ -6708,18 +6698,15 @@ var ts;
             return ts.stringContains(toCanonicalFilePath(path), searchPath);
         }
     }
-    ts.createDirectoryWatcherSupportingRecursive = createDirectoryWatcherSupportingRecursive;
     /*@internal*/
     var FileSystemEntryKind;
     (function (FileSystemEntryKind) {
         FileSystemEntryKind[FileSystemEntryKind["File"] = 0] = "File";
         FileSystemEntryKind[FileSystemEntryKind["Directory"] = 1] = "Directory";
     })(FileSystemEntryKind = ts.FileSystemEntryKind || (ts.FileSystemEntryKind = {}));
-    /*@internal*/
     function createFileWatcherCallback(callback) {
         return function (_fileName, eventKind, modifiedTime) { return callback(eventKind === FileWatcherEventKind.Changed ? "change" : "rename", "", modifiedTime); };
     }
-    ts.createFileWatcherCallback = createFileWatcherCallback;
     function createFsWatchCallbackForFileWatcherCallback(fileName, callback, getModifiedTime) {
         return function (eventName, _relativeFileName, modifiedTime) {
             if (eventName === "rename") {
@@ -6753,7 +6740,10 @@ var ts;
     }
     /*@internal*/
     function createSystemWatchFunctions(_a) {
-        var pollingWatchFile = _a.pollingWatchFile, getModifiedTime = _a.getModifiedTime, setTimeout = _a.setTimeout, clearTimeout = _a.clearTimeout, fsWatchWorker = _a.fsWatchWorker, fileSystemEntryExists = _a.fileSystemEntryExists, useCaseSensitiveFileNames = _a.useCaseSensitiveFileNames, getCurrentDirectory = _a.getCurrentDirectory, fsSupportsRecursiveFsWatch = _a.fsSupportsRecursiveFsWatch, getAccessibleSortedChildDirectories = _a.getAccessibleSortedChildDirectories, realpath = _a.realpath, tscWatchFile = _a.tscWatchFile, useNonPollingWatchers = _a.useNonPollingWatchers, tscWatchDirectory = _a.tscWatchDirectory, defaultWatchFileKind = _a.defaultWatchFileKind, inodeWatching = _a.inodeWatching, sysLog = _a.sysLog;
+        var pollingWatchFileWorker = _a.pollingWatchFileWorker, getModifiedTime = _a.getModifiedTime, setTimeout = _a.setTimeout, clearTimeout = _a.clearTimeout, fsWatchWorker = _a.fsWatchWorker, fileSystemEntryExists = _a.fileSystemEntryExists, useCaseSensitiveFileNames = _a.useCaseSensitiveFileNames, getCurrentDirectory = _a.getCurrentDirectory, fsSupportsRecursiveFsWatch = _a.fsSupportsRecursiveFsWatch, getAccessibleSortedChildDirectories = _a.getAccessibleSortedChildDirectories, realpath = _a.realpath, tscWatchFile = _a.tscWatchFile, useNonPollingWatchers = _a.useNonPollingWatchers, tscWatchDirectory = _a.tscWatchDirectory, defaultWatchFileKind = _a.defaultWatchFileKind, inodeWatching = _a.inodeWatching, sysLog = _a.sysLog;
+        var pollingWatches = new ts.Map();
+        var fsWatches = new ts.Map();
+        var fsWatchesRecursive = new ts.Map();
         var dynamicPollingWatchFile;
         var fixedChunkSizePollingWatchFile;
         var nonPollingWatchFile;
@@ -6817,7 +6807,7 @@ var ts;
                         // Use notifications from FS to watch with falling back to fs.watchFile
                         generateWatchFileOptions(ts.WatchFileKind.UseFsEventsOnParentDirectory, ts.PollingWatchKind.PriorityInterval, options) :
                         // Default to do not use fixed polling interval
-                        { watchFile: (defaultWatchFileKind === null || defaultWatchFileKind === void 0 ? void 0 : defaultWatchFileKind()) || ts.WatchFileKind.FixedPollingInterval };
+                        { watchFile: (defaultWatchFileKind === null || defaultWatchFileKind === void 0 ? void 0 : defaultWatchFileKind()) || ts.WatchFileKind.UseFsEvents };
             }
         }
         function generateWatchFileOptions(watchFile, fallbackPolling, options) {
@@ -6888,7 +6878,13 @@ var ts;
                     };
             }
         }
+        function pollingWatchFile(fileName, callback, pollingInterval, options) {
+            return createSingleWatcherPerName(pollingWatches, useCaseSensitiveFileNames, fileName, callback, function (cb) { return pollingWatchFileWorker(fileName, cb, pollingInterval, options); });
+        }
         function fsWatch(fileOrDirectory, entryKind, callback, recursive, fallbackPollingInterval, fallbackOptions) {
+            return createSingleWatcherPerName(recursive ? fsWatchesRecursive : fsWatches, useCaseSensitiveFileNames, fileOrDirectory, callback, function (cb) { return fsWatchHandlingExistenceOnHost(fileOrDirectory, entryKind, cb, recursive, fallbackPollingInterval, fallbackOptions); });
+        }
+        function fsWatchHandlingExistenceOnHost(fileOrDirectory, entryKind, callback, recursive, fallbackPollingInterval, fallbackOptions) {
             var lastDirectoryPartWithDirectorySeparator;
             var lastDirectoryPart;
             if (inodeWatching) {
@@ -7067,7 +7063,7 @@ var ts;
             var fsSupportsRecursiveFsWatch = isNode4OrLater && (process.platform === "win32" || process.platform === "darwin");
             var getCurrentDirectory = ts.memoize(function () { return process.cwd(); });
             var _b = createSystemWatchFunctions({
-                pollingWatchFile: createSingleFileWatcherPerName(fsWatchFileWorker, useCaseSensitiveFileNames),
+                pollingWatchFileWorker: fsWatchFileWorker,
                 getModifiedTime: getModifiedTime,
                 setTimeout: setTimeout,
                 clearTimeout: clearTimeout,
@@ -39903,6 +39899,7 @@ var ts;
             shortName: "h",
             type: "boolean",
             showInSimplifiedHelpView: true,
+            isCommandLineOnly: true,
             category: ts.Diagnostics.Command_line_Options,
             description: ts.Diagnostics.Print_this_message,
             defaultValueDescription: false,
@@ -39911,6 +39908,8 @@ var ts;
             name: "help",
             shortName: "?",
             type: "boolean",
+            isCommandLineOnly: true,
+            category: ts.Diagnostics.Command_line_Options,
             defaultValueDescription: false,
         },
         {
@@ -66889,8 +66888,8 @@ var ts;
                         var skipTrue = !isTypeAssignableTo(getPermissiveInstantiation(c.checkType), getPermissiveInstantiation(c.extendsType));
                         var skipFalse = !skipTrue && isTypeAssignableTo(getRestrictiveInstantiation(c.checkType), getRestrictiveInstantiation(c.extendsType));
                         // TODO: Find a nice way to include potential conditional type breakdowns in error output, if they seem good (they usually don't)
-                        if (result = skipTrue ? -1 /* Ternary.True */ : isRelatedTo(source, getTrueTypeFromConditionalType(c), 2 /* RecursionFlags.Target */, /*reportErrors*/ false)) {
-                            result &= skipFalse ? -1 /* Ternary.True */ : isRelatedTo(source, getFalseTypeFromConditionalType(c), 2 /* RecursionFlags.Target */, /*reportErrors*/ false);
+                        if (result = skipTrue ? -1 /* Ternary.True */ : isRelatedTo(source, getTrueTypeFromConditionalType(c), 2 /* RecursionFlags.Target */, /*reportErrors*/ false, /*headMessage*/ undefined, intersectionState)) {
+                            result &= skipFalse ? -1 /* Ternary.True */ : isRelatedTo(source, getFalseTypeFromConditionalType(c), 2 /* RecursionFlags.Target */, /*reportErrors*/ false, /*headMessage*/ undefined, intersectionState);
                             if (result) {
                                 return result;
                             }
@@ -90606,7 +90605,7 @@ var ts;
                 return grammarErrorOnNode(node, ts.Diagnostics.This_use_of_import_is_invalid_import_calls_can_be_written_but_they_must_have_parentheses_and_cannot_have_type_arguments);
             }
             var nodeArguments = node.arguments;
-            if (moduleKind !== ts.ModuleKind.ESNext && moduleKind !== ts.ModuleKind.NodeNext) {
+            if (moduleKind !== ts.ModuleKind.ESNext && moduleKind !== ts.ModuleKind.NodeNext && moduleKind !== ts.ModuleKind.Node16) {
                 // We are allowed trailing comma after proposal-import-assertions.
                 checkGrammarForDisallowedTrailingComma(nodeArguments);
                 if (nodeArguments.length > 1) {
@@ -184465,20 +184464,6 @@ var ts;
             }
             // Override sys.write because fs.writeSync is not reliable on Node 4
             sys.write = function (s) { return writeMessage(sys.bufferFrom(s, "utf8")); };
-            // REVIEW: for now this implementation uses polling.
-            // The advantage of polling is that it works reliably
-            // on all os and with network mounted files.
-            // For 90 referenced files, the average time to detect
-            // changes is 2*msInterval (by default 5 seconds).
-            // The overhead of this is .04 percent (1/2500) with
-            // average pause of < 1 millisecond (and max
-            // pause less than 1.5 milliseconds); question is
-            // do we anticipate reference sets in the 100s and
-            // do we care about waiting 10-20 seconds to detect
-            // changes for large reference sets? If so, do we want
-            // to increase the chunk size or decrease the interval
-            // time dynamically to match the large reference set?
-            sys.defaultWatchFileKind = function () { return ts.WatchFileKind.FixedChunkSizePolling; };
             /* eslint-disable no-restricted-globals */
             sys.setTimeout = setTimeout;
             sys.clearTimeout = clearTimeout;

package/lib/tsserverlibrary.js

@@ -108,7 +108,7 @@ var ts;
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220904");
+    ts.version = "".concat(ts.versionMajorMinor, ".0-dev.20220908");
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -6146,7 +6146,6 @@ var ts;
     var pollingChunkSize = createPollingIntervalBasedLevels(defaultChunkLevels);
     /* @internal */
     ts.unchangedPollThresholds = createPollingIntervalBasedLevels(defaultChunkLevels);
-    /* @internal */
     function setCustomPollingValues(system) {
         if (!system.getEnvironmentVariable) {
             return;
@@ -6189,7 +6188,6 @@ var ts;
                 createPollingIntervalBasedLevels(customLevels ? __assign(__assign({}, defaultLevels), customLevels) : defaultLevels);
         }
     }
-    ts.setCustomPollingValues = setCustomPollingValues;
     function pollWatchedFileQueue(host, queue, pollIndex, chunkSize, callbackOnWatchFileStat) {
         var definedValueCopyToIndex = pollIndex;
         // Max visit would be all elements of the queue
@@ -6235,7 +6233,6 @@ var ts;
             }
         }
     }
-    /* @internal */
     function createDynamicPriorityPollingWatchFile(host) {
         var watchedFiles = [];
         var changedFilesInLastPoll = [];
@@ -6344,7 +6341,6 @@ var ts;
             pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === PollingInterval.Low ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingIntervalQueue(pollingInterval));
         }
     }
-    ts.createDynamicPriorityPollingWatchFile = createDynamicPriorityPollingWatchFile;
     function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames) {
         // One file can have multiple watchers
         var fileWatcherCallbacks = ts.createMultiMap();
@@ -6423,42 +6419,38 @@ var ts;
             pollScheduled = host.setTimeout(pollQueue, PollingInterval.High);
         }
     }
-    /* @internal */
-    function createSingleFileWatcherPerName(watchFile, useCaseSensitiveFileNames) {
-        var cache = new ts.Map();
-        var callbacksCache = ts.createMultiMap();
+    function createSingleWatcherPerName(cache, useCaseSensitiveFileNames, name, callback, createWatcher) {
         var toCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
-        return function (fileName, callback, pollingInterval, options) {
-            var path = toCanonicalFileName(fileName);
-            var existing = cache.get(path);
-            if (existing) {
-                existing.refCount++;
-            }
-            else {
-                cache.set(path, {
-                    watcher: watchFile(fileName, function (fileName, eventKind, modifiedTime) { return ts.forEach(callbacksCache.get(path), function (cb) { return cb(fileName, eventKind, modifiedTime); }); }, pollingInterval, options),
-                    refCount: 1
-                });
+        var path = toCanonicalFileName(name);
+        var existing = cache.get(path);
+        if (existing) {
+            existing.callbacks.push(callback);
+        }
+        else {
+            cache.set(path, {
+                watcher: createWatcher((
+                // Cant infer types correctly so lets satisfy checker
+                function (param1, param2, param3) { var _a; return (_a = cache.get(path)) === null || _a === void 0 ? void 0 : _a.callbacks.slice().forEach(function (cb) { return cb(param1, param2, param3); }); })),
+                callbacks: [callback]
+            });
+        }
+        return {
+            close: function () {
+                var watcher = cache.get(path);
+                // Watcher is not expected to be undefined, but if it is normally its because
+                // exception was thrown somewhere else and watch state is not what it should be
+                if (!watcher)
+                    return;
+                if (!ts.orderedRemoveItem(watcher.callbacks, callback) || watcher.callbacks.length)
+                    return;
+                cache.delete(path);
+                ts.closeFileWatcherOf(watcher);
             }
-            callbacksCache.add(path, callback);
-            return {
-                close: function () {
-                    var watcher = ts.Debug.checkDefined(cache.get(path));
-                    callbacksCache.remove(path, callback);
-                    watcher.refCount--;
-                    if (watcher.refCount)
-                        return;
-                    cache.delete(path);
-                    ts.closeFileWatcherOf(watcher);
-                }
-            };
         };
     }
-    ts.createSingleFileWatcherPerName = createSingleFileWatcherPerName;
     /**
      * Returns true if file status changed
      */
-    /*@internal*/
     function onWatchedFileStat(watchedFile, modifiedTime) {
         var oldTime = watchedFile.mtime.getTime();
         var newTime = modifiedTime.getTime();
@@ -6470,7 +6462,6 @@ var ts;
         }
         return false;
     }
-    ts.onWatchedFileStat = onWatchedFileStat;
     /*@internal*/
     function getFileWatcherEventKind(oldTime, newTime) {
         return oldTime === 0
@@ -6498,7 +6489,6 @@ var ts;
      * that means if this is recursive watcher, watch the children directories as well
      * (eg on OS that dont support recursive watch using fs.watch use fs.watchFile)
      */
-    /*@internal*/
     function createDirectoryWatcherSupportingRecursive(_a) {
         var watchDirectory = _a.watchDirectory, useCaseSensitiveFileNames = _a.useCaseSensitiveFileNames, getCurrentDirectory = _a.getCurrentDirectory, getAccessibleSortedChildDirectories = _a.getAccessibleSortedChildDirectories, fileSystemEntryExists = _a.fileSystemEntryExists, realpath = _a.realpath, setTimeout = _a.setTimeout, clearTimeout = _a.clearTimeout;
         var cache = new ts.Map();
@@ -6707,18 +6697,15 @@ var ts;
             return ts.stringContains(toCanonicalFilePath(path), searchPath);
         }
     }
-    ts.createDirectoryWatcherSupportingRecursive = createDirectoryWatcherSupportingRecursive;
     /*@internal*/
     var FileSystemEntryKind;
     (function (FileSystemEntryKind) {
         FileSystemEntryKind[FileSystemEntryKind["File"] = 0] = "File";
         FileSystemEntryKind[FileSystemEntryKind["Directory"] = 1] = "Directory";
     })(FileSystemEntryKind = ts.FileSystemEntryKind || (ts.FileSystemEntryKind = {}));
-    /*@internal*/
     function createFileWatcherCallback(callback) {
         return function (_fileName, eventKind, modifiedTime) { return callback(eventKind === FileWatcherEventKind.Changed ? "change" : "rename", "", modifiedTime); };
     }
-    ts.createFileWatcherCallback = createFileWatcherCallback;
     function createFsWatchCallbackForFileWatcherCallback(fileName, callback, getModifiedTime) {
         return function (eventName, _relativeFileName, modifiedTime) {
             if (eventName === "rename") {
@@ -6752,7 +6739,10 @@ var ts;
     }
     /*@internal*/
     function createSystemWatchFunctions(_a) {
-        var pollingWatchFile = _a.pollingWatchFile, getModifiedTime = _a.getModifiedTime, setTimeout = _a.setTimeout, clearTimeout = _a.clearTimeout, fsWatchWorker = _a.fsWatchWorker, fileSystemEntryExists = _a.fileSystemEntryExists, useCaseSensitiveFileNames = _a.useCaseSensitiveFileNames, getCurrentDirectory = _a.getCurrentDirectory, fsSupportsRecursiveFsWatch = _a.fsSupportsRecursiveFsWatch, getAccessibleSortedChildDirectories = _a.getAccessibleSortedChildDirectories, realpath = _a.realpath, tscWatchFile = _a.tscWatchFile, useNonPollingWatchers = _a.useNonPollingWatchers, tscWatchDirectory = _a.tscWatchDirectory, defaultWatchFileKind = _a.defaultWatchFileKind, inodeWatching = _a.inodeWatching, sysLog = _a.sysLog;
+        var pollingWatchFileWorker = _a.pollingWatchFileWorker, getModifiedTime = _a.getModifiedTime, setTimeout = _a.setTimeout, clearTimeout = _a.clearTimeout, fsWatchWorker = _a.fsWatchWorker, fileSystemEntryExists = _a.fileSystemEntryExists, useCaseSensitiveFileNames = _a.useCaseSensitiveFileNames, getCurrentDirectory = _a.getCurrentDirectory, fsSupportsRecursiveFsWatch = _a.fsSupportsRecursiveFsWatch, getAccessibleSortedChildDirectories = _a.getAccessibleSortedChildDirectories, realpath = _a.realpath, tscWatchFile = _a.tscWatchFile, useNonPollingWatchers = _a.useNonPollingWatchers, tscWatchDirectory = _a.tscWatchDirectory, defaultWatchFileKind = _a.defaultWatchFileKind, inodeWatching = _a.inodeWatching, sysLog = _a.sysLog;
+        var pollingWatches = new ts.Map();
+        var fsWatches = new ts.Map();
+        var fsWatchesRecursive = new ts.Map();
         var dynamicPollingWatchFile;
         var fixedChunkSizePollingWatchFile;
         var nonPollingWatchFile;
@@ -6816,7 +6806,7 @@ var ts;
                         // Use notifications from FS to watch with falling back to fs.watchFile
                         generateWatchFileOptions(ts.WatchFileKind.UseFsEventsOnParentDirectory, ts.PollingWatchKind.PriorityInterval, options) :
                         // Default to do not use fixed polling interval
-                        { watchFile: (defaultWatchFileKind === null || defaultWatchFileKind === void 0 ? void 0 : defaultWatchFileKind()) || ts.WatchFileKind.FixedPollingInterval };
+                        { watchFile: (defaultWatchFileKind === null || defaultWatchFileKind === void 0 ? void 0 : defaultWatchFileKind()) || ts.WatchFileKind.UseFsEvents };
             }
         }
         function generateWatchFileOptions(watchFile, fallbackPolling, options) {
@@ -6887,7 +6877,13 @@ var ts;
                     };
             }
         }
+        function pollingWatchFile(fileName, callback, pollingInterval, options) {
+            return createSingleWatcherPerName(pollingWatches, useCaseSensitiveFileNames, fileName, callback, function (cb) { return pollingWatchFileWorker(fileName, cb, pollingInterval, options); });
+        }
         function fsWatch(fileOrDirectory, entryKind, callback, recursive, fallbackPollingInterval, fallbackOptions) {
+            return createSingleWatcherPerName(recursive ? fsWatchesRecursive : fsWatches, useCaseSensitiveFileNames, fileOrDirectory, callback, function (cb) { return fsWatchHandlingExistenceOnHost(fileOrDirectory, entryKind, cb, recursive, fallbackPollingInterval, fallbackOptions); });
+        }
+        function fsWatchHandlingExistenceOnHost(fileOrDirectory, entryKind, callback, recursive, fallbackPollingInterval, fallbackOptions) {
             var lastDirectoryPartWithDirectorySeparator;
             var lastDirectoryPart;
             if (inodeWatching) {
@@ -7066,7 +7062,7 @@ var ts;
             var fsSupportsRecursiveFsWatch = isNode4OrLater && (process.platform === "win32" || process.platform === "darwin");
             var getCurrentDirectory = ts.memoize(function () { return process.cwd(); });
             var _b = createSystemWatchFunctions({
-                pollingWatchFile: createSingleFileWatcherPerName(fsWatchFileWorker, useCaseSensitiveFileNames),
+                pollingWatchFileWorker: fsWatchFileWorker,
                 getModifiedTime: getModifiedTime,
                 setTimeout: setTimeout,
                 clearTimeout: clearTimeout,
@@ -39902,6 +39898,7 @@ var ts;
             shortName: "h",
             type: "boolean",
             showInSimplifiedHelpView: true,
+            isCommandLineOnly: true,
             category: ts.Diagnostics.Command_line_Options,
             description: ts.Diagnostics.Print_this_message,
             defaultValueDescription: false,
@@ -39910,6 +39907,8 @@ var ts;
             name: "help",
             shortName: "?",
             type: "boolean",
+            isCommandLineOnly: true,
+            category: ts.Diagnostics.Command_line_Options,
             defaultValueDescription: false,
         },
         {
@@ -66888,8 +66887,8 @@ var ts;
                         var skipTrue = !isTypeAssignableTo(getPermissiveInstantiation(c.checkType), getPermissiveInstantiation(c.extendsType));
                         var skipFalse = !skipTrue && isTypeAssignableTo(getRestrictiveInstantiation(c.checkType), getRestrictiveInstantiation(c.extendsType));
                         // TODO: Find a nice way to include potential conditional type breakdowns in error output, if they seem good (they usually don't)
-                        if (result = skipTrue ? -1 /* Ternary.True */ : isRelatedTo(source, getTrueTypeFromConditionalType(c), 2 /* RecursionFlags.Target */, /*reportErrors*/ false)) {
-                            result &= skipFalse ? -1 /* Ternary.True */ : isRelatedTo(source, getFalseTypeFromConditionalType(c), 2 /* RecursionFlags.Target */, /*reportErrors*/ false);
+                        if (result = skipTrue ? -1 /* Ternary.True */ : isRelatedTo(source, getTrueTypeFromConditionalType(c), 2 /* RecursionFlags.Target */, /*reportErrors*/ false, /*headMessage*/ undefined, intersectionState)) {
+                            result &= skipFalse ? -1 /* Ternary.True */ : isRelatedTo(source, getFalseTypeFromConditionalType(c), 2 /* RecursionFlags.Target */, /*reportErrors*/ false, /*headMessage*/ undefined, intersectionState);
                             if (result) {
                                 return result;
                             }
@@ -90605,7 +90604,7 @@ var ts;
                 return grammarErrorOnNode(node, ts.Diagnostics.This_use_of_import_is_invalid_import_calls_can_be_written_but_they_must_have_parentheses_and_cannot_have_type_arguments);
             }
             var nodeArguments = node.arguments;
-            if (moduleKind !== ts.ModuleKind.ESNext && moduleKind !== ts.ModuleKind.NodeNext) {
+            if (moduleKind !== ts.ModuleKind.ESNext && moduleKind !== ts.ModuleKind.NodeNext && moduleKind !== ts.ModuleKind.Node16) {
                 // We are allowed trailing comma after proposal-import-assertions.
                 checkGrammarForDisallowedTrailingComma(nodeArguments);
                 if (nodeArguments.length > 1) {