@nmakarov/cli-toolkit 0.27.0 → 0.32.0

package/dist/cli-runner.js

@@ -1745,7 +1745,8 @@ var Params = class _Params {
   /**
    * Resolved early in constructor so cleanup does not read params lazily.
    * One of: false (off) | "end" (print at exit) | "top" (print after init,
-   * via context.showUsedParamsIfNeeded()).
+   * via context.showUsedParamsIfNeeded()) | "stop" (print after init, then
+   * exit the process — also via context.showUsedParamsIfNeeded()).
    */
   _showUsedParamsMode = false;
   /** Guard so the dump prints at most once (top OR end, never both). */
@@ -1769,8 +1770,9 @@ var Params = class _Params {
    *   (absent) / --no-showUsedParams / =false   -> false  (off)
    *   --showUsedParams / =true                   -> "end"  (print at exit)
    *   --showUsedParams=top                       -> "top"  (print after init)
-   * Read raw (uncoerced) from args so the string "top" isn't forced to a
-   * boolean, then track it under the "script" module for the dump itself.
+   *   --showUsedParams=stop                      -> "stop" (print after init, then exit)
+   * Read raw (uncoerced) from args so the string "top"/"stop" isn't forced to
+   * a boolean, then track it under the "script" module for the dump itself.
    */
   _resolveShowUsedParams() {
     const raw = this.args.get("showUsedParams");
@@ -1780,6 +1782,8 @@ var Params = class _Params {
       mode = false;
     } else if (typeof raw === "string" && raw.trim().toLowerCase() === "top") {
       mode = "top";
+    } else if (typeof raw === "string" && raw.trim().toLowerCase() === "stop") {
+      mode = "stop";
     } else {
       const s = typeof raw === "string" ? raw.trim().toLowerCase() : raw;
       const falsey = s === false || s === "false" || s === "0" || s === "no" || s === "off";
@@ -1793,7 +1797,7 @@ var Params = class _Params {
   getShowUsedParams() {
     return this._showUsedParamsMode !== false;
   }
-  /** Resolved mode: false | "end" | "top". */
+  /** Resolved mode: false | "end" | "top" | "stop". */
   getShowUsedParamsMode() {
     return this._showUsedParamsMode;
   }
@@ -2508,9 +2512,18 @@ function setup(opts = {}) {
     // the used-params list now (after the script has initialized all its
     // own components), instead of at exit. No-op for the default mode,
     // which prints at exit via the cleanup registered by Params.
+    //
+    // --showUsedParams=stop behaves like "top" but then exits immediately —
+    // a quick "show me the figured params and quit" that skips the flow's
+    // actual work. Like --stopAfter=init, this is a hard exit(0) (registered
+    // cleanups are skipped); call it once components/params are resolved.
     showUsedParamsIfNeeded: () => {
-      if (params.getShowUsedParamsMode?.() === "top") {
-        params.printUsedParams(logger);
+      const mode = params.getShowUsedParamsMode?.();
+      if (mode !== "top" && mode !== "stop") return;
+      params.printUsedParams(logger);
+      if (mode === "stop") {
+        logger.debug?.("[showUsedParams=stop] params printed \u2014 exiting");
+        process.exit(0);
       }
     }
   };
@@ -3229,7 +3242,7 @@ function defineTasksTable(t, db, tableNameForIndex) {
   t.timestamp("past_due").defaultTo(null);
   t.text("name").notNullable();
   t.text("opid");
-  t.json("params");
+  t.jsonb("params");
   t.text("service_group");
   t.integer("instance_number");
   t.text("service_name");
@@ -3238,7 +3251,7 @@ function defineTasksTable(t, db, tableNameForIndex) {
   t.timestamp("status_changed_at").defaultTo(null);
   t.text("progress");
   t.boolean("success");
-  t.json("results");
+  t.jsonb("results");
   t.index(["service_group", "status", "priority", "created_at"], `${tableNameForIndex}_claim_idx`);
   t.index(["service_group", "name"], `${tableNameForIndex}_group_name_idx`);
 }
@@ -3253,11 +3266,29 @@ function taskHistoryInsertFromQueueRow(row, overrides) {
 async function ensureTaskTables(context, options = {}) {
   const queueName = options.queueName ?? "tasks";
   const recreate = options.recreate ?? false;
+  const dryRun = options.dryRun ?? false;
   const db = getDb(context);
+  const log = context.logger ?? console;
   const { tasksTable, historyTable, registryTable } = queueToTableNames(queueName);
   const needsTasks = recreate ? true : !await db.tableExists(tasksTable);
   const needsHistory = recreate ? true : !await db.tableExists(historyTable);
   const needsRegistry = recreate ? true : !await db.tableExists(registryTable);
+  if (dryRun) {
+    const plan = [];
+    if (recreate) {
+      plan.push(`DROP TABLE IF EXISTS ${historyTable}, ${tasksTable}, ${registryTable}`);
+    }
+    if (needsTasks) plan.push(`CREATE TABLE ${tasksTable} (tasks queue)`);
+    if (needsHistory) plan.push(`CREATE TABLE ${historyTable} (history mirror)`);
+    if (needsRegistry) plan.push(`CREATE TABLE ${registryTable} (services registry)`);
+    if (plan.length === 0) {
+      log.info?.(`[tasks-schema] dryRun \u2014 queue "${queueName}" already up to date; no DDL`);
+    } else {
+      log.info?.(`[tasks-schema] dryRun \u2014 would run ${plan.length} statement(s) for queue "${queueName}":`);
+      for (const s of plan) log.info?.(`  - ${s}`);
+    }
+    return;
+  }
   if (recreate) {
     await db.schema.dropTableIfExists(historyTable);
     await db.schema.dropTableIfExists(tasksTable);
@@ -5680,9 +5711,8 @@ async function executeClaimedTask(context, tasksTable, historyTable, row, regist
     const dbName = String(context?.params?.get?.("dbName") || "local");
     const tableName = String(context?.params?.get?.("table") || "tasks");
     const fallbackRecoverCommand = [
-      "npx",
-      "tsx",
-      "examples/tasks/recover-task.ts",
+      "node",
+      "examples/tasks/recover-task.js",
       `--dbName='${dbName.replace(/'/g, `'\\''`)}'`,
       `--table='${tableName.replace(/'/g, `'\\''`)}'`,
       `--id='${String(row.id).replace(/'/g, `'\\''`)}'`
@@ -5748,6 +5778,8 @@ async function claimNextRunnableTask(context, tasksTable, serviceGroup, registry
   const db = getDb3(context);
   let query = db(tasksTable).where({ status: "idle" }).where(function() {
     this.whereNull("service_group").orWhere({ service_group: serviceGroup });
+  }).where(function() {
+    this.whereNull("next_run_at").orWhere("next_run_at", "<=", db.fn.now());
   }).orderByRaw("CASE WHEN past_due IS NULL THEN 1 ELSE 0 END ASC").orderBy([{ column: "priority", order: "asc" }]).orderByRaw("CASE WHEN completed_at IS NULL THEN 0 ELSE 1 END ASC").orderBy([{ column: "completed_at", order: "asc" }, { column: "created_at", order: "asc" }]).limit(scanLimit);
   if (taskNames && taskNames.length > 0) {
     query = query.whereIn("name", taskNames);