@effect-app/infra 4.0.0-beta.109 → 4.0.0-beta.110

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @effect-app/infra
 
+## 4.0.0-beta.110
+
+### Minor Changes
+
+- c313c07: Add per-namespace in-memory SQLite adapter via LayerMap. When `makeSqlClientLayer` option is provided to `SQLiteStoreLayer`, each namespace gets its own SQLite database instance managed by a `LayerMap`. Introduces `WithNsTransaction` service for namespace-aware SQL transactions, used by `makeSqlTransactionMiddleware`.
+
+### Patch Changes
+
+- effect-app@4.0.0-beta.110
+
 ## 4.0.0-beta.109
 
 ### Patch Changes

package/dist/Store/SQL.d.ts

@@ -1,11 +1,20 @@
+import { Context, Layer } from "effect";
+import { Effect } from "effect-app";
 import { SqlClient } from "effect/unstable/sql";
 import type { FieldValues } from "../Model/filter/types.js";
 import { type PersistenceModelType, type StorageConfig, StoreMaker } from "./service.js";
+export type WithNsTransactionFn = <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>;
+declare const WithNsTransaction_base: Context.ServiceClass<WithNsTransaction, "effect-app/WithNsTransaction", WithNsTransactionFn>;
+export declare class WithNsTransaction extends WithNsTransaction_base {
+}
 /** @internal */
 export declare const parseRow: <Encoded extends FieldValues>(row: {
     id: string;
     _etag: string | null;
     data: string;
 }, idKey: PropertyKey, defaultValues: Partial<Encoded>) => PersistenceModelType<Encoded>;
-export declare function SQLiteStoreLayer(cfg: StorageConfig): import("effect/Layer").Layer<StoreMaker, never, SqlClient.SqlClient>;
+export declare function SQLiteStoreLayer(cfg: StorageConfig, options?: {
+    makeSqlClientLayer?: (namespace: string) => Layer.Layer<SqlClient.SqlClient>;
+}): Layer.Layer<StoreMaker, never, SqlClient.SqlClient>;
+export {};
 //# sourceMappingURL=SQL.d.ts.map

package/dist/Store/SQL.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SQL.d.ts","sourceRoot":"","sources":["../../src/Store/SQL.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAG/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAE3D,OAAO,EAAmB,KAAK,oBAAoB,EAAE,KAAK,aAAa,EAAgC,UAAU,EAAE,MAAM,cAAc,CAAA;AAIvI,gBAAgB;AAChB,eAAO,MAAM,QAAQ,GAAI,OAAO,SAAS,WAAW,EAClD,KAAK;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACvD,OAAO,WAAW,EAClB,eAAe,OAAO,CAAC,OAAO,CAAC,KAC9B,oBAAoB,CAAC,OAAO,CAG9B,CAAA;AA4UD,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,wEAGlD"}
+{"version":3,"file":"SQL.d.ts","sourceRoot":"","sources":["../../src/Store/SQL.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAY,MAAM,QAAQ,CAAA;AACjD,OAAO,EAAE,MAAM,EAA8C,MAAM,YAAY,CAAA;AAE/E,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAG/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAE3D,OAAO,EAAmB,KAAK,oBAAoB,EAAE,KAAK,aAAa,EAAgC,UAAU,EAAE,MAAM,cAAc,CAAA;AAIvI,MAAM,MAAM,mBAAmB,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;;AAErG,qBAAa,iBACX,SAAQ,sBAAyF;CACjG;AAEF,gBAAgB;AAChB,eAAO,MAAM,QAAQ,GAAI,OAAO,SAAS,WAAW,EAClD,KAAK;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACvD,OAAO,WAAW,EAClB,eAAe,OAAO,CAAC,OAAO,CAAC,KAC9B,oBAAoB,CAAC,OAAO,CAG9B,CAAA;AAonBD,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,aAAa,EAClB,OAAO,CAAC,EAAE;IAAE,kBAAkB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;CAAE,uDA2B3F"}

package/dist/Store/SQL.js

@@ -1,4 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
+import { Context, Layer, LayerMap } from "effect";
 import { Effect, Option, Struct } from "effect-app";
 import { toNonEmptyArray } from "effect-app/Array";
 import { SqlClient } from "effect/unstable/sql";
@@ -8,6 +9,8 @@ import { storeId } from "./Memory.js";
 import { StoreMaker } from "./service.js";
 import { buildWhereSQLQuery, logQuery, sqliteDialect } from "./SQL/query.js";
 import { makeETag } from "./utils.js";
+export class WithNsTransaction extends Context.Service()("effect-app/WithNsTransaction") {
+}
 /** @internal */
 export const parseRow = (row, idKey, defaultValues) => {
     const data = (typeof row.data === "string" ? JSON.parse(row.data) : row.data);
@@ -205,8 +208,163 @@ function makeSQLStoreInt(dialect, jsonColumnType) {
         };
     });
 }
-export function SQLiteStoreLayer(cfg) {
+function makeSQLiteStorePerNs(withNsSql, { prefix }) {
+    return {
+        make: (name, idKey, seed, config) => Effect.gen(function* () {
+            const tableName = `${prefix}${name}`;
+            const defaultValues = config?.defaultValues ?? {};
+            const resolveNamespace = !config?.allowNamespace
+                ? Effect.succeed("primary")
+                : storeId.asEffect().pipe(Effect.map((namespace) => {
+                    if (namespace !== "primary" && !config.allowNamespace(namespace)) {
+                        throw new Error(`Namespace ${namespace} not allowed!`);
+                    }
+                    return namespace;
+                }));
+            const toRow = (e) => {
+                const newE = makeETag(e);
+                const id = newE[idKey];
+                const { _etag, [idKey]: _id, ...rest } = newE;
+                const data = JSON.stringify(rest);
+                return { id, _etag: newE._etag, data, item: newE };
+            };
+            const exec = (ns, query, params) => withNsSql(ns, (sql) => sql.unsafe(query, params).pipe(Effect.orDie));
+            const ensureTable = (ns) => exec(ns, `CREATE TABLE IF NOT EXISTS "${tableName}" (id TEXT NOT NULL PRIMARY KEY, _etag TEXT, data JSON NOT NULL)`);
+            const seedMarkerId = `__seed_marker__`;
+            const setInternal = (e, ns) => Effect.gen(function* () {
+                const row = toRow(e);
+                if (e._etag) {
+                    yield* exec(ns, `UPDATE "${tableName}" SET _etag = ?, data = ? WHERE id = ? AND _etag = ?`, [row._etag, row.data, row.id, e._etag]);
+                    const existing = yield* exec(ns, `SELECT _etag FROM "${tableName}" WHERE id = ?`, [row.id]);
+                    const current = existing[0];
+                    if (!current || current._etag !== row._etag) {
+                        if (current) {
+                            return yield* new OptimisticConcurrencyException({
+                                type: name,
+                                id: row.id,
+                                current: current._etag,
+                                found: e._etag,
+                                code: 412
+                            });
+                        }
+                        return yield* new OptimisticConcurrencyException({
+                            type: name,
+                            id: row.id,
+                            current: "",
+                            found: e._etag,
+                            code: 404
+                        });
+                    }
+                }
+                else {
+                    yield* exec(ns, `INSERT INTO "${tableName}" (id, _etag, data) VALUES (?, ?, ?)`, [row.id, row._etag, row.data]);
+                }
+                return row.item;
+            });
+            const bulkSetInternal = (items, ns) => withNsSql(ns, (sql) => sql
+                .withTransaction(Effect.forEach(items, (e) => setInternal(e, ns)))
+                .pipe(Effect.orDie, Effect.map((_) => _)));
+            const ctx = yield* Effect.context();
+            const seedCache = new Map();
+            const makeSeedEffect = (ns) => exec(ns, `SELECT id FROM "${tableName}" WHERE id = ?`, [seedMarkerId])
+                .pipe(Effect.flatMap((existing) => {
+                if (existing.length > 0)
+                    return Effect.void;
+                return InfraLogger.logInfo(`Seeding data for ${name} (namespace: ${ns})`).pipe(Effect.andThen(seed), Effect.flatMap((items) => Effect.flatMapOption(Effect.succeed(toNonEmptyArray([...items])), (a) => bulkSetInternal(a, ns))), Effect.andThen(exec(ns, `INSERT INTO "${tableName}" (id, _etag, data) VALUES (?, ?, ?)`, [seedMarkerId, null, JSON.stringify({ _marker: true })])), Effect.provide(ctx), Effect.orDie);
+            }));
+            const seedNamespace = Effect.fn("seedNamespace")(function* (ns) {
+                yield* ensureTable(ns);
+                if (!seed)
+                    return;
+                let cached = seedCache.get(ns);
+                if (!cached) {
+                    cached = yield* Effect.cached(makeSeedEffect(ns));
+                    seedCache.set(ns, cached);
+                }
+                yield* cached;
+            });
+            const resolveAndSeed = resolveNamespace.pipe(Effect.tap((ns) => seedNamespace(ns)));
+            const s = {
+                all: resolveAndSeed.pipe(Effect.flatMap((ns) => exec(ns, `SELECT id, _etag, data FROM "${tableName}"`)
+                    .pipe(Effect.map((rows) => rows.map((r) => parseRow(r, idKey, defaultValues))), Effect.withSpan("SQLite.all [effect-app/infra/Store]", {
+                    attributes: {
+                        "repository.table_name": tableName,
+                        "repository.model_name": name,
+                        "repository.namespace": ns
+                    }
+                }, { captureStackTrace: false })))),
+                find: (id) => resolveAndSeed.pipe(Effect.flatMap((ns) => exec(ns, `SELECT id, _etag, data FROM "${tableName}" WHERE id = ?`, [id])
+                    .pipe(Effect.map((rows) => {
+                    const row = rows[0];
+                    return row
+                        ? Option.some(parseRow(row, idKey, defaultValues))
+                        : Option.none();
+                }), Effect.withSpan("SQLite.find [effect-app/infra/Store]", {
+                    attributes: { "repository.table_name": tableName, "repository.model_name": name, id }
+                }, { captureStackTrace: false })))),
+                filter: (f) => {
+                    const filter = f
+                        .filter;
+                    return resolveAndSeed
+                        .pipe(Effect
+                        .flatMap((ns) => Effect
+                        .sync(() => buildWhereSQLQuery(sqliteDialect, idKey, filter ? [{ t: "where-scope", result: filter, relation: "some" }] : [], tableName, defaultValues, f
+                        .select, f
+                        .order, f
+                        .skip, f
+                        .limit))
+                        .pipe(Effect
+                        .tap((q) => logQuery(q)), Effect.flatMap((q) => exec(ns, q.sql, q.params).pipe(Effect.map((rows) => {
+                        if (f.select) {
+                            return rows.map((r) => {
+                                const selected = parseSelectRow(r, idKey);
+                                return {
+                                    ...Struct.pick(defaultValues, f.select.filter((_) => typeof _ === "string")),
+                                    ...selected
+                                };
+                            });
+                        }
+                        return rows.map((r) => parseRow(r, idKey, defaultValues));
+                    }))), Effect.withSpan("SQLite.filter [effect-app/infra/Store]", {
+                        attributes: { "repository.table_name": tableName, "repository.model_name": name }
+                    }, { captureStackTrace: false }))));
+                },
+                set: (e) => resolveAndSeed.pipe(Effect.flatMap((ns) => setInternal(e, ns).pipe(Effect.withSpan("SQLite.set [effect-app/infra/Store]", {
+                    attributes: { "repository.table_name": tableName, "repository.model_name": name, id: e[idKey] }
+                }, { captureStackTrace: false })))),
+                batchSet: (items) => resolveAndSeed.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns).pipe(Effect.withSpan("SQLite.batchSet [effect-app/infra/Store]", {
+                    attributes: { "repository.table_name": tableName, "repository.model_name": name }
+                }, { captureStackTrace: false })))),
+                bulkSet: (items) => resolveAndSeed.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns).pipe(Effect.withSpan("SQLite.bulkSet [effect-app/infra/Store]", {
+                    attributes: { "repository.table_name": tableName, "repository.model_name": name }
+                }, { captureStackTrace: false })))),
+                batchRemove: (ids) => {
+                    const placeholders = ids.map(() => "?").join(", ");
+                    return resolveAndSeed.pipe(Effect.flatMap((ns) => exec(ns, `DELETE FROM "${tableName}" WHERE id IN (${placeholders})`, [...ids])
+                        .pipe(Effect.asVoid, Effect.withSpan("SQLite.batchRemove [effect-app/infra/Store]", {
+                        attributes: { "repository.table_name": tableName, "repository.model_name": name }
+                    }, { captureStackTrace: false }))));
+                },
+                queryRaw: (query) => s.all.pipe(Effect.map(query.memory), Effect.withSpan("SQLite.queryRaw [effect-app/infra/Store]", {
+                    attributes: { "repository.table_name": tableName, "repository.model_name": name }
+                }, { captureStackTrace: false }))
+            };
+            yield* seedNamespace("primary");
+            return s;
+        })
+    };
+}
+export function SQLiteStoreLayer(cfg, options) {
+    if (options?.makeSqlClientLayer) {
+        return Layer.effectContext(Effect.gen(function* () {
+            const layerMap = yield* LayerMap.make((namespace) => options.makeSqlClientLayer(namespace), { idleTimeToLive: "10 minutes" });
+            const withNsSql = (ns, f) => SqlClient.SqlClient.use(f).pipe(Effect.provide(layerMap.get(ns)));
+            const storeMaker = makeSQLiteStorePerNs(withNsSql, cfg);
+            const withTransaction = (effect) => storeId.asEffect().pipe(Effect.flatMap((ns) => withNsSql(ns, (sql) => sql.withTransaction(effect).pipe(Effect.orDie))));
+            return StoreMaker.serviceMap(storeMaker).pipe(Context.add(WithNsTransaction, withTransaction));
+        }));
+    }
     return StoreMaker
         .toLayer(makeSQLStoreInt(sqliteDialect, "JSON")(cfg));
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SQL.js","sourceRoot":"","sources":["../../src/Store/SQL.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SQL.js","sourceRoot":"","sources":["../../src/Store/SQL.ts"],"names":[],"mappings":"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"}

package/dist/Store/index.d.ts

@@ -1,5 +1,8 @@
 import { Layer } from "effect-app";
+import type { SqlClient } from "effect/unstable/sql";
 import type { StorageConfig } from "./service.js";
-export declare function StoreMakerLayer(cfg: StorageConfig): Layer.Layer<import("./service.js").StoreMaker, never, import("effect/unstable/sql/SqlClient").SqlClient>;
+export declare function StoreMakerLayer(cfg: StorageConfig, options?: {
+    makeSqlClientLayer?: (namespace: string) => Layer.Layer<SqlClient.SqlClient>;
+}): Layer.Layer<import("./service.js").StoreMaker, never, SqlClient.SqlClient>;
 export * from "./service.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/Store/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Store/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,KAAK,EAAY,MAAM,YAAY,CAAA;AAKpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAIjD,wBAAgB,eAAe,CAAC,GAAG,EAAE,aAAa,4GA8BjD;AAED,cAAc,cAAc,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Store/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,KAAK,EAAY,MAAM,YAAY,CAAA;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAKpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAIjD,wBAAgB,eAAe,CAC7B,GAAG,EAAE,aAAa,EAClB,OAAO,CAAC,EAAE;IAAE,kBAAkB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;CAAE,8EA+B3F;AAED,cAAc,cAAc,CAAA"}

package/dist/Store/index.js

@@ -5,7 +5,7 @@ import { DiskStoreLayer } from "./Disk.js";
 import { MemoryStoreLive } from "./Memory.js";
 import { SQLiteStoreLayer } from "./SQL.js";
 import { PgStoreLayer } from "./SQL/Pg.js";
-export function StoreMakerLayer(cfg) {
+export function StoreMakerLayer(cfg, options) {
     return Effect
         .sync(() => {
         const storageUrl = Redacted.value(cfg.url);
@@ -20,7 +20,7 @@ export function StoreMakerLayer(cfg) {
         }
         if (storageUrl.startsWith("sqlite://")) {
             console.log("Using SQLite store");
-            return SQLiteStoreLayer(cfg);
+            return SQLiteStoreLayer(cfg, options);
         }
         if (storageUrl.startsWith("pg://")) {
             console.log("Using PostgreSQL store");
@@ -36,4 +36,4 @@ export function StoreMakerLayer(cfg) {
         .pipe(Layer.unwrap);
 }
 export * from "./service.js";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU3RvcmUvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsdURBQXVEO0FBQ3ZELE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUNwRCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFDOUMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLFdBQVcsQ0FBQTtBQUMxQyxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sYUFBYSxDQUFBO0FBRzdDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLFVBQVUsQ0FBQTtBQUMzQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sYUFBYSxDQUFBO0FBRTFDLE1BQU0sVUFBVSxlQUFlLENBQUMsR0FBa0I7SUFDaEQsT0FBTyxNQUFNO1NBQ1YsSUFBSSxDQUFDLEdBQUcsRUFBRTtRQUNULE1BQU0sVUFBVSxHQUFHLFFBQVEsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQzFDLElBQUksVUFBVSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsRUFBRSxDQUFDO1lBQ3BDLE9BQU8sQ0FBQyxHQUFHLENBQUMsdUJBQXVCLENBQUMsQ0FBQTtZQUNwQyxPQUFPLGVBQWUsQ0FBQTtRQUN4QixDQUFDO1FBQ0QsSUFBSSxVQUFVLENBQUMsVUFBVSxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUM7WUFDckMsTUFBTSxHQUFHLEdBQUcsVUFBVSxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUUsRUFBRSxDQUFDLENBQUE7WUFDN0MsT0FBTyxDQUFDLEdBQUcsQ0FBQyxzQkFBc0IsR0FBRyxHQUFHLENBQUMsQ0FBQTtZQUN6QyxPQUFPLGNBQWMsQ0FBQyxHQUFHLEVBQUUsR0FBRyxDQUFDLENBQUE7UUFDakMsQ0FBQztRQUNELElBQUksVUFBVSxDQUFDLFVBQVUsQ0FBQyxXQUFXLENBQUMsRUFBRSxDQUFDO1lBQ3ZDLE9BQU8sQ0FBQyxHQUFHLENBQUMsb0JBQW9CLENBQUMsQ0FBQTtZQUNqQyxPQUFPLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQzlCLENBQUM7UUFDRCxJQUFJLFVBQVUsQ0FBQyxVQUFVLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQztZQUNuQyxPQUFPLENBQUMsR0FBRyxDQUFDLHdCQUF3QixDQUFDLENBQUE7WUFDckMsT0FBTyxZQUFZLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDMUIsQ0FBQztRQUNELDJDQUEyQztRQUMzQyxxQ0FBcUM7UUFDckMsZ0NBQWdDO1FBQ2hDLElBQUk7UUFFSixPQUFPLENBQUMsR0FBRyxDQUFDLHVCQUF1QixDQUFDLENBQUE7UUFDcEMsT0FBTyxnQkFBZ0IsQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUM5QixDQUFDLENBQUM7U0FDRCxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0FBQ3ZCLENBQUM7QUFFRCxjQUFjLGNBQWMsQ0FBQSJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU3RvcmUvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsdURBQXVEO0FBQ3ZELE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUVwRCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFDOUMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLFdBQVcsQ0FBQTtBQUMxQyxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sYUFBYSxDQUFBO0FBRzdDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLFVBQVUsQ0FBQTtBQUMzQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sYUFBYSxDQUFBO0FBRTFDLE1BQU0sVUFBVSxlQUFlLENBQzdCLEdBQWtCLEVBQ2xCLE9BQTBGO0lBRTFGLE9BQU8sTUFBTTtTQUNWLElBQUksQ0FBQyxHQUFHLEVBQUU7UUFDVCxNQUFNLFVBQVUsR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUMxQyxJQUFJLFVBQVUsQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQztZQUNwQyxPQUFPLENBQUMsR0FBRyxDQUFDLHVCQUF1QixDQUFDLENBQUE7WUFDcEMsT0FBTyxlQUFlLENBQUE7UUFDeEIsQ0FBQztRQUNELElBQUksVUFBVSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDO1lBQ3JDLE1BQU0sR0FBRyxHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLEVBQUUsQ0FBQyxDQUFBO1lBQzdDLE9BQU8sQ0FBQyxHQUFHLENBQUMsc0JBQXNCLEdBQUcsR0FBRyxDQUFDLENBQUE7WUFDekMsT0FBTyxjQUFjLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFBO1FBQ2pDLENBQUM7UUFDRCxJQUFJLFVBQVUsQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQztZQUN2QyxPQUFPLENBQUMsR0FBRyxDQUFDLG9CQUFvQixDQUFDLENBQUE7WUFDakMsT0FBTyxnQkFBZ0IsQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDLENBQUE7UUFDdkMsQ0FBQztRQUNELElBQUksVUFBVSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1lBQ25DLE9BQU8sQ0FBQyxHQUFHLENBQUMsd0JBQXdCLENBQUMsQ0FBQTtZQUNyQyxPQUFPLFlBQVksQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUMxQixDQUFDO1FBQ0QsMkNBQTJDO1FBQzNDLHFDQUFxQztRQUNyQyxnQ0FBZ0M7UUFDaEMsSUFBSTtRQUVKLE9BQU8sQ0FBQyxHQUFHLENBQUMsdUJBQXVCLENBQUMsQ0FBQTtRQUNwQyxPQUFPLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQzlCLENBQUMsQ0FBQztTQUNELElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUE7QUFDdkIsQ0FBQztBQUVELGNBQWMsY0FBYyxDQUFBIn0=

package/dist/api/routing/middleware/middleware.d.ts

@@ -2,7 +2,7 @@ import { Config, Effect, Layer, Schema } from "effect";
 import { ConfigureInterruptibilityMiddleware, DevModeMiddleware, LoggerMiddleware, RequestCacheMiddleware } from "effect-app/middleware";
 import { RpcContextMap, type RpcMiddleware } from "effect-app/rpc";
 import { type Rpc } from "effect/unstable/rpc";
-import { SqlClient } from "effect/unstable/sql";
+import { WithNsTransaction } from "../../../Store/SQL.js";
 export declare const DevModeLive: Layer.Layer<never, Config.ConfigError, never>;
 export declare const RequestCacheMiddlewareLive: Layer.Layer<RequestCacheMiddleware, never, never>;
 export declare const ConfigureInterruptibilityMiddlewareLive: Layer.Layer<ConfigureInterruptibilityMiddleware, never, never>;
@@ -24,7 +24,7 @@ export declare const DefaultGenericMiddlewaresLive: Layer.Layer<RequestCacheMidd
 export declare const requiresTransactionConfig: RpcContextMap.RpcContextMap.Custom<never, Schema.Never, boolean>;
 /**
  * Creates the middleware Effect for SQL transaction wrapping.
- * Requires `SqlClient` directly (not via serviceOption).
+ * Requires `WithNsTransaction` service.
  * Reads `requiresTransaction` from the RPC config; defaults to `false`.
  *
  * @example
@@ -39,5 +39,5 @@ export declare const makeSqlTransactionMiddleware: (rcm: {
     getConfig: (rpc: Rpc.AnyWithProps) => {
         readonly requiresTransaction?: boolean;
     };
-}) => Effect.Effect<RpcMiddleware.RpcMiddlewareV4<never, never, never>, never, SqlClient.SqlClient>;
+}) => Effect.Effect<RpcMiddleware.RpcMiddlewareV4<never, never, never>, never, WithNsTransaction>;
 //# sourceMappingURL=middleware.d.ts.map

package/dist/api/routing/middleware/middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../../src/api/routing/middleware/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC7D,OAAO,EAAE,mCAAmC,EAAW,iBAAiB,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AACjJ,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAElE,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAS/C,eAAO,MAAM,WAAW,+CAMvB,CAAA;AAED,eAAO,MAAM,0BAA0B,mDAGtC,CAAA;AAKD,eAAO,MAAM,uCAAuC,gEAqBnD,CAAA;AAED,eAAO,MAAM,oBAAoB,0DA2DE,CAAA;AAEnC,eAAO,MAAM,qBAAqB,2DAQC,CAAA;AAEnC,eAAO,MAAM,6BAA6B,6IAKzC,CAAA;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,yBAAyB,kEAA6D,CAAA;AAEnG;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,4BAA4B,GACvC,KAAK;IAAE,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,YAAY,KAAK;QAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAA;KAAE,CAAA;CAAE,kGAUvF,CAAA"}
+{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../../../src/api/routing/middleware/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC7D,OAAO,EAAE,mCAAmC,EAAW,iBAAiB,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AACjJ,OAAO,EAAE,aAAa,EAAE,KAAK,aAAa,EAAE,MAAM,gBAAgB,CAAA;AAElE,OAAO,EAAE,KAAK,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAG9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAOzD,eAAO,MAAM,WAAW,+CAMvB,CAAA;AAED,eAAO,MAAM,0BAA0B,mDAGtC,CAAA;AAKD,eAAO,MAAM,uCAAuC,gEAqBnD,CAAA;AAED,eAAO,MAAM,oBAAoB,0DA2DE,CAAA;AAEnC,eAAO,MAAM,qBAAqB,2DAQC,CAAA;AAEnC,eAAO,MAAM,6BAA6B,6IAKzC,CAAA;AAED;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,yBAAyB,kEAA6D,CAAA;AAEnG;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,4BAA4B,GACvC,KAAK;IAAE,SAAS,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,YAAY,KAAK;QAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAA;KAAE,CAAA;CAAE,gGAUvF,CAAA"}

package/dist/api/routing/middleware/middleware.js

@@ -3,9 +3,9 @@ import { Cause, Config, Effect, Layer, Schema } from "effect";
 import { ConfigureInterruptibilityMiddleware, DevMode, DevModeMiddleware, LoggerMiddleware, RequestCacheMiddleware } from "effect-app/middleware";
 import { RpcContextMap } from "effect-app/rpc";
 import { pretty } from "effect-app/utils";
-import { SqlClient } from "effect/unstable/sql";
 import { logError, reportError } from "../../../errorReporter.js";
 import { InfraLogger } from "../../../logger.js";
+import { WithNsTransaction } from "../../../Store/SQL.js";
 import { determineMethod, isCommand } from "../utils.js";
 const logRequestError = logError("Request");
 const reportRequestError = reportError("Request");
@@ -106,7 +106,7 @@ export const DefaultGenericMiddlewaresLive = Layer.mergeAll(RequestCacheMiddlewa
 export const requiresTransactionConfig = RpcContextMap.makeCustom()(Schema.Never, false);
 /**
  * Creates the middleware Effect for SQL transaction wrapping.
- * Requires `SqlClient` directly (not via serviceOption).
+ * Requires `WithNsTransaction` service.
  * Reads `requiresTransaction` from the RPC config; defaults to `false`.
  *
  * @example
@@ -118,13 +118,13 @@ export const requiresTransactionConfig = RpcContextMap.makeCustom()(Schema.Never
  * ```
  */
 export const makeSqlTransactionMiddleware = (rcm) => Effect.gen(function* () {
-    const sql = yield* SqlClient.SqlClient;
+    const withTx = yield* WithNsTransaction;
     const mw = (effect, { rpc }) => {
         const { requiresTransaction } = rcm.getConfig(rpc);
         if (requiresTransaction !== true)
             return effect;
-        return sql.withTransaction(effect).pipe(Effect.orDie);
+        return withTx(effect);
     };
     return mw;
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hcGkvcm91dGluZy9taWRkbGV3YXJlL21pZGRsZXdhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsdURBQXVEO0FBQ3ZELE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFBUSxDQUFBO0FBQzdELE9BQU8sRUFBRSxtQ0FBbUMsRUFBRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsZ0JBQWdCLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQTtBQUNqSixPQUFPLEVBQUUsYUFBYSxFQUFzQixNQUFNLGdCQUFnQixDQUFBO0FBQ2xFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUV6QyxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0scUJBQXFCLENBQUE7QUFDL0MsT0FBTyxFQUFFLFFBQVEsRUFBRSxXQUFXLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQTtBQUNqRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDaEQsT0FBTyxFQUFFLGVBQWUsRUFBRSxTQUFTLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFFeEQsTUFBTSxlQUFlLEdBQUcsUUFBUSxDQUFDLFNBQVMsQ0FBQyxDQUFBO0FBQzNDLE1BQU0sa0JBQWtCLEdBQUcsV0FBVyxDQUFDLFNBQVMsQ0FBQyxDQUFBO0FBRWpELHdEQUF3RDtBQUN4RCxNQUFNLENBQUMsTUFBTSxXQUFXLEdBQUcsS0FBSyxDQUFDLE1BQU0sQ0FDckMsT0FBTyxFQUNQLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO0lBQ2xCLE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxXQUFXLENB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL3NyYy9hcGkvcm91dGluZy9taWRkbGV3YXJlL21pZGRsZXdhcmUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsdURBQXVEO0FBQ3ZELE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFBUSxDQUFBO0FBQzdELE9BQU8sRUFBRSxtQ0FBbUMsRUFBRSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsZ0JBQWdCLEVBQUUsc0JBQXNCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQTtBQUNqSixPQUFPLEVBQUUsYUFBYSxFQUFzQixNQUFNLGdCQUFnQixDQUFBO0FBQ2xFLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUV6QyxPQUFPLEVBQUUsUUFBUSxFQUFFLFdBQVcsRUFBRSxNQUFNLDJCQUEyQixDQUFBO0FBQ2pFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUNoRCxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsTUFBTSx1QkFBdUIsQ0FBQTtBQUN6RCxPQUFPLEVBQUUsZUFBZSxFQUFFLFNBQVMsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUV4RCxNQUFNLGVBQWUsR0FBRyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQUE7QUFDM0MsTUFBTSxrQkFBa0IsR0FBRyxXQUFXLENBQUMsU0FBUyxDQUFDLENBQUE7QUFFakQsd0RBQXdEO0FBQ3hELE1BQU0sQ0FBQyxNQUFNLFdBQVcsR0FBRyxLQUFLLENBQUMsTUFBTSxDQUNyQyxPQUFPLEVBQ1AsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUM7SUFDbEIsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFdBQVcs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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "4.0.0-beta.109",
+  "version": "4.0.0-beta.110",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -13,7 +13,7 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "7.0.1",
     "query-string": "^9.3.1",
-    "effect-app": "4.0.0-beta.109"
+    "effect-app": "4.0.0-beta.110"
   },
   "devDependencies": {
     "@azure/cosmos": "^4.9.2",

package/src/Store/SQL.ts

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
+import { Context, Layer, LayerMap } from "effect"
 import { Effect, type NonEmptyReadonlyArray, Option, Struct } from "effect-app"
 import { toNonEmptyArray } from "effect-app/Array"
 import { SqlClient } from "effect/unstable/sql"
@@ -11,6 +12,12 @@ import { type FilterArgs, type PersistenceModelType, type StorageConfig, type St
 import { buildWhereSQLQuery, logQuery, type SQLDialect, sqliteDialect } from "./SQL/query.js"
 import { makeETag } from "./utils.js"
 
+export type WithNsTransactionFn = <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
+
+export class WithNsTransaction
+  extends Context.Service<WithNsTransaction, WithNsTransactionFn>()("effect-app/WithNsTransaction")
+{}
+
 /** @internal */
 export const parseRow = <Encoded extends FieldValues>(
   row: { id: string; _etag: string | null; data: string },
@@ -351,7 +358,329 @@ function makeSQLStoreInt(dialect: SQLDialect, jsonColumnType: string) {
     })
 }
 
-export function SQLiteStoreLayer(cfg: StorageConfig) {
+type WithNsSqlFn = <A, E2, R2>(
+  ns: string,
+  f: (sql: SqlClient.SqlClient) => Effect.Effect<A, E2, R2>
+) => Effect.Effect<A, E2, R2>
+
+function makeSQLiteStorePerNs(
+  withNsSql: WithNsSqlFn,
+  { prefix }: StorageConfig
+) {
+  return {
+    make: <IdKey extends keyof Encoded, Encoded extends FieldValues, R = never, E = never>(
+      name: string,
+      idKey: IdKey,
+      seed?: Effect.Effect<Iterable<Encoded>, E, R>,
+      config?: StoreConfig<Encoded>
+    ) =>
+      Effect.gen(function*() {
+        type PM = PersistenceModelType<Encoded>
+        const tableName = `${prefix}${name}`
+        const defaultValues = config?.defaultValues ?? {}
+
+        const resolveNamespace = !config?.allowNamespace
+          ? Effect.succeed("primary")
+          : storeId.asEffect().pipe(Effect.map((namespace) => {
+            if (namespace !== "primary" && !config.allowNamespace!(namespace)) {
+              throw new Error(`Namespace ${namespace} not allowed!`)
+            }
+            return namespace
+          }))
+
+        const toRow = (e: PM) => {
+          const newE = makeETag(e)
+          const id = newE[idKey] as string
+          const { _etag, [idKey]: _id, ...rest } = newE as any
+          const data = JSON.stringify(rest)
+          return { id, _etag: newE._etag!, data, item: newE }
+        }
+
+        const exec = (ns: string, query: string, params?: readonly unknown[]) =>
+          withNsSql(ns, (sql) => sql.unsafe(query, params as any).pipe(Effect.orDie))
+
+        const ensureTable = (ns: string) =>
+          exec(
+            ns,
+            `CREATE TABLE IF NOT EXISTS "${tableName}" (id TEXT NOT NULL PRIMARY KEY, _etag TEXT, data JSON NOT NULL)`
+          )
+
+        const seedMarkerId = `__seed_marker__`
+
+        const setInternal = (e: PM, ns: string) =>
+          Effect.gen(function*() {
+            const row = toRow(e)
+            if (e._etag) {
+              yield* exec(
+                ns,
+                `UPDATE "${tableName}" SET _etag = ?, data = ? WHERE id = ? AND _etag = ?`,
+                [row._etag, row.data, row.id, e._etag]
+              )
+              const existing = yield* exec(
+                ns,
+                `SELECT _etag FROM "${tableName}" WHERE id = ?`,
+                [row.id]
+              )
+              const current = (existing as any[])[0]
+              if (!current || current._etag !== row._etag) {
+                if (current) {
+                  return yield* new OptimisticConcurrencyException({
+                    type: name,
+                    id: row.id,
+                    current: current._etag,
+                    found: e._etag,
+                    code: 412
+                  })
+                }
+                return yield* new OptimisticConcurrencyException({
+                  type: name,
+                  id: row.id,
+                  current: "",
+                  found: e._etag,
+                  code: 404
+                })
+              }
+            } else {
+              yield* exec(
+                ns,
+                `INSERT INTO "${tableName}" (id, _etag, data) VALUES (?, ?, ?)`,
+                [row.id, row._etag, row.data]
+              )
+            }
+            return row.item
+          })
+
+        const bulkSetInternal = (items: NonEmptyReadonlyArray<PM>, ns: string) =>
+          withNsSql(ns, (sql) =>
+            sql
+              .withTransaction(Effect.forEach(items, (e) => setInternal(e, ns)))
+              .pipe(
+                Effect.orDie,
+                Effect.map((_) => _ as unknown as NonEmptyReadonlyArray<PM>)
+              ))
+
+        const ctx = yield* Effect.context<R>()
+        const seedCache = new Map<string, Effect.Effect<void>>()
+        const makeSeedEffect = (ns: string) =>
+          exec(
+            ns,
+            `SELECT id FROM "${tableName}" WHERE id = ?`,
+            [seedMarkerId]
+          )
+            .pipe(
+              Effect.flatMap((existing) => {
+                if ((existing as any[]).length > 0) return Effect.void
+                return InfraLogger.logInfo(`Seeding data for ${name} (namespace: ${ns})`).pipe(
+                  Effect.andThen(seed!),
+                  Effect.flatMap((items) =>
+                    Effect.flatMapOption(
+                      Effect.succeed(toNonEmptyArray([...items])),
+                      (a) => bulkSetInternal(a, ns)
+                    )
+                  ),
+                  Effect.andThen(
+                    exec(
+                      ns,
+                      `INSERT INTO "${tableName}" (id, _etag, data) VALUES (?, ?, ?)`,
+                      [seedMarkerId, null, JSON.stringify({ _marker: true })]
+                    )
+                  ),
+                  Effect.provide(ctx),
+                  Effect.orDie
+                )
+              })
+            )
+        const seedNamespace = Effect.fn("seedNamespace")(function*(ns: string) {
+          yield* ensureTable(ns)
+          if (!seed) return
+          let cached = seedCache.get(ns)
+          if (!cached) {
+            cached = yield* Effect.cached(makeSeedEffect(ns))
+            seedCache.set(ns, cached)
+          }
+          yield* cached
+        })
+        const resolveAndSeed = resolveNamespace.pipe(
+          Effect.tap((ns) => seedNamespace(ns))
+        )
+
+        const s: Store<IdKey, Encoded> = {
+          all: resolveAndSeed.pipe(Effect.flatMap((ns) =>
+            exec(ns, `SELECT id, _etag, data FROM "${tableName}"`)
+              .pipe(
+                Effect.map((rows) => (rows as any[]).map((r) => parseRow<Encoded>(r, idKey, defaultValues))),
+                Effect.withSpan("SQLite.all [effect-app/infra/Store]", {
+                  attributes: {
+                    "repository.table_name": tableName,
+                    "repository.model_name": name,
+                    "repository.namespace": ns
+                  }
+                }, { captureStackTrace: false })
+              )
+          )),
+
+          find: (id) =>
+            resolveAndSeed.pipe(Effect.flatMap((ns) =>
+              exec(ns, `SELECT id, _etag, data FROM "${tableName}" WHERE id = ?`, [id])
+                .pipe(
+                  Effect.map((rows) => {
+                    const row = (rows as any[])[0]
+                    return row
+                      ? Option.some(parseRow<Encoded>(row, idKey, defaultValues))
+                      : Option.none()
+                  }),
+                  Effect.withSpan("SQLite.find [effect-app/infra/Store]", {
+                    attributes: { "repository.table_name": tableName, "repository.model_name": name, id }
+                  }, { captureStackTrace: false })
+                )
+            )),
+
+          filter: <U extends keyof Encoded = never>(f: FilterArgs<Encoded, U>) => {
+            const filter = f
+              .filter
+            type M = U extends undefined ? Encoded
+              : Pick<Encoded, U>
+            return resolveAndSeed
+              .pipe(Effect
+                .flatMap((ns) =>
+                  Effect
+                    .sync(() =>
+                      buildWhereSQLQuery(
+                        sqliteDialect,
+                        idKey,
+                        filter ? [{ t: "where-scope", result: filter, relation: "some" }] : [],
+                        tableName,
+                        defaultValues,
+                        f
+                          .select as
+                            | NonEmptyReadonlyArray<string | { key: string; subKeys: readonly string[] }>
+                            | undefined,
+                        f
+                          .order as NonEmptyReadonlyArray<{ key: string; direction: "ASC" | "DESC" }> | undefined,
+                        f
+                          .skip,
+                        f
+                          .limit
+                      )
+                    )
+                    .pipe(
+                      Effect
+                        .tap((q) =>
+                          logQuery(q)
+                        ),
+                      Effect.flatMap((q) =>
+                        exec(ns, q.sql, q.params).pipe(
+                          Effect.map((rows) => {
+                            if (f.select) {
+                              return (rows as any[]).map((r) => {
+                                const selected = parseSelectRow(r, idKey)
+                                return {
+                                  ...Struct.pick(
+                                    defaultValues as any,
+                                    f.select!.filter((_) => typeof _ === "string") as never[]
+                                  ),
+                                  ...selected
+                                } as M
+                              })
+                            }
+                            return (rows as any[]).map((r) => parseRow<Encoded>(r, idKey, defaultValues) as any as M)
+                          })
+                        )
+                      ),
+                      Effect.withSpan("SQLite.filter [effect-app/infra/Store]", {
+                        attributes: { "repository.table_name": tableName, "repository.model_name": name }
+                      }, { captureStackTrace: false })
+                    )
+                ))
+          },
+
+          set: (e) =>
+            resolveAndSeed.pipe(Effect.flatMap((ns) =>
+              setInternal(e, ns).pipe(
+                Effect.withSpan("SQLite.set [effect-app/infra/Store]", {
+                  attributes: { "repository.table_name": tableName, "repository.model_name": name, id: e[idKey] }
+                }, { captureStackTrace: false })
+              )
+            )),
+
+          batchSet: (items) =>
+            resolveAndSeed.pipe(Effect.flatMap((ns) =>
+              bulkSetInternal(items, ns).pipe(
+                Effect.withSpan("SQLite.batchSet [effect-app/infra/Store]", {
+                  attributes: { "repository.table_name": tableName, "repository.model_name": name }
+                }, { captureStackTrace: false })
+              )
+            )),
+
+          bulkSet: (items) =>
+            resolveAndSeed.pipe(Effect.flatMap((ns) =>
+              bulkSetInternal(items, ns).pipe(
+                Effect.withSpan("SQLite.bulkSet [effect-app/infra/Store]", {
+                  attributes: { "repository.table_name": tableName, "repository.model_name": name }
+                }, { captureStackTrace: false })
+              )
+            )),
+
+          batchRemove: (ids) => {
+            const placeholders = ids.map(() => "?").join(", ")
+            return resolveAndSeed.pipe(Effect.flatMap((ns) =>
+              exec(
+                ns,
+                `DELETE FROM "${tableName}" WHERE id IN (${placeholders})`,
+                [...ids]
+              )
+                .pipe(
+                  Effect.asVoid,
+                  Effect.withSpan("SQLite.batchRemove [effect-app/infra/Store]", {
+                    attributes: { "repository.table_name": tableName, "repository.model_name": name }
+                  }, { captureStackTrace: false })
+                )
+            ))
+          },
+
+          queryRaw: (query) =>
+            s.all.pipe(
+              Effect.map(query.memory),
+              Effect.withSpan("SQLite.queryRaw [effect-app/infra/Store]", {
+                attributes: { "repository.table_name": tableName, "repository.model_name": name }
+              }, { captureStackTrace: false })
+            )
+        }
+
+        yield* seedNamespace("primary")
+
+        return s
+      })
+  }
+}
+
+export function SQLiteStoreLayer(
+  cfg: StorageConfig,
+  options?: { makeSqlClientLayer?: (namespace: string) => Layer.Layer<SqlClient.SqlClient> }
+) {
+  if (options?.makeSqlClientLayer) {
+    return Layer.effectContext(
+      Effect.gen(function*() {
+        const layerMap = yield* LayerMap.make(
+          (namespace: string) => options.makeSqlClientLayer!(namespace),
+          { idleTimeToLive: "10 minutes" }
+        )
+
+        const withNsSql: WithNsSqlFn = (ns, f) => SqlClient.SqlClient.use(f).pipe(Effect.provide(layerMap.get(ns)))
+
+        const storeMaker = makeSQLiteStorePerNs(withNsSql, cfg)
+
+        const withTransaction: WithNsTransactionFn = (effect) =>
+          storeId.asEffect().pipe(
+            Effect.flatMap((ns) => withNsSql(ns, (sql) => sql.withTransaction(effect).pipe(Effect.orDie)))
+          ) as any
+
+        return StoreMaker.serviceMap(storeMaker).pipe(
+          Context.add(WithNsTransaction, withTransaction as any)
+        )
+      })
+    )
+  }
   return StoreMaker
     .toLayer(makeSQLStoreInt(sqliteDialect, "JSON")(cfg))
 }

package/src/Store/index.ts

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { Effect, Layer, Redacted } from "effect-app"
+import type { SqlClient } from "effect/unstable/sql"
 import { CosmosStoreLayer } from "./Cosmos.js"
 import { DiskStoreLayer } from "./Disk.js"
 import { MemoryStoreLive } from "./Memory.js"
@@ -8,7 +9,10 @@ import type { StorageConfig } from "./service.js"
 import { SQLiteStoreLayer } from "./SQL.js"
 import { PgStoreLayer } from "./SQL/Pg.js"
 
-export function StoreMakerLayer(cfg: StorageConfig) {
+export function StoreMakerLayer(
+  cfg: StorageConfig,
+  options?: { makeSqlClientLayer?: (namespace: string) => Layer.Layer<SqlClient.SqlClient> }
+) {
   return Effect
     .sync(() => {
       const storageUrl = Redacted.value(cfg.url)
@@ -23,7 +27,7 @@ export function StoreMakerLayer(cfg: StorageConfig) {
       }
       if (storageUrl.startsWith("sqlite://")) {
         console.log("Using SQLite store")
-        return SQLiteStoreLayer(cfg)
+        return SQLiteStoreLayer(cfg, options)
       }
       if (storageUrl.startsWith("pg://")) {
         console.log("Using PostgreSQL store")

package/src/api/routing/middleware/middleware.ts

@@ -4,9 +4,9 @@ import { ConfigureInterruptibilityMiddleware, DevMode, DevModeMiddleware, Logger
 import { RpcContextMap, type RpcMiddleware } from "effect-app/rpc"
 import { pretty } from "effect-app/utils"
 import { type Rpc } from "effect/unstable/rpc"
-import { SqlClient } from "effect/unstable/sql"
 import { logError, reportError } from "../../../errorReporter.js"
 import { InfraLogger } from "../../../logger.js"
+import { WithNsTransaction } from "../../../Store/SQL.js"
 import { determineMethod, isCommand } from "../utils.js"
 
 const logRequestError = logError("Request")
@@ -146,7 +146,7 @@ export const requiresTransactionConfig = RpcContextMap.makeCustom()(Schema.Never
 
 /**
  * Creates the middleware Effect for SQL transaction wrapping.
- * Requires `SqlClient` directly (not via serviceOption).
+ * Requires `WithNsTransaction` service.
  * Reads `requiresTransaction` from the RPC config; defaults to `false`.
  *
  * @example
@@ -161,11 +161,11 @@ export const makeSqlTransactionMiddleware = (
   rcm: { getConfig: (rpc: Rpc.AnyWithProps) => { readonly requiresTransaction?: boolean } }
 ) =>
   Effect.gen(function*() {
-    const sql = yield* SqlClient.SqlClient
+    const withTx = yield* WithNsTransaction
     const mw: RpcMiddleware.RpcMiddlewareV4<never, never, never> = (effect, { rpc }) => {
       const { requiresTransaction } = rcm.getConfig(rpc)
       if (requiresTransaction !== true) return effect
-      return sql.withTransaction(effect).pipe(Effect.orDie)
+      return withTx(effect)
     }
     return mw
   })