bunsql-native-migrate 0.1.0 → 0.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bunsql-native-migrate",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Zero-ORM SQL file migrations for Bun: PostgreSQL, MySQL/MariaDB and SQLite through the built-in Bun.SQL client",
   "keywords": [
     "bun",

package/src/api/down.ts

@@ -1,16 +1,13 @@
 import path from "node:path";
-import { getDatabaseUrl } from "../core/env.js";
-import { createDriver } from "../core/driver.js";
 import { resolveListDir } from "../core/fs.js";
 import { log } from "../core/console.js";
 import type { MigrateDownResult, MigrateOptions } from "./options.js";
+import { runWithDriver } from "./run-with-driver.js";
 
 export async function migrateDown(options: MigrateOptions = {}): Promise<MigrateDownResult> {
-  const url = getDatabaseUrl(options.databaseUrl);
   const listDir = resolveListDir(options.listDir);
-  const driver = await createDriver(url);
 
-  try {
+  return runWithDriver(options, async (driver) => {
     const executed = await driver.listExecuted();
     if (executed.length === 0) {
       log({ text: "No migrations to rollback.", type: "warn" });
@@ -31,7 +28,5 @@ export async function migrateDown(options: MigrateOptions = {}): Promise<Migrate
     await driver.remove(file);
     log({ text: `${file} rolled back`, type: "success" });
     return { reverted: file };
-  } finally {
-    await driver.close();
-  }
+  });
 }

package/src/api/install.ts

@@ -1,15 +1,10 @@
-import { getDatabaseUrl } from "../core/env.js";
-import { createDriver } from "../core/driver.js";
 import { log } from "../core/console.js";
 import type { MigrateOptions } from "./options.js";
+import { runWithDriver } from "./run-with-driver.js";
 
 export async function installMigrations(options: MigrateOptions = {}): Promise<void> {
-  const url = getDatabaseUrl(options.databaseUrl);
-  const driver = await createDriver(url);
-  try {
+  await runWithDriver(options, async (driver) => {
     await driver.install();
     log({ text: "Migration table created!", type: "success" });
-  } finally {
-    await driver.close();
-  }
+  });
 }

package/src/api/run-with-driver.ts

@@ -0,0 +1,16 @@
+import { getDatabaseUrl } from "../core/env.js";
+import { createDriver, type MigrationDriver } from "../core/driver.js";
+import type { MigrateOptions } from "./options.js";
+
+export async function runWithDriver<T>(
+  options: MigrateOptions,
+  run: (driver: MigrationDriver) => Promise<T>,
+): Promise<T> {
+  const url = getDatabaseUrl(options.databaseUrl);
+  const driver = await createDriver(url);
+  try {
+    return await run(driver);
+  } finally {
+    await driver.close();
+  }
+}

package/src/api/up.ts

@@ -1,23 +1,20 @@
 import path from "node:path";
-import { getDatabaseUrl } from "../core/env.js";
-import { createDriver } from "../core/driver.js";
 import { checksumFile, listFiles, resolveListDir } from "../core/fs.js";
 import { log } from "../core/console.js";
 import { type MigrateOptions, type MigrateUpResult, ChecksumDriftError } from "./options.js";
+import { runWithDriver } from "./run-with-driver.js";
 
 export async function migrateUp(options: MigrateOptions = {}): Promise<MigrateUpResult> {
-  const url = getDatabaseUrl(options.databaseUrl);
   const listDir = resolveListDir(options.listDir);
-  const driver = await createDriver(url);
 
-  try {
+  return runWithDriver(options, async (driver) => {
     await driver.install();
 
     const allFiles = await listFiles(listDir, "js");
-    const checksums = new Map<string, string>();
-    for (const file of allFiles) {
-      checksums.set(file, await checksumFile(path.join(listDir, file)));
-    }
+    const checksumEntries = await Promise.all(
+      allFiles.map(async (file) => [file, await checksumFile(path.join(listDir, file))] as const),
+    );
+    const checksums = new Map(checksumEntries);
 
     const executed = await driver.listExecuted();
     const executedByName = new Map(executed.map((entry) => [entry.name, entry]));
@@ -68,7 +65,5 @@ export async function migrateUp(options: MigrateOptions = {}): Promise<MigrateUp
     }
 
     return { applied };
-  } finally {
-    await driver.close();
-  }
+  });
 }