@effect-app/infra 4.0.0-beta.121 → 4.0.0-beta.123

package/src/Store/SQL/Pg.ts

@@ -37,283 +37,280 @@ const parseSelectRow = (
   return result
 }
 
-function makePgStore({ prefix }: StorageConfig) {
-  return Effect.gen(function*() {
-    const sql = yield* SqlClient.SqlClient
-    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 makePgStore = Effect.fnUntraced(function*({ prefix }: StorageConfig) {
+  const sql = yield* SqlClient.SqlClient
+  return {
+    make: Effect.fnUntraced(function*<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>
+    ) {
+      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 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 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.andThen(
-                sql.unsafe(
-                  `CREATE TABLE IF NOT EXISTS "_migrations" (id TEXT NOT NULL, version TEXT NOT NULL, PRIMARY KEY (id, version))`
-                )
-              ),
-              Effect.orDie,
-              Effect.asVoid
+      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.andThen(
+            sql.unsafe(
+              `CREATE TABLE IF NOT EXISTS "_migrations" (id TEXT NOT NULL, version TEXT NOT NULL, PRIMARY KEY (id, version))`
             )
+          ),
+          Effect.orDie,
+          Effect.asVoid
+        )
 
-          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 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 = (query: string, params?: readonly unknown[]) =>
-            sql.unsafe(query, params as any).pipe(Effect.orDie)
+      const exec = (query: string, params?: readonly unknown[]) => sql.unsafe(query, params as any).pipe(Effect.orDie)
 
-          const setInternal = (e: PM, ns: string) =>
-            Effect.gen(function*() {
-              const row = toRow(e)
-              if (e._etag) {
-                yield* exec(
-                  `UPDATE "${tableName}" SET _etag = $1, data = $2 WHERE id = $3 AND _etag = $4 AND _namespace = $5`,
-                  [row._etag, row.data, row.id, e._etag, ns]
-                )
-                const existing = yield* exec(
-                  `SELECT _etag FROM "${tableName}" WHERE id = $1 AND _namespace = $2`,
-                  [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 ($1, $2, $3, $4)`,
-                  [row.id, ns, row._etag, row.data]
-                )
-              }
-              return row.item
+      const setInternal = Effect.fnUntraced(function*(e: PM, ns: string) {
+        const row = toRow(e)
+        if (e._etag) {
+          yield* exec(
+            `UPDATE "${tableName}" SET _etag = $1, data = $2 WHERE id = $3 AND _etag = $4 AND _namespace = $5`,
+            [row._etag, row.data, row.id, e._etag, ns]
+          )
+          const existing = yield* exec(
+            `SELECT _etag FROM "${tableName}" WHERE id = $1 AND _namespace = $2`,
+            [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 ($1, $2, $3, $4)`,
+            [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 bulkSetInternal = (items: NonEmptyReadonlyArray<PM>, ns: string) =>
-            sql
-              .withTransaction(Effect.forEach(items, (e) => setInternal(e, ns)))
+      const ctx = yield* Effect.context<R>()
+      const seedCache = new Map<string, Effect.Effect<void>>()
+      const makeSeedEffect = Effect.fnUntraced(function*(ns: string) {
+        yield* ensureTable
+        if (!seed) return
+        const existing = yield* exec(
+          `SELECT id FROM "_migrations" WHERE id = $1 AND version = $2`,
+          [`${tableName}::${ns}`, tableName]
+        )
+        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 "_migrations" (id, version) VALUES ($1, $2)`,
+          [`${tableName}::${ns}`, tableName]
+        )
+      })
+      const seedNamespace = (ns: string) => {
+        let cached = seedCache.get(ns)
+        if (!cached) {
+          cached = Effect.cached(Effect.uninterruptible(makeSeedEffect(ns))).pipe(Effect.runSync)
+          seedCache.set(ns, cached)
+        }
+        return cached
+      }
+      const s: Store<IdKey, Encoded> = {
+        seedNamespace: (ns) => seedNamespace(ns),
+
+        all: resolveNamespace.pipe(
+          Effect.flatMap((ns) =>
+            exec(`SELECT id, _etag, data FROM "${tableName}" WHERE _namespace = $1`, [ns])
               .pipe(
-                Effect.orDie,
-                Effect.map((_) => _ as unknown as NonEmptyReadonlyArray<PM>)
+                Effect.map((rows) => (rows as any[]).map((r) => parseRow<Encoded>(r, idKey, defaultValues))),
+                Effect.withSpan("PgSQL.all [effect-app/infra/Store]", {
+                  attributes: {
+                    "repository.table_name": tableName,
+                    "repository.model_name": name,
+                    "repository.namespace": ns
+                  }
+                }, { captureStackTrace: false })
               )
+          )
+        ),
 
-          const ctx = yield* Effect.context<R>()
-          const seedCache = new Map<string, Effect.Effect<void>>()
-          const makeSeedEffect = Effect.fnUntraced(function*(ns: string) {
-            yield* ensureTable
-            if (!seed) return
-            const existing = yield* exec(
-              `SELECT id FROM "_migrations" WHERE id = $1 AND version = $2`,
-              [`${tableName}::${ns}`, tableName]
-            )
-            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 "_migrations" (id, version) VALUES ($1, $2)`,
-              [`${tableName}::${ns}`, tableName]
-            )
-          })
-          const seedNamespace = (ns: string) => {
-            let cached = seedCache.get(ns)
-            if (!cached) {
-              cached = Effect.cached(Effect.uninterruptible(makeSeedEffect(ns))).pipe(Effect.runSync)
-              seedCache.set(ns, cached)
-            }
-            return cached
-          }
-          const s: Store<IdKey, Encoded> = {
-            seedNamespace: (ns) => seedNamespace(ns),
-
-            all: resolveNamespace.pipe(Effect.flatMap((ns) =>
-              exec(`SELECT id, _etag, data FROM "${tableName}" WHERE _namespace = $1`, [ns])
+        find: (id) =>
+          resolveNamespace.pipe(Effect
+            .flatMap((ns) =>
+              exec(`SELECT id, _etag, data FROM "${tableName}" WHERE id = $1 AND _namespace = $2`, [id, ns])
                 .pipe(
-                  Effect.map((rows) => (rows as any[]).map((r) => parseRow<Encoded>(r, idKey, defaultValues))),
-                  Effect.withSpan("PgSQL.all [effect-app/infra/Store]", {
-                    attributes: {
-                      "repository.table_name": tableName,
-                      "repository.model_name": name,
-                      "repository.namespace": ns
-                    }
+                  Effect.map((rows) => {
+                    const row = (rows as any[])[0]
+                    return row
+                      ? Option.some(parseRow<Encoded>(row, idKey, defaultValues))
+                      : Option.none()
+                  }),
+                  Effect.withSpan("PgSQL.find [effect-app/infra/Store]", {
+                    attributes: { "repository.table_name": tableName, "repository.model_name": name, id }
                   }, { captureStackTrace: false })
                 )
             )),
 
-            find: (id) =>
-              resolveNamespace.pipe(Effect
-                .flatMap((ns) =>
-                  exec(`SELECT id, _etag, data FROM "${tableName}" WHERE id = $1 AND _namespace = $2`, [id, ns])
-                    .pipe(
-                      Effect.map((rows) => {
-                        const row = (rows as any[])[0]
-                        return row
-                          ? Option.some(parseRow<Encoded>(row, idKey, defaultValues))
-                          : Option.none()
-                      }),
-                      Effect.withSpan("PgSQL.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 resolveNamespace.pipe(Effect.flatMap((ns) =>
-                Effect
-                  .sync(() => {
-                    const q = buildWhereSQLQuery(
-                      pgDialect,
-                      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
-                    )
-                    const nsPlaceholder = pgDialect.placeholder(q.params.length + 1)
-                    const hasWhere = q.sql.includes("WHERE")
-                    const nsSql = hasWhere
-                      ? q.sql.replace("WHERE", `WHERE _namespace = ${nsPlaceholder} AND`)
-                      : q.sql.replace(
-                        `FROM "${tableName}"`,
-                        `FROM "${tableName}" WHERE _namespace = ${nsPlaceholder}`
-                      )
-                    return { sql: nsSql, params: [...q.params, ns] }
-                  })
-                  .pipe(
-                    Effect.tap((q) => logQuery(q)),
-                    Effect.flatMap((q) =>
-                      exec(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)
+        filter: <U extends keyof Encoded = never>(f: FilterArgs<Encoded, U>) => {
+          const filter = f
+            .filter
+          type M = U extends undefined ? Encoded : Pick<Encoded, U>
+          return resolveNamespace.pipe(Effect.flatMap((ns) =>
+            Effect
+              .sync(() => {
+                const q = buildWhereSQLQuery(
+                  pgDialect,
+                  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
+                )
+                const nsPlaceholder = pgDialect.placeholder(q.params.length + 1)
+                const hasWhere = q.sql.includes("WHERE")
+                const nsSql = hasWhere
+                  ? q.sql.replace("WHERE", `WHERE _namespace = ${nsPlaceholder} AND`)
+                  : q.sql.replace(
+                    `FROM "${tableName}"`,
+                    `FROM "${tableName}" WHERE _namespace = ${nsPlaceholder}`
+                  )
+                return { sql: nsSql, params: [...q.params, ns] }
+              })
+              .pipe(
+                Effect.tap((q) => logQuery(q)),
+                Effect.flatMap((q) =>
+                  exec(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
                         })
-                      )
-                    ),
-                    Effect.withSpan("PgSQL.filter [effect-app/infra/Store]", {
-                      attributes: { "repository.table_name": tableName, "repository.model_name": name }
-                    }, { captureStackTrace: false })
+                      }
+                      return (rows as any[]).map((r) => parseRow<Encoded>(r, idKey, defaultValues) as any as M)
+                    })
                   )
-              ))
-            },
-
-            set: (e) =>
-              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] }
-                  }, { captureStackTrace: false })
-                )
-              )),
+                ),
+                Effect.withSpan("PgSQL.filter [effect-app/infra/Store]", {
+                  attributes: { "repository.table_name": tableName, "repository.model_name": name }
+                }, { captureStackTrace: false })
+              )
+          ))
+        },
 
-            batchSet: (items) =>
-              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 }
-                  }, { captureStackTrace: false })
-                )
-              )),
+        set: (e) =>
+          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] }
+              }, { captureStackTrace: false })
+            )
+          )),
 
-            bulkSet: (items) =>
-              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 }
-                  }, { captureStackTrace: false })
-                )
-              )),
+        batchSet: (items) =>
+          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 }
+              }, { captureStackTrace: false })
+            )
+          )),
 
-            batchRemove: (ids) => {
-              const placeholders = ids.map((_, i) => `$${i + 1}`).join(", ")
-              const nsPlaceholder = `$${ids.length + 1}`
-              return resolveNamespace.pipe(Effect.flatMap((ns) =>
-                exec(
-                  `DELETE FROM "${tableName}" WHERE id IN (${placeholders}) AND _namespace = ${nsPlaceholder}`,
-                  [...ids, ns]
-                )
-                  .pipe(
-                    Effect.asVoid,
-                    Effect.withSpan("PgSQL.batchRemove [effect-app/infra/Store]", {
-                      attributes: { "repository.table_name": tableName, "repository.model_name": name }
-                    }, { captureStackTrace: false })
-                  )
-              ))
-            },
+        bulkSet: (items) =>
+          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 }
+              }, { captureStackTrace: false })
+            )
+          )),
 
-            queryRaw: (query) =>
-              s.all.pipe(
-                Effect.map(query.memory),
-                Effect.withSpan("PgSQL.queryRaw [effect-app/infra/Store]", {
+        batchRemove: (ids) => {
+          const placeholders = ids.map((_, i) => `$${i + 1}`).join(", ")
+          const nsPlaceholder = `$${ids.length + 1}`
+          return resolveNamespace.pipe(Effect.flatMap((ns) =>
+            exec(
+              `DELETE FROM "${tableName}" WHERE id IN (${placeholders}) AND _namespace = ${nsPlaceholder}`,
+              [...ids, ns]
+            )
+              .pipe(
+                Effect.asVoid,
+                Effect.withSpan("PgSQL.batchRemove [effect-app/infra/Store]", {
                   attributes: { "repository.table_name": tableName, "repository.model_name": name }
                 }, { captureStackTrace: false })
               )
-          }
+          ))
+        },
 
-          // Eagerly seed primary namespace on initialization
-          yield* seedNamespace("primary")
+        queryRaw: (query) =>
+          s.all.pipe(
+            Effect.map(query.memory),
+            Effect.withSpan("PgSQL.queryRaw [effect-app/infra/Store]", {
+              attributes: { "repository.table_name": tableName, "repository.model_name": name }
+            }, { captureStackTrace: false })
+          )
+      }
 
-          return s
-        })
-    }
-  })
-}
+      // Eagerly seed primary namespace on initialization
+      yield* seedNamespace("primary")
+
+      return s
+    })
+  }
+})
 
 export function PgStoreLayer(cfg: StorageConfig) {
   return StoreMaker