@noego/proper 0.0.4 → 0.0.6

package/bin/cli.js

@@ -73,6 +73,7 @@ var __async = (__this, __arguments, generator) => {
 
 // cli.ts
 var import_register = require("source-map-support/register");
+var import_cjs = require("tsx/cjs");
 
 // framework/MigrationCLi.ts
 var import_minimist = __toESM(require("minimist"));
@@ -408,26 +409,50 @@ var SqlMigrationBuilder = class {
 
 // framework/MigrationDirectoryReader.ts
 var 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 = import_path.default.join(this.directory, `${baseName}.${dialectExt}.${direction}.sql`);
+    if (import_fs.default.existsSync(dialectFile)) return dialectFile;
+    const genericFile = import_path.default.join(this.directory, `${baseName}.${direction}.sql`);
+    if (import_fs.default.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) {
     import_fs.default.existsSync(this.directory) || import_fs.default.mkdirSync(this.directory);
     const dir_content = import_fs.default.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: import_path.default.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();
@@ -454,12 +479,16 @@ var MigrationDirectoryReader = class {
   }
   sql_up(file) {
     let content = import_fs.default.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 = import_fs.default.readFileSync(file).toString();
-    content = this.read_strategy(content);
+    if (!this.isDialectSpecific(file)) {
+      content = this.read_strategy(content);
+    }
     return content.trim();
   }
 };
@@ -837,7 +866,7 @@ var MigrationRunnerFactory = class _MigrationRunnerFactory {
       }
       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);
     });
@@ -858,7 +887,7 @@ var MigrationRunnerFactory = class _MigrationRunnerFactory {
       }
       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);
     });
   }
@@ -1242,10 +1271,19 @@ function runSqlSeed(runner, resolved, direction) {
     yield runner.query(sql);
   });
 }
+function loadSeedModule(modulePath) {
+  return __async(this, null, function* () {
+    const resolved = import_path2.default.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 module2 = yield import(import_path2.default.resolve(resolved.upPath));
+    const module2 = yield loadSeedModule(resolved.upPath);
     const handler = module2[direction];
     if (typeof handler !== "function") {
       throw new Error(`Seed module "${resolved.name}" does not export ${direction}()`);