@getstrata/core 2.2.3 → 2.2.4

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @getstrata/core changelog
 
+## 2.2.4
+
+-  perf(database): seek Postgres composite keyset bounds
+
 ## 2.2.3
 
 - feat(database): add scoped composite keyset pagination

package/dist/core/database/whereBuilder.d.ts

@@ -13,6 +13,13 @@ type WhereNode<TEntity extends object> = {
 } | {
     kind: "and" | "or";
     exists: ExistsClause;
+} | {
+    kind: "and" | "or";
+    compareRow: {
+        columns: readonly string[];
+        operator: "lt" | "gt";
+        values: readonly unknown[];
+    };
 };
 declare class WhereBuilder<TEntity extends object, TWhere extends object = QueryWhere<TEntity>> {
     readonly nodes: WhereNode<TEntity>[];

package/dist/entries/database/query.js

@@ -149,6 +149,12 @@ function remapExistsSql(sql, existsParams, params) {
   return sql.replace(/\$(\d+)/g, (_match, index) => `$${offset + Number(index)}`);
 }
 function buildWhereNodeClause(tableName, node, params) {
+  if ("compareRow" in node) {
+    const { columns, operator, values } = node.compareRow;
+    if (!Array.isArray(columns) || !columns.length || !Array.isArray(values) || columns.length !== values.length || !["lt", "gt"].includes(operator) || Array.from(columns).some((column) => typeof column !== "string" || !column.length))
+      throw new TypeError("Invalid row comparison columns, values or operator.");
+    return `(${columns.map((column) => qualifyColumn(tableName, column)).join(", ")}) ${operator === "lt" ? "<" : ">"} (${values.map((value) => pushParam(params, value)).join(", ")})`;
+  }
   if ("exists" in node) {
     const body = remapExistsSql(node.exists.sql, node.exists.params, params);
     return `${node.exists.not ? "NOT " : ""}EXISTS (${body})`;

package/dist/entries/database/repositoryQuery.js

@@ -173,6 +173,12 @@ function remapExistsSql(sql, existsParams, params) {
   return sql.replace(/\$(\d+)/g, (_match, index) => `$${offset + Number(index)}`);
 }
 function buildWhereNodeClause(tableName, node, params) {
+  if ("compareRow" in node) {
+    const { columns, operator, values } = node.compareRow;
+    if (!Array.isArray(columns) || !columns.length || !Array.isArray(values) || columns.length !== values.length || !["lt", "gt"].includes(operator) || Array.from(columns).some((column) => typeof column !== "string" || !column.length))
+      throw new TypeError("Invalid row comparison columns, values or operator.");
+    return `(${columns.map((column) => qualifyColumn(tableName, column)).join(", ")}) ${operator === "lt" ? "<" : ">"} (${values.map((value) => pushParam(params, value)).join(", ")})`;
+  }
   if ("exists" in node) {
     const body = remapExistsSql(node.exists.sql, node.exists.params, params);
     return `${node.exists.not ? "NOT " : ""}EXISTS (${body})`;

package/dist/index.js

@@ -4132,6 +4132,7 @@ init_connectionContext();
 init_dialect();
 
 // ../../src/core/database/keyset.ts
+init_dialect();
 var KEYSET_ALIAS_PREFIX = "__strata_keyset_";
 function validateKeyset(table, options) {
   if (!Number.isInteger(options.perPage) || options.perPage < 1 || options.perPage > 1000)
@@ -4159,6 +4160,18 @@ function validateKeyset(table, options) {
 function keysetBoundary(order, cursor) {
   if (!cursor)
     return [];
+  if (currentSqlDialect().driver === "pgsql" && order.length > 1 && order.every((item) => item.direction === order[0]?.direction)) {
+    return [
+      {
+        kind: "and",
+        compareRow: {
+          columns: order.map((item) => item.column),
+          operator: order[0]?.direction === "asc" ? "gt" : "lt",
+          values: [...cursor.values]
+        }
+      }
+    ];
+  }
   const branches = order.map((item, i) => {
     const where = {};
     order.slice(0, i).forEach((prefix, j) => {
@@ -4320,6 +4333,12 @@ function remapExistsSql(sql, existsParams, params) {
   return sql.replace(/\$(\d+)/g, (_match, index) => `$${offset + Number(index)}`);
 }
 function buildWhereNodeClause(tableName, node, params) {
+  if ("compareRow" in node) {
+    const { columns, operator, values } = node.compareRow;
+    if (!Array.isArray(columns) || !columns.length || !Array.isArray(values) || columns.length !== values.length || !["lt", "gt"].includes(operator) || Array.from(columns).some((column) => typeof column !== "string" || !column.length))
+      throw new TypeError("Invalid row comparison columns, values or operator.");
+    return `(${columns.map((column) => qualifyColumn(tableName, column)).join(", ")}) ${operator === "lt" ? "<" : ">"} (${values.map((value) => pushParam(params, value)).join(", ")})`;
+  }
   if ("exists" in node) {
     const body = remapExistsSql(node.exists.sql, node.exists.params, params);
     return `${node.exists.not ? "NOT " : ""}EXISTS (${body})`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getstrata/core",
-  "version": "2.2.3",
+  "version": "2.2.4",
   "description": "Strata Bun framework public API",
   "type": "module",
   "license": "MIT",