@shivaedev/sql 0.46.3 → 0.47.0

package/src/repositoryQueries.ts

@@ -9,6 +9,7 @@ import type { Aggregate } from "#aggregateQuery.ts";
 import { latestPerGroup as makeLatestPerGroup } from "#latestPerGroup.ts";
 import { makeAggregate } from "#makeAggregate.ts";
 import { makeQueryClauses } from "#makeQueryClauses.ts";
+import type { RecordRead } from "#recordRepositoryRead.ts";
 import type { FindMany, FindOne, LatestPerGroup } from "#repository.ts";
 import { makeFilter } from "#repositoryFilter.ts";
 import { sqlNameTransforms } from "#sqlNameTransforms.ts";
@@ -57,6 +58,7 @@ export interface Queries<TModel extends Model.Any> {
 export function makeQueries<TModel extends Model.Any>(
 	model: TModel,
 	options: {
+		readonly recordRead: RecordRead;
 		readonly tableName: string;
 		readonly spanPrefix: string;
 	},
@@ -72,6 +74,7 @@ export function makeQueries<TModel extends Model.Any>(
 		function count(query: Pick<FindMany<TModel, Key<TModel>>, "where"> = {}): Effect.Effect<number, SqlError | Schema.SchemaError, unknown> {
 			return Effect.gen(function* () {
 				const predicate = yield* where(query.where, true, true);
+				yield* options.recordRead(query.where);
 				const rows = yield* sql`select cast(count(*) as text) as count from ${sql(options.tableName)} where ${predicate}`;
 				const [result] = yield* Schema.decodeUnknownEffect(CountResult)(rows);
 				return result.count;
@@ -88,6 +91,7 @@ export function makeQueries<TModel extends Model.Any>(
 				const predicate = yield* where(query.where, true, true);
 				const order = yield* orderClause(query.orderBy);
 				const limit = yield* limitClause(query.limit);
+				yield* options.recordRead(query.where);
 				return sql`select ${sql.csv(groupColumns(model.fields, keys).map(({ column }) => sql`${sql(column)}`))} from ${sql(options.tableName)} where ${predicate} ${order} ${limit}`;
 			});
 			return { fields, statement };
@@ -112,6 +116,7 @@ export function makeQueries<TModel extends Model.Any>(
 			return Effect.gen(function* () {
 				const order = yield* orderClause(query.orderBy);
 				const rowLimit = yield* decodeLimit(query.limit);
+				yield* options.recordRead(query.where);
 				return yield* readLatest(query, order, rowLimit);
 			}).pipe(Effect.withSpan(`${options.spanPrefix}.latestPerGroup`));
 		}

package/src/transact.ts

@@ -79,29 +79,28 @@ export interface TransactOptions<TError> {
 	readonly onSqlError: (error: SqlError) => TError;
 }
 
+type Transacted<A, E, R> = Effect.Effect<A, E, R | SqlClient.SqlClient | Reactivity.Reactivity>;
+
 export const transact: {
-	<TError>(
-		options: TransactOptions<TError>,
-	): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, Exclude<E, SqlError> | TError, R | SqlClient.SqlClient | Reactivity.Reactivity>;
-	<A, E, R, TError>(
-		effect: Effect.Effect<A, E, R>,
-		options: TransactOptions<TError>,
-	): Effect.Effect<A, Exclude<E, SqlError> | TError, R | SqlClient.SqlClient | Reactivity.Reactivity>;
+	(): <A, E, R>(effect: Effect.Effect<A, E, R>) => Transacted<A, E | SqlError, R>;
+	<TError>(options: TransactOptions<TError>): <A, E, R>(effect: Effect.Effect<A, E, R>) => Transacted<A, Exclude<E, SqlError> | TError, R>;
+	<A, E, R>(effect: Effect.Effect<A, E, R>): Transacted<A, E | SqlError, R>;
+	<A, E, R, TError>(effect: Effect.Effect<A, E, R>, options: TransactOptions<TError>): Transacted<A, Exclude<E, SqlError> | TError, R>;
 } = dual(
-	2,
-	Effect.fn("Transact.transact")(function* <A, E, R, TError>(effect: Effect.Effect<A, E, R>, options: TransactOptions<TError>) {
+	(args) => Effect.isEffect(args[0]),
+	Effect.fn("Transact.transact")(function* <A, E, R, TError>(effect: Effect.Effect<A, E, R>, options?: TransactOptions<TError>) {
 		const sql = yield* SqlClient.SqlClient;
 		const native = yield* Effect.serviceOption(sql.transactionService);
-		return yield* invalidations
+		const transacted = invalidations
 			.within((body, boundary) =>
 				native._tag === "Some"
 					? sql.withTransaction(body)
 					: boundary.restore(sql.withTransaction(Effect.tap(body, () => sql.afterCommit(boundary.committed)))),
 			)(effect)
-			.pipe(
-				Effect.provideService(invalidations.Observer, observe),
-				Effect.provideService(invalidations.CommittedSink, committed),
-				Effect.catchIf(isSqlError, (error) => Effect.fail(options.onSqlError(error))),
-			);
+			.pipe(Effect.provideService(invalidations.Observer, observe), Effect.provideService(invalidations.CommittedSink, committed));
+		if (options === undefined) {
+			return yield* transacted;
+		}
+		return yield* Effect.catchIf(transacted, isSqlError, (error) => Effect.fail(options.onSqlError(error)));
 	}),
 );