[core][rewriter] add temploc destructure rewrites

Author: velzie

rewriter/js/src/cfg.rs

@@ -25,6 +25,9 @@ pub struct Config {
 	pub setrealmfn: String,
 	pub metafn: String,
 	pub pushsourcemapfn: String,
+
+	pub trysetfn: String,
+	pub templocid: String,
 }
 
 #[derive(Debug)]

rewriter/js/src/changes.rs

@@ -43,9 +43,11 @@ pub enum JsChangeType<'alloc: 'data, 'data> {
 	RebindProperty {
 		ident: Atom<'data>,
 	},
+	TempVar,
 
 	WrapObjectAssignmentLeft {
 		restids: Vec<Atom<'data>>,
+		location_assigned: bool,
 	},
 
 	/// insert `${cfg.setrealmfn}({}).`
@@ -132,11 +134,15 @@ impl<'alloc: 'data, 'data> Transform<'data> for JsChange<'alloc, 'data> {
 			Ty::RebindProperty { ident } => {
 				LL::replace(transforms![&cfg.wrappropertybase, ident, ":", ident])
 			}
-			Ty::WrapObjectAssignmentLeft { restids } => {
+			Ty::TempVar => LL::replace(transforms![&cfg.templocid]),
+			Ty::WrapObjectAssignmentLeft { restids, location_assigned } => {
 				let mut steps = String::new();
 				for id in restids {
 					steps.push_str(&format!("{}({}),", &cfg.cleanrestfn, id.as_str()));
 				}
+				if location_assigned {
+                    steps.push_str(&format!("{}(location,\"=\",{})||(location={}),", &cfg.trysetfn, &cfg.templocid, &cfg.templocid));
+                }
 				let steps: &'static str = Box::leak(steps.into_boxed_str());
 				LL::insert(transforms!["((t)=>(", &steps, "t))("])
 			}
@@ -157,7 +163,9 @@ impl<'alloc: 'data, 'data> Transform<'data> for JsChange<'alloc, 'data> {
 			Ty::ImportFn => LL::replace(transforms![&cfg.importfn, "(\"", &flags.base, "\","]),
 			Ty::MetaFn => LL::replace(transforms![&cfg.metafn, "(\"", &flags.base, "\")"]),
 			Ty::AssignmentLeft { name, op } => LL::replace(transforms![
-				"((t)=>$scramjet$tryset(",
+				"((t)=>",
+				&cfg.trysetfn,
+				"(",
 				name,
 				",\"",
 				op,

rewriter/js/src/rewrite.rs

@@ -36,9 +36,12 @@ pub(crate) enum RewriteType<'alloc: 'data, 'data> {
 	RebindProperty {
 		ident: Atom<'data>,
 	},
+	// `location` -> `cfg.templocid`
+ 	TempVar,
 
 	WrapObjectAssignment {
 		restids: Vec<Atom<'data>>,
+		location_assigned: bool,
 	},
 
 	/// `cfg.wrapprop({})`
@@ -119,12 +122,13 @@ impl<'alloc: 'data, 'data> RewriteType<'alloc, 'data> {
 			],
 			Self::RewriteProperty { ident } => smallvec![change!(span, RewriteProperty { ident }),],
 			Self::RebindProperty { ident } => smallvec![change!(span, RebindProperty { ident })],
+			Self::TempVar => smallvec![change!(span, TempVar)],
 			Self::WrapProperty => smallvec![
 				change!(span!(start), WrapPropertyLeft),
 				change!(span!(end), WrapPropertyRight),
 			],
-			Self::WrapObjectAssignment { restids } => smallvec![
-				change!(span!(start), WrapObjectAssignmentLeft { restids }),
+			Self::WrapObjectAssignment { restids, location_assigned } => smallvec![
+				change!(span!(start), WrapObjectAssignmentLeft { restids, location_assigned }),
 				change!(
 					span!(end),
 					ClosingParen {

rewriter/js/src/visitor.rs

@@ -108,6 +108,7 @@ where
 		&mut self,
 		s: &ObjectAssignmentTarget<'data>,
 		restids: &mut Vec<Atom<'data>>,
+		location_assigned: &mut bool,
 	) {
 		if let Some(r) = &s.rest {
 			// { ...rest } = self;
@@ -119,7 +120,6 @@ where
 				}
 				_ => panic!("what?"),
 			}
-			return;
 		}
 		for prop in &s.properties {
 			match prop {
@@ -179,7 +179,14 @@ where
 							walk::walk_expression(self, &d.init);
 						}
 						AssignmentTargetMaybeDefault::ObjectAssignmentTarget(p) => {
-							self.recurse_object_assignment_target(p, restids);
+
+							self.recurse_object_assignment_target(p, restids, location_assigned);
+						}
+						AssignmentTargetMaybeDefault::AssignmentTargetIdentifier(p)=>{
+    						if p.name == "location" {
+		                        self.jschanges.add(rewrite!(p.span(), TempVar));
+                                *location_assigned = true;
+    						}
 						}
 						_ => {}
 					}
@@ -517,11 +524,12 @@ where
 				}
 
 				let mut restids: Vec<Atom<'data>> = Vec::new();
-				self.recurse_object_assignment_target(o, &mut restids);
+				let mut location_assigned: bool = false;
+				self.recurse_object_assignment_target(o, &mut restids, &mut location_assigned);
 
-				if restids.len() > 0 {
+				if restids.len() > 0 || location_assigned {
 					self.jschanges
-						.add(rewrite!(it.span, WrapObjectAssignment { restids }));
+						.add(rewrite!(it.span, WrapObjectAssignment { restids, location_assigned }));
 				}
 				return;
 			}

rewriter/native/src/main.rs

@@ -42,6 +42,11 @@ pub struct RewriterOptions {
 	#[clap(long, default_value = "$pushsourcemap")]
 	pushsourcemapfn: String,
 
+	#[clap(long, default_value = "$tryset")]
+	trysetfn: String,
+	#[clap(long, default_value = "$temploc")]
+    templocid: String,
+
 	#[clap(long, default_value = "https://google.com/glorngle/si.js")]
 	base: String,
 	#[clap(long, default_value = "glongle1")]

rewriter/native/src/rewriter.rs

@@ -60,6 +60,8 @@ impl NativeRewriter {
 				metafn: cfg.metafn.clone(),
 				setrealmfn: cfg.setrealmfn.clone(),
 				pushsourcemapfn: cfg.pushsourcemapfn.clone(),
+				trysetfn: cfg.trysetfn.clone(),
+				templocid: cfg.templocid.clone(),
 			},
 			NativeUrlRewriter,
 		);

rewriter/wasm/src/jsr.rs

@@ -58,6 +58,8 @@ fn get_config(scramjet: &Object) -> Result<Config> {
 		metafn: get_str(globals, "metafn")?,
 		setrealmfn: get_str(globals, "setrealmfn")?,
 		pushsourcemapfn: get_str(globals, "pushsourcemapfn")?,
+		trysetfn: get_str(globals, "trysetfn")?,
+		templocid: get_str(globals, "templocid")?,
 	})
 }
 

src/controller/index.ts

@@ -21,12 +21,13 @@ export class ScramjetController {
 				wrappropertybase: "$scramjet__",
 				wrappropertyfn: "$scramjet$prop",
 				cleanrestfn: "$scramjet$clean",
-				trysetfn: "$scramjet$tryset",
 				importfn: "$scramjet$import",
 				rewritefn: "$scramjet$rewrite",
 				metafn: "$scramjet$meta",
 				setrealmfn: "$scramjet$setrealm",
 				pushsourcemapfn: "$scramjet$pushsourcemap",
+				trysetfn: "$scramjet$tryset",
+				templocid: "$scramjet$temploc",
 			},
 			files: {
 				wasm: "/scramjet.wasm.wasm",

src/types.ts

@@ -24,12 +24,13 @@ export interface ScramjetConfig {
 		wrappropertybase: string;
 		wrappropertyfn: string;
 		cleanrestfn: string;
-		trysetfn: string;
 		importfn: string;
 		rewritefn: string;
 		metafn: string;
 		setrealmfn: string;
 		pushsourcemapfn: string;
+		trysetfn: string;
+		templocid: string;
 	};
 	files: {
 		wasm: string;