@effect-app/infra 4.0.0-beta.84 → 4.0.0-beta.86

package/src/Store/SQL.ts

@@ -86,8 +86,100 @@ function makeSQLStoreInt(dialect: SQLDialect, jsonColumnType: string) {
             const exec = (query: string, params?: readonly unknown[]) =>
               sql.unsafe(query, params as any).pipe(Effect.orDie)
 
+            const seedMarkerId = `__seed_marker__`
+
+            const setInternal = (e: PM, ns: string) =>
+              Effect.gen(function*() {
+                const row = toRow(e)
+                if (e._etag) {
+                  yield* exec(
+                    `UPDATE "${tableName}" SET _etag = ?, data = ? WHERE id = ? AND _etag = ? AND _namespace = ?`,
+                    [row._etag, row.data, row.id, e._etag, ns]
+                  )
+                  const existing = yield* exec(
+                    `SELECT _etag FROM "${tableName}" WHERE id = ? AND _namespace = ?`,
+                    [row.id, ns]
+                  )
+                  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(
+                    `INSERT INTO "${tableName}" (id, _namespace, _etag, data) VALUES (?, ?, ?, ?)`,
+                    [row.id, ns, row._etag, row.data]
+                  )
+                }
+                return row.item
+              })
+
+            const bulkSetInternal = (items: NonEmptyReadonlyArray<PM>, ns: string) =>
+              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(
+                `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
+              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: resolveNamespace.pipe(Effect.flatMap((ns) =>
+              all: resolveAndSeed.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))),
@@ -102,7 +194,7 @@ function makeSQLStoreInt(dialect: SQLDialect, jsonColumnType: string) {
               )),
 
               find: (id) =>
-                resolveNamespace.pipe(Effect.flatMap((ns) =>
+                resolveAndSeed.pipe(Effect.flatMap((ns) =>
                   exec(`SELECT id, _etag, data FROM "${tableName}" WHERE id = ? AND _namespace = ?`, [id, ns])
                     .pipe(
                       Effect.map((rows) => {
@@ -122,7 +214,7 @@ function makeSQLStoreInt(dialect: SQLDialect, jsonColumnType: string) {
                   .filter
                 type M = U extends undefined ? Encoded
                   : Pick<Encoded, U>
-                return resolveNamespace
+                return resolveAndSeed
                   .pipe(Effect
                     .flatMap((ns) =>
                       Effect
@@ -200,82 +292,35 @@ function makeSQLStoreInt(dialect: SQLDialect, jsonColumnType: string) {
               },
 
               set: (e) =>
-                resolveNamespace.pipe(Effect.flatMap((ns) =>
-                  Effect
-                    .gen(function*() {
-                      const row = toRow(e)
-                      if (e._etag) {
-                        yield* exec(
-                          `UPDATE "${tableName}" SET _etag = ?, data = ? WHERE id = ? AND _etag = ? AND _namespace = ?`,
-                          [row._etag, row.data, row.id, e._etag, ns]
-                        )
-                        const existing = yield* exec(
-                          `SELECT _etag FROM "${tableName}" WHERE id = ? AND _namespace = ?`,
-                          [row.id, ns]
-                        )
-                        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(
-                          `INSERT INTO "${tableName}" (id, _namespace, _etag, data) VALUES (?, ?, ?, ?)`,
-                          [row.id, ns, row._etag, row.data]
-                        )
-                      }
-                      return row.item
-                    })
-                    .pipe(
-                      Effect.withSpan("SQL.set [effect-app/infra/Store]", {
-                        attributes: { "repository.table_name": tableName, "repository.model_name": name, id: e[idKey] }
-                      }, { captureStackTrace: false })
-                    )
+                resolveAndSeed.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] }
+                    }, { captureStackTrace: false })
+                  )
                 )),
 
               batchSet: (items) =>
-                sql
-                  .withTransaction(
-                    Effect.forEach(items, (e) => s.set(e))
-                  )
-                  .pipe(
-                    Effect.orDie,
-                    Effect.map((_) => _ as unknown as NonEmptyReadonlyArray<PM>),
+                resolveAndSeed.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 }
                     }, { captureStackTrace: false })
-                  ),
+                  )
+                )),
 
               bulkSet: (items) =>
-                sql
-                  .withTransaction(
-                    Effect.forEach(items, (e) => s.set(e))
-                  )
-                  .pipe(
-                    Effect.orDie,
-                    Effect.map((_) => _ as unknown as NonEmptyReadonlyArray<PM>),
+                resolveAndSeed.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 }
                     }, { captureStackTrace: false })
-                  ),
+                  )
+                )),
 
               batchRemove: (ids) => {
                 const placeholders = ids.map(() => "?").join(", ")
-                return resolveNamespace.pipe(Effect.flatMap((ns) =>
+                return resolveAndSeed.pipe(Effect.flatMap((ns) =>
                   exec(
                     `DELETE FROM "${tableName}" WHERE id IN (${placeholders}) AND _namespace = ?`,
                     [...ids, ns]
@@ -298,21 +343,8 @@ function makeSQLStoreInt(dialect: SQLDialect, jsonColumnType: string) {
                 )
             }
 
-            if (seed) {
-              const existing = yield* exec(
-                `SELECT COUNT(*) as cnt FROM "${tableName}" WHERE _namespace = ?`,
-                ["primary"]
-              )
-              const count = (existing as any[])[0]?.cnt ?? 0
-              if (count === 0) {
-                yield* InfraLogger.logInfo("Seeding data for " + name)
-                const items = yield* seed
-                yield* Effect.flatMapOption(
-                  Effect.succeed(toNonEmptyArray([...items])),
-                  (a) => s.bulkSet(a).pipe(Effect.orDie)
-                )
-              }
-            }
+            // Eagerly seed primary namespace on initialization
+            yield* seedNamespace("primary")
 
             return s
           })