[scramjet/core] rewriter: replace old wrap postmessage with new syntax

Author: velzie

packages/scramjet/packages/core/rewriter/js/src/changes.rs

@@ -54,10 +54,6 @@ pub enum JsChangeType<'alloc: 'data, 'data> {
 	/// insert `$wrapPostMessage(`
 	WrapPostMessageLeft,
 
-	/// insert `)`, or `)?.` if optional
-	WrapPostMessageRight {
-		optional: bool,
-	},
 	/// insert `$scramerr(ident);`
 	ScramErrFn {
 		ident: Atom<'data>,
@@ -242,13 +238,6 @@ impl<'alloc: 'data, 'data> Transform<'data> for JsChange<'alloc, 'data> {
 				LL::insert(transforms![",", &cfg.tempunusedid, "=(", &steps, "0)"])
 			}
 			Ty::WrapPostMessageLeft => LL::insert(transforms![&cfg.wrappostmessagefn, "("]),
-			Ty::WrapPostMessageRight { optional } => LL::replace(
-				if optional {
-					transforms![")?."]
-				} else {
-					transforms![")"]
-				}
-			),
 			Ty::ScramErrFn { ident } => LL::insert(transforms!["$scramerr(", ident, ");"]),
 			Ty::ScramitizeFn => LL::insert(transforms![" $scramitize("]),
 			Ty::EvalRewriteFn => LL::insert(transforms![&cfg.rewritefn, "("]),

packages/scramjet/packages/core/rewriter/js/src/rewrite.rs

@@ -20,10 +20,7 @@ pub(crate) enum RewriteType<'alloc: 'data, 'data> {
 		enclose: bool,
 	},
 	/// `wrapPostMessage(object)`
-	WrapPostMessage {
-		inner: Span,
-		optional: bool,
-	},
+	WrapPostMessage,
 
 	/// `(cfg.importfn("cfg.base"))`
 	ImportFn,
@@ -233,10 +230,8 @@ impl<'alloc: 'data, 'data> RewriteType<'alloc, 'data> {
 					location_assigned
 				}
 			)],
-			Self::WrapPostMessage { inner, optional } => smallvec![change!(span!(start), WrapPostMessageLeft), change!(
-				inner,
-				// ClosingParen { semi: false, replace: true }
-				WrapPostMessageRight { optional }
+			Self::WrapPostMessage => smallvec![change!(span!(start), WrapPostMessageLeft), change!(span!(end),
+				ClosingParen { semi: false, replace: false}
 			)],
 			Self::SetRealmFn => smallvec![change!(span, SetRealmFn)],
 			Self::ImportFn => smallvec![change!(span, ImportFn)],

packages/scramjet/packages/core/rewriter/js/src/visitor.rs

@@ -479,14 +479,7 @@ where
 				// however this code only exists because of recaptcha whatever
 				// and it would slow down js execution a lot
 				if s.property.name == "postMessage" && !matches!(&s.object, Expression::Super(_)) {
-					// include the "postMessage" and the dot before it in the inner span
-					// if `postMessage?.` remove the dot and the question mark
-					let offset = if s.optional { 2 } else { 1 };
-
-					self.jschanges.add(rewrite!(s.span, WrapPostMessage {
-						inner: Span::new(s.property.span.start - offset, s.property.span.end),
-						optional: s.optional,
-					}));
+					self.jschanges.add(rewrite!(s.object.span(), WrapPostMessage));
 
 					walk::walk_expression(self, &s.object);
 					return; // unwise to walk the rest of the tree

packages/scramjet/packages/core/src/client/shared/postmessage.ts

@@ -85,7 +85,9 @@ export default function (client: ScramjetClient, self: Self) {
 	Object.defineProperty(self, client.config.globals.wrappostmessagefn, {
 		value: function (obj: any) {
 			if (!obj || typeof obj.postMessage !== "function") return obj;
-			return obj.postMessage.bind(obj);
+			return {
+				postMessage: obj.postMessage.bind(obj),
+			};
 		},
 		configurable: false,
 		writable: false,