Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions packages/orm/src/client/contract.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
import type Decimal from 'decimal.js';
import { type GetModels, type IsDelegateModel, type ProcedureDef, type SchemaDef } from '../schema';
import {
type FieldIsArray,
type GetModels,
type IsDelegateModel,
type ProcedureDef,
type RelationFields,
type RelationFieldType,
type SchemaDef,
} from '../schema';
import type { AnyKysely } from '../utils/kysely-utils';
import type { OrUndefinedIf, Simplify, UnwrapTuplePromises } from '../utils/type-utils';
import type { TRANSACTION_UNSUPPORTED_METHODS } from './constants';
Expand All @@ -12,6 +20,7 @@ import type {
CreateArgs,
CreateManyAndReturnArgs,
CreateManyArgs,
DefaultModelResult,
DeleteArgs,
DeleteManyArgs,
FindFirstArgs,
Expand Down Expand Up @@ -810,11 +819,23 @@ export type ModelOperations<Schema extends SchemaDef, Model extends GetModels<Sc

//#region Supporting types

/**
* Type for auth context that includes both scalar and relation fields.
* Relations are recursively included to allow nested auth data like { user: { profile: { ... } } }
*/
type AuthModelType<Schema extends SchemaDef, Model extends GetModels<Schema>> = Partial<
DefaultModelResult<Schema, Model>
> & {
[Key in RelationFields<Schema, Model>]?: FieldIsArray<Schema, Model, Key> extends true
? AuthModelType<Schema, RelationFieldType<Schema, Model, Key>>[]
: AuthModelType<Schema, RelationFieldType<Schema, Model, Key>>;
};

export type AuthType<Schema extends SchemaDef> =
string extends GetModels<Schema>
? Record<string, unknown>
: Schema['authType'] extends GetModels<Schema>
? Partial<ModelResult<Schema, Schema['authType']>>
? AuthModelType<Schema, Schema['authType']>
: never;

//#endregion
2 changes: 1 addition & 1 deletion packages/orm/src/client/crud-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import type { ToKyselySchema } from './query-builder';

//#region Query results

type DefaultModelResult<
export type DefaultModelResult<
Schema extends SchemaDef,
Model extends GetModels<Schema>,
Omit = undefined,
Expand Down
Loading