@zenstackhq/runtime 3.0.0-alpha.20 → 3.0.0-alpha.21

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-XFKcwhq7.cjs';
+import { R as RuntimePlugin, V as OnKyselyQueryArgs } from '../../contract-D8U59Syb.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-XFKcwhq7.js';
+import { R as RuntimePlugin, V as OnKyselyQueryArgs } from '../../contract-D8U59Syb.js';
 import { SchemaDef } from '@zenstackhq/sdk/schema';
 import 'decimal.js';
 

package/dist/plugins/policy/index.js

@@ -354,7 +354,7 @@ __name(aggregate, "aggregate");
 
 // src/client/crud/dialects/base.ts
 import { invariant, isPlainObject } from "@zenstackhq/common-helpers";
-import { sql } from "kysely";
+import { expressionBuilder, sql } from "kysely";
 import { match as match2, P } from "ts-pattern";
 
 // src/utils/enumerate.ts
@@ -420,7 +420,7 @@ var BaseCrudDialect = class {
       if (fieldDef.relation) {
         result = this.and(eb, result, this.buildRelationFilter(eb, model, modelAlias, key, fieldDef, payload));
       } else {
-        const fieldRef = buildFieldRef(this.schema, fieldDef.originModel ?? model, key, this.options, eb, fieldDef.originModel ?? modelAlias);
+        const fieldRef = this.fieldRef(fieldDef.originModel ?? model, key, eb, fieldDef.originModel ?? modelAlias);
         if (fieldDef.array) {
           result = this.and(eb, result, this.buildArrayFilter(eb, fieldRef, fieldDef, payload));
         } else {
@@ -743,7 +743,7 @@ var BaseCrudDialect = class {
           invariant(value && typeof value === "object", `invalid orderBy value for field "${field}"`);
           for (const [k, v] of Object.entries(value)) {
             invariant(v === "asc" || v === "desc", `invalid orderBy value for field "${field}"`);
-            result = result.orderBy((eb) => aggregate(eb, sql.ref(`${modelAlias}.${k}`), field), sql.raw(this.negateSort(v, negated)));
+            result = result.orderBy((eb) => aggregate(eb, this.fieldRef(model, k, eb, modelAlias), field), sql.raw(this.negateSort(v, negated)));
           }
           continue;
         }
@@ -752,7 +752,7 @@ var BaseCrudDialect = class {
             invariant(value && typeof value === "object", 'invalid orderBy value for field "_count"');
             for (const [k, v] of Object.entries(value)) {
               invariant(v === "asc" || v === "desc", `invalid orderBy value for field "${field}"`);
-              result = result.orderBy((eb) => eb.fn.count(sql.ref(k)), sql.raw(this.negateSort(v, negated)));
+              result = result.orderBy((eb) => eb.fn.count(this.fieldRef(model, k, eb, modelAlias)), sql.raw(this.negateSort(v, negated)));
             }
             continue;
           }
@@ -761,10 +761,11 @@ var BaseCrudDialect = class {
         }
         const fieldDef = requireField(this.schema, model, field);
         if (!fieldDef.relation) {
+          const fieldRef = this.fieldRef(model, field, expressionBuilder(), modelAlias);
           if (value === "asc" || value === "desc") {
-            result = result.orderBy(sql.ref(`${modelAlias}.${field}`), this.negateSort(value, negated));
+            result = result.orderBy(fieldRef, this.negateSort(value, negated));
           } else if (value && typeof value === "object" && "nulls" in value && "sort" in value && (value.sort === "asc" || value.sort === "desc") && (value.nulls === "first" || value.nulls === "last")) {
-            result = result.orderBy(sql.ref(`${modelAlias}.${field}`), sql.raw(`${this.negateSort(value.sort, negated)} nulls ${value.nulls}`));
+            result = result.orderBy(fieldRef, sql.raw(`${this.negateSort(value.sort, negated)} nulls ${value.nulls}`));
           }
         } else {
           const relationModel = fieldDef.type;
@@ -826,7 +827,7 @@ var BaseCrudDialect = class {
   buildSelectField(query, model, modelAlias, field) {
     const fieldDef = requireField(this.schema, model, field);
     if (fieldDef.computed) {
-      return query.select((eb) => buildFieldRef(this.schema, model, field, this.options, eb).as(field));
+      return query.select((eb) => this.fieldRef(model, field, eb, modelAlias).as(field));
     } else if (!fieldDef.originModel) {
       return query.select(sql.ref(`${modelAlias}.${field}`).as(field));
     } else {
@@ -917,6 +918,9 @@ var BaseCrudDialect = class {
   not(eb, ...args) {
     return eb.not(this.and(eb, ...args));
   }
+  fieldRef(model, field, eb, modelAlias) {
+    return buildFieldRef(this.schema, model, field, this.options, eb, modelAlias);
+  }
 };
 
 // src/client/crud/dialects/postgresql.ts
@@ -1010,7 +1014,7 @@ var PostgresCrudDialect = class extends BaseCrudDialect {
     if (payload === true || !payload.select) {
       objArgs.push(...Object.entries(relationModelDef.fields).filter(([, value]) => !value.relation).filter(([name]) => !(typeof payload === "object" && payload.omit?.[name] === true)).map(([field]) => [
         sql2.lit(field),
-        buildFieldRef(this.schema, relationModel, field, this.options, eb)
+        this.fieldRef(relationModel, field, eb)
       ]).flatMap((v) => v));
     } else if (payload.select) {
       objArgs.push(...Object.entries(payload.select).filter(([, value]) => value).map(([field, value]) => {
@@ -1022,7 +1026,7 @@ var PostgresCrudDialect = class extends BaseCrudDialect {
           ];
         } else {
           const fieldDef = requireField(this.schema, relationModel, field);
-          const fieldValue = fieldDef.relation ? eb.ref(`${parentAlias}$${relationField}$${field}.$j`) : buildFieldRef(this.schema, relationModel, field, this.options, eb);
+          const fieldValue = fieldDef.relation ? eb.ref(`${parentAlias}$${relationField}$${field}.$j`) : this.fieldRef(relationModel, field, eb);
           return [
             sql2.lit(field),
             fieldValue
@@ -1173,7 +1177,7 @@ var SqliteCrudDialect = class extends BaseCrudDialect {
       if (payload === true || !payload.select) {
         objArgs.push(...Object.entries(relationModelDef.fields).filter(([, value]) => !value.relation).filter(([name]) => !(typeof payload === "object" && payload.omit?.[name] === true)).map(([field]) => [
           sql3.lit(field),
-          buildFieldRef(this.schema, relationModel, field, this.options, eb)
+          this.fieldRef(relationModel, field, eb)
         ]).flatMap((v) => v));
       } else if (payload.select) {
         objArgs.push(...Object.entries(payload.select).filter(([, value]) => value).map(([field, value]) => {
@@ -1194,7 +1198,7 @@ var SqliteCrudDialect = class extends BaseCrudDialect {
             } else {
               return [
                 sql3.lit(field),
-                buildFieldRef(this.schema, relationModel, field, this.options, eb)
+                this.fieldRef(relationModel, field, eb)
               ];
             }
           }
@@ -1583,7 +1587,7 @@ var ColumnCollector = class extends DefaultOperationNodeVisitor {
 
 // src/plugins/policy/expression-transformer.ts
 import { invariant as invariant5 } from "@zenstackhq/common-helpers";
-import { AliasNode as AliasNode2, BinaryOperationNode as BinaryOperationNode2, ColumnNode, expressionBuilder, FromNode, FunctionNode as FunctionNode2, IdentifierNode, OperatorNode as OperatorNode2, ReferenceNode as ReferenceNode2, SelectionNode, SelectQueryNode, TableNode as TableNode2, ValueListNode, ValueNode as ValueNode2, WhereNode } from "kysely";
+import { AliasNode as AliasNode2, BinaryOperationNode as BinaryOperationNode2, ColumnNode, expressionBuilder as expressionBuilder2, FromNode, FunctionNode as FunctionNode2, IdentifierNode, OperatorNode as OperatorNode2, ReferenceNode as ReferenceNode2, SelectionNode, SelectQueryNode, TableNode as TableNode2, ValueListNode, ValueNode as ValueNode2, WhereNode } from "kysely";
 import { match as match7 } from "ts-pattern";
 
 // src/plugins/policy/expression-evaluator.ts
@@ -1940,7 +1944,7 @@ var ExpressionTransformer = class {
     if (!func) {
       throw new QueryError(`Function not implemented: ${expr2.function}`);
     }
-    const eb = expressionBuilder();
+    const eb = expressionBuilder2();
     return func(eb, (expr2.args ?? []).map((arg) => this.transformCallArg(eb, arg, context)), {
       dialect: this.dialect,
       model: context.model,