prisma-guard 1.21.0 → 1.22.0

package/dist/runtime/index.d.cts

@@ -95,7 +95,7 @@ interface NestedSelectArgs {
     };
     skip?: true;
 }
-type ShapeOrFn<TCtx = unknown> = ShapeConfig | ((ctx: TCtx) => ShapeConfig);
+type ShapeOrFn$1<TCtx = unknown> = ShapeConfig | ((ctx: TCtx) => ShapeConfig);
 interface ScopeEntry {
     readonly fk: string;
     readonly root: string;
@@ -150,7 +150,7 @@ type GuardInput = GuardShapeOrFn | Record<string, GuardShapeOrFn>;
 type GuardableMethodName = QueryMethod | MutationMethod;
 type ExtractReturn<T, K extends string> = K extends keyof T ? T[K] extends (...args: any[]) => infer R ? R : never : never;
 type GuardedModel<TDelegate> = {
-    [K in GuardableMethodName as K extends keyof TDelegate ? K : never]: ExtractReturn<TDelegate, K> extends never ? never : (body: unknown) => ExtractReturn<TDelegate, K>;
+    [K in GuardableMethodName as K extends keyof TDelegate ? K : never]: ExtractReturn<TDelegate, K> extends never ? never : (body?: unknown) => ExtractReturn<TDelegate, K>;
 };
 
 declare function createGuard<TModels extends TypeMap = TypeMap, TRoots extends string = string, TModelExt = unknown>(config: GuardConfig & {
@@ -158,7 +158,7 @@ declare function createGuard<TModels extends TypeMap = TypeMap, TRoots extends s
 }): {
     input: (model: Extract<keyof TModels, string>, opts: InputOpts) => InputSchema;
     model: (model: Extract<keyof TModels, string>, opts: ModelOpts) => zod.ZodObject<any, zod_v4_core.$strip>;
-    query: <TCtx = unknown>(model: Extract<keyof TModels, string>, method: QueryMethod, config_: ShapeOrFn<TCtx> | Record<string, ShapeOrFn<TCtx>>) => QuerySchema<TCtx>;
+    query: <TCtx = unknown>(model: Extract<keyof TModels, string>, method: QueryMethod, config_: ShapeOrFn$1<TCtx> | Record<string, ShapeOrFn$1<TCtx>>) => QuerySchema<TCtx>;
     extension: <TCtx extends Record<string, unknown> = Record<string, unknown>>(contextFn?: () => TCtx) => {
         name: string;
         model: TModelExt;
@@ -191,4 +191,138 @@ declare function unsupported(): {
     __brand: 'unsupported';
 };
 
-export { CallerError, type EnumMap, type FieldMeta, type GuardConfig, type GuardGeneratedConfig, type GuardInput, type GuardLogger, type GuardShape, type GuardShapeOrFn, type GuardedModel, type InputOpts, type InputSchema, type MissingScopeContextMode, type ModelOpts, type MutationMethod, type NestedIncludeArgs, type NestedSelectArgs, PolicyError, type QueryMethod, type QuerySchema, type ScopeEntry, type ScopeMap, type ShapeConfig, ShapeError, type ShapeOrFn, type TypeMap, type UniqueConstraint, type UniqueMap, type ZodChains, type ZodDefaults, createGuard, force, unsupported };
+declare const OPERATION_SHAPE_KEYS: {
+    readonly findMany: readonly ["where", "include", "select", "orderBy", "cursor", "take", "skip", "distinct"];
+    readonly findFirst: readonly ["where", "include", "select", "orderBy", "cursor", "take", "skip", "distinct"];
+    readonly findFirstOrThrow: readonly ["where", "include", "select", "orderBy", "cursor", "take", "skip", "distinct"];
+    readonly findUnique: readonly ["where", "include", "select"];
+    readonly findUniqueOrThrow: readonly ["where", "include", "select"];
+    readonly findManyPaginated: readonly ["where", "include", "select", "orderBy", "cursor", "take", "skip", "distinct"];
+    readonly count: readonly ["where", "select", "cursor", "orderBy", "skip", "take"];
+    readonly aggregate: readonly ["where", "orderBy", "cursor", "take", "skip", "_count", "_avg", "_sum", "_min", "_max"];
+    readonly groupBy: readonly ["where", "by", "having", "_count", "_avg", "_sum", "_min", "_max", "orderBy", "take", "skip"];
+    readonly create: readonly ["data", "select", "include"];
+    readonly createMany: readonly ["data"];
+    readonly createManyAndReturn: readonly ["data", "select", "include"];
+    readonly update: readonly ["data", "where", "select", "include"];
+    readonly updateMany: readonly ["data", "where"];
+    readonly updateManyAndReturn: readonly ["data", "where", "select", "include"];
+    readonly upsert: readonly ["where", "create", "update", "select", "include"];
+    readonly delete: readonly ["where", "select", "include"];
+    readonly deleteMany: readonly ["where"];
+};
+type OperationName = keyof typeof OPERATION_SHAPE_KEYS;
+type OperationShapeKey<O extends OperationName> = (typeof OPERATION_SHAPE_KEYS)[O][number];
+
+interface FieldMetaConst {
+    readonly type: string;
+    readonly isList: boolean;
+    readonly isRequired: boolean;
+    readonly isId: boolean;
+    readonly isRelation: boolean;
+    readonly hasDefault: boolean;
+    readonly isUpdatedAt: boolean;
+    readonly isEnum?: boolean;
+    readonly isUnique?: boolean;
+    readonly isUnsupported?: boolean;
+}
+type TypeMapConst = Record<string, Record<string, FieldMetaConst>>;
+type ShapeDepth = 0 | 1 | 2 | 3;
+type DecDepth<D extends ShapeDepth> = D extends 3 ? 2 : D extends 2 ? 1 : D extends 1 ? 0 : 0;
+type AllFields<TM extends TypeMapConst, M extends keyof TM> = keyof TM[M] & string;
+type ScalarFields<TM extends TypeMapConst, M extends keyof TM> = {
+    [K in keyof TM[M]]: TM[M][K]['isRelation'] extends true ? never : K;
+}[keyof TM[M]] & string;
+type RelationFields<TM extends TypeMapConst, M extends keyof TM> = {
+    [K in keyof TM[M]]: TM[M][K]['isRelation'] extends true ? K : never;
+}[keyof TM[M]] & string;
+type WritableFields<TM extends TypeMapConst, M extends keyof TM> = {
+    [K in keyof TM[M]]: TM[M][K]['isRelation'] extends true ? never : TM[M][K]['isUpdatedAt'] extends true ? never : K;
+}[keyof TM[M]] & string;
+type UniqueFields<TM extends TypeMapConst, M extends keyof TM> = {
+    [K in keyof TM[M]]: TM[M][K]['isUnique'] extends true ? K : TM[M][K]['isId'] extends true ? K : never;
+}[keyof TM[M]] & string;
+type NumericScalarType = 'Int' | 'BigInt' | 'Float' | 'Decimal';
+type ComparableScalarType = NumericScalarType | 'String' | 'DateTime';
+type NumericFields<TM extends TypeMapConst, M extends keyof TM> = {
+    [K in keyof TM[M]]: TM[M][K]['isRelation'] extends true ? never : TM[M][K]['type'] extends NumericScalarType ? K : never;
+}[keyof TM[M]] & string;
+type ComparableFields<TM extends TypeMapConst, M extends keyof TM> = {
+    [K in keyof TM[M]]: TM[M][K]['isRelation'] extends true ? never : TM[M][K]['type'] extends ComparableScalarType ? K : never;
+}[keyof TM[M]] & string;
+type RelTarget<TM extends TypeMapConst, M extends keyof TM, K extends keyof TM[M]> = TM[M][K]['type'] extends string ? Extract<keyof TM, TM[M][K]['type']> : never;
+type LooseNestedArgs = {
+    select?: Record<string, unknown>;
+    include?: Record<string, unknown>;
+    where?: Record<string, unknown>;
+    orderBy?: Record<string, unknown>;
+    cursor?: Record<string, unknown>;
+    take?: number | {
+        max: number;
+        default?: number;
+    };
+    skip?: true;
+};
+type TypedWhere<TM extends TypeMapConst, M extends keyof TM> = Partial<Record<AllFields<TM, M> | 'AND' | 'OR' | 'NOT', unknown>>;
+type TypedNestedRelArgs<TM extends TypeMapConst, T, D extends ShapeDepth> = T extends keyof TM ? D extends 0 ? LooseNestedArgs : {
+    select?: TypedProjection<TM, T, DecDepth<D>>;
+    include?: TypedInclude<TM, T, DecDepth<D>>;
+    where?: TypedWhere<TM, T>;
+    orderBy?: true | Partial<Record<AllFields<TM, T>, unknown>>;
+    cursor?: Partial<Record<UniqueFields<TM, T>, true>>;
+    take?: number | {
+        max: number;
+        default?: number;
+    };
+    skip?: true;
+} : LooseNestedArgs;
+type TypedProjection<TM extends TypeMapConst, M extends keyof TM, D extends ShapeDepth> = {
+    [K in AllFields<TM, M>]?: K extends RelationFields<TM, M> ? true | TypedNestedRelArgs<TM, RelTarget<TM, M, K>, D> : true;
+};
+type TypedInclude<TM extends TypeMapConst, M extends keyof TM, D extends ShapeDepth> = {
+    [K in RelationFields<TM, M>]?: true | TypedNestedRelArgs<TM, RelTarget<TM, M, K>, D>;
+};
+type TypedCountSelect<TM extends TypeMapConst, M extends keyof TM> = Partial<Record<ScalarFields<TM, M> | '_all', true>>;
+type TypedCountField<TM extends TypeMapConst, M extends keyof TM> = true | Partial<Record<ScalarFields<TM, M> | '_all', true>>;
+type TypedShapeProps<TM extends TypeMapConst, M extends keyof TM, D extends ShapeDepth> = {
+    where: TypedWhere<TM, M>;
+    select: TypedProjection<TM, M, D>;
+    include: TypedInclude<TM, M, D>;
+    orderBy: true | Partial<Record<AllFields<TM, M>, unknown>>;
+    cursor: Partial<Record<UniqueFields<TM, M>, true>>;
+    take: number | {
+        max: number;
+        default?: number;
+    };
+    skip: true;
+    distinct: ScalarFields<TM, M>[];
+    by: ScalarFields<TM, M>[];
+    having: Partial<Record<ScalarFields<TM, M>, unknown>>;
+    _count: TypedCountField<TM, M>;
+    _avg: Partial<Record<NumericFields<TM, M>, true>>;
+    _sum: Partial<Record<NumericFields<TM, M>, true>>;
+    _min: Partial<Record<ComparableFields<TM, M>, true>>;
+    _max: Partial<Record<ComparableFields<TM, M>, true>>;
+    data: Partial<Record<WritableFields<TM, M>, unknown>>;
+    create: Partial<Record<WritableFields<TM, M>, unknown>>;
+    update: Partial<Record<WritableFields<TM, M>, unknown>>;
+};
+type BaseOperationShape<TM extends TypeMapConst, M extends keyof TM, O extends OperationName, D extends ShapeDepth> = Partial<Pick<TypedShapeProps<TM, M, D>, Extract<OperationShapeKey<O>, keyof TypedShapeProps<TM, M, D>>>>;
+type RequireKeys<T, K extends keyof T> = Omit<T, K> & {
+    [P in K]-?: NonNullable<T[P]>;
+};
+type CountShape<TM extends TypeMapConst, M extends keyof TM, D extends ShapeDepth> = Omit<BaseOperationShape<TM, M, 'count', D>, 'select'> & {
+    select?: TypedCountSelect<TM, M>;
+};
+type OperationShape<TM extends TypeMapConst, M extends keyof TM, O extends OperationName, D extends ShapeDepth = 1> = O extends 'findUnique' ? RequireKeys<BaseOperationShape<TM, M, 'findUnique', D>, 'where'> : O extends 'findUniqueOrThrow' ? RequireKeys<BaseOperationShape<TM, M, 'findUniqueOrThrow', D>, 'where'> : O extends 'groupBy' ? RequireKeys<BaseOperationShape<TM, M, 'groupBy', D>, 'by'> : O extends 'count' ? CountShape<TM, M, D> : BaseOperationShape<TM, M, O, D>;
+type TypedGuardShape<TM extends TypeMapConst, M extends keyof TM, D extends ShapeDepth = 1> = Partial<TypedShapeProps<TM, M, D>>;
+type ShapeFn<S, TCtx> = (ctx: TCtx) => S;
+type ShapeOrFn<S, TCtx> = S | ShapeFn<S, TCtx>;
+declare const namedShapeBrand: unique symbol;
+type NamedShapeMap<S, TCtx> = Record<string, ShapeOrFn<S, TCtx>> & {
+    readonly [namedShapeBrand]: true;
+};
+declare function namedShapes<S, TCtx = unknown>(shapes: Record<string, ShapeOrFn<S, TCtx>>): NamedShapeMap<S, TCtx>;
+type ShapeInput<S, TCtx = unknown> = ShapeOrFn<S, TCtx> | NamedShapeMap<S, TCtx>;
+
+export { CallerError, type ComparableFields, type EnumMap, type FieldMeta, type FieldMetaConst, type GuardConfig, type GuardGeneratedConfig, type GuardInput, type GuardLogger, type GuardShape, type GuardShapeOrFn, type GuardedModel, type InputOpts, type InputSchema, type MissingScopeContextMode, type ModelOpts, type MutationMethod, type NamedShapeMap, type NestedIncludeArgs, type NestedSelectArgs, type NumericFields, type OperationName, type OperationShape, PolicyError, type QueryMethod, type QuerySchema, type ScopeEntry, type ScopeMap, type ShapeConfig, type ShapeDepth, ShapeError, type ShapeInput, type ShapeOrFn$1 as ShapeOrFn, type TypeMap, type TypeMapConst, type TypedCountSelect, type TypedGuardShape, type TypedInclude, type TypedProjection, type TypedShapeProps, type TypedWhere, type UniqueConstraint, type UniqueMap, type ZodChains, type ZodDefaults, createGuard, force, namedShapes, unsupported };

package/dist/runtime/index.d.ts

@@ -95,7 +95,7 @@ interface NestedSelectArgs {
     };
     skip?: true;
 }
-type ShapeOrFn<TCtx = unknown> = ShapeConfig | ((ctx: TCtx) => ShapeConfig);
+type ShapeOrFn$1<TCtx = unknown> = ShapeConfig | ((ctx: TCtx) => ShapeConfig);
 interface ScopeEntry {
     readonly fk: string;
     readonly root: string;
@@ -150,7 +150,7 @@ type GuardInput = GuardShapeOrFn | Record<string, GuardShapeOrFn>;
 type GuardableMethodName = QueryMethod | MutationMethod;
 type ExtractReturn<T, K extends string> = K extends keyof T ? T[K] extends (...args: any[]) => infer R ? R : never : never;
 type GuardedModel<TDelegate> = {
-    [K in GuardableMethodName as K extends keyof TDelegate ? K : never]: ExtractReturn<TDelegate, K> extends never ? never : (body: unknown) => ExtractReturn<TDelegate, K>;
+    [K in GuardableMethodName as K extends keyof TDelegate ? K : never]: ExtractReturn<TDelegate, K> extends never ? never : (body?: unknown) => ExtractReturn<TDelegate, K>;
 };
 
 declare function createGuard<TModels extends TypeMap = TypeMap, TRoots extends string = string, TModelExt = unknown>(config: GuardConfig & {
@@ -158,7 +158,7 @@ declare function createGuard<TModels extends TypeMap = TypeMap, TRoots extends s
 }): {
     input: (model: Extract<keyof TModels, string>, opts: InputOpts) => InputSchema;
     model: (model: Extract<keyof TModels, string>, opts: ModelOpts) => zod.ZodObject<any, zod_v4_core.$strip>;
-    query: <TCtx = unknown>(model: Extract<keyof TModels, string>, method: QueryMethod, config_: ShapeOrFn<TCtx> | Record<string, ShapeOrFn<TCtx>>) => QuerySchema<TCtx>;
+    query: <TCtx = unknown>(model: Extract<keyof TModels, string>, method: QueryMethod, config_: ShapeOrFn$1<TCtx> | Record<string, ShapeOrFn$1<TCtx>>) => QuerySchema<TCtx>;
     extension: <TCtx extends Record<string, unknown> = Record<string, unknown>>(contextFn?: () => TCtx) => {
         name: string;
         model: TModelExt;
@@ -191,4 +191,138 @@ declare function unsupported(): {
     __brand: 'unsupported';
 };
 
-export { CallerError, type EnumMap, type FieldMeta, type GuardConfig, type GuardGeneratedConfig, type GuardInput, type GuardLogger, type GuardShape, type GuardShapeOrFn, type GuardedModel, type InputOpts, type InputSchema, type MissingScopeContextMode, type ModelOpts, type MutationMethod, type NestedIncludeArgs, type NestedSelectArgs, PolicyError, type QueryMethod, type QuerySchema, type ScopeEntry, type ScopeMap, type ShapeConfig, ShapeError, type ShapeOrFn, type TypeMap, type UniqueConstraint, type UniqueMap, type ZodChains, type ZodDefaults, createGuard, force, unsupported };
+declare const OPERATION_SHAPE_KEYS: {
+    readonly findMany: readonly ["where", "include", "select", "orderBy", "cursor", "take", "skip", "distinct"];
+    readonly findFirst: readonly ["where", "include", "select", "orderBy", "cursor", "take", "skip", "distinct"];
+    readonly findFirstOrThrow: readonly ["where", "include", "select", "orderBy", "cursor", "take", "skip", "distinct"];
+    readonly findUnique: readonly ["where", "include", "select"];
+    readonly findUniqueOrThrow: readonly ["where", "include", "select"];
+    readonly findManyPaginated: readonly ["where", "include", "select", "orderBy", "cursor", "take", "skip", "distinct"];
+    readonly count: readonly ["where", "select", "cursor", "orderBy", "skip", "take"];
+    readonly aggregate: readonly ["where", "orderBy", "cursor", "take", "skip", "_count", "_avg", "_sum", "_min", "_max"];
+    readonly groupBy: readonly ["where", "by", "having", "_count", "_avg", "_sum", "_min", "_max", "orderBy", "take", "skip"];
+    readonly create: readonly ["data", "select", "include"];
+    readonly createMany: readonly ["data"];
+    readonly createManyAndReturn: readonly ["data", "select", "include"];
+    readonly update: readonly ["data", "where", "select", "include"];
+    readonly updateMany: readonly ["data", "where"];
+    readonly updateManyAndReturn: readonly ["data", "where", "select", "include"];
+    readonly upsert: readonly ["where", "create", "update", "select", "include"];
+    readonly delete: readonly ["where", "select", "include"];
+    readonly deleteMany: readonly ["where"];
+};
+type OperationName = keyof typeof OPERATION_SHAPE_KEYS;
+type OperationShapeKey<O extends OperationName> = (typeof OPERATION_SHAPE_KEYS)[O][number];
+
+interface FieldMetaConst {
+    readonly type: string;
+    readonly isList: boolean;
+    readonly isRequired: boolean;
+    readonly isId: boolean;
+    readonly isRelation: boolean;
+    readonly hasDefault: boolean;
+    readonly isUpdatedAt: boolean;
+    readonly isEnum?: boolean;
+    readonly isUnique?: boolean;
+    readonly isUnsupported?: boolean;
+}
+type TypeMapConst = Record<string, Record<string, FieldMetaConst>>;
+type ShapeDepth = 0 | 1 | 2 | 3;
+type DecDepth<D extends ShapeDepth> = D extends 3 ? 2 : D extends 2 ? 1 : D extends 1 ? 0 : 0;
+type AllFields<TM extends TypeMapConst, M extends keyof TM> = keyof TM[M] & string;
+type ScalarFields<TM extends TypeMapConst, M extends keyof TM> = {
+    [K in keyof TM[M]]: TM[M][K]['isRelation'] extends true ? never : K;
+}[keyof TM[M]] & string;
+type RelationFields<TM extends TypeMapConst, M extends keyof TM> = {
+    [K in keyof TM[M]]: TM[M][K]['isRelation'] extends true ? K : never;
+}[keyof TM[M]] & string;
+type WritableFields<TM extends TypeMapConst, M extends keyof TM> = {
+    [K in keyof TM[M]]: TM[M][K]['isRelation'] extends true ? never : TM[M][K]['isUpdatedAt'] extends true ? never : K;
+}[keyof TM[M]] & string;
+type UniqueFields<TM extends TypeMapConst, M extends keyof TM> = {
+    [K in keyof TM[M]]: TM[M][K]['isUnique'] extends true ? K : TM[M][K]['isId'] extends true ? K : never;
+}[keyof TM[M]] & string;
+type NumericScalarType = 'Int' | 'BigInt' | 'Float' | 'Decimal';
+type ComparableScalarType = NumericScalarType | 'String' | 'DateTime';
+type NumericFields<TM extends TypeMapConst, M extends keyof TM> = {
+    [K in keyof TM[M]]: TM[M][K]['isRelation'] extends true ? never : TM[M][K]['type'] extends NumericScalarType ? K : never;
+}[keyof TM[M]] & string;
+type ComparableFields<TM extends TypeMapConst, M extends keyof TM> = {
+    [K in keyof TM[M]]: TM[M][K]['isRelation'] extends true ? never : TM[M][K]['type'] extends ComparableScalarType ? K : never;
+}[keyof TM[M]] & string;
+type RelTarget<TM extends TypeMapConst, M extends keyof TM, K extends keyof TM[M]> = TM[M][K]['type'] extends string ? Extract<keyof TM, TM[M][K]['type']> : never;
+type LooseNestedArgs = {
+    select?: Record<string, unknown>;
+    include?: Record<string, unknown>;
+    where?: Record<string, unknown>;
+    orderBy?: Record<string, unknown>;
+    cursor?: Record<string, unknown>;
+    take?: number | {
+        max: number;
+        default?: number;
+    };
+    skip?: true;
+};
+type TypedWhere<TM extends TypeMapConst, M extends keyof TM> = Partial<Record<AllFields<TM, M> | 'AND' | 'OR' | 'NOT', unknown>>;
+type TypedNestedRelArgs<TM extends TypeMapConst, T, D extends ShapeDepth> = T extends keyof TM ? D extends 0 ? LooseNestedArgs : {
+    select?: TypedProjection<TM, T, DecDepth<D>>;
+    include?: TypedInclude<TM, T, DecDepth<D>>;
+    where?: TypedWhere<TM, T>;
+    orderBy?: true | Partial<Record<AllFields<TM, T>, unknown>>;
+    cursor?: Partial<Record<UniqueFields<TM, T>, true>>;
+    take?: number | {
+        max: number;
+        default?: number;
+    };
+    skip?: true;
+} : LooseNestedArgs;
+type TypedProjection<TM extends TypeMapConst, M extends keyof TM, D extends ShapeDepth> = {
+    [K in AllFields<TM, M>]?: K extends RelationFields<TM, M> ? true | TypedNestedRelArgs<TM, RelTarget<TM, M, K>, D> : true;
+};
+type TypedInclude<TM extends TypeMapConst, M extends keyof TM, D extends ShapeDepth> = {
+    [K in RelationFields<TM, M>]?: true | TypedNestedRelArgs<TM, RelTarget<TM, M, K>, D>;
+};
+type TypedCountSelect<TM extends TypeMapConst, M extends keyof TM> = Partial<Record<ScalarFields<TM, M> | '_all', true>>;
+type TypedCountField<TM extends TypeMapConst, M extends keyof TM> = true | Partial<Record<ScalarFields<TM, M> | '_all', true>>;
+type TypedShapeProps<TM extends TypeMapConst, M extends keyof TM, D extends ShapeDepth> = {
+    where: TypedWhere<TM, M>;
+    select: TypedProjection<TM, M, D>;
+    include: TypedInclude<TM, M, D>;
+    orderBy: true | Partial<Record<AllFields<TM, M>, unknown>>;
+    cursor: Partial<Record<UniqueFields<TM, M>, true>>;
+    take: number | {
+        max: number;
+        default?: number;
+    };
+    skip: true;
+    distinct: ScalarFields<TM, M>[];
+    by: ScalarFields<TM, M>[];
+    having: Partial<Record<ScalarFields<TM, M>, unknown>>;
+    _count: TypedCountField<TM, M>;
+    _avg: Partial<Record<NumericFields<TM, M>, true>>;
+    _sum: Partial<Record<NumericFields<TM, M>, true>>;
+    _min: Partial<Record<ComparableFields<TM, M>, true>>;
+    _max: Partial<Record<ComparableFields<TM, M>, true>>;
+    data: Partial<Record<WritableFields<TM, M>, unknown>>;
+    create: Partial<Record<WritableFields<TM, M>, unknown>>;
+    update: Partial<Record<WritableFields<TM, M>, unknown>>;
+};
+type BaseOperationShape<TM extends TypeMapConst, M extends keyof TM, O extends OperationName, D extends ShapeDepth> = Partial<Pick<TypedShapeProps<TM, M, D>, Extract<OperationShapeKey<O>, keyof TypedShapeProps<TM, M, D>>>>;
+type RequireKeys<T, K extends keyof T> = Omit<T, K> & {
+    [P in K]-?: NonNullable<T[P]>;
+};
+type CountShape<TM extends TypeMapConst, M extends keyof TM, D extends ShapeDepth> = Omit<BaseOperationShape<TM, M, 'count', D>, 'select'> & {
+    select?: TypedCountSelect<TM, M>;
+};
+type OperationShape<TM extends TypeMapConst, M extends keyof TM, O extends OperationName, D extends ShapeDepth = 1> = O extends 'findUnique' ? RequireKeys<BaseOperationShape<TM, M, 'findUnique', D>, 'where'> : O extends 'findUniqueOrThrow' ? RequireKeys<BaseOperationShape<TM, M, 'findUniqueOrThrow', D>, 'where'> : O extends 'groupBy' ? RequireKeys<BaseOperationShape<TM, M, 'groupBy', D>, 'by'> : O extends 'count' ? CountShape<TM, M, D> : BaseOperationShape<TM, M, O, D>;
+type TypedGuardShape<TM extends TypeMapConst, M extends keyof TM, D extends ShapeDepth = 1> = Partial<TypedShapeProps<TM, M, D>>;
+type ShapeFn<S, TCtx> = (ctx: TCtx) => S;
+type ShapeOrFn<S, TCtx> = S | ShapeFn<S, TCtx>;
+declare const namedShapeBrand: unique symbol;
+type NamedShapeMap<S, TCtx> = Record<string, ShapeOrFn<S, TCtx>> & {
+    readonly [namedShapeBrand]: true;
+};
+declare function namedShapes<S, TCtx = unknown>(shapes: Record<string, ShapeOrFn<S, TCtx>>): NamedShapeMap<S, TCtx>;
+type ShapeInput<S, TCtx = unknown> = ShapeOrFn<S, TCtx> | NamedShapeMap<S, TCtx>;
+
+export { CallerError, type ComparableFields, type EnumMap, type FieldMeta, type FieldMetaConst, type GuardConfig, type GuardGeneratedConfig, type GuardInput, type GuardLogger, type GuardShape, type GuardShapeOrFn, type GuardedModel, type InputOpts, type InputSchema, type MissingScopeContextMode, type ModelOpts, type MutationMethod, type NamedShapeMap, type NestedIncludeArgs, type NestedSelectArgs, type NumericFields, type OperationName, type OperationShape, PolicyError, type QueryMethod, type QuerySchema, type ScopeEntry, type ScopeMap, type ShapeConfig, type ShapeDepth, ShapeError, type ShapeInput, type ShapeOrFn$1 as ShapeOrFn, type TypeMap, type TypeMapConst, type TypedCountSelect, type TypedGuardShape, type TypedInclude, type TypedProjection, type TypedShapeProps, type TypedWhere, type UniqueConstraint, type UniqueMap, type ZodChains, type ZodDefaults, createGuard, force, namedShapes, unsupported };

package/dist/runtime/index.js

@@ -191,7 +191,13 @@ function createScalarBase(strictDecimal) {
       z.string().regex(/^-?\d+$/).transform((v) => BigInt(v))
     ]),
     Boolean: () => z.boolean(),
-    DateTime: () => z.union([z.date(), z.string().datetime({ offset: true })]).pipe(z.coerce.date()),
+    DateTime: () => z.union([
+      z.date(),
+      z.string().refine(
+        (s) => !isNaN(Date.parse(s)),
+        "Invalid date string"
+      )
+    ]).pipe(z.coerce.date()),
     Json: () => z.unknown().refine(
       isJsonSafe,
       "Value must be JSON-serializable (no undefined, functions, symbols, class instances, NaN, Infinity, or circular references)"
@@ -208,8 +214,8 @@ function wrapWithInputCoercion(fieldType, isList, schema) {
       break;
     case "Int":
       itemCoercion = z.union([
-        z.number().int(),
-        z.string().regex(/^-?\d+$/).transform(Number)
+        z.number().transform((v) => Math.trunc(v)).pipe(z.number().int()),
+        z.string().regex(/^-?\d+(\.\d+)?$/).transform((v) => Math.trunc(Number(v)))
       ]);
       break;
     case "Float":
@@ -787,7 +793,7 @@ function createSchemaBuilder(typeMap, zodChains, enumMap, scalarBase, zodDefault
 import { z as z7 } from "zod";
 
 // src/shared/constants.ts
-var SHAPE_CONFIG_KEYS = /* @__PURE__ */ new Set([
+var SHAPE_CONFIG_KEY_LIST = [
   "where",
   "include",
   "select",
@@ -803,13 +809,15 @@ var SHAPE_CONFIG_KEYS = /* @__PURE__ */ new Set([
   "_min",
   "_max",
   "by"
-]);
-var GUARD_SHAPE_KEYS = /* @__PURE__ */ new Set([
+];
+var SHAPE_CONFIG_KEYS = new Set(SHAPE_CONFIG_KEY_LIST);
+var GUARD_SHAPE_KEY_LIST = [
   "data",
   "create",
   "update",
-  ...SHAPE_CONFIG_KEYS
-]);
+  ...SHAPE_CONFIG_KEY_LIST
+];
+var GUARD_SHAPE_KEYS = new Set(GUARD_SHAPE_KEY_LIST);
 var COMBINATOR_KEYS = /* @__PURE__ */ new Set(["AND", "OR", "NOT"]);
 var TO_MANY_RELATION_OPS = /* @__PURE__ */ new Set(["some", "every", "none"]);
 var TO_ONE_RELATION_OPS = /* @__PURE__ */ new Set(["is", "isNot"]);
@@ -2447,67 +2455,51 @@ function createProjectionBuilder(typeMap, enumMap, deps) {
   return { buildIncludeSchema, buildSelectSchema, buildIncludeCountSchema };
 }
 
-// src/runtime/query-builder.ts
-var METHOD_ALLOWED_ARGS = {
-  findMany: /* @__PURE__ */ new Set([
-    "where",
-    "include",
-    "select",
-    "orderBy",
-    "cursor",
-    "take",
-    "skip",
-    "distinct"
-  ]),
-  findFirst: /* @__PURE__ */ new Set([
-    "where",
-    "include",
-    "select",
-    "orderBy",
-    "cursor",
-    "take",
-    "skip",
-    "distinct"
-  ]),
-  findFirstOrThrow: /* @__PURE__ */ new Set([
-    "where",
-    "include",
-    "select",
-    "orderBy",
-    "cursor",
-    "take",
-    "skip",
-    "distinct"
-  ]),
-  findUnique: /* @__PURE__ */ new Set(["where", "include", "select"]),
-  findUniqueOrThrow: /* @__PURE__ */ new Set(["where", "include", "select"]),
-  count: /* @__PURE__ */ new Set(["where", "select", "cursor", "orderBy", "skip", "take"]),
-  aggregate: /* @__PURE__ */ new Set([
-    "where",
-    "orderBy",
-    "cursor",
-    "take",
-    "skip",
-    "_count",
-    "_avg",
-    "_sum",
-    "_min",
-    "_max"
-  ]),
-  groupBy: /* @__PURE__ */ new Set([
-    "where",
-    "by",
-    "having",
-    "_count",
-    "_avg",
-    "_sum",
-    "_min",
-    "_max",
-    "orderBy",
-    "take",
-    "skip"
-  ])
+// src/shared/operation-shape-keys.ts
+var OPERATION_SHAPE_KEYS = {
+  findMany: ["where", "include", "select", "orderBy", "cursor", "take", "skip", "distinct"],
+  findFirst: ["where", "include", "select", "orderBy", "cursor", "take", "skip", "distinct"],
+  findFirstOrThrow: ["where", "include", "select", "orderBy", "cursor", "take", "skip", "distinct"],
+  findUnique: ["where", "include", "select"],
+  findUniqueOrThrow: ["where", "include", "select"],
+  findManyPaginated: ["where", "include", "select", "orderBy", "cursor", "take", "skip", "distinct"],
+  count: ["where", "select", "cursor", "orderBy", "skip", "take"],
+  aggregate: ["where", "orderBy", "cursor", "take", "skip", "_count", "_avg", "_sum", "_min", "_max"],
+  groupBy: ["where", "by", "having", "_count", "_avg", "_sum", "_min", "_max", "orderBy", "take", "skip"],
+  create: ["data", "select", "include"],
+  createMany: ["data"],
+  createManyAndReturn: ["data", "select", "include"],
+  update: ["data", "where", "select", "include"],
+  updateMany: ["data", "where"],
+  updateManyAndReturn: ["data", "where", "select", "include"],
+  upsert: ["where", "create", "update", "select", "include"],
+  delete: ["where", "select", "include"],
+  deleteMany: ["where"]
 };
+var READ_METHOD_ALLOWED_ARGS = {
+  findMany: new Set(OPERATION_SHAPE_KEYS.findMany),
+  findFirst: new Set(OPERATION_SHAPE_KEYS.findFirst),
+  findFirstOrThrow: new Set(OPERATION_SHAPE_KEYS.findFirstOrThrow),
+  findUnique: new Set(OPERATION_SHAPE_KEYS.findUnique),
+  findUniqueOrThrow: new Set(OPERATION_SHAPE_KEYS.findUniqueOrThrow),
+  count: new Set(OPERATION_SHAPE_KEYS.count),
+  aggregate: new Set(OPERATION_SHAPE_KEYS.aggregate),
+  groupBy: new Set(OPERATION_SHAPE_KEYS.groupBy)
+};
+var MUTATION_SHAPE_KEYS = {
+  create: new Set(OPERATION_SHAPE_KEYS.create),
+  createMany: new Set(OPERATION_SHAPE_KEYS.createMany),
+  createManyAndReturn: new Set(OPERATION_SHAPE_KEYS.createManyAndReturn),
+  update: new Set(OPERATION_SHAPE_KEYS.update),
+  updateMany: new Set(OPERATION_SHAPE_KEYS.updateMany),
+  updateManyAndReturn: new Set(OPERATION_SHAPE_KEYS.updateManyAndReturn),
+  upsert: new Set(OPERATION_SHAPE_KEYS.upsert),
+  delete: new Set(OPERATION_SHAPE_KEYS.delete),
+  deleteMany: new Set(OPERATION_SHAPE_KEYS.deleteMany)
+};
+
+// src/runtime/query-builder.ts
+var METHOD_ALLOWED_ARGS = READ_METHOD_ALLOWED_ARGS;
 var UNIQUE_WHERE_METHODS = /* @__PURE__ */ new Set([
   "findUnique",
   "findUniqueOrThrow"
@@ -2918,11 +2910,29 @@ function buildAndConditions(existingWhere, conditions) {
     return conditions[0];
   return { AND: conditions };
 }
-function buildScopedUniqueWhere(existingWhere, conditions) {
-  if (!existingWhere) {
+function stripScopeFksFromWhere(where, scopeFks, log, model) {
+  let result = where;
+  for (const fk of scopeFks) {
+    if (fk in result) {
+      if (result === where)
+        result = { ...where };
+      log.warn(
+        `prisma-guard: Scope FK "${fk}" found in where for model "${model}". Stripped in favor of scope context.`
+      );
+      delete result[fk];
+    }
+  }
+  return result;
+}
+function buildScopedUniqueWhere(existingWhere, conditions, scopeFks, log, model) {
+  let cleaned = existingWhere;
+  if (cleaned) {
+    cleaned = stripScopeFksFromWhere(cleaned, scopeFks, log, model);
+  }
+  if (!cleaned || Object.keys(cleaned).length === 0) {
     return conditions.length === 1 ? conditions[0] : { AND: conditions };
   }
-  const { AND: existingAnd, ...topLevel } = existingWhere;
+  const { AND: existingAnd, ...topLevel } = cleaned;
   const allConditions = [];
   if (existingAnd !== void 0) {
     if (Array.isArray(existingAnd)) {
@@ -3022,6 +3032,13 @@ function createScopeExtension(scopeMap, contextFn, guardConfig, logger) {
       `prisma-guard: Invalid onScopeRelationWrite "${onScopeRelationWrite}". Allowed: ${[...VALID_ON_SCOPE_RELATION_WRITES].join(", ")}`
     );
   }
+  const scopeFkSets = /* @__PURE__ */ new Map();
+  for (const [model, entries] of Object.entries(scopeMap)) {
+    const fks = /* @__PURE__ */ new Set();
+    for (const entry of entries)
+      fks.add(entry.fk);
+    scopeFkSets.set(model, fks);
+  }
   return {
     name: "prisma-guard-scope",
     query: {
@@ -3042,7 +3059,7 @@ function createScopeExtension(scopeMap, contextFn, guardConfig, logger) {
         if (missingRoots.length > 0) {
           if (isMutation || guardConfig.onMissingScopeContext === "error") {
             throw new PolicyError(
-              `Missing scope context for model "${model}": roots ${missingRoots.map((r) => `"${r}"`).join(", ")} not provided. All scope roots must be present.`
+              `prisma-guard: Missing scope context for model "${model}": roots ${missingRoots.map((r) => `"${r}"`).join(", ")} not provided. All scope roots must be present.`
             );
           }
           if (guardConfig.onMissingScopeContext === "warn") {
@@ -3058,9 +3075,10 @@ function createScopeExtension(scopeMap, contextFn, guardConfig, logger) {
         const overrides = Object.fromEntries(
           presentScopes.map((s) => [s.fk, ctx[s.root]])
         );
+        const modelFks = scopeFkSets.get(model) ?? /* @__PURE__ */ new Set();
         const nextArgs = { ...args };
         if (operation === "upsert") {
-          nextArgs.where = buildScopedUniqueWhere(args.where, conditions);
+          nextArgs.where = buildScopedUniqueWhere(args.where, conditions, modelFks, log, model);
           if (args.create !== void 0 && args.create !== null) {
             if (typeof args.create !== "object" || Array.isArray(args.create)) {
               throw new ShapeError(`upsert expects create to be an object`);
@@ -3098,7 +3116,7 @@ function createScopeExtension(scopeMap, contextFn, guardConfig, logger) {
         if (FIND_UNIQUE_OPS.has(operation)) {
           if (findUniqueMode === "reject") {
             throw new PolicyError(
-              `Scoped model "${model}" does not allow ${operation} via scope extension (findUniqueMode is "reject"). Use findFirst with explicit where conditions instead.`
+              `prisma-guard: Scoped model "${model}" does not allow ${operation} via scope extension (findUniqueMode is "reject"). Use findFirst with explicit where conditions instead.`
             );
           }
           return handleFindUnique(
@@ -3168,7 +3186,7 @@ function createScopeExtension(scopeMap, contextFn, guardConfig, logger) {
           return query(nextArgs);
         }
         if (UNIQUE_MUTATION_OPS.has(operation)) {
-          nextArgs.where = buildScopedUniqueWhere(args.where, conditions);
+          nextArgs.where = buildScopedUniqueWhere(args.where, conditions, modelFks, log, model);
           if (args.data !== void 0 && args.data !== null) {
             if (typeof args.data !== "object" || Array.isArray(args.data)) {
               throw new ShapeError(`${operation} expects data to be an object`);
@@ -3208,7 +3226,7 @@ function createScopeExtension(scopeMap, contextFn, guardConfig, logger) {
           return query(nextArgs);
         }
         throw new ShapeError(
-          `Unknown operation "${operation}" on scoped model "${model}". Update prisma-guard to handle this operation.`
+          `prisma-guard: Unknown operation "${operation}" on scoped model "${model}". Update prisma-guard to handle this operation.`
         );
       }
     }
@@ -3279,7 +3297,7 @@ async function handleFindUnique(args, query, conditions, scopes, operation, log,
     if (!looseEqual(verifyObj[fk], value, log, fk)) {
       if (operation === "findUniqueOrThrow") {
         throw new PolicyError(
-          `Record on model "${model}" not accessible in current scope`
+          `prisma-guard: Record on model "${model}" not accessible in current scope`
         );
       }
       return null;
@@ -4351,8 +4369,10 @@ function createModelGuardExtension(config) {
         equalityFields.add(key);
         continue;
       }
-      if (isPlainObject(value) && "equals" in value) {
-        equalityFields.add(key);
+      if (isPlainObject(value)) {
+        if ("equals" in value) {
+          equalityFields.add(key);
+        }
         continue;
       }
       if (value !== null && value !== void 0) {
@@ -5227,12 +5247,18 @@ function createGuard(config) {
     }
   };
 }
+
+// src/shared/typed-shape.ts
+function namedShapes(shapes) {
+  return shapes;
+}
 export {
   CallerError,
   PolicyError,
   ShapeError,
   createGuard,
   force,
+  namedShapes,
   unsupported
 };
 //# sourceMappingURL=index.js.map