@nmakarov/cli-toolkit 0.25.0 → 0.29.0

package/dist/tasks.js

@@ -183,7 +183,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");
@@ -192,7 +192,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`);
 }
@@ -207,11 +207,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);
@@ -2705,8 +2723,7 @@ function forwardChildLogToParent(context, prefix, message) {
 }
 function buildNodeArgs(scriptPath, cliArgs) {
   const inheritedExecArgs = Array.isArray(process.execArgv) ? [...process.execArgv] : [];
-  const hasTsRuntimeInParent = inheritedExecArgs.some((arg) => /tsx|ts-node/i.test(arg));
-  return hasTsRuntimeInParent ? [...inheritedExecArgs, scriptPath, ...cliArgs] : ["--import", "tsx", scriptPath, ...cliArgs];
+  return [...inheritedExecArgs, scriptPath, ...cliArgs];
 }
 function resolveTasksTableName(context) {
   return context.tasksQueueName || context.params?.get?.("table") || "tasks";
@@ -2946,9 +2963,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, `'\\''`)}'`
@@ -3014,6 +3030,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);