@shivaedev/effect-prisma 0.7.1 → 0.9.0

package/src/internal/relation-result.ts

@@ -3,10 +3,13 @@ import type { PrismaError } from "#error.ts";
 import { hasMethod, invokeMethod, isPromiseLike } from "./dynamic.ts";
 import { fromPrismaPromise } from "./promise.ts";
 
-const settle = (value: unknown, map: (result: unknown) => unknown): Effect.Effect<unknown, PrismaError> =>
-	isPromiseLike(value) ? fromPrismaPromise(() => value).pipe(Effect.map(map)) : Effect.succeed(map(value));
+function settle(value: unknown, map: (result: unknown) => unknown): Effect.Effect<unknown, PrismaError> {
+	return isPromiseLike(value) ? fromPrismaPromise(() => value).pipe(Effect.map(map)) : Effect.succeed(map(value));
+}
 
-const countOf = (result: unknown): unknown => (typeof result === "object" && result !== null ? Reflect.get(result, "count") : undefined);
+function countOf(result: unknown): unknown {
+	return typeof result === "object" && result !== null ? Reflect.get(result, "count") : undefined;
+}
 
 export const evaluateResult = (value: unknown, terminal: PropertyKey | undefined): Effect.Effect<unknown, PrismaError> => {
 	if (terminal === "count" && hasMethod(value, "aggregate")) {

package/src/internal/relation-runtime.ts

@@ -1,6 +1,7 @@
 import { Effect, Effectable, type Stream } from "effect";
 import type { PrismaError } from "#error.ts";
 import type { Relation } from "#relation.ts";
+import { hasMethod } from "./dynamic.ts";
 import type { AnyPostgresContract, DatabaseExecutor } from "./executor.ts";
 import { executeQuery } from "./query-execution.ts";
 import { appendOperation, type RelationRecipe, replayRecipe, rootRecipe } from "./recipe.ts";
@@ -8,10 +9,10 @@ import { setRelationPlan } from "./relation-plan.ts";
 import { evaluateResult } from "./relation-result.ts";
 import { makeRelationStream } from "./relation-stream.ts";
 
-interface RelationRuntime<Models extends object, Contract extends AnyPostgresContract> {
-	readonly executor: DatabaseExecutor<Models, Contract>;
+interface RelationRuntime<TModels extends object, TContract extends AnyPostgresContract> {
+	readonly executor: DatabaseExecutor<TModels, TContract>;
 	readonly recipe: RelationRecipe;
-	readonly resolveExecutor: Effect.Effect<DatabaseExecutor<Models, Contract>, PrismaError>;
+	readonly resolveExecutor: Effect.Effect<DatabaseExecutor<TModels, TContract>, PrismaError>;
 	readonly terminal?: PropertyKey;
 }
 
@@ -23,15 +24,15 @@ type AnyRelationRuntime = RelationRuntime<object, AnyPostgresContract>;
 
 const runtimes = new WeakMap<object, AnyRelationRuntime>();
 
-const runtimeOf = (self: object): AnyRelationRuntime => {
+function runtimeOf(self: object): AnyRelationRuntime {
 	const runtime = runtimes.get(self);
 	if (runtime === undefined) {
 		throw new TypeError("Relation runtime is unavailable");
 	}
 	return runtime;
-};
+}
 
-const relationEffect = (self: object): Effect.Effect<unknown, PrismaError> => {
+function relationEffect(self: object): Effect.Effect<unknown, PrismaError> {
 	const runtime = runtimeOf(self);
 	return Effect.flatMap(runtime.resolveExecutor, (executor) =>
 		executeQuery(
@@ -50,11 +51,11 @@ const relationEffect = (self: object): Effect.Effect<unknown, PrismaError> => {
 			kind: "client",
 		}),
 	);
-};
+}
 
 const RelationPrototype = {
 	...Effectable.Prototype<RelationValue>({
-		evaluate() {
+		evaluate(this: RelationValue) {
 			return relationEffect(this);
 		},
 		label: "EffectPrismaRelation",
@@ -65,7 +66,7 @@ const RelationPrototype = {
 	},
 };
 
-const makeRelationProxy = (runtime: AnyRelationRuntime): object => {
+function makeRelationProxy(runtime: AnyRelationRuntime): object {
 	const target: object = Object.create(RelationPrototype);
 	const proxy = new Proxy(target, {
 		get(self, property, receiver) {
@@ -89,6 +90,10 @@ const makeRelationProxy = (runtime: AnyRelationRuntime): object => {
 						terminal: "count",
 					});
 			}
+			// Effect reads protocol keys such as its Exit identifier from every yielded value, so only the collection's own methods become Relation calls.
+			if (!hasMethod(Reflect.get(runtime.executor.models, runtime.recipe.model), property)) {
+				return undefined;
+			}
 			return (...arguments_: readonly unknown[]) =>
 				makeRelationProxy({
 					...runtime,
@@ -109,25 +114,25 @@ const makeRelationProxy = (runtime: AnyRelationRuntime): object => {
 		setRelationPlan(value, plan);
 	}
 	return proxy;
-};
+}
 
 // The proxy replays every Relation call onto the Prisma collection for `model`, so it has that collection's Relation surface.
-function asRelation<Collection, Model extends string>(proxy: object): Relation<Collection, undefined, Model>;
+function asRelation<TCollection, TModel extends string>(proxy: object): Relation<TCollection, undefined, TModel>;
 function asRelation(proxy: object): unknown {
 	return proxy;
 }
 
 export const makeModelRelation = <
-	Collection,
-	Models extends object,
-	ExecutorContract extends AnyPostgresContract = AnyPostgresContract,
-	Model extends string = string,
+	TCollection,
+	TModels extends object,
+	TExecutorContract extends AnyPostgresContract = AnyPostgresContract,
+	TModel extends string = string,
 >(
-	executor: DatabaseExecutor<Models, ExecutorContract>,
-	model: Model,
-	resolveExecutor: Effect.Effect<DatabaseExecutor<Models, ExecutorContract>, PrismaError> = Effect.succeed(executor),
-): Relation<Collection, undefined, Model> =>
-	asRelation<Collection, Model>(
+	executor: DatabaseExecutor<TModels, TExecutorContract>,
+	model: TModel,
+	resolveExecutor: Effect.Effect<DatabaseExecutor<TModels, TExecutorContract>, PrismaError> = Effect.succeed(executor),
+): Relation<TCollection, undefined, TModel> =>
+	asRelation<TCollection, TModel>(
 		makeRelationProxy({
 			executor,
 			recipe: rootRecipe(model),

package/src/internal/relation-stream.ts

@@ -6,17 +6,18 @@ import { fromPrismaPromise } from "./promise.ts";
 import { executeQuery } from "./query-execution.ts";
 import { type RelationRecipe, replayRecipe } from "./recipe.ts";
 
-const collectRows = (iterable: AsyncIterable<unknown>): Effect.Effect<unknown[], PrismaError> =>
-	fromPrismaPromise(async () => {
+function collectRows(iterable: AsyncIterable<unknown>): Effect.Effect<unknown[], PrismaError> {
+	return fromPrismaPromise(async () => {
 		const rows: unknown[] = [];
 		for await (const row of iterable) {
 			rows.push(row);
 		}
 		return rows;
 	});
+}
 
-export const makeRelationStream = <Models extends object, Contract extends AnyPostgresContract>(
-	resolveExecutor: Effect.Effect<DatabaseExecutor<Models, Contract>, PrismaError>,
+export const makeRelationStream = <TModels extends object, TContract extends AnyPostgresContract>(
+	resolveExecutor: Effect.Effect<DatabaseExecutor<TModels, TContract>, PrismaError>,
 	recipe: RelationRecipe,
 ): Stream.Stream<unknown, PrismaError> =>
 	Stream.unwrap(

package/src/internal/sqlite-datetime.ts

@@ -14,13 +14,15 @@ const zonelessDatetime = /^(\d{4}-\d{2}-\d{2})[T ](\d{2}:\d{2}(?::\d{2})?(?:\.\d
 // with no zone, and `new Date` reads that form as local time. Values with a zone and date-only values already read as UTC.
 export const normalizeSqliteDatetime = (value: string): string => value.replace(zonelessDatetime, "$1T$2Z");
 
-const decodeAsUtc = (codec: ContractCodec): ContractCodec => ({
-	decode: (wire: CodecWire, context) => codec.decode(typeof wire === "string" ? normalizeSqliteDatetime(wire) : wire, context),
-	decodeJson: (json: CodecJson) => codec.decodeJson(typeof json === "string" ? normalizeSqliteDatetime(json) : json),
-	encode: (value, context) => codec.encode(value, context),
-	encodeJson: (value) => codec.encodeJson(value),
-	id: sqliteDatetimeCodecId,
-});
+function decodeAsUtc(codec: ContractCodec): ContractCodec {
+	return {
+		decode: (wire: CodecWire, context) => codec.decode(typeof wire === "string" ? normalizeSqliteDatetime(wire) : wire, context),
+		decodeJson: (json: CodecJson) => codec.decodeJson(typeof json === "string" ? normalizeSqliteDatetime(json) : json),
+		encode: (value, context) => codec.encode(value, context),
+		encodeJson: (value) => codec.encodeJson(value),
+		id: sqliteDatetimeCodecId,
+	};
+}
 
 // The registry resolves codecs for rows and included relations alike, and Prisma Next rejects a second descriptor for a registered
 // codec id, so wrapping the registry is the one way to cover every read. It must run before the first query, which reads the
@@ -30,7 +32,7 @@ export const decodeSqliteDatetimesAsUtc = (context: ExecutionContext<AnySqlContr
 	const descriptors = context.codecDescriptors;
 	const utcCodecs = new WeakMap<ContractCodec, ContractCodec>();
 
-	const wrap = (codec: ContractCodec): ContractCodec => {
+	function wrap(codec: ContractCodec): ContractCodec {
 		const existing = utcCodecs.get(codec);
 		if (existing !== undefined) {
 			return existing;
@@ -38,7 +40,7 @@ export const decodeSqliteDatetimesAsUtc = (context: ExecutionContext<AnySqlContr
 		const utc = decodeAsUtc(codec);
 		utcCodecs.set(codec, utc);
 		return utc;
-	};
+	}
 
 	const utcRegistry: CodecRegistry = {
 		forCodecRef: (reference) => {

package/src/internal/testing.ts

@@ -3,28 +3,28 @@ import type { PrismaError } from "#error.ts";
 
 export const DatabaseTestingTypeId: unique symbol = Symbol.for("@shivaedev/effect-prisma/DatabaseTesting");
 
-export interface DatabaseTesting<DatabaseId> {
+export interface DatabaseTesting<TDatabaseId> {
 	readonly withTestTransaction: <A, E, R>(
-		program: Effect.Effect<A, E, R> & (DatabaseId extends R ? unknown : never),
-	) => Effect.Effect<A, E | PrismaError, DatabaseId | Exclude<R, DatabaseId>>;
+		program: Effect.Effect<A, E, R> & (TDatabaseId extends R ? unknown : never),
+	) => Effect.Effect<A, E | PrismaError, TDatabaseId | Exclude<R, TDatabaseId>>;
 }
 
-export interface DatabaseWithTesting<DatabaseId> {
-	readonly [DatabaseTestingTypeId]: DatabaseTesting<DatabaseId>;
+export interface DatabaseWithTesting<TDatabaseId> {
+	readonly [DatabaseTestingTypeId]: DatabaseTesting<TDatabaseId>;
 }
 
 // makeSqlDatabase installs the testing hooks for the database's own service identifier.
-function testingFor<DatabaseId>(testing: object): DatabaseTesting<DatabaseId>;
+function testingFor<TDatabaseId>(testing: object): DatabaseTesting<TDatabaseId>;
 function testingFor(testing: object): unknown {
 	return testing;
 }
 
-export const getDatabaseTesting = <DatabaseId>(database: object): DatabaseTesting<DatabaseId> => {
+export const getDatabaseTesting = <TDatabaseId>(database: object): DatabaseTesting<TDatabaseId> => {
 	const testing: unknown = Reflect.get(database, DatabaseTestingTypeId);
 
 	if (typeof testing !== "object" || testing === null || typeof Reflect.get(testing, "withTestTransaction") !== "function") {
 		throw new TypeError("The database was not created by this copy of @shivaedev/effect-prisma");
 	}
 
-	return testingFor<DatabaseId>(testing);
+	return testingFor<TDatabaseId>(testing);
 };

package/src/internal/transaction.ts

@@ -5,26 +5,26 @@ import { type SettledConnection, type SettledTransaction, settleConnection } fro
 import type { AnySqlContract, DatabaseExecutor } from "./executor.ts";
 import { fromPrismaPromise } from "./promise.ts";
 
-export type TransactionOrm<Contract extends AnySqlContract> = ReturnType<typeof orm<Contract>>;
+export type TransactionOrm<TContract extends AnySqlContract> = ReturnType<typeof orm<TContract>>;
 
 export const withTransactionSemaphore = <A, E, R>(
 	semaphore: Semaphore.Semaphore | undefined,
 	transaction: Effect.Effect<A, E, R>,
 ): Effect.Effect<A, E, R> => (semaphore === undefined ? transaction : semaphore.withPermit(transaction));
 
-export interface TransactionResource<Models extends object, Contract extends AnySqlContract> {
+export interface TransactionResource<TModels extends object, TContract extends AnySqlContract> {
 	readonly connection: SettledConnection;
-	readonly executor: DatabaseExecutor<Models, Contract> & {
+	readonly executor: DatabaseExecutor<TModels, TContract> & {
 		readonly querySemaphore: Semaphore.Semaphore;
 	};
 	readonly transaction: SettledTransaction;
 }
 
-export const acquireTransaction = <Models extends object, Contract extends AnySqlContract>(
-	current: DatabaseExecutor<Models, Contract>,
-	models: (orm: TransactionOrm<Contract>) => Models,
+export const acquireTransaction = <TModels extends object, TContract extends AnySqlContract>(
+	current: DatabaseExecutor<TModels, TContract>,
+	models: (orm: TransactionOrm<TContract>) => TModels,
 	mode: "test" | "transaction",
-): Effect.Effect<TransactionResource<Models, Contract>, PrismaError> =>
+): Effect.Effect<TransactionResource<TModels, TContract>, PrismaError> =>
 	fromPrismaPromise(async () => {
 		const connection = await current.client.runtime().connection();
 
@@ -58,22 +58,22 @@ export const acquireTransaction = <Models extends object, Contract extends AnySq
 		}
 	});
 
-export const releaseTransaction = <Models extends object, Contract extends AnySqlContract, A, E>(
-	resource: TransactionResource<Models, Contract>,
+export const releaseTransaction = <TModels extends object, TContract extends AnySqlContract, A, E>(
+	resource: TransactionResource<TModels, TContract>,
 	exit: Exit.Exit<A, E>,
 ): Effect.Effect<void, PrismaError> => settleTransaction(resource, exit, true);
 
-export const releaseTestTransaction = <Models extends object, Contract extends AnySqlContract, A, E>(
-	resource: TransactionResource<Models, Contract>,
+export const releaseTestTransaction = <TModels extends object, TContract extends AnySqlContract, A, E>(
+	resource: TransactionResource<TModels, TContract>,
 	exit: Exit.Exit<A, E>,
 ): Effect.Effect<void, PrismaError> => settleTransaction(resource, exit, false);
 
-const settleTransaction = <Models extends object, Contract extends AnySqlContract, A, E>(
-	resource: TransactionResource<Models, Contract>,
+function settleTransaction<TModels extends object, TContract extends AnySqlContract, A, E>(
+	resource: TransactionResource<TModels, TContract>,
 	exit: Exit.Exit<A, E>,
 	commitOnSuccess: boolean,
-): Effect.Effect<void, PrismaError> =>
-	Effect.uninterruptible(
+): Effect.Effect<void, PrismaError> {
+	return Effect.uninterruptible(
 		Effect.sync(() => {
 			resource.executor.liveness.open = false;
 		}).pipe(
@@ -82,3 +82,4 @@ const settleTransaction = <Models extends object, Contract extends AnySqlContrac
 			),
 		),
 	);
+}

package/src/relation/include.ts

@@ -2,18 +2,18 @@ import type { DefaultModelRow, Collection as PrismaCollection, RelationNames } f
 import type { Relation, RelationQuery } from "#relation.ts";
 import type { AnyPostgresContract, IncludedRelationValue, IsToManyRelation, RelatedModelNameOf } from "./include-metadata.ts";
 
-type Simplify<Value> = { [Key in keyof Value]: Value[Key] };
+type Simplify<TValue> = { [TKey in keyof TValue]: TValue[TKey] };
 
-type QueryValue<Query> = Query extends RelationQuery<infer Value, infer _Contract, infer _Model, infer _DatabaseId> ? Value : never;
+type QueryValue<TQuery> = TQuery extends RelationQuery<infer TValue, infer _Contract, infer _Model, infer _DatabaseId> ? TValue : never;
 
-type AcceptRelatedQuery<Query, Contract extends AnyPostgresContract, Model extends string, DatabaseId> = [Query] extends [
-	RelationQuery<infer _Value, infer QueryContract, infer QueryModel, infer QueryDatabaseId>,
+type AcceptRelatedQuery<TQuery, TContract extends AnyPostgresContract, TModel extends string, TDatabaseId> = [TQuery] extends [
+	RelationQuery<infer _Value, infer TQueryContract, infer TQueryModel, infer TQueryDatabaseId>,
 ]
-	? [QueryContract] extends [Contract]
-		? [Contract] extends [QueryContract]
-			? [QueryDatabaseId] extends [DatabaseId]
-				? [DatabaseId] extends [QueryDatabaseId]
-					? QueryModel extends Model
+	? [TQueryContract] extends [TContract]
+		? [TContract] extends [TQueryContract]
+			? [TQueryDatabaseId] extends [TDatabaseId]
+				? [TDatabaseId] extends [TQueryDatabaseId]
+					? TQueryModel extends TModel
 						? unknown
 						: never
 					: never
@@ -22,63 +22,63 @@ type AcceptRelatedQuery<Query, Contract extends AnyPostgresContract, Model exten
 		: never
 	: never;
 
-type IncludedQueryValue<Query, Contract extends AnyPostgresContract, Model extends string, RelationName extends string> =
-	QueryValue<Query> extends ReadonlyArray<infer Row> ? IncludedRelationValue<Contract, Model, RelationName, Row> : QueryValue<Query>;
+type IncludedQueryValue<TQuery, TContract extends AnyPostgresContract, TModel extends string, TRelationName extends string> =
+	QueryValue<TQuery> extends ReadonlyArray<infer TRow> ? IncludedRelationValue<TContract, TModel, TRelationName, TRow> : QueryValue<TQuery>;
 
-type QueryShapeValue<Shape extends Readonly<Record<string, unknown>>> = {
-	readonly [Key in keyof Shape]: QueryValue<Shape[Key]>;
+type QueryShapeValue<TShape extends Readonly<Record<string, unknown>>> = {
+	readonly [TKey in keyof TShape]: QueryValue<TShape[TKey]>;
 };
 
 type AcceptRelatedQueryShape<
-	Shape extends Readonly<Record<string, unknown>>,
-	Contract extends AnyPostgresContract,
-	Model extends string,
-	DatabaseId,
+	TShape extends Readonly<Record<string, unknown>>,
+	TContract extends AnyPostgresContract,
+	TModel extends string,
+	TDatabaseId,
 > = {
-	readonly [Key in keyof Shape]: Shape[Key] & AcceptRelatedQuery<Shape[Key], Contract, Model, DatabaseId>;
+	readonly [TKey in keyof TShape]: TShape[TKey] & AcceptRelatedQuery<TShape[TKey], TContract, TModel, TDatabaseId>;
 };
 
-type WithIncludedRelation<Collection, Contract extends AnyPostgresContract, Model extends string, RelationName extends string, Value> =
-	Collection extends PrismaCollection<Contract, Model, infer Row, infer State>
-		? PrismaCollection<Contract, Model, Simplify<Row & { readonly [Key in RelationName]: Value }>, State>
+type WithIncludedRelation<TCollection, TContract extends AnyPostgresContract, TModel extends string, TRelationName extends string, TValue> =
+	TCollection extends PrismaCollection<TContract, TModel, infer TRow, infer TState>
+		? PrismaCollection<TContract, TModel, Simplify<TRow & { readonly [TKey in TRelationName]: TValue }>, TState>
 		: never;
 
-interface IncludeOverloads<Collection, Contract extends AnyPostgresContract, Model extends string, DatabaseId> {
-	<RelationName extends RelationNames<Contract, Model>>(
-		relationName: RelationName,
+interface IncludeOverloads<TCollection, TContract extends AnyPostgresContract, TModel extends string, TDatabaseId> {
+	<TRelationName extends RelationNames<TContract, TModel>>(
+		relationName: TRelationName,
 	): Relation<
 		WithIncludedRelation<
-			Collection,
-			Contract,
-			Model,
-			RelationName,
-			IncludedRelationValue<Contract, Model, RelationName, DefaultModelRow<Contract, RelatedModelNameOf<Contract, Model, RelationName>>>
+			TCollection,
+			TContract,
+			TModel,
+			TRelationName,
+			IncludedRelationValue<TContract, TModel, TRelationName, DefaultModelRow<TContract, RelatedModelNameOf<TContract, TModel, TRelationName>>>
 		>,
-		Contract,
-		Model,
-		DatabaseId
+		TContract,
+		TModel,
+		TDatabaseId
 	>;
-	<RelationName extends RelationNames<Contract, Model>, Query>(
-		relationName: RelationName,
-		query: Query & AcceptRelatedQuery<Query, Contract, RelatedModelNameOf<Contract, Model, RelationName>, DatabaseId>,
+	<TRelationName extends RelationNames<TContract, TModel>, TQuery>(
+		relationName: TRelationName,
+		query: TQuery & AcceptRelatedQuery<TQuery, TContract, RelatedModelNameOf<TContract, TModel, TRelationName>, TDatabaseId>,
 	): Relation<
-		WithIncludedRelation<Collection, Contract, Model, RelationName, IncludedQueryValue<Query, Contract, Model, RelationName>>,
-		Contract,
-		Model,
-		DatabaseId
+		WithIncludedRelation<TCollection, TContract, TModel, TRelationName, IncludedQueryValue<TQuery, TContract, TModel, TRelationName>>,
+		TContract,
+		TModel,
+		TDatabaseId
 	>;
-	<RelationName extends RelationNames<Contract, Model>, Shape extends Readonly<Record<string, unknown>>>(
-		relationName: RelationName,
-		shape: IsToManyRelation<Contract, Model, RelationName> extends true
-			? keyof Shape extends never
+	<TRelationName extends RelationNames<TContract, TModel>, TShape extends Readonly<Record<string, unknown>>>(
+		relationName: TRelationName,
+		shape: IsToManyRelation<TContract, TModel, TRelationName> extends true
+			? keyof TShape extends never
 				? never
-				: Shape & AcceptRelatedQueryShape<Shape, Contract, RelatedModelNameOf<Contract, Model, RelationName>, DatabaseId>
+				: TShape & AcceptRelatedQueryShape<TShape, TContract, RelatedModelNameOf<TContract, TModel, TRelationName>, TDatabaseId>
 			: never,
-	): Relation<WithIncludedRelation<Collection, Contract, Model, RelationName, QueryShapeValue<Shape>>, Contract, Model, DatabaseId>;
+	): Relation<WithIncludedRelation<TCollection, TContract, TModel, TRelationName, QueryShapeValue<TShape>>, TContract, TModel, TDatabaseId>;
 }
 
-export type IncludeMethod<Collection, Contract, Model extends string, DatabaseId> = Contract extends AnyPostgresContract
-	? Collection extends PrismaCollection<Contract, Model, infer _Row, infer _State>
-		? { include: IncludeOverloads<Collection, Contract, Model, DatabaseId> }
+export type IncludeMethod<TCollection, TContract, TModel extends string, TDatabaseId> = TContract extends AnyPostgresContract
+	? TCollection extends PrismaCollection<TContract, TModel, infer _Row, infer _State>
+		? { include: IncludeOverloads<TCollection, TContract, TModel, TDatabaseId> }
 		: Record<never, never>
 	: Record<never, never>;

package/src/relation.ts

@@ -4,40 +4,40 @@ import type { PrismaError } from "./error.ts";
 
 type AnyFunction = (...arguments_: readonly never[]) => unknown;
 
-export type CollectionResult<Collection> = Collection extends {
-	all: () => infer Result;
+export type CollectionResult<TCollection> = TCollection extends {
+	all: () => infer TResult;
 }
-	? Awaited<Result>
+	? Awaited<TResult>
 	: never;
 
-type NormalizeTerminal<Name, Result> = Name extends "first" ? import("effect").Option.Option<Exclude<Result, null>> : Result;
+type NormalizeTerminal<TName, TResult> = TName extends "first" ? import("effect").Option.Option<Exclude<TResult, null>> : TResult;
 
-type WrapReturn<Name, Result, Contract, Model extends string, DatabaseId> =
-	Result extends PromiseLike<infer Value>
-		? Effect.Effect<NormalizeTerminal<Name, Awaited<Value>>, PrismaError>
-		: Result extends object
-			? Relation<Result, Contract, Model, DatabaseId>
+type WrapReturn<TName, TResult, TContract, TModel extends string, TDatabaseId> =
+	TResult extends PromiseLike<infer TValue>
+		? Effect.Effect<NormalizeTerminal<TName, Awaited<TValue>>, PrismaError>
+		: TResult extends object
+			? Relation<TResult, TContract, TModel, TDatabaseId>
 			: never;
 
-type WrapFunction<Name, Function_, Contract, Model extends string, DatabaseId> = Function_ extends {
-	(...arguments_: infer Arguments1): infer Result1;
-	(...arguments_: infer Arguments2): infer Result2;
-	(...arguments_: infer Arguments3): infer Result3;
-	(...arguments_: infer Arguments4): infer Result4;
-	(...arguments_: infer Arguments5): infer Result5;
-	(...arguments_: infer Arguments6): infer Result6;
+type WrapFunction<TName, TFunction, TContract, TModel extends string, TDatabaseId> = TFunction extends {
+	(...arguments_: infer TArguments1): infer TResult1;
+	(...arguments_: infer TArguments2): infer TResult2;
+	(...arguments_: infer TArguments3): infer TResult3;
+	(...arguments_: infer TArguments4): infer TResult4;
+	(...arguments_: infer TArguments5): infer TResult5;
+	(...arguments_: infer TArguments6): infer TResult6;
 }
-	? ((...arguments_: Arguments1) => WrapReturn<Name, Result1, Contract, Model, DatabaseId>) &
-			((...arguments_: Arguments2) => WrapReturn<Name, Result2, Contract, Model, DatabaseId>) &
-			((...arguments_: Arguments3) => WrapReturn<Name, Result3, Contract, Model, DatabaseId>) &
-			((...arguments_: Arguments4) => WrapReturn<Name, Result4, Contract, Model, DatabaseId>) &
-			((...arguments_: Arguments5) => WrapReturn<Name, Result5, Contract, Model, DatabaseId>) &
-			((...arguments_: Arguments6) => WrapReturn<Name, Result6, Contract, Model, DatabaseId>)
+	? ((...arguments_: TArguments1) => WrapReturn<TName, TResult1, TContract, TModel, TDatabaseId>) &
+			((...arguments_: TArguments2) => WrapReturn<TName, TResult2, TContract, TModel, TDatabaseId>) &
+			((...arguments_: TArguments3) => WrapReturn<TName, TResult3, TContract, TModel, TDatabaseId>) &
+			((...arguments_: TArguments4) => WrapReturn<TName, TResult4, TContract, TModel, TDatabaseId>) &
+			((...arguments_: TArguments5) => WrapReturn<TName, TResult5, TContract, TModel, TDatabaseId>) &
+			((...arguments_: TArguments6) => WrapReturn<TName, TResult6, TContract, TModel, TDatabaseId>)
 	: never;
 
-type FunctionKeys<Value> = {
-	[Key in keyof Value]-?: Value[Key] extends AnyFunction ? Key : never;
-}[keyof Value];
+type FunctionKeys<TValue> = {
+	[TKey in keyof TValue]-?: TValue[TKey] extends AnyFunction ? TKey : never;
+}[keyof TValue];
 
 type ExplicitPrismaMethod =
 	| "aggregate"
@@ -58,25 +58,25 @@ type ExplicitPrismaMethod =
 	| "sum"
 	| "variant";
 
-type RelationMethods<Collection, Contract, Model extends string, DatabaseId> = {
-	readonly [Key in Exclude<FunctionKeys<Collection>, ExplicitPrismaMethod>]: WrapFunction<Key, Collection[Key], Contract, Model, DatabaseId>;
+type RelationMethods<TCollection, TContract, TModel extends string, TDatabaseId> = {
+	readonly [TKey in Exclude<FunctionKeys<TCollection>, ExplicitPrismaMethod>]: WrapFunction<TKey, TCollection[TKey], TContract, TModel, TDatabaseId>;
 };
 
 declare const RelationQueryTypeId: unique symbol;
 
-export type RelationQuery<Value, Contract, Model extends string, DatabaseId> = Effect.Effect<Value, PrismaError> & {
+export type RelationQuery<TValue, TContract, TModel extends string, TDatabaseId> = Effect.Effect<TValue, PrismaError> & {
 	readonly [RelationQueryTypeId]: {
-		readonly contract: Contract;
-		readonly database: (database: DatabaseId) => DatabaseId;
-		readonly model: Model;
+		readonly contract: TContract;
+		readonly database: (database: TDatabaseId) => TDatabaseId;
+		readonly model: TModel;
 	};
 };
 
-export type Relation<Collection, Contract = undefined, Model extends string = string, DatabaseId = undefined> = RelationQuery<
-	CollectionResult<Collection>,
-	Contract,
-	Model,
-	DatabaseId
+export type Relation<TCollection, TContract = undefined, TModel extends string = string, TDatabaseId = undefined> = RelationQuery<
+	CollectionResult<TCollection>,
+	TContract,
+	TModel,
+	TDatabaseId
 > &
-	RelationMethods<Collection, Contract, Model, DatabaseId> &
-	PrismaRelationMethods<Collection, Contract, Model, DatabaseId>;
+	RelationMethods<TCollection, TContract, TModel, TDatabaseId> &
+	PrismaRelationMethods<TCollection, TContract, TModel, TDatabaseId>;

package/src/sqlite.ts

@@ -1,9 +1,9 @@
 import sqlite, { type SqliteClient, type SqliteOptionsBase } from "@prisma-next/sqlite/runtime";
 import { type Layer, Semaphore } from "effect";
+import type { DatabaseIdentifier, DatabaseIdentifierLiteral, DatabaseServiceHolder, DefaultModels } from "#databaseTypes.ts";
 import { acquireConnectedClient, assertAvailableModelNames } from "#internal/client-lifecycle.ts";
 import { contractModels } from "#internal/database-facade.ts";
 import { makeSqlDatabase } from "#internal/database-factory.ts";
-import type { DatabaseIdentifier, DatabaseIdentifierLiteral, DatabaseServiceHolder, DefaultModels } from "#internal/database-types.ts";
 import type { AnySqlContract } from "#internal/executor.ts";
 import { fromPrismaPromise } from "#internal/promise.ts";
 import { decodeSqliteDatetimesAsUtc } from "#internal/sqlite-datetime.ts";
@@ -32,12 +32,14 @@ export interface SqliteDatabaseDefinition<Contract extends AnySqlContract, Ident
 	readonly layer: (options: SqliteDatabaseLayerOptions) => Layer.Layer<DatabaseIdentifier<Contract, Identifier>, PrismaError>;
 }
 
-const clientOptions = ({ path, extensions, middleware, verifyMarker }: SqliteDatabaseLayerOptions) => ({
-	path,
-	...(extensions === undefined ? {} : { extensions }),
-	...(middleware === undefined ? {} : { middleware }),
-	...(verifyMarker === undefined ? {} : { verifyMarker }),
-});
+function clientOptions({ path, extensions, middleware, verifyMarker }: SqliteDatabaseLayerOptions) {
+	return {
+		path,
+		...(extensions === undefined ? {} : { extensions }),
+		...(middleware === undefined ? {} : { middleware }),
+		...(verifyMarker === undefined ? {} : { verifyMarker }),
+	};
+}
 
 export const makeSqliteDatabase =
 	<const Contract extends AnySqlContract>() =>

package/src/testing/transaction.ts

@@ -1,7 +1,7 @@
 import type { Effect } from "effect";
+import type { AnyDatabase } from "#databaseTypes.ts";
 import type { PrismaError } from "#error.ts";
 import { getDatabaseTesting } from "#internal/testing.ts";
-import type { AnyDatabase } from "./types.ts";
 
 type TestProgram<Database extends AnyDatabase, A, E, R> = Effect.Effect<A, E, R> & (Effect.Services<Database> extends R ? unknown : never);
 

package/src/testing/types.ts

@@ -1,9 +1,8 @@
 import type { TestContext, Vitest } from "@effect/vitest";
 import type { Effect, Layer } from "effect";
-import type { EffectClock, EffectTestOptions } from "@shivaedev/effect-test";
-import type { AnyDatabase, DatabaseServiceOf } from "#database.ts";
+import type { EffectClock, EffectTestOptions } from "@shivaedev/effect-test/types.ts";
+import type { AnyDatabase, DatabaseServiceOf } from "#databaseTypes.ts";
 
-export type { AnyDatabase } from "#database.ts";
 export type DatabaseService<Database extends AnyDatabase> = DatabaseServiceOf<Database>;
 
 export type DatabaseTest<Database extends AnyDatabase, Provided> = <A, Eff extends Effect.Effect<unknown, unknown, Provided>>(

package/src/testing/vitest.ts

@@ -1,8 +1,10 @@
 import { it as effectIt } from "@effect/vitest";
 import type { Effect, Layer } from "effect";
-import { type EffectClock, makeEffectIt } from "@shivaedev/effect-test";
+import type { EffectClock } from "@shivaedev/effect-test/types.ts";
+import { makeEffectIt } from "@shivaedev/effect-test/vitest.ts";
+import type { AnyDatabase } from "#databaseTypes.ts";
 import { withTestTransaction } from "./transaction.ts";
-import type { AnyDatabase, DatabaseIt, MakeDatabaseItOptions } from "./types.ts";
+import type { DatabaseIt, MakeDatabaseItOptions } from "./types.ts";
 
 export function makeDatabaseIt<Database extends AnyDatabase, Provided, LayerError>(
 	options: MakeDatabaseItOptions<Database, Provided, LayerError> & {

package/dist/index.d.ts

@@ -1,5 +0,0 @@
-export { all, and, not, or } from "@prisma-next/sql-orm-client";
-export { type AnyDatabase, type DatabaseDefinition, type DatabaseLayerOptions, type DatabaseService, type DatabaseServiceOf, makeDatabase, } from "./database.ts";
-export { PrismaConnectionFailure, PrismaError, type PrismaErrorReason, PrismaQueryFailure, PrismaRuntimeFailure, } from "./error.ts";
-export type { Relation } from "./relation.ts";
-//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,6BAA6B,CAAC;AAChE,OAAO,EACN,KAAK,WAAW,EAChB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,eAAe,EACpB,KAAK,iBAAiB,EACtB,YAAY,GACZ,MAAM,eAAe,CAAC;AACvB,OAAO,EACN,uBAAuB,EACvB,WAAW,EACX,KAAK,iBAAiB,EACtB,kBAAkB,EAClB,oBAAoB,GACpB,MAAM,YAAY,CAAC;AACpB,YAAY,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC"}