@shivaedev/sql 0.32.0 → 0.34.0

package/src/transact.ts

@@ -1,45 +1,78 @@
-import { Effect } from "effect";
+import { Context, Effect } from "effect";
 import { dual } from "effect/Function";
 import type { ReadonlyRecord } from "effect/Record";
 import * as Reactivity from "effect/reactivity/Reactivity";
 import { SqlClient } from "effect/sql";
 import { isSqlError, type SqlError } from "effect/sql/SqlError";
-import { makeChannel } from "@shivaedev/changes/channel.ts";
-import { recordKey } from "@shivaedev/changes/keys.ts";
+import { type BeforeCommit as CommitHook, makeChannel } from "@shivaedev/changes/channel.ts";
+import { type Observation, type Observer, unobserved } from "@shivaedev/changes/observe.ts";
+import type { Publish } from "@shivaedev/changes/publish.ts";
+import { flatten, type Invalidation, keysOf } from "#invalidationKeys.ts";
 
 export type InvalidationKeys = readonly unknown[] | ReadonlyRecord<string, readonly unknown[]>;
 
-function isList(keys: InvalidationKeys): keys is readonly unknown[] {
-	return Array.isArray(keys);
+export interface AnnouncementOptions {
+	readonly publication?: "local" | "shared";
 }
 
-function flatten(keys: InvalidationKeys): readonly unknown[] {
-	return isList(keys) ? keys : Object.entries(keys).flatMap(([name, ids]) => [name, ...ids.map((id) => recordKey(name, id))]);
+type Services = SqlClient.SqlClient | Reactivity.Reactivity;
+
+export const ChangeObserver = Context.Reference<Observer<unknown>>("@shivaedev/sql/ChangeObserver", { defaultValue: () => unobserved });
+export const BeforeCommit = Context.Reference<CommitHook<unknown, SqlError, Services>>("@shivaedev/sql/BeforeCommit", {
+	defaultValue: () => () => Effect.void,
+});
+export const CommittedSink = Context.Reference<Publish<unknown, Services> | undefined>("@shivaedev/sql/CommittedSink", {
+	defaultValue: () => undefined,
+});
+
+function observe(event: Observation<Invalidation>) {
+	return Effect.flatMap(ChangeObserver, (observer) => observer({ ...event, changes: keysOf(event.changes) }));
+}
+
+function invalidate(keys: readonly unknown[]) {
+	return Reactivity.Reactivity.use((reactivity) => Effect.sync(() => reactivity.invalidateUnsafe(keys)));
 }
 
-const guard = Effect.fn("Transact.guard")(function* () {
-	const sql = yield* SqlClient.SqlClient;
-	const native = yield* Effect.serviceOption(sql.transactionService);
-	if (native._tag === "Some") {
-		return yield* Effect.die(
-			new Error("transact cannot announce changes after a transaction it does not own; begin the outer transaction with transact"),
-		);
+const committed = Effect.fnUntraced(function* (changes: readonly Invalidation[]) {
+	const sink = yield* CommittedSink;
+	if (sink === undefined) {
+		return yield* invalidate(keysOf(changes));
+	}
+	const shared = keysOf(changes.filter((change) => change.publication === "shared"));
+	const sharedKeys = new Set(shared);
+	const local = keysOf(changes.filter((change) => change.publication === "local" && !sharedKeys.has(change.key)));
+	if (local.length > 0) {
+		yield* invalidate(local);
+	}
+	if (shared.length > 0) {
+		yield* sink(shared);
 	}
 });
 
-const invalidations = makeChannel<unknown, SqlClient.SqlClient | Reactivity.Reactivity, SqlError>({
+const invalidations = makeChannel<Invalidation, Services, SqlError>({
+	beforeCommit: (changes) => {
+		const shared = keysOf(changes.filter((change) => change.publication === "shared"));
+		return shared.length === 0 ? Effect.void : Effect.flatMap(BeforeCommit, (hook) => hook(shared));
+	},
+	key: (change) => (change.publication === "shared" ? change.key : change),
 	name: "@shivaedev/sql/transact",
 	owner: Effect.map(SqlClient.SqlClient, (sql) => sql.transactionService),
-	publish: (keys) => Reactivity.Reactivity.use((reactivity) => Effect.sync(() => reactivity.invalidateUnsafe(keys))),
-	unowned: guard(),
+	publish: (changes) => invalidate(keysOf(changes)),
+	unowned: Effect.gen(function* () {
+		const sql = yield* SqlClient.SqlClient;
+		const native = yield* Effect.serviceOption(sql.transactionService);
+		if (native._tag === "Some") {
+			return yield* Effect.die(
+				new Error("transact cannot announce changes after a transaction it does not own; begin the outer transaction with transact"),
+			);
+		}
+	}),
 });
 
-export const ChangeObserver = invalidations.Observer;
-export const BeforeCommit = invalidations.BeforeCommit;
-export const CommittedSink = invalidations.CommittedSink;
-
-export const invalidateOnCommit = Effect.fn("Transact.invalidateOnCommit")(function* (keys: InvalidationKeys) {
-	yield* invalidations.record(flatten(keys));
+export const invalidateOnCommit = Effect.fn("Transact.invalidateOnCommit")(function* (keys: InvalidationKeys, options?: AnnouncementOptions) {
+	yield* invalidations
+		.record(flatten(keys).map((key) => ({ key, publication: options?.publication ?? "shared" })))
+		.pipe(Effect.provideService(invalidations.Observer, observe));
 });
 
 export interface TransactOptions<TError> {
@@ -65,6 +98,10 @@ export const transact: {
 					? sql.withTransaction(body)
 					: boundary.restore(sql.withTransaction(Effect.tap(body, () => sql.afterCommit(boundary.committed)))),
 			)(effect)
-			.pipe(Effect.catchIf(isSqlError, (error) => Effect.fail(options.onSqlError(error))));
+			.pipe(
+				Effect.provideService(invalidations.Observer, observe),
+				Effect.provideService(invalidations.CommittedSink, committed),
+				Effect.catchIf(isSqlError, (error) => Effect.fail(options.onSqlError(error))),
+			);
 	}),
 );

package/src/upsertColumns.ts

@@ -0,0 +1,16 @@
+import type { BigDecimal } from "effect";
+import type { Model } from "effect/schema";
+
+export type UpsertColumn<TModel extends Model.Any, TColumn extends keyof TModel["fields"]> =
+	| TColumn
+	| {
+			readonly column: TColumn;
+			readonly mode: "keepOnNull";
+	  }
+	| {
+			[TKey in TColumn]: NonNullable<TModel["fields"][TKey]["Type"]> extends number | bigint | BigDecimal.BigDecimal
+				? { readonly column: TKey; readonly mode: "add" }
+				: never;
+	  }[TColumn];
+
+export type UpsertAssignment = string | { readonly column: string; readonly mode: "add" | "keepOnNull" };

package/dist/internal/CommandRecovery.d.ts

@@ -1,3 +0,0 @@
-import { Context, Effect } from "effect";
-export declare const CommandRecovery: Context.Reference<Effect.Effect<void, never, never>>;
-//# sourceMappingURL=CommandRecovery.d.ts.map

package/dist/internal/CommandRecovery.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"CommandRecovery.d.ts","sourceRoot":"","sources":["../../src/internal/CommandRecovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEzC,eAAO,MAAM,eAAe,sDAE1B,CAAC"}

package/dist/internal/CommandRecovery.js

@@ -1,5 +0,0 @@
-import { Context, Effect } from "effect";
-export const CommandRecovery = Context.Reference("@shivaedev/sql/CommandRecovery", {
-    defaultValue: () => Effect.void,
-});
-//# sourceMappingURL=CommandRecovery.js.map

package/dist/internal/CommandRecovery.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"CommandRecovery.js","sourceRoot":"","sources":["../../src/internal/CommandRecovery.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEzC,MAAM,CAAC,MAAM,eAAe,GAAG,OAAO,CAAC,SAAS,CAAsB,gCAAgC,EAAE;IACvG,YAAY,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI;CAC/B,CAAC,CAAC"}

package/dist/internal/MigrationStartedAt.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"MigrationStartedAt.d.ts","sourceRoot":"","sources":["../../src/internal/MigrationStartedAt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEjC,eAAO,MAAM,kBAAkB,uCAE7B,CAAC"}

package/dist/internal/MigrationStartedAt.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"MigrationStartedAt.js","sourceRoot":"","sources":["../../src/internal/MigrationStartedAt.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAEjC,MAAM,CAAC,MAAM,kBAAkB,GAAG,OAAO,CAAC,SAAS,CAAqB,4CAA4C,EAAE;IACrH,YAAY,EAAE,GAAG,EAAE,CAAC,SAAS;CAC7B,CAAC,CAAC"}

package/dist/internal/migrationLock.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"migrationLock.d.ts","sourceRoot":"","sources":["../../src/internal/migrationLock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,eAAO,MAAM,aAAa,qJAexB,CAAC"}

package/dist/internal/migrationLock.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"migrationLock.js","sourceRoot":"","sources":["../../src/internal/migrationLock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,KAAa,EAAE,OAAe;IACvF,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC;IACvC,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC;IACtC,SAAS,OAAO,CAAC,SAAuD;QACvE,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;QAC/C,OAAO,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;IACxD,CAAC;IACD,MAAM,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG,CAAA,mDAAmD,CAAC,CAAC;IAC1F,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,GAAG,CAAA,qCAAqC,OAAO,UAAU,CAAC,EAAE,GAAG,EAAE,CACrG,OAAO,CAAC,GAAG,CAAA,qCAAqC,QAAQ,EAAE,OAAO,UAAU,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAC/F,CAAC;IACF,MAAM,GAAG,GAAG,yBAAyB,KAAK,EAAE,CAAC;IAC7C,yGAAyG;IACzG,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAA,8CAA8C,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IAC1H,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG,CAAA,4CAA4C,GAAG,OAAO,CAAC,CAAC;AAC3E,CAAC,CAAC,CAAC"}

package/src/internal/CommandRecovery.ts

@@ -1,5 +0,0 @@
-import { Context, Effect } from "effect";
-
-export const CommandRecovery = Context.Reference<Effect.Effect<void>>("@shivaedev/sql/CommandRecovery", {
-	defaultValue: () => Effect.void,
-});