@stonyx/orm 0.3.2-beta.2 → 0.3.2-beta.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,91 +1,12 @@
1
- const {
2
- ORM_ACCESS_PATH,
3
- ORM_MODEL_PATH,
4
- ORM_REST_ROUTE,
5
- ORM_SERIALIZER_PATH,
6
- ORM_TRANSFORM_PATH,
7
- ORM_VIEW_PATH,
8
- ORM_USE_REST_SERVER,
9
- DB_AUTO_SAVE,
10
- DB_FILE,
11
- DB_MODE,
12
- DB_DIRECTORY,
13
- DB_SCHEMA_PATH,
14
- DB_SAVE_INTERVAL,
15
- MYSQL_HOST,
16
- MYSQL_PORT,
17
- MYSQL_USER,
18
- MYSQL_PASSWORD,
19
- MYSQL_DATABASE,
20
- MYSQL_CONNECTION_LIMIT,
21
- MYSQL_MIGRATIONS_DIR,
22
- PG_HOST,
23
- PG_PORT,
24
- PG_USER,
25
- PG_PASSWORD,
26
- PG_DATABASE,
27
- PG_CONNECTION_LIMIT,
28
- PG_MIGRATIONS_DIR,
29
- TIMESCALE_HOST,
30
- TIMESCALE_PORT,
31
- TIMESCALE_USER,
32
- TIMESCALE_PASSWORD,
33
- TIMESCALE_DATABASE,
34
- TIMESCALE_CONNECTION_LIMIT,
35
- TIMESCALE_MIGRATIONS_DIR,
36
- } = process.env;
37
-
38
- export default {
39
- logColor: 'white',
40
- logMethod: 'db',
41
-
42
- db: {
43
- autosave: DB_AUTO_SAVE ?? 'false', // 'true' (cron interval), 'false' (disabled), 'onUpdate' (save after each write op)
44
- file: DB_FILE ?? 'db.json',
45
- mode: DB_MODE ?? 'file', // 'file' (single db.json) or 'directory' (one file per collection)
46
- directory: DB_DIRECTORY ?? 'db', // directory name for collection files when mode is 'directory'
47
- saveInterval: DB_SAVE_INTERVAL ?? 60 * 60, // 1 hour
48
- schema: DB_SCHEMA_PATH ?? './config/db-schema.js'
49
- },
50
- paths: {
51
- access: ORM_ACCESS_PATH ?? './access', // Optional for restServer access hooks
52
- model: ORM_MODEL_PATH ?? './models',
53
- serializer: ORM_SERIALIZER_PATH ?? './serializers',
54
- transform: ORM_TRANSFORM_PATH ?? './transforms',
55
- view: ORM_VIEW_PATH ?? './views'
56
- },
57
- mysql: MYSQL_HOST ? {
58
- host: MYSQL_HOST ?? 'localhost',
59
- port: parseInt(MYSQL_PORT ?? '3306'),
60
- user: MYSQL_USER ?? 'root',
61
- password: MYSQL_PASSWORD ?? '',
62
- database: MYSQL_DATABASE ?? 'stonyx',
63
- connectionLimit: parseInt(MYSQL_CONNECTION_LIMIT ?? '10'),
64
- migrationsDir: MYSQL_MIGRATIONS_DIR ?? 'migrations',
65
- migrationsTable: '__migrations',
66
- } : undefined,
67
- postgres: PG_HOST ? {
68
- host: PG_HOST ?? 'localhost',
69
- port: parseInt(PG_PORT ?? '5432'),
70
- user: PG_USER ?? 'postgres',
71
- password: PG_PASSWORD ?? '',
72
- database: PG_DATABASE ?? 'stonyx',
73
- connectionLimit: parseInt(PG_CONNECTION_LIMIT ?? '10'),
74
- migrationsDir: PG_MIGRATIONS_DIR ?? 'migrations',
75
- migrationsTable: '__migrations',
76
- } : undefined,
77
- timescale: TIMESCALE_HOST ? {
78
- host: TIMESCALE_HOST ?? 'localhost',
79
- port: parseInt(TIMESCALE_PORT ?? '5432'),
80
- user: TIMESCALE_USER ?? 'postgres',
81
- password: TIMESCALE_PASSWORD ?? '',
82
- database: TIMESCALE_DATABASE ?? 'stonyx',
83
- connectionLimit: parseInt(TIMESCALE_CONNECTION_LIMIT ?? '10'),
84
- migrationsDir: TIMESCALE_MIGRATIONS_DIR ?? 'migrations',
85
- migrationsTable: '__migrations',
86
- } : undefined,
87
- restServer: {
88
- enabled: ORM_USE_REST_SERVER ?? 'true', // Whether to load restServer for automatic route setup or
89
- route: ORM_REST_ROUTE ?? '/',
90
- }
91
- }
1
+ // project configuration, override-able by listed environment variables
2
+ const {
3
+ DEBUG,
4
+ NODE_ENV,
5
+ } = process.env;
6
+
7
+ const environment = NODE_ENV ?? 'development';
8
+
9
+ export default {
10
+ environment,
11
+ debug: DEBUG ?? environment === 'development',
12
+ }
@@ -0,0 +1,91 @@
1
+ const {
2
+ ORM_ACCESS_PATH,
3
+ ORM_MODEL_PATH,
4
+ ORM_REST_ROUTE,
5
+ ORM_SERIALIZER_PATH,
6
+ ORM_TRANSFORM_PATH,
7
+ ORM_VIEW_PATH,
8
+ ORM_USE_REST_SERVER,
9
+ DB_AUTO_SAVE,
10
+ DB_FILE,
11
+ DB_MODE,
12
+ DB_DIRECTORY,
13
+ DB_SCHEMA_PATH,
14
+ DB_SAVE_INTERVAL,
15
+ MYSQL_HOST,
16
+ MYSQL_PORT,
17
+ MYSQL_USER,
18
+ MYSQL_PASSWORD,
19
+ MYSQL_DATABASE,
20
+ MYSQL_CONNECTION_LIMIT,
21
+ MYSQL_MIGRATIONS_DIR,
22
+ PG_HOST,
23
+ PG_PORT,
24
+ PG_USER,
25
+ PG_PASSWORD,
26
+ PG_DATABASE,
27
+ PG_CONNECTION_LIMIT,
28
+ PG_MIGRATIONS_DIR,
29
+ TIMESCALE_HOST,
30
+ TIMESCALE_PORT,
31
+ TIMESCALE_USER,
32
+ TIMESCALE_PASSWORD,
33
+ TIMESCALE_DATABASE,
34
+ TIMESCALE_CONNECTION_LIMIT,
35
+ TIMESCALE_MIGRATIONS_DIR,
36
+ } = process.env;
37
+
38
+ export default {
39
+ logColor: 'white',
40
+ logMethod: 'db',
41
+
42
+ db: {
43
+ autosave: DB_AUTO_SAVE ?? 'false', // 'true' (cron interval), 'false' (disabled), 'onUpdate' (save after each write op)
44
+ file: DB_FILE ?? 'db.json',
45
+ mode: DB_MODE ?? 'file', // 'file' (single db.json) or 'directory' (one file per collection)
46
+ directory: DB_DIRECTORY ?? 'db', // directory name for collection files when mode is 'directory'
47
+ saveInterval: DB_SAVE_INTERVAL ?? 60 * 60, // 1 hour
48
+ schema: DB_SCHEMA_PATH ?? './config/db-schema.js'
49
+ },
50
+ paths: {
51
+ access: ORM_ACCESS_PATH ?? './access', // Optional for restServer access hooks
52
+ model: ORM_MODEL_PATH ?? './models',
53
+ serializer: ORM_SERIALIZER_PATH ?? './serializers',
54
+ transform: ORM_TRANSFORM_PATH ?? './transforms',
55
+ view: ORM_VIEW_PATH ?? './views'
56
+ },
57
+ mysql: MYSQL_HOST ? {
58
+ host: MYSQL_HOST ?? 'localhost',
59
+ port: parseInt(MYSQL_PORT ?? '3306'),
60
+ user: MYSQL_USER ?? 'root',
61
+ password: MYSQL_PASSWORD ?? '',
62
+ database: MYSQL_DATABASE ?? 'stonyx',
63
+ connectionLimit: parseInt(MYSQL_CONNECTION_LIMIT ?? '10'),
64
+ migrationsDir: MYSQL_MIGRATIONS_DIR ?? 'migrations',
65
+ migrationsTable: '__migrations',
66
+ } : undefined,
67
+ postgres: PG_HOST ? {
68
+ host: PG_HOST ?? 'localhost',
69
+ port: parseInt(PG_PORT ?? '5432'),
70
+ user: PG_USER ?? 'postgres',
71
+ password: PG_PASSWORD ?? '',
72
+ database: PG_DATABASE ?? 'stonyx',
73
+ connectionLimit: parseInt(PG_CONNECTION_LIMIT ?? '10'),
74
+ migrationsDir: PG_MIGRATIONS_DIR ?? 'migrations',
75
+ migrationsTable: '__migrations',
76
+ } : undefined,
77
+ timescale: TIMESCALE_HOST ? {
78
+ host: TIMESCALE_HOST ?? 'localhost',
79
+ port: parseInt(TIMESCALE_PORT ?? '5432'),
80
+ user: TIMESCALE_USER ?? 'postgres',
81
+ password: TIMESCALE_PASSWORD ?? '',
82
+ database: TIMESCALE_DATABASE ?? 'stonyx',
83
+ connectionLimit: parseInt(TIMESCALE_CONNECTION_LIMIT ?? '10'),
84
+ migrationsDir: TIMESCALE_MIGRATIONS_DIR ?? 'migrations',
85
+ migrationsTable: '__migrations',
86
+ } : undefined,
87
+ restServer: {
88
+ enabled: ORM_USE_REST_SERVER ?? 'true', // Whether to load restServer for automatic route setup or
89
+ route: ORM_REST_ROUTE ?? '/',
90
+ }
91
+ }
package/dist/index.d.ts CHANGED
@@ -8,6 +8,7 @@ import { createRecord, updateRecord } from './manage-record.js';
8
8
  import { count, avg, sum, min, max } from './aggregates.js';
9
9
  export { default } from './main.js';
10
10
  export { store, relationships } from './main.js';
11
+ export type { PersistErrorDetail } from './main.js';
11
12
  export { Model, View, Serializer };
12
13
  export { attr, belongsTo, hasMany, createRecord, updateRecord };
13
14
  export { count, avg, sum, min, max };
package/dist/index.js CHANGED
@@ -29,6 +29,11 @@ export { count, avg, sum, min, max }; // aggregate helpers
29
29
  export { beforeHook, afterHook, clearHook, clearAllHooks } from './hooks.js'; // middleware hooks
30
30
  // Store API:
31
31
  // store.get(model, id) -- sync, memory-only
32
- // store.find(model, id) -- async, MySQL for memory:false models
32
+ // store.find(model, id) -- async, SQL for memory:false models
33
33
  // store.findAll(model) -- async, all records
34
- // store.query(model, conditions) -- async, always hits MySQL
34
+ // store.query(model, conditions) -- async, always hits SQL
35
+ //
36
+ // Data-layer auto-persist (memory + SQL persistence):
37
+ // createRecord(model, data) -- sync, auto-persists to SQL (fire-and-forget)
38
+ // updateRecord(record, data) -- sync, auto-persists to SQL (fire-and-forget)
39
+ // store.remove(model, id) -- sync, auto-persists delete to SQL (fire-and-forget)
package/dist/main.d.ts CHANGED
@@ -15,6 +15,12 @@ export interface OrmDB {
15
15
  save(): Promise<void>;
16
16
  init(): Promise<void>;
17
17
  }
18
+ export interface PersistErrorDetail {
19
+ operation: 'create' | 'update' | 'delete';
20
+ modelName: string;
21
+ recordId: unknown;
22
+ error: Error;
23
+ }
18
24
  export default class Orm {
19
25
  static initialized: boolean;
20
26
  static relationships: Map<string, Map<string, unknown>>;
@@ -29,6 +35,7 @@ export default class Orm {
29
35
  options: OrmOptions;
30
36
  sqlDb?: SqlDb;
31
37
  db?: OrmDB | SqlDb;
38
+ private _persistErrorHandler;
32
39
  constructor(options?: OrmOptions);
33
40
  init(): Promise<void>;
34
41
  startup(): Promise<void>;
@@ -39,6 +46,15 @@ export default class Orm {
39
46
  serializerClass: unknown;
40
47
  };
41
48
  isView(modelName: string): boolean;
49
+ /**
50
+ * Register a callback to be invoked when a fire-and-forget SQL persist fails.
51
+ * Without a handler, persist errors are logged via log.error (backwards-compatible).
52
+ */
53
+ onPersistError(handler: ((detail: PersistErrorDetail) => void) | null): void;
54
+ /**
55
+ * Emit a persist error to the registered handler, or fall back to log.error.
56
+ */
57
+ emitPersistError(detail: PersistErrorDetail): void;
42
58
  warn(message: string): void;
43
59
  }
44
60
  export declare const store: Store;
package/dist/main.js CHANGED
@@ -41,6 +41,7 @@ export default class Orm {
41
41
  options;
42
42
  sqlDb;
43
43
  db;
44
+ _persistErrorHandler = null;
44
45
  constructor(options = {}) {
45
46
  if (Orm.instance)
46
47
  return Orm.instance;
@@ -168,6 +169,31 @@ export default class Orm {
168
169
  const modelClassPrefix = kebabCaseToPascalCase(modelName);
169
170
  return !!this.views[`${modelClassPrefix}View`];
170
171
  }
172
+ /**
173
+ * Register a callback to be invoked when a fire-and-forget SQL persist fails.
174
+ * Without a handler, persist errors are logged via log.error (backwards-compatible).
175
+ */
176
+ onPersistError(handler) {
177
+ this._persistErrorHandler = handler;
178
+ }
179
+ /**
180
+ * Emit a persist error to the registered handler, or fall back to log.error.
181
+ */
182
+ emitPersistError(detail) {
183
+ const fallbackLog = () => log.error?.(`[ORM] Failed to persist ${detail.operation} for ${detail.modelName}:${String(detail.recordId)}: ${detail.error.message}`);
184
+ if (this._persistErrorHandler) {
185
+ try {
186
+ this._persistErrorHandler(detail);
187
+ }
188
+ catch (handlerError) {
189
+ fallbackLog();
190
+ log.error?.(`[ORM] onPersistError handler threw: ${handlerError instanceof Error ? handlerError.message : String(handlerError)}`);
191
+ }
192
+ }
193
+ else {
194
+ fallbackLog();
195
+ }
196
+ }
171
197
  // Queue warnings to avoid the same error from being logged in the same iteration
172
198
  warn(message) {
173
199
  this.warnings.add(message);
@@ -4,6 +4,7 @@ interface CreateRecordOptions {
4
4
  serialize?: boolean;
5
5
  transform?: boolean;
6
6
  update?: boolean;
7
+ _skipAutoPersist?: boolean;
7
8
  [key: string]: unknown;
8
9
  }
9
10
  export declare function createRecord(modelName: string, rawData?: {
@@ -7,6 +7,7 @@ const defaultOptions = {
7
7
  serialize: true,
8
8
  transform: true
9
9
  };
10
+ let pendingIdCounter = 0;
10
11
  export function createRecord(modelName, rawData = {}, userOptions = {}) {
11
12
  const orm = Orm.instance;
12
13
  const { initialized } = Orm;
@@ -79,6 +80,19 @@ export function createRecord(modelName, rawData = {}, userOptions = {}) {
79
80
  // Clear the pending queue
80
81
  pendingBelongsTo.length = 0;
81
82
  }
83
+ // Auto-persist to SQL — skip for DB loads (isDbRecord) and relationship resolution (_relationshipKey)
84
+ const shouldPersist = orm?.sqlDb && !options.isDbRecord && !userOptions._relationshipKey && !options._skipAutoPersist;
85
+ if (shouldPersist) {
86
+ const response = { data: { id: record.id } };
87
+ orm.sqlDb.persist('create', modelName, { rawData }, response).catch((err) => {
88
+ orm.emitPersistError({
89
+ operation: 'create',
90
+ modelName,
91
+ recordId: record.id,
92
+ error: err instanceof Error ? err : new Error(String(err)),
93
+ });
94
+ });
95
+ }
82
96
  return record;
83
97
  }
84
98
  export function updateRecord(record, rawData, userOptions = {}) {
@@ -90,7 +104,22 @@ export function updateRecord(record, rawData, userOptions = {}) {
90
104
  throw new Error(`Cannot update records for read-only view '${modelName}'`);
91
105
  }
92
106
  const options = { ...defaultOptions, ...userOptions, update: true };
107
+ // Capture old state before update for SQL diff
108
+ const oldState = record.__data ? JSON.parse(JSON.stringify(record.__data)) : {};
93
109
  record.serialize(rawData, options);
110
+ // Auto-persist to SQL — skip for DB loads (isDbRecord) and relationship resolution (_relationshipKey)
111
+ const orm = Orm.instance;
112
+ const shouldPersist = orm?.sqlDb && !options.isDbRecord && !userOptions._relationshipKey && !options._skipAutoPersist;
113
+ if (shouldPersist && modelName) {
114
+ orm.sqlDb.persist('update', modelName, { record, oldState }, {}).catch((err) => {
115
+ orm.emitPersistError({
116
+ operation: 'update',
117
+ modelName,
118
+ recordId: record.id,
119
+ error: err instanceof Error ? err : new Error(String(err)),
120
+ });
121
+ });
122
+ }
94
123
  }
95
124
  /**
96
125
  * gets the next available id based on last record entry.
@@ -101,9 +130,11 @@ export function updateRecord(record, rawData, userOptions = {}) {
101
130
  function assignRecordId(modelName, rawData) {
102
131
  if (rawData.id)
103
132
  return;
104
- // In SQL mode with numeric IDs, defer to database auto-increment
133
+ // In SQL mode with numeric IDs, defer to database auto-increment.
134
+ // Use unique negative integers — they survive the number transform (parseInt preserves negatives)
135
+ // and avoid NaN store-key collisions that string pending IDs caused.
105
136
  if (Orm.instance?.sqlDb && !isStringIdModel(modelName)) {
106
- rawData.id = `__pending_${Date.now()}_${Math.random()}`;
137
+ rawData.id = -(++pendingIdCounter);
107
138
  rawData.__pendingSqlId = true;
108
139
  return;
109
140
  }
@@ -16,6 +16,7 @@ interface PersistContext {
16
16
  record?: OrmRecord;
17
17
  recordId?: unknown;
18
18
  oldState?: Record<string, unknown>;
19
+ rawData?: Record<string, unknown>;
19
20
  }
20
21
  interface PersistResponse {
21
22
  data?: {
@@ -321,8 +321,10 @@ export default class MysqlDB {
321
321
  if (!record)
322
322
  return;
323
323
  const insertData = this._recordToRow(record, schema);
324
- // For auto-increment models, remove the pending ID
325
- const isPendingId = record.__data.__pendingSqlId;
324
+ // For auto-increment models, remove the pending ID.
325
+ // Check context.rawData (not record.__data) because __pendingSqlId is not a model
326
+ // attribute and gets lost during serialization.
327
+ const isPendingId = context.rawData?.__pendingSqlId === true;
326
328
  if (isPendingId) {
327
329
  delete insertData.id;
328
330
  }
@@ -248,7 +248,7 @@ export default class OrmRequest extends Request {
248
248
  }
249
249
  }
250
250
  const recordAttributes = id !== undefined ? { id, ...sanitizedAttributes } : sanitizedAttributes;
251
- const created = createRecord(model, recordAttributes, { serialize: false });
251
+ const created = createRecord(model, recordAttributes, { serialize: false, _skipAutoPersist: true });
252
252
  const record = isOrmRecord(created) ? created : null;
253
253
  if (!record)
254
254
  return 500;
@@ -283,7 +283,7 @@ export default class OrmRequest extends Request {
283
283
  }
284
284
  }
285
285
  if (Object.keys(relUpdates).length > 0) {
286
- updateRecord(record, relUpdates);
286
+ updateRecord(record, relUpdates, { _skipAutoPersist: true });
287
287
  }
288
288
  }
289
289
  return { data: record.toJSON?.() };
@@ -348,9 +348,9 @@ export default class OrmRequest extends Request {
348
348
  }
349
349
  // Execute main handler
350
350
  const response = await handler(request, state);
351
- // Persist to SQL database for write operations
351
+ // Persist to SQL database for create/update (delete is handled by store.remove auto-persist)
352
352
  const sqlDb = Orm.instance.sqlDb;
353
- if (sqlDb && WRITE_OPERATIONS.has(operation)) {
353
+ if (sqlDb && (operation === 'create' || operation === 'update')) {
354
354
  await sqlDb.persist(operation, this.model, context, response);
355
355
  }
356
356
  // Add response and relevant records to context
@@ -17,6 +17,7 @@ interface PersistContext {
17
17
  record?: OrmRecord;
18
18
  recordId?: unknown;
19
19
  oldState?: Record<string, unknown>;
20
+ rawData?: Record<string, unknown>;
20
21
  }
21
22
  interface PersistResponse {
22
23
  data?: {
@@ -365,7 +365,7 @@ export default class PostgresDB {
365
365
  return this._persistDelete(modelName, context);
366
366
  }
367
367
  }
368
- async _persistCreate(modelName, _context, response) {
368
+ async _persistCreate(modelName, context, response) {
369
369
  const schemas = this.deps.introspectModels();
370
370
  const schema = schemas[modelName];
371
371
  if (!schema)
@@ -375,9 +375,11 @@ export default class PostgresDB {
375
375
  const record = recordId != null ? storeRef.get(modelName, isNaN(recordId) ? recordId : parseInt(recordId)) : null;
376
376
  if (!record)
377
377
  return;
378
- const insertData = this._recordToRow(record, schema);
379
- // For auto-increment models, remove the pending ID
380
- const isPendingId = record.__data.__pendingSqlId;
378
+ const insertData = this._recordToRow(record, schema, context.rawData);
379
+ // For auto-increment models, remove the pending ID.
380
+ // Check context.rawData (not record.__data) because __pendingSqlId is not a model
381
+ // attribute and gets lost during serialization.
382
+ const isPendingId = context.rawData?.__pendingSqlId === true;
381
383
  if (isPendingId) {
382
384
  delete insertData.id;
383
385
  }
@@ -420,7 +422,10 @@ export default class PostgresDB {
420
422
  // Check FK changes too
421
423
  for (const fkCol of Object.keys(schema.foreignKeys)) {
422
424
  const relName = fkCol.replace(/_id$/, '');
423
- const currentFkValue = record.__relationships[relName]?.id ?? null;
425
+ const relValue = record.__relationships[relName];
426
+ const currentFkValue = (relValue && typeof relValue === 'object' && relValue !== null)
427
+ ? relValue.id ?? null
428
+ : relValue ?? record.__data[relName] ?? null;
424
429
  const oldFkValue = oldState[relName] ?? null;
425
430
  if (currentFkValue !== oldFkValue) {
426
431
  changedData[fkCol] = currentFkValue;
@@ -444,7 +449,7 @@ export default class PostgresDB {
444
449
  const { sql, values } = this.deps.buildDelete(schema.table, id);
445
450
  await this.requirePool().query(sql, values);
446
451
  }
447
- _recordToRow(record, schema) {
452
+ _recordToRow(record, schema, rawData) {
448
453
  const row = {};
449
454
  const data = record.__data;
450
455
  // ID
@@ -464,13 +469,20 @@ export default class PostgresDB {
464
469
  for (const fkCol of Object.keys(schema.foreignKeys)) {
465
470
  const relName = fkCol.replace(/_id$/, '');
466
471
  const related = record.__relationships[relName];
467
- if (related) {
472
+ if (related && typeof related === 'object' && related !== null) {
468
473
  row[fkCol] = related.id;
469
474
  }
475
+ else if (related != null) {
476
+ // Raw FK value (e.g., string ID stored directly in __relationships)
477
+ row[fkCol] = related;
478
+ }
470
479
  else if (data[relName] !== undefined) {
471
- // Raw FK value (e.g., from create payload)
472
480
  row[fkCol] = data[relName];
473
481
  }
482
+ else if (rawData?.[relName] !== undefined) {
483
+ // Fallback to original create payload for unresolved belongsTo FKs
484
+ row[fkCol] = rawData[relName];
485
+ }
474
486
  }
475
487
  return row;
476
488
  }
package/dist/store.js CHANGED
@@ -112,6 +112,17 @@ export default class Store {
112
112
  if (Orm.instance?.isView?.(key)) {
113
113
  throw new Error(`Cannot remove records from read-only view '${key}'`);
114
114
  }
115
+ // Auto-persist delete to SQL
116
+ if (id && Orm.instance?.sqlDb) {
117
+ Orm.instance.sqlDb.persist('delete', key, { recordId: id }, {}).catch((err) => {
118
+ Orm.instance.emitPersistError({
119
+ operation: 'delete',
120
+ modelName: key,
121
+ recordId: id,
122
+ error: err instanceof Error ? err : new Error(String(err)),
123
+ });
124
+ });
125
+ }
115
126
  if (id)
116
127
  return this.unloadRecord(key, id);
117
128
  this.unloadAllRecords(key);
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "stonyx-async",
5
5
  "stonyx-module"
6
6
  ],
7
- "version": "0.3.2-beta.2",
7
+ "version": "0.3.2-beta.20",
8
8
  "description": "",
9
9
  "main": "dist/index.js",
10
10
  "type": "module",
@@ -61,9 +61,9 @@
61
61
  },
62
62
  "homepage": "https://github.com/abofs/stonyx-orm#readme",
63
63
  "dependencies": {
64
- "@stonyx/cron": "0.2.1-beta.29",
65
- "@stonyx/events": "0.1.1-beta.9",
66
- "stonyx": "0.2.3-beta.11"
64
+ "@stonyx/cron": "0.2.1-beta.48",
65
+ "@stonyx/events": "0.1.1-beta.47",
66
+ "stonyx": "0.2.3-beta.58"
67
67
  },
68
68
  "peerDependencies": {
69
69
  "@stonyx/rest-server": ">=0.2.1-beta.14",
@@ -82,18 +82,19 @@
82
82
  }
83
83
  },
84
84
  "devDependencies": {
85
- "@stonyx/rest-server": "0.2.1-beta.30",
86
- "@stonyx/utils": "0.2.3-beta.7",
85
+ "@stonyx/rest-server": "0.2.1-beta.48",
86
+ "@stonyx/utils": "0.2.3-beta.23",
87
87
  "@types/node": "^25.6.0",
88
88
  "mysql2": "^3.20.0",
89
89
  "pg": "^8.20.0",
90
90
  "qunit": "^2.24.1",
91
91
  "sinon": "^21.0.0",
92
+ "tsx": "^4.21.0",
92
93
  "typescript": "^5.8.3"
93
94
  },
94
95
  "scripts": {
95
96
  "build": "tsc",
96
97
  "build:test": "tsc -p tsconfig.test.json",
97
- "test": "npm run build && npm run build:test && stonyx test 'dist-test/test/**/*-test.js'"
98
+ "test": "pnpm build && NODE_ENV=test node --import tsx/esm --import ./test/setup.ts node_modules/qunit/bin/qunit.js 'test/**/*-test.ts'"
98
99
  }
99
100
  }
package/src/index.ts CHANGED
@@ -26,6 +26,7 @@ import { count, avg, sum, min, max } from './aggregates.js';
26
26
 
27
27
  export { default } from './main.js';
28
28
  export { store, relationships } from './main.js';
29
+ export type { PersistErrorDetail } from './main.js';
29
30
  export { Model, View, Serializer }; // base classes
30
31
  export { attr, belongsTo, hasMany, createRecord, updateRecord }; // helpers
31
32
  export { count, avg, sum, min, max }; // aggregate helpers
@@ -33,6 +34,11 @@ export { beforeHook, afterHook, clearHook, clearAllHooks } from './hooks.js'; //
33
34
 
34
35
  // Store API:
35
36
  // store.get(model, id) -- sync, memory-only
36
- // store.find(model, id) -- async, MySQL for memory:false models
37
+ // store.find(model, id) -- async, SQL for memory:false models
37
38
  // store.findAll(model) -- async, all records
38
- // store.query(model, conditions) -- async, always hits MySQL
39
+ // store.query(model, conditions) -- async, always hits SQL
40
+ //
41
+ // Data-layer auto-persist (memory + SQL persistence):
42
+ // createRecord(model, data) -- sync, auto-persists to SQL (fire-and-forget)
43
+ // updateRecord(record, data) -- sync, auto-persists to SQL (fire-and-forget)
44
+ // store.remove(model, id) -- sync, auto-persists delete to SQL (fire-and-forget)
package/src/main.ts CHANGED
@@ -49,6 +49,13 @@ const defaultOptions: OrmOptions = {
49
49
  dbType: 'json'
50
50
  }
51
51
 
52
+ export interface PersistErrorDetail {
53
+ operation: 'create' | 'update' | 'delete';
54
+ modelName: string;
55
+ recordId: unknown;
56
+ error: Error;
57
+ }
58
+
52
59
  export default class Orm {
53
60
  static initialized: boolean = false;
54
61
  static relationships: Map<string, Map<string, unknown>> = new Map();
@@ -65,6 +72,8 @@ export default class Orm {
65
72
  sqlDb?: SqlDb;
66
73
  db?: OrmDB | SqlDb;
67
74
 
75
+ private _persistErrorHandler: ((detail: PersistErrorDetail) => void) | null = null;
76
+
68
77
  constructor(options: OrmOptions = {}) {
69
78
  if (Orm.instance) return Orm.instance;
70
79
 
@@ -214,6 +223,32 @@ export default class Orm {
214
223
  return !!this.views[`${modelClassPrefix}View`];
215
224
  }
216
225
 
226
+ /**
227
+ * Register a callback to be invoked when a fire-and-forget SQL persist fails.
228
+ * Without a handler, persist errors are logged via log.error (backwards-compatible).
229
+ */
230
+ onPersistError(handler: ((detail: PersistErrorDetail) => void) | null): void {
231
+ this._persistErrorHandler = handler;
232
+ }
233
+
234
+ /**
235
+ * Emit a persist error to the registered handler, or fall back to log.error.
236
+ */
237
+ emitPersistError(detail: PersistErrorDetail): void {
238
+ const fallbackLog = () => log.error?.(`[ORM] Failed to persist ${detail.operation} for ${detail.modelName}:${String(detail.recordId)}: ${detail.error.message}`);
239
+
240
+ if (this._persistErrorHandler) {
241
+ try {
242
+ this._persistErrorHandler(detail);
243
+ } catch (handlerError) {
244
+ fallbackLog();
245
+ log.error?.(`[ORM] onPersistError handler threw: ${handlerError instanceof Error ? handlerError.message : String(handlerError)}`);
246
+ }
247
+ } else {
248
+ fallbackLog();
249
+ }
250
+ }
251
+
217
252
  // Queue warnings to avoid the same error from being logged in the same iteration
218
253
  warn(message: string): void {
219
254
  this.warnings.add(message);
@@ -9,6 +9,7 @@ interface CreateRecordOptions {
9
9
  serialize?: boolean;
10
10
  transform?: boolean;
11
11
  update?: boolean;
12
+ _skipAutoPersist?: boolean;
12
13
  [key: string]: unknown;
13
14
  }
14
15
 
@@ -25,6 +26,8 @@ const defaultOptions: CreateRecordOptions = {
25
26
  transform: true
26
27
  };
27
28
 
29
+ let pendingIdCounter = 0;
30
+
28
31
  export function createRecord(modelName: string, rawData: { [key: string]: unknown } = {}, userOptions: CreateRecordOptions = {}): OrmRecord {
29
32
  const orm = Orm.instance;
30
33
  const { initialized } = Orm;
@@ -111,6 +114,20 @@ export function createRecord(modelName: string, rawData: { [key: string]: unknow
111
114
  pendingBelongsTo.length = 0;
112
115
  }
113
116
 
117
+ // Auto-persist to SQL — skip for DB loads (isDbRecord) and relationship resolution (_relationshipKey)
118
+ const shouldPersist = orm?.sqlDb && !options.isDbRecord && !userOptions._relationshipKey && !options._skipAutoPersist;
119
+ if (shouldPersist) {
120
+ const response = { data: { id: record.id } };
121
+ orm!.sqlDb!.persist('create', modelName, { rawData }, response).catch((err: unknown) => {
122
+ orm!.emitPersistError({
123
+ operation: 'create',
124
+ modelName,
125
+ recordId: record.id,
126
+ error: err instanceof Error ? err : new Error(String(err)),
127
+ });
128
+ });
129
+ }
130
+
114
131
  return record;
115
132
  }
116
133
 
@@ -125,7 +142,24 @@ export function updateRecord(record: OrmRecord, rawData: unknown, userOptions: C
125
142
 
126
143
  const options = { ...defaultOptions, ...userOptions, update: true };
127
144
 
145
+ // Capture old state before update for SQL diff
146
+ const oldState = record.__data ? JSON.parse(JSON.stringify(record.__data)) : {};
147
+
128
148
  record.serialize(rawData, options);
149
+
150
+ // Auto-persist to SQL — skip for DB loads (isDbRecord) and relationship resolution (_relationshipKey)
151
+ const orm = Orm.instance;
152
+ const shouldPersist = orm?.sqlDb && !options.isDbRecord && !userOptions._relationshipKey && !options._skipAutoPersist;
153
+ if (shouldPersist && modelName) {
154
+ orm!.sqlDb!.persist('update', modelName, { record, oldState }, {}).catch((err: unknown) => {
155
+ orm!.emitPersistError({
156
+ operation: 'update',
157
+ modelName,
158
+ recordId: record.id,
159
+ error: err instanceof Error ? err : new Error(String(err)),
160
+ });
161
+ });
162
+ }
129
163
  }
130
164
 
131
165
  /**
@@ -137,9 +171,11 @@ export function updateRecord(record: OrmRecord, rawData: unknown, userOptions: C
137
171
  function assignRecordId(modelName: string, rawData: { [key: string]: unknown }): void {
138
172
  if (rawData.id) return;
139
173
 
140
- // In SQL mode with numeric IDs, defer to database auto-increment
174
+ // In SQL mode with numeric IDs, defer to database auto-increment.
175
+ // Use unique negative integers — they survive the number transform (parseInt preserves negatives)
176
+ // and avoid NaN store-key collisions that string pending IDs caused.
141
177
  if (Orm.instance?.sqlDb && !isStringIdModel(modelName)) {
142
- rawData.id = `__pending_${Date.now()}_${Math.random()}`;
178
+ rawData.id = -(++pendingIdCounter);
143
179
  rawData.__pendingSqlId = true;
144
180
  return;
145
181
  }
@@ -21,6 +21,7 @@ interface PersistContext {
21
21
  record?: OrmRecord;
22
22
  recordId?: unknown;
23
23
  oldState?: Record<string, unknown>;
24
+ rawData?: Record<string, unknown>;
24
25
  }
25
26
 
26
27
  interface PersistResponse {
@@ -420,8 +421,10 @@ export default class MysqlDB {
420
421
 
421
422
  const insertData = this._recordToRow(record, schema);
422
423
 
423
- // For auto-increment models, remove the pending ID
424
- const isPendingId = record.__data.__pendingSqlId;
424
+ // For auto-increment models, remove the pending ID.
425
+ // Check context.rawData (not record.__data) because __pendingSqlId is not a model
426
+ // attribute and gets lost during serialization.
427
+ const isPendingId = context.rawData?.__pendingSqlId === true;
425
428
 
426
429
  if (isPendingId) {
427
430
  delete insertData.id;
@@ -330,7 +330,7 @@ export default class OrmRequest extends Request {
330
330
  }
331
331
 
332
332
  const recordAttributes = id !== undefined ? { id, ...sanitizedAttributes } : sanitizedAttributes;
333
- const created = createRecord(model, recordAttributes as { [key: string]: unknown }, { serialize: false });
333
+ const created = createRecord(model, recordAttributes as { [key: string]: unknown }, { serialize: false, _skipAutoPersist: true });
334
334
  const record = isOrmRecord(created) ? created : null;
335
335
  if (!record) return 500;
336
336
 
@@ -368,7 +368,7 @@ export default class OrmRequest extends Request {
368
368
  }
369
369
  }
370
370
  if (Object.keys(relUpdates).length > 0) {
371
- updateRecord(record as never, relUpdates);
371
+ updateRecord(record as never, relUpdates, { _skipAutoPersist: true });
372
372
  }
373
373
  }
374
374
 
@@ -443,9 +443,9 @@ export default class OrmRequest extends Request {
443
443
  // Execute main handler
444
444
  const response = await handler(request, state);
445
445
 
446
- // Persist to SQL database for write operations
446
+ // Persist to SQL database for create/update (delete is handled by store.remove auto-persist)
447
447
  const sqlDb = Orm.instance.sqlDb;
448
- if (sqlDb && WRITE_OPERATIONS.has(operation)) {
448
+ if (sqlDb && (operation === 'create' || operation === 'update')) {
449
449
  await sqlDb.persist(operation, this.model, context, response);
450
450
  }
451
451
 
@@ -19,6 +19,7 @@ interface PersistContext {
19
19
  record?: OrmRecord;
20
20
  recordId?: unknown;
21
21
  oldState?: Record<string, unknown>;
22
+ rawData?: Record<string, unknown>;
22
23
  }
23
24
 
24
25
  interface PersistResponse {
@@ -477,7 +478,7 @@ export default class PostgresDB {
477
478
  }
478
479
  }
479
480
 
480
- private async _persistCreate(modelName: string, _context: PersistContext, response: PersistResponse): Promise<void> {
481
+ private async _persistCreate(modelName: string, context: PersistContext, response: PersistResponse): Promise<void> {
481
482
  const schemas = this.deps.introspectModels();
482
483
  const schema = schemas[modelName];
483
484
 
@@ -491,10 +492,12 @@ export default class PostgresDB {
491
492
 
492
493
  if (!record) return;
493
494
 
494
- const insertData = this._recordToRow(record, schema);
495
+ const insertData = this._recordToRow(record, schema, context.rawData);
495
496
 
496
- // For auto-increment models, remove the pending ID
497
- const isPendingId = record.__data.__pendingSqlId;
497
+ // For auto-increment models, remove the pending ID.
498
+ // Check context.rawData (not record.__data) because __pendingSqlId is not a model
499
+ // attribute and gets lost during serialization.
500
+ const isPendingId = context.rawData?.__pendingSqlId === true;
498
501
 
499
502
  if (isPendingId) {
500
503
  delete insertData.id;
@@ -549,7 +552,10 @@ export default class PostgresDB {
549
552
  // Check FK changes too
550
553
  for (const fkCol of Object.keys(schema.foreignKeys)) {
551
554
  const relName = fkCol.replace(/_id$/, '');
552
- const currentFkValue = (record.__relationships[relName] as { id: unknown } | undefined)?.id ?? null;
555
+ const relValue = record.__relationships[relName];
556
+ const currentFkValue = (relValue && typeof relValue === 'object' && relValue !== null)
557
+ ? (relValue as { id: unknown }).id ?? null
558
+ : relValue ?? record.__data[relName] ?? null;
553
559
  const oldFkValue = oldState[relName] ?? null;
554
560
 
555
561
  if (currentFkValue !== oldFkValue) {
@@ -579,7 +585,7 @@ export default class PostgresDB {
579
585
  await this.requirePool().query(sql, values);
580
586
  }
581
587
 
582
- private _recordToRow(record: OrmRecord, schema: ModelSchema): Record<string, unknown> {
588
+ private _recordToRow(record: OrmRecord, schema: ModelSchema, rawData?: Record<string, unknown>): Record<string, unknown> {
583
589
  const row: Record<string, unknown> = {};
584
590
  const data = record.__data;
585
591
 
@@ -603,11 +609,16 @@ export default class PostgresDB {
603
609
  const relName = fkCol.replace(/_id$/, '');
604
610
  const related = record.__relationships[relName];
605
611
 
606
- if (related) {
612
+ if (related && typeof related === 'object' && related !== null) {
607
613
  row[fkCol] = (related as { id: unknown }).id;
614
+ } else if (related != null) {
615
+ // Raw FK value (e.g., string ID stored directly in __relationships)
616
+ row[fkCol] = related;
608
617
  } else if (data[relName] !== undefined) {
609
- // Raw FK value (e.g., from create payload)
610
618
  row[fkCol] = data[relName];
619
+ } else if (rawData?.[relName] !== undefined) {
620
+ // Fallback to original create payload for unresolved belongsTo FKs
621
+ row[fkCol] = rawData[relName];
611
622
  }
612
623
  }
613
624
 
package/src/store.ts CHANGED
@@ -176,6 +176,18 @@ export default class Store {
176
176
  throw new Error(`Cannot remove records from read-only view '${key}'`);
177
177
  }
178
178
 
179
+ // Auto-persist delete to SQL
180
+ if (id && Orm.instance?.sqlDb) {
181
+ Orm.instance.sqlDb.persist('delete', key, { recordId: id }, {}).catch((err: unknown) => {
182
+ Orm.instance.emitPersistError({
183
+ operation: 'delete',
184
+ modelName: key,
185
+ recordId: id,
186
+ error: err instanceof Error ? err : new Error(String(err)),
187
+ });
188
+ });
189
+ }
190
+
179
191
  if (id) return this.unloadRecord(key, id);
180
192
 
181
193
  this.unloadAllRecords(key);