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

package/dist/{contract-BOWN0dwS.d.cts → contract-BF6mvhVn.d.cts}

@@ -1,5 +1,5 @@
 import Decimal, { Decimal as Decimal$1 } from 'decimal.js';
-import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, NonRelationFields, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetEnums, GetEnum, BuiltinType, GetModel, FieldDef, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, IsDelegateModel, GetModelDiscriminator, GetSubModels, FieldIsRelationArray, FieldIsDelegateDiscriminator, FieldType, RelationInfo, FieldIsDelegateRelation, DataSourceProviderType, ProcedureDef } from '@zenstackhq/sdk/schema';
+import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, NonRelationFields, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetModel, FieldDef, GetEnums, GetEnum, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, BuiltinType, IsDelegateModel, GetModelDiscriminator, GetSubModels, FieldIsRelationArray, FieldIsDelegateDiscriminator, FieldType, RelationInfo, FieldIsDelegateRelation, DataSourceProviderType, ProcedureDef } from '@zenstackhq/sdk/schema';
 import { Generated, Kysely, ExpressionBuilder, OperandExpression, SqlBool, SelectQueryBuilder, Expression, ExpressionWrapper, OperationNode, RootOperationNode, QueryResult, UnknownRow, Dialect, KyselyConfig } from 'kysely';
 
 type Optional<T extends object, K extends keyof T = keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
@@ -259,9 +259,9 @@ type FindArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Collect
     skip?: number;
     take?: number;
     orderBy?: OrArray<OrderBy<Schema, Model, true, false>>;
-} : {}) & (AllowFilter extends true ? {
+} & Distinct<Schema, Model> & Cursor<Schema, Model> : {}) & (AllowFilter extends true ? {
     where?: WhereInput<Schema, Model>;
-} : {}) & SelectIncludeOmit<Schema, Model, Collection> & Distinct<Schema, Model> & Cursor<Schema, Model>;
+} : {}) & SelectIncludeOmit<Schema, Model, Collection>;
 type FindManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = FindArgs<Schema, Model, true>;
 type FindFirstArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = FindArgs<Schema, Model, false>;
 type FindUniqueArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
@@ -603,6 +603,7 @@ declare abstract class BaseCrudDialect<Schema extends SchemaDef> {
 }
 
 type CrudOperation = 'findMany' | 'findUnique' | 'findFirst' | 'create' | 'createMany' | 'createManyAndReturn' | 'update' | 'updateMany' | 'updateManyAndReturn' | 'upsert' | 'delete' | 'deleteMany' | 'count' | 'aggregate' | 'groupBy';
+type AllCrudOperation = CrudOperation | 'findUniqueOrThrow' | 'findFirstOrThrow';
 
 /**
  * ZenStack runtime plugin.
@@ -647,7 +648,7 @@ type OnQueryHookContext<Schema extends SchemaDef> = {
     /**
      * The operation that is being performed.
      */
-    operation: CrudOperation;
+    operation: AllCrudOperation;
     /**
      * The query arguments.
      */

package/dist/{contract-BOWN0dwS.d.ts → contract-BF6mvhVn.d.ts}

@@ -1,5 +1,5 @@
 import Decimal, { Decimal as Decimal$1 } from 'decimal.js';
-import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, NonRelationFields, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetEnums, GetEnum, BuiltinType, GetModel, FieldDef, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, IsDelegateModel, GetModelDiscriminator, GetSubModels, FieldIsRelationArray, FieldIsDelegateDiscriminator, FieldType, RelationInfo, FieldIsDelegateRelation, DataSourceProviderType, ProcedureDef } from '@zenstackhq/sdk/schema';
+import { SchemaDef, GetModels, ScalarFields, ForeignKeyFields, GetModelFields, FieldHasDefault, GetModelFieldType, ModelFieldIsOptional, GetModelField, NonRelationFields, RelationFields, FieldIsArray, RelationFieldType, FieldIsRelation, GetModel, FieldDef, GetEnums, GetEnum, GetTypeDefs, GetTypeDefFields, GetTypeDefField, TypeDefFieldIsOptional, BuiltinType, IsDelegateModel, GetModelDiscriminator, GetSubModels, FieldIsRelationArray, FieldIsDelegateDiscriminator, FieldType, RelationInfo, FieldIsDelegateRelation, DataSourceProviderType, ProcedureDef } from '@zenstackhq/sdk/schema';
 import { Generated, Kysely, ExpressionBuilder, OperandExpression, SqlBool, SelectQueryBuilder, Expression, ExpressionWrapper, OperationNode, RootOperationNode, QueryResult, UnknownRow, Dialect, KyselyConfig } from 'kysely';
 
 type Optional<T extends object, K extends keyof T = keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
@@ -259,9 +259,9 @@ type FindArgs<Schema extends SchemaDef, Model extends GetModels<Schema>, Collect
     skip?: number;
     take?: number;
     orderBy?: OrArray<OrderBy<Schema, Model, true, false>>;
-} : {}) & (AllowFilter extends true ? {
+} & Distinct<Schema, Model> & Cursor<Schema, Model> : {}) & (AllowFilter extends true ? {
     where?: WhereInput<Schema, Model>;
-} : {}) & SelectIncludeOmit<Schema, Model, Collection> & Distinct<Schema, Model> & Cursor<Schema, Model>;
+} : {}) & SelectIncludeOmit<Schema, Model, Collection>;
 type FindManyArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = FindArgs<Schema, Model, true>;
 type FindFirstArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = FindArgs<Schema, Model, false>;
 type FindUniqueArgs<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
@@ -603,6 +603,7 @@ declare abstract class BaseCrudDialect<Schema extends SchemaDef> {
 }
 
 type CrudOperation = 'findMany' | 'findUnique' | 'findFirst' | 'create' | 'createMany' | 'createManyAndReturn' | 'update' | 'updateMany' | 'updateManyAndReturn' | 'upsert' | 'delete' | 'deleteMany' | 'count' | 'aggregate' | 'groupBy';
+type AllCrudOperation = CrudOperation | 'findUniqueOrThrow' | 'findFirstOrThrow';
 
 /**
  * ZenStack runtime plugin.
@@ -647,7 +648,7 @@ type OnQueryHookContext<Schema extends SchemaDef> = {
     /**
      * The operation that is being performed.
      */
-    operation: CrudOperation;
+    operation: AllCrudOperation;
     /**
      * The query arguments.
      */

package/dist/index.cjs

@@ -4506,8 +4506,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) {
@@ -4575,12 +4574,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 = import_zod.z.strictObject(fields);
     result = this.refineForSelectIncludeMutuallyExclusive(result);
@@ -4886,13 +4885,7 @@ var InputValidator = class {
     for (const field of Object.keys(modelDef.fields)) {
       const fieldDef = requireField(this.schema, model, field);
       if (fieldDef.relation) {
-        fields[field] = import_zod.z.union([
-          import_zod.z.literal(true),
-          import_zod.z.strictObject({
-            select: import_zod.z.lazy(() => this.makeSelectSchema(fieldDef.type)).optional(),
-            include: import_zod.z.lazy(() => this.makeIncludeSchema(fieldDef.type)).optional()
-          })
-        ]).optional();
+        fields[field] = this.makeRelationSelectIncludeSchema(fieldDef).optional();
       } else {
         fields[field] = import_zod.z.boolean().optional();
       }
@@ -4916,6 +4909,28 @@ var InputValidator = class {
     }
     return import_zod.z.strictObject(fields);
   }
+  makeRelationSelectIncludeSchema(fieldDef) {
+    return import_zod.z.union([
+      import_zod.z.boolean(),
+      import_zod.z.strictObject({
+        ...fieldDef.array || fieldDef.optional ? {
+          // to-many relations and optional to-one relations are filterable
+          where: import_zod.z.lazy(() => this.makeWhereSchema(fieldDef.type, false)).optional()
+        } : {},
+        select: import_zod.z.lazy(() => this.makeSelectSchema(fieldDef.type)).optional(),
+        include: import_zod.z.lazy(() => this.makeIncludeSchema(fieldDef.type)).optional(),
+        omit: import_zod.z.lazy(() => this.makeOmitSchema(fieldDef.type)).optional(),
+        ...fieldDef.array ? {
+          // to-many relations can be ordered, skipped, taken, and cursor-located
+          orderBy: import_zod.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 = {};
@@ -4933,19 +4948,7 @@ var InputValidator = class {
     for (const field of Object.keys(modelDef.fields)) {
       const fieldDef = requireField(this.schema, model, field);
       if (fieldDef.relation) {
-        fields[field] = import_zod.z.union([
-          import_zod.z.literal(true),
-          import_zod.z.strictObject({
-            select: import_zod.z.lazy(() => this.makeSelectSchema(fieldDef.type)).optional(),
-            include: import_zod.z.lazy(() => this.makeIncludeSchema(fieldDef.type)).optional(),
-            omit: import_zod.z.lazy(() => this.makeOmitSchema(fieldDef.type)).optional(),
-            where: import_zod.z.lazy(() => this.makeWhereSchema(fieldDef.type, false)).optional(),
-            orderBy: import_zod.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 import_zod.z.strictObject(fields);