cleaning up how we check for TupleExpressions with a single item, so we minimise the amount of chained accesses and as a bonus removing the non-null assertions

Author: Janther

src/slang-nodes/ConditionalExpression.ts

@@ -133,13 +133,22 @@ export class ConditionalExpression implements SlangNode {
       // We can remove parentheses only because we are sure that the
       // `condition` must be a single `bool` value.
       const operandLoc = this.operand.loc;
-      while (
-        this.operand.variant.kind === NonterminalKind.TupleExpression &&
-        this.operand.variant.items.items.length === 1 &&
-        this.operand.variant.items.items[0].expression!.variant.kind !==
-          NonterminalKind.ConditionalExpression
+
+      const getOperandSingleExpression = (): Expression | undefined => {
+        const operandVariant = this.operand.variant;
+        return operandVariant.kind === NonterminalKind.TupleExpression
+          ? operandVariant.items.getSingleExpression()
+          : undefined;
+      };
+
+      for (
+        let operandSingleExpression = getOperandSingleExpression();
+        operandSingleExpression &&
+        operandSingleExpression.variant.kind !==
+          NonterminalKind.ConditionalExpression;
+        operandSingleExpression = getOperandSingleExpression()
       ) {
-        this.operand = this.operand.variant.items.items[0].expression!;
+        this.operand = operandSingleExpression;
       }
       this.operand.loc = operandLoc;
     }

src/slang-nodes/MemberAccessExpression.ts

@@ -24,9 +24,9 @@ function isEndOfChain(
   path: AstPath<StrictAstNode>
 ): boolean {
   for (
-    let i = 2, current: StrictAstNode = node, grandparent = path.getNode(i)!;
-    isChainableExpression(grandparent);
-    i += 2, current = grandparent, grandparent = path.getNode(i)!
+    let i = 2, current: StrictAstNode = node, grandparent = path.getNode(i);
+    grandparent && isChainableExpression(grandparent);
+    i += 2, current = grandparent, grandparent = path.getNode(i)
   ) {
     switch (grandparent.kind) {
       case NonterminalKind.MemberAccessExpression:

src/slang-nodes/TupleValues.ts

@@ -8,6 +8,7 @@ import type * as ast from '@nomicfoundation/slang/ast';
 import type { AstPath, Doc, ParserOptions } from 'prettier';
 import type { AstNode } from './types.d.ts';
 import type { PrintFunction, SlangNode } from '../types.d.ts';
+import type { Expression } from './Expression.js';
 
 export class TupleValues implements SlangNode {
   readonly kind = NonterminalKind.TupleValues;
@@ -32,11 +33,15 @@ export class TupleValues implements SlangNode {
     this.loc = metadata.loc;
   }
 
+  getSingleExpression(): Expression | undefined {
+    return this.items.length === 1 ? this.items[0].expression : undefined;
+  }
+
   print(path: AstPath<TupleValues>, print: PrintFunction): Doc {
-    return this.items.length === 1 &&
-      this.items[0].expression &&
-      this.items[0].expression.variant.kind !== TerminalKind.Identifier &&
-      isBinaryOperation(this.items[0].expression.variant)
+    const singleExpression = this.getSingleExpression();
+    return singleExpression &&
+      singleExpression.variant.kind !== TerminalKind.Identifier &&
+      isBinaryOperation(singleExpression.variant)
       ? path.map(print, 'items')
       : printSeparatedList(path.map(print, 'items'));
   }