cleaner types imported from slang

Author: Janther

src/types.d.ts

@@ -40,7 +40,7 @@ interface Metadata {
 
 interface SlangNode {
   kind:
-    | keyof typeof NonterminalKind
+    | NonterminalKind
     | typeof TerminalKind.Identifier
     | typeof TerminalKind.YulIdentifier
     | typeof TerminalKind.MultiLineComment
@@ -58,220 +58,9 @@ interface SlangNode {
 
 type PrintFunction = (path: AstPath<AstNode>) => Doc;
 
-export type SlangAstNode =
-  | ast.SourceUnit
-  | ast.PragmaDirective
-  | ast.AbicoderPragma
-  | ast.ExperimentalPragma
-  | ast.VersionPragma
-  | ast.VersionRange
-  | ast.VersionTerm
-  | ast.ImportDirective
-  | ast.PathImport
-  | ast.NamedImport
-  | ast.ImportDeconstruction
-  | ast.ImportDeconstructionSymbol
-  | ast.ImportAlias
-  | ast.UsingDirective
-  | ast.UsingDeconstruction
-  | ast.UsingDeconstructionSymbol
-  | ast.UsingAlias
-  | ast.ContractDefinition
-  | ast.InheritanceSpecifier
-  | ast.InheritanceType
-  | ast.InterfaceDefinition
-  | ast.LibraryDefinition
-  | ast.StructDefinition
-  | ast.StructMember
-  | ast.EnumDefinition
-  | ast.ConstantDefinition
-  | ast.StateVariableDefinition
-  | ast.StateVariableDefinitionValue
-  | ast.FunctionDefinition
-  | ast.ParametersDeclaration
-  | ast.Parameter
-  | ast.OverrideSpecifier
-  | ast.OverridePathsDeclaration
-  | ast.ReturnsDeclaration
-  | ast.ConstructorDefinition
-  | ast.UnnamedFunctionDefinition
-  | ast.FallbackFunctionDefinition
-  | ast.ReceiveFunctionDefinition
-  | ast.ModifierDefinition
-  | ast.ModifierInvocation
-  | ast.EventDefinition
-  | ast.EventParametersDeclaration
-  | ast.EventParameter
-  | ast.UserDefinedValueTypeDefinition
-  | ast.ErrorDefinition
-  | ast.ErrorParametersDeclaration
-  | ast.ErrorParameter
-  | ast.ArrayTypeName
-  | ast.FunctionType
-  | ast.MappingType
-  | ast.MappingKey
-  | ast.MappingValue
-  | ast.AddressType
-  | ast.Block
-  | ast.UncheckedBlock
-  | ast.ExpressionStatement
-  | ast.AssemblyStatement
-  | ast.AssemblyFlagsDeclaration
-  | ast.TupleDeconstructionStatement
-  | ast.TupleDeconstructionElement
-  | ast.TypedTupleMember
-  | ast.UntypedTupleMember
-  | ast.VariableDeclarationStatement
-  | ast.VariableDeclarationValue
-  | ast.IfStatement
-  | ast.ElseBranch
-  | ast.ForStatement
-  | ast.WhileStatement
-  | ast.DoWhileStatement
-  | ast.ContinueStatement
-  | ast.BreakStatement
-  | ast.ReturnStatement
-  | ast.EmitStatement
-  | ast.TryStatement
-  | ast.CatchClause
-  | ast.CatchClauseError
-  | ast.RevertStatement
-  | ast.ThrowStatement
-  | ast.AssignmentExpression
-  | ast.ConditionalExpression
-  | ast.OrExpression
-  | ast.AndExpression
-  | ast.EqualityExpression
-  | ast.InequalityExpression
-  | ast.BitwiseOrExpression
-  | ast.BitwiseXorExpression
-  | ast.BitwiseAndExpression
-  | ast.ShiftExpression
-  | ast.AdditiveExpression
-  | ast.MultiplicativeExpression
-  | ast.ExponentiationExpression
-  | ast.PostfixExpression
-  | ast.PrefixExpression
-  | ast.FunctionCallExpression
-  | ast.CallOptionsExpression
-  | ast.MemberAccessExpression
-  | ast.IndexAccessExpression
-  | ast.IndexAccessEnd
-  | ast.PositionalArgumentsDeclaration
-  | ast.NamedArgumentsDeclaration
-  | ast.NamedArgumentGroup
-  | ast.NamedArgument
-  | ast.TypeExpression
-  | ast.NewExpression
-  | ast.TupleExpression
-  | ast.TupleValue
-  | ast.ArrayExpression
-  | ast.HexNumberExpression
-  | ast.DecimalNumberExpression
-  | ast.YulBlock
-  | ast.YulFunctionDefinition
-  | ast.YulParametersDeclaration
-  | ast.YulReturnsDeclaration
-  | ast.YulVariableDeclarationStatement
-  | ast.YulVariableDeclarationValue
-  | ast.YulVariableAssignmentStatement
-  | ast.YulStackAssignmentStatement
-  | ast.YulStackAssignmentOperator
-  | ast.YulColonAndEqual
-  | ast.YulEqualAndColon
-  | ast.YulIfStatement
-  | ast.YulForStatement
-  | ast.YulSwitchStatement
-  | ast.YulDefaultCase
-  | ast.YulValueCase
-  | ast.YulLeaveStatement
-  | ast.YulBreakStatement
-  | ast.YulContinueStatement
-  | ast.YulLabel
-  | ast.YulFunctionCallExpression
-  | ast.SourceUnitMember
-  | ast.Pragma
-  | ast.ExperimentalFeature
-  | ast.VersionExpression
-  | ast.VersionOperator
-  | ast.VersionLiteral
-  | ast.ImportClause
-  | ast.UsingClause
-  | ast.UsingOperator
-  | ast.UsingTarget
-  | ast.ContractMember
-  | ast.StateVariableAttribute
-  | ast.FunctionName
-  | ast.FunctionAttribute
-  | ast.FunctionBody
-  | ast.ConstructorAttribute
-  | ast.UnnamedFunctionAttribute
-  | ast.FallbackFunctionAttribute
-  | ast.ReceiveFunctionAttribute
-  | ast.ModifierAttribute
-  | ast.TypeName
-  | ast.FunctionTypeAttribute
-  | ast.MappingKeyType
-  | ast.ElementaryType
-  | ast.Statement
-  | ast.TupleMember
-  | ast.VariableDeclarationType
-  | ast.StorageLocation
-  | ast.ForStatementInitialization
-  | ast.ForStatementCondition
-  | ast.Expression
-  | ast.ArgumentsDeclaration
-  | ast.NumberUnit
-  | ast.StringExpression
-  | ast.StringLiteral
-  | ast.HexStringLiteral
-  | ast.UnicodeStringLiteral
-  | ast.YulStatement
-  | ast.YulAssignmentOperator
-  | ast.YulSwitchCase
-  | ast.YulExpression
-  | ast.YulLiteral
-  | ast.SourceUnitMembers
-  | ast.VersionExpressionSet
-  | ast.ContractMembers
-  | ast.InterfaceMembers
-  | ast.LibraryMembers
-  | ast.StructMembers
-  | ast.StateVariableAttributes
-  | ast.FunctionAttributes
-  | ast.ConstructorAttributes
-  | ast.UnnamedFunctionAttributes
-  | ast.FallbackFunctionAttributes
-  | ast.ReceiveFunctionAttributes
-  | ast.ModifierAttributes
-  | ast.FunctionTypeAttributes
-  | ast.Statements
-  | ast.CatchClauses
-  | ast.StringLiterals
-  | ast.HexStringLiterals
-  | ast.UnicodeStringLiterals
-  | ast.YulStatements
-  | ast.YulSwitchCases
-  | ast.VersionExpressionSets
-  | ast.SimpleVersionLiteral
-  | ast.ImportDeconstructionSymbols
-  | ast.UsingDeconstructionSymbols
-  | ast.InheritanceTypes
-  | ast.EnumMembers
-  | ast.Parameters
-  | ast.OverridePaths
-  | ast.EventParameters
-  | ast.ErrorParameters
-  | ast.AssemblyFlags
-  | ast.TupleDeconstructionElements
-  | ast.PositionalArguments
-  | ast.NamedArguments
-  | ast.CallOptions
-  | ast.TupleValues
-  | ast.ArrayValues
-  | ast.IdentifierPath
-  | ast.YulParameters
-  | ast.YulVariableNames
-  | ast.YulArguments
-  | ast.YulPaths
-  | ast.YulPath;
+// This the union of all the types in the namespace `ast`.
+type TypeOfAst = typeof ast;
+type KeyOfAst = keyof TypeOfAst;
+type ValuesOf<E> = E[keyof E];
+
+type SlangAstNode = { [k in KeyOfAst]: ValuesOf<TypeOfAst[k]> }[KeyOfAst];