@prestizni-software/client-dem 0.2.20 → 0.2.21

package/AutoUpdatedClientObjectClass.ts

@@ -64,7 +64,6 @@ export abstract class AutoUpdatedClientObject<T extends Constructor<any>> {
   protected isLoadingReferences = false;
   public readonly classProp: Constructor<T>;
   private readonly EmitterID = new ObjectId().toHexString();
-  protected unpopulatedData: RefToId<IsData<T>>;
   private readonly loadShit = async () => {
     if (this.isLoaded()) {
       try {
@@ -122,7 +121,6 @@ export abstract class AutoUpdatedClientObject<T extends Constructor<any>> {
             this.emitter.dispatchEvent(new Event("loaded" + this.EmitterID));
             return;
           }
-          this.unpopulatedData = res.data as any;
           checkForMissingRefs<T>(
             res.data as any,
             properties,
@@ -135,16 +133,14 @@ export abstract class AutoUpdatedClientObject<T extends Constructor<any>> {
         }
       );
       this.data = { _id: data } as IsData<T>;
-      this.unpopulatedData = { _id: data } as any;
     } else {
       this.isLoading = true;
-      this.unpopulatedData = data;
       checkForMissingRefs<T>(
-            data as any,
-            properties,
-            classProperty as any,
-            autoClassers
-          );
+        data as any,
+        properties,
+        classProperty as any,
+        autoClassers
+      );
       this.data = data as any;
 
       if (this.data._id === "") this.handleNewObject(data as any);
@@ -167,13 +163,12 @@ export abstract class AutoUpdatedClientObject<T extends Constructor<any>> {
         this.emitter.dispatchEvent(new Event("loaded" + this.EmitterID));
         return;
       }
-      this.unpopulatedData = res.data as any;
       checkForMissingRefs<T>(
-            res.data as any,
-            this.properties,
-            this.classProp as any,
-            this.autoClassers
-          );
+        res.data as any,
+        this.properties,
+        this.classProp as any,
+        this.autoClassers
+      );
       this.data = res.data as IsData<T>;
       this.isLoading = false;
       this.emitter.dispatchEvent(new Event("loaded" + this.EmitterID));
@@ -183,13 +178,12 @@ export abstract class AutoUpdatedClientObject<T extends Constructor<any>> {
   public get extractedData(): {
     [K in keyof InstanceType<T>]: InstanceOf<InstanceType<T>>[K];
   } {
-
-    const extracted  = Object.fromEntries(
-        Object.entries(this.unpopulatedData).filter(([k, v]) => typeof v !== "function")
-      )
-    return structuredClone(
-      extracted
-    ) as any as {
+    const extracted = Object.fromEntries(
+      Object.entries(
+        processIsRefProperties(this.data, this.classProp.prototype).newData
+      ).filter(([k, v]) => typeof v !== "function")
+    );
+    return structuredClone(extracted) as any as {
       [K in keyof InstanceType<T>]: InstanceOf<InstanceType<T>>[K];
     };
   }
@@ -248,7 +242,7 @@ export abstract class AutoUpdatedClientObject<T extends Constructor<any>> {
   }
 
   private generateSettersAndGetters() {
-    this.properties.forEach((key) => {
+    for (const key of this.properties) {
       if (typeof key !== "string") return;
 
       const k = key as keyof IsData<T>;
@@ -259,8 +253,13 @@ export abstract class AutoUpdatedClientObject<T extends Constructor<any>> {
       );
 
       Object.defineProperty(this, key, {
-        get: () =>
-          isRef ? this.findReference(this.data[k] as string) : this.data[k],
+        get: () => {
+          if (isRef)
+            return typeof this.data[k] === "string"
+              ? this.findReference(this.data[k] as string)
+              : this.data[k];
+          else return this.data[k];
+        },
         set: () => {
           throw new Error(
             `Cannot set ${key} this way, use "setValue" function.`
@@ -269,7 +268,7 @@ export abstract class AutoUpdatedClientObject<T extends Constructor<any>> {
         enumerable: true,
         configurable: true,
       });
-    });
+    }
   }
 
   protected findReference(id: string): AutoUpdated<any> | undefined {
@@ -429,8 +428,9 @@ export abstract class AutoUpdatedClientObject<T extends Constructor<any>> {
 export function processIsRefProperties(
   instance: any,
   target: any,
-  prefix = "",
+  prefix: string | null = null,
   allProps: string[] = [],
+  newData = {} as any,
   loggers?: LoggersType
 ) {
   const props: string[] = Reflect.getMetadata("props", target) || [];
@@ -438,25 +438,31 @@ export function processIsRefProperties(
   for (const prop of props) {
     const path = prefix ? `${prefix}.${prop}` : prop;
     allProps.push(path);
+    newData[prop] = instance[prop];
     if (Reflect.getMetadata("isRef", target, prop)) {
       (loggers ?? console).debug("Changing isRef:", path);
-
-      instance[prop] =
+      newData[prop] =
         typeof instance[prop] === "string"
           ? instance[prop]
-          : instance[prop]._id;
+          : instance[prop]?._id;
     }
 
-    // recurse into nested objects
     const type = Reflect.getMetadata("design:type", target, prop);
     if (type?.prototype) {
       const nestedProps = Reflect.getMetadata("props", type.prototype);
       if (nestedProps && instance[prop]) {
-        processIsRefProperties(instance[prop], type.prototype, path, allProps);
+        newData[prop] = processIsRefProperties(
+          instance[prop],
+          type.prototype,
+          path,
+          allProps,
+          undefined,
+          loggers
+        ).newData;
       }
     }
   }
-  return allProps;
+  return { allProps, newData };
 }
 
 export function getMetadataRecursive(
@@ -495,15 +501,16 @@ function findMissingObjectReference(
   prop: any,
   autoClassers: { [key: string]: AutoUpdateManager<any> }
 ) {
-  for(const ac of Object.values(autoClassers)){
-    for(const obj of ac.objectsAsArray){
+  for (const ac of Object.values(autoClassers)) {
+    for (const obj of ac.objectsAsArray) {
       const found = Object.values(obj.extractedData).find((value) =>
         Array.isArray(value) ? value.includes(data._id) : value === data._id
-      )
-      if(found){
+      );
+      if (found) {
         data[prop] = obj._id;
         return;
       }
     }
   }
+  console.log("a");
 }

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 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.21](https://github.com/Prestizni-Software/client-dem/compare/v0.2.20...v0.2.21) (2025-11-10)
+
 ### [0.2.20](https://github.com/Prestizni-Software/client-dem/compare/v0.2.19...v0.2.20) (2025-11-10)
 
 ### [0.2.19](https://github.com/Prestizni-Software/client-dem/compare/v0.2.18...v0.2.19) (2025-11-10)

package/package.json

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