@effect-app/infra 4.0.0-beta.216 → 4.0.0-beta.217

package/src/Store/Memory.ts

@@ -6,7 +6,7 @@ import { assertUnreachable } from "effect-app/utils"
 import { InfraLogger } from "../logger.js"
 import type { FilterResult } from "../Model/filter/filterApi.js"
 import type { FieldValues } from "../Model/filter/types.js"
-import type { ComputedProjectionIrExpression } from "../Model/query.js"
+import type { ComputedProjectionIrExpression, ComputedProjectionMathIrExpression } from "../Model/query.js"
 import { annotateDb } from "../otel.js"
 import { codeFilter, codeFilter3_ } from "./codeFilter.js"
 import { type FilterArgs, type PersistenceModelType, type Store, type StoreConfig, StoreMaker } from "./service.js"
@@ -37,7 +37,11 @@ const emptyValueFor = (tag: ComputedProjectionIrExpression["_tag"]) => {
     case "relation-count":
     case "relation-distinct-count":
     case "relation-sum":
+    case "relation-sum-expr":
+    case "relation-sum-expr-normalized":
       return 0
+    case "relation-sum-expr-by":
+      return [] as unknown[]
     case "relation-any":
       return false
     case "relation-every":
@@ -63,6 +67,18 @@ const computeProjectionValue = (
   const matches = filter.length === 0
     ? (_value: unknown) => true
     : (value: unknown) => codeFilter3_(filter, value)
+  const evalExpr = (value: unknown, expression: ComputedProjectionMathIrExpression): number => {
+    switch (expression._tag) {
+      case "field": {
+        const v = get(value, expression.field)
+        return typeof v === "number" ? v : Number(v) || 0
+      }
+      case "mul":
+        return evalExpr(value, expression.left) * evalExpr(value, expression.right)
+      default:
+        return assertUnreachable(expression)
+    }
+  }
   switch (computed._tag) {
     case "relation-count":
       return relation.reduce<number>((acc, value) => matches(value) ? acc + 1 : acc, 0)
@@ -83,6 +99,29 @@ const computeProjectionValue = (
         const v = get(value, computed.field)
         return acc + (typeof v === "number" ? v : Number(v) || 0)
       }, 0)
+    case "relation-sum-expr":
+      return relation.reduce<number>((acc, value) => {
+        if (!matches(value)) return acc
+        return acc + evalExpr(value, computed.expression)
+      }, 0)
+    case "relation-sum-expr-by": {
+      const totals = new Map<unknown, number>()
+      for (const value of relation) {
+        if (!matches(value)) continue
+        const unit = get(value, computed.unit)
+        const current = totals.get(unit) ?? 0
+        totals.set(unit, current + evalExpr(value, computed.expression))
+      }
+      return [...totals.entries()].map(([unit, total]) => ({ unit, total }))
+    }
+    case "relation-sum-expr-normalized":
+      return relation.reduce<number>((acc, value) => {
+        if (!matches(value)) return acc
+        const unit = get(value, computed.unit)
+        const factor = unit === computed.toBase ? 1 : computed.factors[String(unit)]
+        if (factor === undefined || !Number.isFinite(factor)) return acc
+        return acc + evalExpr(value, computed.expression) * factor
+      }, 0)
     case "relation-collect": {
       const out: unknown[] = []
       const seen = computed.distinct ? new Set<unknown>() : undefined

package/src/Store/SQL/query.ts

@@ -3,7 +3,7 @@ import { Effect, type NonEmptyReadonlyArray } from "effect-app"
 import { assertUnreachable } from "effect-app/utils"
 import { InfraLogger } from "../../logger.js"
 import type { FilterR, FilterResult } from "../../Model/filter/filterApi.js"
-import type { ComputedProjectionIrExpression } from "../../Model/query.js"
+import type { ComputedProjectionIrExpression, ComputedProjectionMathIrExpression } from "../../Model/query.js"
 import { isRelationCheck } from "../codeFilter.js"
 
 export interface SQLDialect {
@@ -148,6 +148,8 @@ const dottedToJsonPath = (path: string) =>
     .filter((p) => p !== "-1")
     .join(".")
 
+const sqlStringLiteral = (value: string) => `'${value.replaceAll("'", "''")}'`
+
 export function buildWhereSQLQuery(
   dialect: SQLDialect,
   idKey: PropertyKey,
@@ -392,6 +394,23 @@ export function buildWhereSQLQuery(
     const relationPath = dottedToJsonPath(computed.path)
     const relationAlias = `_${computed.path}`
     const relationFrom = dialect.jsonEachFrom(relationPath, relationAlias)
+    const toNumber = (expr: string) =>
+      dialect.jsonColumnType === "JSON" ? `CAST(${expr} AS REAL)` : `(${expr})::numeric`
+    const compileExpr = (expression: ComputedProjectionMathIrExpression): string => {
+      switch (expression._tag) {
+        case "field":
+          return toNumber(dialect.jsonExtractElement(relationAlias, expression.field))
+        case "mul":
+          return `(${compileExpr(expression.left)} * ${compileExpr(expression.right)})`
+        default:
+          return assertUnreachable(expression)
+      }
+    }
+    const factorCaseExpr = (unitExpr: string, toBase: string, factors: Readonly<Record<string, number>>) => {
+      const entries = Object.entries(factors).filter(([, factor]) => Number.isFinite(factor))
+      const cases = entries.map(([unit, factor]) => ` WHEN ${sqlStringLiteral(unit)} THEN ${factor}`).join("")
+      return `CASE ${unitExpr} WHEN ${sqlStringLiteral(toBase)} THEN 1${cases} ELSE NULL END`
+    }
     const whereClause = () =>
       computed.filter.length > 0
         ? ` WHERE ${print(computed.filter, computed.path, false)}`
@@ -418,10 +437,25 @@ export function buildWhereSQLQuery(
       }
       case "relation-sum": {
         const fieldExtract = dialect.jsonExtractElement(relationAlias, computed.field)
-        const cast = dialect.jsonColumnType === "JSON"
-          ? `CAST(${fieldExtract} AS REAL)`
-          : `(${fieldExtract})::numeric`
-        return `(SELECT COALESCE(SUM(${cast}), 0) FROM ${relationFrom}${whereClause()}) AS "${key}"`
+        return `(SELECT COALESCE(SUM(${toNumber(fieldExtract)}), 0) FROM ${relationFrom}${whereClause()}) AS "${key}"`
+      }
+      case "relation-sum-expr": {
+        const expression = compileExpr(computed.expression)
+        return `(SELECT COALESCE(SUM(${expression}), 0) FROM ${relationFrom}${whereClause()}) AS "${key}"`
+      }
+      case "relation-sum-expr-by": {
+        const expression = compileExpr(computed.expression)
+        const unitExpr = dialect.jsonExtractElement(relationAlias, computed.unit)
+        if (dialect.jsonColumnType === "JSON") {
+          return `(SELECT COALESCE(json_group_array(json_object('unit', __unit, 'total', __total)), json_array()) FROM (SELECT ${unitExpr} AS __unit, COALESCE(SUM(${expression}), 0) AS __total FROM ${relationFrom}${whereClause()} GROUP BY ${unitExpr})) AS "${key}"`
+        }
+        return `(SELECT COALESCE(jsonb_agg(jsonb_build_object('unit', __unit, 'total', __total)), '[]'::jsonb) FROM (SELECT ${unitExpr} AS __unit, COALESCE(SUM(${expression}), 0) AS __total FROM ${relationFrom}${whereClause()} GROUP BY ${unitExpr}) __grouped) AS "${key}"`
+      }
+      case "relation-sum-expr-normalized": {
+        const expression = compileExpr(computed.expression)
+        const unitExpr = dialect.jsonExtractElement(relationAlias, computed.unit)
+        const factorExpr = factorCaseExpr(unitExpr, computed.toBase, computed.factors)
+        return `(SELECT COALESCE(SUM((${expression}) * (${factorExpr})), 0) FROM ${relationFrom}${whereClause()}) AS "${key}"`
       }
       case "relation-collect": {
         const fieldExtract = dialect.jsonExtractElement(relationAlias, computed.field)

package/test/dist/rawQuery.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rawQuery.test.d.ts","sourceRoot":"","sources":["../rawQuery.test.ts"],"names":[],"mappings":"AACA,OAAO,EAA+C,cAAc,EAA2C,MAAM,YAAY,CAAA;AAWjI,eAAO,MAAM,EAAE,6CAWb,CAAA"}
+{"version":3,"file":"rawQuery.test.d.ts","sourceRoot":"","sources":["../rawQuery.test.ts"],"names":[],"mappings":"AAEA,OAAO,EAA+C,cAAc,EAA2C,MAAM,YAAY,CAAA;AAUjI,eAAO,MAAM,EAAE,6CAWb,CAAA"}

package/test/query.test.ts

@@ -6,7 +6,7 @@ import { Context, Effect, flow, Layer, Option, pipe, S, Struct } from "effect-ap
 import { inspect } from "util"
 import { expect, expectTypeOf, it } from "vitest"
 import { setupRequestContextFromCurrent } from "../src/api/setupRequest.js"
-import { and, computed, count, make, one, or, order, page, project, projectComputed, type QueryEnd, type QueryProjection, type QueryWhere, relation, toFilter, where } from "../src/Model/query.js"
+import { and, computed, count, expr, make, one, or, order, page, project, projectComputed, type QueryEnd, type QueryProjection, type QueryWhere, relation, toFilter, where } from "../src/Model/query.js"
 import { makeRepo } from "../src/Model/Repository.js"
 import { RepositoryRegistryLive } from "../src/Model/Repository/Registry.js"
 import { memFilter, MemoryStoreLive } from "../src/Store/Memory.js"
@@ -730,6 +730,61 @@ it("projectComputed.collect / collectDistinct emit relation-collect IR", () => {
   expect((distinct as { distinct: boolean } | undefined)?.distinct).toBe(true)
 })
 
+it("projectComputed.sumExpr emits relation-sum-expr IR", () => {
+  const baseSchema = S.Struct({
+    id: S.String,
+    items: S.Array(S.Struct({
+      weight: S.Number,
+      tradeUnit: S.Struct({ amount: S.Number, unit: S.String })
+    }))
+  })
+  const query = make<S.Codec.Encoded<typeof baseSchema>>().pipe(
+    projectComputed(
+      S.Struct({ total: S.Number }),
+      computed({
+        total: relation<S.Codec.Encoded<typeof baseSchema>>("items").sumExpr(
+          expr.mul(expr.field("weight"), expr.field("tradeUnit.amount"))
+        )
+      })
+    )
+  )
+  const interpreted = toFilter(query, baseSchema)
+  const ir = interpreted.computed?.["total"]
+  expect(ir?._tag).toBe("relation-sum-expr")
+  expect((ir as { expression: unknown } | undefined)?.expression).toEqual({
+    _tag: "mul",
+    left: { _tag: "field", field: "weight" },
+    right: { _tag: "field", field: "tradeUnit.amount" }
+  })
+})
+
+it("projectComputed.sumExprBy emits relation-sum-expr-by IR", () => {
+  const baseSchema = S.Struct({
+    id: S.String,
+    items: S.Array(S.Struct({
+      weight: S.Number,
+      tradeUnit: S.Struct({ amount: S.Number, unit: S.String })
+    }))
+  })
+  const query = make<S.Codec.Encoded<typeof baseSchema>>().pipe(
+    projectComputed(
+      S.Struct({
+        totals: S.Array(S.Struct({ unit: S.String, total: S.Number }))
+      }),
+      computed({
+        totals: relation<S.Codec.Encoded<typeof baseSchema>>("items").sumExprBy(
+          expr.mul(expr.field("weight"), expr.field("tradeUnit.amount")),
+          { unit: "tradeUnit.unit" }
+        )
+      })
+    )
+  )
+  const interpreted = toFilter(query, baseSchema)
+  const ir = interpreted.computed?.["totals"]
+  expect(ir?._tag).toBe("relation-sum-expr-by")
+  expect((ir as { unit: string } | undefined)?.unit).toBe("tradeUnit.unit")
+})
+
 it(
   "doesn't mess when refining fields",
   () =>
@@ -1584,6 +1639,57 @@ it("memFilter: computed projection with multi-statement relation filter", () =>
   ])
 })
 
+it("memFilter: relation-sum-expr / sum-expr-by / sum-expr-normalized", () => {
+  const schema = S.Struct({
+    id: S.String,
+    items: S.Array(S.Struct({
+      weight: S.Finite,
+      tradeUnit: S.Struct({ amount: S.Finite, unit: S.String })
+    }))
+  })
+  type Row = S.Codec.Encoded<typeof schema>
+  const rows: Row[] = [
+    {
+      id: "r1",
+      items: [
+        { weight: 2, tradeUnit: { amount: 5, unit: "kg" } },
+        { weight: 4, tradeUnit: { amount: 1000, unit: "g" } },
+        { weight: 3, tradeUnit: { amount: 1, unit: "kg" } }
+      ]
+    },
+    { id: "r2", items: [] }
+  ]
+  const weighted = expr.mul(expr.field("weight"), expr.field("tradeUnit.amount"))
+  const q = make<Row>().pipe(
+    projectComputed(
+      S.Struct({
+        id: S.String,
+        totalRaw: S.Finite,
+        totalsByUnit: S.Array(S.Struct({ unit: S.String, total: S.Finite })),
+        totalKg: S.Finite
+      }),
+      computed({
+        totalRaw: relation<Row>("items").sumExpr(weighted, where("weight", "gte", 0)),
+        totalsByUnit: relation<Row>("items").sumExprBy(weighted, { unit: "tradeUnit.unit" }, where("weight", "gte", 0)),
+        totalKg: relation<Row>("items").sumExprNormalized(weighted, {
+          unit: "tradeUnit.unit",
+          toBase: "kg",
+          factors: { g: 0.001 }
+        }, where("weight", "gte", 0))
+      })
+    )
+  )
+  expect(memFilter(toFilter(q, schema))(rows)).toEqual([
+    {
+      id: "r1",
+      totalRaw: 4013,
+      totalsByUnit: [{ unit: "kg", total: 13 }, { unit: "g", total: 4000 }],
+      totalKg: 17
+    },
+    { id: "r2", totalRaw: 0, totalsByUnit: [], totalKg: 0 }
+  ])
+})
+
 it("memFilter: computed projection combined with root where filter", () => {
   const q = make<ComputedBase>().pipe(
     where("id", "neq", "r3"),
@@ -1680,8 +1786,7 @@ const cfRows: CFRow[] = [
   { id: "4", tag: "y", qty: 30, desc: "World cup", tags: [], nested: { kind: "k2", v: 0 } }
 ]
 
-const runCF = (q: any) =>
-  (memFilter(toFilter(q))(cfRows) as unknown as readonly CFRow[]).map((_) => _.id)
+const runCF = (q: any) => (memFilter(toFilter(q))(cfRows) as unknown as readonly CFRow[]).map((_) => _.id)
 
 it("codeFilter: where + and chain", () => {
   const q = make<CFRow>().pipe(

package/test/rawQuery.test.ts

@@ -1,3 +1,4 @@
+import { SqliteClient } from "@effect/sql-sqlite-node"
 import { describe, expect, it } from "@effect/vitest"
 import { Array, Config, Context, Effect, flow, Layer, ManagedRuntime, Redacted, References, Result, S, Struct } from "effect-app"
 import { LogLevels } from "effect-app/utils"
@@ -5,7 +6,6 @@ import { setupRequestContextFromCurrent } from "../src/api/setupRequest.js"
 import { and, computed, or, project, projectComputed, relation, where, whereEvery, whereSome } from "../src/Model/query.js"
 import { makeRepo } from "../src/Model/Repository/makeRepo.js"
 import { RepositoryRegistryLive } from "../src/Model/Repository/Registry.js"
-import { SqliteClient } from "@effect/sql-sqlite-node"
 import { CosmosStoreLayer } from "../src/Store/Cosmos.js"
 import { MemoryStoreLive } from "../src/Store/Memory.js"
 import { SQLiteStoreLayer } from "../src/Store/SQL.js"
@@ -596,11 +596,9 @@ describe("scanner-style AllPickList computed projections", () => {
     })
     .pipe(setupRequestContextFromCurrent())
 
-  it("works well in Memory", () =>
-    test.pipe(Effect.provide(OrderRepo.Test), rt.runPromise))
+  it("works well in Memory", () => test.pipe(Effect.provide(OrderRepo.Test), rt.runPromise))
 
-  it("works well in SQLite", () =>
-    test.pipe(Effect.provide(OrderRepo.TestSqlite), rt.runPromise))
+  it("works well in SQLite", () => test.pipe(Effect.provide(OrderRepo.TestSqlite), rt.runPromise))
 })
 
 // Same but mimics the FULL controller projection: includes `items` array
@@ -647,11 +645,9 @@ describe("scanner-style AllPickList — items + computed combined", () => {
     })
     .pipe(setupRequestContextFromCurrent())
 
-  it("works well in Memory", () =>
-    test.pipe(Effect.provide(OrderRepo.Test), rt.runPromise))
+  it("works well in Memory", () => test.pipe(Effect.provide(OrderRepo.Test), rt.runPromise))
 
-  it("works well in SQLite", () =>
-    test.pipe(Effect.provide(OrderRepo.TestSqlite), rt.runPromise))
+  it("works well in SQLite", () => test.pipe(Effect.provide(OrderRepo.TestSqlite), rt.runPromise))
 })
 
 describe("removeByIds", () => {

package/test/sql-store.test.ts

@@ -345,6 +345,90 @@ describe("SQL query builder (SQLite dialect)", () => {
     expect(result.sql).toContain(`AS "totalWeight"`)
   })
 
+  it("computed relation-sum-expr projection (sqlite)", () => {
+    const result = buildWhereSQLQuery(
+      sqliteDialect,
+      "id",
+      [],
+      "users",
+      {},
+      [{
+        key: "totalWeighted",
+        computed: {
+          _tag: "relation-sum-expr",
+          path: "items",
+          expression: {
+            _tag: "mul",
+            left: { _tag: "field", field: "weight" },
+            right: { _tag: "field", field: "tradeUnit.amount" }
+          },
+          filter: []
+        }
+      }]
+    )
+    expect(result.sql).toContain(
+      `COALESCE(SUM((CAST(json_extract(_items.value, '$.weight') AS REAL) * CAST(json_extract(_items.value, '$.tradeUnit.amount') AS REAL))), 0)`
+    )
+    expect(result.sql).toContain(`AS "totalWeighted"`)
+  })
+
+  it("computed relation-sum-expr-by projection (sqlite)", () => {
+    const result = buildWhereSQLQuery(
+      sqliteDialect,
+      "id",
+      [],
+      "users",
+      {},
+      [{
+        key: "totalsByUnit",
+        computed: {
+          _tag: "relation-sum-expr-by",
+          path: "items",
+          expression: {
+            _tag: "mul",
+            left: { _tag: "field", field: "weight" },
+            right: { _tag: "field", field: "tradeUnit.amount" }
+          },
+          unit: "tradeUnit.unit",
+          filter: []
+        }
+      }]
+    )
+    expect(result.sql).toContain(`json_group_array(json_object('unit', __unit, 'total', __total))`)
+    expect(result.sql).toContain(`GROUP BY json_extract(_items.value, '$.tradeUnit.unit')`)
+    expect(result.sql).toContain(`AS "totalsByUnit"`)
+  })
+
+  it("computed relation-sum-expr-normalized projection (sqlite)", () => {
+    const result = buildWhereSQLQuery(
+      sqliteDialect,
+      "id",
+      [],
+      "users",
+      {},
+      [{
+        key: "totalKg",
+        computed: {
+          _tag: "relation-sum-expr-normalized",
+          path: "items",
+          expression: {
+            _tag: "mul",
+            left: { _tag: "field", field: "weight" },
+            right: { _tag: "field", field: "tradeUnit.amount" }
+          },
+          unit: "tradeUnit.unit",
+          toBase: "kg",
+          factors: { g: 0.001 },
+          filter: []
+        }
+      }]
+    )
+    expect(result.sql).toContain(
+      `CASE json_extract(_items.value, '$.tradeUnit.unit') WHEN 'kg' THEN 1 WHEN 'g' THEN 0.001 ELSE NULL END`
+    )
+    expect(result.sql).toContain(`AS "totalKg"`)
+  })
+
   it("computed relation-collect (non-distinct) projection (sqlite)", () => {
     const result = buildWhereSQLQuery(
       sqliteDialect,
@@ -515,6 +599,88 @@ describe("SQL query builder (PostgreSQL dialect)", () => {
     expect(result.sql).toContain(`AS "totalWeight"`)
   })
 
+  it("computed relation-sum-expr (pg)", () => {
+    const result = buildWhereSQLQuery(
+      pgDialect,
+      "id",
+      [],
+      "users",
+      {},
+      [{
+        key: "totalWeighted",
+        computed: {
+          _tag: "relation-sum-expr",
+          path: "items",
+          expression: {
+            _tag: "mul",
+            left: { _tag: "field", field: "weight" },
+            right: { _tag: "field", field: "tradeUnit.amount" }
+          },
+          filter: []
+        }
+      }]
+    )
+    expect(result.sql).toContain(
+      `COALESCE(SUM(((_items->>'weight')::numeric * (_items->'tradeUnit'->>'amount')::numeric)), 0)`
+    )
+    expect(result.sql).toContain(`AS "totalWeighted"`)
+  })
+
+  it("computed relation-sum-expr-by (pg)", () => {
+    const result = buildWhereSQLQuery(
+      pgDialect,
+      "id",
+      [],
+      "users",
+      {},
+      [{
+        key: "totalsByUnit",
+        computed: {
+          _tag: "relation-sum-expr-by",
+          path: "items",
+          expression: {
+            _tag: "mul",
+            left: { _tag: "field", field: "weight" },
+            right: { _tag: "field", field: "tradeUnit.amount" }
+          },
+          unit: "tradeUnit.unit",
+          filter: []
+        }
+      }]
+    )
+    expect(result.sql).toContain(`jsonb_agg(jsonb_build_object('unit', __unit, 'total', __total))`)
+    expect(result.sql).toContain(`GROUP BY _items->'tradeUnit'->>'unit'`)
+    expect(result.sql).toContain(`AS "totalsByUnit"`)
+  })
+
+  it("computed relation-sum-expr-normalized (pg)", () => {
+    const result = buildWhereSQLQuery(
+      pgDialect,
+      "id",
+      [],
+      "users",
+      {},
+      [{
+        key: "totalKg",
+        computed: {
+          _tag: "relation-sum-expr-normalized",
+          path: "items",
+          expression: {
+            _tag: "mul",
+            left: { _tag: "field", field: "weight" },
+            right: { _tag: "field", field: "tradeUnit.amount" }
+          },
+          unit: "tradeUnit.unit",
+          toBase: "kg",
+          factors: { g: 0.001 },
+          filter: []
+        }
+      }]
+    )
+    expect(result.sql).toContain(`CASE _items->'tradeUnit'->>'unit' WHEN 'kg' THEN 1 WHEN 'g' THEN 0.001 ELSE NULL END`)
+    expect(result.sql).toContain(`AS "totalKg"`)
+  })
+
   it("computed relation-collect (pg jsonb_agg)", () => {
     const result = buildWhereSQLQuery(
       pgDialect,