typescript 5.3.0-dev.20231006 → 5.3.0-dev.20231007

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-dev.20231006`;
+var version = `${versionMajorMinor}.0-dev.20231007`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -65740,16 +65740,7 @@ function createTypeChecker(host) {
       } else if (expr.kind === 221 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
         type = narrowTypeBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
       } else if (expr.kind === 112 /* TrueKeyword */) {
-        const clause = flow.switchStatement.caseBlock.clauses.find((_, index) => index === flow.clauseStart);
-        const clauseExpression = clause && clause.kind === 296 /* CaseClause */ ? clause.expression : void 0;
-        if (clauseExpression) {
-          type = narrowType(
-            type,
-            clauseExpression,
-            /*assumeTrue*/
-            true
-          );
-        }
+        type = narrowTypeBySwitchOnTrue(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
       } else {
         if (strictNullChecks) {
           if (optionalChainContainsReference(expr, reference)) {
@@ -66295,6 +66286,42 @@ function createTypeChecker(host) {
       const clauseWitnesses = witnesses.slice(clauseStart, clauseEnd);
       return getUnionType(map(clauseWitnesses, (text) => text ? narrowTypeByTypeName(type, text) : neverType));
     }
+    function narrowTypeBySwitchOnTrue(type, switchStatement, clauseStart, clauseEnd) {
+      const defaultIndex = findIndex(switchStatement.caseBlock.clauses, (clause) => clause.kind === 297 /* DefaultClause */);
+      const hasDefaultClause = clauseStart === clauseEnd || defaultIndex >= clauseStart && defaultIndex < clauseEnd;
+      for (let i = 0; i < clauseStart; i++) {
+        const clause = switchStatement.caseBlock.clauses[i];
+        if (clause.kind === 296 /* CaseClause */) {
+          type = narrowType(
+            type,
+            clause.expression,
+            /*assumeTrue*/
+            false
+          );
+        }
+      }
+      if (hasDefaultClause) {
+        for (let i = clauseEnd; i < switchStatement.caseBlock.clauses.length; i++) {
+          const clause = switchStatement.caseBlock.clauses[i];
+          if (clause.kind === 296 /* CaseClause */) {
+            type = narrowType(
+              type,
+              clause.expression,
+              /*assumeTrue*/
+              false
+            );
+          }
+        }
+        return type;
+      }
+      const clauses = switchStatement.caseBlock.clauses.slice(clauseStart, clauseEnd);
+      return getUnionType(map(clauses, (clause) => clause.kind === 296 /* CaseClause */ ? narrowType(
+        type,
+        clause.expression,
+        /*assumeTrue*/
+        true
+      ) : 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

@@ -2328,7 +2328,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-dev.20231006`;
+var version = `${versionMajorMinor}.0-dev.20231007`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -70452,16 +70452,7 @@ function createTypeChecker(host) {
       } else if (expr.kind === 221 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
         type = narrowTypeBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
       } else if (expr.kind === 112 /* TrueKeyword */) {
-        const clause = flow.switchStatement.caseBlock.clauses.find((_, index) => index === flow.clauseStart);
-        const clauseExpression = clause && clause.kind === 296 /* CaseClause */ ? clause.expression : void 0;
-        if (clauseExpression) {
-          type = narrowType(
-            type,
-            clauseExpression,
-            /*assumeTrue*/
-            true
-          );
-        }
+        type = narrowTypeBySwitchOnTrue(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
       } else {
         if (strictNullChecks) {
           if (optionalChainContainsReference(expr, reference)) {
@@ -71007,6 +70998,42 @@ function createTypeChecker(host) {
       const clauseWitnesses = witnesses.slice(clauseStart, clauseEnd);
       return getUnionType(map(clauseWitnesses, (text) => text ? narrowTypeByTypeName(type, text) : neverType));
     }
+    function narrowTypeBySwitchOnTrue(type, switchStatement, clauseStart, clauseEnd) {
+      const defaultIndex = findIndex(switchStatement.caseBlock.clauses, (clause) => clause.kind === 297 /* DefaultClause */);
+      const hasDefaultClause = clauseStart === clauseEnd || defaultIndex >= clauseStart && defaultIndex < clauseEnd;
+      for (let i = 0; i < clauseStart; i++) {
+        const clause = switchStatement.caseBlock.clauses[i];
+        if (clause.kind === 296 /* CaseClause */) {
+          type = narrowType(
+            type,
+            clause.expression,
+            /*assumeTrue*/
+            false
+          );
+        }
+      }
+      if (hasDefaultClause) {
+        for (let i = clauseEnd; i < switchStatement.caseBlock.clauses.length; i++) {
+          const clause = switchStatement.caseBlock.clauses[i];
+          if (clause.kind === 296 /* CaseClause */) {
+            type = narrowType(
+              type,
+              clause.expression,
+              /*assumeTrue*/
+              false
+            );
+          }
+        }
+        return type;
+      }
+      const clauses = switchStatement.caseBlock.clauses.slice(clauseStart, clauseEnd);
+      return getUnionType(map(clauses, (clause) => clause.kind === 296 /* CaseClause */ ? narrowType(
+        type,
+        clause.expression,
+        /*assumeTrue*/
+        true
+      ) : 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

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.3";
-      version = `${versionMajorMinor}.0-dev.20231006`;
+      version = `${versionMajorMinor}.0-dev.20231007`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -68219,16 +68219,7 @@ ${lanes.join("\n")}
         } else if (expr.kind === 221 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
           type = narrowTypeBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
         } else if (expr.kind === 112 /* TrueKeyword */) {
-          const clause = flow.switchStatement.caseBlock.clauses.find((_, index) => index === flow.clauseStart);
-          const clauseExpression = clause && clause.kind === 296 /* CaseClause */ ? clause.expression : void 0;
-          if (clauseExpression) {
-            type = narrowType(
-              type,
-              clauseExpression,
-              /*assumeTrue*/
-              true
-            );
-          }
+          type = narrowTypeBySwitchOnTrue(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
         } else {
           if (strictNullChecks) {
             if (optionalChainContainsReference(expr, reference)) {
@@ -68774,6 +68765,42 @@ ${lanes.join("\n")}
         const clauseWitnesses = witnesses.slice(clauseStart, clauseEnd);
         return getUnionType(map(clauseWitnesses, (text) => text ? narrowTypeByTypeName(type, text) : neverType));
       }
+      function narrowTypeBySwitchOnTrue(type, switchStatement, clauseStart, clauseEnd) {
+        const defaultIndex = findIndex(switchStatement.caseBlock.clauses, (clause) => clause.kind === 297 /* DefaultClause */);
+        const hasDefaultClause = clauseStart === clauseEnd || defaultIndex >= clauseStart && defaultIndex < clauseEnd;
+        for (let i = 0; i < clauseStart; i++) {
+          const clause = switchStatement.caseBlock.clauses[i];
+          if (clause.kind === 296 /* CaseClause */) {
+            type = narrowType(
+              type,
+              clause.expression,
+              /*assumeTrue*/
+              false
+            );
+          }
+        }
+        if (hasDefaultClause) {
+          for (let i = clauseEnd; i < switchStatement.caseBlock.clauses.length; i++) {
+            const clause = switchStatement.caseBlock.clauses[i];
+            if (clause.kind === 296 /* CaseClause */) {
+              type = narrowType(
+                type,
+                clause.expression,
+                /*assumeTrue*/
+                false
+              );
+            }
+          }
+          return type;
+        }
+        const clauses = switchStatement.caseBlock.clauses.slice(clauseStart, clauseEnd);
+        return getUnionType(map(clauses, (clause) => clause.kind === 296 /* CaseClause */ ? narrowType(
+          type,
+          clause.expression,
+          /*assumeTrue*/
+          true
+        ) : 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/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-dev.20231006`;
+var version = `${versionMajorMinor}.0-dev.20231007`;
 
 // src/compiler/core.ts
 var emptyArray = [];

package/package.json

@@ -2,7 +2,7 @@
     "name": "typescript",
     "author": "Microsoft Corp.",
     "homepage": "https://www.typescriptlang.org/",
-    "version": "5.3.0-dev.20231006",
+    "version": "5.3.0-dev.20231007",
     "license": "Apache-2.0",
     "description": "TypeScript is a language for application scale JavaScript development",
     "keywords": [
@@ -113,5 +113,5 @@
         "node": "20.1.0",
         "npm": "8.19.4"
     },
-    "gitHead": "2e58032f067fbe0d6efbdc970b54b6d72c349aa8"
+    "gitHead": "d1a2e7e730cb8ebd44662ece6b263e2d4d885da2"
 }