@guren/orm 1.0.0-rc.12 → 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 +35 -20
- package/dist/index.js +10 -10
- package/package.json +2 -2
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
|
|
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
|
|
1421
|
-
getDatabase(): Promise<PostgresJsDatabase
|
|
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
|
|
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
|
|
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
|
|
1439
|
-
getDatabase(): Promise<MySql2Database
|
|
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
|
|
1455
|
+
declare function createMySqlDatabase(options: MySqlDatabaseOptions): MySqlDatabase;
|
|
1446
1456
|
|
|
1447
1457
|
type ConnectionResolver = string | (() => string | undefined);
|
|
1448
|
-
interface SqliteDatabaseOptions
|
|
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
|
|
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
|
|
1477
|
+
declare function createSqliteDatabase(options: SqliteDatabaseOptions): SqliteDatabase;
|
|
1463
1478
|
|
|
1464
|
-
interface SeederContext
|
|
1465
|
-
db: PostgresJsDatabase
|
|
1479
|
+
interface SeederContext {
|
|
1480
|
+
db: PostgresJsDatabase;
|
|
1466
1481
|
}
|
|
1467
|
-
type SeederHandler
|
|
1468
|
-
declare function loadSeeders
|
|
1469
|
-
declare function runSeeders
|
|
1470
|
-
declare function defineSeeder
|
|
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
|
@@ -2521,7 +2521,7 @@ function defineSeeder(handler) {
|
|
|
2521
2521
|
|
|
2522
2522
|
// src/postgres.ts
|
|
2523
2523
|
function createPostgresDatabase(options) {
|
|
2524
|
-
const {
|
|
2524
|
+
const { migrationsFolder, connectionString, clientOptions, seedersFolder, relations } = options;
|
|
2525
2525
|
const resolvedMigrationsFolder = migrationsFolder instanceof URL ? fileURLToPath2(migrationsFolder) : resolve2(String(migrationsFolder));
|
|
2526
2526
|
const resolvedSeedersFolder = seedersFolder == null ? void 0 : seedersFolder instanceof URL ? fileURLToPath2(seedersFolder) : resolve2(String(seedersFolder));
|
|
2527
2527
|
let migrationsPromise;
|
|
@@ -2549,7 +2549,7 @@ function createPostgresDatabase(options) {
|
|
|
2549
2549
|
...clientOptions
|
|
2550
2550
|
});
|
|
2551
2551
|
try {
|
|
2552
|
-
const db = drizzle({ client: migrationClient,
|
|
2552
|
+
const db = drizzle({ client: migrationClient, ...relations ? { relations } : {} });
|
|
2553
2553
|
await migrate(db, { migrationsFolder: resolvedMigrationsFolder });
|
|
2554
2554
|
} finally {
|
|
2555
2555
|
await migrationClient.end({ timeout: 0 });
|
|
@@ -2573,7 +2573,7 @@ function createPostgresDatabase(options) {
|
|
|
2573
2573
|
max: 1,
|
|
2574
2574
|
...clientOptions
|
|
2575
2575
|
});
|
|
2576
|
-
return drizzle({ client,
|
|
2576
|
+
return drizzle({ client, ...relations ? { relations } : {} });
|
|
2577
2577
|
})();
|
|
2578
2578
|
databasePromise = promise.catch((error) => {
|
|
2579
2579
|
databasePromise = void 0;
|
|
@@ -2625,7 +2625,7 @@ import { existsSync as existsSync2, readdirSync as readdirSync2 } from "fs";
|
|
|
2625
2625
|
import { resolve as resolve3 } from "path";
|
|
2626
2626
|
import { fileURLToPath as fileURLToPath3 } from "url";
|
|
2627
2627
|
function createMySqlDatabase(options) {
|
|
2628
|
-
const {
|
|
2628
|
+
const { migrationsFolder, connectionString, clientOptions, seedersFolder, relations } = options;
|
|
2629
2629
|
const resolvedMigrationsFolder = migrationsFolder instanceof URL ? fileURLToPath3(migrationsFolder) : resolve3(String(migrationsFolder));
|
|
2630
2630
|
const resolvedSeedersFolder = seedersFolder == null ? void 0 : seedersFolder instanceof URL ? fileURLToPath3(seedersFolder) : resolve3(String(seedersFolder));
|
|
2631
2631
|
let migrationsPromise;
|
|
@@ -2653,8 +2653,8 @@ function createMySqlDatabase(options) {
|
|
|
2653
2653
|
uri: url,
|
|
2654
2654
|
...clientOptions
|
|
2655
2655
|
},
|
|
2656
|
-
|
|
2657
|
-
|
|
2656
|
+
mode: "default",
|
|
2657
|
+
...relations ? { relations } : {}
|
|
2658
2658
|
});
|
|
2659
2659
|
try {
|
|
2660
2660
|
await migrate2(migrationDb, { migrationsFolder: resolvedMigrationsFolder });
|
|
@@ -2681,8 +2681,8 @@ function createMySqlDatabase(options) {
|
|
|
2681
2681
|
uri: url,
|
|
2682
2682
|
...clientOptions
|
|
2683
2683
|
},
|
|
2684
|
-
|
|
2685
|
-
|
|
2684
|
+
mode: "default",
|
|
2685
|
+
...relations ? { relations } : {}
|
|
2686
2686
|
});
|
|
2687
2687
|
database2 = db;
|
|
2688
2688
|
return db;
|
|
@@ -2763,7 +2763,7 @@ import { existsSync as existsSync3, readdirSync as readdirSync3 } from "fs";
|
|
|
2763
2763
|
import { resolve as resolve4 } from "path";
|
|
2764
2764
|
import { fileURLToPath as fileURLToPath4 } from "url";
|
|
2765
2765
|
function createSqliteDatabase(options) {
|
|
2766
|
-
const {
|
|
2766
|
+
const { migrationsFolder, filename, seedersFolder, relations } = options;
|
|
2767
2767
|
const resolvedMigrationsFolder = migrationsFolder instanceof URL ? fileURLToPath4(migrationsFolder) : resolve4(String(migrationsFolder));
|
|
2768
2768
|
const resolvedSeedersFolder = seedersFolder == null ? void 0 : seedersFolder instanceof URL ? fileURLToPath4(seedersFolder) : resolve4(String(seedersFolder));
|
|
2769
2769
|
let db;
|
|
@@ -2785,7 +2785,7 @@ function createSqliteDatabase(options) {
|
|
|
2785
2785
|
const sqlite = new Database(dbPath);
|
|
2786
2786
|
sqlite.exec("PRAGMA journal_mode = WAL;");
|
|
2787
2787
|
const { drizzle: drizzle3 } = await import("drizzle-orm/bun-sqlite");
|
|
2788
|
-
db = drizzle3({ client: sqlite,
|
|
2788
|
+
db = drizzle3({ client: sqlite, ...relations ? { relations } : {} });
|
|
2789
2789
|
return db;
|
|
2790
2790
|
}
|
|
2791
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.
|
|
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-
|
|
40
|
+
"drizzle-orm": "1.0.0-rc.1"
|
|
41
41
|
},
|
|
42
42
|
"peerDependencies": {
|
|
43
43
|
"mysql2": "^3.11.3",
|