tina4-nodejs 3.10.48 → 3.10.55

package/packages/orm/src/databaseResult.ts

@@ -73,18 +73,47 @@ export class DatabaseResult implements Iterable<Record<string, unknown>> {
     return this.records;
   }
 
-  /** Pagination envelope. */
-  toPaginate(): {
+  /** Pagination envelope — accepts either (page, perPage) or (offset, limit) style.
+   *
+   * When called with two arguments both >= 0 and the first >= the second
+   * (i.e. offset-style), pass `{ offset, limit }` as the first argument.
+   * The simplest way is to always use the default (page, perPage) form and
+   * let the autoCRUD layer supply offset/limit from the query string.
+   *
+   * Returns a superset of keys for backwards-compatibility across all clients.
+   */
+  toPaginate(page = 1, perPage = 10): {
     records: Record<string, unknown>[];
+    data: Record<string, unknown>[];
     count: number;
+    total: number;
     limit: number;
     offset: number;
+    page: number;
+    per_page: number;
+    perPage: number;
+    totalPages: number;
+    total_pages: number;
+    has_next: boolean;
+    has_prev: boolean;
   } {
+    const totalPages = Math.max(1, Math.ceil(this.count / perPage));
+    const offset = (page - 1) * perPage;
+    const sliced = this.records.slice(offset, offset + perPage);
     return {
-      records: this.records,
+      records: sliced,
+      data: sliced,
       count: this.count,
-      limit: this.limit,
-      offset: this.offset,
+      total: this.count,
+      limit: perPage,
+      offset,
+      page,
+      per_page: perPage,
+      perPage,
+      totalPages,
+      total_pages: totalPages,
+      has_next: page < totalPages,
+      has_prev: page > 1,
     };
   }
 

package/packages/orm/src/index.ts

@@ -55,3 +55,7 @@ export { MssqlAdapter } from "./adapters/mssql.js";
 export type { MssqlConfig } from "./adapters/mssql.js";
 export { FirebirdAdapter } from "./adapters/firebird.js";
 export type { FirebirdConfig } from "./adapters/firebird.js";
+export { MongodbAdapter } from "./adapters/mongodb.js";
+export type { MongoConfig } from "./adapters/mongodb.js";
+export { OdbcAdapter } from "./adapters/odbc.js";
+export type { OdbcConfig } from "./adapters/odbc.js";

package/packages/orm/src/query.ts

@@ -58,7 +58,7 @@ export function buildQuery(
   }
 
   // Pagination
-  const limit = options.limit ?? 20;
+  const limit = options.limit ?? 100;
   const page = options.page ?? 1;
   const offset = (page - 1) * limit;
 
@@ -99,6 +99,13 @@ export function parseQueryString(query: Record<string, string>): QueryOptions {
   if (query.sort) options.sort = query.sort;
   if (query.page) options.page = parseInt(query.page, 10);
   if (query.limit) options.limit = parseInt(query.limit, 10);
+  // Allow ?offset= as an alternative to ?page= (offset-based pagination)
+  if (query.offset !== undefined) {
+    const offset = parseInt(query.offset, 10);
+    const limit = options.limit ?? 100;
+    // Convert offset → page so the rest of the pipeline stays unchanged
+    options.page = Math.floor(offset / limit) + 1;
+  }
 
   return options;
 }