npm - typescript - Versions diffs - 4.8.0-dev.20220610 → 4.8.0-dev.20220611 - Mend

typescript 4.8.0-dev.20220610 → 4.8.0-dev.20220611

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

Files changed (10) hide show

package/lib/tsc.js +24 -12
package/lib/tsserver.js +35 -16
package/lib/tsserverlibrary.d.ts +1 -1
package/lib/tsserverlibrary.js +35 -16
package/lib/typescript.d.ts +1 -1
package/lib/typescript.js +35 -16
package/lib/typescriptServices.d.ts +1 -1
package/lib/typescriptServices.js +35 -16
package/lib/typingsInstaller.js +33 -14
package/package.json +1 -1

package/lib/tsc.js CHANGED Viewed

@@ -69,7 +69,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 var ts;
 (function (ts) {
     ts.versionMajorMinor = "4.8";
-    ts.version = ts.versionMajorMinor + ".0-dev.20220610";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220611";
     var NativeCollections;
     (function (NativeCollections) {
         var globals = typeof globalThis !== "undefined" ? globalThis :
@@ -2239,7 +2239,7 @@ var ts;
                 return members.length > 0 && members[0][0] === 0 ? members[0][1] : "0";
             }
             if (isFlags) {
-                var result = "";
+                var result = [];
                 var remainingFlags = value;
                 for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
                     var _a = members_1[_i], enumValue = _a[0], enumName = _a[1];
@@ -2247,12 +2247,12 @@ var ts;
                         break;
                     }
                     if (enumValue !== 0 && enumValue & value) {
-                        result = "" + result + (result ? "|" : "") + enumName;
+                        result.push(enumName);
                         remainingFlags &= ~enumValue;
                     }
                 }
                 if (remainingFlags === 0) {
-                    return result;
+                    return result.join("|");
                 }
             }
             else {
@@ -2266,7 +2266,12 @@ var ts;
             return value.toString();
         }
         Debug.formatEnum = formatEnum;
+        var enumMemberCache = new ts.Map();
         function getEnumMembers(enumObject) {
+            var existing = enumMemberCache.get(enumObject);
+            if (existing) {
+                return existing;
+            }
             var result = [];
             for (var name in enumObject) {
                 var value = enumObject[name];
@@ -2274,7 +2279,9 @@ var ts;
                     result.push([value, name]);
                 }
             }
-            return ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
+            var sorted = ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
+            enumMemberCache.set(enumObject, sorted);
+            return sorted;
         }
         function formatSyntaxKind(kind) {
             return formatEnum(kind, ts.SyntaxKind, false);
@@ -28780,8 +28787,13 @@ var ts;
                 case 14:
                 case 15:
                     return true;
+                case 29:
+                case 31:
+                case 39:
+                case 40:
+                    return false;
             }
-            return !isStartOfExpression();
+            return scanner.hasPrecedingLineBreak() || isBinaryOperator() || !isStartOfExpression();
         }
         function parsePrimaryExpression() {
             switch (token()) {
@@ -37008,7 +37020,7 @@ var ts;
                 case 317:
                     return (ts.isJSDocConstructSignature(node) ? "__new" : "__call");
                 case 164:
-                    ts.Debug.assert(node.parent.kind === 317, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
+                    ts.Debug.assert(node.parent.kind === 317, "Impossible parameter parent kind", function () { return "parent is: " + ts.Debug.formatSyntaxKind(node.parent.kind) + ", expected JSDocFunctionType"; });
                     var functionType = node.parent;
                     var index = functionType.parameters.indexOf(node);
                     return "arg" + index;
@@ -89001,7 +89013,7 @@ var ts;
             return getTypeAliasDeclarationVisibilityError;
         }
         else {
-            return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.SyntaxKind[node.kind]);
+            return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.Debug.formatSyntaxKind(node.kind));
         }
         function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
             if (node.kind === 254 || node.kind === 203) {
@@ -89198,7 +89210,7 @@ var ts;
                             ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_private_name_1;
                 default:
-                    return ts.Debug.fail("Unknown parent for parameter: " + ts.SyntaxKind[node.parent.kind]);
+                    return ts.Debug.fail("Unknown parent for parameter: " + ts.Debug.formatSyntaxKind(node.parent.kind));
             }
         }
         function getTypeParameterConstraintVisibilityError() {
@@ -89902,7 +89914,7 @@ var ts;
             while (ts.length(lateMarkedStatements)) {
                 var i = lateMarkedStatements.shift();
                 if (!ts.isLateVisibilityPaintedStatement(i)) {
-                    return ts.Debug.fail("Late replaced statement was found which is not handled by the declaration transformer!: " + (ts.SyntaxKind ? ts.SyntaxKind[i.kind] : i.kind));
+                    return ts.Debug.fail("Late replaced statement was found which is not handled by the declaration transformer!: " + ts.Debug.formatSyntaxKind(i.kind));
                 }
                 var priorNeedsDeclare = needsDeclare;
                 needsDeclare = i.parent && ts.isSourceFile(i.parent) && !(ts.isExternalModule(i.parent) && isBundledEmit);
@@ -90067,7 +90079,7 @@ var ts;
                             return cleanup(input);
                         return cleanup(factory.updateImportTypeNode(input, factory.updateLiteralTypeNode(input.argument, rewriteModuleSpecifier(input, input.argument.literal)), input.assertions, input.qualifier, ts.visitNodes(input.typeArguments, visitDeclarationSubtree, ts.isTypeNode), input.isTypeOf));
                     }
-                    default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: " + ts.SyntaxKind[input.kind]);
+                    default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: " + ts.Debug.formatSyntaxKind(input.kind));
                 }
             }
             if (ts.isTupleTypeNode(input) && (ts.getLineAndCharacterOfPosition(currentSourceFile, input.pos).line === ts.getLineAndCharacterOfPosition(currentSourceFile, input.end).line)) {
@@ -90354,7 +90366,7 @@ var ts;
                     }))));
                 }
             }
-            return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: " + ts.SyntaxKind[input.kind]);
+            return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: " + ts.Debug.formatSyntaxKind(input.kind));
             function cleanup(node) {
                 if (isEnclosingDeclaration(input)) {
                     enclosingDeclaration = previousEnclosingDeclaration;

package/lib/tsserver.js CHANGED Viewed

@@ -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.20220610";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220611";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -2657,7 +2657,7 @@ var ts;
                 return members.length > 0 && members[0][0] === 0 ? members[0][1] : "0";
             }
             if (isFlags) {
-                var result = "";
+                var result = [];
                 var remainingFlags = value;
                 for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
                     var _a = members_1[_i], enumValue = _a[0], enumName = _a[1];
@@ -2665,12 +2665,12 @@ var ts;
                         break;
                     }
                     if (enumValue !== 0 && enumValue & value) {
-                        result = "" + result + (result ? "|" : "") + enumName;
+                        result.push(enumName);
                         remainingFlags &= ~enumValue;
                     }
                 }
                 if (remainingFlags === 0) {
-                    return result;
+                    return result.join("|");
                 }
             }
             else {
@@ -2684,7 +2684,15 @@ var ts;
             return value.toString();
         }
         Debug.formatEnum = formatEnum;
+        var enumMemberCache = new ts.Map();
         function getEnumMembers(enumObject) {
+            // Assuming enum objects do not change at runtime, we can cache the enum members list
+            // to reuse later. This saves us from reconstructing this each and every time we call
+            // a formatting function (which can be expensive for large enums like SyntaxKind).
+            var existing = enumMemberCache.get(enumObject);
+            if (existing) {
+                return existing;
+            }
             var result = [];
             for (var name in enumObject) {
                 var value = enumObject[name];
@@ -2692,7 +2700,9 @@ var ts;
                     result.push([value, name]);
                 }
             }
-            return ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
+            var sorted = ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
+            enumMemberCache.set(enumObject, sorted);
+            return sorted;
         }
         function formatSyntaxKind(kind) {
             return formatEnum(kind, ts.SyntaxKind, /*isFlags*/ false);
@@ -4331,6 +4341,7 @@ var ts;
         SyntaxKind[SyntaxKind["JSDocFunctionType"] = 317] = "JSDocFunctionType";
         SyntaxKind[SyntaxKind["JSDocVariadicType"] = 318] = "JSDocVariadicType";
         SyntaxKind[SyntaxKind["JSDocNamepathType"] = 319] = "JSDocNamepathType";
+        SyntaxKind[SyntaxKind["JSDoc"] = 320] = "JSDoc";
         /** @deprecated Use SyntaxKind.JSDoc */
         SyntaxKind[SyntaxKind["JSDocComment"] = 320] = "JSDocComment";
         SyntaxKind[SyntaxKind["JSDocText"] = 321] = "JSDocText";
@@ -4405,7 +4416,6 @@ var ts;
         SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 347] = "LastJSDocTagNode";
         /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 126] = "FirstContextualKeyword";
         /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 160] = "LastContextualKeyword";
-        SyntaxKind[SyntaxKind["JSDoc"] = 320] = "JSDoc";
     })(SyntaxKind = ts.SyntaxKind || (ts.SyntaxKind = {}));
     var NodeFlags;
     (function (NodeFlags) {
@@ -35783,9 +35793,18 @@ var ts;
                 case 14 /* NoSubstitutionTemplateLiteral */: // foo<T> `...`
                 case 15 /* TemplateHead */: // foo<T> `...${100}...`
                     return true;
+                // A type argument list followed by `<` never makes sense, and a type argument list followed
+                // by `>` is ambiguous with a (re-scanned) `>>` operator, so we disqualify both. Also, in
+                // this context, `+` and `-` are unary operators, not binary operators.
+                case 29 /* LessThanToken */:
+                case 31 /* GreaterThanToken */:
+                case 39 /* PlusToken */:
+                case 40 /* MinusToken */:
+                    return false;
             }
-            // Consider something a type argument list only if the following token can't start an expression.
-            return !isStartOfExpression();
+            // We favor the type argument list interpretation when it is immediately followed by
+            // a line break, a binary operator, or something that can't start an expression.
+            return scanner.hasPrecedingLineBreak() || isBinaryOperator() || !isStartOfExpression();
         }
         function parsePrimaryExpression() {
             switch (token()) {
@@ -45186,7 +45205,7 @@ var ts;
                 case 164 /* Parameter */:
                     // Parameters with names are handled at the top of this function.  Parameters
                     // without names can only come from JSDocFunctionTypes.
-                    ts.Debug.assert(node.parent.kind === 317 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
+                    ts.Debug.assert(node.parent.kind === 317 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + ts.Debug.formatSyntaxKind(node.parent.kind) + ", expected JSDocFunctionType"; });
                     var functionType = node.parent;
                     var index = functionType.parameters.indexOf(node);
                     return "arg" + index;
@@ -108446,7 +108465,7 @@ var ts;
             return getTypeAliasDeclarationVisibilityError;
         }
         else {
-            return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.SyntaxKind[node.kind]);
+            return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.Debug.formatSyntaxKind(node.kind));
         }
         function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
             if (node.kind === 254 /* VariableDeclaration */ || node.kind === 203 /* BindingElement */) {
@@ -108657,7 +108676,7 @@ var ts;
                             ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_private_name_1;
                 default:
-                    return ts.Debug.fail("Unknown parent for parameter: " + ts.SyntaxKind[node.parent.kind]);
+                    return ts.Debug.fail("Unknown parent for parameter: " + ts.Debug.formatSyntaxKind(node.parent.kind));
             }
         }
         function getTypeParameterConstraintVisibilityError() {
@@ -109423,7 +109442,7 @@ var ts;
             while (ts.length(lateMarkedStatements)) {
                 var i = lateMarkedStatements.shift();
                 if (!ts.isLateVisibilityPaintedStatement(i)) {
-                    return ts.Debug.fail("Late replaced statement was found which is not handled by the declaration transformer!: " + (ts.SyntaxKind ? ts.SyntaxKind[i.kind] : i.kind));
+                    return ts.Debug.fail("Late replaced statement was found which is not handled by the declaration transformer!: " + ts.Debug.formatSyntaxKind(i.kind));
                 }
                 var priorNeedsDeclare = needsDeclare;
                 needsDeclare = i.parent && ts.isSourceFile(i.parent) && !(ts.isExternalModule(i.parent) && isBundledEmit);
@@ -109606,7 +109625,7 @@ var ts;
                             return cleanup(input);
                         return cleanup(factory.updateImportTypeNode(input, factory.updateLiteralTypeNode(input.argument, rewriteModuleSpecifier(input, input.argument.literal)), input.assertions, input.qualifier, ts.visitNodes(input.typeArguments, visitDeclarationSubtree, ts.isTypeNode), input.isTypeOf));
                     }
-                    default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: " + ts.SyntaxKind[input.kind]);
+                    default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: " + ts.Debug.formatSyntaxKind(input.kind));
                 }
             }
             if (ts.isTupleTypeNode(input) && (ts.getLineAndCharacterOfPosition(currentSourceFile, input.pos).line === ts.getLineAndCharacterOfPosition(currentSourceFile, input.end).line)) {
@@ -109928,7 +109947,7 @@ var ts;
                 }
             }
             // Anything left unhandled is an error, so this should be unreachable
-            return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: " + ts.SyntaxKind[input.kind]);
+            return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: " + ts.Debug.formatSyntaxKind(input.kind));
             function cleanup(node) {
                 if (isEnclosingDeclaration(input)) {
                     enclosingDeclaration = previousEnclosingDeclaration;
@@ -150057,7 +150076,7 @@ var ts;
                 return {
                     indentation: indentation,
                     prefix: (insertLeadingComma ? "," : "") + this.newLineCharacter,
-                    suffix: insertTrailingComma ? "," : ""
+                    suffix: insertTrailingComma ? "," : ts.isInterfaceDeclaration(node) && isEmpty ? ";" : ""
                 };
             };
             ChangeTracker.prototype.insertNodeAfterComma = function (sourceFile, after, newNode) {
@@ -158655,7 +158674,7 @@ var ts;
                     /*questionToken*/ undefined, typeParameters, parameters, type, createStubbedMethodBody(quotePreference));
                 case 168 /* MethodSignature */:
                     return ts.factory.createMethodSignature(modifiers, name,
-                    /*questionToken*/ undefined, typeParameters, parameters, type);
+                    /*questionToken*/ undefined, typeParameters, parameters, type === undefined ? ts.factory.createKeywordTypeNode(155 /* UnknownKeyword */) : type);
                 case 256 /* FunctionDeclaration */:
                     return ts.factory.createFunctionDeclaration(modifiers, asteriskToken, name, typeParameters, parameters, type, createStubbedBody(ts.Diagnostics.Function_not_implemented.message, quotePreference));
                 default:

package/lib/tsserverlibrary.d.ts CHANGED Viewed

@@ -425,6 +425,7 @@ declare namespace ts {
         JSDocFunctionType = 317,
         JSDocVariadicType = 318,
         JSDocNamepathType = 319,
+        JSDoc = 320,
         /** @deprecated Use SyntaxKind.JSDoc */
         JSDocComment = 320,
         JSDocText = 321,
@@ -493,7 +494,6 @@ declare namespace ts {
         LastJSDocNode = 347,
         FirstJSDocTagNode = 327,
         LastJSDocTagNode = 347,
-        JSDoc = 320
     }
     export type TriviaSyntaxKind = SyntaxKind.SingleLineCommentTrivia | SyntaxKind.MultiLineCommentTrivia | SyntaxKind.NewLineTrivia | SyntaxKind.WhitespaceTrivia | SyntaxKind.ShebangTrivia | SyntaxKind.ConflictMarkerTrivia;
     export type LiteralSyntaxKind = SyntaxKind.NumericLiteral | SyntaxKind.BigIntLiteral | SyntaxKind.StringLiteral | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.RegularExpressionLiteral | SyntaxKind.NoSubstitutionTemplateLiteral;

package/lib/tsserverlibrary.js CHANGED Viewed

@@ -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.20220610";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220611";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -2851,7 +2851,7 @@ var ts;
                 return members.length > 0 && members[0][0] === 0 ? members[0][1] : "0";
             }
             if (isFlags) {
-                var result = "";
+                var result = [];
                 var remainingFlags = value;
                 for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
                     var _a = members_1[_i], enumValue = _a[0], enumName = _a[1];
@@ -2859,12 +2859,12 @@ var ts;
                         break;
                     }
                     if (enumValue !== 0 && enumValue & value) {
-                        result = "" + result + (result ? "|" : "") + enumName;
+                        result.push(enumName);
                         remainingFlags &= ~enumValue;
                     }
                 }
                 if (remainingFlags === 0) {
-                    return result;
+                    return result.join("|");
                 }
             }
             else {
@@ -2878,7 +2878,15 @@ var ts;
             return value.toString();
         }
         Debug.formatEnum = formatEnum;
+        var enumMemberCache = new ts.Map();
         function getEnumMembers(enumObject) {
+            // Assuming enum objects do not change at runtime, we can cache the enum members list
+            // to reuse later. This saves us from reconstructing this each and every time we call
+            // a formatting function (which can be expensive for large enums like SyntaxKind).
+            var existing = enumMemberCache.get(enumObject);
+            if (existing) {
+                return existing;
+            }
             var result = [];
             for (var name in enumObject) {
                 var value = enumObject[name];
@@ -2886,7 +2894,9 @@ var ts;
                     result.push([value, name]);
                 }
             }
-            return ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
+            var sorted = ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
+            enumMemberCache.set(enumObject, sorted);
+            return sorted;
         }
         function formatSyntaxKind(kind) {
             return formatEnum(kind, ts.SyntaxKind, /*isFlags*/ false);
@@ -4525,6 +4535,7 @@ var ts;
         SyntaxKind[SyntaxKind["JSDocFunctionType"] = 317] = "JSDocFunctionType";
         SyntaxKind[SyntaxKind["JSDocVariadicType"] = 318] = "JSDocVariadicType";
         SyntaxKind[SyntaxKind["JSDocNamepathType"] = 319] = "JSDocNamepathType";
+        SyntaxKind[SyntaxKind["JSDoc"] = 320] = "JSDoc";
         /** @deprecated Use SyntaxKind.JSDoc */
         SyntaxKind[SyntaxKind["JSDocComment"] = 320] = "JSDocComment";
         SyntaxKind[SyntaxKind["JSDocText"] = 321] = "JSDocText";
@@ -4599,7 +4610,6 @@ var ts;
         SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 347] = "LastJSDocTagNode";
         /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 126] = "FirstContextualKeyword";
         /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 160] = "LastContextualKeyword";
-        SyntaxKind[SyntaxKind["JSDoc"] = 320] = "JSDoc";
     })(SyntaxKind = ts.SyntaxKind || (ts.SyntaxKind = {}));
     var NodeFlags;
     (function (NodeFlags) {
@@ -35977,9 +35987,18 @@ var ts;
                 case 14 /* NoSubstitutionTemplateLiteral */: // foo<T> `...`
                 case 15 /* TemplateHead */: // foo<T> `...${100}...`
                     return true;
+                // A type argument list followed by `<` never makes sense, and a type argument list followed
+                // by `>` is ambiguous with a (re-scanned) `>>` operator, so we disqualify both. Also, in
+                // this context, `+` and `-` are unary operators, not binary operators.
+                case 29 /* LessThanToken */:
+                case 31 /* GreaterThanToken */:
+                case 39 /* PlusToken */:
+                case 40 /* MinusToken */:
+                    return false;
             }
-            // Consider something a type argument list only if the following token can't start an expression.
-            return !isStartOfExpression();
+            // We favor the type argument list interpretation when it is immediately followed by
+            // a line break, a binary operator, or something that can't start an expression.
+            return scanner.hasPrecedingLineBreak() || isBinaryOperator() || !isStartOfExpression();
         }
         function parsePrimaryExpression() {
             switch (token()) {
@@ -45380,7 +45399,7 @@ var ts;
                 case 164 /* Parameter */:
                     // Parameters with names are handled at the top of this function.  Parameters
                     // without names can only come from JSDocFunctionTypes.
-                    ts.Debug.assert(node.parent.kind === 317 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
+                    ts.Debug.assert(node.parent.kind === 317 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + ts.Debug.formatSyntaxKind(node.parent.kind) + ", expected JSDocFunctionType"; });
                     var functionType = node.parent;
                     var index = functionType.parameters.indexOf(node);
                     return "arg" + index;
@@ -108640,7 +108659,7 @@ var ts;
             return getTypeAliasDeclarationVisibilityError;
         }
         else {
-            return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.SyntaxKind[node.kind]);
+            return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.Debug.formatSyntaxKind(node.kind));
         }
         function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
             if (node.kind === 254 /* VariableDeclaration */ || node.kind === 203 /* BindingElement */) {
@@ -108851,7 +108870,7 @@ var ts;
                             ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_private_name_1;
                 default:
-                    return ts.Debug.fail("Unknown parent for parameter: " + ts.SyntaxKind[node.parent.kind]);
+                    return ts.Debug.fail("Unknown parent for parameter: " + ts.Debug.formatSyntaxKind(node.parent.kind));
             }
         }
         function getTypeParameterConstraintVisibilityError() {
@@ -109617,7 +109636,7 @@ var ts;
             while (ts.length(lateMarkedStatements)) {
                 var i = lateMarkedStatements.shift();
                 if (!ts.isLateVisibilityPaintedStatement(i)) {
-                    return ts.Debug.fail("Late replaced statement was found which is not handled by the declaration transformer!: " + (ts.SyntaxKind ? ts.SyntaxKind[i.kind] : i.kind));
+                    return ts.Debug.fail("Late replaced statement was found which is not handled by the declaration transformer!: " + ts.Debug.formatSyntaxKind(i.kind));
                 }
                 var priorNeedsDeclare = needsDeclare;
                 needsDeclare = i.parent && ts.isSourceFile(i.parent) && !(ts.isExternalModule(i.parent) && isBundledEmit);
@@ -109800,7 +109819,7 @@ var ts;
                             return cleanup(input);
                         return cleanup(factory.updateImportTypeNode(input, factory.updateLiteralTypeNode(input.argument, rewriteModuleSpecifier(input, input.argument.literal)), input.assertions, input.qualifier, ts.visitNodes(input.typeArguments, visitDeclarationSubtree, ts.isTypeNode), input.isTypeOf));
                     }
-                    default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: " + ts.SyntaxKind[input.kind]);
+                    default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: " + ts.Debug.formatSyntaxKind(input.kind));
                 }
             }
             if (ts.isTupleTypeNode(input) && (ts.getLineAndCharacterOfPosition(currentSourceFile, input.pos).line === ts.getLineAndCharacterOfPosition(currentSourceFile, input.end).line)) {
@@ -110122,7 +110141,7 @@ var ts;
                 }
             }
             // Anything left unhandled is an error, so this should be unreachable
-            return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: " + ts.SyntaxKind[input.kind]);
+            return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: " + ts.Debug.formatSyntaxKind(input.kind));
             function cleanup(node) {
                 if (isEnclosingDeclaration(input)) {
                     enclosingDeclaration = previousEnclosingDeclaration;
@@ -150670,7 +150689,7 @@ var ts;
                 return {
                     indentation: indentation,
                     prefix: (insertLeadingComma ? "," : "") + this.newLineCharacter,
-                    suffix: insertTrailingComma ? "," : ""
+                    suffix: insertTrailingComma ? "," : ts.isInterfaceDeclaration(node) && isEmpty ? ";" : ""
                 };
             };
             ChangeTracker.prototype.insertNodeAfterComma = function (sourceFile, after, newNode) {
@@ -159268,7 +159287,7 @@ var ts;
                     /*questionToken*/ undefined, typeParameters, parameters, type, createStubbedMethodBody(quotePreference));
                 case 168 /* MethodSignature */:
                     return ts.factory.createMethodSignature(modifiers, name,
-                    /*questionToken*/ undefined, typeParameters, parameters, type);
+                    /*questionToken*/ undefined, typeParameters, parameters, type === undefined ? ts.factory.createKeywordTypeNode(155 /* UnknownKeyword */) : type);
                 case 256 /* FunctionDeclaration */:
                     return ts.factory.createFunctionDeclaration(modifiers, asteriskToken, name, typeParameters, parameters, type, createStubbedBody(ts.Diagnostics.Function_not_implemented.message, quotePreference));
                 default:

package/lib/typescript.d.ts CHANGED Viewed

@@ -425,6 +425,7 @@ declare namespace ts {
         JSDocFunctionType = 317,
         JSDocVariadicType = 318,
         JSDocNamepathType = 319,
+        JSDoc = 320,
         /** @deprecated Use SyntaxKind.JSDoc */
         JSDocComment = 320,
         JSDocText = 321,
@@ -493,7 +494,6 @@ declare namespace ts {
         LastJSDocNode = 347,
         FirstJSDocTagNode = 327,
         LastJSDocTagNode = 347,
-        JSDoc = 320
     }
     export type TriviaSyntaxKind = SyntaxKind.SingleLineCommentTrivia | SyntaxKind.MultiLineCommentTrivia | SyntaxKind.NewLineTrivia | SyntaxKind.WhitespaceTrivia | SyntaxKind.ShebangTrivia | SyntaxKind.ConflictMarkerTrivia;
     export type LiteralSyntaxKind = SyntaxKind.NumericLiteral | SyntaxKind.BigIntLiteral | SyntaxKind.StringLiteral | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.RegularExpressionLiteral | SyntaxKind.NoSubstitutionTemplateLiteral;

package/lib/typescript.js CHANGED Viewed

@@ -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.20220610";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220611";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -2851,7 +2851,7 @@ var ts;
                 return members.length > 0 && members[0][0] === 0 ? members[0][1] : "0";
             }
             if (isFlags) {
-                var result = "";
+                var result = [];
                 var remainingFlags = value;
                 for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
                     var _a = members_1[_i], enumValue = _a[0], enumName = _a[1];
@@ -2859,12 +2859,12 @@ var ts;
                         break;
                     }
                     if (enumValue !== 0 && enumValue & value) {
-                        result = "" + result + (result ? "|" : "") + enumName;
+                        result.push(enumName);
                         remainingFlags &= ~enumValue;
                     }
                 }
                 if (remainingFlags === 0) {
-                    return result;
+                    return result.join("|");
                 }
             }
             else {
@@ -2878,7 +2878,15 @@ var ts;
             return value.toString();
         }
         Debug.formatEnum = formatEnum;
+        var enumMemberCache = new ts.Map();
         function getEnumMembers(enumObject) {
+            // Assuming enum objects do not change at runtime, we can cache the enum members list
+            // to reuse later. This saves us from reconstructing this each and every time we call
+            // a formatting function (which can be expensive for large enums like SyntaxKind).
+            var existing = enumMemberCache.get(enumObject);
+            if (existing) {
+                return existing;
+            }
             var result = [];
             for (var name in enumObject) {
                 var value = enumObject[name];
@@ -2886,7 +2894,9 @@ var ts;
                     result.push([value, name]);
                 }
             }
-            return ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
+            var sorted = ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
+            enumMemberCache.set(enumObject, sorted);
+            return sorted;
         }
         function formatSyntaxKind(kind) {
             return formatEnum(kind, ts.SyntaxKind, /*isFlags*/ false);
@@ -4525,6 +4535,7 @@ var ts;
         SyntaxKind[SyntaxKind["JSDocFunctionType"] = 317] = "JSDocFunctionType";
         SyntaxKind[SyntaxKind["JSDocVariadicType"] = 318] = "JSDocVariadicType";
         SyntaxKind[SyntaxKind["JSDocNamepathType"] = 319] = "JSDocNamepathType";
+        SyntaxKind[SyntaxKind["JSDoc"] = 320] = "JSDoc";
         /** @deprecated Use SyntaxKind.JSDoc */
         SyntaxKind[SyntaxKind["JSDocComment"] = 320] = "JSDocComment";
         SyntaxKind[SyntaxKind["JSDocText"] = 321] = "JSDocText";
@@ -4599,7 +4610,6 @@ var ts;
         SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 347] = "LastJSDocTagNode";
         /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 126] = "FirstContextualKeyword";
         /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 160] = "LastContextualKeyword";
-        SyntaxKind[SyntaxKind["JSDoc"] = 320] = "JSDoc";
     })(SyntaxKind = ts.SyntaxKind || (ts.SyntaxKind = {}));
     var NodeFlags;
     (function (NodeFlags) {
@@ -35977,9 +35987,18 @@ var ts;
                 case 14 /* NoSubstitutionTemplateLiteral */: // foo<T> `...`
                 case 15 /* TemplateHead */: // foo<T> `...${100}...`
                     return true;
+                // A type argument list followed by `<` never makes sense, and a type argument list followed
+                // by `>` is ambiguous with a (re-scanned) `>>` operator, so we disqualify both. Also, in
+                // this context, `+` and `-` are unary operators, not binary operators.
+                case 29 /* LessThanToken */:
+                case 31 /* GreaterThanToken */:
+                case 39 /* PlusToken */:
+                case 40 /* MinusToken */:
+                    return false;
             }
-            // Consider something a type argument list only if the following token can't start an expression.
-            return !isStartOfExpression();
+            // We favor the type argument list interpretation when it is immediately followed by
+            // a line break, a binary operator, or something that can't start an expression.
+            return scanner.hasPrecedingLineBreak() || isBinaryOperator() || !isStartOfExpression();
         }
         function parsePrimaryExpression() {
             switch (token()) {
@@ -45380,7 +45399,7 @@ var ts;
                 case 164 /* Parameter */:
                     // Parameters with names are handled at the top of this function.  Parameters
                     // without names can only come from JSDocFunctionTypes.
-                    ts.Debug.assert(node.parent.kind === 317 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
+                    ts.Debug.assert(node.parent.kind === 317 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + ts.Debug.formatSyntaxKind(node.parent.kind) + ", expected JSDocFunctionType"; });
                     var functionType = node.parent;
                     var index = functionType.parameters.indexOf(node);
                     return "arg" + index;
@@ -108640,7 +108659,7 @@ var ts;
             return getTypeAliasDeclarationVisibilityError;
         }
         else {
-            return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.SyntaxKind[node.kind]);
+            return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.Debug.formatSyntaxKind(node.kind));
         }
         function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
             if (node.kind === 254 /* VariableDeclaration */ || node.kind === 203 /* BindingElement */) {
@@ -108851,7 +108870,7 @@ var ts;
                             ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_private_name_1;
                 default:
-                    return ts.Debug.fail("Unknown parent for parameter: " + ts.SyntaxKind[node.parent.kind]);
+                    return ts.Debug.fail("Unknown parent for parameter: " + ts.Debug.formatSyntaxKind(node.parent.kind));
             }
         }
         function getTypeParameterConstraintVisibilityError() {
@@ -109617,7 +109636,7 @@ var ts;
             while (ts.length(lateMarkedStatements)) {
                 var i = lateMarkedStatements.shift();
                 if (!ts.isLateVisibilityPaintedStatement(i)) {
-                    return ts.Debug.fail("Late replaced statement was found which is not handled by the declaration transformer!: " + (ts.SyntaxKind ? ts.SyntaxKind[i.kind] : i.kind));
+                    return ts.Debug.fail("Late replaced statement was found which is not handled by the declaration transformer!: " + ts.Debug.formatSyntaxKind(i.kind));
                 }
                 var priorNeedsDeclare = needsDeclare;
                 needsDeclare = i.parent && ts.isSourceFile(i.parent) && !(ts.isExternalModule(i.parent) && isBundledEmit);
@@ -109800,7 +109819,7 @@ var ts;
                             return cleanup(input);
                         return cleanup(factory.updateImportTypeNode(input, factory.updateLiteralTypeNode(input.argument, rewriteModuleSpecifier(input, input.argument.literal)), input.assertions, input.qualifier, ts.visitNodes(input.typeArguments, visitDeclarationSubtree, ts.isTypeNode), input.isTypeOf));
                     }
-                    default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: " + ts.SyntaxKind[input.kind]);
+                    default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: " + ts.Debug.formatSyntaxKind(input.kind));
                 }
             }
             if (ts.isTupleTypeNode(input) && (ts.getLineAndCharacterOfPosition(currentSourceFile, input.pos).line === ts.getLineAndCharacterOfPosition(currentSourceFile, input.end).line)) {
@@ -110122,7 +110141,7 @@ var ts;
                 }
             }
             // Anything left unhandled is an error, so this should be unreachable
-            return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: " + ts.SyntaxKind[input.kind]);
+            return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: " + ts.Debug.formatSyntaxKind(input.kind));
             function cleanup(node) {
                 if (isEnclosingDeclaration(input)) {
                     enclosingDeclaration = previousEnclosingDeclaration;
@@ -150670,7 +150689,7 @@ var ts;
                 return {
                     indentation: indentation,
                     prefix: (insertLeadingComma ? "," : "") + this.newLineCharacter,
-                    suffix: insertTrailingComma ? "," : ""
+                    suffix: insertTrailingComma ? "," : ts.isInterfaceDeclaration(node) && isEmpty ? ";" : ""
                 };
             };
             ChangeTracker.prototype.insertNodeAfterComma = function (sourceFile, after, newNode) {
@@ -159268,7 +159287,7 @@ var ts;
                     /*questionToken*/ undefined, typeParameters, parameters, type, createStubbedMethodBody(quotePreference));
                 case 168 /* MethodSignature */:
                     return ts.factory.createMethodSignature(modifiers, name,
-                    /*questionToken*/ undefined, typeParameters, parameters, type);
+                    /*questionToken*/ undefined, typeParameters, parameters, type === undefined ? ts.factory.createKeywordTypeNode(155 /* UnknownKeyword */) : type);
                 case 256 /* FunctionDeclaration */:
                     return ts.factory.createFunctionDeclaration(modifiers, asteriskToken, name, typeParameters, parameters, type, createStubbedBody(ts.Diagnostics.Function_not_implemented.message, quotePreference));
                 default:

package/lib/typescriptServices.d.ts CHANGED Viewed

@@ -425,6 +425,7 @@ declare namespace ts {
         JSDocFunctionType = 317,
         JSDocVariadicType = 318,
         JSDocNamepathType = 319,
+        JSDoc = 320,
         /** @deprecated Use SyntaxKind.JSDoc */
         JSDocComment = 320,
         JSDocText = 321,
@@ -493,7 +494,6 @@ declare namespace ts {
         LastJSDocNode = 347,
         FirstJSDocTagNode = 327,
         LastJSDocTagNode = 347,
-        JSDoc = 320
     }
     export type TriviaSyntaxKind = SyntaxKind.SingleLineCommentTrivia | SyntaxKind.MultiLineCommentTrivia | SyntaxKind.NewLineTrivia | SyntaxKind.WhitespaceTrivia | SyntaxKind.ShebangTrivia | SyntaxKind.ConflictMarkerTrivia;
     export type LiteralSyntaxKind = SyntaxKind.NumericLiteral | SyntaxKind.BigIntLiteral | SyntaxKind.StringLiteral | SyntaxKind.JsxText | SyntaxKind.JsxTextAllWhiteSpaces | SyntaxKind.RegularExpressionLiteral | SyntaxKind.NoSubstitutionTemplateLiteral;

package/lib/typescriptServices.js CHANGED Viewed

@@ -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.20220610";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220611";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -2851,7 +2851,7 @@ var ts;
                 return members.length > 0 && members[0][0] === 0 ? members[0][1] : "0";
             }
             if (isFlags) {
-                var result = "";
+                var result = [];
                 var remainingFlags = value;
                 for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
                     var _a = members_1[_i], enumValue = _a[0], enumName = _a[1];
@@ -2859,12 +2859,12 @@ var ts;
                         break;
                     }
                     if (enumValue !== 0 && enumValue & value) {
-                        result = "" + result + (result ? "|" : "") + enumName;
+                        result.push(enumName);
                         remainingFlags &= ~enumValue;
                     }
                 }
                 if (remainingFlags === 0) {
-                    return result;
+                    return result.join("|");
                 }
             }
             else {
@@ -2878,7 +2878,15 @@ var ts;
             return value.toString();
         }
         Debug.formatEnum = formatEnum;
+        var enumMemberCache = new ts.Map();
         function getEnumMembers(enumObject) {
+            // Assuming enum objects do not change at runtime, we can cache the enum members list
+            // to reuse later. This saves us from reconstructing this each and every time we call
+            // a formatting function (which can be expensive for large enums like SyntaxKind).
+            var existing = enumMemberCache.get(enumObject);
+            if (existing) {
+                return existing;
+            }
             var result = [];
             for (var name in enumObject) {
                 var value = enumObject[name];
@@ -2886,7 +2894,9 @@ var ts;
                     result.push([value, name]);
                 }
             }
-            return ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
+            var sorted = ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
+            enumMemberCache.set(enumObject, sorted);
+            return sorted;
         }
         function formatSyntaxKind(kind) {
             return formatEnum(kind, ts.SyntaxKind, /*isFlags*/ false);
@@ -4525,6 +4535,7 @@ var ts;
         SyntaxKind[SyntaxKind["JSDocFunctionType"] = 317] = "JSDocFunctionType";
         SyntaxKind[SyntaxKind["JSDocVariadicType"] = 318] = "JSDocVariadicType";
         SyntaxKind[SyntaxKind["JSDocNamepathType"] = 319] = "JSDocNamepathType";
+        SyntaxKind[SyntaxKind["JSDoc"] = 320] = "JSDoc";
         /** @deprecated Use SyntaxKind.JSDoc */
         SyntaxKind[SyntaxKind["JSDocComment"] = 320] = "JSDocComment";
         SyntaxKind[SyntaxKind["JSDocText"] = 321] = "JSDocText";
@@ -4599,7 +4610,6 @@ var ts;
         SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 347] = "LastJSDocTagNode";
         /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 126] = "FirstContextualKeyword";
         /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 160] = "LastContextualKeyword";
-        SyntaxKind[SyntaxKind["JSDoc"] = 320] = "JSDoc";
     })(SyntaxKind = ts.SyntaxKind || (ts.SyntaxKind = {}));
     var NodeFlags;
     (function (NodeFlags) {
@@ -35977,9 +35987,18 @@ var ts;
                 case 14 /* NoSubstitutionTemplateLiteral */: // foo<T> `...`
                 case 15 /* TemplateHead */: // foo<T> `...${100}...`
                     return true;
+                // A type argument list followed by `<` never makes sense, and a type argument list followed
+                // by `>` is ambiguous with a (re-scanned) `>>` operator, so we disqualify both. Also, in
+                // this context, `+` and `-` are unary operators, not binary operators.
+                case 29 /* LessThanToken */:
+                case 31 /* GreaterThanToken */:
+                case 39 /* PlusToken */:
+                case 40 /* MinusToken */:
+                    return false;
             }
-            // Consider something a type argument list only if the following token can't start an expression.
-            return !isStartOfExpression();
+            // We favor the type argument list interpretation when it is immediately followed by
+            // a line break, a binary operator, or something that can't start an expression.
+            return scanner.hasPrecedingLineBreak() || isBinaryOperator() || !isStartOfExpression();
         }
         function parsePrimaryExpression() {
             switch (token()) {
@@ -45380,7 +45399,7 @@ var ts;
                 case 164 /* Parameter */:
                     // Parameters with names are handled at the top of this function.  Parameters
                     // without names can only come from JSDocFunctionTypes.
-                    ts.Debug.assert(node.parent.kind === 317 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
+                    ts.Debug.assert(node.parent.kind === 317 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + ts.Debug.formatSyntaxKind(node.parent.kind) + ", expected JSDocFunctionType"; });
                     var functionType = node.parent;
                     var index = functionType.parameters.indexOf(node);
                     return "arg" + index;
@@ -108640,7 +108659,7 @@ var ts;
             return getTypeAliasDeclarationVisibilityError;
         }
         else {
-            return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.SyntaxKind[node.kind]);
+            return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.Debug.formatSyntaxKind(node.kind));
         }
         function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
             if (node.kind === 254 /* VariableDeclaration */ || node.kind === 203 /* BindingElement */) {
@@ -108851,7 +108870,7 @@ var ts;
                             ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_private_name_1;
                 default:
-                    return ts.Debug.fail("Unknown parent for parameter: " + ts.SyntaxKind[node.parent.kind]);
+                    return ts.Debug.fail("Unknown parent for parameter: " + ts.Debug.formatSyntaxKind(node.parent.kind));
             }
         }
         function getTypeParameterConstraintVisibilityError() {
@@ -109617,7 +109636,7 @@ var ts;
             while (ts.length(lateMarkedStatements)) {
                 var i = lateMarkedStatements.shift();
                 if (!ts.isLateVisibilityPaintedStatement(i)) {
-                    return ts.Debug.fail("Late replaced statement was found which is not handled by the declaration transformer!: " + (ts.SyntaxKind ? ts.SyntaxKind[i.kind] : i.kind));
+                    return ts.Debug.fail("Late replaced statement was found which is not handled by the declaration transformer!: " + ts.Debug.formatSyntaxKind(i.kind));
                 }
                 var priorNeedsDeclare = needsDeclare;
                 needsDeclare = i.parent && ts.isSourceFile(i.parent) && !(ts.isExternalModule(i.parent) && isBundledEmit);
@@ -109800,7 +109819,7 @@ var ts;
                             return cleanup(input);
                         return cleanup(factory.updateImportTypeNode(input, factory.updateLiteralTypeNode(input.argument, rewriteModuleSpecifier(input, input.argument.literal)), input.assertions, input.qualifier, ts.visitNodes(input.typeArguments, visitDeclarationSubtree, ts.isTypeNode), input.isTypeOf));
                     }
-                    default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: " + ts.SyntaxKind[input.kind]);
+                    default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: " + ts.Debug.formatSyntaxKind(input.kind));
                 }
             }
             if (ts.isTupleTypeNode(input) && (ts.getLineAndCharacterOfPosition(currentSourceFile, input.pos).line === ts.getLineAndCharacterOfPosition(currentSourceFile, input.end).line)) {
@@ -110122,7 +110141,7 @@ var ts;
                 }
             }
             // Anything left unhandled is an error, so this should be unreachable
-            return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: " + ts.SyntaxKind[input.kind]);
+            return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: " + ts.Debug.formatSyntaxKind(input.kind));
             function cleanup(node) {
                 if (isEnclosingDeclaration(input)) {
                     enclosingDeclaration = previousEnclosingDeclaration;
@@ -150670,7 +150689,7 @@ var ts;
                 return {
                     indentation: indentation,
                     prefix: (insertLeadingComma ? "," : "") + this.newLineCharacter,
-                    suffix: insertTrailingComma ? "," : ""
+                    suffix: insertTrailingComma ? "," : ts.isInterfaceDeclaration(node) && isEmpty ? ";" : ""
                 };
             };
             ChangeTracker.prototype.insertNodeAfterComma = function (sourceFile, after, newNode) {
@@ -159268,7 +159287,7 @@ var ts;
                     /*questionToken*/ undefined, typeParameters, parameters, type, createStubbedMethodBody(quotePreference));
                 case 168 /* MethodSignature */:
                     return ts.factory.createMethodSignature(modifiers, name,
-                    /*questionToken*/ undefined, typeParameters, parameters, type);
+                    /*questionToken*/ undefined, typeParameters, parameters, type === undefined ? ts.factory.createKeywordTypeNode(155 /* UnknownKeyword */) : type);
                 case 256 /* FunctionDeclaration */:
                     return ts.factory.createFunctionDeclaration(modifiers, asteriskToken, name, typeParameters, parameters, type, createStubbedBody(ts.Diagnostics.Function_not_implemented.message, quotePreference));
                 default:

package/lib/typingsInstaller.js CHANGED Viewed

@@ -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.20220610";
+    ts.version = ts.versionMajorMinor + ".0-dev.20220611";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -2646,7 +2646,7 @@ var ts;
                 return members.length > 0 && members[0][0] === 0 ? members[0][1] : "0";
             }
             if (isFlags) {
-                var result = "";
+                var result = [];
                 var remainingFlags = value;
                 for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
                     var _a = members_1[_i], enumValue = _a[0], enumName = _a[1];
@@ -2654,12 +2654,12 @@ var ts;
                         break;
                     }
                     if (enumValue !== 0 && enumValue & value) {
-                        result = "" + result + (result ? "|" : "") + enumName;
+                        result.push(enumName);
                         remainingFlags &= ~enumValue;
                     }
                 }
                 if (remainingFlags === 0) {
-                    return result;
+                    return result.join("|");
                 }
             }
             else {
@@ -2673,7 +2673,15 @@ var ts;
             return value.toString();
         }
         Debug.formatEnum = formatEnum;
+        var enumMemberCache = new ts.Map();
         function getEnumMembers(enumObject) {
+            // Assuming enum objects do not change at runtime, we can cache the enum members list
+            // to reuse later. This saves us from reconstructing this each and every time we call
+            // a formatting function (which can be expensive for large enums like SyntaxKind).
+            var existing = enumMemberCache.get(enumObject);
+            if (existing) {
+                return existing;
+            }
             var result = [];
             for (var name in enumObject) {
                 var value = enumObject[name];
@@ -2681,7 +2689,9 @@ var ts;
                     result.push([value, name]);
                 }
             }
-            return ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
+            var sorted = ts.stableSort(result, function (x, y) { return ts.compareValues(x[0], y[0]); });
+            enumMemberCache.set(enumObject, sorted);
+            return sorted;
         }
         function formatSyntaxKind(kind) {
             return formatEnum(kind, ts.SyntaxKind, /*isFlags*/ false);
@@ -4320,6 +4330,7 @@ var ts;
         SyntaxKind[SyntaxKind["JSDocFunctionType"] = 317] = "JSDocFunctionType";
         SyntaxKind[SyntaxKind["JSDocVariadicType"] = 318] = "JSDocVariadicType";
         SyntaxKind[SyntaxKind["JSDocNamepathType"] = 319] = "JSDocNamepathType";
+        SyntaxKind[SyntaxKind["JSDoc"] = 320] = "JSDoc";
         /** @deprecated Use SyntaxKind.JSDoc */
         SyntaxKind[SyntaxKind["JSDocComment"] = 320] = "JSDocComment";
         SyntaxKind[SyntaxKind["JSDocText"] = 321] = "JSDocText";
@@ -4394,7 +4405,6 @@ var ts;
         SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 347] = "LastJSDocTagNode";
         /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 126] = "FirstContextualKeyword";
         /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 160] = "LastContextualKeyword";
-        SyntaxKind[SyntaxKind["JSDoc"] = 320] = "JSDoc";
     })(SyntaxKind = ts.SyntaxKind || (ts.SyntaxKind = {}));
     var NodeFlags;
     (function (NodeFlags) {
@@ -35772,9 +35782,18 @@ var ts;
                 case 14 /* NoSubstitutionTemplateLiteral */: // foo<T> `...`
                 case 15 /* TemplateHead */: // foo<T> `...${100}...`
                     return true;
+                // A type argument list followed by `<` never makes sense, and a type argument list followed
+                // by `>` is ambiguous with a (re-scanned) `>>` operator, so we disqualify both. Also, in
+                // this context, `+` and `-` are unary operators, not binary operators.
+                case 29 /* LessThanToken */:
+                case 31 /* GreaterThanToken */:
+                case 39 /* PlusToken */:
+                case 40 /* MinusToken */:
+                    return false;
             }
-            // Consider something a type argument list only if the following token can't start an expression.
-            return !isStartOfExpression();
+            // We favor the type argument list interpretation when it is immediately followed by
+            // a line break, a binary operator, or something that can't start an expression.
+            return scanner.hasPrecedingLineBreak() || isBinaryOperator() || !isStartOfExpression();
         }
         function parsePrimaryExpression() {
             switch (token()) {
@@ -45175,7 +45194,7 @@ var ts;
                 case 164 /* Parameter */:
                     // Parameters with names are handled at the top of this function.  Parameters
                     // without names can only come from JSDocFunctionTypes.
-                    ts.Debug.assert(node.parent.kind === 317 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + (ts.SyntaxKind ? ts.SyntaxKind[node.parent.kind] : node.parent.kind) + ", expected JSDocFunctionType"; });
+                    ts.Debug.assert(node.parent.kind === 317 /* JSDocFunctionType */, "Impossible parameter parent kind", function () { return "parent is: " + ts.Debug.formatSyntaxKind(node.parent.kind) + ", expected JSDocFunctionType"; });
                     var functionType = node.parent;
                     var index = functionType.parameters.indexOf(node);
                     return "arg" + index;
@@ -108435,7 +108454,7 @@ var ts;
             return getTypeAliasDeclarationVisibilityError;
         }
         else {
-            return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.SyntaxKind[node.kind]);
+            return ts.Debug.assertNever(node, "Attempted to set a declaration diagnostic context for unhandled node kind: " + ts.Debug.formatSyntaxKind(node.kind));
         }
         function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
             if (node.kind === 254 /* VariableDeclaration */ || node.kind === 203 /* BindingElement */) {
@@ -108646,7 +108665,7 @@ var ts;
                             ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_name_1_from_private_module_2 :
                         ts.Diagnostics.Parameter_0_of_accessor_has_or_is_using_private_name_1;
                 default:
-                    return ts.Debug.fail("Unknown parent for parameter: " + ts.SyntaxKind[node.parent.kind]);
+                    return ts.Debug.fail("Unknown parent for parameter: " + ts.Debug.formatSyntaxKind(node.parent.kind));
             }
         }
         function getTypeParameterConstraintVisibilityError() {
@@ -109412,7 +109431,7 @@ var ts;
             while (ts.length(lateMarkedStatements)) {
                 var i = lateMarkedStatements.shift();
                 if (!ts.isLateVisibilityPaintedStatement(i)) {
-                    return ts.Debug.fail("Late replaced statement was found which is not handled by the declaration transformer!: " + (ts.SyntaxKind ? ts.SyntaxKind[i.kind] : i.kind));
+                    return ts.Debug.fail("Late replaced statement was found which is not handled by the declaration transformer!: " + ts.Debug.formatSyntaxKind(i.kind));
                 }
                 var priorNeedsDeclare = needsDeclare;
                 needsDeclare = i.parent && ts.isSourceFile(i.parent) && !(ts.isExternalModule(i.parent) && isBundledEmit);
@@ -109595,7 +109614,7 @@ var ts;
                             return cleanup(input);
                         return cleanup(factory.updateImportTypeNode(input, factory.updateLiteralTypeNode(input.argument, rewriteModuleSpecifier(input, input.argument.literal)), input.assertions, input.qualifier, ts.visitNodes(input.typeArguments, visitDeclarationSubtree, ts.isTypeNode), input.isTypeOf));
                     }
-                    default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: " + ts.SyntaxKind[input.kind]);
+                    default: ts.Debug.assertNever(input, "Attempted to process unhandled node kind: " + ts.Debug.formatSyntaxKind(input.kind));
                 }
             }
             if (ts.isTupleTypeNode(input) && (ts.getLineAndCharacterOfPosition(currentSourceFile, input.pos).line === ts.getLineAndCharacterOfPosition(currentSourceFile, input.end).line)) {
@@ -109917,7 +109936,7 @@ var ts;
                 }
             }
             // Anything left unhandled is an error, so this should be unreachable
-            return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: " + ts.SyntaxKind[input.kind]);
+            return ts.Debug.assertNever(input, "Unhandled top-level node in declaration emit: " + ts.Debug.formatSyntaxKind(input.kind));
             function cleanup(node) {
                 if (isEnclosingDeclaration(input)) {
                     enclosingDeclaration = previousEnclosingDeclaration;

package/package.json CHANGED Viewed

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