npm - typescript - Versions diffs - 4.9.0-dev.20220904 → 4.9.0-dev.20220908 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/lib/tsc.js +40 -39
package/lib/tsserver.js +44 -59
package/lib/tsserverlibrary.js +44 -45
package/lib/typescript.js +44 -45
package/lib/typescriptServices.js +44 -45
package/lib/typingsInstaller.js +44 -45
package/package.json +1 -3

package/lib/typescript.js CHANGED Viewed

@@ -99,7 +99,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) {
@@ -6137,7 +6137,6 @@ var ts;
     var pollingChunkSize = createPollingIntervalBasedLevels(defaultChunkLevels);
     /* @internal */
     ts.unchangedPollThresholds = createPollingIntervalBasedLevels(defaultChunkLevels);
-    /* @internal */
     function setCustomPollingValues(system) {
         if (!system.getEnvironmentVariable) {
             return;
@@ -6180,7 +6179,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
@@ -6226,7 +6224,6 @@ var ts;
             }
         }
     }
-    /* @internal */
     function createDynamicPriorityPollingWatchFile(host) {
         var watchedFiles = [];
         var changedFilesInLastPoll = [];
@@ -6335,7 +6332,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();
@@ -6414,42 +6410,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();
@@ -6461,7 +6453,6 @@ var ts;
         }
         return false;
     }
-    ts.onWatchedFileStat = onWatchedFileStat;
     /*@internal*/
     function getFileWatcherEventKind(oldTime, newTime) {
         return oldTime === 0
@@ -6489,7 +6480,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();
@@ -6698,18 +6688,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") {
@@ -6743,7 +6730,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;
@@ -6807,7 +6797,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) {
@@ -6878,7 +6868,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) {
@@ -7057,7 +7053,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,
@@ -39893,6 +39889,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,
@@ -39901,6 +39898,8 @@ var ts;
             name: "help",
             shortName: "?",
             type: "boolean",
+            isCommandLineOnly: true,
+            category: ts.Diagnostics.Command_line_Options,
             defaultValueDescription: false,
         },
         {
@@ -66879,8 +66878,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;
                             }
@@ -90596,7 +90595,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) {

package/lib/typescriptServices.js CHANGED Viewed

@@ -99,7 +99,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) {
@@ -6137,7 +6137,6 @@ var ts;
     var pollingChunkSize = createPollingIntervalBasedLevels(defaultChunkLevels);
     /* @internal */
     ts.unchangedPollThresholds = createPollingIntervalBasedLevels(defaultChunkLevels);
-    /* @internal */
     function setCustomPollingValues(system) {
         if (!system.getEnvironmentVariable) {
             return;
@@ -6180,7 +6179,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
@@ -6226,7 +6224,6 @@ var ts;
             }
         }
     }
-    /* @internal */
     function createDynamicPriorityPollingWatchFile(host) {
         var watchedFiles = [];
         var changedFilesInLastPoll = [];
@@ -6335,7 +6332,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();
@@ -6414,42 +6410,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();
@@ -6461,7 +6453,6 @@ var ts;
         }
         return false;
     }
-    ts.onWatchedFileStat = onWatchedFileStat;
     /*@internal*/
     function getFileWatcherEventKind(oldTime, newTime) {
         return oldTime === 0
@@ -6489,7 +6480,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();
@@ -6698,18 +6688,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") {
@@ -6743,7 +6730,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;
@@ -6807,7 +6797,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) {
@@ -6878,7 +6868,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) {
@@ -7057,7 +7053,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,
@@ -39893,6 +39889,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,
@@ -39901,6 +39898,8 @@ var ts;
             name: "help",
             shortName: "?",
             type: "boolean",
+            isCommandLineOnly: true,
+            category: ts.Diagnostics.Command_line_Options,
             defaultValueDescription: false,
         },
         {
@@ -66879,8 +66878,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;
                             }
@@ -90596,7 +90595,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) {