@oxc-project/types 0.48.2 → 0.50.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oxc-project/types",
-  "version": "0.48.2",
+  "version": "0.50.0",
   "description": "Types for Oxc AST nodes",
   "keywords": [
     "AST",

package/types.d.ts

@@ -1,57 +1,11 @@
 // Auto-generated code, DO NOT EDIT DIRECTLY!
 // To edit this generated file you have to edit `tasks/ast_tools/src/generators/typescript.rs`
 
-export interface BooleanLiteral extends Span {
-  type: 'Literal';
-  value: boolean;
-  raw: string | null;
-}
-
-export interface NullLiteral extends Span {
-  type: 'Literal';
-  value: null;
-  raw: 'null' | null;
-}
-
-export interface NumericLiteral extends Span {
-  type: 'Literal';
-  value: number;
-  raw: string | null;
-}
-
-export interface StringLiteral extends Span {
-  type: 'Literal';
-  value: string;
-  raw: string | null;
-}
-
-export interface BigIntLiteral extends Span {
-  type: 'Literal';
-  raw: string | null;
-  value: null;
-  bigint: string;
-}
-
-export interface RegExpLiteral extends Span {
-  type: 'Literal';
-  raw: string | null;
-  value: {} | null;
-  regex: { pattern: string; flags: string };
-}
-
-export interface RegExp {
-  pattern: RegExpPattern;
-  flags: RegExpFlags;
-}
-
-export type RegExpPattern = string | string | Pattern;
-
 export interface Program extends Span {
   type: 'Program';
-  sourceType: SourceType;
+  sourceType: ModuleKind;
   hashbang: Hashbang | null;
-  directives: Array<Directive>;
-  body: Array<Statement>;
+  body: Array<Directive | Statement>;
 }
 
 export type Expression =
@@ -94,9 +48,7 @@ export type Expression =
   | TSTypeAssertion
   | TSNonNullExpression
   | TSInstantiationExpression
-  | ComputedMemberExpression
-  | StaticMemberExpression
-  | PrivateFieldExpression;
+  | MemberExpression;
 
 export interface IdentifierName extends Span {
   type: 'Identifier';
@@ -124,9 +76,11 @@ export interface ThisExpression extends Span {
 
 export interface ArrayExpression extends Span {
   type: 'ArrayExpression';
-  elements: Array<SpreadElement | Expression | null>;
+  elements: Array<ArrayExpressionElement>;
 }
 
+export type ArrayExpressionElement = SpreadElement | null | Expression;
+
 export interface ObjectExpression extends Span {
   type: 'ObjectExpression';
   properties: Array<ObjectPropertyKind>;
@@ -135,7 +89,7 @@ export interface ObjectExpression extends Span {
 export type ObjectPropertyKind = ObjectProperty | SpreadElement;
 
 export interface ObjectProperty extends Span {
-  type: 'ObjectProperty';
+  type: 'Property';
   kind: PropertyKind;
   key: PropertyKey;
   value: Expression;
@@ -144,51 +98,7 @@ export interface ObjectProperty extends Span {
   computed: boolean;
 }
 
-export type PropertyKey =
-  | IdentifierName
-  | PrivateIdentifier
-  | BooleanLiteral
-  | NullLiteral
-  | NumericLiteral
-  | BigIntLiteral
-  | RegExpLiteral
-  | StringLiteral
-  | TemplateLiteral
-  | IdentifierReference
-  | MetaProperty
-  | Super
-  | ArrayExpression
-  | ArrowFunctionExpression
-  | AssignmentExpression
-  | AwaitExpression
-  | BinaryExpression
-  | CallExpression
-  | ChainExpression
-  | Class
-  | ConditionalExpression
-  | Function
-  | ImportExpression
-  | LogicalExpression
-  | NewExpression
-  | ObjectExpression
-  | ParenthesizedExpression
-  | SequenceExpression
-  | TaggedTemplateExpression
-  | ThisExpression
-  | UnaryExpression
-  | UpdateExpression
-  | YieldExpression
-  | PrivateInExpression
-  | JSXElement
-  | JSXFragment
-  | TSAsExpression
-  | TSSatisfiesExpression
-  | TSTypeAssertion
-  | TSNonNullExpression
-  | TSInstantiationExpression
-  | ComputedMemberExpression
-  | StaticMemberExpression
-  | PrivateFieldExpression;
+export type PropertyKey = IdentifierName | PrivateIdentifier | Expression;
 
 export type PropertyKind = 'init' | 'get' | 'set';
 
@@ -219,24 +129,27 @@ export interface TemplateElementValue {
 export type MemberExpression = ComputedMemberExpression | StaticMemberExpression | PrivateFieldExpression;
 
 export interface ComputedMemberExpression extends Span {
-  type: 'ComputedMemberExpression';
+  type: 'MemberExpression';
   object: Expression;
-  expression: Expression;
+  property: Expression;
   optional: boolean;
+  computed: true;
 }
 
 export interface StaticMemberExpression extends Span {
-  type: 'StaticMemberExpression';
+  type: 'MemberExpression';
   object: Expression;
   property: IdentifierName;
   optional: boolean;
+  computed: false;
 }
 
 export interface PrivateFieldExpression extends Span {
-  type: 'PrivateFieldExpression';
+  type: 'MemberExpression';
   object: Expression;
-  field: PrivateIdentifier;
+  property: PrivateIdentifier;
   optional: boolean;
+  computed: false;
 }
 
 export interface CallExpression extends Span {
@@ -265,50 +178,7 @@ export interface SpreadElement extends Span {
   argument: Expression;
 }
 
-export type Argument =
-  | SpreadElement
-  | BooleanLiteral
-  | NullLiteral
-  | NumericLiteral
-  | BigIntLiteral
-  | RegExpLiteral
-  | StringLiteral
-  | TemplateLiteral
-  | IdentifierReference
-  | MetaProperty
-  | Super
-  | ArrayExpression
-  | ArrowFunctionExpression
-  | AssignmentExpression
-  | AwaitExpression
-  | BinaryExpression
-  | CallExpression
-  | ChainExpression
-  | Class
-  | ConditionalExpression
-  | Function
-  | ImportExpression
-  | LogicalExpression
-  | NewExpression
-  | ObjectExpression
-  | ParenthesizedExpression
-  | SequenceExpression
-  | TaggedTemplateExpression
-  | ThisExpression
-  | UnaryExpression
-  | UpdateExpression
-  | YieldExpression
-  | PrivateInExpression
-  | JSXElement
-  | JSXFragment
-  | TSAsExpression
-  | TSSatisfiesExpression
-  | TSTypeAssertion
-  | TSNonNullExpression
-  | TSInstantiationExpression
-  | ComputedMemberExpression
-  | StaticMemberExpression
-  | PrivateFieldExpression;
+export type Argument = SpreadElement | Expression;
 
 export interface UpdateExpression extends Span {
   type: 'UpdateExpression';
@@ -321,6 +191,7 @@ export interface UnaryExpression extends Span {
   type: 'UnaryExpression';
   operator: UnaryOperator;
   argument: Expression;
+  prefix: true;
 }
 
 export interface BinaryExpression extends Span {
@@ -331,10 +202,10 @@ export interface BinaryExpression extends Span {
 }
 
 export interface PrivateInExpression extends Span {
-  type: 'PrivateInExpression';
+  type: 'BinaryExpression';
   left: PrivateIdentifier;
-  operator: BinaryOperator;
   right: Expression;
+  operator: 'in';
 }
 
 export interface LogicalExpression extends Span {
@@ -358,18 +229,7 @@ export interface AssignmentExpression extends Span {
   right: Expression;
 }
 
-export type AssignmentTarget =
-  | IdentifierReference
-  | TSAsExpression
-  | TSSatisfiesExpression
-  | TSNonNullExpression
-  | TSTypeAssertion
-  | TSInstantiationExpression
-  | ComputedMemberExpression
-  | StaticMemberExpression
-  | PrivateFieldExpression
-  | ArrayAssignmentTarget
-  | ObjectAssignmentTarget;
+export type AssignmentTarget = SimpleAssignmentTarget | AssignmentTargetPattern;
 
 export type SimpleAssignmentTarget =
   | IdentifierReference
@@ -378,20 +238,18 @@ export type SimpleAssignmentTarget =
   | TSNonNullExpression
   | TSTypeAssertion
   | TSInstantiationExpression
-  | ComputedMemberExpression
-  | StaticMemberExpression
-  | PrivateFieldExpression;
+  | MemberExpression;
 
 export type AssignmentTargetPattern = ArrayAssignmentTarget | ObjectAssignmentTarget;
 
 export interface ArrayAssignmentTarget extends Span {
-  type: 'ArrayAssignmentTarget';
-  elements: Array<AssignmentTargetRest | AssignmentTargetMaybeDefault | null>;
+  type: 'ArrayPattern';
+  elements: Array<AssignmentTargetMaybeDefault | AssignmentTargetRest | null>;
 }
 
 export interface ObjectAssignmentTarget extends Span {
-  type: 'ObjectAssignmentTarget';
-  properties: Array<AssignmentTargetRest | AssignmentTargetProperty>;
+  type: 'ObjectPattern';
+  properties: Array<AssignmentTargetProperty | AssignmentTargetRest>;
 }
 
 export interface AssignmentTargetRest extends Span {
@@ -399,39 +257,34 @@ export interface AssignmentTargetRest extends Span {
   argument: AssignmentTarget;
 }
 
-export type AssignmentTargetMaybeDefault =
-  | AssignmentTargetWithDefault
-  | IdentifierReference
-  | TSAsExpression
-  | TSSatisfiesExpression
-  | TSNonNullExpression
-  | TSTypeAssertion
-  | TSInstantiationExpression
-  | ComputedMemberExpression
-  | StaticMemberExpression
-  | PrivateFieldExpression
-  | ArrayAssignmentTarget
-  | ObjectAssignmentTarget;
+export type AssignmentTargetMaybeDefault = AssignmentTargetWithDefault | AssignmentTarget;
 
 export interface AssignmentTargetWithDefault extends Span {
-  type: 'AssignmentTargetWithDefault';
-  binding: AssignmentTarget;
-  init: Expression;
+  type: 'AssignmentPattern';
+  left: AssignmentTarget;
+  right: Expression;
 }
 
 export type AssignmentTargetProperty = AssignmentTargetPropertyIdentifier | AssignmentTargetPropertyProperty;
 
 export interface AssignmentTargetPropertyIdentifier extends Span {
-  type: 'AssignmentTargetPropertyIdentifier';
-  binding: IdentifierReference;
-  init: Expression | null;
+  type: 'Property';
+  key: IdentifierReference;
+  value: IdentifierReference | AssignmentTargetWithDefault;
+  kind: 'init';
+  method: false;
+  shorthand: false;
+  computed: false;
 }
 
 export interface AssignmentTargetPropertyProperty extends Span {
-  type: 'AssignmentTargetPropertyProperty';
-  name: PropertyKey;
-  binding: AssignmentTargetMaybeDefault;
+  type: 'Property';
+  key: PropertyKey;
+  value: AssignmentTargetMaybeDefault;
   computed: boolean;
+  kind: 'init';
+  method: false;
+  shorthand: false;
 }
 
 export interface SequenceExpression extends Span {
@@ -453,12 +306,7 @@ export interface ChainExpression extends Span {
   expression: ChainElement;
 }
 
-export type ChainElement =
-  | CallExpression
-  | TSNonNullExpression
-  | ComputedMemberExpression
-  | StaticMemberExpression
-  | PrivateFieldExpression;
+export type ChainElement = CallExpression | TSNonNullExpression | MemberExpression;
 
 export interface ParenthesizedExpression extends Span {
   type: 'ParenthesizedExpression';
@@ -484,23 +332,11 @@ export type Statement =
   | TryStatement
   | WhileStatement
   | WithStatement
-  | VariableDeclaration
-  | Function
-  | Class
-  | TSTypeAliasDeclaration
-  | TSInterfaceDeclaration
-  | TSEnumDeclaration
-  | TSModuleDeclaration
-  | TSImportEqualsDeclaration
-  | ImportDeclaration
-  | ExportAllDeclaration
-  | ExportDefaultDeclaration
-  | ExportNamedDeclaration
-  | TSExportAssignment
-  | TSNamespaceExportDeclaration;
+  | Declaration
+  | ModuleDeclaration;
 
 export interface Directive extends Span {
-  type: 'Directive';
+  type: 'ExpressionStatement';
   expression: StringLiteral;
   directive: string;
 }
@@ -577,50 +413,7 @@ export interface ForStatement extends Span {
   body: Statement;
 }
 
-export type ForStatementInit =
-  | VariableDeclaration
-  | BooleanLiteral
-  | NullLiteral
-  | NumericLiteral
-  | BigIntLiteral
-  | RegExpLiteral
-  | StringLiteral
-  | TemplateLiteral
-  | IdentifierReference
-  | MetaProperty
-  | Super
-  | ArrayExpression
-  | ArrowFunctionExpression
-  | AssignmentExpression
-  | AwaitExpression
-  | BinaryExpression
-  | CallExpression
-  | ChainExpression
-  | Class
-  | ConditionalExpression
-  | Function
-  | ImportExpression
-  | LogicalExpression
-  | NewExpression
-  | ObjectExpression
-  | ParenthesizedExpression
-  | SequenceExpression
-  | TaggedTemplateExpression
-  | ThisExpression
-  | UnaryExpression
-  | UpdateExpression
-  | YieldExpression
-  | PrivateInExpression
-  | JSXElement
-  | JSXFragment
-  | TSAsExpression
-  | TSSatisfiesExpression
-  | TSTypeAssertion
-  | TSNonNullExpression
-  | TSInstantiationExpression
-  | ComputedMemberExpression
-  | StaticMemberExpression
-  | PrivateFieldExpression;
+export type ForStatementInit = VariableDeclaration | Expression;
 
 export interface ForInStatement extends Span {
   type: 'ForInStatement';
@@ -629,19 +422,7 @@ export interface ForInStatement extends Span {
   body: Statement;
 }
 
-export type ForStatementLeft =
-  | VariableDeclaration
-  | IdentifierReference
-  | TSAsExpression
-  | TSSatisfiesExpression
-  | TSNonNullExpression
-  | TSTypeAssertion
-  | TSInstantiationExpression
-  | ComputedMemberExpression
-  | StaticMemberExpression
-  | PrivateFieldExpression
-  | ArrayAssignmentTarget
-  | ObjectAssignmentTarget;
+export type ForStatementLeft = VariableDeclaration | AssignmentTarget;
 
 export interface ForOfStatement extends Span {
   type: 'ForOfStatement';
@@ -708,10 +489,12 @@ export interface CatchClause extends Span {
   body: BlockStatement;
 }
 
-export interface CatchParameter extends Span {
-  type: 'CatchParameter';
-  pattern: BindingPattern;
-}
+export type CatchParameter =
+  & ({
+    type: 'CatchParameter';
+  })
+  & Span
+  & BindingPattern;
 
 export interface DebuggerStatement extends Span {
   type: 'DebuggerStatement';
@@ -734,20 +517,22 @@ export interface AssignmentPattern extends Span {
 
 export interface ObjectPattern extends Span {
   type: 'ObjectPattern';
-  properties: Array<BindingRestElement | BindingProperty>;
+  properties: Array<BindingProperty | BindingRestElement>;
 }
 
 export interface BindingProperty extends Span {
-  type: 'BindingProperty';
+  type: 'Property';
   key: PropertyKey;
   value: BindingPattern;
   shorthand: boolean;
   computed: boolean;
+  kind: 'init';
+  method: false;
 }
 
 export interface ArrayPattern extends Span {
   type: 'ArrayPattern';
-  elements: Array<BindingRestElement | BindingPattern | null>;
+  elements: Array<BindingPattern | BindingRestElement | null>;
 }
 
 export interface BindingRestElement extends Span {
@@ -763,11 +548,14 @@ export interface Function extends Span {
   declare: boolean;
   typeParameters: TSTypeParameterDeclaration | null;
   thisParam: TSThisParameter | null;
-  params: FormalParameters;
+  params: ParamPattern[];
   returnType: TSTypeAnnotation | null;
   body: FunctionBody | null;
+  expression: false;
 }
 
+export type ParamPattern = FormalParameter | FormalParameterRest;
+
 export type FunctionType =
   | 'FunctionDeclaration'
   | 'FunctionExpression'
@@ -780,21 +568,28 @@ export interface FormalParameters extends Span {
   items: Array<FormalParameter | FormalParameterRest>;
 }
 
-export interface FormalParameter extends Span {
-  type: 'FormalParameter';
-  decorators: Array<Decorator>;
-  pattern: BindingPattern;
-  accessibility: TSAccessibility | null;
-  readonly: boolean;
-  override: boolean;
+export interface FormalParameterRest extends Span {
+  type: 'RestElement';
+  argument: BindingPatternKind;
+  typeAnnotation: TSTypeAnnotation | null;
+  optional: boolean;
 }
 
+export type FormalParameter =
+  & ({
+    decorators: Array<Decorator>;
+    accessibility: TSAccessibility | null;
+    readonly: boolean;
+    override: boolean;
+  })
+  & Span
+  & BindingPattern;
+
 export type FormalParameterKind = 'FormalParameter' | 'UniqueFormalParameters' | 'ArrowFormalParameters' | 'Signature';
 
 export interface FunctionBody extends Span {
-  type: 'FunctionBody';
-  directives: Array<Directive>;
-  statements: Array<Statement>;
+  type: 'BlockStatement';
+  body: Array<Directive | Statement>;
 }
 
 export interface ArrowFunctionExpression extends Span {
@@ -802,9 +597,11 @@ export interface ArrowFunctionExpression extends Span {
   expression: boolean;
   async: boolean;
   typeParameters: TSTypeParameterDeclaration | null;
-  params: FormalParameters;
+  params: ParamPattern[];
   returnType: TSTypeAnnotation | null;
-  body: FunctionBody;
+  body: FunctionBody | Expression;
+  generator: false;
+  id: null;
 }
 
 export interface YieldExpression extends Span {
@@ -905,8 +702,7 @@ export interface AccessorProperty extends Span {
 export interface ImportExpression extends Span {
   type: 'ImportExpression';
   source: Expression;
-  arguments: Array<Expression>;
-  phase: ImportPhase | null;
+  options: Expression | null;
 }
 
 export interface ImportDeclaration extends Span {
@@ -914,7 +710,7 @@ export interface ImportDeclaration extends Span {
   specifiers: Array<ImportDeclarationSpecifier>;
   source: StringLiteral;
   phase: ImportPhase | null;
-  withClause: WithClause | null;
+  attributes: Array<ImportAttribute>;
   importKind: ImportOrExportKind;
 }
 
@@ -959,7 +755,7 @@ export interface ExportNamedDeclaration extends Span {
   specifiers: Array<ExportSpecifier>;
   source: StringLiteral | null;
   exportKind: ImportOrExportKind;
-  withClause: WithClause | null;
+  attributes: Array<ImportAttribute>;
 }
 
 export interface ExportDefaultDeclaration extends Span {
@@ -968,69 +764,163 @@ export interface ExportDefaultDeclaration extends Span {
   exported: ModuleExportName;
 }
 
-export interface ExportAllDeclaration extends Span {
-  type: 'ExportAllDeclaration';
-  exported: ModuleExportName | null;
-  source: StringLiteral;
-  withClause: WithClause | null;
-  exportKind: ImportOrExportKind;
+export interface ExportAllDeclaration extends Span {
+  type: 'ExportAllDeclaration';
+  exported: ModuleExportName | null;
+  source: StringLiteral;
+  attributes: Array<ImportAttribute>;
+  exportKind: ImportOrExportKind;
+}
+
+export interface ExportSpecifier extends Span {
+  type: 'ExportSpecifier';
+  local: ModuleExportName;
+  exported: ModuleExportName;
+  exportKind: ImportOrExportKind;
+}
+
+export type ExportDefaultDeclarationKind = Function | Class | TSInterfaceDeclaration | Expression;
+
+export type ModuleExportName = IdentifierName | IdentifierReference | StringLiteral;
+
+export interface BooleanLiteral extends Span {
+  type: 'Literal';
+  value: boolean;
+  raw: string | null;
+}
+
+export interface NullLiteral extends Span {
+  type: 'Literal';
+  value: null;
+  raw: 'null' | null;
+}
+
+export interface NumericLiteral extends Span {
+  type: 'Literal';
+  value: number;
+  raw: string | null;
+}
+
+export interface StringLiteral extends Span {
+  type: 'Literal';
+  value: string;
+  raw: string | null;
+}
+
+export interface BigIntLiteral extends Span {
+  type: 'Literal';
+  raw: string | null;
+  value: null;
+  bigint: string;
+}
+
+export interface RegExpLiteral extends Span {
+  type: 'Literal';
+  regex: RegExp;
+  raw: string | null;
+  value: null;
+}
+
+export interface RegExp {
+  pattern: string;
+  flags: string;
+}
+
+export interface JSXElement extends Span {
+  type: 'JSXElement';
+  openingElement: JSXOpeningElement;
+  closingElement: JSXClosingElement | null;
+  children: Array<JSXChild>;
+}
+
+export interface JSXOpeningElement extends Span {
+  type: 'JSXOpeningElement';
+  selfClosing: boolean;
+  name: JSXElementName;
+  attributes: Array<JSXAttributeItem>;
+  typeParameters: TSTypeParameterInstantiation | null;
+}
+
+export interface JSXClosingElement extends Span {
+  type: 'JSXClosingElement';
+  name: JSXElementName;
+}
+
+export interface JSXFragment extends Span {
+  type: 'JSXFragment';
+  openingFragment: JSXOpeningFragment;
+  closingFragment: JSXClosingFragment;
+  children: Array<JSXChild>;
+}
+
+export interface JSXOpeningFragment extends Span {
+  type: 'JSXOpeningFragment';
+}
+
+export interface JSXClosingFragment extends Span {
+  type: 'JSXClosingFragment';
+}
+
+export type JSXElementName = JSXIdentifier | JSXNamespacedName | JSXMemberExpression;
+
+export interface JSXNamespacedName extends Span {
+  type: 'JSXNamespacedName';
+  namespace: JSXIdentifier;
+  property: JSXIdentifier;
+}
+
+export interface JSXMemberExpression extends Span {
+  type: 'JSXMemberExpression';
+  object: JSXMemberExpressionObject;
+  property: JSXIdentifier;
+}
+
+export type JSXMemberExpressionObject = JSXIdentifier | JSXMemberExpression;
+
+export interface JSXExpressionContainer extends Span {
+  type: 'JSXExpressionContainer';
+  expression: JSXExpression;
+}
+
+export type JSXExpression = JSXEmptyExpression | Expression;
+
+export interface JSXEmptyExpression extends Span {
+  type: 'JSXEmptyExpression';
+}
+
+export type JSXAttributeItem = JSXAttribute | JSXSpreadAttribute;
+
+export interface JSXAttribute extends Span {
+  type: 'JSXAttribute';
+  name: JSXAttributeName;
+  value: JSXAttributeValue | null;
+}
+
+export interface JSXSpreadAttribute extends Span {
+  type: 'JSXSpreadAttribute';
+  argument: Expression;
 }
 
-export interface ExportSpecifier extends Span {
-  type: 'ExportSpecifier';
-  local: ModuleExportName;
-  exported: ModuleExportName;
-  exportKind: ImportOrExportKind;
+export type JSXAttributeName = JSXIdentifier | JSXNamespacedName;
+
+export type JSXAttributeValue = StringLiteral | JSXExpressionContainer | JSXElement | JSXFragment;
+
+export interface JSXIdentifier extends Span {
+  type: 'JSXIdentifier';
+  name: string;
 }
 
-export type ExportDefaultDeclarationKind =
-  | Function
-  | Class
-  | TSInterfaceDeclaration
-  | BooleanLiteral
-  | NullLiteral
-  | NumericLiteral
-  | BigIntLiteral
-  | RegExpLiteral
-  | StringLiteral
-  | TemplateLiteral
-  | IdentifierReference
-  | MetaProperty
-  | Super
-  | ArrayExpression
-  | ArrowFunctionExpression
-  | AssignmentExpression
-  | AwaitExpression
-  | BinaryExpression
-  | CallExpression
-  | ChainExpression
-  | Class
-  | ConditionalExpression
-  | Function
-  | ImportExpression
-  | LogicalExpression
-  | NewExpression
-  | ObjectExpression
-  | ParenthesizedExpression
-  | SequenceExpression
-  | TaggedTemplateExpression
-  | ThisExpression
-  | UnaryExpression
-  | UpdateExpression
-  | YieldExpression
-  | PrivateInExpression
-  | JSXElement
-  | JSXFragment
-  | TSAsExpression
-  | TSSatisfiesExpression
-  | TSTypeAssertion
-  | TSNonNullExpression
-  | TSInstantiationExpression
-  | ComputedMemberExpression
-  | StaticMemberExpression
-  | PrivateFieldExpression;
+export type JSXChild = JSXText | JSXElement | JSXFragment | JSXExpressionContainer | JSXSpreadChild;
 
-export type ModuleExportName = IdentifierName | IdentifierReference | StringLiteral;
+export interface JSXSpreadChild extends Span {
+  type: 'JSXSpreadChild';
+  expression: Expression;
+}
+
+export interface JSXText extends Span {
+  type: 'JSXText';
+  value: string;
+}
 
 export interface TSThisParameter extends Span {
   type: 'TSThisParameter';
@@ -1177,47 +1067,7 @@ export interface TSRestType extends Span {
   typeAnnotation: TSType;
 }
 
-export type TSTupleElement =
-  | TSOptionalType
-  | TSRestType
-  | TSAnyKeyword
-  | TSBigIntKeyword
-  | TSBooleanKeyword
-  | TSIntrinsicKeyword
-  | TSNeverKeyword
-  | TSNullKeyword
-  | TSNumberKeyword
-  | TSObjectKeyword
-  | TSStringKeyword
-  | TSSymbolKeyword
-  | TSUndefinedKeyword
-  | TSUnknownKeyword
-  | TSVoidKeyword
-  | TSArrayType
-  | TSConditionalType
-  | TSConstructorType
-  | TSFunctionType
-  | TSImportType
-  | TSIndexedAccessType
-  | TSInferType
-  | TSIntersectionType
-  | TSLiteralType
-  | TSMappedType
-  | TSNamedTupleMember
-  | TSQualifiedName
-  | TSTemplateLiteralType
-  | TSThisType
-  | TSTupleType
-  | TSTypeLiteral
-  | TSTypeOperator
-  | TSTypePredicate
-  | TSTypeQuery
-  | TSTypeReference
-  | TSUnionType
-  | TSParenthesizedType
-  | JSDocNullableType
-  | JSDocNonNullableType
-  | JSDocUnknownType;
+export type TSTupleElement = TSOptionalType | TSRestType | TSType;
 
 export interface TSAnyKeyword extends Span {
   type: 'TSAnyKeyword';
@@ -1367,7 +1217,7 @@ export interface TSCallSignatureDeclaration extends Span {
   type: 'TSCallSignatureDeclaration';
   typeParameters: TSTypeParameterDeclaration | null;
   thisParam: TSThisParameter | null;
-  params: FormalParameters;
+  params: ParamPattern[];
   returnType: TSTypeAnnotation | null;
 }
 
@@ -1381,14 +1231,14 @@ export interface TSMethodSignature extends Span {
   kind: TSMethodSignatureKind;
   typeParameters: TSTypeParameterDeclaration | null;
   thisParam: TSThisParameter | null;
-  params: FormalParameters;
+  params: ParamPattern[];
   returnType: TSTypeAnnotation | null;
 }
 
 export interface TSConstructSignatureDeclaration extends Span {
   type: 'TSConstructSignatureDeclaration';
   typeParameters: TSTypeParameterDeclaration | null;
-  params: FormalParameters;
+  params: ParamPattern[];
   returnType: TSTypeAnnotation | null;
 }
 
@@ -1429,7 +1279,7 @@ export type TSModuleDeclarationBody = TSModuleDeclaration | TSModuleBlock;
 
 export interface TSModuleBlock extends Span {
   type: 'TSModuleBlock';
-  body: Array<Statement>;
+  body: Array<Directive | Statement>;
 }
 
 export interface TSTypeLiteral extends Span {
@@ -1448,7 +1298,7 @@ export interface TSTypeQuery extends Span {
   typeParameters: TSTypeParameterInstantiation | null;
 }
 
-export type TSTypeQueryExprName = TSImportType | IdentifierReference | TSQualifiedName;
+export type TSTypeQueryExprName = TSImportType | TSTypeName;
 
 export interface TSImportType extends Span {
   type: 'TSImportType';
@@ -1477,7 +1327,7 @@ export interface TSFunctionType extends Span {
   type: 'TSFunctionType';
   typeParameters: TSTypeParameterDeclaration | null;
   thisParam: TSThisParameter | null;
-  params: FormalParameters;
+  params: ParamPattern[];
   returnType: TSTypeAnnotation;
 }
 
@@ -1485,7 +1335,7 @@ export interface TSConstructorType extends Span {
   type: 'TSConstructorType';
   abstract: boolean;
   typeParameters: TSTypeParameterDeclaration | null;
-  params: FormalParameters;
+  params: ParamPattern[];
   returnType: TSTypeAnnotation;
 }
 
@@ -1531,7 +1381,7 @@ export interface TSImportEqualsDeclaration extends Span {
   importKind: ImportOrExportKind;
 }
 
-export type TSModuleReference = TSExternalModuleReference | IdentifierReference | TSQualifiedName;
+export type TSModuleReference = TSExternalModuleReference | TSTypeName;
 
 export interface TSExternalModuleReference extends Span {
   type: 'TSExternalModuleReference';
@@ -1582,141 +1432,6 @@ export interface JSDocUnknownType extends Span {
   type: 'JSDocUnknownType';
 }
 
-export interface JSXElement extends Span {
-  type: 'JSXElement';
-  openingElement: JSXOpeningElement;
-  closingElement: JSXClosingElement | null;
-  children: Array<JSXChild>;
-}
-
-export interface JSXOpeningElement extends Span {
-  type: 'JSXOpeningElement';
-  selfClosing: boolean;
-  name: JSXElementName;
-  attributes: Array<JSXAttributeItem>;
-  typeParameters: TSTypeParameterInstantiation | null;
-}
-
-export interface JSXClosingElement extends Span {
-  type: 'JSXClosingElement';
-  name: JSXElementName;
-}
-
-export interface JSXFragment extends Span {
-  type: 'JSXFragment';
-  openingFragment: JSXOpeningFragment;
-  closingFragment: JSXClosingFragment;
-  children: Array<JSXChild>;
-}
-
-export interface JSXOpeningFragment extends Span {
-  type: 'JSXOpeningFragment';
-}
-
-export interface JSXClosingFragment extends Span {
-  type: 'JSXClosingFragment';
-}
-
-export interface JSXNamespacedName extends Span {
-  type: 'JSXNamespacedName';
-  namespace: JSXIdentifier;
-  property: JSXIdentifier;
-}
-
-export interface JSXMemberExpression extends Span {
-  type: 'JSXMemberExpression';
-  object: JSXMemberExpressionObject;
-  property: JSXIdentifier;
-}
-
-export interface JSXExpressionContainer extends Span {
-  type: 'JSXExpressionContainer';
-  expression: JSXExpression;
-}
-
-export type JSXExpression =
-  | JSXEmptyExpression
-  | BooleanLiteral
-  | NullLiteral
-  | NumericLiteral
-  | BigIntLiteral
-  | RegExpLiteral
-  | StringLiteral
-  | TemplateLiteral
-  | IdentifierReference
-  | MetaProperty
-  | Super
-  | ArrayExpression
-  | ArrowFunctionExpression
-  | AssignmentExpression
-  | AwaitExpression
-  | BinaryExpression
-  | CallExpression
-  | ChainExpression
-  | Class
-  | ConditionalExpression
-  | Function
-  | ImportExpression
-  | LogicalExpression
-  | NewExpression
-  | ObjectExpression
-  | ParenthesizedExpression
-  | SequenceExpression
-  | TaggedTemplateExpression
-  | ThisExpression
-  | UnaryExpression
-  | UpdateExpression
-  | YieldExpression
-  | PrivateInExpression
-  | JSXElement
-  | JSXFragment
-  | TSAsExpression
-  | TSSatisfiesExpression
-  | TSTypeAssertion
-  | TSNonNullExpression
-  | TSInstantiationExpression
-  | ComputedMemberExpression
-  | StaticMemberExpression
-  | PrivateFieldExpression;
-
-export interface JSXEmptyExpression extends Span {
-  type: 'JSXEmptyExpression';
-}
-
-export type JSXAttributeItem = JSXAttribute | JSXSpreadAttribute;
-
-export interface JSXAttribute extends Span {
-  type: 'JSXAttribute';
-  name: JSXAttributeName;
-  value: JSXAttributeValue | null;
-}
-
-export interface JSXSpreadAttribute extends Span {
-  type: 'JSXSpreadAttribute';
-  argument: Expression;
-}
-
-export type JSXAttributeName = JSXIdentifier | JSXNamespacedName;
-
-export type JSXAttributeValue = StringLiteral | JSXExpressionContainer | JSXElement | JSXFragment;
-
-export interface JSXIdentifier extends Span {
-  type: 'JSXIdentifier';
-  name: string;
-}
-
-export type JSXChild = JSXText | JSXElement | JSXFragment | JSXExpressionContainer | JSXSpreadChild;
-
-export interface JSXSpreadChild extends Span {
-  type: 'JSXSpreadChild';
-  expression: Expression;
-}
-
-export interface JSXText extends Span {
-  type: 'JSXText';
-  value: string;
-}
-
 export type AssignmentOperator =
   | '='
   | '+='
@@ -1770,18 +1485,8 @@ export interface Span {
   end: number;
 }
 
-export interface SourceType {
-  language: Language;
-  moduleKind: ModuleKind;
-  variant: LanguageVariant;
-}
-
-export type Language = 'javascript' | 'typescript' | 'typescriptDefinition';
-
 export type ModuleKind = 'script' | 'module' | 'unambiguous';
 
-export type LanguageVariant = 'standard' | 'jsx';
-
 export interface Pattern extends Span {
   type: 'Pattern';
   body: Disjunction;
@@ -1941,36 +1646,3 @@ export interface NamedReference extends Span {
   type: 'NamedReference';
   name: string;
 }
-
-export interface FormalParameterRest extends Span {
-  type: 'RestElement';
-  argument: BindingPatternKind;
-  typeAnnotation: TSTypeAnnotation | null;
-  optional: boolean;
-}
-
-export type RegExpFlags = {
-  /** Global flag */
-  G: 1;
-  /** Ignore case flag */
-  I: 2;
-  /** Multiline flag */
-  M: 4;
-  /** DotAll flag */
-  S: 8;
-  /** Unicode flag */
-  U: 16;
-  /** Sticky flag */
-  Y: 32;
-  /** Indices flag */
-  D: 64;
-  /** Unicode sets flag */
-  V: 128;
-};
-
-export type JSXElementName =
-  | JSXIdentifier
-  | JSXNamespacedName
-  | JSXMemberExpression;
-
-export type JSXMemberExpressionObject = JSXIdentifier | JSXMemberExpression;