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

package/dist/index.d.cts

@@ -1,5 +1,5 @@
-import { C as ClientConstructor } from './contract-BOWN0dwS.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-BOWN0dwS.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-BOWN0dwS.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-BOWN0dwS.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

@@ -4471,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) {
@@ -4540,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);
@@ -4851,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();
       }
@@ -4881,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 = {};
@@ -4898,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);