removing ImportClause, MappingKeyType, Pragma, StringExpression, and TupleMember from the AST tree

Author: Janther

src/slang-nodes/Expression.ts

@@ -117,7 +117,7 @@ function createNonterminalVariant(
     return new DecimalNumberExpression(variant);
   }
   if (variant instanceof ast.StringExpression) {
-    return new StringExpression(variant, options);
+    return extractVariant(new StringExpression(variant, options));
   }
   if (variant instanceof ast.ElementaryType) {
     return extractVariant(new ElementaryType(variant));
@@ -155,7 +155,7 @@ export class Expression extends SlangNode {
     | ArrayExpression
     | HexNumberExpression
     | DecimalNumberExpression
-    | StringExpression
+    | StringExpression['variant']
     | ElementaryType['variant']
     | TerminalNode;
 

src/slang-nodes/ImportClause.ts

@@ -1,6 +1,6 @@
 import * as ast from '@nomicfoundation/slang/ast';
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { PolymorphicNode } from './PolymorphicNode.js';
+import { SlangNode } from './SlangNode.js';
 import { PathImport } from './PathImport.js';
 import { NamedImport } from './NamedImport.js';
 import { ImportDeconstruction } from './ImportDeconstruction.js';
@@ -25,7 +25,7 @@ function createNonterminalVariant(
   return exhaustiveCheck;
 }
 
-export class ImportClause extends PolymorphicNode {
+export class ImportClause extends SlangNode {
   readonly kind = NonterminalKind.ImportClause;
 
   variant: PathImport | NamedImport | ImportDeconstruction;

src/slang-nodes/ImportDirective.ts

@@ -1,5 +1,5 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { printVariant } from '../slang-printers/print-variant.js';
+import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { ImportClause } from './ImportClause.js';
 
@@ -11,17 +11,17 @@ import type { AstNode } from './types.d.ts';
 export class ImportDirective extends SlangNode {
   readonly kind = NonterminalKind.ImportDirective;
 
-  clause: ImportClause;
+  clause: ImportClause['variant'];
 
   constructor(ast: ast.ImportDirective, options: ParserOptions<AstNode>) {
     super(ast);
 
-    this.clause = new ImportClause(ast.clause, options);
+    this.clause = extractVariant(new ImportClause(ast.clause, options));
 
     this.updateMetadata(this.clause);
   }
 
   print(path: AstPath<ImportDirective>, print: PrintFunction): Doc {
-    return ['import ', path.call(printVariant(print), 'clause'), ';'];
+    return ['import ', path.call(print, 'clause'), ';'];
   }
 }

src/slang-nodes/MappingKey.ts

@@ -1,6 +1,6 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { joinExisting } from '../slang-utils/join-existing.js';
-import { printVariant } from '../slang-printers/print-variant.js';
+import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { MappingKeyType } from './MappingKeyType.js';
 import { TerminalNode } from './TerminalNode.js';
@@ -12,14 +12,14 @@ import type { PrintFunction } from '../types.d.ts';
 export class MappingKey extends SlangNode {
   readonly kind = NonterminalKind.MappingKey;
 
-  keyType: MappingKeyType;
+  keyType: MappingKeyType['variant'];
 
   name?: TerminalNode;
 
   constructor(ast: ast.MappingKey) {
     super(ast);
 
-    this.keyType = new MappingKeyType(ast.keyType);
+    this.keyType = extractVariant(new MappingKeyType(ast.keyType));
     if (ast.name) {
       this.name = new TerminalNode(ast.name);
     }
@@ -29,7 +29,7 @@ export class MappingKey extends SlangNode {
 
   print(path: AstPath<MappingKey>, print: PrintFunction): Doc {
     return joinExisting(' ', [
-      path.call(printVariant(print), 'keyType'),
+      path.call(print, 'keyType'),
       path.call(print, 'name')
     ]);
   }

src/slang-nodes/MappingKeyType.ts

@@ -1,7 +1,7 @@
 import * as ast from '@nomicfoundation/slang/ast';
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
 import { extractVariant } from '../slang-utils/extract-variant.js';
-import { PolymorphicNode } from './PolymorphicNode.js';
+import { SlangNode } from './SlangNode.js';
 import { ElementaryType } from './ElementaryType.js';
 import { IdentifierPath } from './IdentifierPath.js';
 
@@ -18,7 +18,7 @@ function createNonterminalVariant(
   return exhaustiveCheck;
 }
 
-export class MappingKeyType extends PolymorphicNode {
+export class MappingKeyType extends SlangNode {
   readonly kind = NonterminalKind.MappingKeyType;
 
   variant: ElementaryType['variant'] | IdentifierPath;

src/slang-nodes/Pragma.ts

@@ -1,6 +1,6 @@
 import * as ast from '@nomicfoundation/slang/ast';
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { PolymorphicNode } from './PolymorphicNode.js';
+import { SlangNode } from './SlangNode.js';
 import { AbicoderPragma } from './AbicoderPragma.js';
 import { ExperimentalPragma } from './ExperimentalPragma.js';
 import { VersionPragma } from './VersionPragma.js';
@@ -25,7 +25,7 @@ function createNonterminalVariant(
   return exhaustiveCheck;
 }
 
-export class Pragma extends PolymorphicNode {
+export class Pragma extends SlangNode {
   readonly kind = NonterminalKind.Pragma;
 
   variant: AbicoderPragma | ExperimentalPragma | VersionPragma;

src/slang-nodes/PragmaDirective.ts

@@ -1,5 +1,5 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { printVariant } from '../slang-printers/print-variant.js';
+import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { Pragma } from './Pragma.js';
 
@@ -11,17 +11,17 @@ import type { AstNode } from './types.d.ts';
 export class PragmaDirective extends SlangNode {
   readonly kind = NonterminalKind.PragmaDirective;
 
-  pragma: Pragma;
+  pragma: Pragma['variant'];
 
   constructor(ast: ast.PragmaDirective, options: ParserOptions<AstNode>) {
     super(ast);
 
-    this.pragma = new Pragma(ast.pragma, options);
+    this.pragma = extractVariant(new Pragma(ast.pragma, options));
 
     this.updateMetadata(this.pragma);
   }
 
   print(path: AstPath<PragmaDirective>, print: PrintFunction): Doc {
-    return ['pragma ', path.call(printVariant(print), 'pragma'), ';'];
+    return ['pragma ', path.call(print, 'pragma'), ';'];
   }
 }

src/slang-nodes/StringExpression.ts

@@ -1,6 +1,6 @@
 import * as ast from '@nomicfoundation/slang/ast';
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { PolymorphicNode } from './PolymorphicNode.js';
+import { SlangNode } from './SlangNode.js';
 import { StringLiteral } from './StringLiteral.js';
 import { StringLiterals } from './StringLiterals.js';
 import { HexStringLiteral } from './HexStringLiteral.js';
@@ -33,7 +33,7 @@ function createNonterminalVariant(
   return exhaustiveCheck;
 }
 
-export class StringExpression extends PolymorphicNode {
+export class StringExpression extends SlangNode {
   readonly kind = NonterminalKind.StringExpression;
 
   variant:

src/slang-nodes/TupleDeconstructionElement.ts

@@ -1,5 +1,5 @@
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { printVariant } from '../slang-printers/print-variant.js';
+import { extractVariant } from '../slang-utils/extract-variant.js';
 import { SlangNode } from './SlangNode.js';
 import { TupleMember } from './TupleMember.js';
 
@@ -11,7 +11,7 @@ import type { AstNode } from './types.d.ts';
 export class TupleDeconstructionElement extends SlangNode {
   readonly kind = NonterminalKind.TupleDeconstructionElement;
 
-  member?: TupleMember;
+  member?: TupleMember['variant'];
 
   constructor(
     ast: ast.TupleDeconstructionElement,
@@ -20,13 +20,13 @@ export class TupleDeconstructionElement extends SlangNode {
     super(ast);
 
     if (ast.member) {
-      this.member = new TupleMember(ast.member, options);
+      this.member = extractVariant(new TupleMember(ast.member, options));
     }
 
     this.updateMetadata(this.member);
   }
 
   print(path: AstPath<TupleDeconstructionElement>, print: PrintFunction): Doc {
-    return path.call(printVariant(print), 'member');
+    return path.call(print, 'member');
   }
 }

src/slang-nodes/TupleMember.ts

@@ -1,6 +1,6 @@
 import * as ast from '@nomicfoundation/slang/ast';
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { PolymorphicNode } from './PolymorphicNode.js';
+import { SlangNode } from './SlangNode.js';
 import { TypedTupleMember } from './TypedTupleMember.js';
 import { UntypedTupleMember } from './UntypedTupleMember.js';
 
@@ -21,7 +21,7 @@ function createNonterminalVariant(
   return exhaustiveCheck;
 }
 
-export class TupleMember extends PolymorphicNode {
+export class TupleMember extends SlangNode {
   readonly kind = NonterminalKind.TupleMember;
 
   variant: TypedTupleMember | UntypedTupleMember;