@stonyx/orm 0.3.2-beta.77 → 0.3.2-beta.78

package/dist/manage-record.js

@@ -104,6 +104,9 @@ export function createRecord(modelName, rawData = {}, userOptions = {}) {
     // Auto-persist to SQL — skip for DB loads (isDbRecord) and relationship resolution (_relationshipKey)
     const shouldPersist = orm?.sqlDb && !options.isDbRecord && !userOptions._relationshipKey && !options._skipAutoPersist;
     if (shouldPersist) {
+        // Capture ID before persist — SQL adapters re-key pending IDs to real DB IDs,
+        // but relationship registries were keyed with this original ID
+        const registryId = record.id;
         const response = { data: { id: record.id } };
         orm.sqlDb.persist('create', modelName, { rawData }, response)
             .catch((err) => {
@@ -117,7 +120,7 @@ export function createRecord(modelName, rawData = {}, userOptions = {}) {
             .finally(() => {
             // Evict non-memory records after persist to prevent unbounded heap growth (stonyx#81)
             if (store._memoryResolver && !store._memoryResolver(modelName)) {
-                store.evictRecord(modelName, record.id);
+                store.evictRecord(modelName, record.id, registryId);
             }
         });
     }

package/dist/store.d.ts

@@ -50,8 +50,12 @@ export default class Store {
      * Evict a record from the store with full relationship registry cleanup,
      * WITHOUT calling record.clean(). This preserves the caller's reference
      * to the returned record (used by memory:false post-persist eviction).
+     *
+     * @param registryId - The ID used when the record's relationships were
+     *   registered. For SQL models with pending IDs, this is the original
+     *   negative pending ID (before the adapter re-keyed to the real DB ID).
      */
-    evictRecord(modelName: string, id: unknown): void;
+    evictRecord(modelName: string, id: unknown, registryId?: unknown): void;
     unloadRecord(model: string, id: unknown, options?: UnloadOptions): void;
     unloadAllRecords(model: string, options?: UnloadOptions): void;
     private _removeFromHasManyArrays;

package/dist/store.js

@@ -131,8 +131,12 @@ export default class Store {
      * Evict a record from the store with full relationship registry cleanup,
      * WITHOUT calling record.clean(). This preserves the caller's reference
      * to the returned record (used by memory:false post-persist eviction).
+     *
+     * @param registryId - The ID used when the record's relationships were
+     *   registered. For SQL models with pending IDs, this is the original
+     *   negative pending ID (before the adapter re-keyed to the real DB ID).
      */
-    evictRecord(modelName, id) {
+    evictRecord(modelName, id, registryId) {
         const modelStore = this.data.get(modelName);
         if (!modelStore)
             return;
@@ -142,9 +146,19 @@ export default class Store {
         if (!raw || !isStoreRecord(raw))
             return;
         const visited = new Set([`${modelName}:${id}`]);
+        // Remove from hasMany arrays and nullify belongsTo references using current ID
+        // (the adapter updates record.id, so value-based matches need the current ID)
         this._removeFromHasManyArrays(modelName, id, visited);
         this._nullifyBelongsToReferences(modelName, id, visited);
-        this._cleanupRelationshipRegistries(modelName, id);
+        // Clean up relationship registry entries using the registry key
+        // (belongsTo/hasMany registries were keyed by the ID at registration time,
+        // which may differ from the current ID if SQL persist re-keyed the record)
+        const cleanupId = registryId ?? id;
+        this._cleanupRelationshipRegistries(modelName, cleanupId);
+        // If registryId differs from id, also clean with current id as safety net
+        if (registryId !== undefined && registryId !== id) {
+            this._cleanupRelationshipRegistries(modelName, id);
+        }
         modelStore.delete(id);
     }
     unloadRecord(model, id, options = {}) {

package/package.json

@@ -4,7 +4,7 @@
     "stonyx-async",
     "stonyx-module"
   ],
-  "version": "0.3.2-beta.77",
+  "version": "0.3.2-beta.78",
   "description": "",
   "main": "dist/index.js",
   "type": "module",

package/src/manage-record.ts

@@ -139,6 +139,9 @@ export function createRecord(modelName: string, rawData: { [key: string]: unknow
   // Auto-persist to SQL — skip for DB loads (isDbRecord) and relationship resolution (_relationshipKey)
   const shouldPersist = orm?.sqlDb && !options.isDbRecord && !userOptions._relationshipKey && !options._skipAutoPersist;
   if (shouldPersist) {
+    // Capture ID before persist — SQL adapters re-key pending IDs to real DB IDs,
+    // but relationship registries were keyed with this original ID
+    const registryId = record.id;
     const response = { data: { id: record.id } };
     orm!.sqlDb!.persist('create', modelName, { rawData }, response)
       .catch((err: unknown) => {
@@ -152,7 +155,7 @@ export function createRecord(modelName: string, rawData: { [key: string]: unknow
       .finally(() => {
         // Evict non-memory records after persist to prevent unbounded heap growth (stonyx#81)
         if (store._memoryResolver && !store._memoryResolver(modelName)) {
-          store.evictRecord(modelName, record.id);
+          store.evictRecord(modelName, record.id, registryId);
         }
       });
   }

package/src/store.ts

@@ -197,8 +197,12 @@ export default class Store {
    * Evict a record from the store with full relationship registry cleanup,
    * WITHOUT calling record.clean(). This preserves the caller's reference
    * to the returned record (used by memory:false post-persist eviction).
+   *
+   * @param registryId - The ID used when the record's relationships were
+   *   registered. For SQL models with pending IDs, this is the original
+   *   negative pending ID (before the adapter re-keyed to the real DB ID).
    */
-  evictRecord(modelName: string, id: unknown): void {
+  evictRecord(modelName: string, id: unknown, registryId?: unknown): void {
     const modelStore = this.data.get(modelName);
     if (!modelStore) return;
 
@@ -207,9 +211,22 @@ export default class Store {
     if (!raw || !isStoreRecord(raw)) return;
 
     const visited = new Set([`${modelName}:${id}`]);
+
+    // Remove from hasMany arrays and nullify belongsTo references using current ID
+    // (the adapter updates record.id, so value-based matches need the current ID)
     this._removeFromHasManyArrays(modelName, id, visited);
     this._nullifyBelongsToReferences(modelName, id, visited);
-    this._cleanupRelationshipRegistries(modelName, id);
+
+    // Clean up relationship registry entries using the registry key
+    // (belongsTo/hasMany registries were keyed by the ID at registration time,
+    // which may differ from the current ID if SQL persist re-keyed the record)
+    const cleanupId = registryId ?? id;
+    this._cleanupRelationshipRegistries(modelName, cleanupId);
+
+    // If registryId differs from id, also clean with current id as safety net
+    if (registryId !== undefined && registryId !== id) {
+      this._cleanupRelationshipRegistries(modelName, id);
+    }
 
     modelStore.delete(id);
   }