Using node instead of getNode()

src/index.ts

@@ -51,10 +51,8 @@ const parsers = {
   [antlrParserId]: antlrParser
 };
 
-const antlrCanAttachComment = (node: { type: string }): boolean =>
-  typeof node.type === 'string' &&
-  node.type !== 'BlockComment' &&
-  node.type !== 'LineComment';
+const antlrCanAttachComment = ({ type }: { type: string }): boolean =>
+  typeof type === 'string' && type !== 'BlockComment' && type !== 'LineComment';
 const canAttachComment = (node: AstNode): boolean =>
   typeof node !== 'string' &&
   typeof node !== 'undefined' &&

src/slang-comments/handlers/add-collection-node-first-comment.ts → src/slang-comments/handlers/add-collection-first-comment.ts

@@ -1,11 +1,11 @@
 import { util } from 'prettier';
 
-import type { Comment, CollectionNode } from '../../slang-nodes/types.d.ts';
+import type { Comment, Collection } from '../../slang-nodes/types.d.ts';
 
 const { addDanglingComment, addLeadingComment } = util;
 
-export default function addCollectionNodeFirstComment(
-  node: CollectionNode,
+export default function addCollectionFirstComment(
+  node: Collection,
   comment: Comment
 ): void {
   if (node.items.length === 0) {

src/slang-comments/handlers/add-collection-node-last-comment.ts → src/slang-comments/handlers/add-collection-last-comment.ts

@@ -1,11 +1,11 @@
 import { util } from 'prettier';
 
-import type { Comment, CollectionNode } from '../../slang-nodes/types.d.ts';
+import type { Comment, Collection } from '../../slang-nodes/types.d.ts';
 
 const { addDanglingComment, addTrailingComment } = util;
 
-export default function addCollectionNodeLastComment(
-  node: CollectionNode,
+export default function addCollectionLastComment(
+  node: Collection,
   comment: Comment
 ): void {
   if (node.items.length === 0) {

src/slang-comments/handlers/handle-block-comments.ts

@@ -1,6 +1,6 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import addCollectionNodeFirstComment from './add-collection-node-first-comment.js';
-import addCollectionNodeLastComment from './add-collection-node-last-comment.js';
+import addCollectionFirstComment from './add-collection-first-comment.js';
+import addCollectionLastComment from './add-collection-last-comment.js';
 
 import type { HandlerParams } from './types.d.ts';
 
@@ -15,12 +15,12 @@ export default function handleBlockComments({
   }
 
   if (precedingNode?.kind === NonterminalKind.Statements) {
-    addCollectionNodeLastComment(precedingNode, comment);
+    addCollectionLastComment(precedingNode, comment);
     return true;
   }
 
   if (followingNode?.kind === NonterminalKind.Statements) {
-    addCollectionNodeFirstComment(followingNode, comment);
+    addCollectionFirstComment(followingNode, comment);
     return true;
   }
 

src/slang-comments/handlers/handle-contract-definition-comments.ts

@@ -1,7 +1,7 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { util } from 'prettier';
 import { locEnd } from '../../slang-utils/loc.js';
-import addCollectionNodeLastComment from './add-collection-node-last-comment.js';
+import addCollectionLastComment from './add-collection-last-comment.js';
 
 import type { HandlerParams } from './types.d.ts';
 
@@ -36,7 +36,7 @@ export default function handleContractDefinitionComments({
 
   // The comment is at the end of the body of the ContractDefinition.
   if (precedingNode?.kind === NonterminalKind.ContractMembers) {
-    addCollectionNodeLastComment(precedingNode, comment);
+    addCollectionLastComment(precedingNode, comment);
     return true;
   }
 
@@ -52,7 +52,7 @@ export default function handleContractDefinitionComments({
       // If the last ContractSpecifier's an InheritanceSpecifier, the comment
       // is appended to the last InheritanceType.
       if (lastContractSpecifier.kind === NonterminalKind.InheritanceSpecifier) {
-        addCollectionNodeLastComment(lastContractSpecifier.types, comment);
+        addCollectionLastComment(lastContractSpecifier.types, comment);
         return true;
       }
       if (

src/slang-comments/handlers/handle-contract-specifiers-comments.ts

@@ -1,6 +1,6 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { util } from 'prettier';
-import addCollectionNodeLastComment from './add-collection-node-last-comment.js';
+import addCollectionLastComment from './add-collection-last-comment.js';
 
 import type { HandlerParams } from './types.d.ts';
 
@@ -20,7 +20,7 @@ export default function handleContractSpecifiersComments({
     precedingNode.kind === NonterminalKind.ContractSpecifier
   ) {
     if (precedingNode.variant.kind === NonterminalKind.InheritanceSpecifier) {
-      addCollectionNodeLastComment(precedingNode.variant.types, comment);
+      addCollectionLastComment(precedingNode.variant.types, comment);
       return true;
     }
     if (precedingNode.variant.kind === NonterminalKind.StorageLayoutSpecifier) {

src/slang-comments/handlers/handle-else-branch-comments.ts

@@ -1,6 +1,6 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { util } from 'prettier';
-import addCollectionNodeFirstComment from './add-collection-node-first-comment.js';
+import addCollectionFirstComment from './add-collection-first-comment.js';
 
 import type { HandlerParams } from './types.d.ts';
 
@@ -20,7 +20,7 @@ export default function handleElseBranchComments({
     followingNode.variant.kind === NonterminalKind.IfStatement
   ) {
     if (followingNode.variant.body.variant.kind === NonterminalKind.Block) {
-      addCollectionNodeFirstComment(
+      addCollectionFirstComment(
         followingNode.variant.body.variant.statements,
         comment
       );

src/slang-comments/handlers/handle-if-statement-comments.ts

@@ -1,7 +1,7 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { util } from 'prettier';
 import { locEnd } from '../../slang-utils/loc.js';
-import addCollectionNodeFirstComment from './add-collection-node-first-comment.js';
+import addCollectionFirstComment from './add-collection-first-comment.js';
 
 import type { HandlerParams } from './types.d.ts';
 
@@ -45,10 +45,7 @@ export default function handleIfStatementComments({
 
   if (followingNode.kind === NonterminalKind.IfStatement) {
     if (followingNode.body.variant.kind === NonterminalKind.Block) {
-      addCollectionNodeFirstComment(
-        followingNode.body.variant.statements,
-        comment
-      );
+      addCollectionFirstComment(followingNode.body.variant.statements, comment);
     } else {
       addLeadingComment(followingNode.body.variant, comment);
     }
@@ -60,7 +57,7 @@ export default function handleIfStatementComments({
   // if (a) /* comment */ true
   if (enclosingNode.body === followingNode) {
     if (followingNode.variant.kind === NonterminalKind.Block) {
-      addCollectionNodeFirstComment(followingNode.variant.statements, comment);
+      addCollectionFirstComment(followingNode.variant.statements, comment);
     } else {
       addLeadingComment(followingNode, comment);
     }

src/slang-comments/handlers/handle-interface-definition-comments.ts

@@ -1,8 +1,8 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { util } from 'prettier';
 import { locEnd } from '../../slang-utils/loc.js';
-import addCollectionNodeFirstComment from './add-collection-node-first-comment.js';
-import addCollectionNodeLastComment from './add-collection-node-last-comment.js';
+import addCollectionFirstComment from './add-collection-first-comment.js';
+import addCollectionLastComment from './add-collection-last-comment.js';
 
 import type { HandlerParams } from './types.d.ts';
 
@@ -24,7 +24,7 @@ export default function handleInterfaceDefinitionComments({
 
   // The comment is at the end of the body of the InterfaceDefinition.
   if (precedingNode?.kind === NonterminalKind.InterfaceMembers) {
-    addCollectionNodeLastComment(precedingNode, comment);
+    addCollectionLastComment(precedingNode, comment);
     return true;
   }
 
@@ -33,7 +33,7 @@ export default function handleInterfaceDefinitionComments({
     nextCharacter === '{' &&
     followingNode?.kind === NonterminalKind.InterfaceMembers
   ) {
-    addCollectionNodeFirstComment(followingNode, comment);
+    addCollectionFirstComment(followingNode, comment);
     return true;
   }
 

src/slang-comments/handlers/handle-library-definition-comments.ts

@@ -1,8 +1,8 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { util } from 'prettier';
 import { locEnd } from '../../slang-utils/loc.js';
-import addCollectionNodeFirstComment from './add-collection-node-first-comment.js';
-import addCollectionNodeLastComment from './add-collection-node-last-comment.js';
+import addCollectionFirstComment from './add-collection-first-comment.js';
+import addCollectionLastComment from './add-collection-last-comment.js';
 
 import type { HandlerParams } from './types.d.ts';
 
@@ -24,7 +24,7 @@ export default function handleLibraryDefinitionComments({
 
   // The comment is at the end of the body of the ContractDefinition.
   if (precedingNode?.kind === NonterminalKind.LibraryMembers) {
-    addCollectionNodeLastComment(precedingNode, comment);
+    addCollectionLastComment(precedingNode, comment);
     return true;
   }
 
@@ -33,7 +33,7 @@ export default function handleLibraryDefinitionComments({
     nextCharacter === '{' &&
     followingNode?.kind === NonterminalKind.LibraryMembers
   ) {
-    addCollectionNodeFirstComment(followingNode, comment);
+    addCollectionFirstComment(followingNode, comment);
     return true;
   }
 

src/slang-comments/handlers/handle-modifier-invocation-comments.ts

@@ -1,7 +1,7 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { util } from 'prettier';
 import { locEnd } from '../../slang-utils/loc.js';
-import addCollectionNodeFirstComment from './add-collection-node-first-comment.js';
+import addCollectionFirstComment from './add-collection-first-comment.js';
 
 import type { HandlerParams } from './types.d.ts';
 
@@ -34,7 +34,7 @@ export default function handleModifierInvocationComments({
     if (followingNode.variant.arguments.items.length === 0) {
       addTrailingComment(enclosingNode, comment);
     } else {
-      addCollectionNodeFirstComment(followingNode.variant.arguments, comment);
+      addCollectionFirstComment(followingNode.variant.arguments, comment);
     }
     return true;
   }

src/slang-comments/handlers/handle-parameters-declaration-comments.ts

@@ -1,6 +1,6 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import addCollectionNodeFirstComment from './add-collection-node-first-comment.js';
-import addCollectionNodeLastComment from './add-collection-node-last-comment.js';
+import addCollectionFirstComment from './add-collection-first-comment.js';
+import addCollectionLastComment from './add-collection-last-comment.js';
 
 import type { HandlerParams } from './types.d.ts';
 
@@ -15,12 +15,12 @@ export default function handleBlockComments({
   }
 
   if (precedingNode?.kind === NonterminalKind.Parameters) {
-    addCollectionNodeLastComment(precedingNode, comment);
+    addCollectionLastComment(precedingNode, comment);
     return true;
   }
 
   if (followingNode?.kind === NonterminalKind.Parameters) {
-    addCollectionNodeFirstComment(followingNode, comment);
+    addCollectionFirstComment(followingNode, comment);
     return true;
   }
 

src/slang-comments/handlers/handle-positional-arguments-declaration-comments.ts

@@ -1,6 +1,6 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import addCollectionNodeFirstComment from './add-collection-node-first-comment.js';
-import addCollectionNodeLastComment from './add-collection-node-last-comment.js';
+import addCollectionFirstComment from './add-collection-first-comment.js';
+import addCollectionLastComment from './add-collection-last-comment.js';
 
 import type { HandlerParams } from './types.d.ts';
 
@@ -15,12 +15,12 @@ export default function handlePositionalArgumentsDeclarationComments({
   }
 
   if (precedingNode?.kind === NonterminalKind.PositionalArguments) {
-    addCollectionNodeLastComment(precedingNode, comment);
+    addCollectionLastComment(precedingNode, comment);
     return true;
   }
 
   if (followingNode?.kind === NonterminalKind.PositionalArguments) {
-    addCollectionNodeFirstComment(followingNode, comment);
+    addCollectionFirstComment(followingNode, comment);
     return true;
   }
 

src/slang-comments/handlers/handle-while-statement-comments.ts

@@ -1,7 +1,7 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { util } from 'prettier';
 import { locEnd } from '../../slang-utils/loc.js';
-import addCollectionNodeFirstComment from './add-collection-node-first-comment.js';
+import addCollectionFirstComment from './add-collection-first-comment.js';
 
 import type { HandlerParams } from './types.d.ts';
 
@@ -37,7 +37,7 @@ export default function handleWhileStatementComments({
 
   if (enclosingNode.body === followingNode) {
     if (followingNode.variant.kind === NonterminalKind.Block) {
-      addCollectionNodeFirstComment(followingNode.variant.statements, comment);
+      addCollectionFirstComment(followingNode.variant.statements, comment);
     } else {
       addLeadingComment(followingNode, comment);
     }

src/slang-comments/printer.ts

@@ -3,9 +3,7 @@ import { isComment } from '../slang-utils/is-comment.js';
 import type { AstPath, Doc } from 'prettier';
 import type { AstNode } from '../slang-nodes/types.d.ts';
 
-export function printComment(commentPath: AstPath<AstNode>): Doc {
-  const comment = commentPath.getNode()!;
-
+export function printComment({ node: comment }: AstPath<AstNode>): Doc {
   if (isComment(comment)) {
     return comment.print();
   }

src/slang-nodes/BitwiseOrExpression.ts

@@ -38,11 +38,11 @@ export class BitwiseOrExpression implements SlangNode {
 
   loc;
 
-  leftOperand;
+  leftOperand: Expression;
 
-  operator;
+  operator: string;
 
-  rightOperand;
+  rightOperand: Expression;
 
   constructor(ast: ast.BitwiseOrExpression, options: ParserOptions<AstNode>) {
     let metadata = getNodeMetadata(ast);

src/slang-nodes/ConditionalExpression.ts

@@ -11,11 +11,11 @@ import type { PrintFunction, SlangNode } from '../types.d.ts';
 
 const { group, hardline, ifBreak, indent, line, softline } = doc.builders;
 
-function fillTab(options: ParserOptions<AstNode>): Doc {
-  if (options.useTabs) return '\t';
+function fillTab({ useTabs, tabWidth }: ParserOptions<AstNode>): Doc {
+  if (useTabs) return '\t';
   // For the odd case of `tabWidth` of 1 or 0 we initiate `fillTab` as a single
   // space.
-  return options.tabWidth > 2 ? ' '.repeat(options.tabWidth - 1) : ' ';
+  return tabWidth > 2 ? ' '.repeat(tabWidth - 1) : ' ';
 }
 
 function experimentalTernaries(
@@ -24,7 +24,7 @@ function experimentalTernaries(
   print: PrintFunction,
   options: ParserOptions<AstNode>
 ): Doc {
-  const grandparent = path.getNode(2) as StrictAstNode;
+  const grandparent = path.grandparent as StrictAstNode;
   const isNested = grandparent.kind === NonterminalKind.ConditionalExpression;
   const isNestedAsTrueExpression =
     isNested && grandparent.trueExpression.variant === node;
@@ -50,9 +50,10 @@ function experimentalTernaries(
     path.call(print, 'trueExpression')
   ]);
 
+  const groupId = Symbol('Slang.ConditionalExpression.trueExpression');
   const conditionAndTrueExpressionGroup = group(
     [operandDoc, trueExpressionDoc],
-    { id: Symbol('Slang.ConditionalExpression.trueExpression') }
+    { id: groupId }
   );
 
   const falseExpression = path.call(print, 'falseExpression');
@@ -64,10 +65,9 @@ function experimentalTernaries(
       : ifBreak(
           [fillTab(options), indent(falseExpression)],
           [' ', falseExpression],
-          {
-            // We only add `fillTab` if we are sure the trueExpression is indented
-            groupId: conditionAndTrueExpressionGroup.id
-          }
+          // We only add `fillTab` if we are sure the trueExpression is
+          // indented.
+          { groupId }
         )
   ];
 
@@ -87,7 +87,7 @@ function traditionalTernaries(
     indent([
       // Nested trueExpression and falseExpression are always printed in a new
       // line
-      (path.getNode(2) as StrictAstNode).kind ===
+      (path.grandparent as StrictAstNode).kind ===
       NonterminalKind.ConditionalExpression
         ? hardline
         : line,