@typescript-deploys/pr-build 5.3.0-pr-55991-5 → 5.3.0-pr-55991-17

package/lib/tsc.js

@@ -66257,18 +66257,40 @@ function createTypeChecker(host) {
       return getUnionType(map(clauseWitnesses, (text) => text ? narrowTypeByTypeName(type, text) : neverType));
     }
     function narrowTypeBySwitchOnTrue(type, switchStatement, clauseStart, clauseEnd) {
+      const clauses = switchStatement.caseBlock.clauses.slice(clauseStart, clauseEnd);
       const defaultIndex = findIndex(switchStatement.caseBlock.clauses, (clause) => clause.kind === 297 /* DefaultClause */);
       const hasDefaultClause = clauseStart === clauseEnd || defaultIndex >= clauseStart && defaultIndex < clauseEnd;
       if (hasDefaultClause) {
-        return type;
+        const clausesBefore = switchStatement.caseBlock.clauses.slice(0, clauseStart);
+        const before = narrowTypeForClauses(
+          type,
+          clausesBefore,
+          /*assumeTrue*/
+          false
+        );
+        const clausesAfter = switchStatement.caseBlock.clauses.slice(clauseEnd);
+        const after = narrowTypeForClauses(
+          type,
+          clausesAfter,
+          /*assumeTrue*/
+          false
+        );
+        return getUnionType([narrowTypeForClauses(
+          type,
+          clauses,
+          /*assumeTrue*/
+          true
+        ), before, after]);
       }
-      const clauses = switchStatement.caseBlock.clauses.slice(clauseStart, clauseEnd);
-      return getUnionType(map(clauses, (clause) => clause && clause.kind === 296 /* CaseClause */ ? narrowType(
+      return narrowTypeForClauses(
         type,
-        clause.expression,
+        clauses,
         /*assumeTrue*/
         true
-      ) : neverType));
+      );
+    }
+    function narrowTypeForClauses(type, clauses, assumeTrue) {
+      return getUnionType(map(clauses, (clause) => clause.kind === 296 /* CaseClause */ ? narrowType(type, clause.expression, assumeTrue) : neverType));
     }
     function isMatchingConstructorReference(expr) {
       return (isPropertyAccessExpression(expr) && idText(expr.name) === "constructor" || isElementAccessExpression(expr) && isStringLiteralLike(expr.argumentExpression) && expr.argumentExpression.text === "constructor") && isMatchingReference(reference, expr.expression);

package/lib/tsserver.js

@@ -70969,18 +70969,40 @@ function createTypeChecker(host) {
       return getUnionType(map(clauseWitnesses, (text) => text ? narrowTypeByTypeName(type, text) : neverType));
     }
     function narrowTypeBySwitchOnTrue(type, switchStatement, clauseStart, clauseEnd) {
+      const clauses = switchStatement.caseBlock.clauses.slice(clauseStart, clauseEnd);
       const defaultIndex = findIndex(switchStatement.caseBlock.clauses, (clause) => clause.kind === 297 /* DefaultClause */);
       const hasDefaultClause = clauseStart === clauseEnd || defaultIndex >= clauseStart && defaultIndex < clauseEnd;
       if (hasDefaultClause) {
-        return type;
+        const clausesBefore = switchStatement.caseBlock.clauses.slice(0, clauseStart);
+        const before = narrowTypeForClauses(
+          type,
+          clausesBefore,
+          /*assumeTrue*/
+          false
+        );
+        const clausesAfter = switchStatement.caseBlock.clauses.slice(clauseEnd);
+        const after = narrowTypeForClauses(
+          type,
+          clausesAfter,
+          /*assumeTrue*/
+          false
+        );
+        return getUnionType([narrowTypeForClauses(
+          type,
+          clauses,
+          /*assumeTrue*/
+          true
+        ), before, after]);
       }
-      const clauses = switchStatement.caseBlock.clauses.slice(clauseStart, clauseEnd);
-      return getUnionType(map(clauses, (clause) => clause && clause.kind === 296 /* CaseClause */ ? narrowType(
+      return narrowTypeForClauses(
         type,
-        clause.expression,
+        clauses,
         /*assumeTrue*/
         true
-      ) : neverType));
+      );
+    }
+    function narrowTypeForClauses(type, clauses, assumeTrue) {
+      return getUnionType(map(clauses, (clause) => clause.kind === 296 /* CaseClause */ ? narrowType(type, clause.expression, assumeTrue) : neverType));
     }
     function isMatchingConstructorReference(expr) {
       return (isPropertyAccessExpression(expr) && idText(expr.name) === "constructor" || isElementAccessExpression(expr) && isStringLiteralLike(expr.argumentExpression) && expr.argumentExpression.text === "constructor") && isMatchingReference(reference, expr.expression);

package/lib/typescript.js

@@ -68736,18 +68736,40 @@ ${lanes.join("\n")}
         return getUnionType(map(clauseWitnesses, (text) => text ? narrowTypeByTypeName(type, text) : neverType));
       }
       function narrowTypeBySwitchOnTrue(type, switchStatement, clauseStart, clauseEnd) {
+        const clauses = switchStatement.caseBlock.clauses.slice(clauseStart, clauseEnd);
         const defaultIndex = findIndex(switchStatement.caseBlock.clauses, (clause) => clause.kind === 297 /* DefaultClause */);
         const hasDefaultClause = clauseStart === clauseEnd || defaultIndex >= clauseStart && defaultIndex < clauseEnd;
         if (hasDefaultClause) {
-          return type;
+          const clausesBefore = switchStatement.caseBlock.clauses.slice(0, clauseStart);
+          const before = narrowTypeForClauses(
+            type,
+            clausesBefore,
+            /*assumeTrue*/
+            false
+          );
+          const clausesAfter = switchStatement.caseBlock.clauses.slice(clauseEnd);
+          const after = narrowTypeForClauses(
+            type,
+            clausesAfter,
+            /*assumeTrue*/
+            false
+          );
+          return getUnionType([narrowTypeForClauses(
+            type,
+            clauses,
+            /*assumeTrue*/
+            true
+          ), before, after]);
         }
-        const clauses = switchStatement.caseBlock.clauses.slice(clauseStart, clauseEnd);
-        return getUnionType(map(clauses, (clause) => clause && clause.kind === 296 /* CaseClause */ ? narrowType(
+        return narrowTypeForClauses(
           type,
-          clause.expression,
+          clauses,
           /*assumeTrue*/
           true
-        ) : neverType));
+        );
+      }
+      function narrowTypeForClauses(type, clauses, assumeTrue) {
+        return getUnionType(map(clauses, (clause) => clause.kind === 296 /* CaseClause */ ? narrowType(type, clause.expression, assumeTrue) : neverType));
       }
       function isMatchingConstructorReference(expr) {
         return (isPropertyAccessExpression(expr) && idText(expr.name) === "constructor" || isElementAccessExpression(expr) && isStringLiteralLike(expr.argumentExpression) && expr.argumentExpression.text === "constructor") && isMatchingReference(reference, expr.expression);

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.3.0-pr-55991-5",
+  "version": "5.3.0-pr-55991-17",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -114,5 +114,5 @@
     "node": "20.1.0",
     "npm": "8.19.4"
   },
-  "gitHead": "d6e8e9dfe6243d3e73908b31287e71991fedfad1"
+  "gitHead": "ede4ae5499d66a800949ef0f866fa6790c05ac54"
 }