@typescript-deploys/pr-build 4.6.0-pr-47548-5 → 4.6.0-pr-47550-8

package/lib/lib.es5.d.ts

@@ -1625,11 +1625,6 @@ type Uncapitalize<S extends string> = intrinsic;
  */
 interface ThisType<T> { }
 
-/**
- * Marker for yield expressions return types
- */
-interface YieldType<T> { }
-
 /**
  * Represents a raw buffer of binary data, which is used to store data for the
  * different typed arrays. ArrayBuffers cannot be read from or written to directly,

package/lib/tsc.js

@@ -72,12 +72,18 @@ var ts;
     ts.version = ts.versionMajorMinor + ".0-insiders.20220124";
     var NativeCollections;
     (function (NativeCollections) {
+        var globals = typeof globalThis !== "undefined" ? globalThis :
+            typeof global !== "undefined" ? global :
+                typeof self !== "undefined" ? self :
+                    undefined;
         function tryGetNativeMap() {
-            return typeof Map !== "undefined" && "entries" in Map.prototype && new Map([[0, 0]]).size === 1 ? Map : undefined;
+            var gMap = globals === null || globals === void 0 ? void 0 : globals.Map;
+            return typeof gMap !== "undefined" && "entries" in gMap.prototype && new gMap([[0, 0]]).size === 1 ? gMap : undefined;
         }
         NativeCollections.tryGetNativeMap = tryGetNativeMap;
         function tryGetNativeSet() {
-            return typeof Set !== "undefined" && "entries" in Set.prototype && new Set([0]).size === 1 ? Set : undefined;
+            var gSet = globals === null || globals === void 0 ? void 0 : globals.Set;
+            return typeof gSet !== "undefined" && "entries" in gSet.prototype && new gSet([0]).size === 1 ? gSet : undefined;
         }
         NativeCollections.tryGetNativeSet = tryGetNativeSet;
     })(NativeCollections || (NativeCollections = {}));
@@ -26926,18 +26932,18 @@ var ts;
         function parseInitializer() {
             return parseOptional(63) ? parseAssignmentExpressionOrHigher() : undefined;
         }
-        function parseAssignmentExpressionOrHigher() {
+        function parseAssignmentExpressionOrHigher(parsingConditionalExpression) {
             if (isYieldExpression()) {
                 return parseYieldExpression();
             }
-            var arrowExpression = tryParseParenthesizedArrowFunctionExpression() || tryParseAsyncSimpleArrowFunctionExpression();
+            var arrowExpression = tryParseParenthesizedArrowFunctionExpression(parsingConditionalExpression) || tryParseAsyncSimpleArrowFunctionExpression();
             if (arrowExpression) {
                 return arrowExpression;
             }
             var pos = getNodePos();
             var expr = parseBinaryExpressionOrHigher(0);
             if (expr.kind === 79 && token() === 38) {
-                return parseSimpleArrowFunctionExpression(pos, expr, undefined);
+                return parseSimpleArrowFunctionExpression(pos, expr, undefined, parsingConditionalExpression);
             }
             if (ts.isLeftHandSideExpression(expr) && ts.isAssignmentOperator(reScanGreaterToken())) {
                 return makeBinaryExpression(expr, parseTokenNode(), parseAssignmentExpressionOrHigher(), pos);
@@ -26968,24 +26974,24 @@ var ts;
                 return finishNode(factory.createYieldExpression(undefined, undefined), pos);
             }
         }
-        function parseSimpleArrowFunctionExpression(pos, identifier, asyncModifier) {
+        function parseSimpleArrowFunctionExpression(pos, identifier, asyncModifier, parsingConditionalExpression) {
             ts.Debug.assert(token() === 38, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
             var parameter = factory.createParameterDeclaration(undefined, undefined, undefined, identifier, undefined, undefined, undefined);
             finishNode(parameter, identifier.pos);
             var parameters = createNodeArray([parameter], parameter.pos, parameter.end);
             var equalsGreaterThanToken = parseExpectedToken(38);
-            var body = parseArrowFunctionExpressionBody(!!asyncModifier);
+            var body = parseArrowFunctionExpressionBody(!!asyncModifier, parsingConditionalExpression);
             var node = factory.createArrowFunction(asyncModifier, undefined, parameters, undefined, equalsGreaterThanToken, body);
             return addJSDocComment(finishNode(node, pos));
         }
-        function tryParseParenthesizedArrowFunctionExpression() {
+        function tryParseParenthesizedArrowFunctionExpression(parsingConditionalExpression) {
             var triState = isParenthesizedArrowFunctionExpression();
             if (triState === 0) {
                 return undefined;
             }
             return triState === 1 ?
-                parseParenthesizedArrowFunctionExpression(true) :
-                tryParse(parsePossibleParenthesizedArrowFunctionExpression);
+                parseParenthesizedArrowFunctionExpression(true, parsingConditionalExpression) :
+                tryParse(function () { return parsePossibleParenthesizedArrowFunctionExpression(parsingConditionalExpression); });
         }
         function isParenthesizedArrowFunctionExpression() {
             if (token() === 20 || token() === 29 || token() === 131) {
@@ -27079,24 +27085,24 @@ var ts;
                 return 2;
             }
         }
-        function parsePossibleParenthesizedArrowFunctionExpression() {
+        function parsePossibleParenthesizedArrowFunctionExpression(parsingConditionalExpression) {
             var tokenPos = scanner.getTokenPos();
             if (notParenthesizedArrow === null || notParenthesizedArrow === void 0 ? void 0 : notParenthesizedArrow.has(tokenPos)) {
                 return undefined;
             }
-            var result = parseParenthesizedArrowFunctionExpression(false);
+            var result = parseParenthesizedArrowFunctionExpression(false, parsingConditionalExpression);
             if (!result) {
                 (notParenthesizedArrow || (notParenthesizedArrow = new ts.Set())).add(tokenPos);
             }
             return result;
         }
-        function tryParseAsyncSimpleArrowFunctionExpression() {
+        function tryParseAsyncSimpleArrowFunctionExpression(parsingConditionalExpression) {
             if (token() === 131) {
                 if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1) {
                     var pos = getNodePos();
                     var asyncModifier = parseModifiersForArrowFunction();
                     var expr = parseBinaryExpressionOrHigher(0);
-                    return parseSimpleArrowFunctionExpression(pos, expr, asyncModifier);
+                    return parseSimpleArrowFunctionExpression(pos, expr, asyncModifier, parsingConditionalExpression);
                 }
             }
             return undefined;
@@ -27114,7 +27120,7 @@ var ts;
             }
             return 0;
         }
-        function parseParenthesizedArrowFunctionExpression(allowAmbiguity) {
+        function parseParenthesizedArrowFunctionExpression(allowAmbiguity, parsingConditionalExpression) {
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             var modifiers = parseModifiersForArrowFunction();
@@ -27133,6 +27139,10 @@ var ts;
                     return undefined;
                 }
             }
+            if (parsingConditionalExpression && token() === 58) {
+                ts.Debug.assert(!allowAmbiguity);
+                return undefined;
+            }
             var type = parseReturnType(58, false);
             if (type && !allowAmbiguity && typeHasArrowFunctionBlockingParseError(type)) {
                 return undefined;
@@ -27153,7 +27163,7 @@ var ts;
             var node = factory.createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body);
             return withJSDoc(finishNode(node, pos), hasJSDoc);
         }
-        function parseArrowFunctionExpressionBody(isAsync) {
+        function parseArrowFunctionExpressionBody(isAsync, parsingConditionalExpression) {
             if (token() === 18) {
                 return parseFunctionBlock(isAsync ? 2 : 0);
             }
@@ -27167,8 +27177,8 @@ var ts;
             var savedTopLevel = topLevel;
             topLevel = false;
             var node = isAsync
-                ? doInAwaitContext(parseAssignmentExpressionOrHigher)
-                : doOutsideOfAwaitContext(parseAssignmentExpressionOrHigher);
+                ? doInAwaitContext(function () { return parseAssignmentExpressionOrHigher(parsingConditionalExpression); })
+                : doOutsideOfAwaitContext(function () { return parseAssignmentExpressionOrHigher(parsingConditionalExpression); });
             topLevel = savedTopLevel;
             return node;
         }
@@ -27178,8 +27188,8 @@ var ts;
                 return leftOperand;
             }
             var colonToken;
-            return finishNode(factory.createConditionalExpression(leftOperand, questionToken, doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher), colonToken = parseExpectedToken(58), ts.nodeIsPresent(colonToken)
-                ? parseAssignmentExpressionOrHigher()
+            return finishNode(factory.createConditionalExpression(leftOperand, questionToken, doOutsideOfContext(disallowInAndDecoratorContext, function () { return parseAssignmentExpressionOrHigher(true); }), colonToken = parseExpectedToken(58), ts.nodeIsPresent(colonToken)
+                ? parseAssignmentExpressionOrHigher(true)
                 : createMissingNode(79, false, ts.Diagnostics._0_expected, ts.tokenToString(58))), pos);
         }
         function parseBinaryExpressionOrHigher(precedence) {
@@ -38903,7 +38913,6 @@ var ts;
         var globalBooleanType;
         var globalRegExpType;
         var globalThisType;
-        var globalYieldType;
         var anyArrayType;
         var autoArrayType;
         var anyReadonlyArrayType;
@@ -58927,14 +58936,6 @@ var ts;
                 return t.flags & 2097152 ? ts.forEach(t.types, getThisTypeArgument) : getThisTypeArgument(t);
             });
         }
-        function getYieldTypeArgument(type) {
-            return ts.getObjectFlags(type) & 4 && type.target === globalYieldType ? getTypeArguments(type)[0] : undefined;
-        }
-        function getYieldTypeFromContextualType(type) {
-            return mapType(type, function (t) {
-                return t.flags & 2097152 ? ts.forEach(t.types, getYieldTypeArgument) : getYieldTypeArgument(t);
-            });
-        }
         function getContextualThisParameterType(func) {
             if (func.kind === 213) {
                 return undefined;
@@ -64945,10 +64946,6 @@ var ts;
                 return getIterationTypeOfIterable(use, 1, yieldExpressionType, node.expression)
                     || anyType;
             }
-            var suggestedReturnType = yieldedType && getYieldTypeFromContextualType(yieldedType);
-            if (suggestedReturnType) {
-                return suggestedReturnType;
-            }
             else if (returnType) {
                 return getIterationTypeOfGeneratorFunctionReturnType(2, returnType, isAsync)
                     || anyType;
@@ -71740,7 +71737,6 @@ var ts;
             globalReadonlyArrayType = getGlobalTypeOrUndefined("ReadonlyArray", 1) || globalArrayType;
             anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
             globalThisType = getGlobalTypeOrUndefined("ThisType", 1);
-            globalYieldType = getGlobalTypeOrUndefined("YieldType", 1);
             if (augmentations) {
                 for (var _h = 0, augmentations_2 = augmentations; _h < augmentations_2.length; _h++) {
                     var list = augmentations_2[_h];

package/lib/tsserver.js

@@ -111,13 +111,18 @@ var ts;
     /* @internal */
     var NativeCollections;
     (function (NativeCollections) {
+        var globals = typeof globalThis !== "undefined" ? globalThis :
+            typeof global !== "undefined" ? global :
+                typeof self !== "undefined" ? self :
+                    undefined;
         /**
          * Returns the native Map implementation if it is available and compatible (i.e. supports iteration).
          */
         function tryGetNativeMap() {
             // Internet Explorer's Map doesn't support iteration, so don't use it.
+            var gMap = globals === null || globals === void 0 ? void 0 : globals.Map;
             // eslint-disable-next-line no-in-operator
-            return typeof Map !== "undefined" && "entries" in Map.prototype && new Map([[0, 0]]).size === 1 ? Map : undefined;
+            return typeof gMap !== "undefined" && "entries" in gMap.prototype && new gMap([[0, 0]]).size === 1 ? gMap : undefined;
         }
         NativeCollections.tryGetNativeMap = tryGetNativeMap;
         /**
@@ -125,8 +130,9 @@ var ts;
          */
         function tryGetNativeSet() {
             // Internet Explorer's Set doesn't support iteration, so don't use it.
+            var gSet = globals === null || globals === void 0 ? void 0 : globals.Set;
             // eslint-disable-next-line no-in-operator
-            return typeof Set !== "undefined" && "entries" in Set.prototype && new Set([0]).size === 1 ? Set : undefined;
+            return typeof gSet !== "undefined" && "entries" in gSet.prototype && new gSet([0]).size === 1 ? gSet : undefined;
         }
         NativeCollections.tryGetNativeSet = tryGetNativeSet;
     })(NativeCollections || (NativeCollections = {}));
@@ -33366,7 +33372,7 @@ var ts;
         function parseInitializer() {
             return parseOptional(63 /* EqualsToken */) ? parseAssignmentExpressionOrHigher() : undefined;
         }
-        function parseAssignmentExpressionOrHigher() {
+        function parseAssignmentExpressionOrHigher(parsingConditionalExpression) {
             //  AssignmentExpression[in,yield]:
             //      1) ConditionalExpression[?in,?yield]
             //      2) LeftHandSideExpression = AssignmentExpression[?in,?yield]
@@ -33392,7 +33398,7 @@ var ts;
             // If we do successfully parse arrow-function, we must *not* recurse for productions 1, 2 or 3. An ArrowFunction is
             // not a LeftHandSideExpression, nor does it start a ConditionalExpression.  So we are done
             // with AssignmentExpression if we see one.
-            var arrowExpression = tryParseParenthesizedArrowFunctionExpression() || tryParseAsyncSimpleArrowFunctionExpression();
+            var arrowExpression = tryParseParenthesizedArrowFunctionExpression(parsingConditionalExpression) || tryParseAsyncSimpleArrowFunctionExpression();
             if (arrowExpression) {
                 return arrowExpression;
             }
@@ -33411,7 +33417,7 @@ var ts;
             // parameter ('x => ...') above. We handle it here by checking if the parsed expression was a single
             // identifier and the current token is an arrow.
             if (expr.kind === 79 /* Identifier */ && token() === 38 /* EqualsGreaterThanToken */) {
-                return parseSimpleArrowFunctionExpression(pos, expr, /*asyncModifier*/ undefined);
+                return parseSimpleArrowFunctionExpression(pos, expr, /*asyncModifier*/ undefined, parsingConditionalExpression);
             }
             // Now see if we might be in cases '2' or '3'.
             // If the expression was a LHS expression, and we have an assignment operator, then
@@ -33471,7 +33477,7 @@ var ts;
                 return finishNode(factory.createYieldExpression(/*asteriskToken*/ undefined, /*expression*/ undefined), pos);
             }
         }
-        function parseSimpleArrowFunctionExpression(pos, identifier, asyncModifier) {
+        function parseSimpleArrowFunctionExpression(pos, identifier, asyncModifier, parsingConditionalExpression) {
             ts.Debug.assert(token() === 38 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
             var parameter = factory.createParameterDeclaration(
             /*decorators*/ undefined, 
@@ -33483,11 +33489,11 @@ var ts;
             finishNode(parameter, identifier.pos);
             var parameters = createNodeArray([parameter], parameter.pos, parameter.end);
             var equalsGreaterThanToken = parseExpectedToken(38 /* EqualsGreaterThanToken */);
-            var body = parseArrowFunctionExpressionBody(/*isAsync*/ !!asyncModifier);
+            var body = parseArrowFunctionExpressionBody(/*isAsync*/ !!asyncModifier, parsingConditionalExpression);
             var node = factory.createArrowFunction(asyncModifier, /*typeParameters*/ undefined, parameters, /*type*/ undefined, equalsGreaterThanToken, body);
             return addJSDocComment(finishNode(node, pos));
         }
-        function tryParseParenthesizedArrowFunctionExpression() {
+        function tryParseParenthesizedArrowFunctionExpression(parsingConditionalExpression) {
             var triState = isParenthesizedArrowFunctionExpression();
             if (triState === 0 /* False */) {
                 // It's definitely not a parenthesized arrow function expression.
@@ -33498,8 +33504,8 @@ var ts;
             // it out, but don't allow any ambiguity, and return 'undefined' if this could be an
             // expression instead.
             return triState === 1 /* True */ ?
-                parseParenthesizedArrowFunctionExpression(/*allowAmbiguity*/ true) :
-                tryParse(parsePossibleParenthesizedArrowFunctionExpression);
+                parseParenthesizedArrowFunctionExpression(/*allowAmbiguity*/ true, parsingConditionalExpression) :
+                tryParse(function () { return parsePossibleParenthesizedArrowFunctionExpression(parsingConditionalExpression); });
         }
         //  True        -> We definitely expect a parenthesized arrow function here.
         //  False       -> There *cannot* be a parenthesized arrow function here.
@@ -33629,25 +33635,25 @@ var ts;
                 return 2 /* Unknown */;
             }
         }
-        function parsePossibleParenthesizedArrowFunctionExpression() {
+        function parsePossibleParenthesizedArrowFunctionExpression(parsingConditionalExpression) {
             var tokenPos = scanner.getTokenPos();
             if (notParenthesizedArrow === null || notParenthesizedArrow === void 0 ? void 0 : notParenthesizedArrow.has(tokenPos)) {
                 return undefined;
             }
-            var result = parseParenthesizedArrowFunctionExpression(/*allowAmbiguity*/ false);
+            var result = parseParenthesizedArrowFunctionExpression(/*allowAmbiguity*/ false, parsingConditionalExpression);
             if (!result) {
                 (notParenthesizedArrow || (notParenthesizedArrow = new ts.Set())).add(tokenPos);
             }
             return result;
         }
-        function tryParseAsyncSimpleArrowFunctionExpression() {
+        function tryParseAsyncSimpleArrowFunctionExpression(parsingConditionalExpression) {
             // We do a check here so that we won't be doing unnecessarily call to "lookAhead"
             if (token() === 131 /* AsyncKeyword */) {
                 if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1 /* True */) {
                     var pos = getNodePos();
                     var asyncModifier = parseModifiersForArrowFunction();
                     var expr = parseBinaryExpressionOrHigher(0 /* Lowest */);
-                    return parseSimpleArrowFunctionExpression(pos, expr, asyncModifier);
+                    return parseSimpleArrowFunctionExpression(pos, expr, asyncModifier, parsingConditionalExpression);
                 }
             }
             return undefined;
@@ -33671,7 +33677,7 @@ var ts;
             }
             return 0 /* False */;
         }
-        function parseParenthesizedArrowFunctionExpression(allowAmbiguity) {
+        function parseParenthesizedArrowFunctionExpression(allowAmbiguity, parsingConditionalExpression) {
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             var modifiers = parseModifiersForArrowFunction();
@@ -33697,6 +33703,20 @@ var ts;
                     return undefined;
                 }
             }
+            // Given:
+            //     x ? y => ({ y }) : z => ({ z })
+            // We try to parse the body of the first arrow function by looking at:
+            //     ({ y }) : z => ({ z })
+            // This is a valid arrow function with "z" as the return type.
+            //
+            // But, if we're in the true side of a conditional expression, this colon
+            // terminates the true side, so cannot be the return type. If we are in the
+            // false side, we may still be within the true side of a parent conditional
+            // expression, so don't allow it to be a return type either.
+            if (parsingConditionalExpression && token() === 58 /* ColonToken */) {
+                ts.Debug.assert(!allowAmbiguity);
+                return undefined;
+            }
             var type = parseReturnType(58 /* ColonToken */, /*isType*/ false);
             if (type && !allowAmbiguity && typeHasArrowFunctionBlockingParseError(type)) {
                 return undefined;
@@ -33730,7 +33750,7 @@ var ts;
             var node = factory.createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body);
             return withJSDoc(finishNode(node, pos), hasJSDoc);
         }
-        function parseArrowFunctionExpressionBody(isAsync) {
+        function parseArrowFunctionExpressionBody(isAsync, parsingConditionalExpression) {
             if (token() === 18 /* OpenBraceToken */) {
                 return parseFunctionBlock(isAsync ? 2 /* Await */ : 0 /* None */);
             }
@@ -33758,8 +33778,8 @@ var ts;
             var savedTopLevel = topLevel;
             topLevel = false;
             var node = isAsync
-                ? doInAwaitContext(parseAssignmentExpressionOrHigher)
-                : doOutsideOfAwaitContext(parseAssignmentExpressionOrHigher);
+                ? doInAwaitContext(function () { return parseAssignmentExpressionOrHigher(parsingConditionalExpression); })
+                : doOutsideOfAwaitContext(function () { return parseAssignmentExpressionOrHigher(parsingConditionalExpression); });
             topLevel = savedTopLevel;
             return node;
         }
@@ -33772,8 +33792,8 @@ var ts;
             // Note: we explicitly 'allowIn' in the whenTrue part of the condition expression, and
             // we do not that for the 'whenFalse' part.
             var colonToken;
-            return finishNode(factory.createConditionalExpression(leftOperand, questionToken, doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher), colonToken = parseExpectedToken(58 /* ColonToken */), ts.nodeIsPresent(colonToken)
-                ? parseAssignmentExpressionOrHigher()
+            return finishNode(factory.createConditionalExpression(leftOperand, questionToken, doOutsideOfContext(disallowInAndDecoratorContext, function () { return parseAssignmentExpressionOrHigher(/*parsingConditionalExpression*/ true); }), colonToken = parseExpectedToken(58 /* ColonToken */), ts.nodeIsPresent(colonToken)
+                ? parseAssignmentExpressionOrHigher(/*parsingConditionalExpression*/ true)
                 : createMissingNode(79 /* Identifier */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(58 /* ColonToken */))), pos);
         }
         function parseBinaryExpressionOrHigher(precedence) {
@@ -47507,7 +47527,6 @@ var ts;
         var globalBooleanType;
         var globalRegExpType;
         var globalThisType;
-        var globalYieldType;
         var anyArrayType;
         var autoArrayType;
         var anyReadonlyArrayType;
@@ -70600,14 +70619,6 @@ var ts;
                 return t.flags & 2097152 /* Intersection */ ? ts.forEach(t.types, getThisTypeArgument) : getThisTypeArgument(t);
             });
         }
-        function getYieldTypeArgument(type) {
-            return ts.getObjectFlags(type) & 4 /* Reference */ && type.target === globalYieldType ? getTypeArguments(type)[0] : undefined;
-        }
-        function getYieldTypeFromContextualType(type) {
-            return mapType(type, function (t) {
-                return t.flags & 2097152 /* Intersection */ ? ts.forEach(t.types, getYieldTypeArgument) : getYieldTypeArgument(t);
-            });
-        }
         function getContextualThisParameterType(func) {
             if (func.kind === 213 /* ArrowFunction */) {
                 return undefined;
@@ -77551,10 +77562,6 @@ var ts;
                 return getIterationTypeOfIterable(use, 1 /* Return */, yieldExpressionType, node.expression)
                     || anyType;
             }
-            var suggestedReturnType = yieldedType && getYieldTypeFromContextualType(yieldedType);
-            if (suggestedReturnType) {
-                return suggestedReturnType;
-            }
             else if (returnType) {
                 return getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, isAsync)
                     || anyType;
@@ -85493,7 +85500,6 @@ var ts;
             globalReadonlyArrayType = getGlobalTypeOrUndefined("ReadonlyArray", /*arity*/ 1) || globalArrayType;
             anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
             globalThisType = getGlobalTypeOrUndefined("ThisType", /*arity*/ 1);
-            globalYieldType = getGlobalTypeOrUndefined("YieldType", /*arity*/ 1);
             if (augmentations) {
                 // merge _nonglobal_ module augmentations.
                 // this needs to be done after global symbol table is initialized to make sure that all ambient modules are indexed

package/lib/tsserverlibrary.js

@@ -305,13 +305,18 @@ var ts;
     /* @internal */
     var NativeCollections;
     (function (NativeCollections) {
+        var globals = typeof globalThis !== "undefined" ? globalThis :
+            typeof global !== "undefined" ? global :
+                typeof self !== "undefined" ? self :
+                    undefined;
         /**
          * Returns the native Map implementation if it is available and compatible (i.e. supports iteration).
          */
         function tryGetNativeMap() {
             // Internet Explorer's Map doesn't support iteration, so don't use it.
+            var gMap = globals === null || globals === void 0 ? void 0 : globals.Map;
             // eslint-disable-next-line no-in-operator
-            return typeof Map !== "undefined" && "entries" in Map.prototype && new Map([[0, 0]]).size === 1 ? Map : undefined;
+            return typeof gMap !== "undefined" && "entries" in gMap.prototype && new gMap([[0, 0]]).size === 1 ? gMap : undefined;
         }
         NativeCollections.tryGetNativeMap = tryGetNativeMap;
         /**
@@ -319,8 +324,9 @@ var ts;
          */
         function tryGetNativeSet() {
             // Internet Explorer's Set doesn't support iteration, so don't use it.
+            var gSet = globals === null || globals === void 0 ? void 0 : globals.Set;
             // eslint-disable-next-line no-in-operator
-            return typeof Set !== "undefined" && "entries" in Set.prototype && new Set([0]).size === 1 ? Set : undefined;
+            return typeof gSet !== "undefined" && "entries" in gSet.prototype && new gSet([0]).size === 1 ? gSet : undefined;
         }
         NativeCollections.tryGetNativeSet = tryGetNativeSet;
     })(NativeCollections || (NativeCollections = {}));
@@ -33560,7 +33566,7 @@ var ts;
         function parseInitializer() {
             return parseOptional(63 /* EqualsToken */) ? parseAssignmentExpressionOrHigher() : undefined;
         }
-        function parseAssignmentExpressionOrHigher() {
+        function parseAssignmentExpressionOrHigher(parsingConditionalExpression) {
             //  AssignmentExpression[in,yield]:
             //      1) ConditionalExpression[?in,?yield]
             //      2) LeftHandSideExpression = AssignmentExpression[?in,?yield]
@@ -33586,7 +33592,7 @@ var ts;
             // If we do successfully parse arrow-function, we must *not* recurse for productions 1, 2 or 3. An ArrowFunction is
             // not a LeftHandSideExpression, nor does it start a ConditionalExpression.  So we are done
             // with AssignmentExpression if we see one.
-            var arrowExpression = tryParseParenthesizedArrowFunctionExpression() || tryParseAsyncSimpleArrowFunctionExpression();
+            var arrowExpression = tryParseParenthesizedArrowFunctionExpression(parsingConditionalExpression) || tryParseAsyncSimpleArrowFunctionExpression();
             if (arrowExpression) {
                 return arrowExpression;
             }
@@ -33605,7 +33611,7 @@ var ts;
             // parameter ('x => ...') above. We handle it here by checking if the parsed expression was a single
             // identifier and the current token is an arrow.
             if (expr.kind === 79 /* Identifier */ && token() === 38 /* EqualsGreaterThanToken */) {
-                return parseSimpleArrowFunctionExpression(pos, expr, /*asyncModifier*/ undefined);
+                return parseSimpleArrowFunctionExpression(pos, expr, /*asyncModifier*/ undefined, parsingConditionalExpression);
             }
             // Now see if we might be in cases '2' or '3'.
             // If the expression was a LHS expression, and we have an assignment operator, then
@@ -33665,7 +33671,7 @@ var ts;
                 return finishNode(factory.createYieldExpression(/*asteriskToken*/ undefined, /*expression*/ undefined), pos);
             }
         }
-        function parseSimpleArrowFunctionExpression(pos, identifier, asyncModifier) {
+        function parseSimpleArrowFunctionExpression(pos, identifier, asyncModifier, parsingConditionalExpression) {
             ts.Debug.assert(token() === 38 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
             var parameter = factory.createParameterDeclaration(
             /*decorators*/ undefined, 
@@ -33677,11 +33683,11 @@ var ts;
             finishNode(parameter, identifier.pos);
             var parameters = createNodeArray([parameter], parameter.pos, parameter.end);
             var equalsGreaterThanToken = parseExpectedToken(38 /* EqualsGreaterThanToken */);
-            var body = parseArrowFunctionExpressionBody(/*isAsync*/ !!asyncModifier);
+            var body = parseArrowFunctionExpressionBody(/*isAsync*/ !!asyncModifier, parsingConditionalExpression);
             var node = factory.createArrowFunction(asyncModifier, /*typeParameters*/ undefined, parameters, /*type*/ undefined, equalsGreaterThanToken, body);
             return addJSDocComment(finishNode(node, pos));
         }
-        function tryParseParenthesizedArrowFunctionExpression() {
+        function tryParseParenthesizedArrowFunctionExpression(parsingConditionalExpression) {
             var triState = isParenthesizedArrowFunctionExpression();
             if (triState === 0 /* False */) {
                 // It's definitely not a parenthesized arrow function expression.
@@ -33692,8 +33698,8 @@ var ts;
             // it out, but don't allow any ambiguity, and return 'undefined' if this could be an
             // expression instead.
             return triState === 1 /* True */ ?
-                parseParenthesizedArrowFunctionExpression(/*allowAmbiguity*/ true) :
-                tryParse(parsePossibleParenthesizedArrowFunctionExpression);
+                parseParenthesizedArrowFunctionExpression(/*allowAmbiguity*/ true, parsingConditionalExpression) :
+                tryParse(function () { return parsePossibleParenthesizedArrowFunctionExpression(parsingConditionalExpression); });
         }
         //  True        -> We definitely expect a parenthesized arrow function here.
         //  False       -> There *cannot* be a parenthesized arrow function here.
@@ -33823,25 +33829,25 @@ var ts;
                 return 2 /* Unknown */;
             }
         }
-        function parsePossibleParenthesizedArrowFunctionExpression() {
+        function parsePossibleParenthesizedArrowFunctionExpression(parsingConditionalExpression) {
             var tokenPos = scanner.getTokenPos();
             if (notParenthesizedArrow === null || notParenthesizedArrow === void 0 ? void 0 : notParenthesizedArrow.has(tokenPos)) {
                 return undefined;
             }
-            var result = parseParenthesizedArrowFunctionExpression(/*allowAmbiguity*/ false);
+            var result = parseParenthesizedArrowFunctionExpression(/*allowAmbiguity*/ false, parsingConditionalExpression);
             if (!result) {
                 (notParenthesizedArrow || (notParenthesizedArrow = new ts.Set())).add(tokenPos);
             }
             return result;
         }
-        function tryParseAsyncSimpleArrowFunctionExpression() {
+        function tryParseAsyncSimpleArrowFunctionExpression(parsingConditionalExpression) {
             // We do a check here so that we won't be doing unnecessarily call to "lookAhead"
             if (token() === 131 /* AsyncKeyword */) {
                 if (lookAhead(isUnParenthesizedAsyncArrowFunctionWorker) === 1 /* True */) {
                     var pos = getNodePos();
                     var asyncModifier = parseModifiersForArrowFunction();
                     var expr = parseBinaryExpressionOrHigher(0 /* Lowest */);
-                    return parseSimpleArrowFunctionExpression(pos, expr, asyncModifier);
+                    return parseSimpleArrowFunctionExpression(pos, expr, asyncModifier, parsingConditionalExpression);
                 }
             }
             return undefined;
@@ -33865,7 +33871,7 @@ var ts;
             }
             return 0 /* False */;
         }
-        function parseParenthesizedArrowFunctionExpression(allowAmbiguity) {
+        function parseParenthesizedArrowFunctionExpression(allowAmbiguity, parsingConditionalExpression) {
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             var modifiers = parseModifiersForArrowFunction();
@@ -33891,6 +33897,20 @@ var ts;
                     return undefined;
                 }
             }
+            // Given:
+            //     x ? y => ({ y }) : z => ({ z })
+            // We try to parse the body of the first arrow function by looking at:
+            //     ({ y }) : z => ({ z })
+            // This is a valid arrow function with "z" as the return type.
+            //
+            // But, if we're in the true side of a conditional expression, this colon
+            // terminates the true side, so cannot be the return type. If we are in the
+            // false side, we may still be within the true side of a parent conditional
+            // expression, so don't allow it to be a return type either.
+            if (parsingConditionalExpression && token() === 58 /* ColonToken */) {
+                ts.Debug.assert(!allowAmbiguity);
+                return undefined;
+            }
             var type = parseReturnType(58 /* ColonToken */, /*isType*/ false);
             if (type && !allowAmbiguity && typeHasArrowFunctionBlockingParseError(type)) {
                 return undefined;
@@ -33924,7 +33944,7 @@ var ts;
             var node = factory.createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body);
             return withJSDoc(finishNode(node, pos), hasJSDoc);
         }
-        function parseArrowFunctionExpressionBody(isAsync) {
+        function parseArrowFunctionExpressionBody(isAsync, parsingConditionalExpression) {
             if (token() === 18 /* OpenBraceToken */) {
                 return parseFunctionBlock(isAsync ? 2 /* Await */ : 0 /* None */);
             }
@@ -33952,8 +33972,8 @@ var ts;
             var savedTopLevel = topLevel;
             topLevel = false;
             var node = isAsync
-                ? doInAwaitContext(parseAssignmentExpressionOrHigher)
-                : doOutsideOfAwaitContext(parseAssignmentExpressionOrHigher);
+                ? doInAwaitContext(function () { return parseAssignmentExpressionOrHigher(parsingConditionalExpression); })
+                : doOutsideOfAwaitContext(function () { return parseAssignmentExpressionOrHigher(parsingConditionalExpression); });
             topLevel = savedTopLevel;
             return node;
         }
@@ -33966,8 +33986,8 @@ var ts;
             // Note: we explicitly 'allowIn' in the whenTrue part of the condition expression, and
             // we do not that for the 'whenFalse' part.
             var colonToken;
-            return finishNode(factory.createConditionalExpression(leftOperand, questionToken, doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher), colonToken = parseExpectedToken(58 /* ColonToken */), ts.nodeIsPresent(colonToken)
-                ? parseAssignmentExpressionOrHigher()
+            return finishNode(factory.createConditionalExpression(leftOperand, questionToken, doOutsideOfContext(disallowInAndDecoratorContext, function () { return parseAssignmentExpressionOrHigher(/*parsingConditionalExpression*/ true); }), colonToken = parseExpectedToken(58 /* ColonToken */), ts.nodeIsPresent(colonToken)
+                ? parseAssignmentExpressionOrHigher(/*parsingConditionalExpression*/ true)
                 : createMissingNode(79 /* Identifier */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(58 /* ColonToken */))), pos);
         }
         function parseBinaryExpressionOrHigher(precedence) {
@@ -47701,7 +47721,6 @@ var ts;
         var globalBooleanType;
         var globalRegExpType;
         var globalThisType;
-        var globalYieldType;
         var anyArrayType;
         var autoArrayType;
         var anyReadonlyArrayType;
@@ -70794,14 +70813,6 @@ var ts;
                 return t.flags & 2097152 /* Intersection */ ? ts.forEach(t.types, getThisTypeArgument) : getThisTypeArgument(t);
             });
         }
-        function getYieldTypeArgument(type) {
-            return ts.getObjectFlags(type) & 4 /* Reference */ && type.target === globalYieldType ? getTypeArguments(type)[0] : undefined;
-        }
-        function getYieldTypeFromContextualType(type) {
-            return mapType(type, function (t) {
-                return t.flags & 2097152 /* Intersection */ ? ts.forEach(t.types, getYieldTypeArgument) : getYieldTypeArgument(t);
-            });
-        }
         function getContextualThisParameterType(func) {
             if (func.kind === 213 /* ArrowFunction */) {
                 return undefined;
@@ -77745,10 +77756,6 @@ var ts;
                 return getIterationTypeOfIterable(use, 1 /* Return */, yieldExpressionType, node.expression)
                     || anyType;
             }
-            var suggestedReturnType = yieldedType && getYieldTypeFromContextualType(yieldedType);
-            if (suggestedReturnType) {
-                return suggestedReturnType;
-            }
             else if (returnType) {
                 return getIterationTypeOfGeneratorFunctionReturnType(2 /* Next */, returnType, isAsync)
                     || anyType;
@@ -85687,7 +85694,6 @@ var ts;
             globalReadonlyArrayType = getGlobalTypeOrUndefined("ReadonlyArray", /*arity*/ 1) || globalArrayType;
             anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
             globalThisType = getGlobalTypeOrUndefined("ThisType", /*arity*/ 1);
-            globalYieldType = getGlobalTypeOrUndefined("YieldType", /*arity*/ 1);
             if (augmentations) {
                 // merge _nonglobal_ module augmentations.
                 // this needs to be done after global symbol table is initialized to make sure that all ambient modules are indexed