typescript 4.6.0-dev.20211118 → 4.6.0-dev.20211122

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.20211118";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211122";
     var NativeCollections;
     (function (NativeCollections) {
         function tryGetNativeMap() {
@@ -108,20 +108,6 @@ var ts;
     ts.emptyArray = [];
     ts.emptyMap = new ts.Map();
     ts.emptySet = new ts.Set();
-    function createMap() {
-        return new ts.Map();
-    }
-    ts.createMap = createMap;
-    function createMapFromTemplate(template) {
-        var map = new ts.Map();
-        for (var key in template) {
-            if (hasOwnProperty.call(template, key)) {
-                map.set(key, template[key]);
-            }
-        }
-        return map;
-    }
-    ts.createMapFromTemplate = createMapFromTemplate;
     function length(array) {
         return array ? array.length : 0;
     }
@@ -2005,7 +1991,6 @@ var ts;
             return value;
         }
         Debug.checkDefined = checkDefined;
-        Debug.assertDefined = checkDefined;
         function assertEachIsDefined(value, message, stackCrawlMark) {
             for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
                 var v = value_1[_i];
@@ -2018,7 +2003,6 @@ var ts;
             return value;
         }
         Debug.checkEachDefined = checkEachDefined;
-        Debug.assertEachDefined = checkEachDefined;
         function assertNever(member, message, stackCrawlMark) {
             if (message === void 0) { message = "Illegal value:"; }
             var detail = typeof member === "object" && ts.hasProperty(member, "kind") && ts.hasProperty(member, "pos") && formatSyntaxKind ? "SyntaxKind: " + formatSyntaxKind(member.kind) : JSON.stringify(member);
@@ -10501,14 +10485,6 @@ var ts;
         return undefined;
     }
     ts.getDeclarationOfKind = getDeclarationOfKind;
-    function createUnderscoreEscapedMap() {
-        return new ts.Map();
-    }
-    ts.createUnderscoreEscapedMap = createUnderscoreEscapedMap;
-    function hasEntries(map) {
-        return !!map && !!map.size;
-    }
-    ts.hasEntries = hasEntries;
     function createSymbolTable(symbols) {
         var result = new ts.Map();
         if (symbols) {
@@ -21313,7 +21289,7 @@ var ts;
             sourceMapText = mapTextOrStripInternal;
         }
         var node = oldFileOfCurrentEmit ?
-            parseOldFileOfCurrentEmit(ts.Debug.assertDefined(bundleFileInfo)) :
+            parseOldFileOfCurrentEmit(ts.Debug.checkDefined(bundleFileInfo)) :
             parseUnparsedSourceFile(bundleFileInfo, stripInternal, length);
         node.fileName = fileName;
         node.sourceMapPath = sourceMapPath;
@@ -21458,13 +21434,13 @@ var ts;
             };
             node.javascriptPath = declarationTextOrJavascriptPath;
             node.javascriptMapPath = javascriptMapPath;
-            node.declarationPath = ts.Debug.assertDefined(javascriptMapTextOrDeclarationPath);
+            node.declarationPath = ts.Debug.checkDefined(javascriptMapTextOrDeclarationPath);
             node.declarationMapPath = declarationMapPath;
             node.buildInfoPath = declarationMapTextOrBuildInfoPath;
             Object.defineProperties(node, {
                 javascriptText: { get: function () { return definedTextGetter_1(declarationTextOrJavascriptPath); } },
                 javascriptMapText: { get: function () { return textGetter_1(javascriptMapPath); } },
-                declarationText: { get: function () { return definedTextGetter_1(ts.Debug.assertDefined(javascriptMapTextOrDeclarationPath)); } },
+                declarationText: { get: function () { return definedTextGetter_1(ts.Debug.checkDefined(javascriptMapTextOrDeclarationPath)); } },
                 declarationMapText: { get: function () { return textGetter_1(declarationMapPath); } },
                 buildInfo: { get: function () { return getAndCacheBuildInfo_1(function () { return textGetter_1(declarationMapTextOrBuildInfoPath); }); } }
             });
@@ -43052,10 +43028,8 @@ var ts;
                             firstChar = symbolName.charCodeAt(0);
                         }
                         var expression = void 0;
-                        if (ts.isSingleOrDoubleQuote(firstChar)) {
-                            expression = ts.factory.createStringLiteral(symbolName
-                                .substring(1, symbolName.length - 1)
-                                .replace(/\\./g, function (s) { return s.substring(1); }), firstChar === 39);
+                        if (ts.isSingleOrDoubleQuote(firstChar) && !(symbol.flags & 8)) {
+                            expression = ts.factory.createStringLiteral(ts.stripQuotes(symbolName).replace(/\\./g, function (s) { return s.substring(1); }), firstChar === 39);
                         }
                         else if (("" + +symbolName) === symbolName) {
                             expression = ts.factory.createNumericLiteral(+symbolName);
@@ -78606,7 +78580,7 @@ var ts;
         function visitYieldExpression(node) {
             if (enclosingFunctionFlags & 2 && enclosingFunctionFlags & 1) {
                 if (node.asteriskToken) {
-                    var expression = ts.visitNode(ts.Debug.assertDefined(node.expression), visitor, ts.isExpression);
+                    var expression = ts.visitNode(ts.Debug.checkDefined(node.expression), visitor, ts.isExpression);
                     return ts.setOriginalNode(ts.setTextRange(factory.createYieldExpression(undefined, emitHelpers().createAwaitHelper(factory.updateYieldExpression(node, node.asteriskToken, ts.setTextRange(emitHelpers().createAsyncDelegatorHelper(ts.setTextRange(emitHelpers().createAsyncValuesHelper(expression), expression)), expression)))), node), node);
                 }
                 return ts.setOriginalNode(ts.setTextRange(factory.createYieldExpression(undefined, createDownlevelAwait(node.expression
@@ -79404,11 +79378,11 @@ var ts;
                 return existing.name;
             }
             if (!currentFileState.utilizedImplicitRuntimeImports) {
-                currentFileState.utilizedImplicitRuntimeImports = ts.createMap();
+                currentFileState.utilizedImplicitRuntimeImports = new ts.Map();
             }
             var specifierSourceImports = currentFileState.utilizedImplicitRuntimeImports.get(importSource);
             if (!specifierSourceImports) {
-                specifierSourceImports = ts.createMap();
+                specifierSourceImports = new ts.Map();
                 currentFileState.utilizedImplicitRuntimeImports.set(importSource, specifierSourceImports);
             }
             var generatedName = factory.createUniqueName("_" + name, 16 | 32 | 64);
@@ -93686,6 +93660,23 @@ var ts;
         }
     }
     ts.getImpliedNodeFormatForFile = getImpliedNodeFormatForFile;
+    ts.plainJSErrors = new ts.Set([
+        ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0.code,
+        ts.Diagnostics.A_module_cannot_have_multiple_default_exports.code,
+        ts.Diagnostics.Another_export_default_is_here.code,
+        ts.Diagnostics.The_first_export_default_is_here.code,
+        ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_at_the_top_level_of_a_module.code,
+        ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode.code,
+        ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_that_cannot_be_used_here.code,
+        ts.Diagnostics.constructor_is_a_reserved_word.code,
+        ts.Diagnostics.delete_cannot_be_called_on_an_identifier_in_strict_mode.code,
+        ts.Diagnostics.Code_contained_in_a_class_is_evaluated_in_JavaScript_s_strict_mode_which_does_not_allow_this_use_of_0_For_more_information_see_https_Colon_Slash_Slashdeveloper_mozilla_org_Slashen_US_Slashdocs_SlashWeb_SlashJavaScript_SlashReference_SlashStrict_mode.code,
+        ts.Diagnostics.Invalid_use_of_0_Modules_are_automatically_in_strict_mode.code,
+        ts.Diagnostics.Invalid_use_of_0_in_strict_mode.code,
+        ts.Diagnostics.A_label_is_not_allowed_here.code,
+        ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode.code,
+        ts.Diagnostics.with_statements_are_not_allowed_in_strict_mode.code,
+    ]);
     function shouldProgramCreateNewSourceFiles(program, newOptions) {
         if (!program)
             return false;
@@ -94533,13 +94524,18 @@ var ts;
                 }
                 var typeChecker = getDiagnosticsProducingTypeChecker();
                 ts.Debug.assert(!!sourceFile.bindDiagnostics);
-                var isCheckJs = ts.isCheckJsEnabledForFile(sourceFile, options);
+                var isJs = sourceFile.scriptKind === 1 || sourceFile.scriptKind === 2;
+                var isCheckJs = isJs && ts.isCheckJsEnabledForFile(sourceFile, options);
+                var isPlainJs = isJs && !sourceFile.checkJsDirective && options.checkJs === undefined;
                 var isTsNoCheck = !!sourceFile.checkJsDirective && sourceFile.checkJsDirective.enabled === false;
                 var includeBindAndCheckDiagnostics = !isTsNoCheck && (sourceFile.scriptKind === 3 || sourceFile.scriptKind === 4
-                    || sourceFile.scriptKind === 5 || isCheckJs || sourceFile.scriptKind === 7);
+                    || sourceFile.scriptKind === 5 || isPlainJs || isCheckJs || sourceFile.scriptKind === 7);
                 var bindDiagnostics = includeBindAndCheckDiagnostics ? sourceFile.bindDiagnostics : ts.emptyArray;
-                var checkDiagnostics = includeBindAndCheckDiagnostics ? typeChecker.getDiagnostics(sourceFile, cancellationToken) : ts.emptyArray;
-                return getMergedBindAndCheckDiagnostics(sourceFile, includeBindAndCheckDiagnostics, bindDiagnostics, checkDiagnostics, isCheckJs ? sourceFile.jsDocDiagnostics : undefined);
+                var checkDiagnostics = includeBindAndCheckDiagnostics && !isPlainJs ? typeChecker.getDiagnostics(sourceFile, cancellationToken) : ts.emptyArray;
+                if (isPlainJs) {
+                    bindDiagnostics = ts.filter(bindDiagnostics, function (d) { return ts.plainJSErrors.has(d.code); });
+                }
+                return getMergedBindAndCheckDiagnostics(sourceFile, includeBindAndCheckDiagnostics && !isPlainJs, bindDiagnostics, checkDiagnostics, isCheckJs ? sourceFile.jsDocDiagnostics : undefined);
             });
         }
         function getMergedBindAndCheckDiagnostics(sourceFile, includeBindAndCheckDiagnostics) {
@@ -97922,7 +97918,7 @@ var ts;
         function watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, filePath, getResolutionWithResolvedFileName) {
             if (resolution.refCount) {
                 resolution.refCount++;
-                ts.Debug.assertDefined(resolution.files);
+                ts.Debug.assertIsDefined(resolution.files);
             }
             else {
                 resolution.refCount = 1;
@@ -97987,7 +97983,7 @@ var ts;
             }
         }
         function stopWatchFailedLookupLocationOfResolution(resolution, filePath, getResolutionWithResolvedFileName) {
-            ts.unorderedRemoveItem(ts.Debug.assertDefined(resolution.files), filePath);
+            ts.unorderedRemoveItem(ts.Debug.checkDefined(resolution.files), filePath);
             resolution.refCount--;
             if (resolution.refCount) {
                 return;
@@ -98073,7 +98069,7 @@ var ts;
                 if (resolution.isInvalidated || !canInvalidate(resolution))
                     continue;
                 resolution.isInvalidated = invalidated = true;
-                for (var _a = 0, _b = ts.Debug.assertDefined(resolution.files); _a < _b.length; _a++) {
+                for (var _a = 0, _b = ts.Debug.checkDefined(resolution.files); _a < _b.length; _a++) {
                     var containingFilePath = _b[_a];
                     (filesWithInvalidatedResolutions || (filesWithInvalidatedResolutions = new ts.Set())).add(containingFilePath);
                     hasChangedAutomaticTypeDirectiveNames = hasChangedAutomaticTypeDirectiveNames || ts.endsWith(containingFilePath, ts.inferredTypesContainingFile);

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.20211118";
+    ts.version = ts.versionMajorMinor + ".0-dev.20211122";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -162,26 +162,6 @@ var ts;
     ts.emptyArray = [];
     ts.emptyMap = new ts.Map();
     ts.emptySet = new ts.Set();
-    function createMap() {
-        return new ts.Map();
-    }
-    ts.createMap = createMap;
-    /**
-     * Create a new map from a template object is provided, the map will copy entries from it.
-     * @deprecated Use `new Map(getEntries(template))` instead.
-     */
-    function createMapFromTemplate(template) {
-        var map = new ts.Map();
-        // Copies keys/values from template. Note that for..in will not throw if
-        // template is undefined, and instead will just exit the loop.
-        for (var key in template) {
-            if (hasOwnProperty.call(template, key)) {
-                map.set(key, template[key]);
-            }
-        }
-        return map;
-    }
-    ts.createMapFromTemplate = createMapFromTemplate;
     function length(array) {
         return array ? array.length : 0;
     }
@@ -2416,11 +2396,6 @@ var ts;
             return value;
         }
         Debug.checkDefined = checkDefined;
-        /**
-         * @deprecated Use `checkDefined` to check whether a value is defined inline. Use `assertIsDefined` to check whether
-         * a value is defined at the statement level.
-         */
-        Debug.assertDefined = checkDefined;
         function assertEachIsDefined(value, message, stackCrawlMark) {
             for (var _i = 0, value_1 = value; _i < value_1.length; _i++) {
                 var v = value_1[_i];
@@ -2433,11 +2408,6 @@ var ts;
             return value;
         }
         Debug.checkEachDefined = checkEachDefined;
-        /**
-         * @deprecated Use `checkEachDefined` to check whether the elements of an array are defined inline. Use `assertEachIsDefined` to check whether
-         * the elements of an array are defined at the statement level.
-         */
-        Debug.assertEachDefined = checkEachDefined;
         function assertNever(member, message, stackCrawlMark) {
             if (message === void 0) { message = "Illegal value:"; }
             var detail = typeof member === "object" && ts.hasProperty(member, "kind") && ts.hasProperty(member, "pos") && formatSyntaxKind ? "SyntaxKind: " + formatSyntaxKind(member.kind) : JSON.stringify(member);
@@ -13897,21 +13867,6 @@ var ts;
         return undefined;
     }
     ts.getDeclarationOfKind = getDeclarationOfKind;
-    /**
-     * Create a new escaped identifier map.
-     * @deprecated Use `new Map<__String, T>()` instead.
-     */
-    function createUnderscoreEscapedMap() {
-        return new ts.Map();
-    }
-    ts.createUnderscoreEscapedMap = createUnderscoreEscapedMap;
-    /**
-     * @deprecated Use `!!map?.size` instead
-     */
-    function hasEntries(map) {
-        return !!map && !!map.size;
-    }
-    ts.hasEntries = hasEntries;
     function createSymbolTable(symbols) {
         var result = new ts.Map();
         if (symbols) {
@@ -26504,7 +26459,7 @@ var ts;
             sourceMapText = mapTextOrStripInternal;
         }
         var node = oldFileOfCurrentEmit ?
-            parseOldFileOfCurrentEmit(ts.Debug.assertDefined(bundleFileInfo)) :
+            parseOldFileOfCurrentEmit(ts.Debug.checkDefined(bundleFileInfo)) :
             parseUnparsedSourceFile(bundleFileInfo, stripInternal, length);
         node.fileName = fileName;
         node.sourceMapPath = sourceMapPath;
@@ -26651,13 +26606,13 @@ var ts;
             };
             node.javascriptPath = declarationTextOrJavascriptPath;
             node.javascriptMapPath = javascriptMapPath;
-            node.declarationPath = ts.Debug.assertDefined(javascriptMapTextOrDeclarationPath);
+            node.declarationPath = ts.Debug.checkDefined(javascriptMapTextOrDeclarationPath);
             node.declarationMapPath = declarationMapPath;
             node.buildInfoPath = declarationMapTextOrBuildInfoPath;
             Object.defineProperties(node, {
                 javascriptText: { get: function () { return definedTextGetter_1(declarationTextOrJavascriptPath); } },
                 javascriptMapText: { get: function () { return textGetter_1(javascriptMapPath); } },
-                declarationText: { get: function () { return definedTextGetter_1(ts.Debug.assertDefined(javascriptMapTextOrDeclarationPath)); } },
+                declarationText: { get: function () { return definedTextGetter_1(ts.Debug.checkDefined(javascriptMapTextOrDeclarationPath)); } },
                 declarationMapText: { get: function () { return textGetter_1(declarationMapPath); } },
                 buildInfo: { get: function () { return getAndCacheBuildInfo_1(function () { return textGetter_1(declarationMapTextOrBuildInfoPath); }); } }
             });
@@ -52172,10 +52127,8 @@ var ts;
                             firstChar = symbolName.charCodeAt(0);
                         }
                         var expression = void 0;
-                        if (ts.isSingleOrDoubleQuote(firstChar)) {
-                            expression = ts.factory.createStringLiteral(symbolName
-                                .substring(1, symbolName.length - 1)
-                                .replace(/\\./g, function (s) { return s.substring(1); }), firstChar === 39 /* singleQuote */);
+                        if (ts.isSingleOrDoubleQuote(firstChar) && !(symbol.flags & 8 /* EnumMember */)) {
+                            expression = ts.factory.createStringLiteral(ts.stripQuotes(symbolName).replace(/\\./g, function (s) { return s.substring(1); }), firstChar === 39 /* singleQuote */);
                         }
                         else if (("" + +symbolName) === symbolName) {
                             expression = ts.factory.createNumericLiteral(+symbolName);
@@ -94168,7 +94121,7 @@ var ts;
         function visitYieldExpression(node) {
             if (enclosingFunctionFlags & 2 /* Async */ && enclosingFunctionFlags & 1 /* Generator */) {
                 if (node.asteriskToken) {
-                    var expression = ts.visitNode(ts.Debug.assertDefined(node.expression), visitor, ts.isExpression);
+                    var expression = ts.visitNode(ts.Debug.checkDefined(node.expression), visitor, ts.isExpression);
                     return ts.setOriginalNode(ts.setTextRange(factory.createYieldExpression(
                     /*asteriskToken*/ undefined, emitHelpers().createAwaitHelper(factory.updateYieldExpression(node, node.asteriskToken, ts.setTextRange(emitHelpers().createAsyncDelegatorHelper(ts.setTextRange(emitHelpers().createAsyncValuesHelper(expression), expression)), expression)))), node), node);
                 }
@@ -95093,11 +95046,11 @@ var ts;
                 return existing.name;
             }
             if (!currentFileState.utilizedImplicitRuntimeImports) {
-                currentFileState.utilizedImplicitRuntimeImports = ts.createMap();
+                currentFileState.utilizedImplicitRuntimeImports = new ts.Map();
             }
             var specifierSourceImports = currentFileState.utilizedImplicitRuntimeImports.get(importSource);
             if (!specifierSourceImports) {
-                specifierSourceImports = ts.createMap();
+                specifierSourceImports = new ts.Map();
                 currentFileState.utilizedImplicitRuntimeImports.set(importSource, specifierSourceImports);
             }
             var generatedName = factory.createUniqueName("_" + name, 16 /* Optimistic */ | 32 /* FileLevel */ | 64 /* AllowNameSubstitution */);
@@ -113624,6 +113577,24 @@ var ts;
         }
     }
     ts.getImpliedNodeFormatForFile = getImpliedNodeFormatForFile;
+    /** @internal */
+    ts.plainJSErrors = new ts.Set([
+        ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0.code,
+        ts.Diagnostics.A_module_cannot_have_multiple_default_exports.code,
+        ts.Diagnostics.Another_export_default_is_here.code,
+        ts.Diagnostics.The_first_export_default_is_here.code,
+        ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_at_the_top_level_of_a_module.code,
+        ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode.code,
+        ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_that_cannot_be_used_here.code,
+        ts.Diagnostics.constructor_is_a_reserved_word.code,
+        ts.Diagnostics.delete_cannot_be_called_on_an_identifier_in_strict_mode.code,
+        ts.Diagnostics.Code_contained_in_a_class_is_evaluated_in_JavaScript_s_strict_mode_which_does_not_allow_this_use_of_0_For_more_information_see_https_Colon_Slash_Slashdeveloper_mozilla_org_Slashen_US_Slashdocs_SlashWeb_SlashJavaScript_SlashReference_SlashStrict_mode.code,
+        ts.Diagnostics.Invalid_use_of_0_Modules_are_automatically_in_strict_mode.code,
+        ts.Diagnostics.Invalid_use_of_0_in_strict_mode.code,
+        ts.Diagnostics.A_label_is_not_allowed_here.code,
+        ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode.code,
+        ts.Diagnostics.with_statements_are_not_allowed_in_strict_mode.code,
+    ]);
     /**
      * Determine if source file needs to be re-created even if its text hasn't changed
      */
@@ -114641,14 +114612,23 @@ var ts;
                 }
                 var typeChecker = getDiagnosticsProducingTypeChecker();
                 ts.Debug.assert(!!sourceFile.bindDiagnostics);
-                var isCheckJs = ts.isCheckJsEnabledForFile(sourceFile, options);
+                var isJs = sourceFile.scriptKind === 1 /* JS */ || sourceFile.scriptKind === 2 /* JSX */;
+                var isCheckJs = isJs && ts.isCheckJsEnabledForFile(sourceFile, options);
+                var isPlainJs = isJs && !sourceFile.checkJsDirective && options.checkJs === undefined;
                 var isTsNoCheck = !!sourceFile.checkJsDirective && sourceFile.checkJsDirective.enabled === false;
-                // By default, only type-check .ts, .tsx, 'Deferred' and 'External' files (external files are added by plugins)
+                // By default, only type-check .ts, .tsx, Deferred, plain JS, checked JS and External
+                // - plain JS: .js files with no // ts-check and checkJs: undefined
+                // - check JS: .js files with either // ts-check or checkJs: true
+                // - external: files that are added by plugins
                 var includeBindAndCheckDiagnostics = !isTsNoCheck && (sourceFile.scriptKind === 3 /* TS */ || sourceFile.scriptKind === 4 /* TSX */
-                    || sourceFile.scriptKind === 5 /* External */ || isCheckJs || sourceFile.scriptKind === 7 /* Deferred */);
+                    || sourceFile.scriptKind === 5 /* External */ || isPlainJs || isCheckJs || sourceFile.scriptKind === 7 /* Deferred */);
                 var bindDiagnostics = includeBindAndCheckDiagnostics ? sourceFile.bindDiagnostics : ts.emptyArray;
-                var checkDiagnostics = includeBindAndCheckDiagnostics ? typeChecker.getDiagnostics(sourceFile, cancellationToken) : ts.emptyArray;
-                return getMergedBindAndCheckDiagnostics(sourceFile, includeBindAndCheckDiagnostics, bindDiagnostics, checkDiagnostics, isCheckJs ? sourceFile.jsDocDiagnostics : undefined);
+                var checkDiagnostics = includeBindAndCheckDiagnostics && !isPlainJs ? typeChecker.getDiagnostics(sourceFile, cancellationToken) : ts.emptyArray;
+                if (isPlainJs) {
+                    bindDiagnostics = ts.filter(bindDiagnostics, function (d) { return ts.plainJSErrors.has(d.code); });
+                }
+                // skip ts-expect-error errors in plain JS files, and skip JSDoc errors except in checked JS
+                return getMergedBindAndCheckDiagnostics(sourceFile, includeBindAndCheckDiagnostics && !isPlainJs, bindDiagnostics, checkDiagnostics, isCheckJs ? sourceFile.jsDocDiagnostics : undefined);
             });
         }
         function getMergedBindAndCheckDiagnostics(sourceFile, includeBindAndCheckDiagnostics) {
@@ -118557,7 +118537,7 @@ var ts;
         function watchFailedLookupLocationsOfExternalModuleResolutions(name, resolution, filePath, getResolutionWithResolvedFileName) {
             if (resolution.refCount) {
                 resolution.refCount++;
-                ts.Debug.assertDefined(resolution.files);
+                ts.Debug.assertIsDefined(resolution.files);
             }
             else {
                 resolution.refCount = 1;
@@ -118625,7 +118605,7 @@ var ts;
             }
         }
         function stopWatchFailedLookupLocationOfResolution(resolution, filePath, getResolutionWithResolvedFileName) {
-            ts.unorderedRemoveItem(ts.Debug.assertDefined(resolution.files), filePath);
+            ts.unorderedRemoveItem(ts.Debug.checkDefined(resolution.files), filePath);
             resolution.refCount--;
             if (resolution.refCount) {
                 return;
@@ -118717,7 +118697,7 @@ var ts;
                 if (resolution.isInvalidated || !canInvalidate(resolution))
                     continue;
                 resolution.isInvalidated = invalidated = true;
-                for (var _a = 0, _b = ts.Debug.assertDefined(resolution.files); _a < _b.length; _a++) {
+                for (var _a = 0, _b = ts.Debug.checkDefined(resolution.files); _a < _b.length; _a++) {
                     var containingFilePath = _b[_a];
                     (filesWithInvalidatedResolutions || (filesWithInvalidatedResolutions = new ts.Set())).add(containingFilePath);
                     // When its a file with inferred types resolution, invalidate type reference directive resolution
@@ -135605,14 +135585,17 @@ var ts;
             if (node === sourceFile) {
                 return undefined;
             }
-            var symbol = typeChecker.getSymbolAtLocation(node);
+            var symbol = getSymbol(node, typeChecker);
             if (!symbol)
                 return undefined;
             var typeAtLocation = typeChecker.getTypeOfSymbolAtLocation(symbol, node);
             var returnType = tryGetReturnTypeOfFunction(symbol, typeAtLocation, typeChecker);
             var fromReturnType = returnType && definitionFromType(returnType, typeChecker, node);
             // If a function returns 'void' or some other type with no definition, just return the function definition.
-            return fromReturnType && fromReturnType.length !== 0 ? fromReturnType : definitionFromType(typeAtLocation, typeChecker, node);
+            var typeDefinitions = fromReturnType && fromReturnType.length !== 0 ? fromReturnType : definitionFromType(typeAtLocation, typeChecker, node);
+            return typeDefinitions.length ? typeDefinitions
+                : !(symbol.flags & 111551 /* Value */) && symbol.flags & 788968 /* Type */ ? getDefinitionFromSymbol(typeChecker, ts.skipAlias(symbol, typeChecker), node)
+                    : undefined;
         }
         GoToDefinition.getTypeDefinitionAtPosition = getTypeDefinitionAtPosition;
         function definitionFromType(type, checker, node) {
@@ -149505,9 +149488,9 @@ var ts;
             if (!ts.isFunctionDeclaration(fn) && !ts.isFunctionExpression(fn))
                 return undefined;
             if (!ts.isSourceFile(ts.getThisContainer(fn, /*includeArrowFunctions*/ false))) { // 'this' is defined outside, convert to arrow function
-                var fnKeyword = ts.Debug.assertDefined(ts.findChildOfKind(fn, 98 /* FunctionKeyword */, sourceFile));
+                var fnKeyword = ts.Debug.checkDefined(ts.findChildOfKind(fn, 98 /* FunctionKeyword */, sourceFile));
                 var name = fn.name;
-                var body = ts.Debug.assertDefined(fn.body); // Should be defined because the function contained a 'this' expression
+                var body = ts.Debug.checkDefined(fn.body); // Should be defined because the function contained a 'this' expression
                 if (ts.isFunctionExpression(fn)) {
                     if (name && ts.FindAllReferences.Core.isSymbolReferencedInFile(name, checker, sourceFile, body)) {
                         // Function expression references itself. To fix we would have to extract it to a const.
@@ -171933,7 +171916,7 @@ var ts;
             Session.prototype.getFullNavigateToItems = function (args) {
                 var currentFileOnly = args.currentFileOnly, searchValue = args.searchValue, maxResultCount = args.maxResultCount, projectFileName = args.projectFileName;
                 if (currentFileOnly) {
-                    ts.Debug.assertDefined(args.file);
+                    ts.Debug.assertIsDefined(args.file);
                     var _a = this.getFileAndProject(args), file = _a.file, project = _a.project;
                     return [{ project: project, result: project.getLanguageService().getNavigateToItems(searchValue, maxResultCount, file) }];
                 }

package/lib/tsserverlibrary.d.ts

@@ -897,7 +897,7 @@ declare namespace ts {
     export interface TypePredicateNode extends TypeNode {
         readonly kind: SyntaxKind.TypePredicate;
         readonly parent: SignatureDeclaration | JSDocTypeExpression;
-        readonly assertsModifier?: AssertsToken;
+        readonly assertsModifier?: AssertsKeyword;
         readonly parameterName: Identifier | ThisTypeNode;
         readonly type?: TypeNode;
     }
@@ -968,7 +968,7 @@ declare namespace ts {
     }
     export interface MappedTypeNode extends TypeNode, Declaration {
         readonly kind: SyntaxKind.MappedType;
-        readonly readonlyToken?: ReadonlyToken | PlusToken | MinusToken;
+        readonly readonlyToken?: ReadonlyKeyword | PlusToken | MinusToken;
         readonly typeParameter: TypeParameterDeclaration;
         readonly nameType?: TypeNode;
         readonly questionToken?: QuestionToken | PlusToken | MinusToken;
@@ -1465,7 +1465,7 @@ declare namespace ts {
     }
     export interface ForOfStatement extends IterationStatement {
         readonly kind: SyntaxKind.ForOfStatement;
-        readonly awaitModifier?: AwaitKeywordToken;
+        readonly awaitModifier?: AwaitKeyword;
         readonly initializer: ForInitializer;
         readonly expression: Expression;
     }