make proxies enumerable (#476)

Co-authored-by: Ven <vendicated@riseup.net>
This commit is contained in:
Justice Almanzar 2023-02-09 15:21:14 -05:00 committed by GitHub
parent ae98401bd3
commit 6114bc6b16
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -22,6 +22,9 @@ const unconfigurable = ["arguments", "caller", "prototype"];
const handler: ProxyHandler<any> = {}; const handler: ProxyHandler<any> = {};
const GET_KEY = Symbol.for("vencord.lazy.get");
const CACHED_KEY = Symbol.for("vencord.lazy.cached");
for (const method of [ for (const method of [
"apply", "apply",
"construct", "construct",
@ -38,11 +41,11 @@ for (const method of [
"setPrototypeOf" "setPrototypeOf"
]) { ]) {
handler[method] = handler[method] =
(target: any, ...args: any[]) => Reflect[method](target.get(), ...args); (target: any, ...args: any[]) => Reflect[method](target[GET_KEY](), ...args);
} }
handler.ownKeys = target => { handler.ownKeys = target => {
const v = target.get(); const v = target[GET_KEY]();
const keys = Reflect.ownKeys(v); const keys = Reflect.ownKeys(v);
for (const key of unconfigurable) { for (const key of unconfigurable) {
if (!keys.includes(key)) keys.push(key); if (!keys.includes(key)) keys.push(key);
@ -54,7 +57,10 @@ handler.getOwnPropertyDescriptor = (target, p) => {
if (typeof p === "string" && unconfigurable.includes(p)) if (typeof p === "string" && unconfigurable.includes(p))
return Reflect.getOwnPropertyDescriptor(target, p); return Reflect.getOwnPropertyDescriptor(target, p);
return Reflect.getOwnPropertyDescriptor(target.get(), p); const descriptor = Reflect.getOwnPropertyDescriptor(target[GET_KEY](), p);
if (descriptor) Object.defineProperty(target, p, descriptor);
return descriptor;
}; };
/** /**
@ -67,10 +73,10 @@ handler.getOwnPropertyDescriptor = (target, p) => {
* @example const mod = proxyLazy(() => findByProps("blah")); console.log(mod.blah); * @example const mod = proxyLazy(() => findByProps("blah")); console.log(mod.blah);
*/ */
export function proxyLazy<T>(factory: () => T): T { export function proxyLazy<T>(factory: () => T): T {
const proxyDummy: { (): void; cachedValue?: T; get(): T; } = function () { }; const proxyDummy: { (): void; [CACHED_KEY]?: T; [GET_KEY](): T; } = Object.assign(function () { }, {
[CACHED_KEY]: void 0,
proxyDummy.cachedValue = void 0; [GET_KEY]: () => proxyDummy[CACHED_KEY] ??= factory(),
proxyDummy.get = () => proxyDummy.cachedValue ??= factory(); });
return new Proxy(proxyDummy, handler) as any; return new Proxy(proxyDummy, handler) as any;
} }