typescript 4.6.0-dev.20211108 → 4.6.0-dev.20211112

package/lib/lib.es2022.array.d.ts

@@ -111,7 +111,7 @@ interface BigInt64Array {
      * Returns the item located at the specified index.
      * @param index The zero-based index of the desired code unit. A negative index will count back from the last item.
      */
-    at(index: number): number | undefined;
+    at(index: number): bigint | undefined;
 }
 
 interface BigUint64Array {
@@ -119,5 +119,5 @@ interface BigUint64Array {
      * Returns the item located at the specified index.
      * @param index The zero-based index of the desired code unit. A negative index will count back from the last item.
      */
-    at(index: number): number | undefined;
+    at(index: number): bigint | undefined;
 }

package/lib/tsc.js

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.6";
-    ts.version = ts.versionMajorMinor + ".0-dev.20211108";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211112";
     var NativeCollections;
     (function (NativeCollections) {
         function tryGetNativeMap() {
@@ -4976,7 +4976,7 @@ var ts;
                 }
             }
             function readDirectory(path, extensions, excludes, includes, depth) {
-                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath, directoryExists);
+                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
             }
             function fileSystemEntryExists(path, entryKind) {
                 var originalStackTraceLimit = Error.stackTraceLimit;
@@ -15876,7 +15876,7 @@ var ts;
             includeFilePattern: getRegularExpressionForWildcard(includes, absolutePath, "files"),
             includeDirectoryPattern: getRegularExpressionForWildcard(includes, absolutePath, "directories"),
             excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, "exclude"),
-            basePaths: getBasePaths(absolutePath, includes, useCaseSensitiveFileNames)
+            basePaths: getBasePaths(path, includes, useCaseSensitiveFileNames)
         };
     }
     ts.getFileMatcherPatterns = getFileMatcherPatterns;
@@ -15884,7 +15884,7 @@ var ts;
         return new RegExp(pattern, useCaseSensitiveFileNames ? "" : "i");
     }
     ts.getRegexFromPattern = getRegexFromPattern;
-    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath, directoryExists) {
+    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath) {
         path = ts.normalizePath(path);
         currentDirectory = ts.normalizePath(currentDirectory);
         var patterns = getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory);
@@ -15895,20 +15895,18 @@ var ts;
         var visited = new ts.Map();
         var toCanonical = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
         for (var _i = 0, _a = patterns.basePaths; _i < _a.length; _i++) {
-            var absoluteBasePath = _a[_i];
-            if (directoryExists(absoluteBasePath)) {
-                visitDirectory(absoluteBasePath, depth);
-            }
+            var basePath = _a[_i];
+            visitDirectory(basePath, ts.combinePaths(currentDirectory, basePath), depth);
         }
         return ts.flatten(results);
-        function visitDirectory(absolutePath, depth) {
+        function visitDirectory(path, absolutePath, depth) {
             var canonicalPath = toCanonical(realpath(absolutePath));
             if (visited.has(canonicalPath))
                 return;
             visited.set(canonicalPath, true);
-            var _a = getFileSystemEntries(absolutePath), files = _a.files, directories = _a.directories;
+            var _a = getFileSystemEntries(path), files = _a.files, directories = _a.directories;
             var _loop_1 = function (current) {
-                var name = ts.combinePaths(absolutePath, current);
+                var name = ts.combinePaths(path, current);
                 var absoluteName = ts.combinePaths(absolutePath, current);
                 if (extensions && !ts.fileExtensionIsOneOf(name, extensions))
                     return "continue";
@@ -15936,27 +15934,28 @@ var ts;
             }
             for (var _c = 0, _d = ts.sort(directories, ts.compareStringsCaseSensitive); _c < _d.length; _c++) {
                 var current = _d[_c];
+                var name = ts.combinePaths(path, current);
                 var absoluteName = ts.combinePaths(absolutePath, current);
                 if ((!includeDirectoryRegex || includeDirectoryRegex.test(absoluteName)) &&
                     (!excludeRegex || !excludeRegex.test(absoluteName))) {
-                    visitDirectory(absoluteName, depth);
+                    visitDirectory(name, absoluteName, depth);
                 }
             }
         }
     }
     ts.matchFiles = matchFiles;
-    function getBasePaths(absoluteTsconfigPath, includes, useCaseSensitiveFileNames) {
-        var basePaths = [absoluteTsconfigPath];
+    function getBasePaths(path, includes, useCaseSensitiveFileNames) {
+        var basePaths = [path];
         if (includes) {
             var includeBasePaths = [];
             for (var _i = 0, includes_1 = includes; _i < includes_1.length; _i++) {
                 var include = includes_1[_i];
-                var absoluteIncludePath = ts.isRootedDiskPath(include) ? include : ts.normalizePath(ts.combinePaths(absoluteTsconfigPath, include));
-                includeBasePaths.push(getIncludeBasePath(absoluteIncludePath));
+                var absolute = ts.isRootedDiskPath(include) ? include : ts.normalizePath(ts.combinePaths(path, include));
+                includeBasePaths.push(getIncludeBasePath(absolute));
             }
             includeBasePaths.sort(ts.getStringComparer(!useCaseSensitiveFileNames));
             var _loop_2 = function (includeBasePath) {
-                if (ts.every(basePaths, function (basePath) { return !ts.containsPath(basePath, includeBasePath, absoluteTsconfigPath, !useCaseSensitiveFileNames); })) {
+                if (ts.every(basePaths, function (basePath) { return !ts.containsPath(basePath, includeBasePath, path, !useCaseSensitiveFileNames); })) {
                     basePaths.push(includeBasePath);
                 }
             };
@@ -92714,7 +92713,7 @@ var ts;
             var rootResult = tryReadDirectory(rootDir, rootDirPath);
             var rootSymLinkResult;
             if (rootResult !== undefined) {
-                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath, directoryExists);
+                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath);
             }
             return host.readDirectory(rootDir, extensions, excludes, includes, depth);
             function getFileSystemEntries(dir) {

package/lib/tsserver.js

@@ -100,7 +100,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 = ts.versionMajorMinor + ".0-dev.20211108";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211112";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -7767,7 +7767,7 @@ var ts;
                 }
             }
             function readDirectory(path, extensions, excludes, includes, depth) {
-                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath, directoryExists);
+                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
             }
             function fileSystemEntryExists(path, entryKind) {
                 // Since the error thrown by fs.statSync isn't used, we can avoid collecting a stack trace to improve
@@ -20045,7 +20045,7 @@ var ts;
             includeFilePattern: getRegularExpressionForWildcard(includes, absolutePath, "files"),
             includeDirectoryPattern: getRegularExpressionForWildcard(includes, absolutePath, "directories"),
             excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, "exclude"),
-            basePaths: getBasePaths(absolutePath, includes, useCaseSensitiveFileNames)
+            basePaths: getBasePaths(path, includes, useCaseSensitiveFileNames)
         };
     }
     ts.getFileMatcherPatterns = getFileMatcherPatterns;
@@ -20054,7 +20054,7 @@ var ts;
     }
     ts.getRegexFromPattern = getRegexFromPattern;
     /** @param path directory of the tsconfig.json */
-    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath, directoryExists) {
+    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath) {
         path = ts.normalizePath(path);
         currentDirectory = ts.normalizePath(currentDirectory);
         var patterns = getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory);
@@ -20067,20 +20067,18 @@ var ts;
         var visited = new ts.Map();
         var toCanonical = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
         for (var _i = 0, _a = patterns.basePaths; _i < _a.length; _i++) {
-            var absoluteBasePath = _a[_i];
-            if (directoryExists(absoluteBasePath)) {
-                visitDirectory(absoluteBasePath, depth);
-            }
+            var basePath = _a[_i];
+            visitDirectory(basePath, ts.combinePaths(currentDirectory, basePath), depth);
         }
         return ts.flatten(results);
-        function visitDirectory(absolutePath, depth) {
+        function visitDirectory(path, absolutePath, depth) {
             var canonicalPath = toCanonical(realpath(absolutePath));
             if (visited.has(canonicalPath))
                 return;
             visited.set(canonicalPath, true);
-            var _a = getFileSystemEntries(absolutePath), files = _a.files, directories = _a.directories;
+            var _a = getFileSystemEntries(path), files = _a.files, directories = _a.directories;
             var _loop_1 = function (current) {
-                var name = ts.combinePaths(absolutePath, current);
+                var name = ts.combinePaths(path, current);
                 var absoluteName = ts.combinePaths(absolutePath, current);
                 if (extensions && !ts.fileExtensionIsOneOf(name, extensions))
                     return "continue";
@@ -20108,10 +20106,11 @@ var ts;
             }
             for (var _c = 0, _d = ts.sort(directories, ts.compareStringsCaseSensitive); _c < _d.length; _c++) {
                 var current = _d[_c];
+                var name = ts.combinePaths(path, current);
                 var absoluteName = ts.combinePaths(absolutePath, current);
                 if ((!includeDirectoryRegex || includeDirectoryRegex.test(absoluteName)) &&
                     (!excludeRegex || !excludeRegex.test(absoluteName))) {
-                    visitDirectory(absoluteName, depth);
+                    visitDirectory(name, absoluteName, depth);
                 }
             }
         }
@@ -20119,11 +20118,10 @@ var ts;
     ts.matchFiles = matchFiles;
     /**
      * Computes the unique non-wildcard base paths amongst the provided include patterns.
-     * @returns Absolute directory paths
      */
-    function getBasePaths(absoluteTsconfigPath, includes, useCaseSensitiveFileNames) {
+    function getBasePaths(path, includes, useCaseSensitiveFileNames) {
         // Storage for our results in the form of literal paths (e.g. the paths as written by the user).
-        var basePaths = [absoluteTsconfigPath];
+        var basePaths = [path];
         if (includes) {
             // Storage for literal base paths amongst the include patterns.
             var includeBasePaths = [];
@@ -20131,14 +20129,14 @@ var ts;
                 var include = includes_1[_i];
                 // We also need to check the relative paths by converting them to absolute and normalizing
                 // in case they escape the base path (e.g "..\somedirectory")
-                var absoluteIncludePath = ts.isRootedDiskPath(include) ? include : ts.normalizePath(ts.combinePaths(absoluteTsconfigPath, include));
+                var absolute = ts.isRootedDiskPath(include) ? include : ts.normalizePath(ts.combinePaths(path, include));
                 // Append the literal and canonical candidate base paths.
-                includeBasePaths.push(getIncludeBasePath(absoluteIncludePath));
+                includeBasePaths.push(getIncludeBasePath(absolute));
             }
             // Sort the offsets array using either the literal or canonical path representations.
             includeBasePaths.sort(ts.getStringComparer(!useCaseSensitiveFileNames));
             var _loop_2 = function (includeBasePath) {
-                if (ts.every(basePaths, function (basePath) { return !ts.containsPath(basePath, includeBasePath, absoluteTsconfigPath, !useCaseSensitiveFileNames); })) {
+                if (ts.every(basePaths, function (basePath) { return !ts.containsPath(basePath, includeBasePath, path, !useCaseSensitiveFileNames); })) {
                     basePaths.push(includeBasePath);
                 }
             };
@@ -85908,8 +85906,7 @@ var ts;
                 }
                 // Modifiers are never allowed on properties except for 'async' on a method declaration
                 if (prop.modifiers) {
-                    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-                    for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) { // TODO: GH#19955
+                    for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) {
                         var mod = _c[_b];
                         if (mod.kind !== 131 /* AsyncKeyword */ || prop.kind !== 168 /* MethodDeclaration */) {
                             grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
@@ -112526,7 +112523,7 @@ var ts;
             var rootResult = tryReadDirectory(rootDir, rootDirPath);
             var rootSymLinkResult;
             if (rootResult !== undefined) {
-                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath, directoryExists);
+                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath);
             }
             return host.readDirectory(rootDir, extensions, excludes, includes, depth);
             function getFileSystemEntries(dir) {
@@ -128726,9 +128723,6 @@ var ts;
                     insertText = ts.escapeSnippetText(name) + "={$1}";
                     isSnippet = true;
                 }
-                if (isSnippet) {
-                    replacementSpan = ts.createTextSpanFromNode(location, sourceFile);
-                }
             }
             if (insertText !== undefined && !preferences.includeCompletionsWithInsertText) {
                 return undefined;
@@ -128813,7 +128807,7 @@ var ts;
                 removeComments: true,
                 module: options.module,
                 target: options.target,
-                omitTrailingSemicolon: true,
+                omitTrailingSemicolon: false,
                 newLine: ts.getNewLineKind(ts.getNewLineCharacter(options, ts.maybeBind(host, host.getNewLine))),
             });
             var importAdder = ts.codefix.createImportAdder(sourceFile, program, preferences, host);
@@ -128871,7 +128865,7 @@ var ts;
                 completionNodes.push(node);
             }, body, 2 /* Property */, isAbstract);
             if (completionNodes.length) {
-                insertText = printer.printSnippetList(1 /* MultiLine */, ts.factory.createNodeArray(completionNodes), sourceFile);
+                insertText = printer.printSnippetList(1 /* MultiLine */ | 131072 /* NoTrailingNewLine */, ts.factory.createNodeArray(completionNodes), sourceFile);
             }
             return { insertText: insertText, isSnippet: isSnippet, importAdder: importAdder };
         }
@@ -131065,6 +131059,8 @@ var ts;
             // function f<T>(x: T) {}
             // f({ abc/**/: "" }) // `abc` is a member of `T` but only because it declares itself
             function hasDeclarationOtherThanSelf(member) {
+                if (!ts.length(member.declarations))
+                    return true;
                 return ts.some(member.declarations, function (decl) { return decl.parent !== obj; });
             }
         }
@@ -133781,7 +133777,7 @@ var ts;
                     var token = _a[_i];
                     if (!ts.isIdentifier(token) || token === definition || token.escapedText !== definition.escapedText)
                         continue;
-                    var referenceSymbol = checker.getSymbolAtLocation(token); // See GH#19955 for why the type annotation is necessary
+                    var referenceSymbol = checker.getSymbolAtLocation(token);
                     if (referenceSymbol === symbol
                         || checker.getShorthandAssignmentValueSymbol(token.parent) === symbol
                         || ts.isExportSpecifier(token.parent) && getLocalSymbolForExportSpecifier(token, referenceSymbol, token.parent, checker) === symbol) {
@@ -147839,8 +147835,6 @@ var ts;
                     var importSpecifiers = ts.mapAllOrFail(name.elements, function (e) {
                         return e.dotDotDotToken || e.initializer || e.propertyName && !ts.isIdentifier(e.propertyName) || !ts.isIdentifier(e.name)
                             ? undefined
-                            // (TODO: GH#18217)
-                            // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
                             : makeImportSpecifier(e.propertyName && e.propertyName.text, e.name.text);
                     });
                     if (importSpecifiers) {
@@ -155216,8 +155210,7 @@ var ts;
                         return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractRange)] };
                     }
                     var statements = [];
-                    var start2 = start; // TODO: GH#18217 Need to alias `start` to get this to compile. See https://github.com/Microsoft/TypeScript/issues/19955#issuecomment-344118248
-                    for (var _i = 0, _a = start2.parent.statements; _i < _a.length; _i++) {
+                    for (var _i = 0, _a = start.parent.statements; _i < _a.length; _i++) {
                         var statement = _a[_i];
                         if (statement === start || statements.length) {
                             var errors_1 = checkNode(statement);
@@ -159353,10 +159346,11 @@ var ts;
     }
     function findBaseOfDeclaration(checker, declaration, cb) {
         var _a;
+        if (ts.hasStaticModifier(declaration))
+            return;
         var classOrInterfaceDeclaration = ((_a = declaration.parent) === null || _a === void 0 ? void 0 : _a.kind) === 170 /* Constructor */ ? declaration.parent.parent : declaration.parent;
-        if (!classOrInterfaceDeclaration) {
+        if (!classOrInterfaceDeclaration)
             return;
-        }
         return ts.firstDefined(ts.getAllSuperTypeNodes(classOrInterfaceDeclaration), function (superTypeNode) {
             var symbol = checker.getPropertyOfType(checker.getTypeAtLocation(superTypeNode), declaration.symbol.name);
             return symbol ? cb(symbol) : undefined;

package/lib/tsserverlibrary.js

@@ -294,7 +294,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 = ts.versionMajorMinor + ".0-dev.20211108";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211112";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -7961,7 +7961,7 @@ var ts;
                 }
             }
             function readDirectory(path, extensions, excludes, includes, depth) {
-                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath, directoryExists);
+                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
             }
             function fileSystemEntryExists(path, entryKind) {
                 // Since the error thrown by fs.statSync isn't used, we can avoid collecting a stack trace to improve
@@ -20239,7 +20239,7 @@ var ts;
             includeFilePattern: getRegularExpressionForWildcard(includes, absolutePath, "files"),
             includeDirectoryPattern: getRegularExpressionForWildcard(includes, absolutePath, "directories"),
             excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, "exclude"),
-            basePaths: getBasePaths(absolutePath, includes, useCaseSensitiveFileNames)
+            basePaths: getBasePaths(path, includes, useCaseSensitiveFileNames)
         };
     }
     ts.getFileMatcherPatterns = getFileMatcherPatterns;
@@ -20248,7 +20248,7 @@ var ts;
     }
     ts.getRegexFromPattern = getRegexFromPattern;
     /** @param path directory of the tsconfig.json */
-    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath, directoryExists) {
+    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath) {
         path = ts.normalizePath(path);
         currentDirectory = ts.normalizePath(currentDirectory);
         var patterns = getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory);
@@ -20261,20 +20261,18 @@ var ts;
         var visited = new ts.Map();
         var toCanonical = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
         for (var _i = 0, _a = patterns.basePaths; _i < _a.length; _i++) {
-            var absoluteBasePath = _a[_i];
-            if (directoryExists(absoluteBasePath)) {
-                visitDirectory(absoluteBasePath, depth);
-            }
+            var basePath = _a[_i];
+            visitDirectory(basePath, ts.combinePaths(currentDirectory, basePath), depth);
         }
         return ts.flatten(results);
-        function visitDirectory(absolutePath, depth) {
+        function visitDirectory(path, absolutePath, depth) {
             var canonicalPath = toCanonical(realpath(absolutePath));
             if (visited.has(canonicalPath))
                 return;
             visited.set(canonicalPath, true);
-            var _a = getFileSystemEntries(absolutePath), files = _a.files, directories = _a.directories;
+            var _a = getFileSystemEntries(path), files = _a.files, directories = _a.directories;
             var _loop_1 = function (current) {
-                var name = ts.combinePaths(absolutePath, current);
+                var name = ts.combinePaths(path, current);
                 var absoluteName = ts.combinePaths(absolutePath, current);
                 if (extensions && !ts.fileExtensionIsOneOf(name, extensions))
                     return "continue";
@@ -20302,10 +20300,11 @@ var ts;
             }
             for (var _c = 0, _d = ts.sort(directories, ts.compareStringsCaseSensitive); _c < _d.length; _c++) {
                 var current = _d[_c];
+                var name = ts.combinePaths(path, current);
                 var absoluteName = ts.combinePaths(absolutePath, current);
                 if ((!includeDirectoryRegex || includeDirectoryRegex.test(absoluteName)) &&
                     (!excludeRegex || !excludeRegex.test(absoluteName))) {
-                    visitDirectory(absoluteName, depth);
+                    visitDirectory(name, absoluteName, depth);
                 }
             }
         }
@@ -20313,11 +20312,10 @@ var ts;
     ts.matchFiles = matchFiles;
     /**
      * Computes the unique non-wildcard base paths amongst the provided include patterns.
-     * @returns Absolute directory paths
      */
-    function getBasePaths(absoluteTsconfigPath, includes, useCaseSensitiveFileNames) {
+    function getBasePaths(path, includes, useCaseSensitiveFileNames) {
         // Storage for our results in the form of literal paths (e.g. the paths as written by the user).
-        var basePaths = [absoluteTsconfigPath];
+        var basePaths = [path];
         if (includes) {
             // Storage for literal base paths amongst the include patterns.
             var includeBasePaths = [];
@@ -20325,14 +20323,14 @@ var ts;
                 var include = includes_1[_i];
                 // We also need to check the relative paths by converting them to absolute and normalizing
                 // in case they escape the base path (e.g "..\somedirectory")
-                var absoluteIncludePath = ts.isRootedDiskPath(include) ? include : ts.normalizePath(ts.combinePaths(absoluteTsconfigPath, include));
+                var absolute = ts.isRootedDiskPath(include) ? include : ts.normalizePath(ts.combinePaths(path, include));
                 // Append the literal and canonical candidate base paths.
-                includeBasePaths.push(getIncludeBasePath(absoluteIncludePath));
+                includeBasePaths.push(getIncludeBasePath(absolute));
             }
             // Sort the offsets array using either the literal or canonical path representations.
             includeBasePaths.sort(ts.getStringComparer(!useCaseSensitiveFileNames));
             var _loop_2 = function (includeBasePath) {
-                if (ts.every(basePaths, function (basePath) { return !ts.containsPath(basePath, includeBasePath, absoluteTsconfigPath, !useCaseSensitiveFileNames); })) {
+                if (ts.every(basePaths, function (basePath) { return !ts.containsPath(basePath, includeBasePath, path, !useCaseSensitiveFileNames); })) {
                     basePaths.push(includeBasePath);
                 }
             };
@@ -86102,8 +86100,7 @@ var ts;
                 }
                 // Modifiers are never allowed on properties except for 'async' on a method declaration
                 if (prop.modifiers) {
-                    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-                    for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) { // TODO: GH#19955
+                    for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) {
                         var mod = _c[_b];
                         if (mod.kind !== 131 /* AsyncKeyword */ || prop.kind !== 168 /* MethodDeclaration */) {
                             grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
@@ -112720,7 +112717,7 @@ var ts;
             var rootResult = tryReadDirectory(rootDir, rootDirPath);
             var rootSymLinkResult;
             if (rootResult !== undefined) {
-                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath, directoryExists);
+                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath);
             }
             return host.readDirectory(rootDir, extensions, excludes, includes, depth);
             function getFileSystemEntries(dir) {
@@ -129308,9 +129305,6 @@ var ts;
                     insertText = ts.escapeSnippetText(name) + "={$1}";
                     isSnippet = true;
                 }
-                if (isSnippet) {
-                    replacementSpan = ts.createTextSpanFromNode(location, sourceFile);
-                }
             }
             if (insertText !== undefined && !preferences.includeCompletionsWithInsertText) {
                 return undefined;
@@ -129395,7 +129389,7 @@ var ts;
                 removeComments: true,
                 module: options.module,
                 target: options.target,
-                omitTrailingSemicolon: true,
+                omitTrailingSemicolon: false,
                 newLine: ts.getNewLineKind(ts.getNewLineCharacter(options, ts.maybeBind(host, host.getNewLine))),
             });
             var importAdder = ts.codefix.createImportAdder(sourceFile, program, preferences, host);
@@ -129453,7 +129447,7 @@ var ts;
                 completionNodes.push(node);
             }, body, 2 /* Property */, isAbstract);
             if (completionNodes.length) {
-                insertText = printer.printSnippetList(1 /* MultiLine */, ts.factory.createNodeArray(completionNodes), sourceFile);
+                insertText = printer.printSnippetList(1 /* MultiLine */ | 131072 /* NoTrailingNewLine */, ts.factory.createNodeArray(completionNodes), sourceFile);
             }
             return { insertText: insertText, isSnippet: isSnippet, importAdder: importAdder };
         }
@@ -131647,6 +131641,8 @@ var ts;
             // function f<T>(x: T) {}
             // f({ abc/**/: "" }) // `abc` is a member of `T` but only because it declares itself
             function hasDeclarationOtherThanSelf(member) {
+                if (!ts.length(member.declarations))
+                    return true;
                 return ts.some(member.declarations, function (decl) { return decl.parent !== obj; });
             }
         }
@@ -134363,7 +134359,7 @@ var ts;
                     var token = _a[_i];
                     if (!ts.isIdentifier(token) || token === definition || token.escapedText !== definition.escapedText)
                         continue;
-                    var referenceSymbol = checker.getSymbolAtLocation(token); // See GH#19955 for why the type annotation is necessary
+                    var referenceSymbol = checker.getSymbolAtLocation(token);
                     if (referenceSymbol === symbol
                         || checker.getShorthandAssignmentValueSymbol(token.parent) === symbol
                         || ts.isExportSpecifier(token.parent) && getLocalSymbolForExportSpecifier(token, referenceSymbol, token.parent, checker) === symbol) {
@@ -148421,8 +148417,6 @@ var ts;
                     var importSpecifiers = ts.mapAllOrFail(name.elements, function (e) {
                         return e.dotDotDotToken || e.initializer || e.propertyName && !ts.isIdentifier(e.propertyName) || !ts.isIdentifier(e.name)
                             ? undefined
-                            // (TODO: GH#18217)
-                            // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
                             : makeImportSpecifier(e.propertyName && e.propertyName.text, e.name.text);
                     });
                     if (importSpecifiers) {
@@ -155798,8 +155792,7 @@ var ts;
                         return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractRange)] };
                     }
                     var statements = [];
-                    var start2 = start; // TODO: GH#18217 Need to alias `start` to get this to compile. See https://github.com/Microsoft/TypeScript/issues/19955#issuecomment-344118248
-                    for (var _i = 0, _a = start2.parent.statements; _i < _a.length; _i++) {
+                    for (var _i = 0, _a = start.parent.statements; _i < _a.length; _i++) {
                         var statement = _a[_i];
                         if (statement === start || statements.length) {
                             var errors_1 = checkNode(statement);
@@ -159935,10 +159928,11 @@ var ts;
     }
     function findBaseOfDeclaration(checker, declaration, cb) {
         var _a;
+        if (ts.hasStaticModifier(declaration))
+            return;
         var classOrInterfaceDeclaration = ((_a = declaration.parent) === null || _a === void 0 ? void 0 : _a.kind) === 170 /* Constructor */ ? declaration.parent.parent : declaration.parent;
-        if (!classOrInterfaceDeclaration) {
+        if (!classOrInterfaceDeclaration)
             return;
-        }
         return ts.firstDefined(ts.getAllSuperTypeNodes(classOrInterfaceDeclaration), function (superTypeNode) {
             var symbol = checker.getPropertyOfType(checker.getTypeAtLocation(superTypeNode), declaration.symbol.name);
             return symbol ? cb(symbol) : undefined;

package/lib/typescript.js

@@ -294,7 +294,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 = ts.versionMajorMinor + ".0-dev.20211108";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211112";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -7961,7 +7961,7 @@ var ts;
                 }
             }
             function readDirectory(path, extensions, excludes, includes, depth) {
-                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath, directoryExists);
+                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
             }
             function fileSystemEntryExists(path, entryKind) {
                 // Since the error thrown by fs.statSync isn't used, we can avoid collecting a stack trace to improve
@@ -20239,7 +20239,7 @@ var ts;
             includeFilePattern: getRegularExpressionForWildcard(includes, absolutePath, "files"),
             includeDirectoryPattern: getRegularExpressionForWildcard(includes, absolutePath, "directories"),
             excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, "exclude"),
-            basePaths: getBasePaths(absolutePath, includes, useCaseSensitiveFileNames)
+            basePaths: getBasePaths(path, includes, useCaseSensitiveFileNames)
         };
     }
     ts.getFileMatcherPatterns = getFileMatcherPatterns;
@@ -20248,7 +20248,7 @@ var ts;
     }
     ts.getRegexFromPattern = getRegexFromPattern;
     /** @param path directory of the tsconfig.json */
-    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath, directoryExists) {
+    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath) {
         path = ts.normalizePath(path);
         currentDirectory = ts.normalizePath(currentDirectory);
         var patterns = getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory);
@@ -20261,20 +20261,18 @@ var ts;
         var visited = new ts.Map();
         var toCanonical = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
         for (var _i = 0, _a = patterns.basePaths; _i < _a.length; _i++) {
-            var absoluteBasePath = _a[_i];
-            if (directoryExists(absoluteBasePath)) {
-                visitDirectory(absoluteBasePath, depth);
-            }
+            var basePath = _a[_i];
+            visitDirectory(basePath, ts.combinePaths(currentDirectory, basePath), depth);
         }
         return ts.flatten(results);
-        function visitDirectory(absolutePath, depth) {
+        function visitDirectory(path, absolutePath, depth) {
             var canonicalPath = toCanonical(realpath(absolutePath));
             if (visited.has(canonicalPath))
                 return;
             visited.set(canonicalPath, true);
-            var _a = getFileSystemEntries(absolutePath), files = _a.files, directories = _a.directories;
+            var _a = getFileSystemEntries(path), files = _a.files, directories = _a.directories;
             var _loop_1 = function (current) {
-                var name = ts.combinePaths(absolutePath, current);
+                var name = ts.combinePaths(path, current);
                 var absoluteName = ts.combinePaths(absolutePath, current);
                 if (extensions && !ts.fileExtensionIsOneOf(name, extensions))
                     return "continue";
@@ -20302,10 +20300,11 @@ var ts;
             }
             for (var _c = 0, _d = ts.sort(directories, ts.compareStringsCaseSensitive); _c < _d.length; _c++) {
                 var current = _d[_c];
+                var name = ts.combinePaths(path, current);
                 var absoluteName = ts.combinePaths(absolutePath, current);
                 if ((!includeDirectoryRegex || includeDirectoryRegex.test(absoluteName)) &&
                     (!excludeRegex || !excludeRegex.test(absoluteName))) {
-                    visitDirectory(absoluteName, depth);
+                    visitDirectory(name, absoluteName, depth);
                 }
             }
         }
@@ -20313,11 +20312,10 @@ var ts;
     ts.matchFiles = matchFiles;
     /**
      * Computes the unique non-wildcard base paths amongst the provided include patterns.
-     * @returns Absolute directory paths
      */
-    function getBasePaths(absoluteTsconfigPath, includes, useCaseSensitiveFileNames) {
+    function getBasePaths(path, includes, useCaseSensitiveFileNames) {
         // Storage for our results in the form of literal paths (e.g. the paths as written by the user).
-        var basePaths = [absoluteTsconfigPath];
+        var basePaths = [path];
         if (includes) {
             // Storage for literal base paths amongst the include patterns.
             var includeBasePaths = [];
@@ -20325,14 +20323,14 @@ var ts;
                 var include = includes_1[_i];
                 // We also need to check the relative paths by converting them to absolute and normalizing
                 // in case they escape the base path (e.g "..\somedirectory")
-                var absoluteIncludePath = ts.isRootedDiskPath(include) ? include : ts.normalizePath(ts.combinePaths(absoluteTsconfigPath, include));
+                var absolute = ts.isRootedDiskPath(include) ? include : ts.normalizePath(ts.combinePaths(path, include));
                 // Append the literal and canonical candidate base paths.
-                includeBasePaths.push(getIncludeBasePath(absoluteIncludePath));
+                includeBasePaths.push(getIncludeBasePath(absolute));
             }
             // Sort the offsets array using either the literal or canonical path representations.
             includeBasePaths.sort(ts.getStringComparer(!useCaseSensitiveFileNames));
             var _loop_2 = function (includeBasePath) {
-                if (ts.every(basePaths, function (basePath) { return !ts.containsPath(basePath, includeBasePath, absoluteTsconfigPath, !useCaseSensitiveFileNames); })) {
+                if (ts.every(basePaths, function (basePath) { return !ts.containsPath(basePath, includeBasePath, path, !useCaseSensitiveFileNames); })) {
                     basePaths.push(includeBasePath);
                 }
             };
@@ -86102,8 +86100,7 @@ var ts;
                 }
                 // Modifiers are never allowed on properties except for 'async' on a method declaration
                 if (prop.modifiers) {
-                    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-                    for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) { // TODO: GH#19955
+                    for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) {
                         var mod = _c[_b];
                         if (mod.kind !== 131 /* AsyncKeyword */ || prop.kind !== 168 /* MethodDeclaration */) {
                             grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
@@ -112720,7 +112717,7 @@ var ts;
             var rootResult = tryReadDirectory(rootDir, rootDirPath);
             var rootSymLinkResult;
             if (rootResult !== undefined) {
-                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath, directoryExists);
+                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath);
             }
             return host.readDirectory(rootDir, extensions, excludes, includes, depth);
             function getFileSystemEntries(dir) {
@@ -129308,9 +129305,6 @@ var ts;
                     insertText = ts.escapeSnippetText(name) + "={$1}";
                     isSnippet = true;
                 }
-                if (isSnippet) {
-                    replacementSpan = ts.createTextSpanFromNode(location, sourceFile);
-                }
             }
             if (insertText !== undefined && !preferences.includeCompletionsWithInsertText) {
                 return undefined;
@@ -129395,7 +129389,7 @@ var ts;
                 removeComments: true,
                 module: options.module,
                 target: options.target,
-                omitTrailingSemicolon: true,
+                omitTrailingSemicolon: false,
                 newLine: ts.getNewLineKind(ts.getNewLineCharacter(options, ts.maybeBind(host, host.getNewLine))),
             });
             var importAdder = ts.codefix.createImportAdder(sourceFile, program, preferences, host);
@@ -129453,7 +129447,7 @@ var ts;
                 completionNodes.push(node);
             }, body, 2 /* Property */, isAbstract);
             if (completionNodes.length) {
-                insertText = printer.printSnippetList(1 /* MultiLine */, ts.factory.createNodeArray(completionNodes), sourceFile);
+                insertText = printer.printSnippetList(1 /* MultiLine */ | 131072 /* NoTrailingNewLine */, ts.factory.createNodeArray(completionNodes), sourceFile);
             }
             return { insertText: insertText, isSnippet: isSnippet, importAdder: importAdder };
         }
@@ -131647,6 +131641,8 @@ var ts;
             // function f<T>(x: T) {}
             // f({ abc/**/: "" }) // `abc` is a member of `T` but only because it declares itself
             function hasDeclarationOtherThanSelf(member) {
+                if (!ts.length(member.declarations))
+                    return true;
                 return ts.some(member.declarations, function (decl) { return decl.parent !== obj; });
             }
         }
@@ -134363,7 +134359,7 @@ var ts;
                     var token = _a[_i];
                     if (!ts.isIdentifier(token) || token === definition || token.escapedText !== definition.escapedText)
                         continue;
-                    var referenceSymbol = checker.getSymbolAtLocation(token); // See GH#19955 for why the type annotation is necessary
+                    var referenceSymbol = checker.getSymbolAtLocation(token);
                     if (referenceSymbol === symbol
                         || checker.getShorthandAssignmentValueSymbol(token.parent) === symbol
                         || ts.isExportSpecifier(token.parent) && getLocalSymbolForExportSpecifier(token, referenceSymbol, token.parent, checker) === symbol) {
@@ -148421,8 +148417,6 @@ var ts;
                     var importSpecifiers = ts.mapAllOrFail(name.elements, function (e) {
                         return e.dotDotDotToken || e.initializer || e.propertyName && !ts.isIdentifier(e.propertyName) || !ts.isIdentifier(e.name)
                             ? undefined
-                            // (TODO: GH#18217)
-                            // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
                             : makeImportSpecifier(e.propertyName && e.propertyName.text, e.name.text);
                     });
                     if (importSpecifiers) {
@@ -155798,8 +155792,7 @@ var ts;
                         return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractRange)] };
                     }
                     var statements = [];
-                    var start2 = start; // TODO: GH#18217 Need to alias `start` to get this to compile. See https://github.com/Microsoft/TypeScript/issues/19955#issuecomment-344118248
-                    for (var _i = 0, _a = start2.parent.statements; _i < _a.length; _i++) {
+                    for (var _i = 0, _a = start.parent.statements; _i < _a.length; _i++) {
                         var statement = _a[_i];
                         if (statement === start || statements.length) {
                             var errors_1 = checkNode(statement);
@@ -159935,10 +159928,11 @@ var ts;
     }
     function findBaseOfDeclaration(checker, declaration, cb) {
         var _a;
+        if (ts.hasStaticModifier(declaration))
+            return;
         var classOrInterfaceDeclaration = ((_a = declaration.parent) === null || _a === void 0 ? void 0 : _a.kind) === 170 /* Constructor */ ? declaration.parent.parent : declaration.parent;
-        if (!classOrInterfaceDeclaration) {
+        if (!classOrInterfaceDeclaration)
             return;
-        }
         return ts.firstDefined(ts.getAllSuperTypeNodes(classOrInterfaceDeclaration), function (superTypeNode) {
             var symbol = checker.getPropertyOfType(checker.getTypeAtLocation(superTypeNode), declaration.symbol.name);
             return symbol ? cb(symbol) : undefined;

package/lib/typescriptServices.js

@@ -294,7 +294,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 = ts.versionMajorMinor + ".0-dev.20211108";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211112";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -7961,7 +7961,7 @@ var ts;
                 }
             }
             function readDirectory(path, extensions, excludes, includes, depth) {
-                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath, directoryExists);
+                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
             }
             function fileSystemEntryExists(path, entryKind) {
                 // Since the error thrown by fs.statSync isn't used, we can avoid collecting a stack trace to improve
@@ -20239,7 +20239,7 @@ var ts;
             includeFilePattern: getRegularExpressionForWildcard(includes, absolutePath, "files"),
             includeDirectoryPattern: getRegularExpressionForWildcard(includes, absolutePath, "directories"),
             excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, "exclude"),
-            basePaths: getBasePaths(absolutePath, includes, useCaseSensitiveFileNames)
+            basePaths: getBasePaths(path, includes, useCaseSensitiveFileNames)
         };
     }
     ts.getFileMatcherPatterns = getFileMatcherPatterns;
@@ -20248,7 +20248,7 @@ var ts;
     }
     ts.getRegexFromPattern = getRegexFromPattern;
     /** @param path directory of the tsconfig.json */
-    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath, directoryExists) {
+    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath) {
         path = ts.normalizePath(path);
         currentDirectory = ts.normalizePath(currentDirectory);
         var patterns = getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory);
@@ -20261,20 +20261,18 @@ var ts;
         var visited = new ts.Map();
         var toCanonical = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
         for (var _i = 0, _a = patterns.basePaths; _i < _a.length; _i++) {
-            var absoluteBasePath = _a[_i];
-            if (directoryExists(absoluteBasePath)) {
-                visitDirectory(absoluteBasePath, depth);
-            }
+            var basePath = _a[_i];
+            visitDirectory(basePath, ts.combinePaths(currentDirectory, basePath), depth);
         }
         return ts.flatten(results);
-        function visitDirectory(absolutePath, depth) {
+        function visitDirectory(path, absolutePath, depth) {
             var canonicalPath = toCanonical(realpath(absolutePath));
             if (visited.has(canonicalPath))
                 return;
             visited.set(canonicalPath, true);
-            var _a = getFileSystemEntries(absolutePath), files = _a.files, directories = _a.directories;
+            var _a = getFileSystemEntries(path), files = _a.files, directories = _a.directories;
             var _loop_1 = function (current) {
-                var name = ts.combinePaths(absolutePath, current);
+                var name = ts.combinePaths(path, current);
                 var absoluteName = ts.combinePaths(absolutePath, current);
                 if (extensions && !ts.fileExtensionIsOneOf(name, extensions))
                     return "continue";
@@ -20302,10 +20300,11 @@ var ts;
             }
             for (var _c = 0, _d = ts.sort(directories, ts.compareStringsCaseSensitive); _c < _d.length; _c++) {
                 var current = _d[_c];
+                var name = ts.combinePaths(path, current);
                 var absoluteName = ts.combinePaths(absolutePath, current);
                 if ((!includeDirectoryRegex || includeDirectoryRegex.test(absoluteName)) &&
                     (!excludeRegex || !excludeRegex.test(absoluteName))) {
-                    visitDirectory(absoluteName, depth);
+                    visitDirectory(name, absoluteName, depth);
                 }
             }
         }
@@ -20313,11 +20312,10 @@ var ts;
     ts.matchFiles = matchFiles;
     /**
      * Computes the unique non-wildcard base paths amongst the provided include patterns.
-     * @returns Absolute directory paths
      */
-    function getBasePaths(absoluteTsconfigPath, includes, useCaseSensitiveFileNames) {
+    function getBasePaths(path, includes, useCaseSensitiveFileNames) {
         // Storage for our results in the form of literal paths (e.g. the paths as written by the user).
-        var basePaths = [absoluteTsconfigPath];
+        var basePaths = [path];
         if (includes) {
             // Storage for literal base paths amongst the include patterns.
             var includeBasePaths = [];
@@ -20325,14 +20323,14 @@ var ts;
                 var include = includes_1[_i];
                 // We also need to check the relative paths by converting them to absolute and normalizing
                 // in case they escape the base path (e.g "..\somedirectory")
-                var absoluteIncludePath = ts.isRootedDiskPath(include) ? include : ts.normalizePath(ts.combinePaths(absoluteTsconfigPath, include));
+                var absolute = ts.isRootedDiskPath(include) ? include : ts.normalizePath(ts.combinePaths(path, include));
                 // Append the literal and canonical candidate base paths.
-                includeBasePaths.push(getIncludeBasePath(absoluteIncludePath));
+                includeBasePaths.push(getIncludeBasePath(absolute));
             }
             // Sort the offsets array using either the literal or canonical path representations.
             includeBasePaths.sort(ts.getStringComparer(!useCaseSensitiveFileNames));
             var _loop_2 = function (includeBasePath) {
-                if (ts.every(basePaths, function (basePath) { return !ts.containsPath(basePath, includeBasePath, absoluteTsconfigPath, !useCaseSensitiveFileNames); })) {
+                if (ts.every(basePaths, function (basePath) { return !ts.containsPath(basePath, includeBasePath, path, !useCaseSensitiveFileNames); })) {
                     basePaths.push(includeBasePath);
                 }
             };
@@ -86102,8 +86100,7 @@ var ts;
                 }
                 // Modifiers are never allowed on properties except for 'async' on a method declaration
                 if (prop.modifiers) {
-                    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-                    for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) { // TODO: GH#19955
+                    for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) {
                         var mod = _c[_b];
                         if (mod.kind !== 131 /* AsyncKeyword */ || prop.kind !== 168 /* MethodDeclaration */) {
                             grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
@@ -112720,7 +112717,7 @@ var ts;
             var rootResult = tryReadDirectory(rootDir, rootDirPath);
             var rootSymLinkResult;
             if (rootResult !== undefined) {
-                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath, directoryExists);
+                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath);
             }
             return host.readDirectory(rootDir, extensions, excludes, includes, depth);
             function getFileSystemEntries(dir) {
@@ -129308,9 +129305,6 @@ var ts;
                     insertText = ts.escapeSnippetText(name) + "={$1}";
                     isSnippet = true;
                 }
-                if (isSnippet) {
-                    replacementSpan = ts.createTextSpanFromNode(location, sourceFile);
-                }
             }
             if (insertText !== undefined && !preferences.includeCompletionsWithInsertText) {
                 return undefined;
@@ -129395,7 +129389,7 @@ var ts;
                 removeComments: true,
                 module: options.module,
                 target: options.target,
-                omitTrailingSemicolon: true,
+                omitTrailingSemicolon: false,
                 newLine: ts.getNewLineKind(ts.getNewLineCharacter(options, ts.maybeBind(host, host.getNewLine))),
             });
             var importAdder = ts.codefix.createImportAdder(sourceFile, program, preferences, host);
@@ -129453,7 +129447,7 @@ var ts;
                 completionNodes.push(node);
             }, body, 2 /* Property */, isAbstract);
             if (completionNodes.length) {
-                insertText = printer.printSnippetList(1 /* MultiLine */, ts.factory.createNodeArray(completionNodes), sourceFile);
+                insertText = printer.printSnippetList(1 /* MultiLine */ | 131072 /* NoTrailingNewLine */, ts.factory.createNodeArray(completionNodes), sourceFile);
             }
             return { insertText: insertText, isSnippet: isSnippet, importAdder: importAdder };
         }
@@ -131647,6 +131641,8 @@ var ts;
             // function f<T>(x: T) {}
             // f({ abc/**/: "" }) // `abc` is a member of `T` but only because it declares itself
             function hasDeclarationOtherThanSelf(member) {
+                if (!ts.length(member.declarations))
+                    return true;
                 return ts.some(member.declarations, function (decl) { return decl.parent !== obj; });
             }
         }
@@ -134363,7 +134359,7 @@ var ts;
                     var token = _a[_i];
                     if (!ts.isIdentifier(token) || token === definition || token.escapedText !== definition.escapedText)
                         continue;
-                    var referenceSymbol = checker.getSymbolAtLocation(token); // See GH#19955 for why the type annotation is necessary
+                    var referenceSymbol = checker.getSymbolAtLocation(token);
                     if (referenceSymbol === symbol
                         || checker.getShorthandAssignmentValueSymbol(token.parent) === symbol
                         || ts.isExportSpecifier(token.parent) && getLocalSymbolForExportSpecifier(token, referenceSymbol, token.parent, checker) === symbol) {
@@ -148421,8 +148417,6 @@ var ts;
                     var importSpecifiers = ts.mapAllOrFail(name.elements, function (e) {
                         return e.dotDotDotToken || e.initializer || e.propertyName && !ts.isIdentifier(e.propertyName) || !ts.isIdentifier(e.name)
                             ? undefined
-                            // (TODO: GH#18217)
-                            // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
                             : makeImportSpecifier(e.propertyName && e.propertyName.text, e.name.text);
                     });
                     if (importSpecifiers) {
@@ -155798,8 +155792,7 @@ var ts;
                         return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractRange)] };
                     }
                     var statements = [];
-                    var start2 = start; // TODO: GH#18217 Need to alias `start` to get this to compile. See https://github.com/Microsoft/TypeScript/issues/19955#issuecomment-344118248
-                    for (var _i = 0, _a = start2.parent.statements; _i < _a.length; _i++) {
+                    for (var _i = 0, _a = start.parent.statements; _i < _a.length; _i++) {
                         var statement = _a[_i];
                         if (statement === start || statements.length) {
                             var errors_1 = checkNode(statement);
@@ -159935,10 +159928,11 @@ var ts;
     }
     function findBaseOfDeclaration(checker, declaration, cb) {
         var _a;
+        if (ts.hasStaticModifier(declaration))
+            return;
         var classOrInterfaceDeclaration = ((_a = declaration.parent) === null || _a === void 0 ? void 0 : _a.kind) === 170 /* Constructor */ ? declaration.parent.parent : declaration.parent;
-        if (!classOrInterfaceDeclaration) {
+        if (!classOrInterfaceDeclaration)
             return;
-        }
         return ts.firstDefined(ts.getAllSuperTypeNodes(classOrInterfaceDeclaration), function (superTypeNode) {
             var symbol = checker.getPropertyOfType(checker.getTypeAtLocation(superTypeNode), declaration.symbol.name);
             return symbol ? cb(symbol) : undefined;

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 = ts.versionMajorMinor + ".0-dev.20211108";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211112";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -7756,7 +7756,7 @@ var ts;
                 }
             }
             function readDirectory(path, extensions, excludes, includes, depth) {
-                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath, directoryExists);
+                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
             }
             function fileSystemEntryExists(path, entryKind) {
                 // Since the error thrown by fs.statSync isn't used, we can avoid collecting a stack trace to improve
@@ -20034,7 +20034,7 @@ var ts;
             includeFilePattern: getRegularExpressionForWildcard(includes, absolutePath, "files"),
             includeDirectoryPattern: getRegularExpressionForWildcard(includes, absolutePath, "directories"),
             excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, "exclude"),
-            basePaths: getBasePaths(absolutePath, includes, useCaseSensitiveFileNames)
+            basePaths: getBasePaths(path, includes, useCaseSensitiveFileNames)
         };
     }
     ts.getFileMatcherPatterns = getFileMatcherPatterns;
@@ -20043,7 +20043,7 @@ var ts;
     }
     ts.getRegexFromPattern = getRegexFromPattern;
     /** @param path directory of the tsconfig.json */
-    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath, directoryExists) {
+    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath) {
         path = ts.normalizePath(path);
         currentDirectory = ts.normalizePath(currentDirectory);
         var patterns = getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory);
@@ -20056,20 +20056,18 @@ var ts;
         var visited = new ts.Map();
         var toCanonical = ts.createGetCanonicalFileName(useCaseSensitiveFileNames);
         for (var _i = 0, _a = patterns.basePaths; _i < _a.length; _i++) {
-            var absoluteBasePath = _a[_i];
-            if (directoryExists(absoluteBasePath)) {
-                visitDirectory(absoluteBasePath, depth);
-            }
+            var basePath = _a[_i];
+            visitDirectory(basePath, ts.combinePaths(currentDirectory, basePath), depth);
         }
         return ts.flatten(results);
-        function visitDirectory(absolutePath, depth) {
+        function visitDirectory(path, absolutePath, depth) {
             var canonicalPath = toCanonical(realpath(absolutePath));
             if (visited.has(canonicalPath))
                 return;
             visited.set(canonicalPath, true);
-            var _a = getFileSystemEntries(absolutePath), files = _a.files, directories = _a.directories;
+            var _a = getFileSystemEntries(path), files = _a.files, directories = _a.directories;
             var _loop_1 = function (current) {
-                var name = ts.combinePaths(absolutePath, current);
+                var name = ts.combinePaths(path, current);
                 var absoluteName = ts.combinePaths(absolutePath, current);
                 if (extensions && !ts.fileExtensionIsOneOf(name, extensions))
                     return "continue";
@@ -20097,10 +20095,11 @@ var ts;
             }
             for (var _c = 0, _d = ts.sort(directories, ts.compareStringsCaseSensitive); _c < _d.length; _c++) {
                 var current = _d[_c];
+                var name = ts.combinePaths(path, current);
                 var absoluteName = ts.combinePaths(absolutePath, current);
                 if ((!includeDirectoryRegex || includeDirectoryRegex.test(absoluteName)) &&
                     (!excludeRegex || !excludeRegex.test(absoluteName))) {
-                    visitDirectory(absoluteName, depth);
+                    visitDirectory(name, absoluteName, depth);
                 }
             }
         }
@@ -20108,11 +20107,10 @@ var ts;
     ts.matchFiles = matchFiles;
     /**
      * Computes the unique non-wildcard base paths amongst the provided include patterns.
-     * @returns Absolute directory paths
      */
-    function getBasePaths(absoluteTsconfigPath, includes, useCaseSensitiveFileNames) {
+    function getBasePaths(path, includes, useCaseSensitiveFileNames) {
         // Storage for our results in the form of literal paths (e.g. the paths as written by the user).
-        var basePaths = [absoluteTsconfigPath];
+        var basePaths = [path];
         if (includes) {
             // Storage for literal base paths amongst the include patterns.
             var includeBasePaths = [];
@@ -20120,14 +20118,14 @@ var ts;
                 var include = includes_1[_i];
                 // We also need to check the relative paths by converting them to absolute and normalizing
                 // in case they escape the base path (e.g "..\somedirectory")
-                var absoluteIncludePath = ts.isRootedDiskPath(include) ? include : ts.normalizePath(ts.combinePaths(absoluteTsconfigPath, include));
+                var absolute = ts.isRootedDiskPath(include) ? include : ts.normalizePath(ts.combinePaths(path, include));
                 // Append the literal and canonical candidate base paths.
-                includeBasePaths.push(getIncludeBasePath(absoluteIncludePath));
+                includeBasePaths.push(getIncludeBasePath(absolute));
             }
             // Sort the offsets array using either the literal or canonical path representations.
             includeBasePaths.sort(ts.getStringComparer(!useCaseSensitiveFileNames));
             var _loop_2 = function (includeBasePath) {
-                if (ts.every(basePaths, function (basePath) { return !ts.containsPath(basePath, includeBasePath, absoluteTsconfigPath, !useCaseSensitiveFileNames); })) {
+                if (ts.every(basePaths, function (basePath) { return !ts.containsPath(basePath, includeBasePath, path, !useCaseSensitiveFileNames); })) {
                     basePaths.push(includeBasePath);
                 }
             };
@@ -85897,8 +85895,7 @@ var ts;
                 }
                 // Modifiers are never allowed on properties except for 'async' on a method declaration
                 if (prop.modifiers) {
-                    // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-                    for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) { // TODO: GH#19955
+                    for (var _b = 0, _c = prop.modifiers; _b < _c.length; _b++) {
                         var mod = _c[_b];
                         if (mod.kind !== 131 /* AsyncKeyword */ || prop.kind !== 168 /* MethodDeclaration */) {
                             grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
@@ -112515,7 +112512,7 @@ var ts;
             var rootResult = tryReadDirectory(rootDir, rootDirPath);
             var rootSymLinkResult;
             if (rootResult !== undefined) {
-                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath, directoryExists);
+                return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath);
             }
             return host.readDirectory(rootDir, extensions, excludes, includes, depth);
             function getFileSystemEntries(dir) {

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "4.6.0-dev.20211108",
+    "version": "4.6.0-dev.20211112",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [