@noego/proper 0.0.8 → 0.1.0

package/bin/cli.mjs

@@ -429,9 +429,10 @@ var init_MigrationDirectoryReader = __esm({
       /**
        * Resolves the appropriate file for a migration based on dialect.
        * Priority: dialect-specific file > generic file
+       * File extensions: `.mysql.up.sql`, `.sqlite.up.sql`, `.pg.up.sql`.
        */
       resolveFile(baseName, direction) {
-        const dialectExt = this.dialect === "sql" ? "mysql" : "sqlite";
+        const dialectExt = this.dialect === "sql" ? "mysql" : this.dialect;
         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`);
@@ -442,14 +443,14 @@ var init_MigrationDirectoryReader = __esm({
        * 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);
+        return /\.(mysql|sqlite|pg)\.(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);
         const uniqueKeys = /* @__PURE__ */ new Set();
         dir_content.forEach((file) => {
-          const key = file.replace(/(?:\.(mysql|sqlite))?\.(up|down)\.(sql|js)/i, "").toLowerCase();
+          const key = file.replace(/(?:\.(mysql|sqlite|pg))?\.(up|down)\.(sql|js)/i, "").toLowerCase();
           uniqueKeys.add(key);
         });
         const migration_sorter = {};
@@ -526,6 +527,12 @@ var init_MigrationSetup = __esm({
                 up TEXT,
                 down TEXT,
                 created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+            )` : this.config.database === "pg" ? `CREATE TABLE IF NOT EXISTS ${tableName} (
+                id SERIAL PRIMARY KEY,
+                migration_key TEXT,
+                up TEXT,
+                down TEXT,
+                created_at TIMESTAMPTZ DEFAULT now()
             )` : `CREATE TABLE IF NOT EXISTS ${tableName} (
                 id INT AUTO_INCREMENT PRIMARY KEY,
                 migration_key VARCHAR(255),
@@ -572,33 +579,38 @@ function MySqlDialectParser(sql) {
   }
   return result;
 }
-function SqliteDialectParser(sql) {
-  const lines = sql.split("\n");
-  let result = "";
-  let isInSqliteBlock = true;
-  const startSqliteRegex = /^\s*--\s*\[\s*sqlite\s*\]\s*$/i;
+function markerDialectParser(names) {
+  const startRegex = new RegExp(`^\\s*--\\s*\\[\\s*(${names.join("|")})\\s*\\]\\s*$`, "i");
   const anyDialectRegex = /^\s*--\s*\[\s*\w+\s*\]\s*$/i;
-  for (const line of lines) {
-    const trimmed = line.trim();
-    if (startSqliteRegex.test(trimmed)) {
-      isInSqliteBlock = true;
-      result += line + "\n";
-      continue;
-    } else if (anyDialectRegex.test(trimmed) && !startSqliteRegex.test(trimmed)) {
-      isInSqliteBlock = false;
-      continue;
-    }
-    if (!isInSqliteBlock && line.toLowerCase().includes("create index")) {
-      isInSqliteBlock = true;
-    }
-    if (isInSqliteBlock) {
-      result += line + "\n";
+  return function(sql) {
+    const lines = sql.split("\n");
+    let result = "";
+    let capturing = true;
+    for (const line of lines) {
+      const trimmed = line.trim();
+      if (startRegex.test(trimmed)) {
+        capturing = true;
+        result += line + "\n";
+        continue;
+      } else if (anyDialectRegex.test(trimmed)) {
+        capturing = false;
+        continue;
+      }
+      if (!capturing && line.toLowerCase().includes("create index")) {
+        capturing = true;
+      }
+      if (capturing) {
+        result += line + "\n";
+      }
     }
-  }
-  return result;
+    return result;
+  };
 }
+var SqliteDialectParser, PgDialectParser;
 var init_MigrationDialectParser = __esm({
   "framework/MigrationDialectParser.ts"() {
+    SqliteDialectParser = markerDialectParser(["sqlite"]);
+    PgDialectParser = markerDialectParser(["pg", "postgres", "postgresql"]);
   }
 });
 
@@ -606,7 +618,7 @@ var init_MigrationDialectParser = __esm({
 function isPromiseLike(value) {
   return !!value && typeof value.then === "function";
 }
-var BaseSQLRunner, SQLRunner, SQLiteRunner;
+var BaseSQLRunner, SQLRunner, SQLiteRunner, PgRunner;
 var init_SQLRunner = __esm({
   "framework/SQLRunner.ts"() {
     BaseSQLRunner = class {
@@ -819,18 +831,125 @@ ${sql}
         });
       }
     };
+    PgRunner = class _PgRunner extends BaseSQLRunner {
+      constructor(connection) {
+        super();
+        this.connection = connection;
+      }
+      /** `?` -> `$1`, `$2`, ... outside of string literals / comments. */
+      static toPositional(sql) {
+        let out = "";
+        let n = 0;
+        let inSingle = false;
+        let inDouble = false;
+        let inLineComment = false;
+        let inBlockComment = false;
+        for (let i = 0; i < sql.length; i++) {
+          const ch = sql[i];
+          const next = sql[i + 1];
+          if (inLineComment) {
+            out += ch;
+            if (ch === "\n") inLineComment = false;
+            continue;
+          }
+          if (inBlockComment) {
+            out += ch;
+            if (ch === "*" && next === "/") {
+              out += next;
+              i++;
+              inBlockComment = false;
+            }
+            continue;
+          }
+          if (inSingle) {
+            out += ch;
+            if (ch === "'") inSingle = false;
+            continue;
+          }
+          if (inDouble) {
+            out += ch;
+            if (ch === '"') inDouble = false;
+            continue;
+          }
+          if (ch === "-" && next === "-") {
+            out += ch;
+            inLineComment = true;
+            continue;
+          }
+          if (ch === "/" && next === "*") {
+            out += ch + next;
+            i++;
+            inBlockComment = true;
+            continue;
+          }
+          if (ch === "'") {
+            out += ch;
+            inSingle = true;
+            continue;
+          }
+          if (ch === '"') {
+            out += ch;
+            inDouble = true;
+            continue;
+          }
+          if (ch === "?") {
+            out += `$${++n}`;
+            continue;
+          }
+          out += ch;
+        }
+        return out;
+      }
+      run(sql, params) {
+        return __async(this, null, function* () {
+          if (params.length > 0) {
+            return yield this.connection.query(_PgRunner.toPositional(sql), params);
+          }
+          return yield this.connection.query(sql);
+        });
+      }
+      _query(_0) {
+        return __async(this, arguments, function* (sql, params = []) {
+          const result = yield this.run(sql, params);
+          return [result.rows, result];
+        });
+      }
+      _execute(_0) {
+        return __async(this, arguments, function* (sql, params = []) {
+          var _a;
+          const result = yield this.run(sql, params);
+          return [{ changes: (_a = result.rowCount) != null ? _a : 0, lastID: void 0 }, result];
+        });
+      }
+      _end() {
+        return __async(this, null, function* () {
+          if (this.connection && typeof this.connection.end === "function") {
+            yield this.connection.end();
+          }
+        });
+      }
+    };
   }
 });
 
 // framework/MigrationRunner.ts
 import fs3 from "fs";
-import mysql from "mysql2/promise";
-import * as sqlite from "sqlite";
-import * as sqlite3 from "sqlite3";
 function toError(error) {
   if (error instanceof Error) return error;
   return new Error(String(error));
 }
+function makeRunner(database, conn) {
+  switch (database) {
+    case "sql":
+      return new SQLRunner(conn);
+    case "sqlite":
+      return new SQLiteRunner(conn);
+    case "pg":
+      return new PgRunner(conn);
+    default:
+      throw ConfigurationError.unknownDatabaseType(database);
+  }
+}
 var MigrationRunnerFactory, MySQLMigrationRunner, FileMigrationConfigReader, MigrationCreator;
 var init_MigrationRunner = __esm({
   "framework/MigrationRunner.ts"() {
@@ -856,6 +975,7 @@ var init_MigrationRunner = __esm({
       }
       static createConnection(config) {
         return __async(this, null, function* () {
+          var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
           let conn = null;
           switch (config.database) {
             case "sql":
@@ -866,7 +986,8 @@ var init_MigrationRunner = __esm({
                 password: process.env.SQL_PASSWORD
               }, config.sql);
               try {
-                conn = yield mysql.createConnection(settings);
+                const mysql = yield import("mysql2/promise");
+                conn = yield ((_b = (_a = mysql.default) == null ? void 0 : _a.createConnection) != null ? _b : mysql.createConnection)(settings);
                 return conn;
               } catch (error) {
                 throw DatabaseConnectionError.connectionFailed("sql", toError(error).message);
@@ -876,14 +997,32 @@ var init_MigrationRunner = __esm({
                 throw ConfigurationError.missingDatabaseConfiguration("sqlite");
               }
               try {
-                conn = yield sqlite.open({
+                const sqlite = yield import("sqlite");
+                const sqlite3 = yield import("sqlite3");
+                conn = yield ((_d = (_c = sqlite.default) == null ? void 0 : _c.open) != null ? _d : sqlite.open)({
                   filename: config.sqlite.database,
-                  driver: sqlite3.Database
+                  driver: (_f = (_e = sqlite3.default) == null ? void 0 : _e.Database) != null ? _f : sqlite3.Database
                 });
                 return conn;
               } catch (error) {
                 throw DatabaseConnectionError.connectionFailed("sqlite", toError(error).message);
               }
+            case "pg":
+              if (!config.pg && !process.env.DATABASE_URL) {
+                throw ConfigurationError.missingDatabaseConfiguration("pg");
+              }
+              try {
+                const pgcfg = (_g = config.pg) != null ? _g : {};
+                const connectionString = (_h = pgcfg.connectionString) != null ? _h : process.env.DATABASE_URL;
+                const settings2 = connectionString ? { connectionString, ssl: pgcfg.ssl } : __spreadProps(__spreadValues({}, pgcfg), { password: (_i = pgcfg.password) != null ? _i : process.env.PG_PASSWORD });
+                const pg = yield import("pg");
+                const Client = (_k = (_j = pg.default) == null ? void 0 : _j.Client) != null ? _k : pg.Client;
+                conn = new Client(settings2);
+                yield conn.connect();
+                return conn;
+              } catch (error) {
+                throw DatabaseConnectionError.connectionFailed("pg", toError(error).message);
+              }
             default:
               throw ConfigurationError.unknownDatabaseType(config.database);
           }
@@ -904,16 +1043,7 @@ var init_MigrationRunner = __esm({
             sqlrunner = conn;
             driverConnection = null;
           } else {
-            switch (config.database) {
-              case "sql":
-                sqlrunner = new SQLRunner(conn);
-                break;
-              case "sqlite":
-                sqlrunner = new SQLiteRunner(conn);
-                break;
-              default:
-                throw ConfigurationError.unknownDatabaseType(config.database);
-            }
+            sqlrunner = makeRunner(config.database, conn);
           }
           const setup = new MigrationSetup(sqlrunner, config);
           const read_strategy = this.getReadStategy(config);
@@ -925,17 +1055,7 @@ var init_MigrationRunner = __esm({
       createEmpty(config) {
         return __async(this, null, function* () {
           const conn = null;
-          let sqlrunner;
-          switch (config.database) {
-            case "sql":
-              sqlrunner = new SQLRunner(conn);
-              break;
-            case "sqlite":
-              sqlrunner = new SQLiteRunner(conn);
-              break;
-            default:
-              throw ConfigurationError.unknownDatabaseType(config.database);
-          }
+          const sqlrunner = makeRunner(config.database, conn);
           const setup = new MigrationSetup(sqlrunner, config);
           const read_strategy = this.getReadStategy(config);
           const migration_files = new MigrationDirectoryReader(config.migration_folder, read_strategy, sqlrunner, config.database);
@@ -948,6 +1068,8 @@ var init_MigrationRunner = __esm({
             return MySqlDialectParser;
           case "sqlite":
             return SqliteDialectParser;
+          case "pg":
+            return PgDialectParser;
           default:
             throw ConfigurationError.unknownDatabaseType(config.database);
         }
@@ -1134,6 +1256,8 @@ var init_MigrationRunner = __esm({
               config.database = "sql";
             } else if (config.sqlite) {
               config.database = "sqlite";
+            } else if (config.pg) {
+              config.database = "pg";
             } else {
               throw ConfigurationError.missingRequiredProperty("database");
             }
@@ -1189,8 +1313,10 @@ var init_MigrationRunner = __esm({
 // framework/SeedRunner.ts
 import fs4 from "fs";
 import path2 from "path";
+import { pathToFileURL } from "url";
 import Ajv from "ajv";
 import addFormats from "ajv-formats";
+import { tsImport } from "tsx/esm/api";
 function resolveAlias(name, aliasMap) {
   var _a;
   if (!aliasMap) return name;
@@ -1327,6 +1453,10 @@ function runSqlSeed(runner, resolved, direction) {
 function loadSeedModule(modulePath) {
   return __async(this, null, function* () {
     const resolved = path2.resolve(modulePath);
+    if (resolved.endsWith(".ts")) {
+      const fileUrl = pathToFileURL(resolved).href;
+      return tsImport(fileUrl, fileUrl);
+    }
     return import(resolved);
   });
 }
@@ -1426,6 +1556,10 @@ var require_cli = __commonJS({
     init_errors();
     init_SeedRunner();
     var args = MigrationCLIFactory.setup(process.argv);
+    if (args.flags.help) {
+      printUsage();
+      process.exit(0);
+    }
     if (!args.commands || args.commands.length === 0) {
       console.error("Error: No command specified");
       printUsage();