make as clause interrupt type but not data operators

Author: Deskbot

src/cognitive-complexity/cognitive-complexity.ts

@@ -19,6 +19,7 @@ import {
     ChainableBinaryOperator,
     ChainableBinaryTypeOperator,
     pausesASequenceOfBinaryOperators,
+    pausesASequenceOfBinaryTypeOperators,
 } from "./node-inspection";
 import { Scope } from "./Scope";
 
@@ -240,6 +241,7 @@ function nodeCost(
     const opSequenceInProgress = mutCtx.precedingOperator;
     const typeOpSequenceInProgress = mutCtx.precedingTypeOperator;
     const pauseOpSequence = pausesASequenceOfBinaryOperators(node);
+    const pauseTypeOpSequence = pausesASequenceOfBinaryTypeOperators(node);
 
     // Check if the node ends any ongoing sequence of binary operators
     if (breaksASequenceOfBinaryOperators(node)) {
@@ -262,6 +264,7 @@ function nodeCost(
         mutCtx.precedingTypeOperator = node.kind;
     } else if (pauseOpSequence) {
         mutCtx.precedingOperator = undefined;
+    } else if (pauseTypeOpSequence) {
         mutCtx.precedingTypeOperator = undefined;
     }
 
@@ -290,6 +293,7 @@ function nodeCost(
     // continue a paused sequence
     if (pauseOpSequence) {
         mutCtx.precedingOperator = opSequenceInProgress;
+    } else if (pauseTypeOpSequence) {
         mutCtx.precedingTypeOperator = typeOpSequenceInProgress;
     }
 

src/cognitive-complexity/node-inspection.ts

@@ -160,8 +160,15 @@ export function breaksASequenceOfBinaryOperators(node: ts.Node) {
 export function pausesASequenceOfBinaryOperators(node: ts.Node) {
     return ts.isCallLikeExpression(node)
         || ts.isPrefixUnaryExpression(node)
-        || ts.isParenthesizedExpression(node)
+}
+
+/**
+ * @see {pausesASequenceOfBinaryOperators} but for type operators
+ */
+export function pausesASequenceOfBinaryTypeOperators(node: ts.Node) {
+    return ts.isParenthesizedExpression(node)
         || ts.isTypeReferenceNode(node)
+        || ts.isAsExpression(node)
 }
 
 export function passThroughNameBeingAssigned(node: ts.Node): boolean {

test/cases/18-type-operators.expected.json

@@ -1,6 +1,6 @@
 {
     "18-type-operators.ts": {
-        "score": 42,
+        "score": 45,
         "inner": [
             {
                 "name": "A",
@@ -88,6 +88,12 @@
                 "score": 3,
                 "line": 32,
                 "column": 1
+            },
+            {
+                "name": "asBreaksTypeOpSequence_butNotDataOpSequence",
+                "score": 3,
+                "line": 34,
+                "column": 1
             }
         ]
     }

test/cases/18-type-operators.ts

@@ -30,3 +30,7 @@ function breaksInSequencesOfTypeOperators<T extends true | true = true | true>(p
 type InParentheses = NonNullable<true | true>
 
 type PauseSequenceInParentheses = NonNullable<true | true> | number | NonNullable<true | true> | number
+
+function asBreaksTypeOpSequence_butNotDataOpSequence() {
+    1 && (1 && 1 as 1 | 1 as 1 | 1) && 1 // 1 sequence of bitwise ors, 2 sequences of unions
+}