@guren/orm 1.0.0-rc.11 → 1.0.0-rc.13

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.
package/dist/index.d.ts CHANGED
@@ -1410,64 +1410,79 @@ declare const DrizzleAdapter: ORMAdapterAdvanced & {
1410
1410
  declare function buildDrizzleConditions(table: unknown, conditions: WhereCondition[]): SQL | undefined;
1411
1411
 
1412
1412
  type ConnectionResolver$2 = string | (() => string | undefined);
1413
- interface PostgresDatabaseOptions<TSchema extends Record<string, unknown>> {
1414
- schema: TSchema;
1413
+ interface PostgresDatabaseOptions {
1415
1414
  migrationsFolder: string | URL;
1416
1415
  connectionString?: ConnectionResolver$2;
1417
1416
  clientOptions?: postgres.Options<Record<string, never>>;
1418
1417
  seedersFolder?: string | URL;
1418
+ /**
1419
+ * Drizzle relations for RQB v2 (`db.query.*`).
1420
+ * Build with `defineRelations(schema, ...)` from `drizzle-orm`,
1421
+ * or with `relations()` from `drizzle-orm/_relations` for the RQB v1 partial-upgrade path.
1422
+ */
1423
+ relations?: Record<string, unknown>;
1419
1424
  }
1420
- interface PostgresDatabase<TSchema extends Record<string, unknown>> {
1421
- getDatabase(): Promise<PostgresJsDatabase<TSchema>>;
1425
+ interface PostgresDatabase {
1426
+ getDatabase(): Promise<PostgresJsDatabase>;
1422
1427
  migrateDatabase(): Promise<void>;
1423
1428
  closeDatabase(): Promise<void>;
1424
1429
  configureOrm(): Promise<void>;
1425
1430
  seedDatabase(): Promise<void>;
1426
1431
  }
1427
- declare function createPostgresDatabase<TSchema extends Record<string, unknown>>(options: PostgresDatabaseOptions<TSchema>): PostgresDatabase<TSchema>;
1432
+ declare function createPostgresDatabase(options: PostgresDatabaseOptions): PostgresDatabase;
1428
1433
 
1429
1434
  type ConnectionResolver$1 = string | (() => string | undefined);
1430
1435
  type MySqlConnectionOptions = Record<string, unknown>;
1431
- interface MySqlDatabaseOptions<TSchema extends Record<string, unknown>> {
1432
- schema: TSchema;
1436
+ interface MySqlDatabaseOptions {
1433
1437
  migrationsFolder: string | URL;
1434
1438
  connectionString?: ConnectionResolver$1;
1435
1439
  clientOptions?: MySqlConnectionOptions;
1436
1440
  seedersFolder?: string | URL;
1441
+ /**
1442
+ * Drizzle relations for RQB v2 (`db.query.*`).
1443
+ * Build with `defineRelations(schema, ...)` from `drizzle-orm`,
1444
+ * or with `relations()` from `drizzle-orm/_relations` for the RQB v1 partial-upgrade path.
1445
+ */
1446
+ relations?: Record<string, unknown>;
1437
1447
  }
1438
- interface MySqlDatabase<TSchema extends Record<string, unknown>> {
1439
- getDatabase(): Promise<MySql2Database<TSchema>>;
1448
+ interface MySqlDatabase {
1449
+ getDatabase(): Promise<MySql2Database>;
1440
1450
  migrateDatabase(): Promise<void>;
1441
1451
  closeDatabase(): Promise<void>;
1442
1452
  configureOrm(): Promise<void>;
1443
1453
  seedDatabase(): Promise<void>;
1444
1454
  }
1445
- declare function createMySqlDatabase<TSchema extends Record<string, unknown>>(options: MySqlDatabaseOptions<TSchema>): MySqlDatabase<TSchema>;
1455
+ declare function createMySqlDatabase(options: MySqlDatabaseOptions): MySqlDatabase;
1446
1456
 
1447
1457
  type ConnectionResolver = string | (() => string | undefined);
1448
- interface SqliteDatabaseOptions<TSchema extends Record<string, unknown>> {
1449
- schema: TSchema;
1458
+ interface SqliteDatabaseOptions {
1450
1459
  migrationsFolder: string | URL;
1451
1460
  /** Path to the SQLite database file. Defaults to `./data/guren.db`. */
1452
1461
  filename?: ConnectionResolver;
1453
1462
  seedersFolder?: string | URL;
1463
+ /**
1464
+ * Drizzle relations for RQB v2 (`db.query.*`).
1465
+ * Build with `defineRelations(schema, ...)` from `drizzle-orm`,
1466
+ * or with `relations()` from `drizzle-orm/_relations` for the RQB v1 partial-upgrade path.
1467
+ */
1468
+ relations?: Record<string, unknown>;
1454
1469
  }
1455
- interface SqliteDatabase<TSchema extends Record<string, unknown>> {
1470
+ interface SqliteDatabase {
1456
1471
  getDatabase(): Promise<unknown>;
1457
1472
  migrateDatabase(): Promise<void>;
1458
1473
  closeDatabase(): Promise<void>;
1459
1474
  configureOrm(): Promise<void>;
1460
1475
  seedDatabase(): Promise<void>;
1461
1476
  }
1462
- declare function createSqliteDatabase<TSchema extends Record<string, unknown>>(options: SqliteDatabaseOptions<TSchema>): SqliteDatabase<TSchema>;
1477
+ declare function createSqliteDatabase(options: SqliteDatabaseOptions): SqliteDatabase;
1463
1478
 
1464
- interface SeederContext<TSchema extends Record<string, unknown>> {
1465
- db: PostgresJsDatabase<TSchema>;
1479
+ interface SeederContext {
1480
+ db: PostgresJsDatabase;
1466
1481
  }
1467
- type SeederHandler<TSchema extends Record<string, unknown>> = (context: SeederContext<TSchema>) => unknown;
1468
- declare function loadSeeders<TSchema extends Record<string, unknown>>(directory: string | URL): Promise<Array<SeederHandler<TSchema>>>;
1469
- declare function runSeeders<TSchema extends Record<string, unknown>>(db: PostgresJsDatabase<TSchema>, directory: string | URL): Promise<void>;
1470
- declare function defineSeeder<TSchema extends Record<string, unknown>>(handler: SeederHandler<TSchema>): SeederHandler<TSchema>;
1482
+ type SeederHandler = (context: SeederContext) => unknown;
1483
+ declare function loadSeeders(directory: string | URL): Promise<Array<SeederHandler>>;
1484
+ declare function runSeeders(db: PostgresJsDatabase, directory: string | URL): Promise<void>;
1485
+ declare function defineSeeder(handler: SeederHandler): SeederHandler;
1471
1486
 
1472
1487
  /**
1473
1488
  * Serialize a model record for API/JSON output.
package/dist/index.js CHANGED
@@ -204,6 +204,16 @@ async function resolveMutation(result) {
204
204
  function isPromiseLike(value) {
205
205
  return typeof value === "object" && value !== null && "then" in value && typeof value.then === "function";
206
206
  }
207
+ async function resolveWithReturning(query) {
208
+ if (query && typeof query === "object" && "returning" in query && typeof query.returning === "function") {
209
+ const rows = await query.returning();
210
+ return {
211
+ usedReturning: true,
212
+ row: Array.isArray(rows) ? rows[0] : rows
213
+ };
214
+ }
215
+ return { usedReturning: false, row: void 0 };
216
+ }
207
217
  var DrizzleAdapter = {
208
218
  configure(db) {
209
219
  database = db;
@@ -268,7 +278,10 @@ var DrizzleAdapter = {
268
278
  },
269
279
  async create(table, data, writeOptions) {
270
280
  const db = resolveExecutor(writeOptions);
271
- const result = await resolveMutation(db.insert(table).values(data));
281
+ const query = db.insert(table).values(data);
282
+ const { usedReturning, row } = await resolveWithReturning(query);
283
+ if (usedReturning) return row;
284
+ const result = await resolveMutation(query);
272
285
  return result;
273
286
  },
274
287
  async update(table, where, data, writeOptions) {
@@ -277,8 +290,10 @@ var DrizzleAdapter = {
277
290
  throw new Error("DrizzleAdapter: configured database does not support updates.");
278
291
  }
279
292
  const clause = resolveWhere(table, where);
280
- const query = db.update(table).set(data);
281
- const result = await resolveMutation(clause ? query.where(clause) : query);
293
+ const finalQuery = clause ? db.update(table).set(data).where(clause) : db.update(table).set(data);
294
+ const { usedReturning, row } = await resolveWithReturning(finalQuery);
295
+ if (usedReturning) return row;
296
+ const result = await resolveMutation(finalQuery);
282
297
  return result;
283
298
  },
284
299
  async delete(table, where, writeOptions) {
@@ -287,8 +302,10 @@ var DrizzleAdapter = {
287
302
  throw new Error("DrizzleAdapter: configured database does not support deletes.");
288
303
  }
289
304
  const clause = resolveWhere(table, where);
290
- const query = db.delete(table);
291
- const result = await resolveMutation(clause ? query.where(clause) : query);
305
+ const finalQuery = clause ? db.delete(table).where(clause) : db.delete(table);
306
+ const { usedReturning, row } = await resolveWithReturning(finalQuery);
307
+ if (usedReturning) return row;
308
+ const result = await resolveMutation(finalQuery);
292
309
  return result;
293
310
  },
294
311
  async findManyAdvanced(table, conditions, options, queryOptions) {
@@ -350,8 +367,10 @@ var DrizzleAdapter = {
350
367
  throw new Error("DrizzleAdapter: configured database does not support updates.");
351
368
  }
352
369
  const clause = buildDrizzleConditions(table, conditions);
353
- const query = db.update(table).set(data);
354
- const result = await resolveMutation(clause ? query.where(clause) : query);
370
+ const finalQuery = clause ? db.update(table).set(data).where(clause) : db.update(table).set(data);
371
+ const { usedReturning, row } = await resolveWithReturning(finalQuery);
372
+ if (usedReturning) return row;
373
+ const result = await resolveMutation(finalQuery);
355
374
  return result;
356
375
  },
357
376
  async deleteAdvanced(table, conditions, writeOptions) {
@@ -360,8 +379,10 @@ var DrizzleAdapter = {
360
379
  throw new Error("DrizzleAdapter: configured database does not support deletes.");
361
380
  }
362
381
  const clause = buildDrizzleConditions(table, conditions);
363
- const query = db.delete(table);
364
- const result = await resolveMutation(clause ? query.where(clause) : query);
382
+ const finalQuery = clause ? db.delete(table).where(clause) : db.delete(table);
383
+ const { usedReturning, row } = await resolveWithReturning(finalQuery);
384
+ if (usedReturning) return row;
385
+ const result = await resolveMutation(finalQuery);
365
386
  return result;
366
387
  },
367
388
  async transaction(callback) {
@@ -2500,7 +2521,7 @@ function defineSeeder(handler) {
2500
2521
 
2501
2522
  // src/postgres.ts
2502
2523
  function createPostgresDatabase(options) {
2503
- const { schema, migrationsFolder, connectionString, clientOptions, seedersFolder } = options;
2524
+ const { migrationsFolder, connectionString, clientOptions, seedersFolder, relations } = options;
2504
2525
  const resolvedMigrationsFolder = migrationsFolder instanceof URL ? fileURLToPath2(migrationsFolder) : resolve2(String(migrationsFolder));
2505
2526
  const resolvedSeedersFolder = seedersFolder == null ? void 0 : seedersFolder instanceof URL ? fileURLToPath2(seedersFolder) : resolve2(String(seedersFolder));
2506
2527
  let migrationsPromise;
@@ -2528,7 +2549,7 @@ function createPostgresDatabase(options) {
2528
2549
  ...clientOptions
2529
2550
  });
2530
2551
  try {
2531
- const db = drizzle({ client: migrationClient, schema });
2552
+ const db = drizzle({ client: migrationClient, ...relations ? { relations } : {} });
2532
2553
  await migrate(db, { migrationsFolder: resolvedMigrationsFolder });
2533
2554
  } finally {
2534
2555
  await migrationClient.end({ timeout: 0 });
@@ -2552,7 +2573,7 @@ function createPostgresDatabase(options) {
2552
2573
  max: 1,
2553
2574
  ...clientOptions
2554
2575
  });
2555
- return drizzle({ client, schema });
2576
+ return drizzle({ client, ...relations ? { relations } : {} });
2556
2577
  })();
2557
2578
  databasePromise = promise.catch((error) => {
2558
2579
  databasePromise = void 0;
@@ -2604,7 +2625,7 @@ import { existsSync as existsSync2, readdirSync as readdirSync2 } from "fs";
2604
2625
  import { resolve as resolve3 } from "path";
2605
2626
  import { fileURLToPath as fileURLToPath3 } from "url";
2606
2627
  function createMySqlDatabase(options) {
2607
- const { schema, migrationsFolder, connectionString, clientOptions, seedersFolder } = options;
2628
+ const { migrationsFolder, connectionString, clientOptions, seedersFolder, relations } = options;
2608
2629
  const resolvedMigrationsFolder = migrationsFolder instanceof URL ? fileURLToPath3(migrationsFolder) : resolve3(String(migrationsFolder));
2609
2630
  const resolvedSeedersFolder = seedersFolder == null ? void 0 : seedersFolder instanceof URL ? fileURLToPath3(seedersFolder) : resolve3(String(seedersFolder));
2610
2631
  let migrationsPromise;
@@ -2632,8 +2653,8 @@ function createMySqlDatabase(options) {
2632
2653
  uri: url,
2633
2654
  ...clientOptions
2634
2655
  },
2635
- schema,
2636
- mode: "default"
2656
+ mode: "default",
2657
+ ...relations ? { relations } : {}
2637
2658
  });
2638
2659
  try {
2639
2660
  await migrate2(migrationDb, { migrationsFolder: resolvedMigrationsFolder });
@@ -2660,8 +2681,8 @@ function createMySqlDatabase(options) {
2660
2681
  uri: url,
2661
2682
  ...clientOptions
2662
2683
  },
2663
- schema,
2664
- mode: "default"
2684
+ mode: "default",
2685
+ ...relations ? { relations } : {}
2665
2686
  });
2666
2687
  database2 = db;
2667
2688
  return db;
@@ -2742,7 +2763,7 @@ import { existsSync as existsSync3, readdirSync as readdirSync3 } from "fs";
2742
2763
  import { resolve as resolve4 } from "path";
2743
2764
  import { fileURLToPath as fileURLToPath4 } from "url";
2744
2765
  function createSqliteDatabase(options) {
2745
- const { schema, migrationsFolder, filename, seedersFolder } = options;
2766
+ const { migrationsFolder, filename, seedersFolder, relations } = options;
2746
2767
  const resolvedMigrationsFolder = migrationsFolder instanceof URL ? fileURLToPath4(migrationsFolder) : resolve4(String(migrationsFolder));
2747
2768
  const resolvedSeedersFolder = seedersFolder == null ? void 0 : seedersFolder instanceof URL ? fileURLToPath4(seedersFolder) : resolve4(String(seedersFolder));
2748
2769
  let db;
@@ -2764,7 +2785,7 @@ function createSqliteDatabase(options) {
2764
2785
  const sqlite = new Database(dbPath);
2765
2786
  sqlite.exec("PRAGMA journal_mode = WAL;");
2766
2787
  const { drizzle: drizzle3 } = await import("drizzle-orm/bun-sqlite");
2767
- db = drizzle3({ client: sqlite, schema });
2788
+ db = drizzle3({ client: sqlite, ...relations ? { relations } : {} });
2768
2789
  return db;
2769
2790
  }
2770
2791
  async function migrateOnce() {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@guren/orm",
3
- "version": "1.0.0-rc.11",
3
+ "version": "1.0.0-rc.13",
4
4
  "type": "module",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -37,7 +37,7 @@
37
37
  "typecheck": "tsc -p tsconfig.typecheck.json"
38
38
  },
39
39
  "dependencies": {
40
- "drizzle-orm": "1.0.0-beta.18-7eb39f0"
40
+ "drizzle-orm": "1.0.0-rc.1"
41
41
  },
42
42
  "peerDependencies": {
43
43
  "mysql2": "^3.11.3",