update decorators

packages/website-ue/astro.config.ts

@@ -11,11 +11,7 @@ export default defineConfig({
   vite: {
     server: { allowedHosts: [] },
 
-    esbuild: {
+    esbuild: { target: "es2022" },
-      minifyIdentifiers: true,
-      minifySyntax: false,
-      minifyWhitespace: true,
-    },
 
     build: {
       rollupOptions: {

packages/website-ue/src/api/abstract.ts

@@ -82,35 +82,37 @@ export abstract class AbstractAPI {
   }
 }
 
-export function Cache<Arguments extends unknown[]>(disableInDev = false) {
+export function Cache(disableInDev = false) {
   const cache = new WeakMap<object, Map<string, Promise<unknown>>>();
 
-  return function (
+  return function <This, Arguments extends any[], Return>(
-    _target: unknown,
+    target: (this: This, ...args: Arguments) => Promise<Return>,
-    _propertyKey: string,
+    // TODO: evaluate if we need context to make the error trace easier
-    descriptor: PropertyDescriptor,
+    // context: ClassMethodDecoratorContext<
+    //   This,
+    //   (this: This, ...args: Arguments) => Promise<Return>
+    // >,
   ) {
-    const original = descriptor.value;
+    return async function replacementMethod(this: This, ...args: Arguments) {
-
-    descriptor.value = function (...args: Arguments) {
       const key = args.join("-");
+      let thisCache: Map<string, Promise<Return>>;
 
-      let thisCache = cache.get(this);
+      if (cache.has(this as object)) {
-
+        thisCache = cache.get(this as object) as Map<string, Promise<Return>>;
-      if (!thisCache) {
+      } else {
         thisCache = new Map();
-        cache.set(this, thisCache);
+        cache.set(this as object, thisCache);
       }
 
       const disabled = disableInDev && import.meta.env.DEV;
 
       if (thisCache.has(key) && !disabled) {
-        return thisCache.get(key);
+        return thisCache.get(key)!;
       }
 
       const promise = (async () => {
         try {
-          return await original.apply(this, args);
+          return await target.apply(this, args);
         } catch (error) {
           thisCache!.delete(key);
           throw error;

packages/website-ue/src/api/client.ts

@@ -21,7 +21,7 @@ export class ClientAPI extends AbstractAPI {
     throw new Error("MetadataAccessor is inaccessible on the client");
   }
 
-  @UnimplementedOnClient
+  @UnimplementedOnClient()
   mediaPrefix(): never {
     throw rejected();
   }
@@ -85,7 +85,7 @@ export class ClientAPI extends AbstractAPI {
     return json;
   }
 
-  @UnimplementedOnClient
+  @UnimplementedOnClient()
   gameStrings() {
     return rejected();
   }
@@ -98,12 +98,12 @@ export class ClientAPI extends AbstractAPI {
     return json;
   }
 
-  @UnimplementedOnClient
+  @UnimplementedOnClient()
   gameStringGroups() {
     return rejected();
   }
 
-  @UnimplementedOnClient
+  @UnimplementedOnClient()
   avatar() {
     return rejected();
   }
@@ -112,38 +112,44 @@ export class ClientAPI extends AbstractAPI {
     return fetchPB("/api/avatars/all.pb", Avatars);
   }
 
-  @UnimplementedOnClient
+  @UnimplementedOnClient()
   avatarList() {
     return rejected();
   }
 
-  @UnimplementedOnClient
+  @UnimplementedOnClient()
   background() {
     return rejected();
   }
 
-  @UnimplementedOnClient
+  @UnimplementedOnClient()
   backgrounds() {
     return rejected();
   }
 
-  @UnimplementedOnClient
+  @UnimplementedOnClient()
   currencyIcon() {
     return rejected();
   }
 
-  @UnimplementedOnClient
+  @UnimplementedOnClient()
   stuffIcon() {
     return rejected();
   }
 }
 
-function UnimplementedOnClient(
+export function UnimplementedOnClient() {
-  _target: unknown,
+  return function <This, Arguments extends any[], Return>(
-  propertyKey: string,
+    _target: (this: This, ...args: Arguments) => Promise<Return>,
-  descriptor: PropertyDescriptor,
+    context: ClassMethodDecoratorContext<
-) {
+      This,
-  descriptor.value = function () {
+      (this: This, ...args: Arguments) => Promise<Return>
-    throw new Error(`${propertyKey} is not implemented on the client`);
+    >,
+  ) {
+    return function () {
+      throw new Error(
+        `${String(context.name)} is not implemented on the client`,
+      );
+    };
   };
 }

tsconfig.json

@@ -15,10 +15,9 @@
     "incremental": true,
     "isolatedModules": true,
     "paths": {
-      "@protos/*": ["./packages/closed/protos/*"]
+      "@protos/*": ["./packages/closed/protos/*"],
     },
     "strictNullChecks": true,
-    "experimentalDecorators": true
   },
-  "exclude": ["node_modules/**/*", "dist"]
+  "exclude": ["node_modules/**/*", "dist"],
 }