fix(es/ast): Fix definition of SetterProp (#8314)

**Related issue:** - Closes #8157 - Closes #8377
swc-project · Jan 21, 2024 · bc38ac9 · bc38ac9
1 parent 572bcae
commit bc38ac9
Show file tree

Hide file tree

Showing 33 changed files with 275 additions and 89 deletions.
diff --git a/crates/swc_ecma_ast/src/prop.rs b/crates/swc_ecma_ast/src/prop.rs
@@ -6,10 +6,9 @@ use crate::{
     function::Function,
     ident::Ident,
     lit::{BigInt, Number, Str},
-    pat::Pat,
     stmt::BlockStmt,
     typescript::TsTypeAnn,
-    Id, MemberProp,
+    Id, MemberProp, Pat,
 };
 
 #[ast_node]
@@ -76,6 +75,7 @@ pub struct GetterProp {
 pub struct SetterProp {
     pub span: Span,
     pub key: PropName,
+    pub this_param: Option<Pat>,
     pub param: Box<Pat>,
     #[cfg_attr(feature = "serde-impl", serde(default))]
     pub body: Option<BlockStmt>,

diff --git a/crates/swc_ecma_codegen/src/lib.rs b/crates/swc_ecma_codegen/src/lib.rs
@@ -2218,7 +2218,15 @@ where
         formatting_space!();
 
         punct!("(");
+        if let Some(this) = &node.this_param {
+            emit!(this);
+            punct!(",");
+
+            formatting_space!();
+        }
+
         emit!(node.param);
+
         punct!(")");
 
         emit!(node.body);

diff --git a/crates/swc_ecma_compat_common/src/macros.rs b/crates/swc_ecma_compat_common/src/macros.rs
@@ -77,14 +77,14 @@ macro_rules! impl_visit_mut_fn {
             let (mut params, body) = self.visit_mut_fn_like(
                 &mut vec![Param {
                     span: DUMMY_SP,
-                    decorators: Default::default(),
+                    decorators: vec![],
                     pat: *f.param.take(),
                 }],
                 &mut f.body.take().unwrap(),
             );
             debug_assert!(params.len() == 1);
 
-            f.param = Box::new(params.pop().unwrap().pat);
+            f.param = Box::new(params.into_iter().next().unwrap().pat);
             f.body = Some(body);
         }
 

diff --git a/crates/swc_ecma_compat_es2015/src/computed_props.rs b/crates/swc_ecma_compat_es2015/src/computed_props.rs
@@ -172,6 +172,7 @@ impl VisitMut for ComputedProps {
                                     body,
                                     param,
                                     key,
+                                    ..
                                 }) => (
                                     key,
                                     Box::new(Function {

diff --git a/crates/swc_ecma_parser/src/parser/object.rs b/crates/swc_ecma_parser/src/parser/object.rs
@@ -1,6 +1,6 @@
 //! Parser for object literal.
 
-use swc_common::Spanned;
+use swc_common::{Spanned, DUMMY_SP};
 
 use super::*;
 use crate::parser::class_and_fn::is_not_this;
@@ -355,21 +355,33 @@ impl<I: Tokens> ParseObject<Box<Expr>> for Parser<I> {
                                     |Function {
                                          mut params, body, ..
                                      }| {
-                                        params.retain(|p| match &p.pat {
-                                            Pat::Ident(p) => p.sym != "this",
-                                            _ => true,
-                                        });
+                                        let mut this = None;
+                                        if params.len() >= 2 {
+                                            this = Some(params.remove(0).pat);
+                                        }
+
+                                        let param = Box::new(
+                                            params
+                                                .into_iter()
+                                                .next()
+                                                .map(|v| v.pat)
+                                                .unwrap_or_else(|| {
+                                                    parser.emit_err(
+                                                        key_span,
+                                                        SyntaxError::SetterParam,
+                                                    );
+
+                                                    Pat::Invalid(Invalid { span: DUMMY_SP })
+                                                }),
+                                        );
 
                                         // debug_assert_eq!(params.len(), 1);
                                         PropOrSpread::Prop(Box::new(Prop::Setter(SetterProp {
                                             span: span!(parser, start),
                                             key,
                                             body,
-                                            param: Box::new(
-                                                params.into_iter().map(|p| p.pat).next().unwrap_or(
-                                                    Pat::Invalid(Invalid { span: key_span }),
-                                                ),
-                                            ),
+                                            param,
+                                            this_param: this,
                                         })))
                                     },
                                 )

diff --git a/crates/swc_ecma_parser/tests/tsc/accessorWithES3.json b/crates/swc_ecma_parser/tests/tsc/accessorWithES3.json
@@ -334,6 +334,7 @@
                   "value": "b",
                   "optional": false
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {

diff --git a/crates/swc_ecma_parser/tests/tsc/accessorWithES5.json b/crates/swc_ecma_parser/tests/tsc/accessorWithES5.json
@@ -334,6 +334,7 @@
                   "value": "b",
                   "optional": false
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {

diff --git a/crates/swc_ecma_parser/tests/tsc/computedPropertyNames11_ES5.json b/crates/swc_ecma_parser/tests/tsc/computedPropertyNames11_ES5.json
@@ -269,6 +269,7 @@
                     "optional": false
                   }
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {
@@ -408,6 +409,7 @@
                     }
                   }
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {
@@ -518,6 +520,7 @@
                     "raw": "\"\""
                   }
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {
@@ -619,6 +622,7 @@
                     "optional": false
                   }
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {
@@ -748,6 +752,7 @@
                     ]
                   }
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {

diff --git a/crates/swc_ecma_parser/tests/tsc/computedPropertyNames11_ES6.json b/crates/swc_ecma_parser/tests/tsc/computedPropertyNames11_ES6.json
@@ -269,6 +269,7 @@
                     "optional": false
                   }
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {
@@ -408,6 +409,7 @@
                     }
                   }
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {
@@ -518,6 +520,7 @@
                     "raw": "\"\""
                   }
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {
@@ -619,6 +622,7 @@
                     "optional": false
                   }
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {
@@ -748,6 +752,7 @@
                     ]
                   }
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {

diff --git a/crates/swc_ecma_parser/tests/tsc/computedPropertyNames1_ES5.json b/crates/swc_ecma_parser/tests/tsc/computedPropertyNames1_ES5.json
@@ -160,6 +160,7 @@
                     }
                   }
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {

diff --git a/crates/swc_ecma_parser/tests/tsc/computedPropertyNames1_ES6.json b/crates/swc_ecma_parser/tests/tsc/computedPropertyNames1_ES6.json
@@ -160,6 +160,7 @@
                     }
                   }
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {

diff --git a/crates/swc_ecma_parser/tests/tsc/computedPropertyNamesDeclarationEmit5_ES5.json b/crates/swc_ecma_parser/tests/tsc/computedPropertyNamesDeclarationEmit5_ES5.json
@@ -270,6 +270,7 @@
                     }
                   }
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {

diff --git a/crates/swc_ecma_parser/tests/tsc/computedPropertyNamesDeclarationEmit5_ES6.json b/crates/swc_ecma_parser/tests/tsc/computedPropertyNamesDeclarationEmit5_ES6.json
@@ -270,6 +270,7 @@
                     }
                   }
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {

diff --git a/crates/swc_ecma_parser/tests/tsc/jsDeclarationsFunctionLikeClasses2.json b/crates/swc_ecma_parser/tests/tsc/jsDeclarationsFunctionLikeClasses2.json
@@ -1728,6 +1728,7 @@
                 "value": "x",
                 "optional": false
               },
+              "thisParam": null,
               "param": {
                 "type": "Identifier",
                 "span": {
@@ -1935,6 +1936,7 @@
                 "value": "y",
                 "optional": false
               },
+              "thisParam": null,
               "param": {
                 "type": "Identifier",
                 "span": {

diff --git a/crates/swc_ecma_parser/tests/tsc/numericIndexerConstrainsPropertyDeclarations.json b/crates/swc_ecma_parser/tests/tsc/numericIndexerConstrainsPropertyDeclarations.json
@@ -2808,6 +2808,7 @@
                   "value": "X",
                   "optional": false
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {

diff --git a/crates/swc_ecma_parser/tests/tsc/objectLiteralErrorsES3.json b/crates/swc_ecma_parser/tests/tsc/objectLiteralErrorsES3.json
@@ -148,6 +148,7 @@
                   "value": "a",
                   "optional": false
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {
@@ -275,6 +276,7 @@
                   "value": "a",
                   "optional": false
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {

diff --git a/crates/swc_ecma_parser/tests/tsc/objectSpreadSetonlyAccessor.json b/crates/swc_ecma_parser/tests/tsc/objectSpreadSetonlyAccessor.json
@@ -196,6 +196,7 @@
                         "value": "bar",
                         "optional": false
                       },
+                      "thisParam": null,
                       "param": {
                         "type": "Identifier",
                         "span": {
@@ -391,6 +392,7 @@
                         "value": "foo",
                         "optional": false
                       },
+                      "thisParam": null,
                       "param": {
                         "type": "Identifier",
                         "span": {

diff --git a/crates/swc_ecma_parser/tests/tsc/parserAccessors4.json b/crates/swc_ecma_parser/tests/tsc/parserAccessors4.json
@@ -59,6 +59,7 @@
                   "value": "Foo",
                   "optional": false
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {

diff --git a/crates/swc_ecma_parser/tests/tsc/parserComputedPropertyName17.json b/crates/swc_ecma_parser/tests/tsc/parserComputedPropertyName17.json
@@ -67,6 +67,7 @@
                     "optional": false
                   }
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {

diff --git a/crates/swc_ecma_parser/tests/tsc/parserES3Accessors4.json b/crates/swc_ecma_parser/tests/tsc/parserES3Accessors4.json
@@ -59,6 +59,7 @@
                   "value": "Foo",
                   "optional": false
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {

diff --git a/crates/swc_ecma_parser/tests/tsc/stringIndexerConstrainsPropertyDeclarations.json b/crates/swc_ecma_parser/tests/tsc/stringIndexerConstrainsPropertyDeclarations.json
@@ -2808,6 +2808,7 @@
                   "value": "X",
                   "optional": false
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {

diff --git a/crates/swc_ecma_parser/tests/tsc/symbolDeclarationEmit10.json b/crates/swc_ecma_parser/tests/tsc/symbolDeclarationEmit10.json
@@ -158,6 +158,7 @@
                     }
                   }
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {

diff --git a/crates/swc_ecma_parser/tests/tsc/symbolProperty18.json b/crates/swc_ecma_parser/tests/tsc/symbolProperty18.json
@@ -212,6 +212,7 @@
                     }
                   }
                 },
+                "thisParam": null,
                 "param": {
                   "type": "Identifier",
                   "span": {
-Original file line number
+Diff line change
@@ Expand Up / @@ -172,6 +172,7 @@ impl VisitMut for ComputedProps { @@
                                         body,
                                         param,
                                         key,
+                                        ..
                                     }) => (
                                         key,
                                         Box::new(Function {
@@ Expand Down @@