@typescript-deploys/pr-build 5.8.0-pr-60910-2 → 5.8.0-pr-60834-11

package/lib/_tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.8";
-var version = `${versionMajorMinor}.0-insiders.20250103`;
+var version = `${versionMajorMinor}.0-insiders.20250104`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -41407,7 +41407,7 @@ function loadModuleFromNearestNodeModulesDirectoryTypesScope(moduleName, directo
   );
 }
 function loadModuleFromNearestNodeModulesDirectoryWorker(extensions, moduleName, directory, state, typesScopeOnly, cache, redirectedReference) {
-  const mode = state.features === 0 ? void 0 : state.features & 32 /* EsmMode */ || state.conditions.includes("import") ? 99 /* ESNext */ : 1 /* CommonJS */;
+  const mode = state.features === 0 ? void 0 : state.features & 32 /* EsmMode */ ? 99 /* ESNext */ : 1 /* CommonJS */;
   const priorityExtensions = extensions & (1 /* TypeScript */ | 4 /* Declaration */);
   const secondaryExtensions = extensions & ~(1 /* TypeScript */ | 4 /* Declaration */);
   if (priorityExtensions) {
@@ -77870,7 +77870,7 @@ function createTypeChecker(host) {
         return false;
     }
   }
-  function getTypePredicateFromBody(func) {
+  function getTypePredicateFromBody(func, contextualTypePredicate) {
     switch (func.kind) {
       case 176 /* Constructor */:
       case 177 /* GetAccessor */:
@@ -77889,28 +77889,29 @@ function createTypeChecker(host) {
       });
       if (bailedEarly || !singleReturn || functionHasImplicitReturn(func)) return void 0;
     }
-    return checkIfExpressionRefinesAnyParameter(func, singleReturn);
-  }
-  function checkIfExpressionRefinesAnyParameter(func, expr) {
-    expr = skipParentheses(
-      expr,
+    const expr = skipParentheses(
+      singleReturn,
       /*excludeJSDocTypeAssertions*/
       true
     );
     const returnType = checkExpressionCached(expr);
-    if (!(returnType.flags & 16 /* Boolean */)) return void 0;
-    return forEach(func.parameters, (param, i) => {
-      const initType = getTypeOfSymbol(param.symbol);
-      if (!initType || initType.flags & 16 /* Boolean */ || !isIdentifier(param.name) || isSymbolAssigned(param.symbol) || isRestParameter(param)) {
-        return;
-      }
-      const trueType2 = checkIfExpressionRefinesParameter(func, expr, param, initType);
-      if (trueType2) {
-        return createTypePredicate(1 /* Identifier */, unescapeLeadingUnderscores(param.name.escapedText), i, trueType2);
+    if (contextualTypePredicate && returnType.flags & 512 /* BooleanLiteral */) {
+      const param = func.parameters[contextualTypePredicate.parameterIndex];
+      if (!isIdentifier(param.name)) {
+        return void 0;
       }
-    });
+      const refinedType = returnType.intrinsicName === "true" ? getTypeOfSymbol(param.symbol) : neverType;
+      return createTypePredicate(1 /* Identifier */, unescapeLeadingUnderscores(param.name.escapedText), contextualTypePredicate.parameterIndex, refinedType);
+    }
+    if (!(returnType.flags & 16 /* Boolean */)) return void 0;
+    return contextualTypePredicate ? getTypePredicateIfRefinesParameterAtIndex(func, expr, contextualTypePredicate, contextualTypePredicate.parameterIndex) : forEach(func.parameters, (_, i) => getTypePredicateIfRefinesParameterAtIndex(func, expr, contextualTypePredicate, i));
   }
-  function checkIfExpressionRefinesParameter(func, expr, param, initType) {
+  function getTypePredicateIfRefinesParameterAtIndex(func, expr, contextualTypePredicate, parameterIndex) {
+    const param = func.parameters[parameterIndex];
+    const initType = getTypeOfSymbol(param.symbol);
+    if (!initType || initType.flags & 16 /* Boolean */ || !isIdentifier(param.name) || isSymbolAssigned(param.symbol) || isRestParameter(param)) {
+      return;
+    }
     const antecedent = canHaveFlowNode(expr) && expr.flowNode || expr.parent.kind === 253 /* ReturnStatement */ && expr.parent.flowNode || createFlowNode(
       2 /* Start */,
       /*node*/
@@ -77920,10 +77921,12 @@ function createTypeChecker(host) {
     );
     const trueCondition = createFlowNode(32 /* TrueCondition */, expr, antecedent);
     const trueType2 = getFlowTypeOfReference(param.name, initType, initType, func, trueCondition);
-    if (trueType2 === initType) return void 0;
+    if (!contextualTypePredicate && trueType2 === initType) {
+      return void 0;
+    }
     const falseCondition = createFlowNode(64 /* FalseCondition */, expr, antecedent);
     const falseSubtype = getFlowTypeOfReference(param.name, initType, trueType2, func, falseCondition);
-    return falseSubtype.flags & 131072 /* Never */ ? trueType2 : void 0;
+    return falseSubtype.flags & 131072 /* Never */ ? createTypePredicate(1 /* Identifier */, unescapeLeadingUnderscores(param.name.escapedText), parameterIndex, trueType2) : void 0;
   }
   function checkAllCodePathsInNonVoidFunctionReturnOrThrow(func, returnType) {
     addLazyDiagnostic(checkAllCodePathsInNonVoidFunctionReturnOrThrowDiagnostics);
@@ -78034,10 +78037,11 @@ function createTypeChecker(host) {
             inferFromAnnotatedParameters(signature, contextualSignature, inferenceContext);
           }
         }
-        if (contextualSignature && !getReturnTypeFromAnnotation(node) && !signature.resolvedReturnType) {
-          const returnType = getReturnTypeFromBody(node, checkMode);
-          if (!signature.resolvedReturnType) {
-            signature.resolvedReturnType = returnType;
+        if (contextualSignature && !getReturnTypeFromAnnotation(node)) {
+          const returnType = signature.resolvedReturnType ?? getReturnTypeFromBody(node, checkMode);
+          signature.resolvedReturnType ?? (signature.resolvedReturnType = returnType);
+          if (signature.resolvedReturnType.flags && 16 /* Boolean */ && contextualSignature.resolvedTypePredicate && contextualSignature.resolvedTypePredicate !== noTypePredicate && contextualSignature.resolvedTypePredicate.kind === 1 /* Identifier */) {
+            signature.resolvedTypePredicate ?? (signature.resolvedTypePredicate = getTypePredicateFromBody(node, contextualSignature.resolvedTypePredicate) ?? noTypePredicate);
           }
         }
         checkSignatureDeclaration(node);

package/lib/typescript.js

@@ -2279,7 +2279,7 @@ module.exports = __toCommonJS(typescript_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.8";
-var version = `${versionMajorMinor}.0-insiders.20250103`;
+var version = `${versionMajorMinor}.0-insiders.20250104`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -45893,7 +45893,7 @@ function loadModuleFromNearestNodeModulesDirectoryTypesScope(moduleName, directo
   );
 }
 function loadModuleFromNearestNodeModulesDirectoryWorker(extensions, moduleName, directory, state, typesScopeOnly, cache, redirectedReference) {
-  const mode = state.features === 0 ? void 0 : state.features & 32 /* EsmMode */ || state.conditions.includes("import") ? 99 /* ESNext */ : 1 /* CommonJS */;
+  const mode = state.features === 0 ? void 0 : state.features & 32 /* EsmMode */ ? 99 /* ESNext */ : 1 /* CommonJS */;
   const priorityExtensions = extensions & (1 /* TypeScript */ | 4 /* Declaration */);
   const secondaryExtensions = extensions & ~(1 /* TypeScript */ | 4 /* Declaration */);
   if (priorityExtensions) {
@@ -82474,7 +82474,7 @@ function createTypeChecker(host) {
         return false;
     }
   }
-  function getTypePredicateFromBody(func) {
+  function getTypePredicateFromBody(func, contextualTypePredicate) {
     switch (func.kind) {
       case 176 /* Constructor */:
       case 177 /* GetAccessor */:
@@ -82493,28 +82493,29 @@ function createTypeChecker(host) {
       });
       if (bailedEarly || !singleReturn || functionHasImplicitReturn(func)) return void 0;
     }
-    return checkIfExpressionRefinesAnyParameter(func, singleReturn);
-  }
-  function checkIfExpressionRefinesAnyParameter(func, expr) {
-    expr = skipParentheses(
-      expr,
+    const expr = skipParentheses(
+      singleReturn,
       /*excludeJSDocTypeAssertions*/
       true
     );
     const returnType = checkExpressionCached(expr);
-    if (!(returnType.flags & 16 /* Boolean */)) return void 0;
-    return forEach(func.parameters, (param, i) => {
-      const initType = getTypeOfSymbol(param.symbol);
-      if (!initType || initType.flags & 16 /* Boolean */ || !isIdentifier(param.name) || isSymbolAssigned(param.symbol) || isRestParameter(param)) {
-        return;
-      }
-      const trueType2 = checkIfExpressionRefinesParameter(func, expr, param, initType);
-      if (trueType2) {
-        return createTypePredicate(1 /* Identifier */, unescapeLeadingUnderscores(param.name.escapedText), i, trueType2);
+    if (contextualTypePredicate && returnType.flags & 512 /* BooleanLiteral */) {
+      const param = func.parameters[contextualTypePredicate.parameterIndex];
+      if (!isIdentifier(param.name)) {
+        return void 0;
       }
-    });
+      const refinedType = returnType.intrinsicName === "true" ? getTypeOfSymbol(param.symbol) : neverType;
+      return createTypePredicate(1 /* Identifier */, unescapeLeadingUnderscores(param.name.escapedText), contextualTypePredicate.parameterIndex, refinedType);
+    }
+    if (!(returnType.flags & 16 /* Boolean */)) return void 0;
+    return contextualTypePredicate ? getTypePredicateIfRefinesParameterAtIndex(func, expr, contextualTypePredicate, contextualTypePredicate.parameterIndex) : forEach(func.parameters, (_, i) => getTypePredicateIfRefinesParameterAtIndex(func, expr, contextualTypePredicate, i));
   }
-  function checkIfExpressionRefinesParameter(func, expr, param, initType) {
+  function getTypePredicateIfRefinesParameterAtIndex(func, expr, contextualTypePredicate, parameterIndex) {
+    const param = func.parameters[parameterIndex];
+    const initType = getTypeOfSymbol(param.symbol);
+    if (!initType || initType.flags & 16 /* Boolean */ || !isIdentifier(param.name) || isSymbolAssigned(param.symbol) || isRestParameter(param)) {
+      return;
+    }
     const antecedent = canHaveFlowNode(expr) && expr.flowNode || expr.parent.kind === 253 /* ReturnStatement */ && expr.parent.flowNode || createFlowNode(
       2 /* Start */,
       /*node*/
@@ -82524,10 +82525,12 @@ function createTypeChecker(host) {
     );
     const trueCondition = createFlowNode(32 /* TrueCondition */, expr, antecedent);
     const trueType2 = getFlowTypeOfReference(param.name, initType, initType, func, trueCondition);
-    if (trueType2 === initType) return void 0;
+    if (!contextualTypePredicate && trueType2 === initType) {
+      return void 0;
+    }
     const falseCondition = createFlowNode(64 /* FalseCondition */, expr, antecedent);
     const falseSubtype = getFlowTypeOfReference(param.name, initType, trueType2, func, falseCondition);
-    return falseSubtype.flags & 131072 /* Never */ ? trueType2 : void 0;
+    return falseSubtype.flags & 131072 /* Never */ ? createTypePredicate(1 /* Identifier */, unescapeLeadingUnderscores(param.name.escapedText), parameterIndex, trueType2) : void 0;
   }
   function checkAllCodePathsInNonVoidFunctionReturnOrThrow(func, returnType) {
     addLazyDiagnostic(checkAllCodePathsInNonVoidFunctionReturnOrThrowDiagnostics);
@@ -82638,10 +82641,11 @@ function createTypeChecker(host) {
             inferFromAnnotatedParameters(signature, contextualSignature, inferenceContext);
           }
         }
-        if (contextualSignature && !getReturnTypeFromAnnotation(node) && !signature.resolvedReturnType) {
-          const returnType = getReturnTypeFromBody(node, checkMode);
-          if (!signature.resolvedReturnType) {
-            signature.resolvedReturnType = returnType;
+        if (contextualSignature && !getReturnTypeFromAnnotation(node)) {
+          const returnType = signature.resolvedReturnType ?? getReturnTypeFromBody(node, checkMode);
+          signature.resolvedReturnType ?? (signature.resolvedReturnType = returnType);
+          if (signature.resolvedReturnType.flags && 16 /* Boolean */ && contextualSignature.resolvedTypePredicate && contextualSignature.resolvedTypePredicate !== noTypePredicate && contextualSignature.resolvedTypePredicate.kind === 1 /* Identifier */) {
+            signature.resolvedTypePredicate ?? (signature.resolvedTypePredicate = getTypePredicateFromBody(node, contextualSignature.resolvedTypePredicate) ?? noTypePredicate);
           }
         }
         checkSignatureDeclaration(node);

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.8.0-pr-60910-2",
+  "version": "5.8.0-pr-60834-11",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [