refactor(all): remove binding pattern wierdness

Author: camc314

apps/oxlint/src-js/generated/deserialize.js

@@ -1599,15 +1599,17 @@ function deserializeVariableDeclarator(pos) {
       __proto__: NodeProto,
       type: 'VariableDeclarator',
       id: null,
+      typeAnnotation: null,
       init: null,
-      definite: deserializeBool(pos + 57),
+      definite: deserializeBool(pos + 49),
       start,
       end,
       range: [start, end],
       parent,
     });
   node.id = deserializeBindingPattern(pos + 8);
-  node.init = deserializeOptionExpression(pos + 40);
+  node.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 24);
+  node.init = deserializeOptionExpression(pos + 32);
   parent = previousParent;
   return node;
 }
@@ -2088,13 +2090,15 @@ function deserializeCatchClause(pos) {
       parent,
     });
   node.param = deserializeOptionCatchParameter(pos + 8);
-  node.body = deserializeBoxBlockStatement(pos + 48);
+  node.body = deserializeBoxBlockStatement(pos + 40);
   parent = previousParent;
   return node;
 }
 
 function deserializeCatchParameter(pos) {
-  return deserializeBindingPattern(pos + 8);
+  let pattern = deserializeBindingPattern(pos + 8);
+  pattern.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 24);
+  return pattern;
 }
 
 function deserializeDebuggerStatement(pos) {
@@ -2111,18 +2115,6 @@ function deserializeDebuggerStatement(pos) {
 }
 
 function deserializeBindingPattern(pos) {
-  let pattern = deserializeBindingPatternKind(pos);
-  {
-    let previousParent = parent;
-    parent = pattern;
-    pattern.optional = deserializeBool(pos + 24);
-    pattern.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 16);
-    parent = previousParent;
-  }
-  return pattern;
-}
-
-function deserializeBindingPatternKind(pos) {
   switch (uint8[pos]) {
     case 0:
       return deserializeBoxBindingIdentifier(pos + 8);
@@ -2133,7 +2125,7 @@ function deserializeBindingPatternKind(pos) {
     case 3:
       return deserializeBoxAssignmentPattern(pos + 8);
     default:
-      throw Error(`Unexpected discriminant ${uint8[pos]} for BindingPatternKind`);
+      throw Error(`Unexpected discriminant ${uint8[pos]} for BindingPattern`);
   }
 }
 
@@ -2156,7 +2148,7 @@ function deserializeAssignmentPattern(pos) {
     });
   node.decorators = [];
   node.left = deserializeBindingPattern(pos + 8);
-  node.right = deserializeExpression(pos + 40);
+  node.right = deserializeExpression(pos + 24);
   node.optional = false;
   parent = previousParent;
   return node;
@@ -2199,8 +2191,8 @@ function deserializeBindingProperty(pos) {
       key: null,
       value: null,
       method: null,
-      shorthand: deserializeBool(pos + 56),
-      computed: deserializeBool(pos + 57),
+      shorthand: deserializeBool(pos + 40),
+      computed: deserializeBool(pos + 41),
       optional: null,
       start,
       end,
@@ -2329,16 +2321,16 @@ function deserializeFormalParameters(pos) {
         type: 'RestElement',
         decorators: [],
         argument: null,
-        optional: deserializeBool(pos + 32),
+        optional: false,
         typeAnnotation: null,
         value: null,
         start: (start = deserializeU32(pos)),
         end: (end = deserializeU32(pos + 4)),
         range: [start, end],
         parent,
       });
-    rest.argument = deserializeBindingPatternKind(pos + 8);
-    rest.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 24);
+    rest.argument = deserializeBindingPattern(pos + 16);
+    rest.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 32);
     params.push(rest);
     parent = previousParent;
   }
@@ -2348,14 +2340,14 @@ function deserializeFormalParameters(pos) {
 function deserializeFormalParameter(pos) {
   let param;
   {
-    let accessibility = deserializeOptionTSAccessibility(pos + 64),
-      readonly = deserializeBool(pos + 65),
-      override = deserializeBool(pos + 66),
+    let accessibility = deserializeOptionTSAccessibility(pos + 65),
+      readonly = deserializeBool(pos + 66),
+      override = deserializeBool(pos + 67),
       previousParent = parent;
     if (accessibility === null && !readonly && !override) {
-      param = parent = deserializeBindingPatternKind(pos + 32);
+      param = parent = deserializeBindingPattern(pos + 32);
       param.decorators = deserializeVecDecorator(pos + 8);
-      param.optional = deserializeBool(pos + 56);
+      param.optional = deserializeBool(pos + 64);
       param.typeAnnotation = deserializeOptionBoxTSTypeAnnotation(pos + 48);
     } else {
       let start, end;
@@ -6308,14 +6300,23 @@ function deserializeVecVariableDeclarator(pos) {
   let arr = [],
     pos32 = pos >> 2;
   pos = uint32[pos32];
-  let endPos = pos + uint32[pos32 + 2] * 64;
+  let endPos = pos + uint32[pos32 + 2] * 56;
   for (; pos !== endPos; ) {
     arr.push(deserializeVariableDeclarator(pos));
-    pos += 64;
+    pos += 56;
   }
   return arr;
 }
 
+function deserializeBoxTSTypeAnnotation(pos) {
+  return deserializeTSTypeAnnotation(uint32[pos >> 2]);
+}
+
+function deserializeOptionBoxTSTypeAnnotation(pos) {
+  if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
+  return deserializeBoxTSTypeAnnotation(pos);
+}
+
 function deserializeOptionStatement(pos) {
   if (uint8[pos] === 70) return null;
   return deserializeStatement(pos);
@@ -6358,19 +6359,10 @@ function deserializeOptionBoxBlockStatement(pos) {
 }
 
 function deserializeOptionCatchParameter(pos) {
-  if (uint8[pos + 32] === 2) return null;
+  if (uint8[pos + 8] === 4) return null;
   return deserializeCatchParameter(pos);
 }
 
-function deserializeBoxTSTypeAnnotation(pos) {
-  return deserializeTSTypeAnnotation(uint32[pos >> 2]);
-}
-
-function deserializeOptionBoxTSTypeAnnotation(pos) {
-  if (uint32[pos >> 2] === 0 && uint32[(pos + 4) >> 2] === 0) return null;
-  return deserializeBoxTSTypeAnnotation(pos);
-}
-
 function deserializeBoxBindingIdentifier(pos) {
   return deserializeBindingIdentifier(uint32[pos >> 2]);
 }
@@ -6391,10 +6383,10 @@ function deserializeVecBindingProperty(pos) {
   let arr = [],
     pos32 = pos >> 2;
   pos = uint32[pos32];
-  let endPos = pos + uint32[pos32 + 2] * 64;
+  let endPos = pos + uint32[pos32 + 2] * 48;
   for (; pos !== endPos; ) {
     arr.push(deserializeBindingProperty(pos));
-    pos += 64;
+    pos += 48;
   }
   return arr;
 }
@@ -6409,18 +6401,18 @@ function deserializeOptionBoxBindingRestElement(pos) {
 }
 
 function deserializeOptionBindingPattern(pos) {
-  if (uint8[pos + 24] === 2) return null;
+  if (uint8[pos] === 4) return null;
   return deserializeBindingPattern(pos);
 }
 
 function deserializeVecOptionBindingPattern(pos) {
   let arr = [],
     pos32 = pos >> 2;
   pos = uint32[pos32];
-  let endPos = pos + uint32[pos32 + 2] * 32;
+  let endPos = pos + uint32[pos32 + 2] * 16;
   for (; pos !== endPos; ) {
     arr.push(deserializeOptionBindingPattern(pos));
-    pos += 32;
+    pos += 16;
   }
   return arr;
 }

apps/oxlint/src-js/generated/types.d.ts

@@ -448,6 +448,7 @@ export type VariableDeclarationKind = 'var' | 'let' | 'const' | 'using' | 'await
 export interface VariableDeclarator extends Span {
   type: 'VariableDeclarator';
   id: BindingPattern;
+  typeAnnotation?: TSTypeAnnotation | null;
   init: Expression | null;
   definite?: boolean;
   parent: Node;
@@ -589,12 +590,7 @@ export interface DebuggerStatement extends Span {
   parent: Node;
 }
 
-export type BindingPattern = {
-  optional?: boolean;
-  typeAnnotation?: TSTypeAnnotation | null;
-} & (BindingIdentifier | ObjectPattern | ArrayPattern | AssignmentPattern);
-
-export type BindingPatternKind = BindingIdentifier | ObjectPattern | ArrayPattern | AssignmentPattern;
+export type BindingPattern = BindingIdentifier | ObjectPattern | ArrayPattern | AssignmentPattern;
 
 export interface AssignmentPattern extends Span {
   type: 'AssignmentPattern';

crates/oxc_ast/src/ast/js.rs

@@ -270,7 +270,7 @@ pub struct IdentifierReference<'a> {
 ///
 /// See: [13.1 Identifiers](https://tc39.es/ecma262/#sec-identifiers)
 ///
-/// Also see other examples in docs for [`BindingPatternKind`].
+/// Also see other examples in docs for [`BindingPattern`].
 #[ast(visit)]
 #[derive(Debug, Clone)]
 #[generate_derive(CloneIn, Dummy, TakeIn, GetSpan, GetSpanMut, ContentEq, ESTree, UnstableAddress)]
@@ -1230,6 +1230,8 @@ pub struct VariableDeclarator<'a> {
     #[estree(skip)]
     pub kind: VariableDeclarationKind,
     pub id: BindingPattern<'a>,
+    #[ts]
+    pub type_annotation: Option<Box<'a, TSTypeAnnotation<'a>>>,
     pub init: Option<Expression<'a>>,
     #[ts]
     pub definite: bool,
@@ -1521,6 +1523,8 @@ pub struct CatchParameter<'a> {
     /// The bound error
     #[estree(flatten)]
     pub pattern: BindingPattern<'a>,
+    #[ts]
+    pub type_annotation: Option<Box<'a, TSTypeAnnotation<'a>>>,
 }
 
 /// Debugger Statement
@@ -1537,36 +1541,10 @@ pub struct DebuggerStatement {
     pub span: Span,
 }
 
-/// Destructuring Binding Patterns.
-/// <https://tc39.es/ecma262/#prod-BindingPattern>
-///
-/// Binding patterns can be nested within other binding patterns
-/// e.g. `const [ { a: [ {x} ] } ] = arr;`.
-///
-/// Type annotations are valid in some positions e.g. `const x: T = f();`
-/// but invalid in others e.g. `const [x: T] = f();`.
-#[ast(visit)]
-#[derive(Debug)]
-#[generate_derive(CloneIn, Dummy, TakeIn, GetSpan, GetSpanMut, ContentEq, ESTree, UnstableAddress)]
-#[estree(no_type, via = BindingPatternConverter, field_order(kind, optional, type_annotation))]
-pub struct BindingPattern<'a> {
-    // estree(flatten) the attributes because estree has no `BindingPattern`
-    #[estree(
-        flatten,
-        ts_type = "(BindingIdentifier | ObjectPattern | ArrayPattern | AssignmentPattern)"
-    )]
-    #[span]
-    pub kind: BindingPatternKind<'a>,
-    #[ts]
-    pub type_annotation: Option<Box<'a, TSTypeAnnotation<'a>>>,
-    #[ts]
-    pub optional: bool,
-}
-
 #[ast(visit)]
 #[derive(Debug)]
 #[generate_derive(CloneIn, Dummy, TakeIn, GetSpan, GetSpanMut, GetAddress, ContentEq, ESTree)]
-pub enum BindingPatternKind<'a> {
+pub enum BindingPattern<'a> {
     /// `x` in `const x = 1;`.
     ///
     /// Also e.g. `x` in:
@@ -1617,7 +1595,7 @@ pub enum BindingPatternKind<'a> {
 
 /// `x = 1` in `const {x = 1} = obj;`.
 ///
-/// See other examples in docs for [`BindingPatternKind`].
+/// See other examples in docs for [`BindingPattern`].
 #[ast(visit)]
 #[derive(Debug)]
 #[generate_derive(CloneIn, Dummy, TakeIn, GetSpan, GetSpanMut, ContentEq, ESTree, UnstableAddress)]
@@ -1633,7 +1611,7 @@ pub struct AssignmentPattern<'a> {
 
 /// `{x}` in `const {x} = 1;`.
 ///
-/// See other examples in docs for [`BindingPatternKind`].
+/// See other examples in docs for [`BindingPattern`].
 #[ast(visit)]
 #[derive(Debug)]
 #[generate_derive(CloneIn, Dummy, TakeIn, GetSpan, GetSpanMut, ContentEq, ESTree, UnstableAddress)]
@@ -1666,7 +1644,7 @@ pub struct BindingProperty<'a> {
 
 /// `[x]` in `const [x] = 1;`
 ///
-/// See other examples in docs for [`BindingPatternKind`].
+/// See other examples in docs for [`BindingPattern`].
 #[ast(visit)]
 #[derive(Debug)]
 #[generate_derive(CloneIn, Dummy, TakeIn, GetSpan, GetSpanMut, ContentEq, ESTree, UnstableAddress)]
@@ -1863,7 +1841,7 @@ pub struct FormalParameters<'a> {
     #[estree(ts_type = "Array<FormalParameter | TSParameterProperty | FormalParameterRest>")]
     pub items: Vec<'a, FormalParameter<'a>>,
     #[estree(skip)]
-    pub rest: Option<Box<'a, BindingRestElement<'a>>>,
+    pub rest: Option<Box<'a, FormalParameterRest<'a>>>,
 }
 
 #[ast(visit)]
@@ -1901,6 +1879,11 @@ pub struct FormalParameter<'a> {
     #[estree(flatten)]
     pub pattern: BindingPattern<'a>,
     #[ts]
+    pub type_annotation: Option<Box<'a, TSTypeAnnotation<'a>>>,
+    pub initializer: Option<Box<'a, Expression<'a>>>,
+    #[ts]
+    pub optional: bool,
+    #[ts]
     #[estree(skip)]
     pub accessibility: Option<TSAccessibility>,
     #[ts]
@@ -1926,6 +1909,18 @@ pub enum FormalParameterKind {
     Signature = 3,
 }
 
+/// Rest parameter in a function's formal parameters.
+///
+/// Wrapper around [`BindingRestElement`] with optional type annotation for TypeScript.
+#[ast(visit)]
+#[derive(Debug)]
+#[generate_derive(CloneIn, Dummy, TakeIn, GetSpan, GetSpanMut, ContentEq, UnstableAddress)]
+pub struct FormalParameterRest<'a> {
+    pub span: Span,
+    pub rest: BindingRestElement<'a>,
+    pub type_annotation: Option<Box<'a, TSTypeAnnotation<'a>>>,
+}
+
 /// <https://tc39.es/ecma262/#prod-FunctionBody>
 #[ast(visit)]
 #[derive(Debug)]

crates/oxc_ast/src/ast_builder_impl.rs

@@ -160,7 +160,7 @@ impl<'a> AstBuilder<'a> {
         span: Span,
         pattern: BindingPattern<'a>,
     ) -> FormalParameter<'a> {
-        self.formal_parameter(span, self.vec(), pattern, None, false, false)
+        self.formal_parameter(span, self.vec(), pattern, NONE, NONE, false, None, false, false)
     }
 
     /// Create a [`Function`] with no "extras".