@plyaz/db 0.1.1 → 0.2.0

package/dist/index.mjs

@@ -3597,6 +3597,7 @@ var SupabaseAdapter = class {
     return ops[operator]();
   }
 };
+var SQL_ERROR_TRUNCATE_LENGTH = 500;
 var SQLAdapter = class {
   static {
     __name(this, "SQLAdapter");
@@ -3607,6 +3608,7 @@ var SQLAdapter = class {
   idColumnMap = /* @__PURE__ */ new Map();
   configIdColumns;
   defaultSchema;
+  showSqlInErrors;
   /**
    * Creates a new SQLAdapter instance.
    * @param {SQLAdapterConfig} config - Configuration for the SQL adapter.
@@ -3620,6 +3622,7 @@ var SQLAdapter = class {
   constructor(config) {
     this.config = config;
     this.defaultSchema = config.schema ?? "public";
+    this.showSqlInErrors = config.showSqlInErrors ?? true;
     this.pool = new Pool({
       connectionString: config.connectionString,
       ...config.pool
@@ -3738,16 +3741,16 @@ var SQLAdapter = class {
       const result = await this.pool.query(sql2, params);
       return result.rows;
     } catch (error) {
-      throw new DatabaseError(
-        `Failed to execute query: ${sql2} - ${error.message}`,
-        DATABASE_ERROR_CODES.QUERY_FAILED,
-        {
-          context: {
-            source: "SQLAdapter.query"
-          },
-          cause: error
-        }
-      );
+      const truncatedSql = sql2.slice(0, SQL_ERROR_TRUNCATE_LENGTH);
+      const sqlSuffix = sql2.length > SQL_ERROR_TRUNCATE_LENGTH ? "..." : "";
+      const errorMessage = this.showSqlInErrors ? `SQL Error: ${error.message}
+  Query: ${truncatedSql}${sqlSuffix}` : `SQL Error: ${error.message}`;
+      throw new DatabaseError(errorMessage, DATABASE_ERROR_CODES.QUERY_FAILED, {
+        context: {
+          source: "SQLAdapter.query"
+        },
+        cause: error
+      });
     }
   }
   /**
@@ -10418,6 +10421,10 @@ __name(DataValidationPipe, "DataValidationPipe");
 DataValidationPipe = __decorateClass([
   Injectable()
 ], DataValidationPipe);
+var DESCRIPTION_MAX_LENGTH = 60;
+var FALLBACK_DESCRIPTION_LENGTH = 50;
+var PROGRESS_LOG_INTERVAL = 10;
+var ERROR_MESSAGE_MAX_LENGTH = 300;
 var MigrationManager = class {
   static {
     __name(this, "MigrationManager");
@@ -10527,6 +10534,116 @@ var MigrationManager = class {
     }
     return { upSQL: sql2.trim(), downSQL: null };
   }
+  /**
+   * Process dollar-quoted string delimiters ($$ or $tag$)
+   * Returns updated state for tracking if we're inside a dollar block
+   */
+  processDollarDelimiters(line, inDollarBlock, dollarTag) {
+    const dollarMatch = line.match(/\$([a-zA-Z_]*)\$/g);
+    if (!dollarMatch) return { inDollarBlock, dollarTag };
+    let currentInBlock = inDollarBlock;
+    let currentTag = dollarTag;
+    for (const match of dollarMatch) {
+      if (!currentInBlock) {
+        currentInBlock = true;
+        currentTag = match;
+      } else if (match === currentTag) {
+        currentInBlock = false;
+        currentTag = "";
+      }
+    }
+    return { inDollarBlock: currentInBlock, dollarTag: currentTag };
+  }
+  /**
+   * Filter out comment-only statements
+   */
+  isNonCommentStatement(statement) {
+    const withoutComments = statement.replace(/--.*$/gm, "").trim();
+    return withoutComments.length > 0;
+  }
+  /**
+   * Split SQL into individual statements for better error reporting
+   * Handles $$ delimited blocks (functions, triggers) correctly
+   */
+  splitSqlStatements(sql2) {
+    const statements = [];
+    let current = "";
+    let inDollarBlock = false;
+    let dollarTag = "";
+    for (const line of sql2.split("\n")) {
+      const trimmedLine = line.trim();
+      const isEmptyOrComment = trimmedLine === "" || trimmedLine.startsWith("--");
+      current += line + "\n";
+      if (isEmptyOrComment) continue;
+      const dollarState = this.processDollarDelimiters(line, inDollarBlock, dollarTag);
+      inDollarBlock = dollarState.inDollarBlock;
+      dollarTag = dollarState.dollarTag;
+      const isEndOfStatement = !inDollarBlock && trimmedLine.endsWith(";");
+      if (isEndOfStatement && current.trim()) {
+        statements.push(current.trim());
+        current = "";
+      }
+    }
+    if (current.trim()) {
+      statements.push(current.trim());
+    }
+    return statements.filter((s) => this.isNonCommentStatement(s));
+  }
+  /**
+   * Extract a short description from a SQL statement for logging
+   */
+  getStatementDescription(statement) {
+    const firstLine = statement.split("\n").find((l) => l.trim() && !l.trim().startsWith("--"))?.trim() ?? "";
+    const patterns = [
+      /^(CREATE\s+(?:OR\s+REPLACE\s+)?(?:TABLE|INDEX|UNIQUE\s+INDEX|TYPE|FUNCTION|TRIGGER|EXTENSION|SCHEMA|VIEW|POLICY))\s+(?:IF\s+NOT\s+EXISTS\s+)?([^\s(]+)/i,
+      /^(ALTER\s+TABLE)\s+([^\s]+)/i,
+      /^(DROP\s+(?:TABLE|INDEX|TYPE|FUNCTION|TRIGGER|EXTENSION|SCHEMA|VIEW|POLICY))\s+(?:IF\s+EXISTS\s+)?([^\s(;]+)/i,
+      /^(INSERT\s+INTO)\s+([^\s(]+)/i,
+      /^(COMMENT\s+ON\s+(?:TABLE|COLUMN|INDEX|FUNCTION|TYPE))\s+([^\s]+)/i,
+      /^(GRANT|REVOKE)\s+.+\s+ON\s+([^\s]+)/i
+    ];
+    for (const pattern of patterns) {
+      const match = firstLine.match(pattern);
+      if (match) {
+        return `${match[1]} ${match[2]}`.slice(0, DESCRIPTION_MAX_LENGTH);
+      }
+    }
+    const truncated = firstLine.slice(0, FALLBACK_DESCRIPTION_LENGTH);
+    const suffix = firstLine.length > FALLBACK_DESCRIPTION_LENGTH ? "..." : "";
+    return truncated + suffix;
+  }
+  /**
+   * Execute SQL statements individually with better error reporting
+   */
+  async executeSqlStatements(adapter, sql2, migrationVersion) {
+    const statements = this.splitSqlStatements(sql2);
+    const total = statements.length;
+    console.log(`  → ${total} statements to execute`);
+    for (let i = 0; i < statements.length; i++) {
+      const statement = statements[i];
+      const description = this.getStatementDescription(statement);
+      try {
+        await adapter.query(statement);
+        const isInterval = (i + 1) % PROGRESS_LOG_INTERVAL === 0;
+        const isLast = i === total - 1;
+        const isSignificant = Boolean(description.match(/^(CREATE TABLE|CREATE FUNCTION|CREATE TRIGGER)/i));
+        if (isInterval || isLast || isSignificant) {
+          console.log(`  ✓ [${i + 1}/${total}] ${description}`);
+        }
+      } catch (error) {
+        console.log(`  ✗ [${i + 1}/${total}] ${description}`);
+        const rawMessage = error.message;
+        const errorMessage = rawMessage.replace(/^SQL Error:\s*/i, "").replace(/^Failed to execute query:.*?-\s*/i, "").slice(0, ERROR_MESSAGE_MAX_LENGTH);
+        throw new DatabaseError(
+          `Migration ${migrationVersion} failed at statement ${i + 1}/${total}:
+  Statement: ${description}
+  Error: ${errorMessage}`,
+          DATABASE_ERROR_CODES.QUERY_FAILED,
+          { cause: error }
+        );
+      }
+    }
+  }
   /**
    * Load SQL migration from file
    */
@@ -10538,12 +10655,20 @@ var MigrationManager = class {
       name: migrationFile.name,
       up: /* @__PURE__ */ __name(async (adapter) => {
         if (typeof adapter.query === "function") {
-          await adapter.query(upSQL);
+          await this.executeSqlStatements(
+            adapter,
+            upSQL,
+            migrationFile.version
+          );
         }
       }, "up"),
       down: /* @__PURE__ */ __name(async (adapter) => {
         if (downSQL && typeof adapter.query === "function") {
-          await adapter.query(downSQL);
+          await this.executeSqlStatements(
+            adapter,
+            downSQL,
+            migrationFile.version
+          );
         } else {
           console.warn(
             `[Migrations] No DOWN migration for ${migrationFile.version}`
@@ -10650,6 +10775,7 @@ var MigrationManager = class {
   /**
    * Run all pending migrations
    */
+  /* eslint-disable max-depth, complexity */
   async up(targetVersion) {
     try {
       await this.initialize();
@@ -10670,9 +10796,15 @@ var MigrationManager = class {
         const migration = await this.loadMigration(migrationFile);
         const startTime = Date.now();
         if (typeof this.adapter.transaction === "function") {
-          await this.adapter.transaction(async () => {
+          const txResult = await this.adapter.transaction(async () => {
             await migration.up(this.adapter);
           });
+          if (!txResult.success) {
+            throw txResult.error ?? new DatabaseError(
+              `Migration ${migration.version} failed`,
+              DATABASE_ERROR_CODES.QUERY_FAILED
+            );
+          }
         } else {
           await migration.up(this.adapter);
         }
@@ -10727,9 +10859,15 @@ var MigrationManager = class {
         const migration = await this.loadMigration(migrationFile);
         const startTime = Date.now();
         if (typeof this.adapter.transaction === "function") {
-          await this.adapter.transaction(async () => {
+          const txResult = await this.adapter.transaction(async () => {
             await migration.down(this.adapter);
           });
+          if (!txResult.success) {
+            throw txResult.error ?? new DatabaseError(
+              `Rollback ${appliedMigration.version} failed`,
+              DATABASE_ERROR_CODES.QUERY_FAILED
+            );
+          }
         } else {
           await migration.down(this.adapter);
         }
@@ -10788,6 +10926,10 @@ var MigrationManager = class {
     }
   }
 };
+var DESCRIPTION_MAX_LENGTH2 = 60;
+var FALLBACK_DESCRIPTION_LENGTH2 = 50;
+var PROGRESS_LOG_INTERVAL2 = 10;
+var ERROR_MESSAGE_MAX_LENGTH2 = 300;
 var SeedManager = class {
   static {
     __name(this, "SeedManager");
@@ -10856,7 +10998,7 @@ var SeedManager = class {
     const files = fs.readdirSync(this.seedsPath);
     const seeds = [];
     for (const file of files) {
-      const match = file.match(/^(\d+)_(.+)\.(ts|js)$/);
+      const match = file.match(/^(\d+)_(.+)\.(ts|js|sql)$/);
       if (match) {
         const [, order, name] = match;
         seeds.push({
@@ -10869,9 +11011,137 @@ var SeedManager = class {
     return seeds.sort((a, b) => a.order - b.order);
   }
   /**
-   * Load seed from file
+   * Process dollar-quoted string delimiters ($$ or $tag$)
+   */
+  processDollarDelimiters(line, inDollarBlock, dollarTag) {
+    const dollarMatch = line.match(/\$([a-zA-Z_]*)\$/g);
+    if (!dollarMatch) return { inDollarBlock, dollarTag };
+    let currentInBlock = inDollarBlock;
+    let currentTag = dollarTag;
+    for (const match of dollarMatch) {
+      if (!currentInBlock) {
+        currentInBlock = true;
+        currentTag = match;
+      } else if (match === currentTag) {
+        currentInBlock = false;
+        currentTag = "";
+      }
+    }
+    return { inDollarBlock: currentInBlock, dollarTag: currentTag };
+  }
+  /**
+   * Filter out comment-only statements
+   */
+  isNonCommentStatement(statement) {
+    const withoutComments = statement.replace(/--.*$/gm, "").trim();
+    return withoutComments.length > 0;
+  }
+  /**
+   * Split SQL into individual statements for better error reporting
+   */
+  splitSqlStatements(sql2) {
+    const statements = [];
+    let current = "";
+    let inDollarBlock = false;
+    let dollarTag = "";
+    for (const line of sql2.split("\n")) {
+      const trimmedLine = line.trim();
+      const isEmptyOrComment = trimmedLine === "" || trimmedLine.startsWith("--");
+      current += line + "\n";
+      if (isEmptyOrComment) continue;
+      const dollarState = this.processDollarDelimiters(line, inDollarBlock, dollarTag);
+      inDollarBlock = dollarState.inDollarBlock;
+      dollarTag = dollarState.dollarTag;
+      if (!inDollarBlock && trimmedLine.endsWith(";") && current.trim()) {
+        statements.push(current.trim());
+        current = "";
+      }
+    }
+    if (current.trim()) {
+      statements.push(current.trim());
+    }
+    return statements.filter((s) => this.isNonCommentStatement(s));
+  }
+  /**
+   * Extract a short description from a SQL statement for logging
+   */
+  getStatementDescription(statement) {
+    const firstLine = statement.split("\n").find((l) => l.trim() && !l.trim().startsWith("--"))?.trim() ?? "";
+    const patterns = [
+      /^(CREATE\s+(?:OR\s+REPLACE\s+)?(?:TABLE|INDEX|UNIQUE\s+INDEX|TYPE|FUNCTION|TRIGGER|EXTENSION|SCHEMA|VIEW|POLICY))\s+(?:IF\s+NOT\s+EXISTS\s+)?([^\s(]+)/i,
+      /^(ALTER\s+TABLE)\s+([^\s]+)/i,
+      /^(DROP\s+(?:TABLE|INDEX|TYPE|FUNCTION|TRIGGER|EXTENSION|SCHEMA|VIEW|POLICY))\s+(?:IF\s+EXISTS\s+)?([^\s(;]+)/i,
+      /^(INSERT\s+INTO)\s+([^\s(]+)/i,
+      /^(COMMENT\s+ON\s+(?:TABLE|COLUMN|INDEX|FUNCTION|TYPE))\s+([^\s]+)/i,
+      /^(GRANT|REVOKE)\s+.+\s+ON\s+([^\s]+)/i
+    ];
+    for (const pattern of patterns) {
+      const match = firstLine.match(pattern);
+      if (match) {
+        return `${match[1]} ${match[2]}`.slice(0, DESCRIPTION_MAX_LENGTH2);
+      }
+    }
+    const truncated = firstLine.slice(0, FALLBACK_DESCRIPTION_LENGTH2);
+    const suffix = firstLine.length > FALLBACK_DESCRIPTION_LENGTH2 ? "..." : "";
+    return truncated + suffix;
+  }
+  /**
+   * Execute SQL statements individually with better error reporting
+   */
+  async executeSqlStatements(sql2, seedName) {
+    const statements = this.splitSqlStatements(sql2);
+    const total = statements.length;
+    console.log(`  → ${total} statements to execute`);
+    for (let i = 0; i < statements.length; i++) {
+      const statement = statements[i];
+      const description = this.getStatementDescription(statement);
+      try {
+        await this.adapter.query(statement);
+        const isInterval = (i + 1) % PROGRESS_LOG_INTERVAL2 === 0;
+        const isLast = i === total - 1;
+        const isSignificant = Boolean(description.match(/^(INSERT INTO)/i));
+        if (isInterval || isLast || isSignificant) {
+          console.log(`  ✓ [${i + 1}/${total}] ${description}`);
+        }
+      } catch (error) {
+        console.log(`  ✗ [${i + 1}/${total}] ${description}`);
+        const rawMessage = error.message;
+        const errorMessage = rawMessage.replace(/^SQL Error:\s*/i, "").replace(/^Failed to execute query:.*?-\s*/i, "").slice(0, ERROR_MESSAGE_MAX_LENGTH2);
+        throw new DatabaseError(
+          `Seed "${seedName}" failed at statement ${i + 1}/${total}:
+  Statement: ${description}
+  Error: ${errorMessage}`,
+          DATABASE_ERROR_CODES.QUERY_FAILED,
+          { cause: error }
+        );
+      }
+    }
+  }
+  /**
+   * Load SQL seed from file
+   */
+  loadSqlSeed(seedFile) {
+    const sql2 = fs.readFileSync(seedFile.filePath, "utf-8");
+    return {
+      name: seedFile.name,
+      run: /* @__PURE__ */ __name(async () => {
+        if (typeof this.adapter.query === "function") {
+          await this.executeSqlStatements(sql2, seedFile.name);
+        }
+      }, "run"),
+      // SQL seeds don't have cleanup by default
+      cleanup: void 0
+    };
+  }
+  /**
+   * Load seed from file (supports .ts, .js, and .sql)
    */
+  // eslint-disable-next-line complexity
   async loadSeed(seedFile) {
+    const ext = path.extname(seedFile.filePath);
+    if (ext === ".sql") {
+      return this.loadSqlSeed(seedFile);
+    }
     const importPath = seedFile.filePath.startsWith("/") ? seedFile.filePath : new URL(`file:///${seedFile.filePath.replace(/\\/g, "/")}`).href;
     const seedModule = await import(importPath);
     return {
@@ -10925,9 +11195,15 @@ var SeedManager = class {
    */
   async executeSeed(seed) {
     if (typeof this.adapter.transaction === "function") {
-      await this.adapter.transaction(async () => {
+      const txResult = await this.adapter.transaction(async () => {
         await seed.run(this.adapter);
       });
+      if (!txResult.success) {
+        throw txResult.error ?? new DatabaseError(
+          `Seed ${seed.name} failed`,
+          DATABASE_ERROR_CODES.QUERY_FAILED
+        );
+      }
     } else {
       await seed.run(this.adapter);
     }
@@ -10984,9 +11260,15 @@ var SeedManager = class {
   async executeCleanup(seed) {
     if (!seed.cleanup) return;
     if (typeof this.adapter.transaction === "function") {
-      await this.adapter.transaction(async () => {
+      const txResult = await this.adapter.transaction(async () => {
         await seed.cleanup(this.adapter);
       });
+      if (!txResult.success) {
+        throw txResult.error ?? new DatabaseError(
+          `Seed cleanup for ${seed.name} failed`,
+          DATABASE_ERROR_CODES.QUERY_FAILED
+        );
+      }
     } else {
       await seed.cleanup(this.adapter);
     }