@zenstackhq/runtime 3.0.0-alpha.24 → 3.0.0-alpha.26

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { C as ClientConstructor } from './contract-C9SubPBD.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-C9SubPBD.cjs';
+import { C as ClientConstructor } from './contract-BF6mvhVn.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-BF6mvhVn.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-C9SubPBD.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-C9SubPBD.js';
+import { C as ClientConstructor } from './contract-BF6mvhVn.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-BF6mvhVn.js';
 import 'decimal.js';
 import '@zenstackhq/sdk/schema';
 import 'kysely';

package/dist/index.js

@@ -270,11 +270,14 @@ function getIdValues(schema, model, data) {
   }), {});
 }
 __name(getIdValues, "getIdValues");
-function buildFieldRef(schema, model, field, options, eb, modelAlias) {
+function buildFieldRef(schema, model, field, options, eb, modelAlias, inlineComputedField = true) {
   const fieldDef = requireField(schema, model, field);
   if (!fieldDef.computed) {
     return eb.ref(modelAlias ? `${modelAlias}.${field}` : field);
   } else {
+    if (!inlineComputedField) {
+      return eb.ref(modelAlias ? `${modelAlias}.${field}` : field);
+    }
     let computer;
     if ("computedFields" in options) {
       const computedFields = options.computedFields;
@@ -458,7 +461,6 @@ import { sql as sql2 } from "kysely";
 import { match as match3 } from "ts-pattern";
 
 // src/client/constants.ts
-var CONTEXT_COMMENT_PREFIX = "-- $$context:";
 var NUMERIC_FIELD_TYPES = [
   "Int",
   "Float",
@@ -1045,8 +1047,8 @@ 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);
+  fieldRef(model, field, eb, modelAlias, inlineComputedField = true) {
+    return buildFieldRef(this.schema, model, field, this.options, eb, modelAlias, inlineComputedField);
   }
 };
 
@@ -1141,7 +1143,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),
-        this.fieldRef(relationModel, field, eb)
+        this.fieldRef(relationModel, field, eb, void 0, false)
       ]).flatMap((v) => v));
     } else if (payload.select) {
       objArgs.push(...Object.entries(payload.select).filter(([, value]) => value).map(([field, value]) => {
@@ -1153,7 +1155,7 @@ var PostgresCrudDialect = class extends BaseCrudDialect {
           ];
         } else {
           const fieldDef = requireField(this.schema, relationModel, field);
-          const fieldValue = fieldDef.relation ? eb.ref(`${parentAlias}$${relationField}$${field}.$j`) : this.fieldRef(relationModel, field, eb);
+          const fieldValue = fieldDef.relation ? eb.ref(`${parentAlias}$${relationField}$${field}.$j`) : this.fieldRef(relationModel, field, eb, void 0, false);
           return [
             sql2.lit(field),
             fieldValue
@@ -1304,7 +1306,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),
-          this.fieldRef(relationModel, field, eb)
+          this.fieldRef(relationModel, field, eb, void 0, false)
         ]).flatMap((v) => v));
       } else if (payload.select) {
         objArgs.push(...Object.entries(payload.select).filter(([, value]) => value).map(([field, value]) => {
@@ -1325,7 +1327,7 @@ var SqliteCrudDialect = class extends BaseCrudDialect {
             } else {
               return [
                 sql3.lit(field),
-                this.fieldRef(relationModel, field, eb)
+                this.fieldRef(relationModel, field, eb, void 0, false)
               ];
             }
           }
@@ -3425,8 +3427,8 @@ ${compiled.parameters.map((p) => inspect(p)).join("\n")}`;
   isNumericField(fieldDef) {
     return NUMERIC_FIELD_TYPES.includes(fieldDef.type) && !fieldDef.array;
   }
-  makeContextComment(context) {
-    return sql4.raw(`${CONTEXT_COMMENT_PREFIX}${JSON.stringify(context)}`);
+  makeContextComment(_context) {
+    return sql4``;
   }
   async updateMany(kysely, model, where, data, limit, returnData, filterModel) {
     if (typeof data !== "object") {
@@ -4469,8 +4471,7 @@ var InputValidator = class {
   }
   validateFindArgs(model, unique, args) {
     return this.validate(model, "find", {
-      unique,
-      collection: true
+      unique
     }, (model2, options) => this.makeFindSchema(model2, options), args);
   }
   validateCreateArgs(model, args) {
@@ -4538,12 +4539,12 @@ var InputValidator = class {
     fields["select"] = this.makeSelectSchema(model).optional();
     fields["include"] = this.makeIncludeSchema(model).optional();
     fields["omit"] = this.makeOmitSchema(model).optional();
-    fields["distinct"] = this.makeDistinctSchema(model).optional();
-    fields["cursor"] = this.makeCursorSchema(model).optional();
-    if (options.collection) {
+    if (!options.unique) {
       fields["skip"] = this.makeSkipSchema().optional();
       fields["take"] = this.makeTakeSchema().optional();
       fields["orderBy"] = this.orArray(this.makeOrderBySchema(model, true, false), true).optional();
+      fields["cursor"] = this.makeCursorSchema(model).optional();
+      fields["distinct"] = this.makeDistinctSchema(model).optional();
     }
     let result = z.strictObject(fields);
     result = this.refineForSelectIncludeMutuallyExclusive(result);
@@ -4849,13 +4850,7 @@ var InputValidator = class {
     for (const field of Object.keys(modelDef.fields)) {
       const fieldDef = requireField(this.schema, model, field);
       if (fieldDef.relation) {
-        fields[field] = z.union([
-          z.literal(true),
-          z.strictObject({
-            select: z.lazy(() => this.makeSelectSchema(fieldDef.type)).optional(),
-            include: z.lazy(() => this.makeIncludeSchema(fieldDef.type)).optional()
-          })
-        ]).optional();
+        fields[field] = this.makeRelationSelectIncludeSchema(fieldDef).optional();
       } else {
         fields[field] = z.boolean().optional();
       }
@@ -4879,6 +4874,28 @@ var InputValidator = class {
     }
     return z.strictObject(fields);
   }
+  makeRelationSelectIncludeSchema(fieldDef) {
+    return z.union([
+      z.boolean(),
+      z.strictObject({
+        ...fieldDef.array || fieldDef.optional ? {
+          // to-many relations and optional to-one relations are filterable
+          where: z.lazy(() => this.makeWhereSchema(fieldDef.type, false)).optional()
+        } : {},
+        select: z.lazy(() => this.makeSelectSchema(fieldDef.type)).optional(),
+        include: z.lazy(() => this.makeIncludeSchema(fieldDef.type)).optional(),
+        omit: z.lazy(() => this.makeOmitSchema(fieldDef.type)).optional(),
+        ...fieldDef.array ? {
+          // to-many relations can be ordered, skipped, taken, and cursor-located
+          orderBy: z.lazy(() => this.makeOrderBySchema(fieldDef.type, true, false)).optional(),
+          skip: this.makeSkipSchema().optional(),
+          take: this.makeTakeSchema().optional(),
+          cursor: this.makeCursorSchema(fieldDef.type).optional(),
+          distinct: this.makeDistinctSchema(fieldDef.type).optional()
+        } : {}
+      })
+    ]);
+  }
   makeOmitSchema(model) {
     const modelDef = requireModel(this.schema, model);
     const fields = {};
@@ -4896,19 +4913,7 @@ var InputValidator = class {
     for (const field of Object.keys(modelDef.fields)) {
       const fieldDef = requireField(this.schema, model, field);
       if (fieldDef.relation) {
-        fields[field] = z.union([
-          z.literal(true),
-          z.strictObject({
-            select: z.lazy(() => this.makeSelectSchema(fieldDef.type)).optional(),
-            include: z.lazy(() => this.makeIncludeSchema(fieldDef.type)).optional(),
-            omit: z.lazy(() => this.makeOmitSchema(fieldDef.type)).optional(),
-            where: z.lazy(() => this.makeWhereSchema(fieldDef.type, false)).optional(),
-            orderBy: z.lazy(() => this.makeOrderBySchema(fieldDef.type, true, false)).optional(),
-            skip: this.makeSkipSchema().optional(),
-            take: this.makeTakeSchema().optional(),
-            distinct: this.makeDistinctSchema(fieldDef.type).optional()
-          })
-        ]).optional();
+        fields[field] = this.makeRelationSelectIncludeSchema(fieldDef).optional();
       }
     }
     return z.strictObject(fields);