@mastra/pg 0.10.2-alpha.0 → 0.10.2-alpha.2

package/dist/index.cjs

@@ -944,6 +944,11 @@ var PostgresStore = class extends storage.MastraStorage {
       }
     );
   }
+  get supports() {
+    return {
+      selectByIncludeResourceScope: true
+    };
+  }
   getTableName(indexName) {
     const parsedIndexName = utils.parseSqlIdentifier(indexName, "table name");
     const parsedSchemaName = this.schema ? utils.parseSqlIdentifier(this.schema, "schema name") : void 0;
@@ -1000,18 +1005,23 @@ var PostgresStore = class extends storage.MastraStorage {
       throw error;
     }
   }
+  /**
+   * @deprecated use getTracesPaginated instead
+   */
   async getTraces(args) {
-    const {
-      name,
-      scope,
-      page,
-      perPage: perPageInput,
-      attributes,
-      filters,
-      fromDate,
-      toDate,
-      returnPaginationResults
-    } = args;
+    if (args.fromDate || args.toDate) {
+      args.dateRange = {
+        start: args.fromDate,
+        end: args.toDate
+      };
+    }
+    const result = await this.getTracesPaginated(args);
+    return result.traces;
+  }
+  async getTracesPaginated(args) {
+    const { name, scope, page = 0, perPage: perPageInput, attributes, filters, dateRange } = args;
+    const fromDate = dateRange?.start;
+    const toDate = dateRange?.end;
     const perPage = perPageInput !== void 0 ? perPageInput : 100;
     const currentOffset = page * perPage;
     const queryParams = [];
@@ -1051,7 +1061,7 @@ var PostgresStore = class extends storage.MastraStorage {
     const countQuery = `SELECT COUNT(*) FROM ${this.getTableName(storage.TABLE_TRACES)} ${whereClause}`;
     const countResult = await this.db.one(countQuery, queryParams);
     const total = parseInt(countResult.count, 10);
-    if (total === 0 && returnPaginationResults) {
+    if (total === 0) {
       return {
         traces: [],
         total: 0,
@@ -1059,10 +1069,10 @@ var PostgresStore = class extends storage.MastraStorage {
         perPage,
         hasMore: false
       };
-    } else if (total === 0) {
-      return [];
     }
-    const dataQuery = `SELECT * FROM ${this.getTableName(storage.TABLE_TRACES)} ${whereClause} ORDER BY "createdAt" DESC LIMIT $${paramIndex++} OFFSET $${paramIndex++}`;
+    const dataQuery = `SELECT * FROM ${this.getTableName(
+      storage.TABLE_TRACES
+    )} ${whereClause} ORDER BY "createdAt" DESC LIMIT $${paramIndex++} OFFSET $${paramIndex++}`;
     const finalQueryParams = [...queryParams, perPage, currentOffset];
     const rows = await this.db.manyOrNone(dataQuery, finalQueryParams);
     const traces = rows.map((row) => ({
@@ -1081,17 +1091,13 @@ var PostgresStore = class extends storage.MastraStorage {
       other: row.other,
       createdAt: row.createdAt
     }));
-    if (returnPaginationResults) {
-      return {
-        traces,
-        total,
-        page,
-        perPage,
-        hasMore: currentOffset + traces.length < total
-      };
-    } else {
-      return traces;
-    }
+    return {
+      traces,
+      total,
+      page,
+      perPage,
+      hasMore: currentOffset + traces.length < total
+    };
   }
   async setupSchema() {
     if (!this.schema || this.schemaSetupComplete) {
@@ -1170,6 +1176,48 @@ var PostgresStore = class extends storage.MastraStorage {
       throw error;
     }
   }
+  getDefaultValue(type) {
+    switch (type) {
+      case "timestamp":
+        return "DEFAULT NOW()";
+      case "jsonb":
+        return "DEFAULT '{}'::jsonb";
+      default:
+        return super.getDefaultValue(type);
+    }
+  }
+  /**
+   * Alters table schema to add columns if they don't exist
+   * @param tableName Name of the table
+   * @param schema Schema of the table
+   * @param ifNotExists Array of column names to add if they don't exist
+   */
+  async alterTable({
+    tableName,
+    schema,
+    ifNotExists
+  }) {
+    const fullTableName = this.getTableName(tableName);
+    try {
+      for (const columnName of ifNotExists) {
+        if (schema[columnName]) {
+          const columnDef = schema[columnName];
+          const sqlType = this.getSqlType(columnDef.type);
+          const nullable = columnDef.nullable === false ? "NOT NULL" : "";
+          const defaultValue = columnDef.nullable === false ? this.getDefaultValue(columnDef.type) : "";
+          const parsedColumnName = utils.parseSqlIdentifier(columnName, "column name");
+          const alterSql = `ALTER TABLE ${fullTableName} ADD COLUMN IF NOT EXISTS "${parsedColumnName}" ${sqlType} ${nullable} ${defaultValue}`.trim();
+          await this.db.none(alterSql);
+          this.logger?.debug?.(`Ensured column ${parsedColumnName} exists in table ${fullTableName}`);
+        }
+      }
+    } catch (error) {
+      this.logger?.error?.(
+        `Error altering table ${tableName}: ${error instanceof Error ? error.message : String(error)}`
+      );
+      throw new Error(`Failed to alter table ${tableName}: ${error}`);
+    }
+  }
   async clearTable({ tableName }) {
     try {
       await this.db.none(`TRUNCATE TABLE ${this.getTableName(tableName)} CASCADE`);
@@ -1245,58 +1293,65 @@ var PostgresStore = class extends storage.MastraStorage {
       throw error;
     }
   }
+  /**
+   * @deprecated use getThreadsByResourceIdPaginated instead
+   */
   async getThreadsByResourceId(args) {
-    const { resourceId, page, perPage: perPageInput } = args;
+    const { resourceId } = args;
     try {
       const baseQuery = `FROM ${this.getTableName(storage.TABLE_THREADS)} WHERE "resourceId" = $1`;
       const queryParams = [resourceId];
-      if (page !== void 0) {
-        const perPage = perPageInput !== void 0 ? perPageInput : 100;
-        const currentOffset = page * perPage;
-        const countQuery = `SELECT COUNT(*) ${baseQuery}`;
-        const countResult = await this.db.one(countQuery, queryParams);
-        const total = parseInt(countResult.count, 10);
-        if (total === 0) {
-          return {
-            threads: [],
-            total: 0,
-            page,
-            perPage,
-            hasMore: false
-          };
-        }
-        const dataQuery = `SELECT id, "resourceId", title, metadata, "createdAt", "updatedAt" ${baseQuery} ORDER BY "createdAt" DESC LIMIT $2 OFFSET $3`;
-        const rows = await this.db.manyOrNone(dataQuery, [...queryParams, perPage, currentOffset]);
-        const threads = (rows || []).map((thread) => ({
-          ...thread,
-          metadata: typeof thread.metadata === "string" ? JSON.parse(thread.metadata) : thread.metadata,
-          createdAt: thread.createdAt,
-          // Assuming already Date objects or ISO strings
-          updatedAt: thread.updatedAt
-        }));
+      const dataQuery = `SELECT id, "resourceId", title, metadata, "createdAt", "updatedAt" ${baseQuery} ORDER BY "createdAt" DESC`;
+      const rows = await this.db.manyOrNone(dataQuery, queryParams);
+      return (rows || []).map((thread) => ({
+        ...thread,
+        metadata: typeof thread.metadata === "string" ? JSON.parse(thread.metadata) : thread.metadata,
+        createdAt: thread.createdAt,
+        updatedAt: thread.updatedAt
+      }));
+    } catch (error) {
+      this.logger.error(`Error getting threads for resource ${resourceId}:`, error);
+      return [];
+    }
+  }
+  async getThreadsByResourceIdPaginated(args) {
+    const { resourceId, page = 0, perPage: perPageInput } = args;
+    try {
+      const baseQuery = `FROM ${this.getTableName(storage.TABLE_THREADS)} WHERE "resourceId" = $1`;
+      const queryParams = [resourceId];
+      const perPage = perPageInput !== void 0 ? perPageInput : 100;
+      const currentOffset = page * perPage;
+      const countQuery = `SELECT COUNT(*) ${baseQuery}`;
+      const countResult = await this.db.one(countQuery, queryParams);
+      const total = parseInt(countResult.count, 10);
+      if (total === 0) {
         return {
-          threads,
-          total,
+          threads: [],
+          total: 0,
           page,
           perPage,
-          hasMore: currentOffset + threads.length < total
+          hasMore: false
         };
-      } else {
-        const dataQuery = `SELECT id, "resourceId", title, metadata, "createdAt", "updatedAt" ${baseQuery} ORDER BY "createdAt" DESC`;
-        const rows = await this.db.manyOrNone(dataQuery, queryParams);
-        return (rows || []).map((thread) => ({
-          ...thread,
-          metadata: typeof thread.metadata === "string" ? JSON.parse(thread.metadata) : thread.metadata,
-          createdAt: thread.createdAt,
-          updatedAt: thread.updatedAt
-        }));
       }
+      const dataQuery = `SELECT id, "resourceId", title, metadata, "createdAt", "updatedAt" ${baseQuery} ORDER BY "createdAt" DESC LIMIT $2 OFFSET $3`;
+      const rows = await this.db.manyOrNone(dataQuery, [...queryParams, perPage, currentOffset]);
+      const threads = (rows || []).map((thread) => ({
+        ...thread,
+        metadata: typeof thread.metadata === "string" ? JSON.parse(thread.metadata) : thread.metadata,
+        createdAt: thread.createdAt,
+        // Assuming already Date objects or ISO strings
+        updatedAt: thread.updatedAt
+      }));
+      return {
+        threads,
+        total,
+        page,
+        perPage,
+        hasMore: currentOffset + threads.length < total
+      };
     } catch (error) {
       this.logger.error(`Error getting threads for resource ${resourceId}:`, error);
-      if (page !== void 0) {
-        return { threads: [], total: 0, page, perPage: perPageInput || 100, hasMore: false };
-      }
-      return [];
+      return { threads: [], total: 0, page, perPage: perPageInput || 100, hasMore: false };
     }
   }
   async saveThread({ thread }) {
@@ -1377,144 +1432,156 @@ var PostgresStore = class extends storage.MastraStorage {
     }
   }
   async getMessages(args) {
-    const { threadId, format, page, perPage: perPageInput, fromDate, toDate, selectBy } = args;
+    const { threadId, format, selectBy } = args;
     const selectStatement = `SELECT id, content, role, type, "createdAt", thread_id AS "threadId"`;
     const orderByStatement = `ORDER BY "createdAt" DESC`;
     try {
-      if (page !== void 0) {
-        const perPage = perPageInput !== void 0 ? perPageInput : 40;
-        const currentOffset = page * perPage;
-        const conditions = [`thread_id = $1`];
-        const queryParams = [threadId];
-        let paramIndex = 2;
-        if (fromDate) {
-          conditions.push(`"createdAt" >= $${paramIndex++}`);
-          queryParams.push(fromDate);
-        }
-        if (toDate) {
-          conditions.push(`"createdAt" <= $${paramIndex++}`);
-          queryParams.push(toDate);
-        }
-        const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
-        const countQuery = `SELECT COUNT(*) FROM ${this.getTableName(storage.TABLE_MESSAGES)} ${whereClause}`;
-        const countResult = await this.db.one(countQuery, queryParams);
-        const total = parseInt(countResult.count, 10);
-        if (total === 0) {
-          return {
-            messages: [],
-            total: 0,
-            page,
-            perPage,
-            hasMore: false
-          };
-        }
-        const dataQuery = `${selectStatement} FROM ${this.getTableName(storage.TABLE_MESSAGES)} ${whereClause} ${orderByStatement} LIMIT $${paramIndex++} OFFSET $${paramIndex++}`;
-        const rows = await this.db.manyOrNone(dataQuery, [...queryParams, perPage, currentOffset]);
-        const fetchedMessages = (rows || []).map((message) => {
-          if (typeof message.content === "string") {
-            try {
-              message.content = JSON.parse(message.content);
-            } catch {
-            }
-          }
-          if (message.type === "v2") delete message.type;
-          return message;
-        });
-        const messagesToReturn = format === "v2" ? fetchedMessages.map(
-          (m) => ({
-            ...m,
-            content: m.content || { format: 2, parts: [{ type: "text", text: "" }] }
-          })
-        ) : fetchedMessages;
-        return {
-          messages: messagesToReturn,
-          total,
-          page,
-          perPage,
-          hasMore: currentOffset + fetchedMessages.length < total
-        };
-      } else {
-        let rows = [];
-        const include = selectBy?.include || [];
-        if (include.length) {
-          rows = await this.db.manyOrNone(
+      let rows = [];
+      const include = selectBy?.include || [];
+      if (include.length) {
+        const unionQueries = [];
+        const params = [];
+        let paramIdx = 1;
+        for (const inc of include) {
+          const { id, withPreviousMessages = 0, withNextMessages = 0 } = inc;
+          const searchId = inc.threadId || threadId;
+          unionQueries.push(
             `
-            WITH ordered_messages AS (
-              SELECT 
-                *,
-                ROW_NUMBER() OVER (${orderByStatement}) as row_num
-              FROM ${this.getTableName(storage.TABLE_MESSAGES)}
-              WHERE thread_id = $1
-            )
-            SELECT
-              m.id, 
-              m.content, 
-              m.role, 
-              m.type,
-              m."createdAt", 
-              m.thread_id AS "threadId"
-            FROM ordered_messages m
-            WHERE m.id = ANY($2)
-            OR EXISTS (
-              SELECT 1 FROM ordered_messages target
-              WHERE target.id = ANY($2)
-              AND (
-                -- Get previous messages based on the max withPreviousMessages
-                (m.row_num <= target.row_num + $3 AND m.row_num > target.row_num)
-                OR
-                -- Get next messages based on the max withNextMessages
-                (m.row_num >= target.row_num - $4 AND m.row_num < target.row_num)
+            SELECT * FROM (
+              WITH ordered_messages AS (
+                SELECT 
+                  *,
+                  ROW_NUMBER() OVER (${orderByStatement}) as row_num
+                FROM ${this.getTableName(storage.TABLE_MESSAGES)}
+                WHERE thread_id = $${paramIdx}
               )
-            )
-            ORDER BY m."createdAt" ASC 
-            `,
+              SELECT
+                m.id, 
+                m.content, 
+                m.role, 
+                m.type,
+                m."createdAt", 
+                m.thread_id AS "threadId",
+                m."resourceId"
+              FROM ordered_messages m
+              WHERE m.id = $${paramIdx + 1}
+              OR EXISTS (
+                SELECT 1 FROM ordered_messages target
+                WHERE target.id = $${paramIdx + 1}
+                AND (
+                  -- Get previous messages based on the max withPreviousMessages
+                  (m.row_num <= target.row_num + $${paramIdx + 2} AND m.row_num > target.row_num)
+                  OR
+                  -- Get next messages based on the max withNextMessages
+                  (m.row_num >= target.row_num - $${paramIdx + 3} AND m.row_num < target.row_num)
+                )
+              )
+            ) 
+            `
             // Keep ASC for final sorting after fetching context
-            [
-              threadId,
-              include.map((i) => i.id),
-              Math.max(0, ...include.map((i) => i.withPreviousMessages || 0)),
-              // Ensure non-negative
-              Math.max(0, ...include.map((i) => i.withNextMessages || 0))
-              // Ensure non-negative
-            ]
           );
-        } else {
-          const limit = typeof selectBy?.last === `number` ? selectBy.last : 40;
-          if (limit === 0 && selectBy?.last !== false) ; else {
-            let query = `${selectStatement} FROM ${this.getTableName(storage.TABLE_MESSAGES)} WHERE thread_id = $1 ${orderByStatement}`;
-            const queryParams = [threadId];
-            if (limit !== void 0 && selectBy?.last !== false) {
-              query += ` LIMIT $2`;
-              queryParams.push(limit);
-            }
-            rows = await this.db.manyOrNone(query, queryParams);
-          }
+          params.push(searchId, id, withPreviousMessages, withNextMessages);
+          paramIdx += 4;
         }
-        const fetchedMessages = (rows || []).map((message) => {
-          if (typeof message.content === "string") {
-            try {
-              message.content = JSON.parse(message.content);
-            } catch {
-            }
-          }
-          if (message.type === "v2") delete message.type;
-          return message;
-        });
-        const sortedMessages = fetchedMessages.sort(
-          (a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()
+        const finalQuery = unionQueries.join(" UNION ALL ") + ' ORDER BY "createdAt" ASC';
+        const includedRows = await this.db.manyOrNone(finalQuery, params);
+        const dedupedRows = Object.values(
+          includedRows.reduce(
+            (acc, row) => {
+              acc[row.id] = row;
+              return acc;
+            },
+            {}
+          )
         );
-        return format === "v2" ? sortedMessages.map(
-          (m) => ({ ...m, content: m.content || { format: 2, parts: [{ type: "text", text: "" }] } })
-        ) : sortedMessages;
+        rows = dedupedRows;
+      } else {
+        const limit = typeof selectBy?.last === `number` ? selectBy.last : 40;
+        if (limit === 0 && selectBy?.last !== false) ; else {
+          let query = `${selectStatement} FROM ${this.getTableName(
+            storage.TABLE_MESSAGES
+          )} WHERE thread_id = $1 ${orderByStatement}`;
+          const queryParams = [threadId];
+          if (limit !== void 0 && selectBy?.last !== false) {
+            query += ` LIMIT $2`;
+            queryParams.push(limit);
+          }
+          rows = await this.db.manyOrNone(query, queryParams);
+        }
       }
+      const fetchedMessages = (rows || []).map((message) => {
+        if (typeof message.content === "string") {
+          try {
+            message.content = JSON.parse(message.content);
+          } catch {
+          }
+        }
+        if (message.type === "v2") delete message.type;
+        return message;
+      });
+      const sortedMessages = fetchedMessages.sort(
+        (a, b) => new Date(a.createdAt).getTime() - new Date(b.createdAt).getTime()
+      );
+      return format === "v2" ? sortedMessages.map(
+        (m) => ({ ...m, content: m.content || { format: 2, parts: [{ type: "text", text: "" }] } })
+      ) : sortedMessages;
     } catch (error) {
       this.logger.error("Error getting messages:", error);
-      if (page !== void 0) {
-        return { messages: [], total: 0, page, perPage: perPageInput || 40, hasMore: false };
-      }
       return [];
     }
   }
+  async getMessagesPaginated(args) {
+    const { threadId, format, selectBy } = args;
+    const { page = 0, perPage: perPageInput, dateRange } = selectBy?.pagination || {};
+    const fromDate = dateRange?.start;
+    const toDate = dateRange?.end;
+    const selectStatement = `SELECT id, content, role, type, "createdAt", thread_id AS "threadId"`;
+    const orderByStatement = `ORDER BY "createdAt" DESC`;
+    try {
+      const perPage = perPageInput !== void 0 ? perPageInput : 40;
+      const currentOffset = page * perPage;
+      const conditions = [`thread_id = $1`];
+      const queryParams = [threadId];
+      let paramIndex = 2;
+      if (fromDate) {
+        conditions.push(`"createdAt" >= $${paramIndex++}`);
+        queryParams.push(fromDate);
+      }
+      if (toDate) {
+        conditions.push(`"createdAt" <= $${paramIndex++}`);
+        queryParams.push(toDate);
+      }
+      const whereClause = conditions.length > 0 ? `WHERE ${conditions.join(" AND ")}` : "";
+      const countQuery = `SELECT COUNT(*) FROM ${this.getTableName(storage.TABLE_MESSAGES)} ${whereClause}`;
+      const countResult = await this.db.one(countQuery, queryParams);
+      const total = parseInt(countResult.count, 10);
+      if (total === 0) {
+        return {
+          messages: [],
+          total: 0,
+          page,
+          perPage,
+          hasMore: false
+        };
+      }
+      const dataQuery = `${selectStatement} FROM ${this.getTableName(
+        storage.TABLE_MESSAGES
+      )} ${whereClause} ${orderByStatement} LIMIT $${paramIndex++} OFFSET $${paramIndex++}`;
+      const rows = await this.db.manyOrNone(dataQuery, [...queryParams, perPage, currentOffset]);
+      const list = new agent.MessageList().add(rows || [], "memory");
+      const messagesToReturn = format === `v2` ? list.get.all.v2() : list.get.all.v1();
+      return {
+        messages: messagesToReturn,
+        total,
+        page,
+        perPage,
+        hasMore: currentOffset + rows.length < total
+      };
+    } catch (error) {
+      this.logger.error("Error getting messages:", error);
+      return { messages: [], total: 0, page, perPage: perPageInput || 40, hasMore: false };
+    }
+  }
   async saveMessages({
     messages,
     format
@@ -1531,16 +1598,27 @@ var PostgresStore = class extends storage.MastraStorage {
       }
       await this.db.tx(async (t) => {
         for (const message of messages) {
+          if (!message.threadId) {
+            throw new Error(
+              `Expected to find a threadId for message, but couldn't find one. An unexpected error has occurred.`
+            );
+          }
+          if (!message.resourceId) {
+            throw new Error(
+              `Expected to find a resourceId for message, but couldn't find one. An unexpected error has occurred.`
+            );
+          }
           await t.none(
-            `INSERT INTO ${this.getTableName(storage.TABLE_MESSAGES)} (id, thread_id, content, "createdAt", role, type) 
-             VALUES ($1, $2, $3, $4, $5, $6)`,
+            `INSERT INTO ${this.getTableName(storage.TABLE_MESSAGES)} (id, thread_id, content, "createdAt", role, type, "resourceId") 
+             VALUES ($1, $2, $3, $4, $5, $6, $7)`,
             [
               message.id,
-              threadId,
+              message.threadId,
               typeof message.content === "string" ? message.content : JSON.stringify(message.content),
               message.createdAt || (/* @__PURE__ */ new Date()).toISOString(),
               message.role,
-              message.type || "v2"
+              message.type || "v2",
+              message.resourceId
             ]
           );
         }
@@ -1725,8 +1803,10 @@ var PostgresStore = class extends storage.MastraStorage {
   async close() {
     this.pgp.end();
   }
-  async getEvals(options) {
-    const { agentName, type, page, perPage, limit, offset, fromDate, toDate } = options || {};
+  async getEvals(options = {}) {
+    const { agentName, type, page = 0, perPage = 100, dateRange } = options;
+    const fromDate = dateRange?.start;
+    const toDate = dateRange?.end;
     const conditions = [];
     const queryParams = [];
     let paramIndex = 1;
@@ -1751,45 +1831,26 @@ var PostgresStore = class extends storage.MastraStorage {
     const countQuery = `SELECT COUNT(*) FROM ${this.getTableName(storage.TABLE_EVALS)} ${whereClause}`;
     const countResult = await this.db.one(countQuery, queryParams);
     const total = parseInt(countResult.count, 10);
-    let currentLimit;
-    let currentOffset;
-    let currentPage = page;
-    let currentPerPage = perPage;
-    let hasMore = false;
-    if (limit !== void 0 && offset !== void 0) {
-      currentLimit = limit;
-      currentOffset = offset;
-      currentPage = void 0;
-      currentPerPage = void 0;
-      hasMore = currentOffset + currentLimit < total;
-    } else if (page !== void 0 && perPage !== void 0) {
-      currentLimit = perPage;
-      currentOffset = page * perPage;
-      hasMore = currentOffset + currentLimit < total;
-    } else {
-      currentLimit = perPage || 100;
-      currentOffset = (page || 0) * currentLimit;
-      if (page === void 0) currentPage = 0;
-      if (currentPerPage === void 0) currentPerPage = currentLimit;
-      hasMore = currentOffset + currentLimit < total;
-    }
+    const currentOffset = page * perPage;
     if (total === 0) {
       return {
         evals: [],
         total: 0,
-        page: currentPage,
-        perPage: currentPerPage,
+        page,
+        perPage,
         hasMore: false
       };
     }
-    const dataQuery = `SELECT * FROM ${this.getTableName(storage.TABLE_EVALS)} ${whereClause} ORDER BY created_at DESC LIMIT $${paramIndex++} OFFSET $${paramIndex++}`;
-    const rows = await this.db.manyOrNone(dataQuery, [...queryParams, currentLimit, currentOffset]);
+    const dataQuery = `SELECT * FROM ${this.getTableName(
+      storage.TABLE_EVALS
+    )} ${whereClause} ORDER BY created_at DESC LIMIT $${paramIndex++} OFFSET $${paramIndex++}`;
+    const rows = await this.db.manyOrNone(dataQuery, [...queryParams, perPage, currentOffset]);
     return {
       evals: rows?.map((row) => this.transformEvalRow(row)) ?? [],
       total,
-      page: currentPage,
-      perPage: currentPerPage,
-      hasMore
+      page,
+      perPage,
+      hasMore: currentOffset + (rows?.length ?? 0) < total
     };
   }
 };