@noego/proper 0.0.4 → 0.0.6

package/bin/cli.mjs

@@ -420,26 +420,50 @@ var init_MigrationDirectoryReader = __esm({
   "framework/MigrationDirectoryReader.ts"() {
     init_SqlMigrationBuilder();
     MigrationDirectoryReader = class {
-      constructor(directory, read_strategy, sqlrunner) {
+      constructor(directory, read_strategy, sqlrunner, dialect = "sql") {
         this.directory = directory;
         this.read_strategy = read_strategy;
         this.sqlrunner = sqlrunner;
+        this.dialect = dialect;
+      }
+      /**
+       * Resolves the appropriate file for a migration based on dialect.
+       * Priority: dialect-specific file > generic file
+       */
+      resolveFile(baseName, direction) {
+        const dialectExt = this.dialect === "sql" ? "mysql" : "sqlite";
+        const dialectFile = path.join(this.directory, `${baseName}.${dialectExt}.${direction}.sql`);
+        if (fs.existsSync(dialectFile)) return dialectFile;
+        const genericFile = path.join(this.directory, `${baseName}.${direction}.sql`);
+        if (fs.existsSync(genericFile)) return genericFile;
+        return null;
+      }
+      /**
+       * Checks if a file path is dialect-specific (contains .mysql. or .sqlite. in the name)
+       */
+      isDialectSpecific(filePath) {
+        return /\.(mysql|sqlite)\.(up|down)\.sql$/i.test(filePath);
       }
       loadMigrations(table, connection) {
         fs.existsSync(this.directory) || fs.mkdirSync(this.directory);
         const dir_content = fs.readdirSync(this.directory, { withFileTypes: true }).filter((file) => file.isFile()).map((file) => file.name);
-        let migration_files = dir_content.map((file) => {
-          return {
-            migration_key: file.replace(/\.(up|down)\.(sql|js)/i, "").toLowerCase(),
-            directory: this.directory,
-            relative_path: path.join(this.directory, file),
-            file
-          };
-        }).sort();
+        const uniqueKeys = /* @__PURE__ */ new Set();
+        dir_content.forEach((file) => {
+          const key = file.replace(/(?:\.(mysql|sqlite))?\.(up|down)\.(sql|js)/i, "").toLowerCase();
+          uniqueKeys.add(key);
+        });
         const migration_sorter = {};
-        migration_files.forEach((migration) => {
-          const builder = migration_sorter[migration.migration_key] = migration_sorter[migration.migration_key] || new SqlMigrationBuilder(migration.migration_key);
-          this.loadMigration(builder, migration.relative_path);
+        uniqueKeys.forEach((migration_key) => {
+          const builder = new SqlMigrationBuilder(migration_key);
+          const upFile = this.resolveFile(migration_key, "up");
+          const downFile = this.resolveFile(migration_key, "down");
+          if (upFile) {
+            this.loadMigration(builder, upFile);
+          }
+          if (downFile) {
+            this.loadMigration(builder, downFile);
+          }
+          migration_sorter[migration_key] = builder;
         });
         const keys = Object.keys(migration_sorter);
         keys.sort();
@@ -466,12 +490,16 @@ var init_MigrationDirectoryReader = __esm({
       }
       sql_up(file) {
         let content = fs.readFileSync(file).toString();
-        content = this.read_strategy(content);
+        if (!this.isDialectSpecific(file)) {
+          content = this.read_strategy(content);
+        }
         return content.trim();
       }
       sql_down(file) {
         let content = fs.readFileSync(file).toString();
-        content = this.read_strategy(content);
+        if (!this.isDialectSpecific(file)) {
+          content = this.read_strategy(content);
+        }
         return content.trim();
       }
     };
@@ -878,7 +906,7 @@ var init_MigrationRunner = __esm({
           }
           const setup = new MigrationSetup(sqlrunner, config);
           const read_strategy = this.getReadStategy(config);
-          const migration_files = new MigrationDirectoryReader(config.migration_folder, read_strategy, sqlrunner);
+          const migration_files = new MigrationDirectoryReader(config.migration_folder, read_strategy, sqlrunner, config.database);
           yield setup.setup();
           return new MySQLMigrationRunner(config, migration_files, setup, sqlrunner, driverConnection);
         });
@@ -899,7 +927,7 @@ var init_MigrationRunner = __esm({
           }
           const setup = new MigrationSetup(sqlrunner, config);
           const read_strategy = this.getReadStategy(config);
-          const migration_files = new MigrationDirectoryReader(config.migration_folder, read_strategy, sqlrunner);
+          const migration_files = new MigrationDirectoryReader(config.migration_folder, read_strategy, sqlrunner, config.database);
           return new MySQLMigrationRunner(config, migration_files, setup, sqlrunner, conn);
         });
       }
@@ -1285,10 +1313,19 @@ function runSqlSeed(runner, resolved, direction) {
     yield runner.query(sql);
   });
 }
+function loadSeedModule(modulePath) {
+  return __async(this, null, function* () {
+    const resolved = path2.resolve(modulePath);
+    if (resolved.endsWith(".ts")) {
+      return __require(resolved);
+    }
+    return import(resolved);
+  });
+}
 function runModuleSeed(runner, resolved, migrationConfig, options, direction) {
   return __async(this, null, function* () {
     const { log } = options;
-    const module = yield import(path2.resolve(resolved.upPath));
+    const module = yield loadSeedModule(resolved.upPath);
     const handler = module[direction];
     if (typeof handler !== "function") {
       throw new Error(`Seed module "${resolved.name}" does not export ${direction}()`);
@@ -1372,6 +1409,7 @@ var init_SeedRunner = __esm({
 
 // cli.ts
 import "source-map-support/register";
+import "tsx/cjs";
 var require_cli = __commonJS({
   "cli.ts"(exports) {
     init_MigrationCLi();