Removing joinExisting

src/slang-nodes/AssemblyStatement.ts

@@ -1,5 +1,4 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { joinExisting } from '../slang-utils/join-existing.js';
 import { SlangNode } from './SlangNode.js';
 import { StringLiteral } from './StringLiteral.js';
 import { AssemblyFlagsDeclaration } from './AssemblyFlagsDeclaration.js';
@@ -38,11 +37,13 @@ export class AssemblyStatement extends SlangNode {
   }
 
   print(print: PrintFunction): Doc {
-    return joinExisting(' ', [
-      'assembly',
-      print('label'),
-      print('flags'),
+    const labelDoc = print('label');
+    const flagsDoc = print('flags');
+    return [
+      'assembly ',
+      labelDoc ? [labelDoc, ' '] : labelDoc,
+      flagsDoc ? [flagsDoc, ' '] : flagsDoc,
       print('body')
-    ]);
+    ];
   }
 }

src/slang-nodes/ConstructorDefinition.ts

@@ -1,5 +1,5 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { printFunctionWithBody } from '../slang-printers/print-function.js';
+import { printFunction } from '../slang-printers/print-function.js';
 import { SlangNode } from './SlangNode.js';
 import { ParametersDeclaration } from './ParametersDeclaration.js';
 import { ConstructorAttributes } from './ConstructorAttributes.js';
@@ -42,6 +42,6 @@ export class ConstructorDefinition extends SlangNode {
   }
 
   print(print: PrintFunction): Doc {
-    return printFunctionWithBody('constructor', this, print);
+    return printFunction('constructor', this, print);
   }
 }

src/slang-nodes/ContractDefinition.ts

@@ -60,9 +60,8 @@ export class ContractDefinition extends SlangNode {
 
   print(print: PrintFunction): Doc {
     return [
+      `${this.abstractKeyword ? 'abstract ' : ''}contract `,
       group([
-        this.abstractKeyword ? 'abstract ' : '',
-        'contract ',
         print('name'),
         print('specifiers'),
         this.specifiers.items.length > 0 ? '' : line,

src/slang-nodes/DecimalNumberExpression.ts

@@ -1,5 +1,4 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { joinExisting } from '../slang-utils/join-existing.js';
 import { SlangNode } from './SlangNode.js';
 import { NumberUnit } from './NumberUnit.js';
 
@@ -26,6 +25,7 @@ export class DecimalNumberExpression extends SlangNode {
   }
 
   print(print: PrintFunction): Doc {
-    return joinExisting(' ', [this.literal, print('unit')]);
+    const unitDoc = print('unit');
+    return [this.literal, unitDoc ? [' ', unitDoc] : unitDoc];
   }
 }

src/slang-nodes/ErrorParameter.ts

@@ -1,5 +1,4 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { joinExisting } from '../slang-utils/join-existing.js';
 import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { TypeName } from './TypeName.js';
@@ -35,6 +34,7 @@ export class ErrorParameter extends SlangNode {
   }
 
   print(print: PrintFunction): Doc {
-    return joinExisting(' ', [print('typeName'), print('name')]);
+    const nameDoc = print('name');
+    return [print('typeName'), nameDoc ? [' ', nameDoc] : nameDoc];
   }
 }

src/slang-nodes/EventParameter.ts

@@ -1,5 +1,4 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { joinExisting } from '../slang-utils/join-existing.js';
 import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { TypeName } from './TypeName.js';
@@ -38,10 +37,11 @@ export class EventParameter extends SlangNode {
   }
 
   print(print: PrintFunction): Doc {
-    return joinExisting(' ', [
+    const nameDoc = print('name');
+    return [
       print('typeName'),
-      this.indexedKeyword,
-      print('name')
-    ]);
+      this.indexedKeyword ? ' indexed' : '',
+      nameDoc ? [' ', nameDoc] : nameDoc
+    ];
   }
 }

src/slang-nodes/FallbackFunctionDefinition.ts

@@ -1,5 +1,5 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { printFunctionWithBody } from '../slang-printers/print-function.js';
+import { printFunction } from '../slang-printers/print-function.js';
 import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { ParametersDeclaration } from './ParametersDeclaration.js';
@@ -60,6 +60,6 @@ export class FallbackFunctionDefinition extends SlangNode {
   }
 
   print(print: PrintFunction): Doc {
-    return printFunctionWithBody('fallback', this, print);
+    return printFunction('fallback', this, print);
   }
 }

src/slang-nodes/FunctionDefinition.ts

@@ -1,6 +1,6 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { satisfies } from 'semver';
-import { printFunctionWithBody } from '../slang-printers/print-function.js';
+import { printFunction } from '../slang-printers/print-function.js';
 import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { FunctionName } from './FunctionName.js';
@@ -76,6 +76,6 @@ export class FunctionDefinition extends SlangNode {
   }
 
   print(print: PrintFunction): Doc {
-    return printFunctionWithBody(['function ', print('name')], this, print);
+    return printFunction(['function ', print('name')], this, print);
   }
 }

src/slang-nodes/HexNumberExpression.ts

@@ -1,5 +1,4 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { joinExisting } from '../slang-utils/join-existing.js';
 import { SlangNode } from './SlangNode.js';
 import { NumberUnit } from './NumberUnit.js';
 
@@ -26,6 +25,7 @@ export class HexNumberExpression extends SlangNode {
   }
 
   print(print: PrintFunction): Doc {
-    return joinExisting(' ', [this.literal, print('unit')]);
+    const unitDoc = print('unit');
+    return [this.literal, unitDoc ? [' ', unitDoc] : unitDoc];
   }
 }

src/slang-nodes/InterfaceDefinition.ts

@@ -43,8 +43,8 @@ export class InterfaceDefinition extends SlangNode {
 
   print(print: PrintFunction): Doc {
     return [
+      'interface ',
       group([
-        'interface ',
         print('name'),
         this.inheritance ? [' ', print('inheritance')] : line,
         '{'

src/slang-nodes/LibraryDefinition.ts

@@ -46,7 +46,8 @@ export class LibraryDefinition extends SlangNode {
 
   print(print: PrintFunction): Doc {
     return [
-      group(['library ', print('name'), line, '{']),
+      'library ',
+      group([print('name'), line, '{']),
       print('members'),
       '}'
     ];

src/slang-nodes/MappingKey.ts

@@ -1,5 +1,4 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { joinExisting } from '../slang-utils/join-existing.js';
 import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { MappingKeyType } from './MappingKeyType.js';
@@ -28,6 +27,7 @@ export class MappingKey extends SlangNode {
   }
 
   print(print: PrintFunction): Doc {
-    return joinExisting(' ', [print('keyType'), print('name')]);
+    const nameDoc = print('name');
+    return [print('keyType'), nameDoc ? [' ', nameDoc] : nameDoc];
   }
 }

src/slang-nodes/MappingValue.ts

@@ -1,5 +1,4 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { joinExisting } from '../slang-utils/join-existing.js';
 import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { TypeName } from './TypeName.js';
@@ -35,6 +34,7 @@ export class MappingValue extends SlangNode {
   }
 
   print(print: PrintFunction): Doc {
-    return joinExisting(' ', [print('typeName'), print('name')]);
+    const nameDoc = print('name');
+    return [print('typeName'), nameDoc ? [' ', nameDoc] : nameDoc];
   }
 }

src/slang-nodes/ModifierDefinition.ts

@@ -1,5 +1,5 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { printFunctionWithBody } from '../slang-printers/print-function.js';
+import { printFunction } from '../slang-printers/print-function.js';
 import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { TerminalNode } from './TerminalNode.js';
@@ -78,6 +78,6 @@ export class ModifierDefinition extends SlangNode {
   }
 
   print(print: PrintFunction): Doc {
-    return printFunctionWithBody(['modifier ', print('name')], this, print);
+    return printFunction(['modifier ', print('name')], this, print);
   }
 }

src/slang-nodes/Parameter.ts

@@ -1,6 +1,5 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
-import { joinExisting } from '../slang-utils/join-existing.js';
 import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { TypeName } from './TypeName.js';
@@ -47,12 +46,12 @@ export class Parameter extends SlangNode {
   }
 
   print(print: PrintFunction): Doc {
-    return group(
-      joinExisting(' ', [
-        print('typeName'),
-        print('storageLocation'),
-        print('name')
-      ])
-    );
+    const storageLocationDoc = print('storageLocation');
+    const nameDoc = print('name');
+    return group([
+      print('typeName'),
+      storageLocationDoc ? [' ', storageLocationDoc] : storageLocationDoc,
+      nameDoc ? [' ', nameDoc] : nameDoc
+    ]);
   }
 }

src/slang-nodes/ReceiveFunctionDefinition.ts

@@ -1,5 +1,5 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { printFunctionWithBody } from '../slang-printers/print-function.js';
+import { printFunction } from '../slang-printers/print-function.js';
 import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { ParametersDeclaration } from './ParametersDeclaration.js';
@@ -49,6 +49,6 @@ export class ReceiveFunctionDefinition extends SlangNode {
   }
 
   print(print: PrintFunction): Doc {
-    return printFunctionWithBody('receive', this, print);
+    return printFunction('receive', this, print);
   }
 }

src/slang-nodes/TryStatement.ts

@@ -1,7 +1,6 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { doc } from 'prettier';
 import { printSeparatedItem } from '../slang-printers/print-separated-item.js';
-import { joinExisting } from '../slang-utils/join-existing.js';
 import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { Expression } from './Expression.js';
@@ -52,16 +51,18 @@ export class TryStatement extends SlangNode {
   }
 
   print(print: PrintFunction): Doc {
+    const returnsDoc = print('returns');
     return [
       'try',
       printSeparatedItem(print('expression'), {
         firstSeparator: line
       }),
-      joinExisting(' ', [
-        print('returns'),
+      [
+        returnsDoc ? [returnsDoc, ' '] : returnsDoc,
         print('body'),
+        ' ',
         print('catchClauses')
-      ])
+      ]
     ];
   }
 }

src/slang-nodes/TypedTupleMember.ts

@@ -1,5 +1,4 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { joinExisting } from '../slang-utils/join-existing.js';
 import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { TypeName } from './TypeName.js';
@@ -42,10 +41,12 @@ export class TypedTupleMember extends SlangNode {
   }
 
   print(print: PrintFunction): Doc {
-    return joinExisting(' ', [
+    const storageLocationDoc = print('storageLocation');
+    return [
       print('typeName'),
-      print('storageLocation'),
+      storageLocationDoc ? [' ', storageLocationDoc] : storageLocationDoc,
+      ' ',
       print('name')
-    ]);
+    ];
   }
 }

src/slang-nodes/UnnamedFunctionDefinition.ts

@@ -1,5 +1,5 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { printFunctionWithBody } from '../slang-printers/print-function.js';
+import { printFunction } from '../slang-printers/print-function.js';
 import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { ParametersDeclaration } from './ParametersDeclaration.js';
@@ -49,6 +49,6 @@ export class UnnamedFunctionDefinition extends SlangNode {
   }
 
   print(print: PrintFunction): Doc {
-    return printFunctionWithBody('function', this, print);
+    return printFunction('function', this, print);
   }
 }

src/slang-nodes/UntypedTupleMember.ts

@@ -1,5 +1,4 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { joinExisting } from '../slang-utils/join-existing.js';
 import { SlangNode } from './SlangNode.js';
 import { StorageLocation } from './StorageLocation.js';
 import { TerminalNode } from './TerminalNode.js';
@@ -30,6 +29,10 @@ export class UntypedTupleMember extends SlangNode {
   }
 
   print(print: PrintFunction): Doc {
-    return joinExisting(' ', [print('storageLocation'), print('name')]);
+    const storageLocationDoc = print('storageLocation');
+    return [
+      storageLocationDoc ? [storageLocationDoc, ' '] : storageLocationDoc,
+      print('name')
+    ];
   }
 }

src/slang-nodes/YulVariableDeclarationStatement.ts

@@ -1,5 +1,4 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { joinExisting } from '../slang-utils/join-existing.js';
 import { SlangNode } from './SlangNode.js';
 import { YulVariableDeclarationValue } from './YulVariableDeclarationValue.js';
 import { YulVariableNames } from './YulVariableNames.js';
@@ -36,6 +35,7 @@ export class YulVariableDeclarationStatement extends SlangNode {
   }
 
   print(print: PrintFunction): Doc {
-    return joinExisting(' ', [['let', print('variables')], print('value')]);
+    const valueDoc = print('value');
+    return ['let', print('variables'), valueDoc ? [' ', valueDoc] : valueDoc];
   }
 }