@prestizni-software/client-dem 0.2.15 → 0.2.17

package/AutoUpdatedClientObjectClass.ts

@@ -39,8 +39,6 @@ export async function createAutoUpdatedClass<C extends Constructor<any>>(
     classParam,
     autoClassers,
     emitter
-
-    
   );
 
   await instance.isLoadedAsync();
@@ -79,7 +77,7 @@ export abstract class AutoUpdatedClientObject<T extends Constructor<any>> {
 
       return;
     }
-    this.emitter.addEventListener("loaded"+this.EmitterID, async () => {
+    this.emitter.addEventListener("loaded" + this.EmitterID, async () => {
       try {
         await this.loadForceReferences();
       } catch (error) {
@@ -122,13 +120,18 @@ export abstract class AutoUpdatedClientObject<T extends Constructor<any>> {
           if (!res.success) {
             this.isLoading = false;
             this.loggers.error("Could not load data from server:", res.message);
-            this.emitter.dispatchEvent(new Event("loaded"+this.EmitterID));
+            this.emitter.dispatchEvent(new Event("loaded" + this.EmitterID));
             return;
           }
-          checkForMissingRefs<T>(res.data as any, properties, classProperty as  any, autoClassers);
+          checkForMissingRefs<T>(
+            res.data as any,
+            properties,
+            classProperty as any,
+            autoClassers
+          );
           this.data = res.data as IsData<T>;
           this.isLoading = false;
-          this.emitter.dispatchEvent(new Event("loaded"+this.EmitterID));
+          this.emitter.dispatchEvent(new Event("loaded" + this.EmitterID));
         }
       );
       this.data = { _id: data } as IsData<T>;
@@ -152,19 +155,23 @@ export abstract class AutoUpdatedClientObject<T extends Constructor<any>> {
       if (!res.success) {
         this.isLoading = false;
         this.loggers.error("Could not create data on server:", res.message);
-        this.emitter.dispatchEvent(new Event("loaded"+this.EmitterID));
+        this.emitter.dispatchEvent(new Event("loaded" + this.EmitterID));
         return;
       }
       this.data = res.data as IsData<T>;
       this.isLoading = false;
-      this.emitter.dispatchEvent(new Event("loaded"+this.EmitterID));
+      this.emitter.dispatchEvent(new Event("loaded" + this.EmitterID));
     });
   }
 
   public get extractedData(): {
     [K in keyof InstanceType<T>]: InstanceOf<InstanceType<T>>[K];
   } {
-    return structuredClone(this.data) as any as {
+    return structuredClone(
+      Object.fromEntries(
+        Object.entries(this.data).filter(([k, v]) => typeof v !== "function")
+      )
+    ) as any as {
       [K in keyof InstanceType<T>]: InstanceOf<InstanceType<T>>[K];
     };
   }
@@ -177,7 +184,7 @@ export abstract class AutoUpdatedClientObject<T extends Constructor<any>> {
     await this.loadShit();
     return this.isLoading
       ? new Promise((resolve) => {
-          this.emitter.addEventListener("loaded"+this.EmitterID, () => {
+          this.emitter.addEventListener("loaded" + this.EmitterID, () => {
             resolve(this.isLoading === false);
           });
         })
@@ -227,7 +234,7 @@ export abstract class AutoUpdatedClientObject<T extends Constructor<any>> {
       if (typeof key !== "string") return;
 
       const k = key as keyof IsData<T>;
-      const isRef = this.getMetadataRecursive(
+      const isRef = getMetadataRecursive(
         "isRef",
         this.classProp.prototype,
         key
@@ -336,15 +343,6 @@ export abstract class AutoUpdatedClientObject<T extends Constructor<any>> {
     return { _id: id, key, value } as any;
   }
 
-  private getMetadataRecursive(metaKey: string, proto: any, prop: string) {
-    while (proto) {
-      const meta = Reflect.getMetadata(metaKey, proto, prop);
-      if (meta !== undefined) return meta;
-      proto = Object.getPrototypeOf(proto);
-    }
-    return undefined;
-  }
-
   // return a properly typed AutoUpdatedClientClass (or null)
   // inside AutoUpdatedClientClass
   protected resolveReference(id: string): AutoUpdatedClientObject<any> | null {
@@ -427,7 +425,10 @@ export function processIsRefProperties(
       (loggers ?? console).debug("Changing isRef:", path);
 
       // Example: replace with a proxy or a marker object
-      instance[prop] = typeof instance[prop]  === "string" ? instance[prop] : instance[prop]._id;
+      instance[prop] =
+        typeof instance[prop] === "string"
+          ? instance[prop]
+          : instance[prop]._id;
     }
 
     // recurse into nested objects
@@ -455,15 +456,29 @@ export function getMetadataRecursive(
   return undefined;
 }
 
-function checkForMissingRefs<C extends Constructor<any>>(data: IsData<InstanceType<C>>, props: any, classParam: C, autoClassers: { [key: string]: AutoUpdateManager<any>; }) {
+function checkForMissingRefs<C extends Constructor<any>>(
+  data: IsData<InstanceType<C>>,
+  props: any,
+  classParam: C,
+  autoClassers: { [key: string]: AutoUpdateManager<any> }
+) {
   if (typeof data !== "string") {
     const entryKeys = Object.keys(data);
     for (const prop of props) {
-      if (!entryKeys.includes(prop.toString()) &&
-        getMetadataRecursive("isRef", classParam.prototype, prop.toString())) {
-        (data as any)[prop] = Object.values(autoClassers).find((autoClasser) => autoClasser.getObject((data as any)[prop])
+      if (
+        !entryKeys.includes(prop.toString()) &&
+        getMetadataRecursive("isRef", classParam.prototype, prop.toString())
+      ) {
+        (data as any)[prop] = Object.values(autoClassers).find((autoClasser) =>
+          autoClasser.objectsAsArray.find((object) =>
+            Object.values(object.extractedData).find((value) =>
+              Array.isArray(value)
+                ? value.includes(data._id)
+                : value === data._id
+            )
+          )
         );
       }
     }
   }
-}
+}

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.2.17](https://github.com/Prestizni-Software/client-dem/compare/v0.2.16...v0.2.17) (2025-11-10)
+
+### [0.2.16](https://github.com/Prestizni-Software/client-dem/compare/v0.2.15...v0.2.16) (2025-11-10)
+
 ### [0.2.15](https://github.com/Prestizni-Software/client-dem/compare/v0.2.14...v0.2.15) (2025-11-10)
 
 ### [0.2.14](https://github.com/Prestizni-Software/client-dem/compare/v0.2.13...v0.2.14) (2025-11-06)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prestizni-software/client-dem",
-  "version": "0.2.15",
+  "version": "0.2.17",
   "description": "An solution for when making http requests is not a good solution",
   "keywords": [
     "websockets"