@typescript-deploys/pr-build 5.2.0-pr-54477-10 → 5.2.0-pr-54688-11

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230619`;
+var version = `${versionMajorMinor}.0-insiders.20230620`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -28835,7 +28835,7 @@ var Parser;
     }
     const pos = getNodePos();
     const type = parseUnionTypeOrHigher();
-    if (!inDisallowConditionalTypesContext() && !scanner.hasPrecedingLineBreak() && parseOptional(96 /* ExtendsKeyword */)) {
+    if (!inDisallowConditionalTypesContext() && tryParse(parseConditionalTypeExtends)) {
       const extendsType = disallowConditionalTypesAnd(parseType);
       parseExpected(58 /* QuestionToken */);
       const trueType = allowConditionalTypesAnd(parseType);
@@ -28845,6 +28845,9 @@ var Parser;
     }
     return type;
   }
+  function parseConditionalTypeExtends() {
+    return parseOptional(96 /* ExtendsKeyword */) && !(parseOptional(58 /* QuestionToken */) || parseOptional(59 /* ColonToken */));
+  }
   function parseTypeAnnotation() {
     return parseOptional(59 /* ColonToken */) ? parseType() : void 0;
   }
@@ -74222,19 +74225,16 @@ function createTypeChecker(host) {
       }
     }
   }
-  function getNonGenericReturnTypeOfSingleCallSignature(funcType) {
+  function getReturnTypeOfSingleNonGenericCallSignature(funcType) {
     const signature = getSingleCallSignature(funcType);
-    if (signature) {
-      const returnType = getReturnTypeOfSignature(signature);
-      if (!signature.typeParameters || !couldContainTypeVariables(returnType)) {
-        return returnType;
-      }
+    if (signature && !signature.typeParameters) {
+      return getReturnTypeOfSignature(signature);
     }
   }
   function getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) {
     const funcType = checkExpression(expr.expression);
     const nonOptionalType = getOptionalExpressionType(funcType, expr.expression);
-    const returnType = getNonGenericReturnTypeOfSingleCallSignature(funcType);
+    const returnType = getReturnTypeOfSingleNonGenericCallSignature(funcType);
     return returnType && propagateOptionalTypeMarker(returnType, expr, nonOptionalType !== funcType);
   }
   function getTypeOfExpression(node) {
@@ -74279,7 +74279,7 @@ function createTypeChecker(host) {
       /*requireStringLiteralLikeArgument*/
       true
     ) && !isSymbolOrSymbolForCall(expr)) {
-      return isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getNonGenericReturnTypeOfSingleCallSignature(checkNonNullExpression(expr.expression));
+      return isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getReturnTypeOfSingleNonGenericCallSignature(checkNonNullExpression(expr.expression));
     } else if (isAssertionExpression(expr) && !isConstTypeReference(expr.type)) {
       return getTypeFromTypeNode(expr.type);
     } else if (isLiteralExpression(node) || isBooleanLiteral(node)) {

package/lib/tsserver.js

@@ -2305,7 +2305,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230619`;
+var version = `${versionMajorMinor}.0-insiders.20230620`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -33210,7 +33210,7 @@ var Parser;
     }
     const pos = getNodePos();
     const type = parseUnionTypeOrHigher();
-    if (!inDisallowConditionalTypesContext() && !scanner2.hasPrecedingLineBreak() && parseOptional(96 /* ExtendsKeyword */)) {
+    if (!inDisallowConditionalTypesContext() && tryParse(parseConditionalTypeExtends)) {
       const extendsType = disallowConditionalTypesAnd(parseType);
       parseExpected(58 /* QuestionToken */);
       const trueType = allowConditionalTypesAnd(parseType);
@@ -33220,6 +33220,9 @@ var Parser;
     }
     return type;
   }
+  function parseConditionalTypeExtends() {
+    return parseOptional(96 /* ExtendsKeyword */) && !(parseOptional(58 /* QuestionToken */) || parseOptional(59 /* ColonToken */));
+  }
   function parseTypeAnnotation() {
     return parseOptional(59 /* ColonToken */) ? parseType() : void 0;
   }
@@ -78863,19 +78866,16 @@ function createTypeChecker(host) {
       }
     }
   }
-  function getNonGenericReturnTypeOfSingleCallSignature(funcType) {
+  function getReturnTypeOfSingleNonGenericCallSignature(funcType) {
     const signature = getSingleCallSignature(funcType);
-    if (signature) {
-      const returnType = getReturnTypeOfSignature(signature);
-      if (!signature.typeParameters || !couldContainTypeVariables(returnType)) {
-        return returnType;
-      }
+    if (signature && !signature.typeParameters) {
+      return getReturnTypeOfSignature(signature);
     }
   }
   function getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) {
     const funcType = checkExpression(expr.expression);
     const nonOptionalType = getOptionalExpressionType(funcType, expr.expression);
-    const returnType = getNonGenericReturnTypeOfSingleCallSignature(funcType);
+    const returnType = getReturnTypeOfSingleNonGenericCallSignature(funcType);
     return returnType && propagateOptionalTypeMarker(returnType, expr, nonOptionalType !== funcType);
   }
   function getTypeOfExpression(node) {
@@ -78920,7 +78920,7 @@ function createTypeChecker(host) {
       /*requireStringLiteralLikeArgument*/
       true
     ) && !isSymbolOrSymbolForCall(expr)) {
-      return isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getNonGenericReturnTypeOfSingleCallSignature(checkNonNullExpression(expr.expression));
+      return isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getReturnTypeOfSingleNonGenericCallSignature(checkNonNullExpression(expr.expression));
     } else if (isAssertionExpression(expr) && !isConstTypeReference(expr.type)) {
       return getTypeFromTypeNode(expr.type);
     } else if (isLiteralExpression(node) || isBooleanLiteral(node)) {

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-insiders.20230619`;
+      version = `${versionMajorMinor}.0-insiders.20230620`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -31305,7 +31305,7 @@ ${lanes.join("\n")}
           }
           const pos = getNodePos();
           const type = parseUnionTypeOrHigher();
-          if (!inDisallowConditionalTypesContext() && !scanner2.hasPrecedingLineBreak() && parseOptional(96 /* ExtendsKeyword */)) {
+          if (!inDisallowConditionalTypesContext() && tryParse(parseConditionalTypeExtends)) {
             const extendsType = disallowConditionalTypesAnd(parseType);
             parseExpected(58 /* QuestionToken */);
             const trueType = allowConditionalTypesAnd(parseType);
@@ -31315,6 +31315,9 @@ ${lanes.join("\n")}
           }
           return type;
         }
+        function parseConditionalTypeExtends() {
+          return parseOptional(96 /* ExtendsKeyword */) && !(parseOptional(58 /* QuestionToken */) || parseOptional(59 /* ColonToken */));
+        }
         function parseTypeAnnotation() {
           return parseOptional(59 /* ColonToken */) ? parseType() : void 0;
         }
@@ -76652,19 +76655,16 @@ ${lanes.join("\n")}
         }
       }
     }
-    function getNonGenericReturnTypeOfSingleCallSignature(funcType) {
+    function getReturnTypeOfSingleNonGenericCallSignature(funcType) {
       const signature = getSingleCallSignature(funcType);
-      if (signature) {
-        const returnType = getReturnTypeOfSignature(signature);
-        if (!signature.typeParameters || !couldContainTypeVariables(returnType)) {
-          return returnType;
-        }
+      if (signature && !signature.typeParameters) {
+        return getReturnTypeOfSignature(signature);
       }
     }
     function getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) {
       const funcType = checkExpression(expr.expression);
       const nonOptionalType = getOptionalExpressionType(funcType, expr.expression);
-      const returnType = getNonGenericReturnTypeOfSingleCallSignature(funcType);
+      const returnType = getReturnTypeOfSingleNonGenericCallSignature(funcType);
       return returnType && propagateOptionalTypeMarker(returnType, expr, nonOptionalType !== funcType);
     }
     function getTypeOfExpression(node) {
@@ -76709,7 +76709,7 @@ ${lanes.join("\n")}
         /*requireStringLiteralLikeArgument*/
         true
       ) && !isSymbolOrSymbolForCall(expr)) {
-        return isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getNonGenericReturnTypeOfSingleCallSignature(checkNonNullExpression(expr.expression));
+        return isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getReturnTypeOfSingleNonGenericCallSignature(checkNonNullExpression(expr.expression));
       } else if (isAssertionExpression(expr) && !isConstTypeReference(expr.type)) {
         return getTypeFromTypeNode(expr.type);
       } else if (isLiteralExpression(node) || isBooleanLiteral(node)) {

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-insiders.20230619`;
+      version = `${versionMajorMinor}.0-insiders.20230620`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -31305,7 +31305,7 @@ ${lanes.join("\n")}
           }
           const pos = getNodePos();
           const type = parseUnionTypeOrHigher();
-          if (!inDisallowConditionalTypesContext() && !scanner2.hasPrecedingLineBreak() && parseOptional(96 /* ExtendsKeyword */)) {
+          if (!inDisallowConditionalTypesContext() && tryParse(parseConditionalTypeExtends)) {
             const extendsType = disallowConditionalTypesAnd(parseType);
             parseExpected(58 /* QuestionToken */);
             const trueType = allowConditionalTypesAnd(parseType);
@@ -31315,6 +31315,9 @@ ${lanes.join("\n")}
           }
           return type;
         }
+        function parseConditionalTypeExtends() {
+          return parseOptional(96 /* ExtendsKeyword */) && !(parseOptional(58 /* QuestionToken */) || parseOptional(59 /* ColonToken */));
+        }
         function parseTypeAnnotation() {
           return parseOptional(59 /* ColonToken */) ? parseType() : void 0;
         }
@@ -76652,19 +76655,16 @@ ${lanes.join("\n")}
         }
       }
     }
-    function getNonGenericReturnTypeOfSingleCallSignature(funcType) {
+    function getReturnTypeOfSingleNonGenericCallSignature(funcType) {
       const signature = getSingleCallSignature(funcType);
-      if (signature) {
-        const returnType = getReturnTypeOfSignature(signature);
-        if (!signature.typeParameters || !couldContainTypeVariables(returnType)) {
-          return returnType;
-        }
+      if (signature && !signature.typeParameters) {
+        return getReturnTypeOfSignature(signature);
       }
     }
     function getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) {
       const funcType = checkExpression(expr.expression);
       const nonOptionalType = getOptionalExpressionType(funcType, expr.expression);
-      const returnType = getNonGenericReturnTypeOfSingleCallSignature(funcType);
+      const returnType = getReturnTypeOfSingleNonGenericCallSignature(funcType);
       return returnType && propagateOptionalTypeMarker(returnType, expr, nonOptionalType !== funcType);
     }
     function getTypeOfExpression(node) {
@@ -76709,7 +76709,7 @@ ${lanes.join("\n")}
         /*requireStringLiteralLikeArgument*/
         true
       ) && !isSymbolOrSymbolForCall(expr)) {
-        return isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getNonGenericReturnTypeOfSingleCallSignature(checkNonNullExpression(expr.expression));
+        return isCallChain(expr) ? getReturnTypeOfSingleNonGenericSignatureOfCallChain(expr) : getReturnTypeOfSingleNonGenericCallSignature(checkNonNullExpression(expr.expression));
       } else if (isAssertionExpression(expr) && !isConstTypeReference(expr.type)) {
         return getTypeFromTypeNode(expr.type);
       } else if (isLiteralExpression(node) || isBooleanLiteral(node)) {

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230619`;
+var version = `${versionMajorMinor}.0-insiders.20230620`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -20844,7 +20844,7 @@ var Parser;
     }
     const pos = getNodePos();
     const type = parseUnionTypeOrHigher();
-    if (!inDisallowConditionalTypesContext() && !scanner.hasPrecedingLineBreak() && parseOptional(96 /* ExtendsKeyword */)) {
+    if (!inDisallowConditionalTypesContext() && tryParse(parseConditionalTypeExtends)) {
       const extendsType = disallowConditionalTypesAnd(parseType);
       parseExpected(58 /* QuestionToken */);
       const trueType = allowConditionalTypesAnd(parseType);
@@ -20854,6 +20854,9 @@ var Parser;
     }
     return type;
   }
+  function parseConditionalTypeExtends() {
+    return parseOptional(96 /* ExtendsKeyword */) && !(parseOptional(58 /* QuestionToken */) || parseOptional(59 /* ColonToken */));
+  }
   function parseTypeAnnotation() {
     return parseOptional(59 /* ColonToken */) ? parseType() : void 0;
   }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.2.0-pr-54477-10",
+  "version": "5.2.0-pr-54688-11",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -115,5 +115,5 @@
     "node": "20.1.0",
     "npm": "8.19.4"
   },
-  "gitHead": "34d289ed91d6d5fe33db36a73407a2cb75cd9ef6"
+  "gitHead": "93f6572f86164d3d5973c7956b7d43a8e57c4aef"
 }