[core] add dpsc globals

Author: velzie

rewriter/wasm/src/jsr.rs

@@ -49,10 +49,8 @@ fn get_config(scramjet: &Object) -> Result<Config> {
 	Ok(Config {
 		prefix: get_str(config, "prefix")?,
 
-        wrapgetbase: get_str(globals, "wrapgetbase")?,
-        wrapsetbase: get_str(globals, "wrapsetbase")?,
-        wrapcomputedgetfn: get_str(globals, "wrapcomputedgetfn")?,
-        wrapcomputedsetfn: get_str(globals, "wrapcomputedsetfn")?,
+        wrappropertybase: get_str(globals, "wrappropertybase")?,
+        wrappropertyfn: get_str(globals, "wrappropertyfn")?,
 		wrapfn: get_str(globals, "wrapfn")?,
 		importfn: get_str(globals, "importfn")?,
 		rewritefn: get_str(globals, "rewritefn")?,

src/client/shared/wrap.ts

@@ -7,7 +7,6 @@ import { indirectEval } from "@client/shared/eval";
 
 export function createWrapFn(client: ScramjetClient, self: typeof globalThis) {
 	return function (identifier: any, strict: boolean) {
-		if (identifier === self) return client.globalProxy;
 		if (identifier === self.location) return client.locationProxy;
 		if (identifier === eval) return indirectEval.bind(client, strict);
 
@@ -18,10 +17,8 @@ export function createWrapFn(client: ScramjetClient, self: typeof globalThis) {
 					return self.parent[SCRAMJETCLIENT].globalProxy;
 				} else {
 					// ... then we should pretend we aren't nested and return the current window
-					return client.globalProxy;
+					return self;
 				}
-			} else if (identifier === self.document) {
-				return client.documentProxy;
 			} else if (identifier === self.top) {
 				// instead of returning top, we need to return the uppermost parent that's inside a scramjet context
 				let current = self;
@@ -37,7 +34,7 @@ export function createWrapFn(client: ScramjetClient, self: typeof globalThis) {
 					current = test;
 				}
 
-				return current[SCRAMJETCLIENT].globalProxy;
+				return current;
 			}
 		}
 
@@ -47,27 +44,96 @@ export function createWrapFn(client: ScramjetClient, self: typeof globalThis) {
 
 export const order = 4;
 export default function (client: ScramjetClient, self: typeof globalThis) {
-	// the main magic of the proxy. all attempts to access any "banned objects" will be redirected here, and instead served a proxy object
-	// this contrasts from how other proxies will leave the root object alone and instead attempt to catch every member access
-	// this presents some issues (see element.ts), but makes us a good bit faster at runtime!
 	Object.defineProperty(self, config.globals.wrapfn, {
 		value: client.wrapfn,
 		writable: false,
 		configurable: false,
+		enumerable: false,
 	});
-	Object.defineProperty(self, config.globals.wrapcomputedgetfn, {
-		value: function (val, prop) {
-			if (val === self) {
-				console.log(prop);
+	Object.defineProperty(self, config.globals.wrappropertyfn, {
+		value: function (str) {
+			if (
+				str === "location" ||
+				str === "parent" ||
+				str === "top" ||
+				str === "eval"
+			)
+				return config.globals.wrappropertybase + str;
 
-				return null;
-			}
-
-			return Reflect.get(val, prop);
+			return str;
 		},
 		writable: false,
 		configurable: false,
+		enumerable: false,
 	});
+	console.log(config.globals.wrappropertybase);
+
+	Object.defineProperty(
+		self.Object.prototype,
+		config.globals.wrappropertybase + "location",
+		{
+			get: function () {
+				if (this === self) {
+					return client.locationProxy;
+				}
+
+				return this.location;
+			},
+			set(value: any) {
+				if (this === self) {
+					client.locationProxy = value;
+
+					return;
+				}
+				this.location = value;
+			},
+			configurable: false,
+			enumerable: false,
+		}
+	);
+	Object.defineProperty(
+		self.Object.prototype,
+		config.globals.wrappropertybase + "parent",
+		{
+			get: function () {
+				return client.wrapfn(this.parent, false);
+			},
+			set(value: any) {
+				// i guess??
+				this.parent = value;
+			},
+			configurable: false,
+			enumerable: false,
+		}
+	);
+	Object.defineProperty(
+		self.Object.prototype,
+		config.globals.wrappropertybase + "top",
+		{
+			get: function () {
+				return client.wrapfn(this.top, false);
+			},
+			set(value: any) {
+				this.top = value;
+			},
+			configurable: false,
+			enumerable: false,
+		}
+	);
+	Object.defineProperty(
+		self.Object.prototype,
+		config.globals.wrappropertybase + "eval",
+		{
+			get: function () {
+				return client.wrapfn(this.eval, true);
+			},
+			set(value: any) {
+				this.eval = value;
+			},
+			configurable: false,
+			enumerable: false,
+		}
+	);
 
 	self.$scramitize = function (v) {
 		if (v === self) debugger;

src/controller/index.ts

@@ -17,10 +17,8 @@ export class ScramjetController {
 			prefix: "/scramjet/",
 			globals: {
 				wrapfn: "$scramjet$wrap",
-				wrapgetbase: "$scramjet$get_",
-				wrapsetbase: "$scramjet$get_",
-				wrapcomputedgetfn: "$scramjet$get",
-				wrapcomputedsetfn: "$scramjet$get",
+				wrappropertybase: "$scramjet__",
+				wrappropertyfn: "$scramjet$prop",
 				trysetfn: "$scramjet$tryset",
 				importfn: "$scramjet$import",
 				rewritefn: "$scramjet$rewrite",

src/types.ts

@@ -19,10 +19,8 @@ export interface ScramjetConfig {
 	prefix: string;
 	globals: {
 		wrapfn: string;
-		wrapsetbase: string;
-		wrapgetbase: string;
-		wrapcomputedgetfn: string;
-		wrapcomputedsetfn: string;
+		wrappropertybase: string;
+		wrappropertyfn: string;
 		trysetfn: string;
 		importfn: string;
 		rewritefn: string;