@effect-app/infra 4.0.0-beta.111 → 4.0.0-beta.113

package/src/Store/Cosmos.ts

@@ -127,10 +127,6 @@ function makeCosmosStore({ prefix }: StorageConfig) {
             }
             yield* cached
           })
-          const resolveAndSeed = resolveNamespace.pipe(
-            Effect.tap((ns) => seedNamespace(ns))
-          )
-
           const bulkSetInternal = (items: NonEmptyReadonlyArray<PM>, ns: string) =>
             Effect
               .gen(function*() {
@@ -239,10 +235,10 @@ function makeCosmosStore({ prefix }: StorageConfig) {
               )
 
           const bulkSet = (items: NonEmptyReadonlyArray<PM>) =>
-            resolveAndSeed.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns)))
+            resolveNamespace.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns)))
 
           const batchSet = (items: NonEmptyReadonlyArray<PM>) => {
-            return resolveAndSeed
+            return resolveNamespace
               .pipe(Effect.flatMap((ns) =>
                 Effect
                   .suspend(() => {
@@ -315,9 +311,11 @@ function makeCosmosStore({ prefix }: StorageConfig) {
           }
 
           const s: Store<IdKey, Encoded> = {
+            seedNamespace: (ns) => seedNamespace(ns),
+
             queryRaw: <Out>(query: RawQuery<Encoded, Out>) =>
               Effect
-                .all({ q: Effect.sync(() => query.cosmos({ name })), ns: resolveAndSeed })
+                .all({ q: Effect.sync(() => query.cosmos({ name })), ns: resolveNamespace })
                 .pipe(
                   Effect.tap(({ q }) => logQuery(q)),
                   Effect.flatMap(({ ns, q }) =>
@@ -345,7 +343,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
                   )
                 ),
             batchRemove: (ids, partitionKey?: string) =>
-              resolveAndSeed.pipe(Effect.flatMap((ns) =>
+              resolveNamespace.pipe(Effect.flatMap((ns) =>
                 Effect
                   .promise(() =>
                     execBatch(
@@ -376,7 +374,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
                   query: `SELECT * FROM ${name}`,
                   parameters: []
                 })),
-                ns: resolveAndSeed
+                ns: resolveNamespace
               })
               .pipe(
                 Effect.tap(({ q }) => logQuery(q)),
@@ -430,7 +428,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
                       limit
                     )
                   ),
-                  ns: resolveAndSeed
+                  ns: resolveNamespace
                 })
                 .pipe(
                   Effect.tap(({ q }) => logQuery(q)),
@@ -473,7 +471,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
                 )
             },
             find: (id) =>
-              resolveAndSeed.pipe(Effect.flatMap((ns) =>
+              resolveNamespace.pipe(Effect.flatMap((ns) =>
                 Effect
                   .promise(() =>
                     container
@@ -497,7 +495,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
                     }, { captureStackTrace: false }))
               )),
             set: (e) =>
-              resolveAndSeed.pipe(Effect.flatMap((ns) =>
+              resolveNamespace.pipe(Effect.flatMap((ns) =>
                 Option
                   .match(
                     Option

package/src/Store/Disk.ts

@@ -139,43 +139,48 @@ export function makeDiskStore({ prefix }: StorageConfig, dir: string) {
         config?: StoreConfig<Encoded>
       ) =>
         Effect.gen(function*() {
-          const storesSem = Semaphore.makeUnsafe(1)
           const primary = yield* makeDiskStoreInt(prefix, idKey, "primary", dir, name, seed, config?.defaultValues)
           const stores = new Map<string, Store<IdKey, Encoded>>([["primary", primary]])
           const ctx = yield* Effect.context<R>()
+          const semaphores = new Map<string, Semaphore.Semaphore>()
+          const getSem = (ns: string) => {
+            let sem = semaphores.get(ns)
+            if (!sem) {
+              sem = Semaphore.makeUnsafe(1)
+              semaphores.set(ns, sem)
+            }
+            return sem
+          }
+          const ensureStore = (namespace: string) =>
+            getSem(namespace).withPermits(1)(
+              Effect.suspend(() => {
+                const existing = stores.get(namespace)
+                if (existing) return Effect.succeed(existing)
+                if (config?.allowNamespace && !config.allowNamespace(namespace)) {
+                  throw new Error(`Namespace ${namespace} not allowed!`)
+                }
+                return makeDiskStoreInt<IdKey, Encoded, R, E>(
+                  prefix,
+                  idKey,
+                  namespace,
+                  dir,
+                  name,
+                  seed,
+                  config?.defaultValues
+                )
+                  .pipe(
+                    Effect.orDie,
+                    Effect.provide(ctx),
+                    Effect.tap((store) => Effect.sync(() => stores.set(namespace, store)))
+                  )
+              })
+            )
           const getStore = !config?.allowNamespace
             ? Effect.succeed(primary)
-            : storeId.asEffect().pipe(Effect.flatMap((namespace) => {
-              const store = stores.get(namespace)
-              if (store) {
-                return Effect.succeed(store)
-              }
-              if (!config.allowNamespace!(namespace)) {
-                throw new Error(`Namespace ${namespace} not allowed!`)
-              }
-              return storesSem.withPermits(1)(
-                Effect.suspend(() => {
-                  const existing = stores.get(namespace)
-                  if (existing) return Effect.sync(() => existing)
-                  return makeDiskStoreInt<IdKey, Encoded, R, E>(
-                    prefix,
-                    idKey,
-                    namespace,
-                    dir,
-                    name,
-                    seed,
-                    config?.defaultValues
-                  )
-                    .pipe(
-                      Effect.orDie,
-                      Effect.provide(ctx),
-                      Effect.tap((store) => Effect.sync(() => stores.set(namespace, store)))
-                    )
-                })
-              )
-            }))
+            : storeId.asEffect().pipe(Effect.flatMap((namespace) => ensureStore(namespace)))
 
           const s: Store<IdKey, Encoded> = {
+            seedNamespace: (namespace) => ensureStore(namespace).pipe(Effect.asVoid),
             all: Effect.flatMap(getStore, (_) => _.all),
             find: (...args) => Effect.flatMap(getStore, (_) => _.find(...args)),
             filter: (...args) => Effect.flatMap(getStore, (_) => _.filter(...args)),

package/src/Store/Memory.ts

@@ -151,6 +151,8 @@ export function makeMemoryStoreInt<IdKey extends keyof Encoded, Encoded extends
           withPermit
         )
     const s: Store<IdKey, Encoded> = {
+      seedNamespace: () => Effect.void,
+
       queryRaw: (query) =>
         all
           .pipe(
@@ -257,7 +259,6 @@ export const makeMemoryStore = () => ({
     config?: StoreConfig<Encoded>
   ) =>
     Effect.gen(function*() {
-      const storesSem = Semaphore.makeUnsafe(1)
       const primary = yield* makeMemoryStoreInt<IdKey, Encoded, R, E>(
         modelName,
         idKey,
@@ -267,28 +268,34 @@ export const makeMemoryStore = () => ({
       )
       const ctx = yield* Effect.context<R>()
       const stores = new Map([["primary", primary]])
-      const getStore = !config?.allowNamespace
-        ? Effect.succeed(primary)
-        : storeId.asEffect().pipe(Effect.flatMap((namespace) => {
+      const semaphores = new Map<string, Semaphore.Semaphore>()
+      const getSem = (ns: string) => {
+        let sem = semaphores.get(ns)
+        if (!sem) {
+          sem = Semaphore.makeUnsafe(1)
+          semaphores.set(ns, sem)
+        }
+        return sem
+      }
+      const ensureStore = (namespace: string) =>
+        getSem(namespace).withPermits(1)(Effect.suspend(() => {
           const store = stores.get(namespace)
-          if (store) {
-            return Effect.succeed(store)
-          }
-          if (!config.allowNamespace!(namespace)) {
+          if (store) return Effect.succeed(store)
+          if (config?.allowNamespace && !config.allowNamespace(namespace)) {
             throw new Error(`Namespace ${namespace} not allowed!`)
           }
-          return storesSem.withPermits(1)(Effect.suspend(() => {
-            const store = stores.get(namespace)
-            if (store) return Effect.sync(() => store)
-            return makeMemoryStoreInt(modelName, idKey, namespace, seed, config?.defaultValues)
-              .pipe(
-                Effect.orDie,
-                Effect.provide(ctx),
-                Effect.tap((store) => Effect.sync(() => stores.set(namespace, store)))
-              )
-          }))
+          return makeMemoryStoreInt(modelName, idKey, namespace, seed, config?.defaultValues)
+            .pipe(
+              Effect.orDie,
+              Effect.provide(ctx),
+              Effect.tap((store) => Effect.sync(() => stores.set(namespace, store)))
+            )
         }))
+      const getStore = !config?.allowNamespace
+        ? Effect.succeed(primary)
+        : storeId.asEffect().pipe(Effect.flatMap((namespace) => ensureStore(namespace)))
       const s: Store<IdKey, Encoded> = {
+        seedNamespace: (namespace) => ensureStore(namespace).pipe(Effect.asVoid),
         all: Effect.flatMap(getStore, (_) => _.all),
         queryRaw: (...args) => Effect.flatMap(getStore, (_) => _.queryRaw(...args)),
         find: (...args) => Effect.flatMap(getStore, (_) => _.find(...args)),

package/src/Store/SQL/Pg.ts

@@ -61,11 +61,11 @@ function makePgStore({ prefix }: StorageConfig) {
               return namespace
             }))
 
-          yield* sql
+          const ensureTable = sql
             .unsafe(
               `CREATE TABLE IF NOT EXISTS "${tableName}" (id TEXT NOT NULL, _namespace TEXT NOT NULL DEFAULT 'primary', _etag TEXT, data JSONB NOT NULL, PRIMARY KEY (id, _namespace))`
             )
-            .pipe(Effect.orDie)
+            .pipe(Effect.orDie, Effect.asVoid)
 
           const toRow = (e: PM) => {
             const newE = makeETag(e)
@@ -130,48 +130,35 @@ function makePgStore({ prefix }: StorageConfig) {
 
           const ctx = yield* Effect.context<R>()
           const seedCache = new Map<string, Effect.Effect<void>>()
-          const makeSeedEffect = (ns: string) =>
-            exec(
+          const makeSeedEffect = Effect.fnUntraced(function*(ns: string) {
+            yield* ensureTable
+            if (!seed) return
+            const existing = yield* exec(
               `SELECT id FROM "${tableName}" WHERE id = $1 AND _namespace = $2`,
               [seedMarkerId, `__seed__::${ns}`]
             )
-              .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(
-                        `INSERT INTO "${tableName}" (id, _namespace, _etag, data) VALUES ($1, $2, $3, $4)`,
-                        [seedMarkerId, `__seed__::${ns}`, null, JSON.stringify({ _marker: true })]
-                      )
-                    ),
-                    Effect.provide(ctx),
-                    Effect.orDie
-                  )
-                })
-              )
-          const seedNamespace = Effect.fn("seedNamespace")(function*(ns: string) {
-            if (!seed) return
+            if ((existing as any[]).length > 0) return
+            yield* InfraLogger.logInfo(`Seeding data for ${name} (namespace: ${ns})`)
+            const items = yield* seed.pipe(Effect.provide(ctx), Effect.orDie)
+            const ne = toNonEmptyArray([...items])
+            if (Option.isSome(ne)) yield* bulkSetInternal(ne.value, ns)
+            yield* exec(
+              `INSERT INTO "${tableName}" (id, _namespace, _etag, data) VALUES ($1, $2, $3, $4)`,
+              [seedMarkerId, `__seed__::${ns}`, null, JSON.stringify({ _marker: true })]
+            )
+          })
+          const seedNamespace = (ns: string) => {
             let cached = seedCache.get(ns)
             if (!cached) {
-              cached = yield* Effect.cached(makeSeedEffect(ns))
+              cached = Effect.cached(makeSeedEffect(ns)).pipe(Effect.runSync)
               seedCache.set(ns, cached)
             }
-            yield* cached
-          })
-          const resolveAndSeed = resolveNamespace.pipe(
-            Effect.tap((ns) => seedNamespace(ns))
-          )
-
+            return cached
+          }
           const s: Store<IdKey, Encoded> = {
-            all: resolveAndSeed.pipe(Effect.flatMap((ns) =>
+            seedNamespace: (ns) => seedNamespace(ns),
+
+            all: resolveNamespace.pipe(Effect.flatMap((ns) =>
               exec(`SELECT id, _etag, data FROM "${tableName}" WHERE _namespace = $1`, [ns])
                 .pipe(
                   Effect.map((rows) => (rows as any[]).map((r) => parseRow<Encoded>(r, idKey, defaultValues))),
@@ -186,7 +173,7 @@ function makePgStore({ prefix }: StorageConfig) {
             )),
 
             find: (id) =>
-              resolveAndSeed.pipe(Effect
+              resolveNamespace.pipe(Effect
                 .flatMap((ns) =>
                   exec(`SELECT id, _etag, data FROM "${tableName}" WHERE id = $1 AND _namespace = $2`, [id, ns])
                     .pipe(
@@ -206,7 +193,7 @@ function makePgStore({ prefix }: StorageConfig) {
               const filter = f
                 .filter
               type M = U extends undefined ? Encoded : Pick<Encoded, U>
-              return resolveAndSeed.pipe(Effect.flatMap((ns) =>
+              return resolveNamespace.pipe(Effect.flatMap((ns) =>
                 Effect
                   .sync(() => {
                     const q = buildWhereSQLQuery(
@@ -261,7 +248,7 @@ function makePgStore({ prefix }: StorageConfig) {
             },
 
             set: (e) =>
-              resolveAndSeed.pipe(Effect.flatMap((ns) =>
+              resolveNamespace.pipe(Effect.flatMap((ns) =>
                 setInternal(e, ns).pipe(
                   Effect.withSpan("PgSQL.set [effect-app/infra/Store]", {
                     attributes: { "repository.table_name": tableName, "repository.model_name": name, id: e[idKey] }
@@ -270,7 +257,7 @@ function makePgStore({ prefix }: StorageConfig) {
               )),
 
             batchSet: (items) =>
-              resolveAndSeed.pipe(Effect.flatMap((ns) =>
+              resolveNamespace.pipe(Effect.flatMap((ns) =>
                 bulkSetInternal(items, ns).pipe(
                   Effect.withSpan("PgSQL.batchSet [effect-app/infra/Store]", {
                     attributes: { "repository.table_name": tableName, "repository.model_name": name }
@@ -279,7 +266,7 @@ function makePgStore({ prefix }: StorageConfig) {
               )),
 
             bulkSet: (items) =>
-              resolveAndSeed.pipe(Effect.flatMap((ns) =>
+              resolveNamespace.pipe(Effect.flatMap((ns) =>
                 bulkSetInternal(items, ns).pipe(
                   Effect.withSpan("PgSQL.bulkSet [effect-app/infra/Store]", {
                     attributes: { "repository.table_name": tableName, "repository.model_name": name }
@@ -290,7 +277,7 @@ function makePgStore({ prefix }: StorageConfig) {
             batchRemove: (ids) => {
               const placeholders = ids.map((_, i) => `$${i + 1}`).join(", ")
               const nsPlaceholder = `$${ids.length + 1}`
-              return resolveAndSeed.pipe(Effect.flatMap((ns) =>
+              return resolveNamespace.pipe(Effect.flatMap((ns) =>
                 exec(
                   `DELETE FROM "${tableName}" WHERE id IN (${placeholders}) AND _namespace = ${nsPlaceholder}`,
                   [...ids, ns]

package/src/Store/SQL.ts

@@ -75,11 +75,11 @@ function makeSQLStoreInt(dialect: SQLDialect, jsonColumnType: string) {
                 return namespace
               }))
 
-            yield* sql
+            const ensureTable = sql
               .unsafe(
                 `CREATE TABLE IF NOT EXISTS "${tableName}" (id TEXT NOT NULL, _namespace TEXT NOT NULL DEFAULT 'primary', _etag TEXT, data ${jsonColumnType} NOT NULL, PRIMARY KEY (id, _namespace))`
               )
-              .pipe(Effect.orDie)
+              .pipe(Effect.orDie, Effect.asVoid)
 
             const toRow = (e: PM) => {
               const newE = makeETag(e)
@@ -144,48 +144,35 @@ function makeSQLStoreInt(dialect: SQLDialect, jsonColumnType: string) {
 
             const ctx = yield* Effect.context<R>()
             const seedCache = new Map<string, Effect.Effect<void>>()
-            const makeSeedEffect = (ns: string) =>
-              exec(
+            const makeSeedEffect = Effect.fnUntraced(function*(ns: string) {
+              yield* ensureTable
+              if (!seed) return
+              const existing = yield* exec(
                 `SELECT id FROM "${tableName}" WHERE id = ? AND _namespace = ?`,
                 [seedMarkerId, `__seed__::${ns}`]
               )
-                .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(
-                          `INSERT INTO "${tableName}" (id, _namespace, _etag, data) VALUES (?, ?, ?, ?)`,
-                          [seedMarkerId, `__seed__::${ns}`, null, JSON.stringify({ _marker: true })]
-                        )
-                      ),
-                      Effect.provide(ctx),
-                      Effect.orDie
-                    )
-                  })
-                )
-            const seedNamespace = Effect.fn("seedNamespace")(function*(ns: string) {
-              if (!seed) return
+              if ((existing as any[]).length > 0) return
+              yield* InfraLogger.logInfo(`Seeding data for ${name} (namespace: ${ns})`)
+              const items = yield* seed.pipe(Effect.provide(ctx), Effect.orDie)
+              const ne = toNonEmptyArray([...items])
+              if (Option.isSome(ne)) yield* bulkSetInternal(ne.value, ns)
+              yield* exec(
+                `INSERT INTO "${tableName}" (id, _namespace, _etag, data) VALUES (?, ?, ?, ?)`,
+                [seedMarkerId, `__seed__::${ns}`, null, JSON.stringify({ _marker: true })]
+              )
+            })
+            const seedNamespace = (ns: string) => {
               let cached = seedCache.get(ns)
               if (!cached) {
-                cached = yield* Effect.cached(makeSeedEffect(ns))
+                cached = Effect.cached(makeSeedEffect(ns)).pipe(Effect.runSync)
                 seedCache.set(ns, cached)
               }
-              yield* cached
-            })
-            const resolveAndSeed = resolveNamespace.pipe(
-              Effect.tap((ns) => seedNamespace(ns))
-            )
-
+              return cached
+            }
             const s: Store<IdKey, Encoded> = {
-              all: resolveAndSeed.pipe(Effect.flatMap((ns) =>
+              seedNamespace: (ns) => seedNamespace(ns),
+
+              all: resolveNamespace.pipe(Effect.flatMap((ns) =>
                 exec(`SELECT id, _etag, data FROM "${tableName}" WHERE _namespace = ?`, [ns])
                   .pipe(
                     Effect.map((rows) => (rows as any[]).map((r) => parseRow<Encoded>(r, idKey, defaultValues))),
@@ -200,7 +187,7 @@ function makeSQLStoreInt(dialect: SQLDialect, jsonColumnType: string) {
               )),
 
               find: (id) =>
-                resolveAndSeed.pipe(Effect.flatMap((ns) =>
+                resolveNamespace.pipe(Effect.flatMap((ns) =>
                   exec(`SELECT id, _etag, data FROM "${tableName}" WHERE id = ? AND _namespace = ?`, [id, ns])
                     .pipe(
                       Effect.map((rows) => {
@@ -220,7 +207,7 @@ function makeSQLStoreInt(dialect: SQLDialect, jsonColumnType: string) {
                   .filter
                 type M = U extends undefined ? Encoded
                   : Pick<Encoded, U>
-                return resolveAndSeed
+                return resolveNamespace
                   .pipe(Effect
                     .flatMap((ns) =>
                       Effect
@@ -298,7 +285,7 @@ function makeSQLStoreInt(dialect: SQLDialect, jsonColumnType: string) {
               },
 
               set: (e) =>
-                resolveAndSeed.pipe(Effect.flatMap((ns) =>
+                resolveNamespace.pipe(Effect.flatMap((ns) =>
                   setInternal(e, ns).pipe(
                     Effect.withSpan("SQL.set [effect-app/infra/Store]", {
                       attributes: { "repository.table_name": tableName, "repository.model_name": name, id: e[idKey] }
@@ -307,7 +294,7 @@ function makeSQLStoreInt(dialect: SQLDialect, jsonColumnType: string) {
                 )),
 
               batchSet: (items) =>
-                resolveAndSeed.pipe(Effect.flatMap((ns) =>
+                resolveNamespace.pipe(Effect.flatMap((ns) =>
                   bulkSetInternal(items, ns).pipe(
                     Effect.withSpan("SQL.batchSet [effect-app/infra/Store]", {
                       attributes: { "repository.table_name": tableName, "repository.model_name": name }
@@ -316,7 +303,7 @@ function makeSQLStoreInt(dialect: SQLDialect, jsonColumnType: string) {
                 )),
 
               bulkSet: (items) =>
-                resolveAndSeed.pipe(Effect.flatMap((ns) =>
+                resolveNamespace.pipe(Effect.flatMap((ns) =>
                   bulkSetInternal(items, ns).pipe(
                     Effect.withSpan("SQL.bulkSet [effect-app/infra/Store]", {
                       attributes: { "repository.table_name": tableName, "repository.model_name": name }
@@ -326,7 +313,7 @@ function makeSQLStoreInt(dialect: SQLDialect, jsonColumnType: string) {
 
               batchRemove: (ids) => {
                 const placeholders = ids.map(() => "?").join(", ")
-                return resolveAndSeed.pipe(Effect.flatMap((ns) =>
+                return resolveNamespace.pipe(Effect.flatMap((ns) =>
                   exec(
                     `DELETE FROM "${tableName}" WHERE id IN (${placeholders}) AND _namespace = ?`,
                     [...ids, ns]
@@ -404,6 +391,7 @@ function makeSQLiteStorePerNs(
             ns,
             `CREATE TABLE IF NOT EXISTS "${tableName}" (id TEXT NOT NULL PRIMARY KEY, _etag TEXT, data JSON NOT NULL)`
           )
+            .pipe(Effect.asVoid)
 
         const seedMarkerId = `__seed_marker__`
 
@@ -461,51 +449,38 @@ function makeSQLiteStorePerNs(
 
         const ctx = yield* Effect.context<R>()
         const seedCache = new Map<string, Effect.Effect<void>>()
-        const makeSeedEffect = (ns: string) =>
-          exec(
+        const makeSeedEffect = Effect.fnUntraced(function*(ns: string) {
+          yield* ensureTable(ns)
+          if (!seed) return
+          const existing = yield* 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
+          if ((existing as any[]).length > 0) return
+          yield* InfraLogger.logInfo(`Seeding data for ${name} (namespace: ${ns})`)
+          const items = yield* seed.pipe(Effect.provide(ctx), Effect.orDie)
+          const ne = toNonEmptyArray([...items])
+          if (Option.isSome(ne)) yield* bulkSetInternal(ne.value, ns)
+          yield* exec(
+            ns,
+            `INSERT INTO "${tableName}" (id, _etag, data) VALUES (?, ?, ?)`,
+            [seedMarkerId, null, JSON.stringify({ _marker: true })]
+          )
+        })
+        const seedNamespace = (ns: string) => {
           let cached = seedCache.get(ns)
           if (!cached) {
-            cached = yield* Effect.cached(makeSeedEffect(ns))
+            cached = Effect.cached(makeSeedEffect(ns)).pipe(Effect.runSync)
             seedCache.set(ns, cached)
           }
-          yield* cached
-        })
-        const resolveAndSeed = resolveNamespace.pipe(
-          Effect.tap((ns) => seedNamespace(ns))
-        )
+          return cached
+        }
 
         const s: Store<IdKey, Encoded> = {
-          all: resolveAndSeed.pipe(Effect.flatMap((ns) =>
+          seedNamespace: (ns) => seedNamespace(ns),
+
+          all: resolveNamespace.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))),
@@ -520,7 +495,7 @@ function makeSQLiteStorePerNs(
           )),
 
           find: (id) =>
-            resolveAndSeed.pipe(Effect.flatMap((ns) =>
+            resolveNamespace.pipe(Effect.flatMap((ns) =>
               exec(ns, `SELECT id, _etag, data FROM "${tableName}" WHERE id = ?`, [id])
                 .pipe(
                   Effect.map((rows) => {
@@ -540,7 +515,7 @@ function makeSQLiteStorePerNs(
               .filter
             type M = U extends undefined ? Encoded
               : Pick<Encoded, U>
-            return resolveAndSeed
+            return resolveNamespace
               .pipe(Effect
                 .flatMap((ns) =>
                   Effect
@@ -595,7 +570,7 @@ function makeSQLiteStorePerNs(
           },
 
           set: (e) =>
-            resolveAndSeed.pipe(Effect.flatMap((ns) =>
+            resolveNamespace.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] }
@@ -604,7 +579,7 @@ function makeSQLiteStorePerNs(
             )),
 
           batchSet: (items) =>
-            resolveAndSeed.pipe(Effect.flatMap((ns) =>
+            resolveNamespace.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 }
@@ -613,7 +588,7 @@ function makeSQLiteStorePerNs(
             )),
 
           bulkSet: (items) =>
-            resolveAndSeed.pipe(Effect.flatMap((ns) =>
+            resolveNamespace.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 }
@@ -623,7 +598,7 @@ function makeSQLiteStorePerNs(
 
           batchRemove: (ids) => {
             const placeholders = ids.map(() => "?").join(", ")
-            return resolveAndSeed.pipe(Effect.flatMap((ns) =>
+            return resolveNamespace.pipe(Effect.flatMap((ns) =>
               exec(
                 ns,
                 `DELETE FROM "${tableName}" WHERE id IN (${placeholders})`,
@@ -675,7 +650,7 @@ export function SQLiteStoreLayer(
             Effect.flatMap((ns) => withNsSql(ns, (sql) => sql.withTransaction(effect).pipe(Effect.orDie)))
           ) as any
 
-        return StoreMaker.contextMap(storeMaker).pipe(
+        return StoreMaker.context(storeMaker).pipe(
           Context.add(WithNsTransaction, withTransaction)
         )
       })

package/src/Store/index.ts

@@ -5,6 +5,7 @@ import { CosmosStoreLayer } from "./Cosmos.js"
 import { DiskStoreLayer } from "./Disk.js"
 import { MemoryStoreLive } from "./Memory.js"
 // import { RedisStoreLayer } from "./Redis.js"
+import { RepositoryRegistryLive } from "../Model.js"
 import type { StorageConfig } from "./service.js"
 import { SQLiteStoreLayer } from "./SQL.js"
 import { PgStoreLayer } from "./SQL/Pg.js"
@@ -41,7 +42,7 @@ export function StoreMakerLayer(
       console.log("Using Cosmos DB store")
       return CosmosStoreLayer(cfg)
     })
-    .pipe(Layer.unwrap)
+    .pipe(Layer.unwrap, Layer.merge(RepositoryRegistryLive))
 }
 
 export * from "./service.js"