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

package/lib/typingsInstaller.js

@@ -89,7 +89,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) {
@@ -6127,7 +6127,6 @@ var ts;
     var pollingChunkSize = createPollingIntervalBasedLevels(defaultChunkLevels);
     /* @internal */
     ts.unchangedPollThresholds = createPollingIntervalBasedLevels(defaultChunkLevels);
-    /* @internal */
     function setCustomPollingValues(system) {
         if (!system.getEnvironmentVariable) {
             return;
@@ -6170,7 +6169,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
@@ -6216,7 +6214,6 @@ var ts;
             }
         }
     }
-    /* @internal */
     function createDynamicPriorityPollingWatchFile(host) {
         var watchedFiles = [];
         var changedFilesInLastPoll = [];
@@ -6325,7 +6322,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();
@@ -6404,42 +6400,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();
@@ -6451,7 +6443,6 @@ var ts;
         }
         return false;
     }
-    ts.onWatchedFileStat = onWatchedFileStat;
     /*@internal*/
     function getFileWatcherEventKind(oldTime, newTime) {
         return oldTime === 0
@@ -6479,7 +6470,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();
@@ -6688,18 +6678,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") {
@@ -6733,7 +6720,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;
@@ -6797,7 +6787,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) {
@@ -6868,7 +6858,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) {
@@ -7047,7 +7043,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,
@@ -39883,6 +39879,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,
@@ -39891,6 +39888,8 @@ var ts;
             name: "help",
             shortName: "?",
             type: "boolean",
+            isCommandLineOnly: true,
+            category: ts.Diagnostics.Command_line_Options,
             defaultValueDescription: false,
         },
         {
@@ -66869,8 +66868,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;
                             }
@@ -90586,7 +90585,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/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "4.9.0-dev.20220904",
+    "version": "4.9.0-dev.20220908",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -90,7 +90,6 @@
         "mocha-fivemat-progress-reporter": "latest",
         "ms": "^2.1.3",
         "node-fetch": "^2.6.7",
-        "prex": "^0.4.7",
         "source-map-support": "latest",
         "typescript": "^4.8.2",
         "vinyl": "latest",
@@ -110,7 +109,6 @@
         "clean": "gulp clean",
         "gulp": "gulp",
         "lint": "gulp lint",
-        "lint:ci": "gulp lint --ci",
         "setup-hooks": "node scripts/link-hooks.js"
     },
     "browser": {