@shivaedev/sql 0.40.0 → 0.41.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.41.0 - 2026-11-05
+
+### Added
+
+- `defineRepository` exposes a repository and its domain operations through one native Effect service and Layer, shared by services that declare it in `requires`. Initialization retains its typed errors, dependencies and Layer-owned scope; repository operations retain caller transactions.
+
+### Breaking
+
+- The worker scheduling port is `WorkerReleaseClock` from `@shivaedev/sql/WorkerReleaseClock.ts`. Replace imports and uses of `WorkerReleaseTesting`; use `hostTime` from test-kits for controlled story time.
+
 ## 0.40.0 - 2026-11-04
 
 ### Added

package/README.md

@@ -189,6 +189,93 @@ class Receipt extends Model.Class<Receipt>("Receipt")({
 
 `jsonb` uses native `PgTypes.jsonb` parameters. The supplied schema encodes nested values for storage and decodes PostgreSQL's returned object through the repository, including projections. Here `amount` is a number in application code and a string inside the stored JSON. Invalid input or stored data fails with `SchemaError`. Use `jsonb(Schema.NullOr(Details))` for a nullable column: a null input binds SQL `NULL`. The application still owns the column's DDL.
 
+### Share a table's repository and domain reads between services
+
+Use `defineRepository` from `@shivaedev/sql/defineRepository.ts` to give the table's repository and its domain operations one native Effect service and Layer. Its initializer returns the whole public shape: values, repositories and functions are all allowed. Services declare that repository tag in `requires`, then read it from the environment. Keep repository construction out of each service's initializer.
+
+For a pot with `id`, `amount` and `pending` integer fields, its repository module can own loading and replaying pending portions:
+
+```ts
+import { Effect } from "effect";
+import { defineRepository } from "@shivaedev/sql/defineRepository.ts";
+import { makeRepository } from "@shivaedev/sql/repository.ts";
+import { Pot } from "#pots/Pot.ts";
+
+const initializePots = Effect.gen(function* () {
+	const rows = yield* makeRepository(Pot, {
+		idColumn: "id",
+		spanPrefix: "Pots",
+		tableName: "pots",
+	});
+	const load = Effect.fn("Pots.load")((id: number) => rows.findById(id));
+	const settle = Effect.fn("Pots.settle")(function* (id: number) {
+		const pot = yield* load(id);
+		return yield* rows.update({ ...pot, amount: pot.amount + pot.pending, pending: 0 });
+	});
+	return { rows, load, settle };
+});
+
+export const Pots = defineRepository({ id: "app/Pots", initialize: initializePots });
+```
+
+`Pots.layer` requires the initializer's services, including `SqlClient`. Its initialization errors stay in the Layer's error type, and resources acquired by initialization belong to the Layer's scope. The returned operations keep their own types and caller requirements; `defineRepository` does not bind their dependencies. Here `load` and `settle` close over `rows`, which captures the native SQL client.
+
+Put service operations in their operation modules, reading the shared tag:
+
+```ts
+import { Effect } from "effect";
+import { Pots } from "#pots/Pots.ts";
+
+export const loadPot = Effect.fn("Plates.loadPot")(function* (id: number) {
+	return yield* (yield* Pots).load(id);
+});
+
+export const settlePot = Effect.fn("PotLifecycle.settlePot")(function* (id: number) {
+	return yield* (yield* Pots).settle(id);
+});
+```
+
+Keep each operation in its own module. The two service assemblies import those operations:
+
+```ts
+import { Effect, Layer } from "effect";
+import { defineService } from "@shivaedev/service/defineService.ts";
+import { loadPot } from "#pots/loadPot.ts";
+import { Pots } from "#pots/Pots.ts";
+import { settlePot } from "#pots/settlePot.ts";
+
+const Plates = defineService({
+	id: "app/Plates",
+	requires: [Pots],
+	initialize: Effect.void,
+	methods: () => ({ loadPot }),
+});
+const PotLifecycle = defineService({
+	id: "app/PotLifecycle",
+	requires: [Pots],
+	initialize: Effect.void,
+	methods: () => ({ settlePot }),
+});
+
+const features = Layer.merge(Plates.layer, PotLifecycle.layer).pipe(Layer.provide(Pots.layer));
+```
+
+Provide the application's PostgreSQL Layer to `features` once. Both services receive the same repository instance within that Layer build. Reuse the same `Pots.layer` value so native Layer memoization shares construction; `Layer.fresh` and separate builds intentionally create separate lifetimes. The repository does not open another pool or a transaction. Wrap work spanning both services in `transact`; repository reads and writes keep the caller's transaction and savepoints, and a failure rolls back the work across both services. The application chooses concurrency and locking for a read followed by an update. Closing the Layer scope releases its repository initialization resources.
+
+```ts
+import { transact } from "@shivaedev/sql/transact.ts";
+
+const application = features.pipe(Layer.provideMerge(database));
+const settleAndLoad = Effect.gen(function* () {
+	const lifecycle = yield* PotLifecycle;
+	const plates = yield* Plates;
+	yield* lifecycle.settlePot(1);
+	return yield* plates.loadPot(1);
+}).pipe(transact({ onSqlError: (error) => error }), Effect.provide(application));
+```
+
+`database` is the application's `postgresLayer`. `Layer.provideMerge` also keeps its SQL and Reactivity services available to the outer `transact`.
+
 ### 2. Per feature: write and query through the model
 
 ```ts
@@ -917,6 +1004,7 @@ Import the module that defines the name; there is no root entry.
 - `@shivaedev/sql/int8.ts`: `int8(field)` — PostgreSQL bigint storage codec using the supplied field schema.
 - `@shivaedev/sql/int4Array.ts`: `int4Array(field)` — PostgreSQL integer-array storage codec, including typed empty arrays.
 - `@shivaedev/sql/compositeRecordKey.ts`: `compositeRecordKey(model, { tableName, idColumn }, value)` — Encodes decoded composite key fields into the published record key.
+- `@shivaedev/sql/defineRepository.ts`: `defineRepository({ id, initialize })` — Native Context service and `.layer` for a shared repository shape; the initializer's dependencies, errors and scoped resources belong to its Layer.
 - `@shivaedev/sql/repository.ts`: `makeRepository(model, options)` — `tableName`, scalar or composite `idColumn`, `spanPrefix`, optional `versionColumn`, `conflictColumns` and `conflictWhere`, and `collection` required for bucket models; requires native `SqlClient`.
 - `@shivaedev/sql/repository.ts`: `OptimisticConcurrencyError` — Typed stale or missing-row failure for versioned writes, with `tableName`, `id`, `expectedVersion`, `reason: "missing" | "stale"`.
 - `@shivaedev/sql/tupleIn.ts`: `tupleIn(model, fields, tuples, types)` — Filter entry matching two or more fields together against a list of tuples, for `where` in reads and unversioned deletes.

package/dist/{testing/WorkerRelease.d.ts → WorkerReleaseClock.d.ts}

@@ -1,13 +1,13 @@
 import { type Clock, Context, type Effect, type Schema, type Scope } from "effect";
 import type { SqlError } from "effect/sql/SqlError";
-declare const WorkerReleaseTesting_base: Context.ServiceClass<WorkerReleaseTesting, "@shivaedev/sql/testing/WorkerReleaseTesting", {
+declare const WorkerReleaseClock_base: Context.ServiceClass<WorkerReleaseClock, "@shivaedev/sql/WorkerReleaseClock", {
     readonly clock: Clock.Clock;
     readonly register: (tick: {
         readonly heartbeat: Effect.Effect<void, SqlError | Schema.SchemaError>;
         readonly poll: Effect.Effect<void, SqlError | Schema.SchemaError>;
     }) => Effect.Effect<void, never, Scope.Scope>;
 }>;
-export declare class WorkerReleaseTesting extends WorkerReleaseTesting_base {
+export declare class WorkerReleaseClock extends WorkerReleaseClock_base {
 }
 export {};
-//# sourceMappingURL=WorkerRelease.d.ts.map
+//# sourceMappingURL=WorkerReleaseClock.d.ts.map

package/dist/WorkerReleaseClock.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkerReleaseClock.d.ts","sourceRoot":"","sources":["../src/WorkerReleaseClock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,MAAM,EAAE,KAAK,KAAK,EAAE,MAAM,QAAQ,CAAC;AACnF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;;oBAKlC,KAAK,CAAC,KAAK;uBACR,CAAC,IAAI,EAAE;QACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;QACvE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;KAClE,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC;;AAP/C,qBAAa,kBAAmB,SAAQ,uBASA;CAAG"}

package/dist/WorkerReleaseClock.js

@@ -0,0 +1,4 @@
+import { Context } from "effect";
+export class WorkerReleaseClock extends Context.Service()("@shivaedev/sql/WorkerReleaseClock") {
+}
+//# sourceMappingURL=WorkerReleaseClock.js.map

package/dist/WorkerReleaseClock.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkerReleaseClock.js","sourceRoot":"","sources":["../src/WorkerReleaseClock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,OAAO,EAAwC,MAAM,QAAQ,CAAC;AAGnF,MAAM,OAAO,kBAAmB,SAAQ,OAAO,CAAC,OAAO,EASpD,CAAC,mCAAmC,CAAC;CAAG"}

package/dist/coordinateWorkerRelease.js

@@ -1,6 +1,6 @@
 import { Duration, Effect, Exit, Option, Predicate, Schedule, Scope } from "effect";
 import { isSqlError } from "effect/sql/SqlError";
-import { WorkerReleaseTesting } from "#testing/WorkerRelease.ts";
+import { WorkerReleaseClock } from "#WorkerReleaseClock.ts";
 import { makeWorkerRelease } from "./makeWorkerRelease.js";
 import { readPostgresRelease } from "./postgresRelease.js";
 import { releaseWorkers } from "./releaseWorkers.js";
@@ -42,7 +42,7 @@ export const coordinateWorkerRelease = Effect.fn("EffectSql.coordinateWorkerRele
     yield* loop("heartbeat", rows.heartbeat);
     yield* tick("poll", poll).pipe(Scope.provide(scope));
     yield* loop("poll", poll);
-    const testing = yield* Effect.serviceOption(WorkerReleaseTesting);
+    const testing = yield* Effect.serviceOption(WorkerReleaseClock);
     if (Option.isSome(testing)) {
         const context = yield* Effect.context();
         yield* testing.value.register({ heartbeat: rows.heartbeat, poll: poll.pipe(Effect.provideContext(context)) }).pipe(Scope.provide(scope));

package/dist/coordinateWorkerRelease.js.map

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

package/dist/defineRepository.d.ts

@@ -0,0 +1,8 @@
+import { Context, type Effect, Layer } from "effect";
+export declare function defineRepository<const TIdentifier extends string, TShape, TError, TRequirements>(definition: {
+    readonly id: TIdentifier;
+    readonly initialize: Effect.Effect<TShape, TError, TRequirements>;
+}): Context.Service<TIdentifier, TShape> & {
+    layer: Layer.Layer<TIdentifier, TError, Exclude<TRequirements, import("effect/Scope").Scope>>;
+};
+//# sourceMappingURL=defineRepository.d.ts.map

package/dist/defineRepository.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"defineRepository.d.ts","sourceRoot":"","sources":["../src/defineRepository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAErD,wBAAgB,gBAAgB,CAAC,KAAK,CAAC,WAAW,SAAS,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE;IAC7G,QAAQ,CAAC,EAAE,EAAE,WAAW,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;CAClE;;EAGA"}

package/dist/defineRepository.js

@@ -0,0 +1,6 @@
+import { Context, Layer } from "effect";
+export function defineRepository(definition) {
+    const repository = Context.Service(definition.id);
+    return Object.assign(repository, { layer: Layer.effect(repository)(definition.initialize) });
+}
+//# sourceMappingURL=defineRepository.js.map

package/dist/defineRepository.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"defineRepository.js","sourceRoot":"","sources":["../src/defineRepository.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAe,KAAK,EAAE,MAAM,QAAQ,CAAC;AAErD,MAAM,UAAU,gBAAgB,CAAkE,UAGjG;IACA,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,CAAsB,UAAU,CAAC,EAAE,CAAC,CAAC;IACvE,OAAO,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;AAC9F,CAAC"}

package/dist/releaseWorkers.js

@@ -1,11 +1,11 @@
 import { Clock, Effect, Option, Random, Schema } from "effect";
 import { SqlClient } from "effect/sql";
-import { WorkerReleaseTesting } from "#testing/WorkerRelease.ts";
+import { WorkerReleaseClock } from "#WorkerReleaseClock.ts";
 export const releaseWorkers = Effect.fn("EffectSql.releaseWorkers")(function* (release, staleMillis, table = "effect_sql_migrations") {
     const sql = yield* SqlClient.SqlClient;
     const processId = `${yield* Random.nextInt}:${yield* Random.nextInt}`;
     const workers = `${table}_workers`;
-    const testing = yield* Effect.serviceOption(WorkerReleaseTesting);
+    const testing = yield* Effect.serviceOption(WorkerReleaseClock);
     const now = Option.isSome(testing)
         ? Clock.currentTimeMillis.pipe(Effect.provideService(Clock.Clock, testing.value.clock), Effect.map((millis) => sql `${new Date(millis).toISOString()}::timestamptz`))
         : Effect.succeed(sql `clock_timestamp()`);

package/dist/releaseWorkers.js.map

@@ -1 +1 @@
-{"version":3,"file":"releaseWorkers.js","sourceRoot":"","sources":["../src/releaseWorkers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAEjE,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAC,QAAQ,CAAC,EAC5E,OAAe,EACf,WAAmB,EACnB,KAAK,GAAG,uBAAuB;IAE/B,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC;IACvC,MAAM,SAAS,GAAG,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IACtE,MAAM,OAAO,GAAG,GAAG,KAAK,UAAU,CAAC;IACnC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;IAClE,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;QACjC,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAC5B,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EACvD,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAA,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,eAAe,CAAC,CAC3E;QACF,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAA,mBAAmB,CAAC,CAAC;IAC1C,OAAO;QACN,KAAK,EAAE,GAAG,CAAC,eAAe,CACzB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC;YAC7B,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAA,uBAAuB,GAAG,CAAC,GAAG,KAAK,UAAU,CAAC,6BAA6B,CAAC,gBAAgB,CAAC,IAAI,CAC1H,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CACnG,CAAC;YACF,IAAI,KAAK,EAAE,OAAO,KAAK,OAAO,EAAE,CAAC;gBAChC,OAAO,KAAK,CAAC;YACd,CAAC;YACD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,GAAG,CAAA,0BAA0B,GAAG,CAAC,OAAO,CAAC,qBAAqB,OAAO;sBACzE,SAAS,MAAM,WAAW,6BAA6B,CAAC;YAC1E,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,OAAO,KAAK,CAAC;YACd,CAAC;YACD,KAAK,CAAC,CAAC,GAAG,CAAA,eAAe,GAAG,CAAC,OAAO,CAAC,6CAA6C,SAAS,KAAK,OAAO,KAAK,SAAS;0EAC/C,CAAC;YACvE,OAAO,IAAI,CAAC;QACb,CAAC,CAAC,CACF;QACD,SAAS,EAAE,GAAG,CAAC,IAAI,CAClB,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,GAAG,CAAA,UAAU,GAAG,CAAC,OAAO,CAAC,oBAAoB,SAAS,uBAAuB,SAAS,EAAE,CAAC,EACvH,MAAM,CAAC,MAAM,CACb;QACD,MAAM,EAAE,GAAG,CAAA,eAAe,GAAG,CAAC,OAAO,CAAC,uBAAuB,SAAS,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;KAC5F,CAAC;AACH,CAAC,CAAC,CAAC"}
+{"version":3,"file":"releaseWorkers.js","sourceRoot":"","sources":["../src/releaseWorkers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAC,QAAQ,CAAC,EAC5E,OAAe,EACf,WAAmB,EACnB,KAAK,GAAG,uBAAuB;IAE/B,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC;IACvC,MAAM,SAAS,GAAG,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,IAAI,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;IACtE,MAAM,OAAO,GAAG,GAAG,KAAK,UAAU,CAAC;IACnC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,kBAAkB,CAAC,CAAC;IAChE,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC;QACjC,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,IAAI,CAC5B,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EACvD,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAA,GAAG,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,eAAe,CAAC,CAC3E;QACF,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAA,mBAAmB,CAAC,CAAC;IAC1C,OAAO;QACN,KAAK,EAAE,GAAG,CAAC,eAAe,CACzB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC;YAC7B,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAAA,uBAAuB,GAAG,CAAC,GAAG,KAAK,UAAU,CAAC,6BAA6B,CAAC,gBAAgB,CAAC,IAAI,CAC1H,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CACnG,CAAC;YACF,IAAI,KAAK,EAAE,OAAO,KAAK,OAAO,EAAE,CAAC;gBAChC,OAAO,KAAK,CAAC;YACd,CAAC;YACD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,GAAG,CAAA,0BAA0B,GAAG,CAAC,OAAO,CAAC,qBAAqB,OAAO;sBACzE,SAAS,MAAM,WAAW,6BAA6B,CAAC;YAC1E,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,OAAO,KAAK,CAAC;YACd,CAAC;YACD,KAAK,CAAC,CAAC,GAAG,CAAA,eAAe,GAAG,CAAC,OAAO,CAAC,6CAA6C,SAAS,KAAK,OAAO,KAAK,SAAS;0EAC/C,CAAC;YACvE,OAAO,IAAI,CAAC;QACb,CAAC,CAAC,CACF;QACD,SAAS,EAAE,GAAG,CAAC,IAAI,CAClB,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,GAAG,CAAA,UAAU,GAAG,CAAC,OAAO,CAAC,oBAAoB,SAAS,uBAAuB,SAAS,EAAE,CAAC,EACvH,MAAM,CAAC,MAAM,CACb;QACD,MAAM,EAAE,GAAG,CAAA,eAAe,GAAG,CAAC,OAAO,CAAC,uBAAuB,SAAS,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;KAC5F,CAAC;AACH,CAAC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shivaedev/sql",
-  "version": "0.40.0",
+  "version": "0.41.0",
   "description": "Schema-derived repositories over native Effect SQL",
   "keywords": [
     "effect"
@@ -50,12 +50,12 @@
     "@effect/platform-node": "4.0.7",
     "@effect/sql-pg": "4.0.7",
     "@effect/sql-sqlite-node": "4.0.7",
-    "@shivaedev/contract": "0.36.1",
-    "@shivaedev/jobs": "0.37.0",
-    "@shivaedev/quality": "0.62.0",
-    "@shivaedev/test-kits": "0.5.0",
-    "@shivaedev/test-sql": "0.21.2",
-    "@shivaedev/test-story": "0.39.2",
+    "@shivaedev/contract": "0.37.0",
+    "@shivaedev/jobs": "0.37.1",
+    "@shivaedev/quality": "0.63.0",
+    "@shivaedev/test-kits": "0.6.0",
+    "@shivaedev/test-sql": "0.22.0",
+    "@shivaedev/test-story": "0.40.0",
     "@types/node": "24.19.2",
     "effect": "4.0.7",
     "typescript": "7.0.2",

package/src/{testing/WorkerRelease.ts → WorkerReleaseClock.ts}

@@ -1,8 +1,8 @@
 import { type Clock, Context, type Effect, type Schema, type Scope } from "effect";
 import type { SqlError } from "effect/sql/SqlError";
 
-export class WorkerReleaseTesting extends Context.Service<
-	WorkerReleaseTesting,
+export class WorkerReleaseClock extends Context.Service<
+	WorkerReleaseClock,
 	{
 		readonly clock: Clock.Clock;
 		readonly register: (tick: {
@@ -10,4 +10,4 @@ export class WorkerReleaseTesting extends Context.Service<
 			readonly poll: Effect.Effect<void, SqlError | Schema.SchemaError>;
 		}) => Effect.Effect<void, never, Scope.Scope>;
 	}
->()("@shivaedev/sql/testing/WorkerReleaseTesting") {}
+>()("@shivaedev/sql/WorkerReleaseClock") {}

package/src/coordinateWorkerRelease.ts

@@ -1,6 +1,6 @@
 import { Duration, Effect, Exit, Option, Predicate, Schedule, Scope } from "effect";
 import { isSqlError } from "effect/sql/SqlError";
-import { WorkerReleaseTesting } from "#testing/WorkerRelease.ts";
+import { WorkerReleaseClock } from "#WorkerReleaseClock.ts";
 import { makeWorkerRelease } from "./makeWorkerRelease.ts";
 import { readPostgresRelease } from "./postgresRelease.ts";
 import { releaseWorkers } from "./releaseWorkers.ts";
@@ -66,7 +66,7 @@ export const coordinateWorkerRelease = Effect.fn("EffectSql.coordinateWorkerRele
 	yield* loop("heartbeat", rows.heartbeat);
 	yield* tick("poll", poll).pipe(Scope.provide(scope));
 	yield* loop("poll", poll);
-	const testing = yield* Effect.serviceOption(WorkerReleaseTesting);
+	const testing = yield* Effect.serviceOption(WorkerReleaseClock);
 	if (Option.isSome(testing)) {
 		const context = yield* Effect.context<Effect.Services<typeof poll>>();
 		yield* testing.value.register({ heartbeat: rows.heartbeat, poll: poll.pipe(Effect.provideContext(context)) }).pipe(Scope.provide(scope));

package/src/defineRepository.ts

@@ -0,0 +1,9 @@
+import { Context, type Effect, Layer } from "effect";
+
+export function defineRepository<const TIdentifier extends string, TShape, TError, TRequirements>(definition: {
+	readonly id: TIdentifier;
+	readonly initialize: Effect.Effect<TShape, TError, TRequirements>;
+}) {
+	const repository = Context.Service<TIdentifier, TShape>(definition.id);
+	return Object.assign(repository, { layer: Layer.effect(repository)(definition.initialize) });
+}

package/src/releaseWorkers.ts

@@ -1,6 +1,6 @@
 import { Clock, Effect, Option, Random, Schema } from "effect";
 import { SqlClient } from "effect/sql";
-import { WorkerReleaseTesting } from "#testing/WorkerRelease.ts";
+import { WorkerReleaseClock } from "#WorkerReleaseClock.ts";
 
 export const releaseWorkers = Effect.fn("EffectSql.releaseWorkers")(function* (
 	release: string,
@@ -10,7 +10,7 @@ export const releaseWorkers = Effect.fn("EffectSql.releaseWorkers")(function* (
 	const sql = yield* SqlClient.SqlClient;
 	const processId = `${yield* Random.nextInt}:${yield* Random.nextInt}`;
 	const workers = `${table}_workers`;
-	const testing = yield* Effect.serviceOption(WorkerReleaseTesting);
+	const testing = yield* Effect.serviceOption(WorkerReleaseClock);
 	const now = Option.isSome(testing)
 		? Clock.currentTimeMillis.pipe(
 				Effect.provideService(Clock.Clock, testing.value.clock),

package/dist/testing/WorkerRelease.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"WorkerRelease.d.ts","sourceRoot":"","sources":["../../src/testing/WorkerRelease.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,MAAM,EAAE,KAAK,KAAK,EAAE,MAAM,QAAQ,CAAC;AACnF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;;oBAKlC,KAAK,CAAC,KAAK;uBACR,CAAC,IAAI,EAAE;QACzB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;QACvE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;KAClE,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC;;AAP/C,qBAAa,oBAAqB,SAAQ,yBASQ;CAAG"}

package/dist/testing/WorkerRelease.js

@@ -1,4 +0,0 @@
-import { Context } from "effect";
-export class WorkerReleaseTesting extends Context.Service()("@shivaedev/sql/testing/WorkerReleaseTesting") {
-}
-//# sourceMappingURL=WorkerRelease.js.map

package/dist/testing/WorkerRelease.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"WorkerRelease.js","sourceRoot":"","sources":["../../src/testing/WorkerRelease.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,OAAO,EAAwC,MAAM,QAAQ,CAAC;AAGnF,MAAM,OAAO,oBAAqB,SAAQ,OAAO,CAAC,OAAO,EAStD,CAAC,6CAA6C,CAAC;CAAG"}