using the latest print signature

src/index.ts

@@ -12,7 +12,10 @@ import { locEnd, locStart } from './slang-utils/loc.js';
 import { hasPrettierIgnore } from './slang-utils/has-prettier-ignore.js';
 
 import type {
+  AstPath,
+  Doc,
   Parser,
+  ParserOptions,
   Printer,
   RequiredOptions,
   SupportLanguage
@@ -77,7 +80,12 @@ const slangPrinter: Printer<PrintableNode | undefined> = {
   handleComments,
   isBlockComment,
   massageAstNode,
-  print: slangPrint,
+  print: slangPrint as (
+    path: AstPath<PrintableNode | undefined>,
+    options: ParserOptions<PrintableNode | undefined>,
+    print: (path: AstPath<PrintableNode | undefined>) => Doc,
+    args?: unknown
+  ) => Doc,
   hasPrettierIgnore,
   printComment
 };

src/slang-nodes/AbicoderPragma.ts

@@ -3,7 +3,7 @@ import { SlangNode } from './SlangNode.js';
 import { AbicoderVersion } from './AbicoderVersion.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
-import type { AstPath, Doc } from 'prettier';
+import type { Doc } from 'prettier';
 import type { CollectedMetadata, PrintFunction } from '../types.d.ts';
 
 export class AbicoderPragma extends SlangNode {
@@ -19,7 +19,7 @@ export class AbicoderPragma extends SlangNode {
     this.updateMetadata(this.version);
   }
 
-  print(path: AstPath<AbicoderPragma>, print: PrintFunction): Doc {
-    return ['abicoder ', path.call(print, 'version')];
+  print(print: PrintFunction): Doc {
+    return ['abicoder ', print('version')];
   }
 }

src/slang-nodes/AdditiveExpression.ts

@@ -57,8 +57,8 @@ export class AdditiveExpression extends SlangNode {
   }
 
   print(
-    path: AstPath<AdditiveExpression>,
     print: PrintFunction,
+    path: AstPath<AdditiveExpression>,
     options: ParserOptions<PrintableNode>
   ): Doc {
     return printAdditiveExpression(this, path, print, options);

src/slang-nodes/AndExpression.ts

@@ -37,8 +37,8 @@ export class AndExpression extends SlangNode {
   }
 
   print(
-    path: AstPath<AndExpression>,
     print: PrintFunction,
+    path: AstPath<AndExpression>,
     options: ParserOptions<PrintableNode>
   ): Doc {
     return printLogicalOperation(this, path, print, options);

src/slang-nodes/ArrayExpression.ts

@@ -3,7 +3,7 @@ import { SlangNode } from './SlangNode.js';
 import { ArrayValues } from './ArrayValues.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
-import type { AstPath, Doc, ParserOptions } from 'prettier';
+import type { Doc, ParserOptions } from 'prettier';
 import type { CollectedMetadata, PrintFunction } from '../types.d.ts';
 import type { PrintableNode } from './types.d.ts';
 
@@ -24,7 +24,7 @@ export class ArrayExpression extends SlangNode {
     this.updateMetadata(this.items);
   }
 
-  print(path: AstPath<ArrayExpression>, print: PrintFunction): Doc {
-    return ['[', path.call(print, 'items'), ']'];
+  print(print: PrintFunction): Doc {
+    return ['[', print('items'), ']'];
   }
 }

src/slang-nodes/ArrayTypeName.ts

@@ -5,7 +5,7 @@ import { TypeName } from './TypeName.js';
 import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
-import type { AstPath, Doc, ParserOptions } from 'prettier';
+import type { Doc, ParserOptions } from 'prettier';
 import type { CollectedMetadata, PrintFunction } from '../types.d.ts';
 import type { PrintableNode } from './types.d.ts';
 
@@ -35,7 +35,7 @@ export class ArrayTypeName extends SlangNode {
     this.updateMetadata(this.operand, this.index);
   }
 
-  print(path: AstPath<ArrayTypeName>, print: PrintFunction): Doc {
-    return [path.call(print, 'operand'), '[', path.call(print, 'index'), ']'];
+  print(print: PrintFunction): Doc {
+    return [print('operand'), '[', print('index'), ']'];
   }
 }

src/slang-nodes/ArrayValues.ts

@@ -26,7 +26,7 @@ export class ArrayValues extends SlangNode {
     );
   }
 
-  print(path: AstPath<ArrayValues>, print: PrintFunction): Doc {
+  print(print: PrintFunction, path: AstPath<ArrayValues>): Doc {
     return printSeparatedList(path.map(print, 'items'));
   }
 }

src/slang-nodes/AssemblyFlags.ts

@@ -25,7 +25,7 @@ export class AssemblyFlags extends SlangNode {
     );
   }
 
-  print(path: AstPath<AssemblyFlags>, print: PrintFunction): Doc {
+  print(print: PrintFunction, path: AstPath<AssemblyFlags>): Doc {
     return printSeparatedList(path.map(print, 'items'));
   }
 }

src/slang-nodes/AssemblyFlagsDeclaration.ts

@@ -3,7 +3,7 @@ import { SlangNode } from './SlangNode.js';
 import { AssemblyFlags } from './AssemblyFlags.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
-import type { AstPath, Doc, ParserOptions } from 'prettier';
+import type { Doc, ParserOptions } from 'prettier';
 import type { CollectedMetadata, PrintFunction } from '../types.d.ts';
 import type { PrintableNode } from './types.d.ts';
 
@@ -24,7 +24,7 @@ export class AssemblyFlagsDeclaration extends SlangNode {
     this.updateMetadata(this.flags);
   }
 
-  print(path: AstPath<AssemblyFlagsDeclaration>, print: PrintFunction): Doc {
-    return ['(', path.call(print, 'flags'), ')'];
+  print(print: PrintFunction): Doc {
+    return ['(', print('flags'), ')'];
   }
 }

src/slang-nodes/AssemblyStatement.ts

@@ -6,7 +6,7 @@ import { AssemblyFlagsDeclaration } from './AssemblyFlagsDeclaration.js';
 import { YulBlock } from './YulBlock.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
-import type { AstPath, Doc, ParserOptions } from 'prettier';
+import type { Doc, ParserOptions } from 'prettier';
 import type { CollectedMetadata, PrintFunction } from '../types.d.ts';
 import type { PrintableNode } from './types.d.ts';
 
@@ -37,12 +37,12 @@ export class AssemblyStatement extends SlangNode {
     this.updateMetadata(this.label, this.flags, this.body);
   }
 
-  print(path: AstPath<AssemblyStatement>, print: PrintFunction): Doc {
+  print(print: PrintFunction): Doc {
     return joinExisting(' ', [
       'assembly',
-      path.call(print, 'label'),
-      path.call(print, 'flags'),
-      path.call(print, 'body')
+      print('label'),
+      print('flags'),
+      print('body')
     ]);
   }
 }

src/slang-nodes/AssignmentExpression.ts

@@ -5,7 +5,7 @@ import { SlangNode } from './SlangNode.js';
 import { Expression } from './Expression.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
-import type { AstPath, Doc, ParserOptions } from 'prettier';
+import type { Doc, ParserOptions } from 'prettier';
 import type { CollectedMetadata, PrintFunction } from '../types.d.ts';
 import type { PrintableNode } from './types.d.ts';
 
@@ -36,14 +36,11 @@ export class AssignmentExpression extends SlangNode {
     this.updateMetadata(this.leftOperand, this.rightOperand);
   }
 
-  print(path: AstPath<AssignmentExpression>, print: PrintFunction): Doc {
+  print(print: PrintFunction): Doc {
     return [
-      path.call(print, 'leftOperand'),
+      print('leftOperand'),
       ` ${this.operator}`,
-      printAssignmentRightSide(
-        path.call(print, 'rightOperand'),
-        this.rightOperand
-      )
+      printAssignmentRightSide(print('rightOperand'), this.rightOperand)
     ];
   }
 }

src/slang-nodes/BitwiseAndExpression.ts

@@ -53,8 +53,8 @@ export class BitwiseAndExpression extends SlangNode {
   }
 
   print(
-    path: AstPath<BitwiseAndExpression>,
     print: PrintFunction,
+    path: AstPath<BitwiseAndExpression>,
     options: ParserOptions<PrintableNode>
   ): Doc {
     return printBitwiseAndExpression(this, path, print, options);

src/slang-nodes/BitwiseOrExpression.ts

@@ -63,8 +63,8 @@ export class BitwiseOrExpression extends SlangNode {
   }
 
   print(
-    path: AstPath<BitwiseOrExpression>,
     print: PrintFunction,
+    path: AstPath<BitwiseOrExpression>,
     options: ParserOptions<PrintableNode>
   ): Doc {
     return printBitwiseOrExpression(this, path, print, options);

src/slang-nodes/BitwiseXorExpression.ts

@@ -53,8 +53,8 @@ export class BitwiseXorExpression extends SlangNode {
   }
 
   print(
-    path: AstPath<BitwiseXorExpression>,
     print: PrintFunction,
+    path: AstPath<BitwiseXorExpression>,
     options: ParserOptions<PrintableNode>
   ): Doc {
     return printBitwiseXorExpression(this, path, print, options);

src/slang-nodes/Block.ts

@@ -3,7 +3,7 @@ import { SlangNode } from './SlangNode.js';
 import { Statements } from './Statements.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
-import type { AstPath, Doc, ParserOptions } from 'prettier';
+import type { Doc, ParserOptions } from 'prettier';
 import type { CollectedMetadata, PrintFunction } from '../types.d.ts';
 import type { PrintableNode } from './types.d.ts';
 
@@ -24,7 +24,7 @@ export class Block extends SlangNode {
     this.updateMetadata(this.statements);
   }
 
-  print(path: AstPath<Block>, print: PrintFunction): Doc {
-    return ['{', path.call(print, 'statements'), '}'];
+  print(print: PrintFunction): Doc {
+    return ['{', print('statements'), '}'];
   }
 }

src/slang-nodes/CallOptions.ts

@@ -29,8 +29,8 @@ export class CallOptions extends SlangNode {
   }
 
   print(
-    path: AstPath<CallOptions>,
     print: PrintFunction,
+    path: AstPath<CallOptions>,
     options: ParserOptions<PrintableNode>
   ): Doc {
     return printSeparatedList(path.map(print, 'items'), {

src/slang-nodes/CallOptionsExpression.ts

@@ -5,7 +5,7 @@ import { Expression } from './Expression.js';
 import { CallOptions } from './CallOptions.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
-import type { AstPath, Doc, ParserOptions } from 'prettier';
+import type { Doc, ParserOptions } from 'prettier';
 import type { CollectedMetadata, PrintFunction } from '../types.d.ts';
 import type { PrintableNode } from './types.d.ts';
 
@@ -31,7 +31,7 @@ export class CallOptionsExpression extends SlangNode {
     this.updateMetadata(this.operand, this.options);
   }
 
-  print(path: AstPath<CallOptionsExpression>, print: PrintFunction): Doc {
-    return [path.call(print, 'operand'), '{', path.call(print, 'options'), '}'];
+  print(print: PrintFunction): Doc {
+    return [print('operand'), '{', print('options'), '}'];
   }
 }

src/slang-nodes/CatchClause.ts

@@ -4,7 +4,7 @@ import { CatchClauseError } from './CatchClauseError.js';
 import { Block } from './Block.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
-import type { AstPath, Doc, ParserOptions } from 'prettier';
+import type { Doc, ParserOptions } from 'prettier';
 import type { CollectedMetadata, PrintFunction } from '../types.d.ts';
 import type { PrintableNode } from './types.d.ts';
 
@@ -30,7 +30,7 @@ export class CatchClause extends SlangNode {
     this.updateMetadata(this.error, this.body);
   }
 
-  print(path: AstPath<CatchClause>, print: PrintFunction): Doc {
-    return ['catch ', path.call(print, 'error'), path.call(print, 'body')];
+  print(print: PrintFunction): Doc {
+    return ['catch ', print('error'), print('body')];
   }
 }

src/slang-nodes/CatchClauseError.ts

@@ -5,7 +5,7 @@ import { TerminalNode } from './TerminalNode.js';
 import { ParametersDeclaration } from './ParametersDeclaration.js';
 
 import type * as ast from '@nomicfoundation/slang/ast';
-import type { AstPath, Doc, ParserOptions } from 'prettier';
+import type { Doc, ParserOptions } from 'prettier';
 import type { CollectedMetadata, PrintFunction } from '../types.d.ts';
 import type { PrintableNode } from './types.d.ts';
 
@@ -37,11 +37,7 @@ export class CatchClauseError extends SlangNode {
     this.updateMetadata(this.parameters);
   }
 
-  print(path: AstPath<CatchClauseError>, print: PrintFunction): Doc {
-    return [
-      path.call(print, 'name'),
-      group(path.call(print, 'parameters')),
-      ' '
-    ];
+  print(print: PrintFunction): Doc {
+    return [print('name'), group(print('parameters')), ' '];
   }
 }

src/slang-nodes/CatchClauses.ts

@@ -29,7 +29,7 @@ export class CatchClauses extends SlangNode {
     this.updateMetadata(...this.items);
   }
 
-  print(path: AstPath<CatchClauses>, print: PrintFunction): Doc {
+  print(print: PrintFunction, path: AstPath<CatchClauses>): Doc {
     return join(' ', path.map(print, 'items'));
   }
 }

src/slang-nodes/ConditionalExpression.ts

@@ -28,7 +28,7 @@ function experimentalTernaries(
 
   // If the `condition` breaks into multiple lines, we add parentheses,
   // unless it already is a `TupleExpression`.
-  const operand = path.call(print, 'operand');
+  const operand = print('operand');
   const operandDoc = group([
     node.operand.kind === NonterminalKind.TupleExpression
       ? operand
@@ -41,7 +41,7 @@ function experimentalTernaries(
   // `trueExpression`.
   const trueExpressionDoc = indent([
     isNestedAsTrueExpression ? hardline : line,
-    path.call(print, 'trueExpression')
+    print('trueExpression')
   ]);
 
   const groupId = Symbol('Slang.ConditionalExpression.trueExpression');
@@ -58,7 +58,7 @@ function experimentalTernaries(
       ? ' '.repeat(tabWidth - 1)
       : ' ';
 
-  const falseExpression = path.call(print, 'falseExpression');
+  const falseExpression = print('falseExpression');
   const falseExpressionDoc = [
     isNested ? hardline : line,
     ':',
@@ -81,18 +81,18 @@ function traditionalTernaries(
   print: PrintFunction
 ): Doc {
   return group([
-    path.call(print, 'operand'),
+    print('operand'),
     indent([
       // Nested trueExpression and falseExpression are always printed in a new
       // line
       path.parent!.kind === NonterminalKind.ConditionalExpression
         ? hardline
         : line,
       '? ',
-      path.call(print, 'trueExpression'),
+      print('trueExpression'),
       line,
       ': ',
-      path.call(print, 'falseExpression')
+      print('falseExpression')
     ])
   ]);
 }
@@ -156,8 +156,8 @@ export class ConditionalExpression extends SlangNode {
   }
 
   print(
-    path: AstPath<ConditionalExpression>,
     print: PrintFunction,
+    path: AstPath<ConditionalExpression>,
     options: ParserOptions<PrintableNode>
   ): Doc {
     return options.experimentalTernaries