@stonyx/orm 0.3.2-beta.3 → 0.3.2-beta.5

package/dist/main.js

@@ -180,7 +180,7 @@ export default class Orm {
         const record = createRecord(modelName, data, { serialize: false });
         if (Orm.instance.sqlDb) {
             const response = { data: { id: record.id } };
-            await Orm.instance.sqlDb.persist('create', modelName, {}, response);
+            await Orm.instance.sqlDb.persist('create', modelName, { rawData: data }, response);
         }
         return record;
     }

package/dist/postgres/postgres-db.d.ts

@@ -17,6 +17,7 @@ interface PersistContext {
     record?: OrmRecord;
     recordId?: unknown;
     oldState?: Record<string, unknown>;
+    rawData?: Record<string, unknown>;
 }
 interface PersistResponse {
     data?: {

package/dist/postgres/postgres-db.js

@@ -365,7 +365,7 @@ export default class PostgresDB {
                 return this._persistDelete(modelName, context);
         }
     }
-    async _persistCreate(modelName, _context, response) {
+    async _persistCreate(modelName, context, response) {
         const schemas = this.deps.introspectModels();
         const schema = schemas[modelName];
         if (!schema)
@@ -375,7 +375,7 @@ export default class PostgresDB {
         const record = recordId != null ? storeRef.get(modelName, isNaN(recordId) ? recordId : parseInt(recordId)) : null;
         if (!record)
             return;
-        const insertData = this._recordToRow(record, schema);
+        const insertData = this._recordToRow(record, schema, context.rawData);
         // For auto-increment models, remove the pending ID
         const isPendingId = record.__data.__pendingSqlId;
         if (isPendingId) {
@@ -420,7 +420,10 @@ export default class PostgresDB {
         // Check FK changes too
         for (const fkCol of Object.keys(schema.foreignKeys)) {
             const relName = fkCol.replace(/_id$/, '');
-            const currentFkValue = record.__relationships[relName]?.id ?? null;
+            const relValue = record.__relationships[relName];
+            const currentFkValue = (relValue && typeof relValue === 'object' && relValue !== null)
+                ? relValue.id ?? null
+                : relValue ?? record.__data[relName] ?? null;
             const oldFkValue = oldState[relName] ?? null;
             if (currentFkValue !== oldFkValue) {
                 changedData[fkCol] = currentFkValue;
@@ -444,7 +447,7 @@ export default class PostgresDB {
         const { sql, values } = this.deps.buildDelete(schema.table, id);
         await this.requirePool().query(sql, values);
     }
-    _recordToRow(record, schema) {
+    _recordToRow(record, schema, rawData) {
         const row = {};
         const data = record.__data;
         // ID
@@ -464,13 +467,20 @@ export default class PostgresDB {
         for (const fkCol of Object.keys(schema.foreignKeys)) {
             const relName = fkCol.replace(/_id$/, '');
             const related = record.__relationships[relName];
-            if (related) {
+            if (related && typeof related === 'object' && related !== null) {
                 row[fkCol] = related.id;
             }
+            else if (related != null) {
+                // Raw FK value (e.g., string ID stored directly in __relationships)
+                row[fkCol] = related;
+            }
             else if (data[relName] !== undefined) {
-                // Raw FK value (e.g., from create payload)
                 row[fkCol] = data[relName];
             }
+            else if (rawData?.[relName] !== undefined) {
+                // Fallback to original create payload for unresolved belongsTo FKs
+                row[fkCol] = rawData[relName];
+            }
         }
         return row;
     }

package/package.json

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

package/src/main.ts

@@ -228,7 +228,7 @@ export default class Orm {
 
     if (Orm.instance.sqlDb) {
       const response: { data: { id: unknown } } = { data: { id: record.id } };
-      await Orm.instance.sqlDb.persist('create', modelName, {}, response);
+      await Orm.instance.sqlDb.persist('create', modelName, { rawData: data }, response);
     }
 
     return record;

package/src/postgres/postgres-db.ts

@@ -19,6 +19,7 @@ interface PersistContext {
   record?: OrmRecord;
   recordId?: unknown;
   oldState?: Record<string, unknown>;
+  rawData?: Record<string, unknown>;
 }
 
 interface PersistResponse {
@@ -477,7 +478,7 @@ export default class PostgresDB {
     }
   }
 
-  private async _persistCreate(modelName: string, _context: PersistContext, response: PersistResponse): Promise<void> {
+  private async _persistCreate(modelName: string, context: PersistContext, response: PersistResponse): Promise<void> {
     const schemas = this.deps.introspectModels();
     const schema = schemas[modelName];
 
@@ -491,7 +492,7 @@ export default class PostgresDB {
 
     if (!record) return;
 
-    const insertData = this._recordToRow(record, schema);
+    const insertData = this._recordToRow(record, schema, context.rawData);
 
     // For auto-increment models, remove the pending ID
     const isPendingId = record.__data.__pendingSqlId;
@@ -549,7 +550,10 @@ export default class PostgresDB {
     // Check FK changes too
     for (const fkCol of Object.keys(schema.foreignKeys)) {
       const relName = fkCol.replace(/_id$/, '');
-      const currentFkValue = (record.__relationships[relName] as { id: unknown } | undefined)?.id ?? null;
+      const relValue = record.__relationships[relName];
+      const currentFkValue = (relValue && typeof relValue === 'object' && relValue !== null)
+        ? (relValue as { id: unknown }).id ?? null
+        : relValue ?? record.__data[relName] ?? null;
       const oldFkValue = oldState[relName] ?? null;
 
       if (currentFkValue !== oldFkValue) {
@@ -579,7 +583,7 @@ export default class PostgresDB {
     await this.requirePool().query(sql, values);
   }
 
-  private _recordToRow(record: OrmRecord, schema: ModelSchema): Record<string, unknown> {
+  private _recordToRow(record: OrmRecord, schema: ModelSchema, rawData?: Record<string, unknown>): Record<string, unknown> {
     const row: Record<string, unknown> = {};
     const data = record.__data;
 
@@ -603,11 +607,16 @@ export default class PostgresDB {
       const relName = fkCol.replace(/_id$/, '');
       const related = record.__relationships[relName];
 
-      if (related) {
+      if (related && typeof related === 'object' && related !== null) {
         row[fkCol] = (related as { id: unknown }).id;
+      } else if (related != null) {
+        // Raw FK value (e.g., string ID stored directly in __relationships)
+        row[fkCol] = related;
       } else if (data[relName] !== undefined) {
-        // Raw FK value (e.g., from create payload)
         row[fkCol] = data[relName];
+      } else if (rawData?.[relName] !== undefined) {
+        // Fallback to original create payload for unresolved belongsTo FKs
+        row[fkCol] = rawData[relName];
       }
     }