[core][rewriter] dpsc: fix nested WrapGet s

Author: velzie

rewriter/js/src/changes.rs

@@ -132,7 +132,7 @@ impl<'alloc: 'data, 'data> Transform<'data> for JsChange<'alloc, 'data> {
             } else {
                 transforms![&cfg.wrapcomputedgetfn, "("]
             }),
-			Ty::WrapGetRight { enclose } => LL::insert(if enclose {
+			Ty::WrapGetRight { enclose } => LL::replace(if enclose {
 				transforms!["))"]
 			} else {
 				transforms![")"]

rewriter/js/src/rewrite.rs

@@ -101,6 +101,8 @@ impl<'alloc: 'data, 'data> Rewrite<'alloc, 'data> {
 
 impl<'alloc: 'data, 'data> RewriteType<'alloc, 'data> {
 	fn into_inner(self, span: Span) -> SmallVec<[JsChange<'alloc, 'data>; 2]> {
+
+	dbg!(&self);
 		macro_rules! span {
 			(start) => {
 				Span::new(span.start, span.start)
@@ -130,8 +132,8 @@ impl<'alloc: 'data, 'data> RewriteType<'alloc, 'data> {
 					ident,
 					enclose,
 				}),
-				change!(propspan, Delete),
-				change!(span!(end), WrapGetRight {
+				// change!(propspan, Delete),
+				change!(Span::new(propspan.start-1, propspan.end), WrapGetRight {
                     enclose,
                 }),
 			],

rewriter/js/src/visitor.rs

@@ -138,7 +138,7 @@ where
     			if UNSAFE_GLOBALS.contains(&s.property.name.as_str()) {
      			    self.jschanges.add(rewrite!(it.span(), WrapGet {
                         ident: s.property.name,
-     			        propspan: Span::new(s.property.span.start-1, s.property.span.end),
+     			        propspan: Span::new(s.property.span.start, s.property.span.end),
                         enclose: false,
                     }));
      			}

rewriter/native/src/main.rs

@@ -25,8 +25,14 @@ pub struct RewriterOptions {
 	prefix: String,
 	#[clap(long, default_value = "$wrap")]
 	wrapfn: String,
-	#[clap(long, default_value = "$gwrap")]
-	wrapthisfn: String,
+	#[clap(long, default_value = "$get_")]
+	wrapgetbase: String,
+	#[clap(long, default_value = "$set_")]
+	wrapsetbase: String,
+	#[clap(long, default_value = "$computedget")]
+	wrapcomputedgetfn: String,
+	#[clap(long, default_value = "$computedset")]
+	wrapcomputedsetfn: String,
 	#[clap(long, default_value = "$import")]
 	importfn: String,
 	#[clap(long, default_value = "$rewrite")]
@@ -102,6 +108,10 @@ fn main() -> Result<()> {
 			);
 
 			let unrewritten = NativeRewriter::unrewrite(&res);
+			// println!(
+			//     "unrewritten:\n{}",
+   //              str::from_utf8(&unrewritten).context("failed to parse unrewritten js")?
+			// );
 
 			eprintln!("errors:");
 			for err in res.errors {

rewriter/native/src/rewriter.rs

@@ -52,7 +52,10 @@ impl NativeRewriter {
 			Config {
 				prefix: cfg.prefix.clone(),
 				wrapfn: cfg.wrapfn.clone(),
-				wrapthisfn: cfg.wrapthisfn.clone(),
+				wrapgetbase: cfg.wrapgetbase.clone(),
+				wrapsetbase: cfg.wrapsetbase.clone(),
+				wrapcomputedgetfn: cfg.wrapcomputedgetfn.clone(),
+				wrapcomputedsetfn: cfg.wrapcomputedsetfn.clone(),
 				importfn: cfg.importfn.clone(),
 				rewritefn: cfg.rewritefn.clone(),
 				metafn: cfg.metafn.clone(),