separating the complex factory into 2 specific ones

Janther · Janther · commit ff21be6f070d · 2026-02-12T12:00:59.000-03:00
diff --git a/src/slang-nodes/ArgumentsDeclaration.ts b/src/slang-nodes/ArgumentsDeclaration.ts
@@ -1,6 +1,6 @@
 import * as ast from '@nomicfoundation/slang/ast';
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { createNonterminalVariantCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
+import { createNonterminalVariantSimpleCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
 import { SlangNode } from './SlangNode.js';
 import { PositionalArgumentsDeclaration } from './PositionalArgumentsDeclaration.js';
 import { NamedArgumentsDeclaration } from './NamedArgumentsDeclaration.js';
@@ -9,7 +9,7 @@ import type { ParserOptions } from 'prettier';
 import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
-const createNonterminalVariant = createNonterminalVariantCreator<
+const createNonterminalVariant = createNonterminalVariantSimpleCreator<
   ast.ArgumentsDeclaration,
   ArgumentsDeclaration
 >([
diff --git a/src/slang-nodes/ContractMember.ts b/src/slang-nodes/ContractMember.ts
@@ -1,6 +1,6 @@
 import * as ast from '@nomicfoundation/slang/ast';
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { createNonterminalVariantCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
+import { createNonterminalVariantSimpleCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
 import { SlangNode } from './SlangNode.js';
 import { UsingDirective } from './UsingDirective.js';
 import { FunctionDefinition } from './FunctionDefinition.js';
@@ -20,7 +20,7 @@ import type { ParserOptions } from 'prettier';
 import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
-const createNonterminalVariant = createNonterminalVariantCreator<
+const createNonterminalVariant = createNonterminalVariantSimpleCreator<
   ast.ContractMember,
   ContractMember
 >([
diff --git a/src/slang-nodes/ContractSpecifier.ts b/src/slang-nodes/ContractSpecifier.ts
@@ -1,6 +1,6 @@
 import * as ast from '@nomicfoundation/slang/ast';
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { createNonterminalVariantCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
+import { createNonterminalVariantSimpleCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
 import { SlangNode } from './SlangNode.js';
 import { InheritanceSpecifier } from './InheritanceSpecifier.js';
 import { StorageLayoutSpecifier } from './StorageLayoutSpecifier.js';
@@ -9,7 +9,7 @@ import type { ParserOptions } from 'prettier';
 import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
-const createNonterminalVariant = createNonterminalVariantCreator<
+const createNonterminalVariant = createNonterminalVariantSimpleCreator<
   ast.ContractSpecifier,
   ContractSpecifier
 >([
diff --git a/src/slang-nodes/FallbackFunctionAttribute.ts b/src/slang-nodes/FallbackFunctionAttribute.ts
@@ -3,7 +3,7 @@ import {
   NonterminalKind,
   TerminalNode as SlangTerminalNode
 } from '@nomicfoundation/slang/cst';
-import { createNonterminalVariantCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
+import { createNonterminalVariantSimpleCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
 import { SlangNode } from './SlangNode.js';
 import { ModifierInvocation } from './ModifierInvocation.js';
 import { OverrideSpecifier } from './OverrideSpecifier.js';
@@ -13,7 +13,7 @@ import type { ParserOptions } from 'prettier';
 import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
-const createNonterminalVariant = createNonterminalVariantCreator<
+const createNonterminalVariant = createNonterminalVariantSimpleCreator<
   ast.FallbackFunctionAttribute,
   FallbackFunctionAttribute
 >([
diff --git a/src/slang-nodes/ForStatementInitialization.ts b/src/slang-nodes/ForStatementInitialization.ts
@@ -3,7 +3,7 @@ import {
   NonterminalKind,
   TerminalNode as SlangTerminalNode
 } from '@nomicfoundation/slang/cst';
-import { createNonterminalVariantCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
+import { createNonterminalVariantSimpleCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
 import { SlangNode } from './SlangNode.js';
 import { ExpressionStatement } from './ExpressionStatement.js';
 import { VariableDeclarationStatement } from './VariableDeclarationStatement.js';
@@ -14,7 +14,7 @@ import type { ParserOptions } from 'prettier';
 import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
-const createNonterminalVariant = createNonterminalVariantCreator<
+const createNonterminalVariant = createNonterminalVariantSimpleCreator<
   ast.ForStatementInitialization,
   ForStatementInitialization
 >([
diff --git a/src/slang-nodes/FunctionAttribute.ts b/src/slang-nodes/FunctionAttribute.ts
@@ -3,7 +3,7 @@ import {
   NonterminalKind,
   TerminalNode as SlangTerminalNode
 } from '@nomicfoundation/slang/cst';
-import { createNonterminalVariantCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
+import { createNonterminalVariantSimpleCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
 import { SlangNode } from './SlangNode.js';
 import { ModifierInvocation } from './ModifierInvocation.js';
 import { OverrideSpecifier } from './OverrideSpecifier.js';
@@ -13,7 +13,7 @@ import type { ParserOptions } from 'prettier';
 import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
-const createNonterminalVariant = createNonterminalVariantCreator<
+const createNonterminalVariant = createNonterminalVariantSimpleCreator<
   ast.FunctionAttribute,
   FunctionAttribute
 >([
diff --git a/src/slang-nodes/ImportClause.ts b/src/slang-nodes/ImportClause.ts
@@ -1,6 +1,6 @@
 import * as ast from '@nomicfoundation/slang/ast';
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { createNonterminalVariantCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
+import { createNonterminalVariantSimpleCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
 import { SlangNode } from './SlangNode.js';
 import { PathImport } from './PathImport.js';
 import { NamedImport } from './NamedImport.js';
@@ -10,7 +10,7 @@ import type { ParserOptions } from 'prettier';
 import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
-const createNonterminalVariant = createNonterminalVariantCreator<
+const createNonterminalVariant = createNonterminalVariantSimpleCreator<
   ast.ImportClause,
   ImportClause
 >([
diff --git a/src/slang-nodes/Pragma.ts b/src/slang-nodes/Pragma.ts
@@ -1,6 +1,6 @@
 import * as ast from '@nomicfoundation/slang/ast';
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { createNonterminalVariantCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
+import { createNonterminalVariantSimpleCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
 import { SlangNode } from './SlangNode.js';
 import { AbicoderPragma } from './AbicoderPragma.js';
 import { ExperimentalPragma } from './ExperimentalPragma.js';
@@ -10,7 +10,7 @@ import type { ParserOptions } from 'prettier';
 import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
-const createNonterminalVariant = createNonterminalVariantCreator<
+const createNonterminalVariant = createNonterminalVariantSimpleCreator<
   ast.Pragma,
   Pragma
 >([
diff --git a/src/slang-nodes/ReceiveFunctionAttribute.ts b/src/slang-nodes/ReceiveFunctionAttribute.ts
@@ -3,7 +3,7 @@ import {
   NonterminalKind,
   TerminalNode as SlangTerminalNode
 } from '@nomicfoundation/slang/cst';
-import { createNonterminalVariantCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
+import { createNonterminalVariantSimpleCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
 import { SlangNode } from './SlangNode.js';
 import { ModifierInvocation } from './ModifierInvocation.js';
 import { OverrideSpecifier } from './OverrideSpecifier.js';
@@ -13,7 +13,7 @@ import type { ParserOptions } from 'prettier';
 import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
-const createNonterminalVariant = createNonterminalVariantCreator<
+const createNonterminalVariant = createNonterminalVariantSimpleCreator<
   ast.ReceiveFunctionAttribute,
   ReceiveFunctionAttribute
 >([
diff --git a/src/slang-nodes/SourceUnitMember.ts b/src/slang-nodes/SourceUnitMember.ts
@@ -1,6 +1,6 @@
 import * as ast from '@nomicfoundation/slang/ast';
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { createNonterminalVariantCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
+import { createNonterminalVariantSimpleCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
 import { SlangNode } from './SlangNode.js';
 import { PragmaDirective } from './PragmaDirective.js';
 import { ImportDirective } from './ImportDirective.js';
@@ -20,7 +20,7 @@ import type { ParserOptions } from 'prettier';
 import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
-const createNonterminalVariant = createNonterminalVariantCreator<
+const createNonterminalVariant = createNonterminalVariantSimpleCreator<
   ast.SourceUnitMember,
   SourceUnitMember
 >([
diff --git a/src/slang-nodes/Statement.ts b/src/slang-nodes/Statement.ts
@@ -1,6 +1,6 @@
 import * as ast from '@nomicfoundation/slang/ast';
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { createNonterminalVariantCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
+import { createNonterminalVariantSimpleCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
 import { SlangNode } from './SlangNode.js';
 import { ExpressionStatement } from './ExpressionStatement.js';
 import { VariableDeclarationStatement } from './VariableDeclarationStatement.js';
@@ -24,7 +24,7 @@ import type { ParserOptions } from 'prettier';
 import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
-const createNonterminalVariantInternal = createNonterminalVariantCreator<
+const createNonterminalVariantInternal = createNonterminalVariantSimpleCreator<
   ast.Statement,
   Statement
 >([
diff --git a/src/slang-nodes/StringExpression.ts b/src/slang-nodes/StringExpression.ts
@@ -1,6 +1,6 @@
 import * as ast from '@nomicfoundation/slang/ast';
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { createNonterminalVariantCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
+import { createNonterminalVariantSimpleCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
 import { SlangNode } from './SlangNode.js';
 import { StringLiteral } from './StringLiteral.js';
 import { StringLiterals } from './StringLiterals.js';
@@ -12,7 +12,7 @@ import type { ParserOptions } from 'prettier';
 import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
-const createNonterminalVariant = createNonterminalVariantCreator<
+const createNonterminalVariant = createNonterminalVariantSimpleCreator<
   ast.StringExpression,
   StringExpression
 >([
diff --git a/src/slang-nodes/TupleMember.ts b/src/slang-nodes/TupleMember.ts
@@ -1,6 +1,6 @@
 import * as ast from '@nomicfoundation/slang/ast';
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { createNonterminalVariantCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
+import { createNonterminalVariantSimpleCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
 import { SlangNode } from './SlangNode.js';
 import { TypedTupleMember } from './TypedTupleMember.js';
 import { UntypedTupleMember } from './UntypedTupleMember.js';
@@ -9,7 +9,7 @@ import type { ParserOptions } from 'prettier';
 import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
-const createNonterminalVariant = createNonterminalVariantCreator<
+const createNonterminalVariant = createNonterminalVariantSimpleCreator<
   ast.TupleMember,
   TupleMember
 >([
diff --git a/src/slang-nodes/UsingClause.ts b/src/slang-nodes/UsingClause.ts
@@ -1,13 +1,13 @@
 import * as ast from '@nomicfoundation/slang/ast';
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { createNonterminalVariantCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
+import { createNonterminalVariantSimpleCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
 import { SlangNode } from './SlangNode.js';
 import { IdentifierPath } from './IdentifierPath.js';
 import { UsingDeconstruction } from './UsingDeconstruction.js';
 
 import type { CollectedMetadata } from '../types.d.ts';
 
-const createNonterminalVariant = createNonterminalVariantCreator<
+const createNonterminalVariant = createNonterminalVariantSimpleCreator<
   ast.UsingClause,
   UsingClause
 >([
diff --git a/src/slang-nodes/VersionExpression.ts b/src/slang-nodes/VersionExpression.ts
@@ -1,13 +1,13 @@
 import * as ast from '@nomicfoundation/slang/ast';
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { createNonterminalVariantCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
+import { createNonterminalVariantSimpleCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
 import { SlangNode } from './SlangNode.js';
 import { VersionRange } from './VersionRange.js';
 import { VersionTerm } from './VersionTerm.js';
 
 import type { CollectedMetadata } from '../types.d.ts';
 
-const createNonterminalVariant = createNonterminalVariantCreator<
+const createNonterminalVariant = createNonterminalVariantSimpleCreator<
   ast.VersionExpression,
   VersionExpression
 >([
diff --git a/src/slang-nodes/YulLiteral.ts b/src/slang-nodes/YulLiteral.ts
@@ -3,7 +3,7 @@ import {
   NonterminalKind,
   TerminalNode as SlangTerminalNode
 } from '@nomicfoundation/slang/cst';
-import { createNonterminalVariantCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
+import { createNonterminalVariantSimpleCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
 import { SlangNode } from './SlangNode.js';
 import { HexStringLiteral } from './HexStringLiteral.js';
 import { StringLiteral } from './StringLiteral.js';
@@ -13,7 +13,7 @@ import type { ParserOptions } from 'prettier';
 import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
-const createNonterminalVariant = createNonterminalVariantCreator<
+const createNonterminalVariant = createNonterminalVariantSimpleCreator<
   ast.YulLiteral,
   YulLiteral
 >([
diff --git a/src/slang-nodes/YulSwitchCase.ts b/src/slang-nodes/YulSwitchCase.ts
@@ -1,6 +1,6 @@
 import * as ast from '@nomicfoundation/slang/ast';
 import { NonterminalKind } from '@nomicfoundation/slang/cst';
-import { createNonterminalVariantCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
+import { createNonterminalVariantSimpleCreator } from '../slang-utils/create-nonterminal-variant-creator.js';
 import { SlangNode } from './SlangNode.js';
 import { YulDefaultCase } from './YulDefaultCase.js';
 import { YulValueCase } from './YulValueCase.js';
@@ -9,7 +9,7 @@ import type { ParserOptions } from 'prettier';
 import type { CollectedMetadata } from '../types.d.ts';
 import type { AstNode } from './types.d.ts';
 
-const createNonterminalVariant = createNonterminalVariantCreator<
+const createNonterminalVariant = createNonterminalVariantSimpleCreator<
   ast.YulSwitchCase,
   YulSwitchCase
 >([
diff --git a/src/slang-utils/create-nonterminal-variant-creator.ts b/src/slang-utils/create-nonterminal-variant-creator.ts
@@ -16,52 +16,70 @@ type GenericFunction<U> = U extends any
   : never;
 type SlangPolymorphicNode = Extract<SlangAstNode, { variant: unknown }>;
 
-export function createNonterminalVariantCreator<
+export function createNonterminalVariantSimpleCreator<
   U extends SlangPolymorphicNode,
   T extends StrictPolymorphicNode
 >(
   constructors: [
     GenericFunction<U['variant']>,
     ConstructorsFromInstances<T['variant']>
-  ][],
-  constructorsWithVariants?: [
-    GenericFunction<SlangPolymorphicNode>,
-    ConstructorsFromInstances<StrictPolymorphicNode>
   ][]
-) {
+): (
+  variant: U['variant'],
+  collected: CollectedMetadata,
+  options?: ParserOptions<AstNode>
+) => T['variant'] {
   const variantConstructors = new Map(constructors);
 
-  if (constructorsWithVariants === undefined) {
-    return (
-      variant: U['variant'],
-      collected: CollectedMetadata,
-      options?: ParserOptions<AstNode>
-    ): T['variant'] => {
-      const constructor = variantConstructors.get(variant.constructor);
-      if (constructor !== undefined)
-        return new constructor(variant, collected, options);
+  return (
+    variant: U['variant'],
+    collected: CollectedMetadata,
+    options?: ParserOptions<AstNode>
+  ): T['variant'] => {
+    const constructor = variantConstructors.get(variant.constructor);
+    if (constructor !== undefined)
+      return new constructor(variant, collected, options);
 
-      throw new Error(`Unexpected variant: ${JSON.stringify(variant)}`);
-    };
-  }
+    throw new Error(`Unexpected variant: ${JSON.stringify(variant)}`);
+  };
+}
 
+export function createNonterminalVariantCreator<
+  U extends SlangPolymorphicNode,
+  T extends StrictPolymorphicNode
+>(
+  constructors: [
+    GenericFunction<U['variant']>,
+    ConstructorsFromInstances<T['variant']>
+  ][],
+  constructorsWithVariants: [
+    GenericFunction<SlangPolymorphicNode>,
+    ConstructorsFromInstances<StrictPolymorphicNode>
+  ][]
+): (
+  variant: U['variant'] | SlangPolymorphicNode,
+  collected: CollectedMetadata,
+  options?: ParserOptions<AstNode>
+) => T['variant'] {
+  const createNonterminalVariantSimple =
+    createNonterminalVariantSimpleCreator(constructors);
   const variantWithVariantsConstructors = new Map(constructorsWithVariants);
 
   return (
     variant: U['variant'] | SlangPolymorphicNode,
     collected: CollectedMetadata,
     options?: ParserOptions<AstNode>
   ): T['variant'] => {
-    let constructor:
-      | ConstructorsFromInstances<T['variant'] | StrictPolymorphicNode>
-      | undefined = variantConstructors.get(variant.constructor);
-    if (constructor !== undefined)
-      return new constructor(variant, collected, options);
-
-    constructor = variantWithVariantsConstructors.get(variant.constructor);
+    const constructor = variantWithVariantsConstructors.get(
+      variant.constructor
+    );
     if (constructor !== undefined)
       return extractVariant(new constructor(variant, collected, options));
 
-    throw new Error(`Unexpected variant: ${JSON.stringify(variant)}`);
+    return createNonterminalVariantSimple(
+      variant as U['variant'],
+      collected,
+      options
+    );
   };
 }
