[core][rewriter] dspc: change eval() from a replace rewrite to an insert rewrite to fix nesting issues

Author: velzie

rewriter/js/src/changes.rs

@@ -150,7 +150,7 @@ impl<'alloc: 'data, 'data> Transform<'data> for JsChange<'alloc, 'data> {
 			Ty::SetRealmFn => LL::insert(transforms![&cfg.setrealmfn, "({})."]),
 			Ty::ScramErrFn { ident } => LL::insert(transforms!["$scramerr(", ident, ");"]),
 			Ty::ScramitizeFn => LL::insert(transforms![" $scramitize("]),
-			Ty::EvalRewriteFn => LL::replace(transforms!["eval(", &cfg.rewritefn, "("]),
+			Ty::EvalRewriteFn => LL::insert(transforms![&cfg.rewritefn, "("]),
 			Ty::ShorthandObj { ident } => {
 				LL::insert(transforms![":", &cfg.wrapfn, "(", ident, ")"])
 			}

rewriter/js/src/rewrite.rs

@@ -130,8 +130,9 @@ impl<'alloc: 'data, 'data> RewriteType<'alloc, 'data> {
 					ident,
 					enclose,
 				}),
-				// change!(propspan, Delete),
-				change!(Span::new(propspan.start-1, propspan.end), WrapGetRight {
+				change!(propspan, Delete),
+				change!(Span::new(propspan.start-1, propspan.start), Delete),
+				change!(Span::new(propspan.end, propspan.end), WrapGetRight {
                     enclose,
                 }),
 			],
@@ -194,7 +195,7 @@ impl<'alloc: 'data, 'data> RewriteType<'alloc, 'data> {
 					span!(inner span end),
 					ClosingParen {
 						semi: false,
-						replace: true
+						replace: false,
 					}
 				)
 			],

rewriter/js/src/visitor.rs

@@ -184,7 +184,7 @@ where
 				self.jschanges.add(rewrite!(
 					it.span,
 					Eval {
-						inner: Span::new(s.span.end + 1, it.span.end),
+						inner: Span::new(s.span.end+1, it.span.end-1),
 					}
 				));