adding a printVariant helper

Janther · Janther · commit 8b7763e9a321 · 2025-07-21T15:48:37.000+01:00
diff --git a/src/slang-nodes/ConstructorAttribute.ts b/src/slang-nodes/ConstructorAttribute.ts
@@ -1,4 +1,5 @@
 import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
+import { printVariant } from '../slang-printers/print-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { ModifierInvocation } from './ModifierInvocation.js';
 
@@ -25,8 +26,6 @@ export class ConstructorAttribute extends SlangNode {
   }
 
   print(path: AstPath<ConstructorAttribute>, print: PrintFunction): Doc {
-    return typeof this.variant === 'string'
-      ? this.variant
-      : path.call(print, 'variant');
+    return printVariant(this, path, print);
   }
 }
diff --git a/src/slang-nodes/ElementaryType.ts b/src/slang-nodes/ElementaryType.ts
@@ -1,4 +1,5 @@
 import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
+import { printVariant } from '../slang-printers/print-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { AddressType } from './AddressType.js';
 
@@ -24,8 +25,6 @@ export class ElementaryType extends SlangNode {
   }
 
   print(path: AstPath<ElementaryType>, print: PrintFunction): Doc {
-    return typeof this.variant === 'string'
-      ? this.variant
-      : path.call(print, 'variant');
+    return printVariant(this, path, print);
   }
 }
diff --git a/src/slang-nodes/FallbackFunctionAttribute.ts b/src/slang-nodes/FallbackFunctionAttribute.ts
@@ -1,4 +1,5 @@
 import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
+import { printVariant } from '../slang-printers/print-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { ModifierInvocation } from './ModifierInvocation.js';
 import { OverrideSpecifier } from './OverrideSpecifier.js';
@@ -43,8 +44,6 @@ export class FallbackFunctionAttribute extends SlangNode {
   }
 
   print(path: AstPath<FallbackFunctionAttribute>, print: PrintFunction): Doc {
-    return typeof this.variant === 'string'
-      ? this.variant
-      : path.call(print, 'variant');
+    return printVariant(this, path, print);
   }
 }
diff --git a/src/slang-nodes/ForStatementCondition.ts b/src/slang-nodes/ForStatementCondition.ts
@@ -1,4 +1,5 @@
 import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
+import { printVariant } from '../slang-printers/print-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { ExpressionStatement } from './ExpressionStatement.js';
 
@@ -25,8 +26,6 @@ export class ForStatementCondition extends SlangNode {
   }
 
   print(path: AstPath<ForStatementCondition>, print: PrintFunction): Doc {
-    return typeof this.variant === 'string'
-      ? this.variant
-      : path.call(print, 'variant');
+    return printVariant(this, path, print);
   }
 }
diff --git a/src/slang-nodes/ForStatementInitialization.ts b/src/slang-nodes/ForStatementInitialization.ts
@@ -1,4 +1,5 @@
 import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
+import { printVariant } from '../slang-printers/print-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { ExpressionStatement } from './ExpressionStatement.js';
 import { VariableDeclarationStatement } from './VariableDeclarationStatement.js';
@@ -55,8 +56,6 @@ export class ForStatementInitialization extends SlangNode {
   }
 
   print(path: AstPath<ForStatementInitialization>, print: PrintFunction): Doc {
-    return typeof this.variant === 'string'
-      ? this.variant
-      : path.call(print, 'variant');
+    return printVariant(this, path, print);
   }
 }
diff --git a/src/slang-nodes/FunctionAttribute.ts b/src/slang-nodes/FunctionAttribute.ts
@@ -1,4 +1,5 @@
 import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
+import { printVariant } from '../slang-printers/print-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { ModifierInvocation } from './ModifierInvocation.js';
 import { OverrideSpecifier } from './OverrideSpecifier.js';
@@ -40,8 +41,6 @@ export class FunctionAttribute extends SlangNode {
   }
 
   print(path: AstPath<FunctionAttribute>, print: PrintFunction): Doc {
-    return typeof this.variant === 'string'
-      ? this.variant
-      : path.call(print, 'variant');
+    return printVariant(this, path, print);
   }
 }
diff --git a/src/slang-nodes/FunctionBody.ts b/src/slang-nodes/FunctionBody.ts
@@ -1,4 +1,5 @@
 import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
+import { printVariant } from '../slang-printers/print-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { Block } from './Block.js';
 
@@ -25,8 +26,6 @@ export class FunctionBody extends SlangNode {
   }
 
   print(path: AstPath<FunctionBody>, print: PrintFunction): Doc {
-    return typeof this.variant === 'string'
-      ? this.variant
-      : path.call(print, 'variant');
+    return printVariant(this, path, print);
   }
 }
diff --git a/src/slang-nodes/ModifierAttribute.ts b/src/slang-nodes/ModifierAttribute.ts
@@ -1,4 +1,5 @@
 import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
+import { printVariant } from '../slang-printers/print-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { OverrideSpecifier } from './OverrideSpecifier.js';
 
@@ -24,8 +25,6 @@ export class ModifierAttribute extends SlangNode {
   }
 
   print(path: AstPath<ModifierAttribute>, print: PrintFunction): Doc {
-    return typeof this.variant === 'string'
-      ? this.variant
-      : path.call(print, 'variant');
+    return printVariant(this, path, print);
   }
 }
diff --git a/src/slang-nodes/ReceiveFunctionAttribute.ts b/src/slang-nodes/ReceiveFunctionAttribute.ts
@@ -1,4 +1,5 @@
 import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
+import { printVariant } from '../slang-printers/print-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { ModifierInvocation } from './ModifierInvocation.js';
 import { OverrideSpecifier } from './OverrideSpecifier.js';
@@ -43,8 +44,6 @@ export class ReceiveFunctionAttribute extends SlangNode {
   }
 
   print(path: AstPath<ReceiveFunctionAttribute>, print: PrintFunction): Doc {
-    return typeof this.variant === 'string'
-      ? this.variant
-      : path.call(print, 'variant');
+    return printVariant(this, path, print);
   }
 }
diff --git a/src/slang-nodes/StateVariableAttribute.ts b/src/slang-nodes/StateVariableAttribute.ts
@@ -1,4 +1,5 @@
 import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
+import { printVariant } from '../slang-printers/print-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { OverrideSpecifier } from './OverrideSpecifier.js';
 
@@ -24,8 +25,6 @@ export class StateVariableAttribute extends SlangNode {
   }
 
   print(path: AstPath<StateVariableAttribute>, print: PrintFunction): Doc {
-    return typeof this.variant === 'string'
-      ? this.variant
-      : path.call(print, 'variant');
+    return printVariant(this, path, print);
   }
 }
diff --git a/src/slang-nodes/UnnamedFunctionAttribute.ts b/src/slang-nodes/UnnamedFunctionAttribute.ts
@@ -1,4 +1,5 @@
 import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
+import { printVariant } from '../slang-printers/print-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { ModifierInvocation } from './ModifierInvocation.js';
 
@@ -28,8 +29,6 @@ export class UnnamedFunctionAttribute extends SlangNode {
   }
 
   print(path: AstPath<UnnamedFunctionAttribute>, print: PrintFunction): Doc {
-    return typeof this.variant === 'string'
-      ? this.variant
-      : path.call(print, 'variant');
+    return printVariant(this, path, print);
   }
 }
diff --git a/src/slang-nodes/UsingTarget.ts b/src/slang-nodes/UsingTarget.ts
@@ -1,4 +1,5 @@
 import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
+import { printVariant } from '../slang-printers/print-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { TypeName } from './TypeName.js';
 
@@ -25,8 +26,6 @@ export class UsingTarget extends SlangNode {
   }
 
   print(path: AstPath<UsingTarget>, print: PrintFunction): Doc {
-    return typeof this.variant === 'string'
-      ? this.variant
-      : path.call(print, 'variant');
+    return printVariant(this, path, print);
   }
 }
diff --git a/src/slang-nodes/VariableDeclarationType.ts b/src/slang-nodes/VariableDeclarationType.ts
@@ -1,4 +1,5 @@
 import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
+import { printVariant } from '../slang-printers/print-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { TypeName } from './TypeName.js';
 
@@ -28,8 +29,6 @@ export class VariableDeclarationType extends SlangNode {
   }
 
   print(path: AstPath<VariableDeclarationType>, print: PrintFunction): Doc {
-    return typeof this.variant === 'string'
-      ? this.variant
-      : path.call(print, 'variant');
+    return printVariant(this, path, print);
   }
 }
diff --git a/src/slang-nodes/VersionLiteral.ts b/src/slang-nodes/VersionLiteral.ts
@@ -1,4 +1,5 @@
 import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
+import { printVariant } from '../slang-printers/print-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { SimpleVersionLiteral } from './SimpleVersionLiteral.js';
 
@@ -24,8 +25,6 @@ export class VersionLiteral extends SlangNode {
   }
 
   print(path: AstPath<VersionLiteral>, print: PrintFunction): Doc {
-    return typeof this.variant === 'string'
-      ? this.variant
-      : path.call(print, 'variant');
+    return printVariant(this, path, print);
   }
 }
diff --git a/src/slang-nodes/YulAssignmentOperator.ts b/src/slang-nodes/YulAssignmentOperator.ts
@@ -1,4 +1,5 @@
 import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
+import { printVariant } from '../slang-printers/print-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { YulColonAndEqual } from './YulColonAndEqual.js';
 
@@ -24,8 +25,6 @@ export class YulAssignmentOperator extends SlangNode {
   }
 
   print(path: AstPath<YulAssignmentOperator>, print: PrintFunction): Doc {
-    return typeof this.variant === 'string'
-      ? this.variant
-      : path.call(print, 'variant');
+    return printVariant(this, path, print);
   }
 }
diff --git a/src/slang-nodes/YulLiteral.ts b/src/slang-nodes/YulLiteral.ts
@@ -1,4 +1,5 @@
 import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
+import { printVariant } from '../slang-printers/print-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { HexStringLiteral } from './HexStringLiteral.js';
 import { StringLiteral } from './StringLiteral.js';
@@ -41,8 +42,6 @@ export class YulLiteral extends SlangNode {
   }
 
   print(path: AstPath<YulLiteral>, print: PrintFunction): Doc {
-    return typeof this.variant === 'string'
-      ? this.variant
-      : path.call(print, 'variant');
+    return printVariant(this, path, print);
   }
 }
diff --git a/src/slang-nodes/YulStackAssignmentOperator.ts b/src/slang-nodes/YulStackAssignmentOperator.ts
@@ -1,4 +1,5 @@
 import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';
+import { printVariant } from '../slang-printers/print-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { YulEqualAndColon } from './YulEqualAndColon.js';
 
@@ -24,8 +25,6 @@ export class YulStackAssignmentOperator extends SlangNode {
   }
 
   print(path: AstPath<YulStackAssignmentOperator>, print: PrintFunction): Doc {
-    return typeof this.variant === 'string'
-      ? this.variant
-      : path.call(print, 'variant');
+    return printVariant(this, path, print);
   }
 }
diff --git a/src/slang-nodes/types.d.ts b/src/slang-nodes/types.d.ts
@@ -460,6 +460,13 @@ export type StrictAstNode =
   | YulPaths
   | YulPath;
 
+export type PolymorphicNode = Extract<StrictAstNode, { variant: unknown }>;
+
+export type StrictPolymorphicNode = Extract<
+  StrictAstNode,
+  { variant: StrictAstNode | Identifier | YulIdentifier }
+>;
+
 export type Collection = Extract<StrictAstNode, { items: unknown[] }>;
 
 export type NodeCollection = Extract<
@@ -469,7 +476,7 @@ export type NodeCollection = Extract<
 
 export type LineCollection = Extract<
   NodeCollection,
-  { items: Extract<StrictAstNode, { variant: StrictAstNode }>[] }
+  { items: StrictPolymorphicNode[] }
 >;
 
 export type BinaryOperation = Extract<
diff --git a/src/slang-printers/print-variant.ts b/src/slang-printers/print-variant.ts
@@ -0,0 +1,11 @@
+import type { AstPath, Doc } from 'prettier';
+import type { PolymorphicNode } from '../slang-nodes/types.d.ts';
+import type { PrintFunction } from '../types.d.ts';
+
+export function printVariant(
+  { variant }: PolymorphicNode,
+  path: AstPath<PolymorphicNode>,
+  print: PrintFunction
+): Doc {
+  return typeof variant === 'string' ? variant : path.call(print, 'variant');
+}

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`import { NonterminalKind, TerminalNode } from '@nomicfoundation/slang/cst';`
	`2`	`+import { printVariant } from '../slang-printers/print-variant.js';`
`2`	`3`	`import { SlangNode } from './SlangNode.js';`
`3`	`4`	`import { ModifierInvocation } from './ModifierInvocation.js';`
`4`	`5`
`@@ -25,8 +26,6 @@ export class ConstructorAttribute extends SlangNode {`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`print(path: AstPath<ConstructorAttribute>, print: PrintFunction): Doc {`
`28`		`- return typeof this.variant === 'string'`
`29`		`- ? this.variant`
`30`		`- : path.call(print, 'variant');`
	`29`	`+ return printVariant(this, path, print);`
`31`	`30`	`}`
`32`	`31`	`}`