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

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { C as ClientConstructor } from './contract-XFKcwhq7.cjs';
-export { K as AggregateArgs, L as AggregateResult, B as BatchResult, i as BooleanFilter, h as BytesFilter, c as ClientContract, d as ClientOptions, G as CountArgs, H as CountResult, u as CreateArgs, w as CreateManyAndReturnArgs, v as CreateManyArgs, D as DateTimeFilter, A as DeleteArgs, E as DeleteManyArgs, F as FindArgs, s as FindFirstArgs, r as FindManyArgs, t as FindUniqueArgs, P as GroupByArgs, Q as GroupByResult, I as IncludeInput, J as JsonArray, a as JsonObject, b as JsonValue, M as ModelResult, k as NullsOrder, N as NumberFilter, m as OmitInput, O as OrderBy, n as SelectIncludeOmit, o as SelectInput, q as SelectSubset, S as SimplifiedModelResult, j as SortOrder, g as StringFilter, p as Subset, T as ToKysely, f as TypeDefResult, U as UpdateArgs, y as UpdateManyAndReturnArgs, x as UpdateManyArgs, z as UpsertArgs, W as WhereInput, l as WhereUniqueInput, e as definePlugin } from './contract-XFKcwhq7.cjs';
+import { C as ClientConstructor } from './contract-D8U59Syb.cjs';
+export { K as AggregateArgs, L as AggregateResult, B as BatchResult, i as BooleanFilter, h as BytesFilter, c as ClientContract, d as ClientOptions, G as CountArgs, H as CountResult, u as CreateArgs, w as CreateManyAndReturnArgs, v as CreateManyArgs, D as DateTimeFilter, A as DeleteArgs, E as DeleteManyArgs, F as FindArgs, s as FindFirstArgs, r as FindManyArgs, t as FindUniqueArgs, P as GroupByArgs, Q as GroupByResult, I as IncludeInput, J as JsonArray, a as JsonObject, b as JsonValue, M as ModelResult, k as NullsOrder, N as NumberFilter, m as OmitInput, O as OrderBy, n as SelectIncludeOmit, o as SelectInput, q as SelectSubset, S as SimplifiedModelResult, j as SortOrder, g as StringFilter, p as Subset, T as ToKysely, f as TypeDefResult, U as UpdateArgs, y as UpdateManyAndReturnArgs, x as UpdateManyArgs, z as UpsertArgs, W as WhereInput, l as WhereUniqueInput, e as definePlugin } from './contract-D8U59Syb.cjs';
 import 'decimal.js';
 import '@zenstackhq/sdk/schema';
 import 'kysely';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { C as ClientConstructor } from './contract-XFKcwhq7.js';
-export { K as AggregateArgs, L as AggregateResult, B as BatchResult, i as BooleanFilter, h as BytesFilter, c as ClientContract, d as ClientOptions, G as CountArgs, H as CountResult, u as CreateArgs, w as CreateManyAndReturnArgs, v as CreateManyArgs, D as DateTimeFilter, A as DeleteArgs, E as DeleteManyArgs, F as FindArgs, s as FindFirstArgs, r as FindManyArgs, t as FindUniqueArgs, P as GroupByArgs, Q as GroupByResult, I as IncludeInput, J as JsonArray, a as JsonObject, b as JsonValue, M as ModelResult, k as NullsOrder, N as NumberFilter, m as OmitInput, O as OrderBy, n as SelectIncludeOmit, o as SelectInput, q as SelectSubset, S as SimplifiedModelResult, j as SortOrder, g as StringFilter, p as Subset, T as ToKysely, f as TypeDefResult, U as UpdateArgs, y as UpdateManyAndReturnArgs, x as UpdateManyArgs, z as UpsertArgs, W as WhereInput, l as WhereUniqueInput, e as definePlugin } from './contract-XFKcwhq7.js';
+import { C as ClientConstructor } from './contract-D8U59Syb.js';
+export { K as AggregateArgs, L as AggregateResult, B as BatchResult, i as BooleanFilter, h as BytesFilter, c as ClientContract, d as ClientOptions, G as CountArgs, H as CountResult, u as CreateArgs, w as CreateManyAndReturnArgs, v as CreateManyArgs, D as DateTimeFilter, A as DeleteArgs, E as DeleteManyArgs, F as FindArgs, s as FindFirstArgs, r as FindManyArgs, t as FindUniqueArgs, P as GroupByArgs, Q as GroupByResult, I as IncludeInput, J as JsonArray, a as JsonObject, b as JsonValue, M as ModelResult, k as NullsOrder, N as NumberFilter, m as OmitInput, O as OrderBy, n as SelectIncludeOmit, o as SelectInput, q as SelectSubset, S as SimplifiedModelResult, j as SortOrder, g as StringFilter, p as Subset, T as ToKysely, f as TypeDefResult, U as UpdateArgs, y as UpdateManyAndReturnArgs, x as UpdateManyArgs, z as UpsertArgs, W as WhereInput, l as WhereUniqueInput, e as definePlugin } from './contract-D8U59Syb.js';
 import 'decimal.js';
 import '@zenstackhq/sdk/schema';
 import 'kysely';

package/dist/index.js

@@ -7,7 +7,7 @@ var __export = (target, all) => {
 
 // src/client/client-impl.ts
 import { invariant as invariant12, lowerCaseFirst as lowerCaseFirst2 } from "@zenstackhq/common-helpers";
-import { CompiledQuery, DefaultConnectionProvider, DefaultQueryExecutor as DefaultQueryExecutor2, Kysely, Log, sql as sql10 } from "kysely";
+import { CompiledQuery, DefaultConnectionProvider, DefaultQueryExecutor as DefaultQueryExecutor2, Kysely, Log, sql as sql9 } from "kysely";
 
 // src/client/crud/operations/aggregate.ts
 import { sql as sql5 } from "kysely";
@@ -425,7 +425,7 @@ __name(aggregate, "aggregate");
 // src/client/crud/operations/base.ts
 import { createId } from "@paralleldrive/cuid2";
 import { invariant as invariant7, isPlainObject as isPlainObject3 } from "@zenstackhq/common-helpers";
-import { expressionBuilder as expressionBuilder2, sql as sql4 } from "kysely";
+import { expressionBuilder as expressionBuilder3, sql as sql4 } from "kysely";
 import { nanoid } from "nanoid";
 import { inspect } from "util";
 import { match as match9 } from "ts-pattern";
@@ -481,7 +481,7 @@ var AGGREGATE_OPERATORS = [
 
 // 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
@@ -547,7 +547,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 {
@@ -870,7 +870,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;
         }
@@ -879,7 +879,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;
           }
@@ -888,10 +888,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;
@@ -953,7 +954,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 {
@@ -1044,6 +1045,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
@@ -1137,7 +1141,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]) => {
@@ -1149,7 +1153,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
@@ -1300,7 +1304,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]) => {
@@ -1321,7 +1325,7 @@ var SqliteCrudDialect = class extends BaseCrudDialect {
             } else {
               return [
                 sql3.lit(field),
-                buildFieldRef(this.schema, relationModel, field, this.options, eb)
+                this.fieldRef(relationModel, field, eb)
               ];
             }
           }
@@ -1710,7 +1714,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
@@ -2067,7 +2071,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,
@@ -2708,7 +2712,7 @@ var BaseOperationHandler = class {
     return this.executeQueryTakeFirst(kysely, query, "exists");
   }
   async read(kysely, model, args) {
-    let query = this.dialect.buildSelectModel(expressionBuilder2(), model);
+    let query = this.dialect.buildSelectModel(expressionBuilder3(), model);
     if (args?.where) {
       query = query.where((eb) => this.dialect.buildFilter(eb, model, model, args?.where));
     }
@@ -2728,7 +2732,7 @@ var BaseOperationHandler = class {
         query = query.distinctOn(distinct.map((f) => sql4.ref(`${model}.${f}`)));
       } else {
         inMemoryDistinct = distinct;
-        query = distinct.reduce((acc, field) => acc.select((eb) => buildFieldRef(this.schema, model, field, this.options, eb).as(`$distinct$${field}`)), query);
+        query = distinct.reduce((acc, field) => acc.select((eb) => this.dialect.fieldRef(model, field, eb).as(`$distinct$${field}`)), query);
       }
     }
     if (args && "select" in args && args.select) {
@@ -2820,7 +2824,7 @@ ${compiled.parameters.map((p) => inspect(p)).join("\n")}`;
       orderBy = makeDefaultOrderBy(this.schema, model);
     }
     const orderByItems = ensureArray(orderBy).flatMap((obj) => Object.entries(obj));
-    const eb = expressionBuilder2();
+    const eb = expressionBuilder3();
     const cursorFilter = this.dialect.buildFilter(eb, model, model, cursor);
     let result = query;
     const filters = [];
@@ -2979,7 +2983,7 @@ ${compiled.parameters.map((p) => inspect(p)).join("\n")}`;
       ]).doNothing()).execute();
       return result[0];
     } else {
-      const eb = expressionBuilder2();
+      const eb = expressionBuilder3();
       const result = await kysely.deleteFrom(joinTable).where(eb(`${joinTable}.A`, "=", sortedRecords[0].entity[firstIds[0]])).where(eb(`${joinTable}.B`, "=", sortedRecords[1].entity[secondIds[0]])).execute();
       return result[0];
     }
@@ -2989,7 +2993,7 @@ ${compiled.parameters.map((p) => inspect(p)).join("\n")}`;
     const parentId = Object.values(parentIds)[0];
     const m2m = getManyToManyRelation(this.schema, model, field);
     invariant7(m2m, "not a many-to-many relation");
-    const eb = expressionBuilder2();
+    const eb = expressionBuilder3();
     return kysely.deleteFrom(m2m.joinTable).where(eb(`${m2m.joinTable}.${m2m.parentFkName}`, "=", parentId)).execute();
   }
   async processOwnedRelationForCreate(kysely, relationField, payload) {
@@ -3400,8 +3404,8 @@ ${compiled.parameters.map((p) => inspect(p)).join("\n")}`;
     invariant7(Object.keys(payload).length === 1, 'Only one of "set", "increment", "decrement", "multiply", or "divide" can be provided');
     const key = Object.keys(payload)[0];
     const value = this.dialect.transformPrimitive(payload[key], fieldDef.type, false);
-    const eb = expressionBuilder2();
-    const fieldRef = buildFieldRef(this.schema, model, field, this.options, eb);
+    const eb = expressionBuilder3();
+    const fieldRef = this.dialect.fieldRef(model, field, eb);
     return match9(key).with("set", () => value).with("increment", () => eb(fieldRef, "+", value)).with("decrement", () => eb(fieldRef, "-", value)).with("multiply", () => eb(fieldRef, "*", value)).with("divide", () => eb(fieldRef, "/", value)).otherwise(() => {
       throw new InternalError(`Invalid incremental update operation: ${key}`);
     });
@@ -3410,8 +3414,8 @@ ${compiled.parameters.map((p) => inspect(p)).join("\n")}`;
     invariant7(Object.keys(payload).length === 1, 'Only one of "set", "push" can be provided');
     const key = Object.keys(payload)[0];
     const value = this.dialect.transformPrimitive(payload[key], fieldDef.type, true);
-    const eb = expressionBuilder2();
-    const fieldRef = buildFieldRef(this.schema, model, field, this.options, eb);
+    const eb = expressionBuilder3();
+    const fieldRef = this.dialect.fieldRef(model, field, eb);
     return match9(key).with("set", () => value).with("push", () => {
       return eb(fieldRef, "||", eb.val(ensureArray(value)));
     }).otherwise(() => {
@@ -3697,7 +3701,7 @@ ${compiled.parameters.map((p) => inspect(p)).join("\n")}`;
       await Promise.all(actions);
     } else {
       const { ownedByModel, keyPairs } = getRelationForeignKeyFieldPairs(this.schema, fromRelation.model, fromRelation.field);
-      const eb = expressionBuilder2();
+      const eb = expressionBuilder3();
       if (ownedByModel) {
         invariant7(disconnectConditions.length === 1, "only one entity can be disconnected");
         const condition = disconnectConditions[0];
@@ -4263,7 +4267,7 @@ var FindOperationHandler = class extends BaseOperationHandler {
 };
 
 // src/client/crud/operations/group-by.ts
-import { sql as sql7 } from "kysely";
+import { expressionBuilder as expressionBuilder4 } from "kysely";
 import { match as match13 } from "ts-pattern";
 var GroupByOperationHandler = class extends BaseOperationHandler {
   static {
@@ -4285,10 +4289,11 @@ var GroupByOperationHandler = class extends BaseOperationHandler {
       subQuery = this.dialect.buildOrderBy(subQuery, this.model, this.model, void 0, skip !== void 0 || take !== void 0, negateOrderBy);
       return subQuery.as("$sub");
     });
+    const fieldRef = /* @__PURE__ */ __name((field) => this.dialect.fieldRef(this.model, field, expressionBuilder4(), "$sub"), "fieldRef");
     const bys = typeof parsedArgs.by === "string" ? [
       parsedArgs.by
     ] : parsedArgs.by;
-    query = query.groupBy(bys.map((by) => sql7.ref(`$sub.${by}`)));
+    query = query.groupBy(bys.map((by) => fieldRef(by)));
     if (parsedArgs.orderBy) {
       query = this.dialect.buildOrderBy(query, this.model, "$sub", parsedArgs.orderBy, false, false);
     }
@@ -4296,7 +4301,7 @@ var GroupByOperationHandler = class extends BaseOperationHandler {
       query = query.having((eb) => this.dialect.buildFilter(eb, this.model, "$sub", parsedArgs.having));
     }
     for (const by of bys) {
-      query = query.select(() => sql7.ref(`$sub.${by}`).as(by));
+      query = query.select(() => fieldRef(by).as(by));
     }
     for (const [key, value] of Object.entries(parsedArgs)) {
       switch (key) {
@@ -4309,7 +4314,7 @@ var GroupByOperationHandler = class extends BaseOperationHandler {
                 if (field === "_all") {
                   query = query.select((eb) => eb.cast(eb.fn.countAll(), "integer").as(`_count._all`));
                 } else {
-                  query = query.select((eb) => eb.cast(eb.fn.count(sql7.ref(`$sub.${field}`)), "integer").as(`${key}.${field}`));
+                  query = query.select((eb) => eb.cast(eb.fn.count(fieldRef(field)), "integer").as(`${key}.${field}`));
                 }
               }
             });
@@ -4322,10 +4327,7 @@ var GroupByOperationHandler = class extends BaseOperationHandler {
         case "_min": {
           Object.entries(value).forEach(([field, val]) => {
             if (val === true) {
-              query = query.select((eb) => {
-                const fn = match13(key).with("_sum", () => eb.fn.sum).with("_avg", () => eb.fn.avg).with("_max", () => eb.fn.max).with("_min", () => eb.fn.min).exhaustive();
-                return fn(sql7.ref(`$sub.${field}`)).as(`${key}.${field}`);
-              });
+              query = query.select((eb) => aggregate(eb, fieldRef(field), key).as(`${key}.${field}`));
             }
           });
           break;
@@ -6136,7 +6138,7 @@ __export(functions_exports, {
   startsWith: () => startsWith
 });
 import { invariant as invariant9, lowerCaseFirst, upperCaseFirst } from "@zenstackhq/common-helpers";
-import { sql as sql8, ValueNode as ValueNode4 } from "kysely";
+import { sql as sql7, ValueNode as ValueNode4 } from "kysely";
 import { match as match17 } from "ts-pattern";
 var contains = /* @__PURE__ */ __name((eb, args) => {
   const [field, search2, caseInsensitive = false] = args;
@@ -6147,9 +6149,9 @@ var contains = /* @__PURE__ */ __name((eb, args) => {
     throw new Error('"search" parameter is required');
   }
   const searchExpr = eb.fn("CONCAT", [
-    sql8.lit("%"),
+    sql7.lit("%"),
     search2,
-    sql8.lit("%")
+    sql7.lit("%")
   ]);
   return eb(field, caseInsensitive ? "ilike" : "like", searchExpr);
 }, "contains");
@@ -6166,7 +6168,7 @@ var startsWith = /* @__PURE__ */ __name((eb, args) => {
   }
   return eb(field, "like", eb.fn("CONCAT", [
     search2,
-    sql8.lit("%")
+    sql7.lit("%")
   ]));
 }, "startsWith");
 var endsWith = /* @__PURE__ */ __name((eb, args) => {
@@ -6178,7 +6180,7 @@ var endsWith = /* @__PURE__ */ __name((eb, args) => {
     throw new Error('"search" parameter is required');
   }
   return eb(field, "like", eb.fn("CONCAT", [
-    sql8.lit("%"),
+    sql7.lit("%"),
     search2
   ]));
 }, "endsWith");
@@ -6219,10 +6221,10 @@ var isEmpty = /* @__PURE__ */ __name((eb, args, { dialect }) => {
   if (!field) {
     throw new Error('"field" parameter is required');
   }
-  return eb(dialect.buildArrayLength(eb, field), "=", sql8.lit(0));
+  return eb(dialect.buildArrayLength(eb, field), "=", sql7.lit(0));
 }, "isEmpty");
 var now = /* @__PURE__ */ __name((eb, _args, { dialect }) => {
-  return match17(dialect.provider).with("postgresql", () => eb.fn("now")).with("sqlite", () => sql8.raw("CURRENT_TIMESTAMP")).exhaustive();
+  return match17(dialect.provider).with("postgresql", () => eb.fn("now")).with("sqlite", () => sql7.raw("CURRENT_TIMESTAMP")).exhaustive();
 }, "now");
 var currentModel = /* @__PURE__ */ __name((_eb, args, { model }) => {
   let result = model;
@@ -6230,7 +6232,7 @@ var currentModel = /* @__PURE__ */ __name((_eb, args, { model }) => {
   if (casing) {
     result = processCasing(casing, result, model);
   }
-  return sql8.lit(result);
+  return sql7.lit(result);
 }, "currentModel");
 var currentOperation = /* @__PURE__ */ __name((_eb, args, { operation }) => {
   let result = operation;
@@ -6238,7 +6240,7 @@ var currentOperation = /* @__PURE__ */ __name((_eb, args, { operation }) => {
   if (casing) {
     result = processCasing(casing, result, operation);
   }
-  return sql8.lit(result);
+  return sql7.lit(result);
 }, "currentOperation");
 function processCasing(casing, result, model) {
   const opNode = casing.toOperationNode();
@@ -6252,7 +6254,7 @@ __name(processCasing, "processCasing");
 
 // src/client/helpers/schema-db-pusher.ts
 import { invariant as invariant10 } from "@zenstackhq/common-helpers";
-import { sql as sql9 } from "kysely";
+import { sql as sql8 } from "kysely";
 import { match as match18 } from "ts-pattern";
 var SchemaDbPusher = class {
   static {
@@ -6331,7 +6333,7 @@ var SchemaDbPusher = class {
       if (fieldDef.default !== void 0) {
         if (typeof fieldDef.default === "object" && "kind" in fieldDef.default) {
           if (ExpressionUtils.isCall(fieldDef.default) && fieldDef.default.function === "now") {
-            col = col.defaultTo(sql9`CURRENT_TIMESTAMP`);
+            col = col.defaultTo(sql8`CURRENT_TIMESTAMP`);
           }
         } else {
           col = col.defaultTo(fieldDef.default);
@@ -6351,7 +6353,7 @@ var SchemaDbPusher = class {
   }
   mapFieldType(fieldDef) {
     if (this.schema.enums?.[fieldDef.type]) {
-      return this.schema.provider.type === "postgresql" ? sql9.ref(fieldDef.type) : "text";
+      return this.schema.provider.type === "postgresql" ? sql8.ref(fieldDef.type) : "text";
     }
     if (this.isAutoIncrement(fieldDef) && this.schema.provider.type === "postgresql") {
       return "serial";
@@ -6361,7 +6363,7 @@ var SchemaDbPusher = class {
       throw new Error(`Unsupported field type: ${type}`);
     });
     if (fieldDef.array) {
-      return sql9.raw(`${result}[]`);
+      return sql8.raw(`${result}[]`);
     } else {
       return result;
     }
@@ -6764,7 +6766,7 @@ var ClientImpl = class _ClientImpl {
   }
   $executeRaw(query, ...values) {
     return createZenStackPromise(async () => {
-      const result = await sql10(query, ...values).execute(this.kysely);
+      const result = await sql9(query, ...values).execute(this.kysely);
       return Number(result.numAffectedRows ?? 0);
     });
   }
@@ -6777,7 +6779,7 @@ var ClientImpl = class _ClientImpl {
   }
   $queryRaw(query, ...values) {
     return createZenStackPromise(async () => {
-      const result = await sql10(query, ...values).execute(this.kysely);
+      const result = await sql9(query, ...values).execute(this.kysely);
       return result.rows;
     });
   }