@stonyx/orm 0.3.2-beta.1 → 0.3.2-beta.100

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.
Files changed (51) hide show
  1. package/README.md +36 -2
  2. package/config/environment.js +8 -0
  3. package/dist/commands.js +34 -0
  4. package/dist/dynamodb/connection.d.ts +31 -0
  5. package/dist/dynamodb/connection.js +28 -0
  6. package/dist/dynamodb/dynamodb-db.d.ts +142 -0
  7. package/dist/dynamodb/dynamodb-db.js +596 -0
  8. package/dist/dynamodb/operation-builder.d.ts +76 -0
  9. package/dist/dynamodb/operation-builder.js +116 -0
  10. package/dist/dynamodb/type-map.d.ts +31 -0
  11. package/dist/dynamodb/type-map.js +48 -0
  12. package/dist/index.d.ts +1 -0
  13. package/dist/index.js +4 -4
  14. package/dist/main.d.ts +12 -12
  15. package/dist/main.js +28 -42
  16. package/dist/manage-record.d.ts +1 -0
  17. package/dist/manage-record.js +66 -4
  18. package/dist/mysql/connection.d.ts +1 -0
  19. package/dist/mysql/mysql-db.d.ts +9 -0
  20. package/dist/mysql/mysql-db.js +48 -12
  21. package/dist/orm-request.js +8 -7
  22. package/dist/postgres/connection.d.ts +1 -0
  23. package/dist/postgres/connection.js +8 -6
  24. package/dist/postgres/postgres-db.d.ts +9 -0
  25. package/dist/postgres/postgres-db.js +64 -18
  26. package/dist/record.js +7 -5
  27. package/dist/relationships.js +1 -1
  28. package/dist/serializer.js +38 -2
  29. package/dist/store.d.ts +13 -1
  30. package/dist/store.js +74 -3
  31. package/dist/types/orm-types.d.ts +11 -0
  32. package/package.json +17 -7
  33. package/src/commands.ts +43 -0
  34. package/src/dynamodb/connection.ts +50 -0
  35. package/src/dynamodb/dynamodb-db.ts +811 -0
  36. package/src/dynamodb/operation-builder.ts +202 -0
  37. package/src/dynamodb/type-map.ts +54 -0
  38. package/src/index.ts +5 -4
  39. package/src/main.ts +36 -50
  40. package/src/manage-record.ts +72 -4
  41. package/src/mysql/connection.ts +1 -0
  42. package/src/mysql/mysql-db.ts +49 -14
  43. package/src/orm-request.ts +9 -6
  44. package/src/postgres/connection.ts +10 -6
  45. package/src/postgres/postgres-db.ts +63 -20
  46. package/src/record.ts +8 -5
  47. package/src/relationships.ts +1 -1
  48. package/src/serializer.ts +39 -2
  49. package/src/store.ts +78 -3
  50. package/src/types/orm-types.ts +12 -0
  51. package/src/types/stonyx.d.ts +7 -1
@@ -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,13 +283,13 @@ 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?.() };
290
290
  };
291
291
  const deleteHandler = ({ params }) => {
292
- store.remove(model, getId(params));
292
+ store.remove(model, getId(params), { _skipAutoPersist: true });
293
293
  return 204;
294
294
  };
295
295
  // Wrap handlers with hooks
@@ -348,7 +348,11 @@ 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
+ // Set context.record for update BEFORE persist so SQL drivers can read it
352
+ if (operation === 'update' && response?.data) {
353
+ context.record = store.get(this.model, getId(request.params));
354
+ }
355
+ // Persist to SQL database for all write operations (create/update/delete)
352
356
  const sqlDb = Orm.instance.sqlDb;
353
357
  if (sqlDb && WRITE_OPERATIONS.has(operation)) {
354
358
  await sqlDb.persist(operation, this.model, context, response);
@@ -367,9 +371,6 @@ export default class OrmRequest extends Request {
367
371
  const recordId = isNaN(responseData.id) ? responseData.id : parseInt(responseData.id);
368
372
  context.record = store.get(this.model, recordId);
369
373
  }
370
- else if (operation === 'update' && response?.data) {
371
- context.record = store.get(this.model, getId(request.params));
372
- }
373
374
  else if (operation === 'delete') {
374
375
  // For delete, the record may no longer exist, but we have oldState
375
376
  context.recordId = getId(request.params);
@@ -6,6 +6,7 @@ interface PgConfig {
6
6
  password: string;
7
7
  database: string;
8
8
  connectionLimit: number;
9
+ [key: string]: unknown;
9
10
  }
10
11
  /**
11
12
  * Create or return the singleton pg Pool.
@@ -7,15 +7,17 @@ export async function getPool(pgConfig, extensions = ['vector']) {
7
7
  if (pool)
8
8
  return pool;
9
9
  const { default: pg } = await import('pg');
10
+ const { host, port, user, password, database, connectionLimit, migrationsDir, migrationsTable, autoMigrate, ...poolOpts } = pgConfig;
10
11
  pool = new pg.Pool({
11
- host: pgConfig.host,
12
- port: pgConfig.port,
13
- user: pgConfig.user,
14
- password: pgConfig.password,
15
- database: pgConfig.database,
16
- max: pgConfig.connectionLimit,
12
+ host,
13
+ port,
14
+ user,
15
+ password,
16
+ database,
17
+ max: connectionLimit,
17
18
  idleTimeoutMillis: 30000,
18
19
  connectionTimeoutMillis: 10000,
20
+ ...poolOpts,
19
21
  });
20
22
  // Enable requested PostgreSQL extensions
21
23
  for (const ext of extensions) {
@@ -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?: {
@@ -71,6 +72,14 @@ export default class PostgresDB {
71
72
  deps: PostgresDeps;
72
73
  pool: Pool | null;
73
74
  pgConfig: Record<string, unknown>;
75
+ /**
76
+ * Promise-chain mutex for write serialization (#156).
77
+ * All persist() calls chain through this single queue so concurrent
78
+ * fire-and-forget writes never produce parallel transactions
79
+ * on FK-linked rows (which cause deadlocks).
80
+ * Reads are NOT affected — only persist() serializes.
81
+ */
82
+ private _writeQueue;
74
83
  constructor(deps?: Partial<PostgresDeps>);
75
84
  protected requirePool(): Pool;
76
85
  init(): Promise<void>;
@@ -30,6 +30,14 @@ export default class PostgresDB {
30
30
  deps;
31
31
  pool;
32
32
  pgConfig;
33
+ /**
34
+ * Promise-chain mutex for write serialization (#156).
35
+ * All persist() calls chain through this single queue so concurrent
36
+ * fire-and-forget writes never produce parallel transactions
37
+ * on FK-linked rows (which cause deadlocks).
38
+ * Reads are NOT affected — only persist() serializes.
39
+ */
40
+ _writeQueue = Promise.resolve();
33
41
  constructor(deps = {}) {
34
42
  const Ctor = this.constructor;
35
43
  if (Ctor.instance)
@@ -57,7 +65,17 @@ export default class PostgresDB {
57
65
  const pending = files.filter(f => !applied.includes(f));
58
66
  if (pending.length > 0) {
59
67
  this.deps.log.db?.(`${pending.length} pending migration(s) found.`);
60
- const shouldApply = await this.deps.confirm(`${pending.length} pending migration(s) found. Apply now?`);
68
+ let shouldApply;
69
+ if (this.pgConfig.autoMigrate === true) {
70
+ shouldApply = true;
71
+ }
72
+ else if (this.pgConfig.autoMigrate === false) {
73
+ shouldApply = false;
74
+ this.deps.log.warn?.(`autoMigrate is false — skipping ${pending.length} pending migration(s).`);
75
+ }
76
+ else {
77
+ shouldApply = await this.deps.confirm(`${pending.length} pending migration(s) found. Apply now?`);
78
+ }
61
79
  if (shouldApply) {
62
80
  for (const filename of pending) {
63
81
  const content = await this.deps.readFile(this.deps.path.join(migrationsPath, filename));
@@ -76,7 +94,17 @@ export default class PostgresDB {
76
94
  const schemas = this.deps.introspectModels();
77
95
  const modelCount = Object.keys(schemas).length;
78
96
  if (modelCount > 0) {
79
- const shouldGenerate = await this.deps.confirm(`No migrations found but ${modelCount} model(s) detected. Generate and apply initial migration?`);
97
+ let shouldGenerate;
98
+ if (this.pgConfig.autoMigrate === true) {
99
+ shouldGenerate = true;
100
+ }
101
+ else if (this.pgConfig.autoMigrate === false) {
102
+ shouldGenerate = false;
103
+ this.deps.log.warn?.(`autoMigrate is false — skipping initial migration generation for ${modelCount} model(s).`);
104
+ }
105
+ else {
106
+ shouldGenerate = await this.deps.confirm(`No migrations found but ${modelCount} model(s) detected. Generate and apply initial migration?`);
107
+ }
80
108
  if (shouldGenerate) {
81
109
  const { generateMigration } = await import('./migration-generator.js');
82
110
  const result = await generateMigration('initial_setup');
@@ -356,16 +384,22 @@ export default class PostgresDB {
356
384
  const Orm = (await import('@stonyx/orm')).default;
357
385
  if (Orm.instance?.isView?.(modelName))
358
386
  return;
359
- switch (operation) {
360
- case 'create':
361
- return this._persistCreate(modelName, context, response);
362
- case 'update':
363
- return this._persistUpdate(modelName, context, response);
364
- case 'delete':
365
- return this._persistDelete(modelName, context);
366
- }
387
+ const work = async () => {
388
+ switch (operation) {
389
+ case 'create':
390
+ return this._persistCreate(modelName, context, response);
391
+ case 'update':
392
+ return this._persistUpdate(modelName, context, response);
393
+ case 'delete':
394
+ return this._persistDelete(modelName, context);
395
+ }
396
+ };
397
+ // Chain through the write queue — .then(work, work) ensures the queue
398
+ // advances even when a previous persist rejects (#156).
399
+ this._writeQueue = this._writeQueue.then(work, work);
400
+ return this._writeQueue;
367
401
  }
368
- async _persistCreate(modelName, _context, response) {
402
+ async _persistCreate(modelName, context, response) {
369
403
  const schemas = this.deps.introspectModels();
370
404
  const schema = schemas[modelName];
371
405
  if (!schema)
@@ -375,9 +409,11 @@ export default class PostgresDB {
375
409
  const record = recordId != null ? storeRef.get(modelName, isNaN(recordId) ? recordId : parseInt(recordId)) : null;
376
410
  if (!record)
377
411
  return;
378
- const insertData = this._recordToRow(record, schema);
379
- // For auto-increment models, remove the pending ID
380
- const isPendingId = record.__data.__pendingSqlId;
412
+ const insertData = this._recordToRow(record, schema, context.rawData);
413
+ // For auto-increment models, remove the pending ID.
414
+ // Check context.rawData (not record.__data) because __pendingSqlId is not a model
415
+ // attribute and gets lost during serialization.
416
+ const isPendingId = context.rawData?.__pendingSqlId === true;
381
417
  if (isPendingId) {
382
418
  delete insertData.id;
383
419
  }
@@ -420,7 +456,10 @@ export default class PostgresDB {
420
456
  // Check FK changes too
421
457
  for (const fkCol of Object.keys(schema.foreignKeys)) {
422
458
  const relName = fkCol.replace(/_id$/, '');
423
- const currentFkValue = record.__relationships[relName]?.id ?? null;
459
+ const relValue = record.__relationships[relName];
460
+ const currentFkValue = (relValue && typeof relValue === 'object' && relValue !== null)
461
+ ? relValue.id ?? null
462
+ : relValue ?? record.__data[relName] ?? null;
424
463
  const oldFkValue = oldState[relName] ?? null;
425
464
  if (currentFkValue !== oldFkValue) {
426
465
  changedData[fkCol] = currentFkValue;
@@ -444,7 +483,7 @@ export default class PostgresDB {
444
483
  const { sql, values } = this.deps.buildDelete(schema.table, id);
445
484
  await this.requirePool().query(sql, values);
446
485
  }
447
- _recordToRow(record, schema) {
486
+ _recordToRow(record, schema, rawData) {
448
487
  const row = {};
449
488
  const data = record.__data;
450
489
  // ID
@@ -464,13 +503,20 @@ export default class PostgresDB {
464
503
  for (const fkCol of Object.keys(schema.foreignKeys)) {
465
504
  const relName = fkCol.replace(/_id$/, '');
466
505
  const related = record.__relationships[relName];
467
- if (related) {
506
+ if (related && typeof related === 'object' && related !== null) {
468
507
  row[fkCol] = related.id;
469
508
  }
509
+ else if (related != null) {
510
+ // Raw FK value (e.g., string ID stored directly in __relationships)
511
+ row[fkCol] = related;
512
+ }
470
513
  else if (data[relName] !== undefined) {
471
- // Raw FK value (e.g., from create payload)
472
514
  row[fkCol] = data[relName];
473
515
  }
516
+ else if (rawData?.[relName] !== undefined) {
517
+ // Fallback to original create payload for unresolved belongsTo FKs
518
+ row[fkCol] = rawData[relName];
519
+ }
474
520
  }
475
521
  return row;
476
522
  }
package/dist/record.js CHANGED
@@ -40,11 +40,13 @@ export default class Record {
40
40
  const records = {};
41
41
  for (const [key, childRecord] of Object.entries(this.__relationships)) {
42
42
  if (Array.isArray(childRecord)) {
43
+ // Filter out cleaned records (those with no __model)
44
+ const live = childRecord.filter((r) => r?.__model);
43
45
  // Deduplicate by record ID — keep last occurrence (latest data wins)
44
46
  const seen = new Set();
45
47
  const unique = [];
46
- for (let i = childRecord.length - 1; i >= 0; i--) {
47
- const r = childRecord[i];
48
+ for (let i = live.length - 1; i >= 0; i--) {
49
+ const r = live[i];
48
50
  if (!seen.has(r.id)) {
49
51
  seen.add(r.id);
50
52
  unique.push(r);
@@ -54,7 +56,7 @@ export default class Record {
54
56
  records[key] = unique.map((r) => r.serialize());
55
57
  }
56
58
  else {
57
- records[key] = childRecord?.serialize() ?? null;
59
+ records[key] = childRecord?.__model ? childRecord.serialize() : null;
58
60
  }
59
61
  }
60
62
  return { ...data, ...records };
@@ -86,8 +88,8 @@ export default class Record {
86
88
  if (fields && !fields.has(key))
87
89
  continue;
88
90
  const relationshipData = Array.isArray(childRecord)
89
- ? childRecord.map((r) => ({ type: r.__model.__name, id: r.id }))
90
- : childRecord ? { type: childRecord.__model.__name, id: childRecord.id } : null;
91
+ ? childRecord.filter((r) => r?.__model).map((r) => ({ type: r.__model.__name, id: r.id }))
92
+ : (childRecord && childRecord.__model) ? { type: childRecord.__model.__name, id: childRecord.id } : null;
91
93
  // Dasherize the key for URL paths (e.g., accessLinks -> access-links)
92
94
  const dasherizedKey = camelCaseToKebabCase(key);
93
95
  relationships[dasherizedKey] = { data: relationshipData };
@@ -38,4 +38,4 @@ export function getPendingRegistry() {
38
38
  export function getPendingBelongsToRegistry() {
39
39
  return relationships.get('pendingBelongsTo');
40
40
  }
41
- export const TYPES = ['global', 'hasMany', 'belongsTo', 'pending'];
41
+ export const TYPES = ['global', 'hasMany', 'belongsTo', 'pending', 'pendingBelongsTo'];
@@ -79,8 +79,44 @@ export default class Serializer {
79
79
  // Pass relationship key name to handler for pending fulfillment
80
80
  const handlerOptions = { ...options, _relationshipKey: key };
81
81
  const childRecord = handler(record, data, handlerOptions);
82
- rec[key] = childRecord;
83
- relatedRecords[key] = childRecord;
82
+ // hasMany relationships use a getter so format()/toJSON() always read
83
+ // the live registry array instead of a stale snapshot captured at
84
+ // serialization time. This is critical when child records are created
85
+ // in a later async frame — the belongsTo inverse wiring pushes into
86
+ // the shared registry array, and the getter ensures the parent sees it.
87
+ const isHasMany = handler.__relationshipType === 'hasMany';
88
+ if (isHasMany) {
89
+ // `childRecord` IS the shared registry array — define a getter that
90
+ // always dereferences through the same array reference.
91
+ const registryArray = childRecord;
92
+ Object.defineProperty(rec, key, {
93
+ enumerable: true,
94
+ configurable: true,
95
+ get: () => registryArray,
96
+ set(v) { relatedRecords[key] = v; }
97
+ });
98
+ Object.defineProperty(relatedRecords, key, {
99
+ enumerable: true,
100
+ configurable: true,
101
+ get: () => registryArray,
102
+ set(v) { Object.defineProperty(relatedRecords, key, { value: v, writable: true, enumerable: true, configurable: true }); }
103
+ });
104
+ }
105
+ else {
106
+ rec[key] = childRecord;
107
+ relatedRecords[key] = childRecord;
108
+ // Preserve the raw FK value in __data when the belongsTo handler
109
+ // couldn't resolve the target (e.g., memory:false model not loaded).
110
+ // This allows adapters to read the FK from __data as a fallback
111
+ // when __relationships[key] is null. Only store when `data` is a
112
+ // truthy non-object — i.e., a raw FK string/number that the handler
113
+ // attempted but failed to resolve. When `data` is null/undefined
114
+ // (optional empty relationship) we intentionally skip to preserve
115
+ // the existing behavior of not populating __data for empty FKs.
116
+ if (childRecord === null && data && typeof data !== 'object') {
117
+ parsedData[key] = data;
118
+ }
119
+ }
84
120
  continue;
85
121
  }
86
122
  // Aggregate property handling — use the rawData value, not the aggregate descriptor
package/dist/store.d.ts CHANGED
@@ -45,7 +45,19 @@ export default class Store {
45
45
  */
46
46
  private _isMemoryModel;
47
47
  set(key: string, value: Map<number | string, unknown>): void;
48
- remove(key: string, id?: number | string): void;
48
+ remove(key: string, id?: number | string, options?: {
49
+ _skipAutoPersist?: boolean;
50
+ }): void;
51
+ /**
52
+ * Evict a record from the store with full relationship registry cleanup,
53
+ * WITHOUT calling record.clean(). This preserves the caller's reference
54
+ * to the returned record (used by memory:false post-persist eviction).
55
+ *
56
+ * @param registryId - The ID used when the record's relationships were
57
+ * registered. For SQL models with pending IDs, this is the original
58
+ * negative pending ID (before the adapter re-keyed to the real DB ID).
59
+ */
60
+ evictRecord(modelName: string, id: unknown, registryId?: unknown): void;
49
61
  unloadRecord(model: string, id: unknown, options?: UnloadOptions): void;
50
62
  unloadAllRecords(model: string, options?: UnloadOptions): void;
51
63
  private _removeFromHasManyArrays;
package/dist/store.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import Orm, { relationships } from '@stonyx/orm';
2
- import { TYPES, getHasManyRegistry, getBelongsToRegistry, getPendingRegistry } from './relationships.js';
2
+ import { TYPES, getHasManyRegistry, getBelongsToRegistry, getPendingRegistry, getPendingBelongsToRegistry } from './relationships.js';
3
3
  import ViewResolver from './view-resolver.js';
4
4
  function isStoreRecord(value) {
5
5
  return typeof value === 'object' && value !== null && '__data' in value;
@@ -22,7 +22,7 @@ export default class Store {
22
22
  this.data = new Map();
23
23
  }
24
24
  get(key, id) {
25
- if (!id)
25
+ if (id === undefined)
26
26
  return this.data.get(key);
27
27
  return this.data.get(key)?.get(id);
28
28
  }
@@ -107,15 +107,61 @@ export default class Store {
107
107
  set(key, value) {
108
108
  this.data.set(key, value);
109
109
  }
110
- remove(key, id) {
110
+ remove(key, id, options) {
111
111
  // Guard: read-only views cannot have records removed
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 (fire-and-forget) — skipped when the
116
+ // request path handles persist itself to avoid double-delete.
117
+ if (id && Orm.instance?.sqlDb && !options?._skipAutoPersist) {
118
+ Orm.instance.sqlDb.persist('delete', key, { recordId: id }, {}).catch((err) => {
119
+ Orm.instance.emitPersistError({
120
+ operation: 'delete',
121
+ modelName: key,
122
+ recordId: id,
123
+ error: err instanceof Error ? err : new Error(String(err)),
124
+ });
125
+ });
126
+ }
115
127
  if (id)
116
128
  return this.unloadRecord(key, id);
117
129
  this.unloadAllRecords(key);
118
130
  }
131
+ /**
132
+ * Evict a record from the store with full relationship registry cleanup,
133
+ * WITHOUT calling record.clean(). This preserves the caller's reference
134
+ * to the returned record (used by memory:false post-persist eviction).
135
+ *
136
+ * @param registryId - The ID used when the record's relationships were
137
+ * registered. For SQL models with pending IDs, this is the original
138
+ * negative pending ID (before the adapter re-keyed to the real DB ID).
139
+ */
140
+ evictRecord(modelName, id, registryId) {
141
+ const modelStore = this.data.get(modelName);
142
+ if (!modelStore)
143
+ return;
144
+ if (typeof id !== 'string' && typeof id !== 'number')
145
+ return;
146
+ const raw = modelStore.get(id);
147
+ if (!raw || !isStoreRecord(raw))
148
+ return;
149
+ const visited = new Set([`${modelName}:${id}`]);
150
+ // Remove from hasMany arrays and nullify belongsTo references using current ID
151
+ // (the adapter updates record.id, so value-based matches need the current ID)
152
+ this._removeFromHasManyArrays(modelName, id, visited);
153
+ this._nullifyBelongsToReferences(modelName, id, visited);
154
+ // Clean up relationship registry entries using the registry key
155
+ // (belongsTo/hasMany registries were keyed by the ID at registration time,
156
+ // which may differ from the current ID if SQL persist re-keyed the record)
157
+ const cleanupId = registryId ?? id;
158
+ this._cleanupRelationshipRegistries(modelName, cleanupId);
159
+ // If registryId differs from id, also clean with current id as safety net
160
+ if (registryId !== undefined && registryId !== id) {
161
+ this._cleanupRelationshipRegistries(modelName, id);
162
+ }
163
+ modelStore.delete(id);
164
+ }
119
165
  unloadRecord(model, id, options = {}) {
120
166
  const modelStore = this.data.get(model);
121
167
  if (!modelStore) {
@@ -219,6 +265,31 @@ export default class Store {
219
265
  const pendingMap = getPendingRegistry().get(modelName);
220
266
  if (pendingMap)
221
267
  pendingMap.delete(recordId);
268
+ // Clean pendingBelongsTo entries in both directions
269
+ const pendingBelongsToMap = getPendingBelongsToRegistry();
270
+ if (pendingBelongsToMap) {
271
+ // Direction 1: evicted record was the TARGET others were waiting for
272
+ const targetEntries = pendingBelongsToMap.get(modelName);
273
+ if (targetEntries)
274
+ targetEntries.delete(recordId);
275
+ // Direction 2: evicted record was the SOURCE with unresolved forward-references
276
+ for (const [, targetIdMap] of pendingBelongsToMap) {
277
+ for (const [targetId, entries] of targetIdMap) {
278
+ if (!Array.isArray(entries))
279
+ continue;
280
+ const filtered = entries.filter((e) => {
281
+ const entry = e;
282
+ return !(entry.sourceModelName === modelName && entry.relationshipId === recordId);
283
+ });
284
+ if (filtered.length === 0) {
285
+ targetIdMap.delete(targetId);
286
+ }
287
+ else if (filtered.length < entries.length) {
288
+ targetIdMap.set(targetId, filtered);
289
+ }
290
+ }
291
+ }
292
+ }
222
293
  }
223
294
  /**
224
295
  * Extracts hasMany and non-bidirectional belongsTo children from a record
@@ -16,6 +16,7 @@ export interface OrmMysqlConfig {
16
16
  connectionLimit?: number;
17
17
  migrationsDir?: string;
18
18
  migrationsTable?: string;
19
+ autoMigrate?: boolean;
19
20
  [key: string]: unknown;
20
21
  }
21
22
  export interface OrmPostgresConfig {
@@ -27,6 +28,7 @@ export interface OrmPostgresConfig {
27
28
  connectionLimit?: number;
28
29
  migrationsDir?: string;
29
30
  migrationsTable?: string;
31
+ autoMigrate?: boolean;
30
32
  [key: string]: unknown;
31
33
  }
32
34
  export interface OrmPaths {
@@ -42,6 +44,12 @@ export interface OrmRestServerConfig {
42
44
  route: string;
43
45
  metaRoute: boolean;
44
46
  }
47
+ export interface OrmDynamoDBConfig {
48
+ region?: string;
49
+ endpoint?: string;
50
+ tablePrefix?: string;
51
+ [key: string]: unknown;
52
+ }
45
53
  export interface OrmSection {
46
54
  db: OrmDbConfig;
47
55
  paths: OrmPaths;
@@ -49,6 +57,9 @@ export interface OrmSection {
49
57
  mysql?: OrmMysqlConfig;
50
58
  postgres?: OrmPostgresConfig;
51
59
  timescale?: OrmPostgresConfig;
60
+ dynamodb?: OrmDynamoDBConfig;
61
+ logColor?: string;
62
+ logMethod?: string;
52
63
  [key: string]: unknown;
53
64
  }
54
65
  export interface OrmConfig {
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "stonyx-async",
5
5
  "stonyx-module"
6
6
  ],
7
- "version": "0.3.2-beta.1",
7
+ "version": "0.3.2-beta.100",
8
8
  "description": "",
9
9
  "main": "dist/index.js",
10
10
  "type": "module",
@@ -61,16 +61,25 @@
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.72",
65
+ "@stonyx/events": "0.1.1-beta.52",
66
+ "@stonyx/utils": "0.2.3-beta.26",
67
+ "stonyx": "0.2.3-beta.69"
67
68
  },
68
69
  "peerDependencies": {
70
+ "@aws-sdk/client-dynamodb": "^3.0.0",
71
+ "@aws-sdk/lib-dynamodb": "^3.0.0",
69
72
  "@stonyx/rest-server": ">=0.2.1-beta.14",
70
73
  "mysql2": "^3.0.0",
71
74
  "pg": "^8.0.0"
72
75
  },
73
76
  "peerDependenciesMeta": {
77
+ "@aws-sdk/client-dynamodb": {
78
+ "optional": true
79
+ },
80
+ "@aws-sdk/lib-dynamodb": {
81
+ "optional": true
82
+ },
74
83
  "mysql2": {
75
84
  "optional": true
76
85
  },
@@ -82,18 +91,19 @@
82
91
  }
83
92
  },
84
93
  "devDependencies": {
85
- "@stonyx/rest-server": "0.2.1-beta.30",
86
- "@stonyx/utils": "0.2.3-beta.7",
94
+ "@stonyx/rest-server": "0.2.1-beta.73",
87
95
  "@types/node": "^25.6.0",
88
96
  "mysql2": "^3.20.0",
89
97
  "pg": "^8.20.0",
90
98
  "qunit": "^2.24.1",
91
99
  "sinon": "^21.0.0",
100
+ "tsx": "^4.21.0",
92
101
  "typescript": "^5.8.3"
93
102
  },
94
103
  "scripts": {
95
104
  "build": "tsc",
96
105
  "build:test": "tsc -p tsconfig.test.json",
97
- "test": "npm run build && npm run build:test && stonyx test 'dist-test/test/**/*-test.js'"
106
+ "test": "pnpm build && NODE_ENV=test node --import tsx/esm --import ./test/setup.ts node_modules/qunit/bin/qunit.js 'test/**/*-test.ts'",
107
+ "test:dynamodb": "pnpm build && node --import tsx/esm --import ./test/integration/dynamodb/setup.ts node_modules/qunit/bin/qunit.js 'test/integration/dynamodb/**/*-test.ts'"
98
108
  }
99
109
  }
package/src/commands.ts CHANGED
@@ -28,6 +28,13 @@ const commands: Record<string, Command> = {
28
28
  description: 'Generate a MySQL migration from current model schemas',
29
29
  bootstrap: true,
30
30
  run: async (args) => {
31
+ const config = (await import('stonyx/config')).default;
32
+
33
+ if (config.orm.dynamodb) {
34
+ console.log('DynamoDB does not use file-based migrations. Use db:sync to provision tables.');
35
+ return;
36
+ }
37
+
31
38
  const description = args?.join(' ') || 'migration';
32
39
  const { generateMigration } = await import('./mysql/migration-generator.js');
33
40
  const result = await generateMigration(description);
@@ -39,6 +46,25 @@ const commands: Record<string, Command> = {
39
46
  }
40
47
  }
41
48
  },
49
+ 'db:sync': {
50
+ description: 'Provision DynamoDB tables and GSIs from current model schemas',
51
+ bootstrap: true,
52
+ run: async () => {
53
+ const config = (await import('stonyx/config')).default;
54
+
55
+ if (!config.orm.dynamodb) {
56
+ console.error('DynamoDB is not configured. Set DYNAMODB_REGION (and optionally DYNAMODB_ENDPOINT) to enable DynamoDB mode.');
57
+ process.exit(1);
58
+ }
59
+
60
+ const { default: DynamoDBDB } = await import('./dynamodb/dynamodb-db.js');
61
+ const db = new DynamoDBDB();
62
+ await db.init();
63
+ await db.startup();
64
+ await db.shutdown();
65
+ console.log('DynamoDB tables synced successfully.');
66
+ }
67
+ },
42
68
  'db:migrate': {
43
69
  description: 'Apply pending MySQL migrations',
44
70
  bootstrap: true,
@@ -46,6 +72,11 @@ const commands: Record<string, Command> = {
46
72
  const config = (await import('stonyx/config')).default;
47
73
  const mysqlConfig = config.orm.mysql;
48
74
 
75
+ if (config.orm.dynamodb) {
76
+ console.log('DynamoDB does not use file-based migrations. Use db:sync to provision tables.');
77
+ return;
78
+ }
79
+
49
80
  if (!mysqlConfig) {
50
81
  console.error('MySQL is not configured. Set MYSQL_HOST to enable MySQL mode.');
51
82
  process.exit(1);
@@ -92,6 +123,12 @@ const commands: Record<string, Command> = {
92
123
  bootstrap: true,
93
124
  run: async () => {
94
125
  const config = (await import('stonyx/config')).default;
126
+
127
+ if (config.orm.dynamodb) {
128
+ console.log('DynamoDB does not support migration rollback. Manage table changes via the AWS console or db:sync.');
129
+ return;
130
+ }
131
+
95
132
  const mysqlConfig = config.orm.mysql;
96
133
 
97
134
  if (!mysqlConfig) {
@@ -138,6 +175,12 @@ const commands: Record<string, Command> = {
138
175
  bootstrap: true,
139
176
  run: async () => {
140
177
  const config = (await import('stonyx/config')).default;
178
+
179
+ if (config.orm.dynamodb) {
180
+ console.log('DynamoDB does not use file-based migrations. Use db:sync to provision tables.');
181
+ return;
182
+ }
183
+
141
184
  const mysqlConfig = config.orm.mysql;
142
185
 
143
186
  if (!mysqlConfig) {