@guren/orm 1.0.0-rc.13 → 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 +1 -1
- package/dist/drizzle.js +2 -0
- package/dist/index.js +43 -45
- package/package.json +1 -1
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
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 {
|
|
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) :
|
|
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) =>
|
|
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);
|
|
@@ -2522,8 +2546,8 @@ function defineSeeder(handler) {
|
|
|
2522
2546
|
// src/postgres.ts
|
|
2523
2547
|
function createPostgresDatabase(options) {
|
|
2524
2548
|
const { migrationsFolder, connectionString, clientOptions, seedersFolder, relations } = options;
|
|
2525
|
-
const resolvedMigrationsFolder = migrationsFolder instanceof URL ? fileURLToPath2(migrationsFolder) :
|
|
2526
|
-
const resolvedSeedersFolder = seedersFolder == null ? void 0 : seedersFolder instanceof URL ? fileURLToPath2(seedersFolder) :
|
|
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();
|
|
@@ -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 {
|
|
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
2643
|
const { migrationsFolder, connectionString, clientOptions, seedersFolder, relations } = options;
|
|
2629
|
-
const resolvedMigrationsFolder = migrationsFolder instanceof URL ? fileURLToPath3(migrationsFolder) :
|
|
2630
|
-
const resolvedSeedersFolder = seedersFolder == null ? void 0 : seedersFolder instanceof URL ? fileURLToPath3(seedersFolder) :
|
|
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 (!
|
|
2662
|
+
if (!hasDrizzleMigrations(resolvedMigrationsFolder)) {
|
|
2663
|
+
warnIgnoredFlatSqlMigrations(resolvedMigrationsFolder);
|
|
2648
2664
|
return;
|
|
2649
2665
|
}
|
|
2650
2666
|
const url = resolveConnectionString();
|
|
@@ -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 {
|
|
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
2772
|
const { migrationsFolder, filename, seedersFolder, relations } = options;
|
|
2767
|
-
const resolvedMigrationsFolder = migrationsFolder instanceof URL ? fileURLToPath4(migrationsFolder) :
|
|
2768
|
-
const resolvedSeedersFolder = seedersFolder == null ? void 0 : seedersFolder instanceof URL ? fileURLToPath4(seedersFolder) :
|
|
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,7 +2784,7 @@ function createSqliteDatabase(options) {
|
|
|
2778
2784
|
const { mkdirSync } = await import("fs");
|
|
2779
2785
|
const { dirname } = await import("path");
|
|
2780
2786
|
try {
|
|
2781
|
-
mkdirSync(dirname(
|
|
2787
|
+
mkdirSync(dirname(resolve5(dbPath)), { recursive: true });
|
|
2782
2788
|
} catch {
|
|
2783
2789
|
}
|
|
2784
2790
|
const { Database } = await import("bun:sqlite");
|
|
@@ -2791,7 +2797,8 @@ function createSqliteDatabase(options) {
|
|
|
2791
2797
|
async function migrateOnce() {
|
|
2792
2798
|
if (migrationsPromise) return migrationsPromise;
|
|
2793
2799
|
migrationsPromise = (async () => {
|
|
2794
|
-
if (!
|
|
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,
|