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

package/dist/{contract-Y3qWOegb.d.cts → contract-C9SubPBD.d.cts}

@@ -1,6 +1,6 @@
 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 { Generated, Kysely, ExpressionBuilder, OperandExpression, SqlBool, SelectQueryBuilder, Expression, ExpressionWrapper, RootOperationNode, QueryResult, UnknownRow, OperationNode, Dialect, KyselyConfig } from 'kysely';
+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>>;
 type NullableIf<T, Condition extends boolean> = Condition extends true ? T | null : T;
@@ -605,79 +605,66 @@ declare abstract class BaseCrudDialect<Schema extends SchemaDef> {
 type CrudOperation = 'findMany' | 'findUnique' | 'findFirst' | 'create' | 'createMany' | 'createManyAndReturn' | 'update' | 'updateMany' | 'updateManyAndReturn' | 'upsert' | 'delete' | 'deleteMany' | 'count' | 'aggregate' | 'groupBy';
 
 /**
- * The result of the hooks interception filter.
+ * ZenStack runtime plugin.
  */
-type MutationInterceptionFilterResult = {
+interface RuntimePlugin<Schema extends SchemaDef = SchemaDef> {
     /**
-     * Whether to intercept the mutation or not.
+     * Plugin ID.
      */
-    intercept: boolean;
+    id: string;
     /**
-     * Whether entities should be loaded before the mutation.
+     * Plugin display name.
      */
-    loadBeforeMutationEntities?: boolean;
+    name?: string;
     /**
-     * Whether entities should be loaded after the mutation.
+     * Plugin description.
      */
-    loadAfterMutationEntities?: boolean;
-};
-type MutationHooksArgs<Schema extends SchemaDef> = {
+    description?: string;
     /**
-     * The model that is being mutated.
+     * Intercepts an ORM query.
      */
-    model: GetModels<Schema>;
+    onQuery?: OnQueryCallback<Schema>;
     /**
-     * The mutation action that is being performed.
+     * Intercepts an entity mutation.
      */
-    action: 'create' | 'update' | 'delete';
+    onEntityMutation?: EntityMutationHooksDef<Schema>;
     /**
-     * The mutation data. Only available for create and update actions.
+     * Intercepts a Kysely query.
      */
-    queryNode: OperationNode;
-};
-type PluginBeforeEntityMutationArgs<Schema extends SchemaDef> = MutationHooksArgs<Schema> & {
-    entities?: Record<string, unknown>[];
-};
-type PluginAfterEntityMutationArgs<Schema extends SchemaDef> = MutationHooksArgs<Schema> & {
-    beforeMutationEntities?: Record<string, unknown>[];
-    afterMutationEntities?: Record<string, unknown>[];
-};
-type OnKyselyQueryArgs<Schema extends SchemaDef> = {
-    kysely: ToKysely<Schema>;
-    schema: SchemaDef;
-    client: ClientContract<Schema>;
-    query: RootOperationNode;
-    proceed: ProceedKyselyQueryFunction;
-};
-type ProceedKyselyQueryFunction = (query: RootOperationNode) => Promise<QueryResult<any>>;
-type OnKyselyQueryCallback<Schema extends SchemaDef> = (args: OnKyselyQueryArgs<Schema>) => Promise<QueryResult<UnknownRow>>;
-type MutationInterceptionFilter<Schema extends SchemaDef> = (args: MutationHooksArgs<Schema>) => MaybePromise<MutationInterceptionFilterResult>;
-type BeforeEntityMutationCallback<Schema extends SchemaDef> = (args: PluginBeforeEntityMutationArgs<Schema>) => MaybePromise<void>;
-type AfterEntityMutationCallback<Schema extends SchemaDef> = (args: PluginAfterEntityMutationArgs<Schema>) => MaybePromise<void>;
+    onKyselyQuery?: OnKyselyQueryCallback<Schema>;
+}
 /**
- * ZenStack runtime plugin.
+ * Defines a ZenStack runtime plugin.
  */
-interface RuntimePlugin<Schema extends SchemaDef = SchemaDef> {
+declare function definePlugin<Schema extends SchemaDef>(plugin: RuntimePlugin<Schema>): RuntimePlugin<Schema>;
+
+type OnQueryCallback<Schema extends SchemaDef> = (ctx: OnQueryHookContext<Schema>) => Promise<unknown>;
+type OnQueryHookContext<Schema extends SchemaDef> = {
     /**
-     * Plugin ID.
+     * The model that is being queried.
      */
-    id: string;
+    model: GetModels<Schema>;
     /**
-     * Plugin display name.
+     * The operation that is being performed.
      */
-    name?: string;
+    operation: CrudOperation;
     /**
-     * Plugin description.
+     * The query arguments.
      */
-    description?: string;
+    args: unknown;
     /**
-     * Intercepts an ORM query.
+     * The function to proceed with the original query.
+     * It takes the same arguments as the operation method.
+     *
+     * @param args The query arguments.
      */
-    onQuery?: OnQueryHooks<Schema>;
+    proceed: (args: unknown) => Promise<unknown>;
     /**
-     * Intercepts a Kysely query.
+     * The ZenStack client that is performing the operation.
      */
-    onKyselyQuery?: OnKyselyQueryCallback<Schema>;
+    client: ClientContract<Schema>;
+};
+type EntityMutationHooksDef<Schema extends SchemaDef> = {
     /**
      * This callback determines whether a mutation should be intercepted, and if so,
      * what data should be loaded before and after the mutation.
@@ -697,52 +684,69 @@ interface RuntimePlugin<Schema extends SchemaDef = SchemaDef> {
      * return value of {@link RuntimePlugin.mutationInterceptionFilter}.
      */
     afterEntityMutation?: AfterEntityMutationCallback<Schema>;
-}
-type OnQueryHooks<Schema extends SchemaDef = SchemaDef> = {
-    [Model in GetModels<Schema> as Uncapitalize<Model>]?: OnQueryOperationHooks<Schema, Model>;
-} & {
-    $allModels?: OnQueryOperationHooks<Schema, GetModels<Schema>>;
 };
-type OnQueryOperationHooks<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
-    [Operation in keyof ModelOperations<Schema, Model>]?: (ctx: OnQueryHookContext<Schema, Model, Operation>) => Promise<Awaited<ReturnType<ModelOperations<Schema, Model>[Operation]>>>;
-} & {
-    $allOperations?: (ctx: {
-        model: Model;
-        operation: CrudOperation;
-        args: unknown;
-        query: (args: unknown) => Promise<unknown>;
-        client: ClientContract<Schema>;
-    }) => MaybePromise<unknown>;
+type MutationHooksArgs<Schema extends SchemaDef> = {
+    /**
+     * The model that is being mutated.
+     */
+    model: GetModels<Schema>;
+    /**
+     * The mutation action that is being performed.
+     */
+    action: 'create' | 'update' | 'delete';
+    /**
+     * The mutation data. Only available for create and update actions.
+     */
+    queryNode: OperationNode;
 };
-type OnQueryHookContext<Schema extends SchemaDef, Model extends GetModels<Schema>, Operation extends keyof ModelOperations<Schema, Model>> = {
+type MutationInterceptionFilter<Schema extends SchemaDef> = (args: MutationHooksArgs<Schema>) => MaybePromise<MutationInterceptionFilterResult>;
+/**
+ * The result of the hooks interception filter.
+ */
+type MutationInterceptionFilterResult = {
     /**
-     * The model that is being queried.
+     * Whether to intercept the mutation or not.
+     */
+    intercept: boolean;
+    /**
+     * Whether entities should be loaded before the mutation.
      */
-    model: Model;
+    loadBeforeMutationEntities?: boolean;
     /**
-     * The operation that is being performed.
+     * Whether entities should be loaded after the mutation.
      */
-    operation: Operation;
+    loadAfterMutationEntities?: boolean;
+};
+type BeforeEntityMutationCallback<Schema extends SchemaDef> = (args: PluginBeforeEntityMutationArgs<Schema>) => MaybePromise<void>;
+type AfterEntityMutationCallback<Schema extends SchemaDef> = (args: PluginAfterEntityMutationArgs<Schema>) => MaybePromise<void>;
+type PluginBeforeEntityMutationArgs<Schema extends SchemaDef> = MutationHooksArgs<Schema> & {
     /**
-     * The query arguments.
+     * Entities that are about to be mutated. Only available if `loadBeforeMutationEntities` is set to
+     * true in the return value of {@link RuntimePlugin.mutationInterceptionFilter}.
      */
-    args: Parameters<ModelOperations<Schema, Model>[Operation]>[0];
+    entities?: unknown[];
+};
+type PluginAfterEntityMutationArgs<Schema extends SchemaDef> = MutationHooksArgs<Schema> & {
     /**
-     * The query function to proceed with the original query.
-     * It takes the same arguments as the operation method.
-     *
-     * @param args The query arguments.
+     * Entities that are about to be mutated. Only available if `loadBeforeMutationEntities` is set to
+     * true in the return value of {@link RuntimePlugin.mutationInterceptionFilter}.
      */
-    query: (args: Parameters<ModelOperations<Schema, Model>[Operation]>[0]) => ReturnType<ModelOperations<Schema, Model>[Operation]>;
+    beforeMutationEntities?: unknown[];
     /**
-     * The ZenStack client that is performing the operation.
+     * Entities mutated. Only available if `loadAfterMutationEntities` is set to true in the return
+     * value of {@link RuntimePlugin.mutationInterceptionFilter}.
      */
+    afterMutationEntities?: unknown[];
+};
+type OnKyselyQueryArgs<Schema extends SchemaDef> = {
+    kysely: ToKysely<Schema>;
+    schema: SchemaDef;
     client: ClientContract<Schema>;
+    query: RootOperationNode;
+    proceed: ProceedKyselyQueryFunction;
 };
-/**
- * Defines a ZenStack runtime plugin.
- */
-declare function definePlugin<Schema extends SchemaDef>(plugin: RuntimePlugin<Schema>): RuntimePlugin<Schema>;
+type ProceedKyselyQueryFunction = (query: RootOperationNode) => Promise<QueryResult<any>>;
+type OnKyselyQueryCallback<Schema extends SchemaDef> = (args: OnKyselyQueryArgs<Schema>) => Promise<QueryResult<UnknownRow>>;
 
 type ZModelFunctionContext<Schema extends SchemaDef> = {
     dialect: BaseCrudDialect<Schema>;
@@ -950,7 +954,7 @@ interface ClientConstructor {
  * CRUD operations.
  */
 type CRUD = 'create' | 'read' | 'update' | 'delete';
-type ModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema>> = Omit<{
+type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
     /**
      * Returns a list of entities.
      * @param args - query args
@@ -1361,7 +1365,7 @@ type ModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema>>
      * }); // result: `{ id: string; email: string }`
      * ```
      */
-    delete<T extends DeleteArgs<Schema, Model>>(args: SelectSubset<T, DeleteArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model>>>;
+    delete<T extends DeleteArgs<Schema, Model>>(args: SelectSubset<T, DeleteArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
     /**
      * Deletes multiple entities.
      * @param args - delete args
@@ -1453,6 +1457,7 @@ type ModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema>>
      * });
      */
     groupBy<T extends GroupByArgs<Schema, Model>>(args: Subset<T, GroupByArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<GroupByResult<Schema, Model, T>>>;
-}, IsDelegateModel<Schema, Model> extends true ? 'create' | 'createMany' | 'createManyAndReturn' | 'upsert' : never>;
+};
+type ModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema>> = Omit<AllModelOperations<Schema, Model>, IsDelegateModel<Schema, Model> extends true ? 'create' | 'createMany' | 'createManyAndReturn' | 'upsert' : never>;
 
 export { type DeleteArgs as A, type BatchResult as B, type ClientConstructor as C, type DateTimeFilter as D, type DeleteManyArgs as E, type FindArgs as F, type CountArgs as G, type CountResult as H, type IncludeInput as I, type JsonArray as J, type AggregateArgs as K, type AggregateResult as L, type ModelResult as M, type NumberFilter as N, type OrderBy as O, type GroupByArgs as P, type GroupByResult as Q, type RuntimePlugin as R, type SimplifiedModelResult as S, type ToKysely as T, type UpdateArgs as U, type OnKyselyQueryArgs as V, type WhereInput as W, type JsonObject as a, type JsonValue as b, type ClientContract as c, type ClientOptions as d, definePlugin as e, type TypeDefResult as f, type StringFilter as g, type BytesFilter as h, type BooleanFilter as i, type SortOrder as j, type NullsOrder as k, type WhereUniqueInput as l, type OmitInput as m, type SelectIncludeOmit as n, type SelectInput as o, type Subset as p, type SelectSubset as q, type FindManyArgs as r, type FindFirstArgs as s, type FindUniqueArgs as t, type CreateArgs as u, type CreateManyArgs as v, type CreateManyAndReturnArgs as w, type UpdateManyArgs as x, type UpdateManyAndReturnArgs as y, type UpsertArgs as z };

package/dist/{contract-Y3qWOegb.d.ts → contract-C9SubPBD.d.ts}

@@ -1,6 +1,6 @@
 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 { Generated, Kysely, ExpressionBuilder, OperandExpression, SqlBool, SelectQueryBuilder, Expression, ExpressionWrapper, RootOperationNode, QueryResult, UnknownRow, OperationNode, Dialect, KyselyConfig } from 'kysely';
+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>>;
 type NullableIf<T, Condition extends boolean> = Condition extends true ? T | null : T;
@@ -605,79 +605,66 @@ declare abstract class BaseCrudDialect<Schema extends SchemaDef> {
 type CrudOperation = 'findMany' | 'findUnique' | 'findFirst' | 'create' | 'createMany' | 'createManyAndReturn' | 'update' | 'updateMany' | 'updateManyAndReturn' | 'upsert' | 'delete' | 'deleteMany' | 'count' | 'aggregate' | 'groupBy';
 
 /**
- * The result of the hooks interception filter.
+ * ZenStack runtime plugin.
  */
-type MutationInterceptionFilterResult = {
+interface RuntimePlugin<Schema extends SchemaDef = SchemaDef> {
     /**
-     * Whether to intercept the mutation or not.
+     * Plugin ID.
      */
-    intercept: boolean;
+    id: string;
     /**
-     * Whether entities should be loaded before the mutation.
+     * Plugin display name.
      */
-    loadBeforeMutationEntities?: boolean;
+    name?: string;
     /**
-     * Whether entities should be loaded after the mutation.
+     * Plugin description.
      */
-    loadAfterMutationEntities?: boolean;
-};
-type MutationHooksArgs<Schema extends SchemaDef> = {
+    description?: string;
     /**
-     * The model that is being mutated.
+     * Intercepts an ORM query.
      */
-    model: GetModels<Schema>;
+    onQuery?: OnQueryCallback<Schema>;
     /**
-     * The mutation action that is being performed.
+     * Intercepts an entity mutation.
      */
-    action: 'create' | 'update' | 'delete';
+    onEntityMutation?: EntityMutationHooksDef<Schema>;
     /**
-     * The mutation data. Only available for create and update actions.
+     * Intercepts a Kysely query.
      */
-    queryNode: OperationNode;
-};
-type PluginBeforeEntityMutationArgs<Schema extends SchemaDef> = MutationHooksArgs<Schema> & {
-    entities?: Record<string, unknown>[];
-};
-type PluginAfterEntityMutationArgs<Schema extends SchemaDef> = MutationHooksArgs<Schema> & {
-    beforeMutationEntities?: Record<string, unknown>[];
-    afterMutationEntities?: Record<string, unknown>[];
-};
-type OnKyselyQueryArgs<Schema extends SchemaDef> = {
-    kysely: ToKysely<Schema>;
-    schema: SchemaDef;
-    client: ClientContract<Schema>;
-    query: RootOperationNode;
-    proceed: ProceedKyselyQueryFunction;
-};
-type ProceedKyselyQueryFunction = (query: RootOperationNode) => Promise<QueryResult<any>>;
-type OnKyselyQueryCallback<Schema extends SchemaDef> = (args: OnKyselyQueryArgs<Schema>) => Promise<QueryResult<UnknownRow>>;
-type MutationInterceptionFilter<Schema extends SchemaDef> = (args: MutationHooksArgs<Schema>) => MaybePromise<MutationInterceptionFilterResult>;
-type BeforeEntityMutationCallback<Schema extends SchemaDef> = (args: PluginBeforeEntityMutationArgs<Schema>) => MaybePromise<void>;
-type AfterEntityMutationCallback<Schema extends SchemaDef> = (args: PluginAfterEntityMutationArgs<Schema>) => MaybePromise<void>;
+    onKyselyQuery?: OnKyselyQueryCallback<Schema>;
+}
 /**
- * ZenStack runtime plugin.
+ * Defines a ZenStack runtime plugin.
  */
-interface RuntimePlugin<Schema extends SchemaDef = SchemaDef> {
+declare function definePlugin<Schema extends SchemaDef>(plugin: RuntimePlugin<Schema>): RuntimePlugin<Schema>;
+
+type OnQueryCallback<Schema extends SchemaDef> = (ctx: OnQueryHookContext<Schema>) => Promise<unknown>;
+type OnQueryHookContext<Schema extends SchemaDef> = {
     /**
-     * Plugin ID.
+     * The model that is being queried.
      */
-    id: string;
+    model: GetModels<Schema>;
     /**
-     * Plugin display name.
+     * The operation that is being performed.
      */
-    name?: string;
+    operation: CrudOperation;
     /**
-     * Plugin description.
+     * The query arguments.
      */
-    description?: string;
+    args: unknown;
     /**
-     * Intercepts an ORM query.
+     * The function to proceed with the original query.
+     * It takes the same arguments as the operation method.
+     *
+     * @param args The query arguments.
      */
-    onQuery?: OnQueryHooks<Schema>;
+    proceed: (args: unknown) => Promise<unknown>;
     /**
-     * Intercepts a Kysely query.
+     * The ZenStack client that is performing the operation.
      */
-    onKyselyQuery?: OnKyselyQueryCallback<Schema>;
+    client: ClientContract<Schema>;
+};
+type EntityMutationHooksDef<Schema extends SchemaDef> = {
     /**
      * This callback determines whether a mutation should be intercepted, and if so,
      * what data should be loaded before and after the mutation.
@@ -697,52 +684,69 @@ interface RuntimePlugin<Schema extends SchemaDef = SchemaDef> {
      * return value of {@link RuntimePlugin.mutationInterceptionFilter}.
      */
     afterEntityMutation?: AfterEntityMutationCallback<Schema>;
-}
-type OnQueryHooks<Schema extends SchemaDef = SchemaDef> = {
-    [Model in GetModels<Schema> as Uncapitalize<Model>]?: OnQueryOperationHooks<Schema, Model>;
-} & {
-    $allModels?: OnQueryOperationHooks<Schema, GetModels<Schema>>;
 };
-type OnQueryOperationHooks<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
-    [Operation in keyof ModelOperations<Schema, Model>]?: (ctx: OnQueryHookContext<Schema, Model, Operation>) => Promise<Awaited<ReturnType<ModelOperations<Schema, Model>[Operation]>>>;
-} & {
-    $allOperations?: (ctx: {
-        model: Model;
-        operation: CrudOperation;
-        args: unknown;
-        query: (args: unknown) => Promise<unknown>;
-        client: ClientContract<Schema>;
-    }) => MaybePromise<unknown>;
+type MutationHooksArgs<Schema extends SchemaDef> = {
+    /**
+     * The model that is being mutated.
+     */
+    model: GetModels<Schema>;
+    /**
+     * The mutation action that is being performed.
+     */
+    action: 'create' | 'update' | 'delete';
+    /**
+     * The mutation data. Only available for create and update actions.
+     */
+    queryNode: OperationNode;
 };
-type OnQueryHookContext<Schema extends SchemaDef, Model extends GetModels<Schema>, Operation extends keyof ModelOperations<Schema, Model>> = {
+type MutationInterceptionFilter<Schema extends SchemaDef> = (args: MutationHooksArgs<Schema>) => MaybePromise<MutationInterceptionFilterResult>;
+/**
+ * The result of the hooks interception filter.
+ */
+type MutationInterceptionFilterResult = {
     /**
-     * The model that is being queried.
+     * Whether to intercept the mutation or not.
+     */
+    intercept: boolean;
+    /**
+     * Whether entities should be loaded before the mutation.
      */
-    model: Model;
+    loadBeforeMutationEntities?: boolean;
     /**
-     * The operation that is being performed.
+     * Whether entities should be loaded after the mutation.
      */
-    operation: Operation;
+    loadAfterMutationEntities?: boolean;
+};
+type BeforeEntityMutationCallback<Schema extends SchemaDef> = (args: PluginBeforeEntityMutationArgs<Schema>) => MaybePromise<void>;
+type AfterEntityMutationCallback<Schema extends SchemaDef> = (args: PluginAfterEntityMutationArgs<Schema>) => MaybePromise<void>;
+type PluginBeforeEntityMutationArgs<Schema extends SchemaDef> = MutationHooksArgs<Schema> & {
     /**
-     * The query arguments.
+     * Entities that are about to be mutated. Only available if `loadBeforeMutationEntities` is set to
+     * true in the return value of {@link RuntimePlugin.mutationInterceptionFilter}.
      */
-    args: Parameters<ModelOperations<Schema, Model>[Operation]>[0];
+    entities?: unknown[];
+};
+type PluginAfterEntityMutationArgs<Schema extends SchemaDef> = MutationHooksArgs<Schema> & {
     /**
-     * The query function to proceed with the original query.
-     * It takes the same arguments as the operation method.
-     *
-     * @param args The query arguments.
+     * Entities that are about to be mutated. Only available if `loadBeforeMutationEntities` is set to
+     * true in the return value of {@link RuntimePlugin.mutationInterceptionFilter}.
      */
-    query: (args: Parameters<ModelOperations<Schema, Model>[Operation]>[0]) => ReturnType<ModelOperations<Schema, Model>[Operation]>;
+    beforeMutationEntities?: unknown[];
     /**
-     * The ZenStack client that is performing the operation.
+     * Entities mutated. Only available if `loadAfterMutationEntities` is set to true in the return
+     * value of {@link RuntimePlugin.mutationInterceptionFilter}.
      */
+    afterMutationEntities?: unknown[];
+};
+type OnKyselyQueryArgs<Schema extends SchemaDef> = {
+    kysely: ToKysely<Schema>;
+    schema: SchemaDef;
     client: ClientContract<Schema>;
+    query: RootOperationNode;
+    proceed: ProceedKyselyQueryFunction;
 };
-/**
- * Defines a ZenStack runtime plugin.
- */
-declare function definePlugin<Schema extends SchemaDef>(plugin: RuntimePlugin<Schema>): RuntimePlugin<Schema>;
+type ProceedKyselyQueryFunction = (query: RootOperationNode) => Promise<QueryResult<any>>;
+type OnKyselyQueryCallback<Schema extends SchemaDef> = (args: OnKyselyQueryArgs<Schema>) => Promise<QueryResult<UnknownRow>>;
 
 type ZModelFunctionContext<Schema extends SchemaDef> = {
     dialect: BaseCrudDialect<Schema>;
@@ -950,7 +954,7 @@ interface ClientConstructor {
  * CRUD operations.
  */
 type CRUD = 'create' | 'read' | 'update' | 'delete';
-type ModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema>> = Omit<{
+type AllModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema>> = {
     /**
      * Returns a list of entities.
      * @param args - query args
@@ -1361,7 +1365,7 @@ type ModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema>>
      * }); // result: `{ id: string; email: string }`
      * ```
      */
-    delete<T extends DeleteArgs<Schema, Model>>(args: SelectSubset<T, DeleteArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model>>>;
+    delete<T extends DeleteArgs<Schema, Model>>(args: SelectSubset<T, DeleteArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<ModelResult<Schema, Model, T>>>;
     /**
      * Deletes multiple entities.
      * @param args - delete args
@@ -1453,6 +1457,7 @@ type ModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema>>
      * });
      */
     groupBy<T extends GroupByArgs<Schema, Model>>(args: Subset<T, GroupByArgs<Schema, Model>>): ZenStackPromise<Schema, Simplify<GroupByResult<Schema, Model, T>>>;
-}, IsDelegateModel<Schema, Model> extends true ? 'create' | 'createMany' | 'createManyAndReturn' | 'upsert' : never>;
+};
+type ModelOperations<Schema extends SchemaDef, Model extends GetModels<Schema>> = Omit<AllModelOperations<Schema, Model>, IsDelegateModel<Schema, Model> extends true ? 'create' | 'createMany' | 'createManyAndReturn' | 'upsert' : never>;
 
 export { type DeleteArgs as A, type BatchResult as B, type ClientConstructor as C, type DateTimeFilter as D, type DeleteManyArgs as E, type FindArgs as F, type CountArgs as G, type CountResult as H, type IncludeInput as I, type JsonArray as J, type AggregateArgs as K, type AggregateResult as L, type ModelResult as M, type NumberFilter as N, type OrderBy as O, type GroupByArgs as P, type GroupByResult as Q, type RuntimePlugin as R, type SimplifiedModelResult as S, type ToKysely as T, type UpdateArgs as U, type OnKyselyQueryArgs as V, type WhereInput as W, type JsonObject as a, type JsonValue as b, type ClientContract as c, type ClientOptions as d, definePlugin as e, type TypeDefResult as f, type StringFilter as g, type BytesFilter as h, type BooleanFilter as i, type SortOrder as j, type NullsOrder as k, type WhereUniqueInput as l, type OmitInput as m, type SelectIncludeOmit as n, type SelectInput as o, type Subset as p, type SelectSubset as q, type FindManyArgs as r, type FindFirstArgs as s, type FindUniqueArgs as t, type CreateArgs as u, type CreateManyArgs as v, type CreateManyAndReturnArgs as w, type UpdateManyArgs as x, type UpdateManyAndReturnArgs as y, type UpsertArgs as z };

package/dist/index.cjs

@@ -6015,7 +6015,7 @@ ${compiled.parameters.map((p) => (0, import_node_util2.inspect)(p)).join("\n")}`
     return newExecutor;
   }
   get hasMutationHooks() {
-    return this.client.$options.plugins?.some((plugin) => plugin.beforeEntityMutation || plugin.afterEntityMutation);
+    return this.client.$options.plugins?.some((plugin) => !!plugin.onEntityMutation);
   }
   getMutationModel(queryNode) {
     return (0, import_ts_pattern16.match)(queryNode).when(import_kysely13.InsertQueryNode.is, (node) => node.into.table.identifier.name).when(import_kysely13.UpdateQueryNode.is, (node) => node.table.table.identifier.name).when(import_kysely13.DeleteQueryNode.is, (node) => {
@@ -6045,10 +6045,14 @@ ${compiled.parameters.map((p) => (0, import_node_util2.inspect)(p)).join("\n")}`
         where: node.where
       })).exhaustive();
       for (const plugin of plugins) {
-        if (!plugin.mutationInterceptionFilter) {
+        const onEntityMutation = plugin.onEntityMutation;
+        if (!onEntityMutation) {
+          continue;
+        }
+        if (!onEntityMutation.mutationInterceptionFilter) {
           result.intercept = true;
         } else {
-          const filterResult = await plugin.mutationInterceptionFilter({
+          const filterResult = await onEntityMutation.mutationInterceptionFilter({
             model: mutationModel,
             action,
             queryNode
@@ -6080,8 +6084,9 @@ ${compiled.parameters.map((p) => (0, import_node_util2.inspect)(p)).join("\n")}`
     if (this.options.plugins) {
       const mutationModel = this.getMutationModel(queryNode);
       for (const plugin of this.options.plugins) {
-        if (plugin.beforeEntityMutation) {
-          await plugin.beforeEntityMutation({
+        const onEntityMutation = plugin.onEntityMutation;
+        if (onEntityMutation?.beforeEntityMutation) {
+          await onEntityMutation.beforeEntityMutation({
             model: mutationModel,
             action: mutationInterceptionInfo.action,
             queryNode,
@@ -6097,8 +6102,9 @@ ${compiled.parameters.map((p) => (0, import_node_util2.inspect)(p)).join("\n")}`
     }
     const hooks = [];
     for (const plugin of this.options.plugins ?? []) {
-      if (plugin.afterEntityMutation) {
-        hooks.push(plugin.afterEntityMutation.bind(plugin));
+      const onEntityMutation = plugin.onEntityMutation;
+      if (onEntityMutation?.afterEntityMutation) {
+        hooks.push(onEntityMutation.afterEntityMutation.bind(plugin));
       }
     }
     if (hooks.length === 0) {
@@ -6896,7 +6902,7 @@ function createModelCrudHandler(client, model, inputValidator, resultProcessor)
     return createZenStackPromise(async (txClient) => {
       let proceed = /* @__PURE__ */ __name(async (_args) => {
         const _handler = txClient ? handler.withClient(txClient) : handler;
-        const r = await _handler.handle(operation, _args ?? args);
+        const r = await _handler.handle(operation, _args);
         if (!r && throwIfNoResult) {
           throw new NotFoundError(model);
         }
@@ -6912,27 +6918,18 @@ function createModelCrudHandler(client, model, inputValidator, resultProcessor)
         ...client.$options.plugins ?? []
       ];
       for (const plugin of plugins) {
-        if (plugin.onQuery && typeof plugin.onQuery === "object") {
-          for (const [_model, modelHooks] of Object.entries(plugin.onQuery)) {
-            if (_model === (0, import_common_helpers13.lowerCaseFirst)(model) || _model === "$allModels") {
-              if (modelHooks && typeof modelHooks === "object") {
-                for (const [op, opHooks] of Object.entries(modelHooks)) {
-                  if (op === operation || op === "$allOperations") {
-                    if (typeof opHooks === "function") {
-                      const _proceed = proceed;
-                      proceed = /* @__PURE__ */ __name(() => opHooks({
-                        client,
-                        model,
-                        operation,
-                        args,
-                        query: _proceed
-                      }), "proceed");
-                    }
-                  }
-                }
-              }
-            }
-          }
+        const onQuery = plugin.onQuery;
+        if (onQuery) {
+          const _proceed = proceed;
+          proceed = /* @__PURE__ */ __name((_args) => onQuery({
+            client,
+            model,
+            operation,
+            // reflect the latest override if provided
+            args: _args,
+            // ensure inner overrides are propagated to the previous proceed
+            proceed: /* @__PURE__ */ __name((nextArgs) => _proceed(nextArgs), "proceed")
+          }), "proceed");
         }
       }
       return proceed(args);