@shivaedev/sql 0.34.0 → 0.36.1

package/src/tupleIn.ts

@@ -51,27 +51,25 @@ export function tupleIn<TModel extends Model.Any, const TFields extends readonly
 	return { [tupleFilter]: { fields, model, types: fields.map((field: TFields[number]) => types[field]), values } };
 }
 
-export function tuplePredicate(
+export const tuplePredicate = Effect.fnUntraced(function* (
 	input: Partial<TupleFilter<Model.Any>>,
-	sql: SqlClient.SqlClient,
 	fieldAt: (key: string) => Effect.Effect<Schema.Constraint, Schema.SchemaError>,
 ) {
 	const tuple = input[tupleFilter];
 	if (tuple === undefined) {
-		return Effect.succeed(undefined);
+		return undefined;
 	}
-	return Effect.gen(function* () {
-		const fields = yield* Effect.forEach(tuple.fields, fieldAt);
-		const encode = Schema.encodeUnknownEffect(Schema.Tuple(fields));
-		const columns = sql.csv(tuple.fields.map((field) => sql`${sql(field)}`));
-		const rows: readonly (readonly unknown[])[] = yield* Effect.forEach(tuple.values, (value) => encode(value));
-		if (rows.length === 0) {
-			return sql`1 = 0`;
-		}
-		if (sql.onDialectOrElse({ orElse: () => false, pg: () => true })) {
-			const relation = yield* tupleUnnest(tuple.types, rows).pipe(Effect.provideService(SqlClient.SqlClient, sql));
-			return sql`(${columns}) in (select * from ${relation})`;
-		}
-		return sql.or(rows.map((row) => sql`(${columns}) = (${sql.csv(row.map((entry) => sql`${entry}`))})`));
-	});
-}
+	const sql = yield* SqlClient.SqlClient;
+	const fields = yield* Effect.forEach(tuple.fields, fieldAt);
+	const encode = Schema.encodeUnknownEffect(Schema.Tuple(fields));
+	const columns = sql.csv(tuple.fields.map((field) => sql`${sql(field)}`));
+	const rows: readonly (readonly unknown[])[] = yield* Effect.forEach(tuple.values, (value) => encode(value));
+	if (rows.length === 0) {
+		return sql`1 = 0`;
+	}
+	if (sql.onDialectOrElse({ orElse: () => false, pg: () => true })) {
+		const relation = yield* tupleUnnest(tuple.types, rows).pipe(Effect.provideService(SqlClient.SqlClient, sql));
+		return sql`(${columns}) in (select * from ${relation})`;
+	}
+	return sql.or(rows.map((row) => sql`(${columns}) = (${sql.csv(row.map((entry) => sql`${entry}`))})`));
+});

package/src/upsertResult.ts

@@ -1,15 +1,16 @@
 import { Effect, Schema } from "effect";
 import type { Model } from "effect/schema";
-import type { SqlClient } from "effect/sql";
+import { SqlClient } from "effect/sql";
 
 export interface UpsertRow<TRow> {
 	readonly inserted: boolean;
 	readonly row: TRow;
 }
 
-export function upsertReturning(sql: SqlClient.SqlClient) {
+export const upsertReturning = Effect.fnUntraced(function* () {
+	const sql = yield* SqlClient.SqlClient;
 	return sql`*, (xmax = 0) as ${sql("effectSqlInserted")}`;
-}
+});
 
 export function makeUpsertDecoder(model: Model.Any) {
 	const decode = Schema.decodeUnknownEffect(model);

package/src/versionedRepository.ts

@@ -1,12 +1,12 @@
 import { Effect, Option, Schema } from "effect";
 import type { Model } from "effect/schema";
-import type { SqlClient, SqlModel } from "effect/sql";
+import { SqlClient, type SqlModel } from "effect/sql";
 import type { SqlError } from "effect/sql/SqlError";
 import type { PrimaryKey, Repository } from "#compositeRepository.ts";
 import type { OptimisticConcurrencyError } from "#repository.ts";
+import type { RepositoryChanges } from "#repositoryChanges.ts";
 import type { UpdateInput } from "#repositoryUpdate.ts";
 import { type VersionedOptions, versionedStatements } from "#versionedStatements.ts";
-import type { RepositoryChanges } from "./repositoryChanges.ts";
 
 export type IdColumn<TModel extends Model.Any> = keyof TModel["Type"] & keyof TModel["update"]["Type"] & keyof TModel["fields"];
 export type VersionColumn<TModel extends Model.Any, TId extends PrimaryKey<TModel>> = {
@@ -43,13 +43,13 @@ export interface VersionedWrites<TModel extends Model.Any, TId extends PrimaryKe
 	readonly updateVoid: (input: UpdateInput<TModel>) => Effect.Effect<void, WriteError, TModel["update"]["EncodingServices"]>;
 }
 
-export function makeVersionedWrites(
+export const makeVersionedWrites = Effect.fnUntraced(function* (
 	model: Model.Any,
-	sql: SqlClient.SqlClient,
 	options: VersionedOptions & { readonly changes: RepositoryChanges; readonly spanPrefix: string },
 ) {
+	const sql = yield* SqlClient.SqlClient;
 	const { spanPrefix, changes } = options;
-	const statements = versionedStatements(model, sql, options);
+	const statements = yield* versionedStatements(model, options);
 	const decodeRow = Schema.decodeUnknownEffect(model);
 	function insert(input: unknown) {
 		return Effect.gen(function* () {
@@ -106,4 +106,4 @@ export function makeVersionedWrites(
 		}).pipe(changes.write, Effect.withSpan(`${spanPrefix}.delete`));
 	}
 	return { delete: deleteRow, insert, insertVoid, update, updateVoid, ...(options.conflictColumns === undefined ? {} : { insertOrIgnore }) };
-}
+});

package/src/versionedStatements.ts

@@ -1,6 +1,6 @@
 import { Effect, Schema } from "effect";
 import type { Model } from "effect/schema";
-import type { SqlClient } from "effect/sql";
+import { SqlClient } from "effect/sql";
 import { makeConflictClause } from "#makeConflictClause.ts";
 import type { OptimisticConcurrencyError } from "#repository.ts";
 
@@ -14,21 +14,21 @@ export interface VersionedOptions {
 	readonly versionColumn: string;
 }
 
-export function versionedStatements(model: Model.Any, sql: SqlClient.SqlClient, options: VersionedOptions) {
+export const versionedStatements = Effect.fnUntraced(function* (model: Model.Any, options: VersionedOptions) {
+	const sql = yield* SqlClient.SqlClient;
 	const { tableName, idColumns, versionColumn, conflict } = options;
-	const fields = Object.fromEntries(
-		idColumns.map((column) => {
-			const field = model.fields[column];
-			if (field === undefined) {
-				throw new Error(`Unknown ID column: ${column}`);
-			}
-			return [column, field];
-		}),
-	);
-	const encodeKey = Schema.encodeEffect(Schema.Struct(fields));
+	const entries: [string, Schema.Constraint][] = [];
+	for (const column of idColumns) {
+		const field = model.fields[column];
+		if (field === undefined) {
+			return yield* Effect.die(new Error(`Unknown ID column: ${column}`));
+		}
+		entries.push([column, field]);
+	}
+	const encodeKey = Schema.encodeEffect(Schema.Struct(Object.fromEntries(entries)));
 	const versionSchema = model.fields[versionColumn];
 	if (versionSchema === undefined) {
-		throw new Error(`Unknown version column: ${versionColumn}`);
+		return yield* Effect.die(new Error(`Unknown version column: ${versionColumn}`));
 	}
 	const encodeVersion = Schema.encodeEffect(versionSchema);
 	const encodeInsert = Schema.encodeEffect(model.insert);
@@ -36,7 +36,7 @@ export function versionedStatements(model: Model.Any, sql: SqlClient.SqlClient,
 	const record = Schema.decodeUnknownEffect(Schema.Record(Schema.String, Schema.Unknown));
 	const validateVersion = Schema.decodeUnknownEffect(Version);
 	const clause =
-		options.conflictColumns === undefined ? undefined : makeConflictClause(model, sql, { ...options, conflictColumns: options.conflictColumns });
+		options.conflictColumns === undefined ? undefined : yield* makeConflictClause(model, { ...options, conflictColumns: options.conflictColumns });
 	function key(input: unknown) {
 		return idColumns.length === 1 ? { [idColumns[0] ?? ""]: input } : input;
 	}
@@ -86,4 +86,4 @@ export function versionedStatements(model: Model.Any, sql: SqlClient.SqlClient,
 		});
 	}
 	return { insert, remove, update };
-}
+});

package/dist/testing.d.ts

@@ -1,27 +0,0 @@
-import { Effect, Schema } from "effect";
-import { SqlClient } from "effect/sql";
-import { type BucketKey, type ItemKey } from "@shivaedev/changes/keys.ts";
-declare const UnannouncedWrites_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
-    readonly _tag: "UnannouncedWrites";
-} & Readonly<A>;
-export declare class UnannouncedWrites extends UnannouncedWrites_base<{
-    readonly tables: readonly string[];
-}> {
-}
-export interface ChangeCoverage {
-    readonly covers: Readonly<Record<string, readonly (ItemKey | BucketKey)[]>>;
-}
-export declare const withChangeCoverage: <A, E, R>(body: Effect.Effect<A, E, R>, options?: ChangeCoverage | undefined) => Effect.Effect<A, Schema.SchemaError | import("effect/sql/SqlError").SqlError | UnannouncedWrites | Exclude<E, import("effect/sql/SqlError").SqlError>, import("effect/reactivity/Reactivity").Reactivity | SqlClient.SqlClient | Exclude<Exclude<R, never>, never>>;
-declare const PublishedKeysMismatch_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
-    readonly _tag: "PublishedKeysMismatch";
-} & Readonly<A>;
-export declare class PublishedKeysMismatch extends PublishedKeysMismatch_base<{
-    readonly expected: readonly unknown[];
-    readonly actual: readonly unknown[];
-}> {
-    get message(): string;
-}
-export declare function expectPublished(keys: readonly unknown[]): <A, E, R>(body: Effect.Effect<A, E, R>) => Effect.Effect<A, E | PublishedKeysMismatch, R>;
-export declare function expectPublished<A>(keys: (result: A) => readonly unknown[]): <E, R>(body: Effect.Effect<A, E, R>) => Effect.Effect<A, E | PublishedKeysMismatch, R>;
-export {};
-//# sourceMappingURL=testing.d.ts.map

package/dist/testing.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,OAAO,EAAoB,MAAM,4BAA4B,CAAC;;;;AAI5F,qBAAa,iBAAkB,SAAQ,uBAAsC;IAAE,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC;CAAG;AAEvH,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,OAAO,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;CAC5E;AAED,eAAO,MAAM,kBAAkB,GAAsD,CAAC,EAAE,CAAC,EAAE,CAAC,4UAuD1F,CAAC;;;;AAEH,qBAAa,qBAAsB,SAAQ,2BAA0C;IACpF,QAAQ,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,CAAC;IACtC,QAAQ,CAAC,MAAM,EAAE,SAAS,OAAO,EAAE,CAAC;CACpC,CAAC;IACD,IAAa,OAAO,WAEnB;CACD;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,OAAO,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,qBAAqB,EAAE,CAAC,CAAC,CAAC;AACrJ,wBAAgB,eAAe,CAAC,CAAC,EAChC,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,SAAS,OAAO,EAAE,GACrC,CAAC,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,GAAG,qBAAqB,EAAE,CAAC,CAAC,CAAC"}

package/dist/testing.js

@@ -1,75 +0,0 @@
-import { Data, Effect, Schema } from "effect";
-import { SqlClient } from "effect/sql";
-import { invalidationKeys } from "@shivaedev/changes/keys.ts";
-import { ChangeDeclarations } from "#ChangeDeclarations.ts";
-import { ChangeObserver, transact } from "#transact.ts";
-export class UnannouncedWrites extends Data.TaggedError("UnannouncedWrites") {
-}
-export const withChangeCoverage = Effect.fn("Changes.withChangeCoverage")(function* (body, options) {
-    const observer = yield* ChangeObserver;
-    const sql = yield* SqlClient.SqlClient;
-    const named = new Set();
-    const declarations = new Map();
-    const outer = yield* ChangeDeclarations;
-    const written = sql `select relid, relname, (n_tup_ins + n_tup_upd + n_tup_del)::int as writes from pg_stat_xact_user_tables`.pipe(Effect.flatMap(Schema.decodeUnknownEffect(Schema.Array(Schema.Struct({ relid: Schema.Int, relname: Schema.String, writes: Schema.Int })))));
-    const checked = Effect.gen(function* () {
-        const before = new Map((yield* written).map((row) => [row.relid, row.writes]));
-        const result = yield* body;
-        const missing = (yield* written).filter((row) => {
-            const count = row.writes - (before.get(row.relid) ?? 0);
-            if (count <= 0) {
-                return false;
-            }
-            const automatic = declarations.get(row.relname);
-            const explicit = options?.covers[row.relname] ?? [];
-            const expected = [...(automatic?.keys ?? []), ...invalidationKeys(explicit)];
-            return (count > (automatic?.rows ?? 0) && explicit.length === 0) || expected.some((key) => !named.has(key));
-        });
-        if (missing.length > 0) {
-            return yield* Effect.fail(new UnannouncedWrites({ tables: missing.map((row) => row.relname).sort() }));
-        }
-        return result;
-    });
-    return yield* checked.pipe(transact({ onSqlError: (error) => error }), Effect.provideService(ChangeDeclarations, {
-        declare: (table, keys, rows) => Effect.andThen(Effect.sync(() => {
-            const entry = declarations.get(table) ?? { keys: new Set(), rows: 0 };
-            for (const key of keys) {
-                entry.keys.add(key);
-            }
-            entry.rows += rows;
-            declarations.set(table, entry);
-        }), outer.declare(table, keys, rows)),
-    }), Effect.provideService(ChangeObserver, (event) => {
-        if (event._tag === "Recorded") {
-            for (const key of event.changes) {
-                named.add(key);
-            }
-        }
-        return observer(event);
-    }));
-});
-export class PublishedKeysMismatch extends Data.TaggedError("PublishedKeysMismatch") {
-    get message() {
-        return `Expected published keys ${JSON.stringify(this.expected)}; actual published keys ${JSON.stringify(this.actual)}`;
-    }
-}
-export function expectPublished(keys) {
-    return Effect.fn("Changes.expectPublished")(function* (body) {
-        const observer = yield* ChangeObserver;
-        const actual = new Set();
-        const result = yield* body.pipe(Effect.provideService(ChangeObserver, (event) => {
-            if (event._tag === "Published") {
-                for (const key of event.changes) {
-                    actual.add(key);
-                }
-            }
-            return observer(event);
-        }));
-        const expected = new Set(typeof keys === "function" ? keys(result) : keys);
-        if (actual.size !== expected.size || [...expected].some((key) => !actual.has(key))) {
-            return yield* Effect.fail(new PublishedKeysMismatch({ actual: [...actual], expected: [...expected] }));
-        }
-        return result;
-    });
-}
-//# sourceMappingURL=testing.js.map

package/dist/testing.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"testing.js","sourceRoot":"","sources":["../src/testing.ts"],"names":[],"mappings":"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"}

package/src/testing.ts

@@ -1,103 +0,0 @@
-import { Data, Effect, Schema } from "effect";
-import { SqlClient } from "effect/sql";
-import { type BucketKey, type ItemKey, invalidationKeys } from "@shivaedev/changes/keys.ts";
-import { ChangeDeclarations } from "#ChangeDeclarations.ts";
-import { ChangeObserver, transact } from "#transact.ts";
-
-export class UnannouncedWrites extends Data.TaggedError("UnannouncedWrites")<{ readonly tables: readonly string[] }> {}
-
-export interface ChangeCoverage {
-	readonly covers: Readonly<Record<string, readonly (ItemKey | BucketKey)[]>>;
-}
-
-export const withChangeCoverage = Effect.fn("Changes.withChangeCoverage")(function* <A, E, R>(
-	body: Effect.Effect<A, E, R>,
-	options?: ChangeCoverage,
-) {
-	const observer = yield* ChangeObserver;
-	const sql = yield* SqlClient.SqlClient;
-	const named = new Set<unknown>();
-	const declarations = new Map<string, { keys: Set<string>; rows: number }>();
-	const outer = yield* ChangeDeclarations;
-	const written = sql`select relid, relname, (n_tup_ins + n_tup_upd + n_tup_del)::int as writes from pg_stat_xact_user_tables`.pipe(
-		Effect.flatMap(Schema.decodeUnknownEffect(Schema.Array(Schema.Struct({ relid: Schema.Int, relname: Schema.String, writes: Schema.Int })))),
-	);
-	const checked = Effect.gen(function* () {
-		const before = new Map((yield* written).map((row) => [row.relid, row.writes]));
-		const result = yield* body;
-		const missing = (yield* written).filter((row) => {
-			const count = row.writes - (before.get(row.relid) ?? 0);
-			if (count <= 0) {
-				return false;
-			}
-			const automatic = declarations.get(row.relname);
-			const explicit = options?.covers[row.relname] ?? [];
-			const expected = [...(automatic?.keys ?? []), ...invalidationKeys(explicit)];
-			return (count > (automatic?.rows ?? 0) && explicit.length === 0) || expected.some((key) => !named.has(key));
-		});
-		if (missing.length > 0) {
-			return yield* Effect.fail(new UnannouncedWrites({ tables: missing.map((row) => row.relname).sort() }));
-		}
-		return result;
-	});
-	return yield* checked.pipe(
-		transact({ onSqlError: (error) => error }),
-		Effect.provideService(ChangeDeclarations, {
-			declare: (table, keys, rows) =>
-				Effect.andThen(
-					Effect.sync(() => {
-						const entry = declarations.get(table) ?? { keys: new Set<string>(), rows: 0 };
-						for (const key of keys) {
-							entry.keys.add(key);
-						}
-						entry.rows += rows;
-						declarations.set(table, entry);
-					}),
-					outer.declare(table, keys, rows),
-				),
-		}),
-		Effect.provideService(ChangeObserver, (event) => {
-			if (event._tag === "Recorded") {
-				for (const key of event.changes) {
-					named.add(key);
-				}
-			}
-			return observer(event);
-		}),
-	);
-});
-
-export class PublishedKeysMismatch extends Data.TaggedError("PublishedKeysMismatch")<{
-	readonly expected: readonly unknown[];
-	readonly actual: readonly unknown[];
-}> {
-	override get message() {
-		return `Expected published keys ${JSON.stringify(this.expected)}; actual published keys ${JSON.stringify(this.actual)}`;
-	}
-}
-
-export function expectPublished(keys: readonly unknown[]): <A, E, R>(body: Effect.Effect<A, E, R>) => Effect.Effect<A, E | PublishedKeysMismatch, R>;
-export function expectPublished<A>(
-	keys: (result: A) => readonly unknown[],
-): <E, R>(body: Effect.Effect<A, E, R>) => Effect.Effect<A, E | PublishedKeysMismatch, R>;
-export function expectPublished<A>(keys: readonly unknown[] | ((result: A) => readonly unknown[])) {
-	return Effect.fn("Changes.expectPublished")(function* <E, R>(body: Effect.Effect<A, E, R>) {
-		const observer = yield* ChangeObserver;
-		const actual = new Set<unknown>();
-		const result = yield* body.pipe(
-			Effect.provideService(ChangeObserver, (event) => {
-				if (event._tag === "Published") {
-					for (const key of event.changes) {
-						actual.add(key);
-					}
-				}
-				return observer(event);
-			}),
-		);
-		const expected = new Set(typeof keys === "function" ? keys(result) : keys);
-		if (actual.size !== expected.size || [...expected].some((key) => !actual.has(key))) {
-			return yield* Effect.fail(new PublishedKeysMismatch({ actual: [...actual], expected: [...expected] }));
-		}
-		return result;
-	});
-}