fix

Author: r58Playz

rewriter/js/src/changes.rs

@@ -209,6 +209,8 @@ impl Ord for JsChange<'_, '_> {
 			Ordering::Equal => match (&self.ty, &other.ty) {
 				(Ty::ScramErrFn { .. }, _) => Ordering::Less,
 				(_, Ty::ScramErrFn { .. }) => Ordering::Greater,
+                (Ty::WrapFnRight { .. }, _) => Ordering::Less,
+                (_, Ty::WrapFnRight { .. }) => Ordering::Greater,
 				_ => Ordering::Equal,
 			},
 			x => x,

rewriter/js/src/rewrite.rs

@@ -115,6 +115,9 @@ impl<'alloc: 'data, 'data> RewriteType<'alloc, 'data> {
 			($span1:ident $span2:ident end) => {
 				Span::new($span1.end, $span2.end)
 			};
+			($span1:ident $span2:ident between) => {
+				Span::new($span1.end, $span2.start)
+			};
 		}
 
 		match self {
@@ -128,12 +131,7 @@ impl<'alloc: 'data, 'data> RewriteType<'alloc, 'data> {
 				enclose,
 			} => smallvec![
 				change!(span!(start), WrapGetLeft { ident, enclose }),
-				change!(propspan, Delete),
-				change!(Span::new(propspan.start - 1, propspan.start), Delete),
-				change!(
-					Span::new(propspan.end, propspan.end),
-					WrapGetRight { enclose }
-				),
+				change!(propspan.expand_left(1), WrapGetRight { enclose }),
 			],
 			Self::WrapGetComputed {
 				leftspan,
@@ -142,13 +140,10 @@ impl<'alloc: 'data, 'data> RewriteType<'alloc, 'data> {
 			} => smallvec![
 				change!(span!(start), WrapGetComputedLeft { enclose }),
 				// replace the bracket with ,
-				change!(
-					Span::new(leftspan.end, propspan.start),
-					Replace { text: "," }
-				),
+				change!(span!(leftspan propspan between), Replace { text: "," }),
 				// replace the other bracket with )
 				change!(
-					Span::new(propspan.end, propspan.end + 1),
+					propspan.expand_right(1),
 					ClosingParen {
 						semi: false,
 						replace: true
@@ -163,10 +158,7 @@ impl<'alloc: 'data, 'data> RewriteType<'alloc, 'data> {
 			} => smallvec![
 				change!(span!(start), WrapSet { ident, propspan }),
 				change!(propspan, Delete),
-				change!(
-					Span::new(leftspan.end, rightspan.start),
-					Replace { text: "," }
-				),
+				change!(span!(leftspan rightspan between), Replace { text: "," }),
 				change!(
 					span!(end),
 					ClosingParen {
@@ -182,15 +174,9 @@ impl<'alloc: 'data, 'data> RewriteType<'alloc, 'data> {
 			} => smallvec![
 				change!(span!(start), WrapSetComputed),
 				// replace the bracket with ,
-				change!(
-					Span::new(leftspan.end, propspan.start),
-					Replace { text: "," }
-				),
+				change!(span!(leftspan propspan between), Replace { text: "," }),
 				// replace the other bracket with another ,
-				change!(
-					Span::new(propspan.end, rightspan.start),
-					Replace { text: "," }
-				),
+				change!(span!(propspan rightspan between), Replace { text: "," }),
 				change!(
 					span!(end),
 					ClosingParen {

rewriter/js/src/visitor.rs

@@ -133,7 +133,7 @@ where
 						it.span(),
 						WrapGet {
 							ident: s.property.name,
-							propspan: Span::new(s.property.span.start, s.property.span.end),
+							propspan: s.property.span,
 							enclose: false,
 						}
 					));

rewriter/native/test.js

@@ -1 +1,36 @@
-parent.location
+window.location.href = "http://example.com";
+
+console.log(top.window.aaa);
+consle.log(globalThis["win" + "dow"]);
+
+globalThis.eval("..");
+
+let ref = { b: this.top.window, c: globalThis["win" + "dow"] };
+
+
+export default ref;
+
+export { ref };
+
+
+export { ref as default };
+
+export { S } from "module";
+export * from "module";
+import sd from "d"
+
+location += "http://example.com";
+
+function f() { return import("x") }
+
+
+let window = (1, window);
+
+let x = new this.Abc();
+
+try{}catch(e){this.a.log()};
+
+await import("test")
+
+
+import{c as d,u as g,a as l,r as i,b,d as m,g as p,e as h,f as v,h as k}from"./1e3cB0WW.js";