[core][rewriter] destructure_rewrites: insert cleanrests to arrow functions

Author: velzie

rewriter/js/src/changes.rs

@@ -89,9 +89,12 @@ pub enum JsChangeType<'alloc: 'data, 'data> {
 	},
 	/// replace span with ""
 	Delete,
-	// ;cfg.cleanrestfn(restids[0]); cfg.cleanrestfn(restid[1]);
-	CleanRest {
+	// ;cfg.cleanrestfn(restids[0]); cfg.cleanrestfn(restids[1]);
+	// or
+	// (cfg.cleanrestfn(restids[0]), cfg.cleanrestfn(restids[1]),
+	CleanFunction {
 		restids: Vec<Atom<'data>>,
+		expression: bool,
 	},
 }
 
@@ -156,13 +159,25 @@ impl<'alloc: 'data, 'data> Transform<'data> for JsChange<'alloc, 'data> {
 				let steps: &'static str = Box::leak(steps.into_boxed_str());
 				LL::insert(transforms!["((t)=>(", &steps, "t))("])
 			}
-			Ty::CleanRest { restids } => {
-			   let mut steps = String::new();
-				for id in restids {
-    				steps.push_str(&format!("{}({});", &cfg.cleanrestfn, id.as_str()));
+			Ty::CleanFunction {
+				restids,
+				expression,
+			} => {
+				let mut steps = String::new();
+
+				if expression {
+					for id in restids {
+						steps.push_str(&format!("{}({}),", &cfg.cleanrestfn, id.as_str()));
+					}
+					let steps: &'static str = Box::leak(steps.into_boxed_str());
+					LL::insert(transforms!["(", &steps])
+				} else {
+					for id in restids {
+						steps.push_str(&format!("{}({});", &cfg.cleanrestfn, id.as_str()));
+					}
+					let steps: &'static str = Box::leak(steps.into_boxed_str());
+					LL::insert(transforms![";", &steps])
 				}
-    			let steps: &'static str = Box::leak(steps.into_boxed_str());
-    			LL::insert(transforms![";",&steps])
 			}
 			Ty::SetRealmFn => LL::insert(transforms![&cfg.setrealmfn, "({})."]),
 			Ty::ScramErrFn { ident } => LL::insert(transforms!["$scramerr(", ident, ");"]),

rewriter/js/src/rewrite.rs

@@ -73,8 +73,9 @@ pub(crate) enum RewriteType<'alloc: 'data, 'data> {
 	SourceTag,
 
 	// ;cfg.cleanrestfn(restids[0]); cfg.cleanrestfn(restid[1]);
-	CleanRest {
+	CleanFunction {
 		restids: Vec<Atom<'data>>,
+		expression: bool,
 	},
 
 	// don't use for anything static, only use for stuff like rewriteurl
@@ -151,7 +152,37 @@ impl<'alloc: 'data, 'data> RewriteType<'alloc, 'data> {
 					}
 				)
 			],
-			Self::CleanRest { restids } => smallvec![change!(span!(start), CleanRest { restids })],
+			Self::CleanFunction {
+				restids,
+				expression,
+			} => {
+				if expression {
+					smallvec![
+						change!(
+							Span::new(span.start, span.start),
+							CleanFunction {
+								restids,
+								expression
+							}
+						),
+						change!(
+							Span::new(span.end, span.end),
+							ClosingParen {
+								semi: false,
+								replace: false
+							}
+						)
+					]
+				} else {
+					smallvec![change!(
+						Span::new(span.start, span.start),
+						CleanFunction {
+							restids,
+							expression
+						}
+					),]
+				}
+			}
 			Self::SetRealmFn => smallvec![change!(span, SetRealmFn)],
 			Self::ImportFn => smallvec![change!(span, ImportFn)],
 			Self::MetaFn => smallvec![change!(span, MetaFn)],

rewriter/js/src/visitor.rs

@@ -488,19 +488,42 @@ where
 		for param in &it.params.items {
 			self.recurse_binding_pattern(&param.pattern, &mut restids, &mut location_assigned);
 		}
-		dbg!(&restids);
 
 		if let Some(b) = &it.body {
 			walk::walk_function_body(self, b);
 			if let Some(stmt) = b.statements.get(0) {
 				let span = stmt.span();
 				self.jschanges.add(rewrite!(
 					Span::new(span.start, span.start),
-					CleanRest { restids }
+					CleanFunction {
+						restids,
+						expression: false
+					}
 				));
 			}
 		}
 	}
+	fn visit_arrow_function_expression(
+		&mut self,
+		it: &oxc::ast::ast::ArrowFunctionExpression<'data>,
+	) {
+		let mut restids: Vec<Atom<'data>> = Vec::new();
+		let mut location_assigned: bool = false;
+		for param in &it.params.items {
+			self.recurse_binding_pattern(&param.pattern, &mut restids, &mut location_assigned);
+		}
+
+		walk::walk_function_body(self, &it.body);
+		if let Some(stmt) = &it.body.statements.get(0) {
+			self.jschanges.add(rewrite!(
+				stmt.span(),
+				CleanFunction {
+					restids,
+					expression: it.expression,
+				}
+			));
+		}
+	}
 
 	fn visit_function_body(&mut self, it: &FunctionBody<'data>) {
 		// tag function for use in sourcemaps