@cheetah.js/orm 0.2.1 → 0.2.2

package/dist/identity-map/identity-map-integration.js

@@ -16,6 +16,7 @@ class IdentityMapIntegration {
             return cached;
         }
         const instance = factory();
+        identityMap.setByKey(model, primaryKey, instance);
         return instance;
     }
     static registerEntity(entity) {

package/dist/identity-map/identity-map.d.ts

@@ -4,6 +4,7 @@ export declare class IdentityMap {
     constructor();
     get<T>(entityClass: Function, pk: any): T | undefined;
     set<T extends object>(entity: T): void;
+    setByKey<T extends object>(entityClass: Function, pk: any, entity: T): void;
     has(entityClass: Function, pk: any): boolean;
     remove(entityClass: Function, pk: any): void;
     clear(): void;

package/dist/identity-map/identity-map.js

@@ -16,6 +16,10 @@ class IdentityMap {
         const key = this.keyGenerator.generateForEntity(entity);
         this.registry.set(key, entity);
     }
+    setByKey(entityClass, pk, entity) {
+        const key = this.keyGenerator.generate(entityClass, pk);
+        this.registry.set(key, entity);
+    }
     has(entityClass, pk) {
         const key = this.keyGenerator.generate(entityClass, pk);
         return this.registry.has(key);

package/dist/query/model-transformer.js

@@ -9,41 +9,55 @@ class ModelTransformer {
         this.entityStorage = entityStorage;
     }
     transform(model, statement, data) {
-        const instanceMap = this.createInstances(model, statement, data);
+        const { instanceMap, cachedAliases } = this.createInstances(model, statement, data);
         const optionsMap = this.buildOptionsMap(instanceMap);
-        this.populateProperties(data, instanceMap, optionsMap);
+        this.populateProperties(data, instanceMap, optionsMap, cachedAliases);
         this.linkJoinedEntities(statement, instanceMap, optionsMap);
-        this.resetChangedValues(instanceMap);
-        this.registerInstancesInIdentityMap(instanceMap);
+        this.resetChangedValues(instanceMap, cachedAliases);
+        this.registerInstancesInIdentityMap(instanceMap, cachedAliases);
         return instanceMap[statement.alias];
     }
-    registerInstancesInIdentityMap(instanceMap) {
-        Object.values(instanceMap).forEach(instance => {
+    registerInstancesInIdentityMap(instanceMap, cachedAliases) {
+        Object.entries(instanceMap).forEach(([alias, instance]) => {
+            // Skip registering entities that were already in cache
+            if (cachedAliases.has(alias)) {
+                return;
+            }
             identity_map_1.IdentityMapIntegration.registerEntity(instance);
         });
     }
     createInstances(model, statement, data) {
+        const cachedAliases = new Set();
         const primaryKey = this.extractPrimaryKeyFromData(model, statement.alias, data);
-        const instance = this.createInstance(model, primaryKey);
+        const { instance, wasCached } = this.createInstance(model, primaryKey);
+        if (wasCached) {
+            cachedAliases.add(statement.alias);
+        }
         const instanceMap = {
             [statement.alias]: instance,
         };
         if (statement.join) {
-            this.addJoinedInstances(statement, instanceMap, data);
+            this.addJoinedInstances(statement, instanceMap, data, cachedAliases);
         }
-        return instanceMap;
+        return { instanceMap, cachedAliases };
     }
     createInstance(model, primaryKey) {
-        return identity_map_1.IdentityMapIntegration.getOrCreateInstance(model, primaryKey, () => {
-            const instance = new model();
-            instance.$_isPersisted = true;
-            return instance;
-        });
+        const cached = identity_map_1.IdentityMapIntegration.getEntity(model, primaryKey);
+        if (cached) {
+            return { instance: cached, wasCached: true };
+        }
+        const instance = new model();
+        instance.$_isPersisted = true;
+        // Note: Registration happens later in registerInstancesInIdentityMap after properties are populated
+        return { instance, wasCached: false };
     }
-    addJoinedInstances(statement, instanceMap, data) {
+    addJoinedInstances(statement, instanceMap, data, cachedAliases) {
         statement.join.forEach(join => {
             const primaryKey = this.extractPrimaryKeyFromData(join.joinEntity, join.joinAlias, data);
-            const joinInstance = this.createInstance(join.joinEntity, primaryKey);
+            const { instance: joinInstance, wasCached } = this.createInstance(join.joinEntity, primaryKey);
+            if (wasCached) {
+                cachedAliases.add(join.joinAlias);
+            }
             instanceMap[join.joinAlias] = joinInstance;
         });
     }
@@ -84,13 +98,17 @@ class ModelTransformer {
         }
         return optionsMap;
     }
-    populateProperties(data, instanceMap, optionsMap) {
+    populateProperties(data, instanceMap, optionsMap, cachedAliases) {
         Object.entries(data).forEach(([key, value]) => {
             const { alias, propertyName } = this.parseColumnKey(key);
             const entity = instanceMap[alias];
             if (!entity) {
                 return;
             }
+            // Skip populating properties for cached entities to preserve in-memory changes
+            if (cachedAliases.has(alias)) {
+                return;
+            }
             this.setPropertyValue(entity, propertyName, value, optionsMap.get(alias));
         });
     }
@@ -163,8 +181,12 @@ class ModelTransformer {
     appendToArray(existingArray, newItem) {
         return existingArray ? [...existingArray, newItem] : [newItem];
     }
-    resetChangedValues(instanceMap) {
-        Object.values(instanceMap).forEach(instance => {
+    resetChangedValues(instanceMap, cachedAliases) {
+        Object.entries(instanceMap).forEach(([alias, instance]) => {
+            // Skip resetting changed values for cached entities to preserve in-memory changes
+            if (cachedAliases.has(alias)) {
+                return;
+            }
             const currentValues = {};
             for (const key in instance) {
                 if (!key.startsWith('_') && !key.startsWith('$')) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cheetah.js/orm",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "A simple ORM for Cheetah.js.",
   "type": "commonjs",
   "main": "dist/index.js",
@@ -55,5 +55,5 @@
     "bun",
     "value-object"
   ],
-  "gitHead": "a46701aa7b6e513992090e6d8045918288eab16e"
+  "gitHead": "7e01e4a49e89040af0c81bd3e5d1bd257fbe3e2a"
 }