using the latest print signature (#1500)

* `path.call(print, 'selector')` can be called like `print('selector')`

* rearrange Node's `print` signature to delete unneeded `path` parameter

* if `print` is called without an argument, it prints the current `path`

* small refactor to avoid `const` creation

Author: Janther

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')
     ]);
   }
 }