@bdkinc/knex-ibmi 0.5.9 → 0.5.11

package/dist/cli.cjs

@@ -36,6 +36,9 @@ var import_fs2 = require("fs");
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_url = require("url");
+function buildTsRuntimeHelpMessage(fileName) {
+  return `TypeScript migration '${fileName}' requires a TypeScript runtime loader. Run with a TS-capable runtime (for example: \`node --import tsx\`) or precompile migrations to JavaScript.`;
+}
 var IBMiMigrationRunner = class {
   constructor(knex2, config) {
     __publicField(this, "knex");
@@ -45,9 +48,13 @@ var IBMiMigrationRunner = class {
       directory: "./migrations",
       tableName: "KNEX_MIGRATIONS",
       schemaName: void 0,
-      extension: "js",
       ...config
     };
+    if (typeof config?.extension === "string") {
+      console.warn(
+        "\u26A0\uFE0F IBMiMigrationRunner config 'extension' is ignored for discovery. The runner always discovers .js/.ts/.mjs/.cjs migration files."
+      );
+    }
   }
   getFullTableName() {
     return this.config.schemaName ? `${this.config.schemaName}.${this.config.tableName}` : this.config.tableName;
@@ -94,7 +101,18 @@ var IBMiMigrationRunner = class {
         try {
           const migrationPath = this.getMigrationPath(migrationFile);
           const fileUrl = (0, import_url.pathToFileURL)(migrationPath).href;
-          const migration = await import(`${fileUrl}?t=${Date.now()}`);
+          let migration;
+          try {
+            const moduleNs = await import(`${fileUrl}?t=${Date.now()}`);
+            migration = moduleNs.default ?? moduleNs;
+          } catch (importError) {
+            const isTsMigration = migrationFile.toLowerCase().endsWith(".ts");
+            const message = String(importError?.message || importError || "");
+            if (isTsMigration && (message.includes("Unknown file extension") || message.includes("Cannot use import statement") || message.includes("Unexpected token"))) {
+              throw new Error(buildTsRuntimeHelpMessage(migrationFile));
+            }
+            throw importError;
+          }
           if (!migration.up || typeof migration.up !== "function") {
             throw new Error(`Migration ${migrationFile} has no 'up' function`);
           }
@@ -142,7 +160,18 @@ var IBMiMigrationRunner = class {
         try {
           const migrationPath = this.getMigrationPath(migrationFile);
           const fileUrl = (0, import_url.pathToFileURL)(migrationPath).href;
-          const migration = await import(`${fileUrl}?t=${Date.now()}`);
+          let migration;
+          try {
+            const moduleNs = await import(`${fileUrl}?t=${Date.now()}`);
+            migration = moduleNs.default ?? moduleNs;
+          } catch (importError) {
+            const isTsMigration = migrationFile.toLowerCase().endsWith(".ts");
+            const message = String(importError?.message || importError || "");
+            if (isTsMigration && (message.includes("Unknown file extension") || message.includes("Cannot use import statement") || message.includes("Unexpected token"))) {
+              throw new Error(buildTsRuntimeHelpMessage(migrationFile));
+            }
+            throw importError;
+          }
           if (migration.down && typeof migration.down === "function") {
             console.log(`  \u26A1 Executing rollback...`);
             await migration.down(this.knex);
@@ -213,17 +242,12 @@ var IBMiMigrationRunner = class {
     }
   }
   getMigrationFiles() {
-    const { directory, extension } = this.config;
+    const { directory } = this.config;
     if (!import_fs.default.existsSync(directory)) {
       throw new Error(`Migration directory does not exist: ${directory}`);
     }
     const validExtensions = ["js", "ts", "mjs", "cjs"];
-    return import_fs.default.readdirSync(directory).filter((file) => {
-      if (extension && extension !== "js") {
-        return file.endsWith(`.${extension}`);
-      }
-      return validExtensions.some((ext) => file.endsWith(`.${ext}`));
-    }).sort();
+    return import_fs.default.readdirSync(directory).filter((file) => validExtensions.some((ext) => file.endsWith(`.${ext}`))).sort();
   }
   getMigrationPath(filename) {
     return import_path.default.resolve(this.config.directory, filename);
@@ -258,17 +282,19 @@ function showHelp() {
   console.log(
     "  --knexfile <file>      - Specify knexfile path (default: ./knexfile.js)"
   );
+  console.log("                         - Supports both .js and .ts knexfiles");
   console.log(
-    "                         - Supports both .js and .ts knexfiles"
+    "  -x <extension>         - File extension for new migrations (js|ts)"
   );
   console.log(
-    "  -x <extension>         - File extension for new migrations (js|ts)"
+    "  --steps <number>       - Number of migration batches to rollback"
   );
   console.log("  --help                 - Show this help message");
   console.log("");
   console.log("Examples:");
   console.log("  ibmi-migrations migrate:latest");
   console.log("  ibmi-migrations migrate:rollback");
+  console.log("  ibmi-migrations migrate:rollback --steps 2");
   console.log("  ibmi-migrations migrate:status --env production");
   console.log("  ibmi-migrations migrate:latest --knexfile knexfile.ts");
   console.log("  ibmi-migrations migrate:make create_users_table");
@@ -283,6 +309,7 @@ function parseArgs() {
     knexfile: "./knexfile.js",
     help: false,
     extension: "js",
+    steps: 1,
     migrationName: null
   };
   for (let i = 0; i < args.length; i++) {
@@ -298,8 +325,16 @@ function parseArgs() {
     } else if (arg === "-x" && args[i + 1]) {
       parsed.extension = args[i + 1];
       i++;
+    } else if ((arg === "--steps" || arg === "-s") && args[i + 1]) {
+      const parsedSteps = Number.parseInt(args[i + 1], 10);
+      if (!Number.isNaN(parsedSteps) && parsedSteps > 0) {
+        parsed.steps = parsedSteps;
+      }
+      i++;
     } else if (!parsed.command) {
       parsed.command = arg;
+    } else if (parsed.command === "migrate:rollback" && /^\d+$/.test(arg) && parsed.steps === 1) {
+      parsed.steps = Number.parseInt(arg, 10);
     } else if (parsed.command === "migrate:make" && !parsed.migrationName) {
       parsed.migrationName = arg;
     }
@@ -385,6 +420,14 @@ async function loadKnexfile(knexfilePath, environment) {
     return envConfig;
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
+    const tsFile = knexfilePath.toLowerCase().endsWith(".ts");
+    if (tsFile && (message.includes("Unknown file extension") || message.includes("Cannot use import statement") || message.includes("Unexpected token"))) {
+      console.error("\u274C Failed to load TypeScript knexfile:", knexfilePath);
+      console.error(
+        "Run with a TS-capable runtime loader (for example: `node --import tsx`) or use a compiled JavaScript knexfile."
+      );
+      process.exit(1);
+    }
     console.error("\u274C Failed to load knexfile:", message);
     console.error(`Make sure you have a valid knexfile at: ${knexfilePath}`);
     process.exit(1);
@@ -455,8 +498,7 @@ async function main() {
     const migrationConfig = {
       directory: config.migrations?.directory || "./migrations",
       tableName: config.migrations?.tableName || "KNEX_MIGRATIONS",
-      schemaName: config.migrations?.schemaName,
-      extension: config.migrations?.extension || "js"
+      schemaName: config.migrations?.schemaName
     };
     const migrationRunner = createIBMiMigrationRunner(db, migrationConfig);
     switch (command) {
@@ -465,11 +507,8 @@ async function main() {
         await migrationRunner.latest();
         break;
       case "migrate:rollback":
-        const steps = parseInt(
-          process.argv.find((_arg, i) => process.argv[i - 1] === command)?.split(" ")[1] || "1"
-        ) || 1;
-        console.log(`\u{1F504} Rolling back ${steps} migration batch(es)...`);
-        await migrationRunner.rollback(steps);
+        console.log(`\u{1F504} Rolling back ${args.steps} migration batch(es)...`);
+        await migrationRunner.rollback(args.steps);
         break;
       case "migrate:status":
         console.log("\u{1F4CB} Migration Status Report");

package/dist/index.d.mts

@@ -5,6 +5,10 @@ interface IBMiMigrationConfig {
     directory: string;
     tableName: string;
     schemaName?: string;
+    /**
+     * Deprecated for runner discovery. Kept for backward compatibility.
+     * The runner discovers .js/.ts/.mjs/.cjs migrations regardless of this value.
+     */
     extension?: string;
 }
 declare class IBMiMigrationRunner {

package/dist/index.d.ts

@@ -5,6 +5,10 @@ interface IBMiMigrationConfig {
     directory: string;
     tableName: string;
     schemaName?: string;
+    /**
+     * Deprecated for runner discovery. Kept for backward compatibility.
+     * The runner discovers .js/.ts/.mjs/.cjs migrations regardless of this value.
+     */
     extension?: string;
 }
 declare class IBMiMigrationRunner {

package/dist/index.js

@@ -508,7 +508,8 @@ var IBMiQueryCompiler = class extends import_querycompiler.default {
           updateSql: baseUpdateSql,
           selectColumns,
           whereClause: where,
-          tableName: this.tableName
+          tableName: this.tableName,
+          setBindingCount: updates.map((fragment) => (fragment.match(/\?/g) || []).length).reduce((sum, count) => sum + count, 0)
         }
       };
     }
@@ -573,6 +574,9 @@ var import_node_stream = require("stream");
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
 var import_url = require("url");
+function buildTsRuntimeHelpMessage(fileName) {
+  return `TypeScript migration '${fileName}' requires a TypeScript runtime loader. Run with a TS-capable runtime (for example: \`node --import tsx\`) or precompile migrations to JavaScript.`;
+}
 var IBMiMigrationRunner = class {
   constructor(knex2, config) {
     __publicField(this, "knex");
@@ -582,9 +586,13 @@ var IBMiMigrationRunner = class {
       directory: "./migrations",
       tableName: "KNEX_MIGRATIONS",
       schemaName: void 0,
-      extension: "js",
       ...config
     };
+    if (typeof config?.extension === "string") {
+      console.warn(
+        "\u26A0\uFE0F IBMiMigrationRunner config 'extension' is ignored for discovery. The runner always discovers .js/.ts/.mjs/.cjs migration files."
+      );
+    }
   }
   getFullTableName() {
     return this.config.schemaName ? `${this.config.schemaName}.${this.config.tableName}` : this.config.tableName;
@@ -631,7 +639,18 @@ var IBMiMigrationRunner = class {
         try {
           const migrationPath = this.getMigrationPath(migrationFile);
           const fileUrl = (0, import_url.pathToFileURL)(migrationPath).href;
-          const migration = await import(`${fileUrl}?t=${Date.now()}`);
+          let migration;
+          try {
+            const moduleNs = await import(`${fileUrl}?t=${Date.now()}`);
+            migration = moduleNs.default ?? moduleNs;
+          } catch (importError) {
+            const isTsMigration = migrationFile.toLowerCase().endsWith(".ts");
+            const message = String(importError?.message || importError || "");
+            if (isTsMigration && (message.includes("Unknown file extension") || message.includes("Cannot use import statement") || message.includes("Unexpected token"))) {
+              throw new Error(buildTsRuntimeHelpMessage(migrationFile));
+            }
+            throw importError;
+          }
           if (!migration.up || typeof migration.up !== "function") {
             throw new Error(`Migration ${migrationFile} has no 'up' function`);
           }
@@ -679,7 +698,18 @@ var IBMiMigrationRunner = class {
         try {
           const migrationPath = this.getMigrationPath(migrationFile);
           const fileUrl = (0, import_url.pathToFileURL)(migrationPath).href;
-          const migration = await import(`${fileUrl}?t=${Date.now()}`);
+          let migration;
+          try {
+            const moduleNs = await import(`${fileUrl}?t=${Date.now()}`);
+            migration = moduleNs.default ?? moduleNs;
+          } catch (importError) {
+            const isTsMigration = migrationFile.toLowerCase().endsWith(".ts");
+            const message = String(importError?.message || importError || "");
+            if (isTsMigration && (message.includes("Unknown file extension") || message.includes("Cannot use import statement") || message.includes("Unexpected token"))) {
+              throw new Error(buildTsRuntimeHelpMessage(migrationFile));
+            }
+            throw importError;
+          }
           if (migration.down && typeof migration.down === "function") {
             console.log(`  \u26A1 Executing rollback...`);
             await migration.down(this.knex);
@@ -750,17 +780,12 @@ var IBMiMigrationRunner = class {
     }
   }
   getMigrationFiles() {
-    const { directory, extension } = this.config;
+    const { directory } = this.config;
     if (!import_fs.default.existsSync(directory)) {
       throw new Error(`Migration directory does not exist: ${directory}`);
     }
     const validExtensions = ["js", "ts", "mjs", "cjs"];
-    return import_fs.default.readdirSync(directory).filter((file) => {
-      if (extension && extension !== "js") {
-        return file.endsWith(`.${extension}`);
-      }
-      return validExtensions.some((ext) => file.endsWith(`.${ext}`));
-    }).sort();
+    return import_fs.default.readdirSync(directory).filter((file) => validExtensions.some((ext) => file.endsWith(`.${ext}`))).sort();
   }
   getMigrationPath(filename) {
     return import_path.default.resolve(this.config.directory, filename);
@@ -1004,7 +1029,13 @@ var DB2Client = class extends import_knex.default.Client {
    */
   async executeUpdateReturning(connection, obj) {
     const { _ibmiUpdateReturning } = obj;
-    const { updateSql, selectColumns, whereClause, tableName } = _ibmiUpdateReturning;
+    const {
+      updateSql,
+      selectColumns,
+      whereClause,
+      tableName,
+      setBindingCount
+    } = _ibmiUpdateReturning;
     this.printDebug(
       "Executing UPDATE with returning using transaction approach"
     );
@@ -1016,10 +1047,8 @@ var DB2Client = class extends import_knex.default.Client {
       };
       await this.executeStatementQuery(connection, updateObj);
       const selectSql = whereClause ? `select ${selectColumns} from ${tableName} ${whereClause}` : `select ${selectColumns} from ${tableName}`;
-      const updateSqlParts = updateSql.split(" where ");
-      const setClausePart = updateSqlParts[0];
-      const setBindingCount = (setClausePart.match(/\?/g) || []).length;
-      const whereBindings = obj.bindings ? obj.bindings.slice(setBindingCount) : [];
+      const inferredSetBindingCount = typeof setBindingCount === "number" ? setBindingCount : (updateSql.split(" where ")[0].match(/\?/g) || []).length;
+      const whereBindings = obj.bindings ? obj.bindings.slice(inferredSetBindingCount) : [];
       const selectObj = {
         sql: selectSql,
         bindings: whereBindings,
@@ -1425,11 +1454,25 @@ var DB2Client = class extends import_knex.default.Client {
   validateResponse(obj) {
     if (!obj.response) {
       this.printDebug("response undefined " + this.safeStringify(obj));
-      return null;
+      return this.processSqlMethod({
+        ...obj,
+        response: { rows: [], rowCount: 0 }
+      });
     }
     if (!obj.response.rows) {
-      this.printError("rows undefined " + this.safeStringify(obj));
-      return null;
+      const usesRowCountOnly = !obj.select && (obj.sqlMethod === "del" /* DELETE */ || obj.sqlMethod === "delete" /* DELETE_ALT */ || obj.sqlMethod === "update" /* UPDATE */ || obj.sqlMethod === "counter" /* COUNTER */);
+      if (usesRowCountOnly) {
+        return null;
+      }
+      this.printWarn("rows undefined " + this.safeStringify(obj));
+      return this.processSqlMethod({
+        ...obj,
+        response: {
+          ...obj.response,
+          rows: [],
+          rowCount: obj.response.rowCount ?? 0
+        }
+      });
     }
     return null;
   }
@@ -1474,8 +1517,7 @@ var DB2Client = class extends import_knex.default.Client {
       return queryObject;
     } catch (retryError) {
       this.printError(`Retry failed: ${retryError.message}`);
-      queryObject.response = { rows: [], rowCount: 0 };
-      return queryObject;
+      throw this.wrapError(retryError, `${method}_retry`, queryObject);
     }
   }
   /**
@@ -1520,7 +1562,8 @@ var DB2Client = class extends import_knex.default.Client {
     return errorMessage.includes("sql") || errorMessage.includes("syntax") || errorMessage.includes("table") || errorMessage.includes("column");
   }
   processSqlMethod(obj) {
-    const { rows, rowCount } = obj.response;
+    const rows = obj.response?.rows ?? [];
+    const rowCount = obj.response?.rowCount;
     switch (obj.sqlMethod) {
       case "select" /* SELECT */:
         return rows;