@storecraft/database-sql-base 1.3.1 → 1.4.2

package/fix-migration-provider.js

@@ -0,0 +1,43 @@
+import { promises as fs } from "fs";
+import * as path from "path";
+import { pathToFileURL } from "url";
+
+export class FixedFileMigrationProvider {
+  /**
+   * @param {{fs: typeof import("fs").promises, path: typeof import("path"), migrationFolder: string}} config
+   */
+  constructor(config) {
+    this.fs = config.fs;
+    this.path = config.path;
+    this.migrationFolder = config.migrationFolder;
+  }
+
+  async getMigrations() {
+    const files = await this.fs.readdir(this.migrationFolder);
+
+    /** @type {Record<string, any>} */
+    const migrations = {};
+
+    for (const file of files) {
+      if (!file.endsWith(".js")) continue;
+
+      // resolve absolute path to ensure cross-platform consistency
+      const fullPath = this.path.resolve(this.migrationFolder, file);
+
+      /**
+       * Convert file path to file URL using Node's built-in utility.
+       * This avoids manual string manipulation (like regex) and ensures
+       * correct behavior across Windows, Linux, and macOS.
+       */
+      const fileUrl = pathToFileURL(fullPath).href;
+
+      const name = file.replace(".js", "");
+
+      console.log("Provider loading:", fileUrl);
+
+      migrations[name] = await import(fileUrl);
+    }
+
+    return migrations;
+  }
+}

package/migrate.js

@@ -3,112 +3,103 @@
  * @import { SqlDialectType } from './types.public.js';
  * @import { Migration } from 'kysely';
  */
+
 import { fileURLToPath, pathToFileURL } from "node:url";
-import * as path from 'path'
-import { promises as fs } from 'fs'
+import * as path from "path";
+import { promises as fs } from "fs";
 import {
   Migrator,
-  FileMigrationProvider,
   Kysely,
-} from 'kysely'
+} from "kysely";
 import { SQL } from "./index.js";
 
+// reusing the same provider for all migrations to avoid issues with dynamic imports and file URLs
+import { FixedFileMigrationProvider } from "./fix-migration-provider.js";
+
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
 export const current = {
+  /** @type {SQL | undefined} */
   driver: undefined
-}
+};
 
-export const read_files_in_folder = async (folder='') => {
+export const read_files_in_folder = async (folder = "") => {
   const files = await fs.readdir(folder);
-  return files.filter(file => file.endsWith('.js'));
-}
+  return files.filter(file => file.endsWith(".js"));
+};
 
 /**
  * @param {SqlDialectType} dialect_type
  */
-export const get_migrations = async (dialect_type='SQLITE') => {
-  const folder = 'migrations.' + dialect_type.toLowerCase();
+export const get_migrations = async (dialect_type = "SQLITE") => {
+  const folder = "migrations." + dialect_type.toLowerCase();
   const files = await fs.readdir(path.join(__dirname, folder));
 
   /** @type {Record<string, Migration>} */
   const migrations = {};
 
   for (const file of files) {
-    if(file.endsWith('.js')) {
-      const file_name = file.split('.').slice(0, -1).join('.');
+    if (file.endsWith(".js")) {
+      const file_name = file.split(".").slice(0, -1).join(".");
       const file_path = path.join(__dirname, folder, file);
       const file_url = pathToFileURL(file_path);
+
       const migration = await import(file_url.href);
       migrations[file_name] = migration;
     }
   }
 
   return migrations;
-}
-
-// console.log(
-//   await get_migrations()
-// )
-
+};
 
 /**
- * 
- * @param {SQL} db_driver 
- * @param {boolean} [release_db_upon_completion=true] 
+ * @param {SQL} db_driver
+ * @param {boolean} [release_db_upon_completion=true]
  */
-export async function migrateToLatest(db_driver, release_db_upon_completion=true) {
-  if(!db_driver?.client)
-    throw new Error('No Kysely client found !!!');
+export async function migrateToLatest(db_driver, release_db_upon_completion = true) {
+  if (!db_driver?.client) {
+    throw new Error("No Kysely client found !!!");
+  }
 
-  console.log('Resolving migrations. This may take 2 minutes ...')
+  console.log("Resolving migrations. This may take some time...");
 
-  let db = db_driver.client;
+  const db = db_driver.client;
 
   current.driver = db_driver;
 
-  const migrator = new Migrator(
-    {
-      db,
-      provider: new FileMigrationProvider(
-        {
-          fs,
-          path,
-          migrationFolder: path.join(
-            __dirname, 
-            `migrations.${db_driver.dialectType.toLowerCase()}`
-          ),
-        }
+  const migrator = new Migrator({
+    db,
+    provider: new FixedFileMigrationProvider({
+      fs,
+      path,
+      migrationFolder: path.join(
+        __dirname,
+        `migrations.${db_driver.dialectType.toLowerCase()}`
       ),
-    }
-  );
+    }),
+  });
 
   const { error, results } = await migrator.migrateToLatest();
 
-  results?.forEach(
-    (it) => {
-      if (it.status === 'Success') {
-        console.log(
-          `migration "${it.migrationName}" was executed successfully`
-        );
-      } else if (it.status === 'Error') {
-        console.error(
-          `failed to execute migration "${it.migrationName}"`
-        );
-      }
+  results?.forEach((it) => {
+    if (it.status === "Success") {
+      console.log(`migration "${it.migrationName}" was executed successfully`);
+    } else if (it.status === "Error") {
+      console.error(`failed to execute migration "${it.migrationName}"`);
     }
-  );
+  });
 
   if (error) {
-    console.error('failed to migrate')
-    console.error(JSON.stringify(error, null, 2))
-    console.error(JSON.stringify(results, null, 2))
-    process.exit(1)
+    console.error("failed to migrate");
+    console.error(JSON.stringify(error, null, 2));
+    console.error(JSON.stringify(results, null, 2));
+    process.exit(1);
   }
 
-  console.log('Resolving migrations COMPLETE.')
+  console.log("Resolving migrations COMPLETE.");
 
-  if(release_db_upon_completion)
+  if (release_db_upon_completion) {
     await db.destroy();
-}
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storecraft/database-sql-base",
-  "version": "1.3.1",
+  "version": "1.4.2",
   "description": "Official SQL Database driver for storecraft",
   "license": "MIT",
   "author": "Tomer Shalev (https://github.com/store-craft)",