@nmakarov/cli-toolkit 0.39.0 → 0.43.0

package/dist/index.cjs

@@ -2534,6 +2534,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;
@@ -3300,7 +3303,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;
@@ -3329,8 +3331,14 @@ var FileDatabase = class _FileDatabase {
       const file = this.metadata.files[i];
       const filePath = import_path4.default.join(this.getDestinationPath(this.currentVersion || void 0), file.fileName);
       try {
-        const rawData = await import_fs4.default.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 import_fs4.default.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;
@@ -3344,6 +3352,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;
@@ -3357,6 +3366,7 @@ var FileDatabase = class _FileDatabase {
   setStartRecord(startRecord) {
     this.currentRecord = startRecord - 1;
     this.hasReadFirstPage = false;
+    this.readFileCache = null;
   }
   /**
    * Reset read pagination state
@@ -3364,6 +3374,7 @@ var FileDatabase = class _FileDatabase {
   resetPagination() {
     this.currentRecord = 0;
     this.hasReadFirstPage = false;
+    this.readFileCache = null;
   }
   /**
    * List filenames in the table directory.
@@ -4109,6 +4120,41 @@ var Db = class _Db {
       }
       return stack.pop();
     };
+    const isTimeoutError = (error) => error?.name === "KnexTimeoutError" || /query timeout|timeout exceeded/i.test(String(error?.message ?? ""));
+    const logQueryEntry = (query, start, { error } = {}) => {
+      let executionTimeMs;
+      if (start) {
+        const [seconds, nanoseconds] = process.hrtime(start);
+        executionTimeMs = (seconds * 1e3 + nanoseconds / 1e6).toFixed(2);
+      } else if (error?.timeout != null) {
+        executionTimeMs = Number(error.timeout).toFixed(2);
+      } else {
+        executionTimeMs = "?";
+      }
+      let status = "ok";
+      if (error) {
+        status = isTimeoutError(error) ? "timeout" : "error";
+      }
+      const logEntry = {
+        sql: query?.sql,
+        bindings: query?.bindings || [],
+        executionTimeMs,
+        status
+      };
+      if (error) {
+        logEntry.error = error.message ?? String(error);
+      }
+      this.queriesLog.push(logEntry);
+      const suffix = error ? ` | ${status}: ${logEntry.error}` : "";
+      this.logger.debug?.(
+        `[Db] Query: ${query?.sql} | Duration: ${executionTimeMs}ms${suffix}`
+      );
+    };
+    const handleQueryError = (error, query) => {
+      const start = popStart(query);
+      logQueryEntry(query, start, { error });
+      this.logger.error?.(`[Db] Query failed: ${query?.sql}`, error);
+    };
     this.knexInstance.on("query", (query) => {
       pushStart(query);
     });
@@ -4117,20 +4163,31 @@ var Db = class _Db {
       if (!start) {
         return;
       }
-      const [seconds, nanoseconds] = process.hrtime(start);
-      const executionTimeMs = (seconds * 1e3 + nanoseconds / 1e6).toFixed(2);
-      const logEntry = {
-        sql: query.sql,
-        bindings: query.bindings || [],
-        executionTimeMs
-      };
-      this.queriesLog.push(logEntry);
-      this.logger.debug?.(`[Db] Query: ${query.sql} | Duration: ${executionTimeMs}ms`);
+      logQueryEntry(query, start);
     });
     this.knexInstance.on("query-error", (error, query) => {
-      popStart(query);
-      this.logger.error?.(`[Db] Query failed: ${query.sql}`, error);
+      handleQueryError(error, query);
     });
+    const hookBuilder = (builder) => {
+      if (!builder || builder.__dbProfilerHooked) {
+        return;
+      }
+      builder.__dbProfilerHooked = true;
+      builder.on("query", pushStart);
+      builder.on("query-error", handleQueryError);
+    };
+    const client = this.knexInstance.client;
+    if (client && !client.__dbProfilerPatched) {
+      client.__dbProfilerPatched = true;
+      if (typeof client.queryBuilder === "function") {
+        const origQueryBuilder = client.queryBuilder.bind(client);
+        client.queryBuilder = (...args) => {
+          const builder = origQueryBuilder(...args);
+          hookBuilder(builder);
+          return builder;
+        };
+      }
+    }
   }
   getQueryLog() {
     return [...this.queriesLog];