@guren/orm 1.0.0-rc.12 → 1.0.0-rc.14

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/drizzle.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  export { SQL, sql } from 'drizzle-orm';
2
- export { PgColumn, PgTable, bigint, boolean, integer, pgTable, serial, text, timestamp, uniqueIndex } from 'drizzle-orm/pg-core';
2
+ export { PgColumn, PgTable, bigint, boolean, integer, jsonb, pgTable, serial, text, timestamp, uniqueIndex } from 'drizzle-orm/pg-core';
3
3
  export { MySqlColumn, MySqlTable, datetime, int, mysqlTable, varchar } from 'drizzle-orm/mysql-core';
package/dist/drizzle.js CHANGED
@@ -8,6 +8,7 @@ import {
8
8
  bigint,
9
9
  timestamp,
10
10
  boolean,
11
+ jsonb,
11
12
  uniqueIndex
12
13
  } from "drizzle-orm/pg-core";
13
14
  import {
@@ -22,6 +23,7 @@ export {
22
23
  datetime,
23
24
  int,
24
25
  integer,
26
+ jsonb,
25
27
  mysqlTable,
26
28
  pgTable,
27
29
  serial,
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
@@ -2445,14 +2445,38 @@ function SoftDeletes(Base) {
2445
2445
  // src/postgres.ts
2446
2446
  import { drizzle } from "drizzle-orm/postgres-js";
2447
2447
  import { migrate } from "drizzle-orm/postgres-js/migrator";
2448
- import { existsSync, readdirSync } from "fs";
2449
- import { resolve as resolve2 } from "path";
2448
+ import { resolve as resolve3 } from "path";
2450
2449
  import { fileURLToPath as fileURLToPath2 } from "url";
2451
2450
  import postgres from "postgres";
2452
2451
 
2452
+ // src/migration-utils.ts
2453
+ import { existsSync, readdirSync } from "fs";
2454
+ import { resolve } from "path";
2455
+ function hasDrizzleMigrations(migrationsFolder) {
2456
+ if (!existsSync(migrationsFolder)) {
2457
+ return false;
2458
+ }
2459
+ const entries = readdirSync(migrationsFolder, { withFileTypes: true });
2460
+ return entries.some(
2461
+ (entry) => entry.isDirectory() && existsSync(resolve(migrationsFolder, entry.name, "migration.sql"))
2462
+ );
2463
+ }
2464
+ function warnIgnoredFlatSqlMigrations(migrationsFolder) {
2465
+ if (!existsSync(migrationsFolder)) {
2466
+ return;
2467
+ }
2468
+ const flatSqlFiles = readdirSync(migrationsFolder, { withFileTypes: true }).filter((entry) => entry.isFile() && entry.name.endsWith(".sql")).map((entry) => entry.name);
2469
+ if (flatSqlFiles.length > 0) {
2470
+ console.warn(
2471
+ `[guren/orm] Ignoring ${flatSqlFiles.length} loose .sql file(s) in ${migrationsFolder}: ${flatSqlFiles.join(", ")}.
2472
+ [guren/orm] Migrations must be generated with drizzle-kit (\`bun run db:make\`), which creates one folder per migration.`
2473
+ );
2474
+ }
2475
+ }
2476
+
2453
2477
  // src/seeder.ts
2454
2478
  import { readdir } from "fs/promises";
2455
- import { extname, resolve } from "path";
2479
+ import { extname, resolve as resolve2 } from "path";
2456
2480
  import { fileURLToPath, pathToFileURL } from "url";
2457
2481
  var SUPPORTED_EXTENSIONS = /* @__PURE__ */ new Set([".js", ".mjs", ".cjs", ".ts"]);
2458
2482
  function normalizeSeeder(candidate) {
@@ -2497,9 +2521,9 @@ async function loadSeederModule(path) {
2497
2521
  return void 0;
2498
2522
  }
2499
2523
  async function loadSeeders(directory) {
2500
- const root = directory instanceof URL ? fileURLToPath(directory) : resolve(directory);
2524
+ const root = directory instanceof URL ? fileURLToPath(directory) : resolve2(directory);
2501
2525
  const entries = await readdir(root, { withFileTypes: true });
2502
- const files = entries.filter((entry) => entry.isFile() && SUPPORTED_EXTENSIONS.has(extname(entry.name))).map((entry) => resolve(root, entry.name)).sort();
2526
+ const files = entries.filter((entry) => entry.isFile() && SUPPORTED_EXTENSIONS.has(extname(entry.name))).map((entry) => resolve2(root, entry.name)).sort();
2503
2527
  const seeders = [];
2504
2528
  for (const file of files) {
2505
2529
  const handler = await loadSeederModule(file);
@@ -2521,9 +2545,9 @@ function defineSeeder(handler) {
2521
2545
 
2522
2546
  // src/postgres.ts
2523
2547
  function createPostgresDatabase(options) {
2524
- const { schema, migrationsFolder, connectionString, clientOptions, seedersFolder } = options;
2525
- const resolvedMigrationsFolder = migrationsFolder instanceof URL ? fileURLToPath2(migrationsFolder) : resolve2(String(migrationsFolder));
2526
- const resolvedSeedersFolder = seedersFolder == null ? void 0 : seedersFolder instanceof URL ? fileURLToPath2(seedersFolder) : resolve2(String(seedersFolder));
2548
+ const { migrationsFolder, connectionString, clientOptions, seedersFolder, relations } = options;
2549
+ const resolvedMigrationsFolder = migrationsFolder instanceof URL ? fileURLToPath2(migrationsFolder) : resolve3(String(migrationsFolder));
2550
+ const resolvedSeedersFolder = seedersFolder == null ? void 0 : seedersFolder instanceof URL ? fileURLToPath2(seedersFolder) : resolve3(String(seedersFolder));
2527
2551
  let migrationsPromise;
2528
2552
  let databasePromise;
2529
2553
  let client;
@@ -2541,6 +2565,7 @@ function createPostgresDatabase(options) {
2541
2565
  }
2542
2566
  const promise = (async () => {
2543
2567
  if (!hasDrizzleMigrations(resolvedMigrationsFolder)) {
2568
+ warnIgnoredFlatSqlMigrations(resolvedMigrationsFolder);
2544
2569
  return;
2545
2570
  }
2546
2571
  const url = resolveConnectionString();
@@ -2549,7 +2574,7 @@ function createPostgresDatabase(options) {
2549
2574
  ...clientOptions
2550
2575
  });
2551
2576
  try {
2552
- const db = drizzle({ client: migrationClient, schema });
2577
+ const db = drizzle({ client: migrationClient, ...relations ? { relations } : {} });
2553
2578
  await migrate(db, { migrationsFolder: resolvedMigrationsFolder });
2554
2579
  } finally {
2555
2580
  await migrationClient.end({ timeout: 0 });
@@ -2573,7 +2598,7 @@ function createPostgresDatabase(options) {
2573
2598
  max: 1,
2574
2599
  ...clientOptions
2575
2600
  });
2576
- return drizzle({ client, schema });
2601
+ return drizzle({ client, ...relations ? { relations } : {} });
2577
2602
  })();
2578
2603
  databasePromise = promise.catch((error) => {
2579
2604
  databasePromise = void 0;
@@ -2608,26 +2633,16 @@ function createPostgresDatabase(options) {
2608
2633
  seedDatabase
2609
2634
  };
2610
2635
  }
2611
- function hasDrizzleMigrations(migrationsFolder) {
2612
- if (!existsSync(migrationsFolder)) {
2613
- return false;
2614
- }
2615
- const entries = readdirSync(migrationsFolder, { withFileTypes: true });
2616
- return entries.some(
2617
- (entry) => entry.isDirectory() && existsSync(resolve2(migrationsFolder, entry.name, "migration.sql"))
2618
- );
2619
- }
2620
2636
 
2621
2637
  // src/mysql.ts
2622
2638
  import { drizzle as drizzle2 } from "drizzle-orm/mysql2";
2623
2639
  import { migrate as migrate2 } from "drizzle-orm/mysql2/migrator";
2624
- import { existsSync as existsSync2, readdirSync as readdirSync2 } from "fs";
2625
- import { resolve as resolve3 } from "path";
2640
+ import { resolve as resolve4 } from "path";
2626
2641
  import { fileURLToPath as fileURLToPath3 } from "url";
2627
2642
  function createMySqlDatabase(options) {
2628
- const { schema, migrationsFolder, connectionString, clientOptions, seedersFolder } = options;
2629
- const resolvedMigrationsFolder = migrationsFolder instanceof URL ? fileURLToPath3(migrationsFolder) : resolve3(String(migrationsFolder));
2630
- const resolvedSeedersFolder = seedersFolder == null ? void 0 : seedersFolder instanceof URL ? fileURLToPath3(seedersFolder) : resolve3(String(seedersFolder));
2643
+ const { migrationsFolder, connectionString, clientOptions, seedersFolder, relations } = options;
2644
+ const resolvedMigrationsFolder = migrationsFolder instanceof URL ? fileURLToPath3(migrationsFolder) : resolve4(String(migrationsFolder));
2645
+ const resolvedSeedersFolder = seedersFolder == null ? void 0 : seedersFolder instanceof URL ? fileURLToPath3(seedersFolder) : resolve4(String(seedersFolder));
2631
2646
  let migrationsPromise;
2632
2647
  let databasePromise;
2633
2648
  let database2;
@@ -2644,7 +2659,8 @@ function createMySqlDatabase(options) {
2644
2659
  return migrationsPromise;
2645
2660
  }
2646
2661
  const promise = (async () => {
2647
- if (!hasDrizzleMigrations2(resolvedMigrationsFolder)) {
2662
+ if (!hasDrizzleMigrations(resolvedMigrationsFolder)) {
2663
+ warnIgnoredFlatSqlMigrations(resolvedMigrationsFolder);
2648
2664
  return;
2649
2665
  }
2650
2666
  const url = resolveConnectionString();
@@ -2653,8 +2669,8 @@ function createMySqlDatabase(options) {
2653
2669
  uri: url,
2654
2670
  ...clientOptions
2655
2671
  },
2656
- schema,
2657
- mode: "default"
2672
+ mode: "default",
2673
+ ...relations ? { relations } : {}
2658
2674
  });
2659
2675
  try {
2660
2676
  await migrate2(migrationDb, { migrationsFolder: resolvedMigrationsFolder });
@@ -2681,8 +2697,8 @@ function createMySqlDatabase(options) {
2681
2697
  uri: url,
2682
2698
  ...clientOptions
2683
2699
  },
2684
- schema,
2685
- mode: "default"
2700
+ mode: "default",
2701
+ ...relations ? { relations } : {}
2686
2702
  });
2687
2703
  database2 = db;
2688
2704
  return db;
@@ -2748,24 +2764,14 @@ async function closeClient(db) {
2748
2764
  function isPromiseLike2(value) {
2749
2765
  return typeof value === "object" && value !== null && "then" in value && typeof value.then === "function";
2750
2766
  }
2751
- function hasDrizzleMigrations2(migrationsFolder) {
2752
- if (!existsSync2(migrationsFolder)) {
2753
- return false;
2754
- }
2755
- const entries = readdirSync2(migrationsFolder, { withFileTypes: true });
2756
- return entries.some(
2757
- (entry) => entry.isDirectory() && existsSync2(resolve3(migrationsFolder, entry.name, "migration.sql"))
2758
- );
2759
- }
2760
2767
 
2761
2768
  // src/sqlite.ts
2762
- import { existsSync as existsSync3, readdirSync as readdirSync3 } from "fs";
2763
- import { resolve as resolve4 } from "path";
2769
+ import { resolve as resolve5 } from "path";
2764
2770
  import { fileURLToPath as fileURLToPath4 } from "url";
2765
2771
  function createSqliteDatabase(options) {
2766
- const { schema, migrationsFolder, filename, seedersFolder } = options;
2767
- const resolvedMigrationsFolder = migrationsFolder instanceof URL ? fileURLToPath4(migrationsFolder) : resolve4(String(migrationsFolder));
2768
- const resolvedSeedersFolder = seedersFolder == null ? void 0 : seedersFolder instanceof URL ? fileURLToPath4(seedersFolder) : resolve4(String(seedersFolder));
2772
+ const { migrationsFolder, filename, seedersFolder, relations } = options;
2773
+ const resolvedMigrationsFolder = migrationsFolder instanceof URL ? fileURLToPath4(migrationsFolder) : resolve5(String(migrationsFolder));
2774
+ const resolvedSeedersFolder = seedersFolder == null ? void 0 : seedersFolder instanceof URL ? fileURLToPath4(seedersFolder) : resolve5(String(seedersFolder));
2769
2775
  let db;
2770
2776
  let migrationsPromise;
2771
2777
  function resolveFilename() {
@@ -2778,20 +2784,21 @@ function createSqliteDatabase(options) {
2778
2784
  const { mkdirSync } = await import("fs");
2779
2785
  const { dirname } = await import("path");
2780
2786
  try {
2781
- mkdirSync(dirname(resolve4(dbPath)), { recursive: true });
2787
+ mkdirSync(dirname(resolve5(dbPath)), { recursive: true });
2782
2788
  } catch {
2783
2789
  }
2784
2790
  const { Database } = await import("bun:sqlite");
2785
2791
  const sqlite = new Database(dbPath);
2786
2792
  sqlite.exec("PRAGMA journal_mode = WAL;");
2787
2793
  const { drizzle: drizzle3 } = await import("drizzle-orm/bun-sqlite");
2788
- db = drizzle3({ client: sqlite, schema });
2794
+ db = drizzle3({ client: sqlite, ...relations ? { relations } : {} });
2789
2795
  return db;
2790
2796
  }
2791
2797
  async function migrateOnce() {
2792
2798
  if (migrationsPromise) return migrationsPromise;
2793
2799
  migrationsPromise = (async () => {
2794
- if (!hasDrizzleMigrations3(resolvedMigrationsFolder)) {
2800
+ if (!hasDrizzleMigrations(resolvedMigrationsFolder)) {
2801
+ warnIgnoredFlatSqlMigrations(resolvedMigrationsFolder);
2795
2802
  return;
2796
2803
  }
2797
2804
  const database2 = await ensureDatabase2();
@@ -2832,15 +2839,6 @@ function createSqliteDatabase(options) {
2832
2839
  }
2833
2840
  };
2834
2841
  }
2835
- function hasDrizzleMigrations3(migrationsFolder) {
2836
- if (!existsSync3(migrationsFolder)) {
2837
- return false;
2838
- }
2839
- const entries = readdirSync3(migrationsFolder, { withFileTypes: true });
2840
- return entries.some(
2841
- (entry) => entry.isDirectory() && existsSync3(resolve4(migrationsFolder, entry.name, "migration.sql"))
2842
- );
2843
- }
2844
2842
  export {
2845
2843
  DrizzleAdapter,
2846
2844
  GlobalScopeRegistry,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@guren/orm",
3
- "version": "1.0.0-rc.12",
3
+ "version": "1.0.0-rc.14",
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",