refactor(all): remove binding pattern wierdness

Author: camc314

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,26 @@ 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,
+            // span: Span,
+            // decorators: Vec<'a, Decorator<'a>>,
+            // pattern: BindingPattern<'a>,
+            // type_annotation: T1,
+            // initializer: Option<Expression<'a>>,
+            // optional: bool,
+            // accessibility: Option<TSAccessibility>,
+            // readonly: bool,
+            // r#override: bool,
+            self.vec(),
+            pattern,
+            NONE,
+            NONE,
+            false,
+            None,
+            false,
+            false,
+        )
     }
 
     /// Create a [`Function`] with no "extras".

crates/oxc_ast/src/ast_impl/js.rs

@@ -1247,43 +1247,6 @@ impl SwitchCase<'_> {
 }
 
 impl<'a> BindingPattern<'a> {
-    /// Returns the name of the bound identifier in this binding pattern, if it has one, or `None` otherwise.
-    ///
-    /// ## Example
-    ///
-    /// - calling on `a = 1` in `let a = 1` would return `Some("a")`
-    /// - calling on `a = 1` in `let {a = 1} = c` would return `Some("a")`
-    /// - calling on `a: b` in `let {a: b} = c` would return `None`
-    pub fn get_identifier_name(&self) -> Option<Atom<'a>> {
-        self.kind.get_identifier_name()
-    }
-
-    /// Returns the bound identifier in this binding pattern, if it has one, or `None` otherwise.
-    ///
-    /// To just get the name of the bound identifier, use [`BindingPattern::get_identifier_name`].
-    ///
-    /// ## Example
-    ///
-    /// - calling on `a = 1` in `let a = 1` would return `Some(BindingIdentifier { name: "a", .. })`
-    /// - calling on `a = 1` in `let {a = 1} = c` would return `Some(BindingIdentifier { name: "a", .. })`
-    /// - calling on `a: b` in `let {a: b} = c` would return `None`
-    pub fn get_binding_identifier(&self) -> Option<&BindingIdentifier<'a>> {
-        self.kind.get_binding_identifier()
-    }
-
-    /// Returns the bound identifiers in this binding pattern.
-    ///
-    /// ## Example
-    ///
-    /// - `let {} = obj` would return `[]`
-    /// - `let {a, b} = obj` would return `[a, b]`
-    /// - `let {a = 1, b: c} = obj` would return `[a, c]`
-    pub fn get_binding_identifiers(&self) -> std::vec::Vec<&BindingIdentifier<'a>> {
-        self.kind.get_binding_identifiers()
-    }
-}
-
-impl<'a> BindingPatternKind<'a> {
     /// Returns the name of the bound identifier in this binding pattern, if it has one, or `None` otherwise.
     ///
     /// ## Example
@@ -1322,23 +1285,23 @@ impl<'a> BindingPatternKind<'a> {
     ) {
         match self {
             Self::BindingIdentifier(ident) => idents.push(ident),
-            Self::AssignmentPattern(assign) => assign.left.kind.append_binding_identifiers(idents),
+            Self::AssignmentPattern(assign) => assign.left.append_binding_identifiers(idents),
             Self::ArrayPattern(pattern) => {
                 pattern
                     .elements
                     .iter()
                     .filter_map(|item| item.as_ref())
-                    .for_each(|item| item.kind.append_binding_identifiers(idents));
+                    .for_each(|item| item.append_binding_identifiers(idents));
                 if let Some(rest) = &pattern.rest {
-                    rest.argument.kind.append_binding_identifiers(idents);
+                    rest.argument.append_binding_identifiers(idents);
                 }
             }
             Self::ObjectPattern(pattern) => {
                 pattern.properties.iter().for_each(|item| {
-                    item.value.kind.append_binding_identifiers(idents);
+                    item.value.append_binding_identifiers(idents);
                 });
                 if let Some(rest) = &pattern.rest {
-                    rest.argument.kind.append_binding_identifiers(idents);
+                    rest.argument.append_binding_identifiers(idents);
                 }
             }
         }
@@ -1368,7 +1331,7 @@ impl<'a> BindingPatternKind<'a> {
     pub fn is_destructuring_pattern(&self) -> bool {
         match self {
             Self::ObjectPattern(_) | Self::ArrayPattern(_) => true,
-            Self::AssignmentPattern(pattern) => pattern.left.kind.is_destructuring_pattern(),
+            Self::AssignmentPattern(pattern) => pattern.left.is_destructuring_pattern(),
             Self::BindingIdentifier(_) => false,
         }
     }
@@ -1475,7 +1438,7 @@ impl<'a> FormalParameters<'a> {
         self.items
             .iter()
             .map(|param| &param.pattern)
-            .chain(self.rest.iter().map(|rest| &rest.argument))
+            .chain(self.rest.iter().map(|param| &param.rest.argument))
     }
 }
 

crates/oxc_ast/src/ast_kind_impl.rs

@@ -477,6 +477,7 @@ impl AstKind<'_> {
                 p.pattern.get_identifier_name().unwrap_or(Atom::from(DESTRUCTURE.as_ref()))
             )
             .into(),
+            Self::FormalParameterRest(_) => "FormalParameterRest".into(),
             Self::CatchParameter(_) => "CatchParameter".into(),
 
             Self::Class(c) => format!("Class({})", or_anonymous(c.id.as_ref())).into(),