@nmakarov/cli-toolkit 0.40.0 → 0.44.0

package/dist/tasks.js

@@ -372,22 +372,46 @@ async function ensureTaskTables(context, options = {}) {
       }
     }
     const { actions } = await ensureSchema(db, spec, { dryRun, logger: context.logger });
+    const legacyDrops = await dropLegacyTaskNameColumn(db, [tasksTable, historyTable], {
+      dryRun,
+      log,
+      label
+    });
+    const allActions = [...actions, ...legacyDrops];
     if (dryRun) {
-      if (actions.length === 0) {
+      if (allActions.length === 0) {
         log.info?.(`[tasks-schema] dryRun \u2014 ${label}: queue "${queueName}" already up to date; no DDL`);
       } else {
         log.info?.(
-          `[tasks-schema] dryRun \u2014 ${label}: would run ${actions.length} statement(s) for queue "${queueName}":`
+          `[tasks-schema] dryRun \u2014 ${label}: would run ${allActions.length} statement(s) for queue "${queueName}":`
         );
-        for (const s of actions) log.info?.(`  - ${s}`);
+        for (const s of allActions) log.info?.(`  - ${s}`);
       }
-    } else if (actions.length > 0) {
+    } else if (allActions.length > 0) {
       log.info?.(
-        `[tasks-schema] ${label}: applied ${actions.length} DDL statement(s) for queue "${queueName}"`
+        `[tasks-schema] ${label}: applied ${allActions.length} DDL statement(s) for queue "${queueName}"`
       );
     }
   }
 }
+async function dropLegacyTaskNameColumn(db, tableNames, { dryRun, log, label }) {
+  const actions = [];
+  for (const table of tableNames) {
+    if (!await db.tableExists(table).catch(() => false)) continue;
+    const hasTask = await db.schema.hasColumn(table, "task");
+    const hasName = await db.schema.hasColumn(table, "name");
+    if (!hasTask || !hasName) continue;
+    const sql = `ALTER TABLE "${table}" DROP COLUMN IF EXISTS "task"`;
+    actions.push(sql);
+    if (dryRun) {
+      log?.info?.(`[tasks-schema] dryRun \u2014 ${label}: ${sql}`);
+    } else {
+      await db.raw(sql);
+      log?.info?.(`[tasks-schema] ${label}: dropped legacy column ${table}.task`);
+    }
+  }
+  return actions;
+}
 async function enqueueTask(context, options) {
   const db = getDb(context);
   const queueName = options.queueName ?? "tasks";
@@ -404,7 +428,7 @@ async function enqueueTask(context, options) {
   } else if (schedule) {
     nextRunAt = nextTimeMatch(schedule, /* @__PURE__ */ new Date());
   }
-  await db(tasksTable).insert({
+  const row = {
     id,
     name,
     params: toJsonColumn(options.params ?? null),
@@ -418,9 +442,21 @@ async function enqueueTask(context, options) {
     server_name: options.serverName ?? null,
     status: "idle",
     status_changed_at: db.fn.now()
-  });
+  };
+  if (await tableHasLegacyTaskColumn(db, tasksTable)) {
+    row.task = name;
+  }
+  await db(tasksTable).insert(row);
   return id;
 }
+var legacyTaskColumnCache = /* @__PURE__ */ new Map();
+async function tableHasLegacyTaskColumn(db, tableName) {
+  const key = `${db?.config?.name ?? "db"}:${tableName}`;
+  if (!legacyTaskColumnCache.has(key)) {
+    legacyTaskColumnCache.set(key, await db.schema.hasColumn(tableName, "task"));
+  }
+  return legacyTaskColumnCache.get(key);
+}
 async function updateTaskProgress(context, tasksTable, taskId, progress) {
   const db = getDb(context);
   await db(tasksTable).where({ id: taskId }).update({
@@ -752,6 +788,9 @@ var FileDatabase = class _FileDatabase {
   currentRecord = 0;
   hasReadFirstPage = false;
   lastFileData = null;
+  /** Cache of the last JSON file parsed during paginated reads (avoid re-parse per page). */
+  readFileCache = null;
+  // { filePath: string, data: any[] } | null
   metadata;
   // Synopsis calculation functions
   fileSynopsisFunction = null;
@@ -1518,7 +1557,6 @@ var FileDatabase = class _FileDatabase {
     let effectivePageSize;
     if (nextPage && this.hasReadFirstPage) {
       effectivePageSize = pageSize || this.pageSize;
-      this.currentRecord += effectivePageSize;
     } else if (!nextPage) {
       effectivePageSize = pageSize !== void 0 ? pageSize : this.metadata.totalRecords;
       this.currentRecord = 0;
@@ -1547,8 +1585,14 @@ var FileDatabase = class _FileDatabase {
       const file = this.metadata.files[i];
       const filePath = path3.join(this.getDestinationPath(this.currentVersion || void 0), file.fileName);
       try {
-        const rawData = await fs3.promises.readFile(filePath, "utf8");
-        const fileData = deserializeData(rawData, this.metadata.dataType);
+        let fileData;
+        if (this.readFileCache?.filePath === filePath && Array.isArray(this.readFileCache.data)) {
+          fileData = this.readFileCache.data;
+        } else {
+          const rawData = await fs3.promises.readFile(filePath, "utf8");
+          fileData = deserializeData(rawData, this.metadata.dataType);
+          this.readFileCache = { filePath, data: fileData };
+        }
         let startIndex = 0;
         if (i === currentFileIndex) {
           startIndex = this.currentRecord - cumulativeRecords;
@@ -1562,6 +1606,7 @@ var FileDatabase = class _FileDatabase {
         throw new FileDatabaseError(`Failed to read file ${file.fileName}: ${error.message}`);
       }
     }
+    this.currentRecord += recordsRead;
     if (result.length > 0) {
       if (nextPage || pageSize !== void 0 && pageSize < this.metadata.totalRecords) {
         this.hasReadFirstPage = true;
@@ -1575,6 +1620,7 @@ var FileDatabase = class _FileDatabase {
   setStartRecord(startRecord) {
     this.currentRecord = startRecord - 1;
     this.hasReadFirstPage = false;
+    this.readFileCache = null;
   }
   /**
    * Reset read pagination state
@@ -1582,6 +1628,7 @@ var FileDatabase = class _FileDatabase {
   resetPagination() {
     this.currentRecord = 0;
     this.hasReadFirstPage = false;
+    this.readFileCache = null;
   }
   /**
    * List filenames in the table directory.