@zenstackhq/runtime 3.0.0-alpha.25 → 3.0.0-alpha.27

package/dist/plugins/policy/index.d.cts

@@ -1,5 +1,5 @@
 import * as kysely from 'kysely';
-import { R as RuntimePlugin, V as OnKyselyQueryArgs } from '../../contract-BOWN0dwS.cjs';
+import { R as RuntimePlugin, V as OnKyselyQueryArgs } from '../../contract-c8GpEAl3.cjs';
 import { SchemaDef } from '@zenstackhq/sdk/schema';
 import 'decimal.js';
 

package/dist/plugins/policy/index.d.ts

@@ -1,5 +1,5 @@
 import * as kysely from 'kysely';
-import { R as RuntimePlugin, V as OnKyselyQueryArgs } from '../../contract-BOWN0dwS.js';
+import { R as RuntimePlugin, V as OnKyselyQueryArgs } from '../../contract-c8GpEAl3.js';
 import { SchemaDef } from '@zenstackhq/sdk/schema';
 import 'decimal.js';
 

package/dist/plugins/policy/index.js

@@ -337,6 +337,16 @@ function flattenCompoundUniqueFilters(schema, model, filter) {
   return result;
 }
 __name(flattenCompoundUniqueFilters, "flattenCompoundUniqueFilters");
+function ensureArray(value) {
+  if (Array.isArray(value)) {
+    return value;
+  } else {
+    return [
+      value
+    ];
+  }
+}
+__name(ensureArray, "ensureArray");
 function getDelegateDescendantModels(schema, model, collected = /* @__PURE__ */ new Set()) {
   const subModels = Object.values(schema.models).filter((m) => m.baseModel === model);
   subModels.forEach((def) => {
@@ -399,6 +409,33 @@ var BaseCrudDialect = class {
     }
     return result;
   }
+  buildFilterSortTake(model, args, query) {
+    let result = query;
+    if (args.where) {
+      result = result.where((eb) => this.buildFilter(eb, model, model, args?.where));
+    }
+    let negateOrderBy = false;
+    const skip = args.skip;
+    let take = args.take;
+    if (take !== void 0 && take < 0) {
+      negateOrderBy = true;
+      take = -take;
+    }
+    result = this.buildSkipTake(result, skip, take);
+    result = this.buildOrderBy(result, model, model, args.orderBy, skip !== void 0 || take !== void 0, negateOrderBy);
+    if ("distinct" in args && args.distinct) {
+      const distinct = ensureArray(args.distinct);
+      if (this.supportsDistinctOn) {
+        result = result.distinctOn(distinct.map((f) => sql.ref(`${model}.${f}`)));
+      } else {
+        throw new QueryError(`"distinct" is not supported by "${this.schema.provider.type}" provider`);
+      }
+    }
+    if (args.cursor) {
+      result = this.buildCursorFilter(model, result, args.cursor, args.orderBy, negateOrderBy);
+    }
+    return result;
+  }
   buildFilter(eb, model, modelAlias, where) {
     if (where === true || where === void 0) {
       return this.true(eb);
@@ -436,6 +473,26 @@ var BaseCrudDialect = class {
     }
     return result;
   }
+  buildCursorFilter(model, query, cursor, orderBy, negateOrderBy) {
+    const _orderBy = orderBy ?? makeDefaultOrderBy(this.schema, model);
+    const orderByItems = ensureArray(_orderBy).flatMap((obj) => Object.entries(obj));
+    const eb = expressionBuilder();
+    const cursorFilter = this.buildFilter(eb, model, model, cursor);
+    let result = query;
+    const filters = [];
+    for (let i = orderByItems.length - 1; i >= 0; i--) {
+      const andFilters = [];
+      for (let j = 0; j <= i; j++) {
+        const [field, order] = orderByItems[j];
+        const _order = negateOrderBy ? order === "asc" ? "desc" : "asc" : order;
+        const op = j === i ? _order === "asc" ? ">=" : "<=" : "=";
+        andFilters.push(eb(eb.ref(`${model}.${field}`), op, eb.selectFrom(model).select(`${model}.${field}`).where(cursorFilter)));
+      }
+      filters.push(eb.and(andFilters));
+    }
+    result = result.where((eb2) => eb2.or(filters));
+    return result;
+  }
   isLogicalCombinator(key) {
     return LOGICAL_COMBINATORS.includes(key);
   }
@@ -962,18 +1019,7 @@ var PostgresCrudDialect = class extends BaseCrudDialect {
         let subQuery = this.buildSelectModel(eb, relationModel);
         subQuery = this.buildSelectAllFields(relationModel, subQuery, typeof payload === "object" ? payload?.omit : void 0);
         if (payload && typeof payload === "object") {
-          if (payload.where) {
-            subQuery = subQuery.where((eb2) => this.buildFilter(eb2, relationModel, relationModel, payload.where));
-          }
-          const skip = payload.skip;
-          let take = payload.take;
-          let negateOrderBy = false;
-          if (take !== void 0 && take < 0) {
-            negateOrderBy = true;
-            take = -take;
-          }
-          subQuery = this.buildSkipTake(subQuery, skip, take);
-          subQuery = this.buildOrderBy(subQuery, relationModel, relationModel, payload.orderBy, skip !== void 0 || take !== void 0, negateOrderBy);
+          subQuery = this.buildFilterSortTake(relationModel, payload, subQuery);
         }
         const m2m = getManyToManyRelation(this.schema, model, relationField);
         if (m2m) {
@@ -1136,18 +1182,7 @@ var SqliteCrudDialect = class extends BaseCrudDialect {
       let subQuery = this.buildSelectModel(eb, relationModel);
       subQuery = this.buildSelectAllFields(relationModel, subQuery, typeof payload === "object" ? payload?.omit : void 0);
       if (payload && typeof payload === "object") {
-        if (payload.where) {
-          subQuery = subQuery.where((eb2) => this.buildFilter(eb2, relationModel, relationModel, payload.where));
-        }
-        const skip = payload.skip;
-        let take = payload.take;
-        let negateOrderBy = false;
-        if (take !== void 0 && take < 0) {
-          negateOrderBy = true;
-          take = -take;
-        }
-        subQuery = this.buildSkipTake(subQuery, skip, take);
-        subQuery = this.buildOrderBy(subQuery, relationModel, relationModel, payload.orderBy, skip !== void 0 || take !== void 0, negateOrderBy);
+        subQuery = this.buildFilterSortTake(relationModel, payload, subQuery);
       }
       const m2m = getManyToManyRelation(this.schema, model, relationField);
       if (m2m) {