@effect-app/infra 4.0.0-beta.294 → 4.0.0-beta.296

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @effect-app/infra
 
+## 4.0.0-beta.296
+
+### Patch Changes
+
+- Updated dependencies [e0c4835]
+  - effect-app@4.0.0-beta.296
+
+## 4.0.0-beta.295
+
+### Patch Changes
+
+- eb06b32: improve root union select
+- Updated dependencies [eb06b32]
+  - effect-app@4.0.0-beta.295
+
 ## 4.0.0-beta.294
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "4.0.0-beta.294",
+  "version": "4.0.0-beta.296",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -10,7 +10,7 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "8.4.0",
     "query-string": "^9.4.0",
-    "effect-app": "4.0.0-beta.294"
+    "effect-app": "4.0.0-beta.296"
   },
   "devDependencies": {
     "@azure/cosmos": "^4.9.3",

package/test/cosmos-query.test.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { and, computed, make, projectComputed, relation, toFilter, where } from "effect-app/Model/query"
+import { and, computed, make, project, projectComputed, relation, toFilter, where } from "effect-app/Model/query"
 import * as S from "effect-app/Schema"
 import { describe, expect, it } from "vitest"
 import { buildWhereCosmosQuery3 } from "../src/Store/Cosmos/query.js"
@@ -40,6 +40,75 @@ describe("cosmos query projection: array length", () => {
   })
 })
 
+describe("cosmos query projection: union array fields", () => {
+  const PackageView = S.Array(S.Struct({ carrier: S.String }))
+
+  class UnionOrder extends S.Class<UnionOrder>("UnionOrder")({
+    id: S.String,
+    _tag: S.Literals(["picked", "packed"]),
+    packages: PackageView
+  }) {}
+
+  type UnionOrderEnc = S.Codec.Encoded<typeof UnionOrder>
+
+  const ProjectProjection = S.Union([
+    S.TaggedStruct("picked", {
+      id: S.String,
+      packages: PackageView
+    }),
+    S.TaggedStruct("packed", {
+      id: S.String,
+      packages: PackageView
+    })
+  ])
+
+  const ComputedProjection = S.Union([
+    S.TaggedStruct("picked", {
+      id: S.String,
+      packages: PackageView,
+      packageCount: S.NonNegativeInt
+    }),
+    S.TaggedStruct("packed", {
+      id: S.String,
+      packages: PackageView,
+      packageCount: S.NonNegativeInt
+    })
+  ])
+
+  it("dedupes array selects for project union schemas", () => {
+    const q = make<UnionOrderEnc>().pipe(project(ProjectProjection))
+
+    const ir = toFilter(q as any, UnionOrder as any)
+    const select: readonly unknown[] = ir.select ?? []
+    const packageSelects = select.filter((item) =>
+      typeof item === "object" && item !== null && "key" in item && item.key === "packages"
+    )
+    const result = buildWhereCosmosQuery3("id", ir.filter ?? [], "Orders", {}, ir.select as any)
+
+    expect(packageSelects).toHaveLength(1)
+    expect(result.query.match(/\bAS\s+packages\b/g) ?? []).toHaveLength(1)
+  })
+
+  it("dedupes array selects for projectComputed union schemas", () => {
+    const q = make<UnionOrderEnc>().pipe(
+      projectComputed(
+        ComputedProjection,
+        computed({ packageCount: relation<UnionOrderEnc>("packages").length() })
+      )
+    )
+
+    const ir = toFilter(q as any, UnionOrder as any)
+    const select: readonly unknown[] = ir.select ?? []
+    const packageSelects = select.filter((item) =>
+      typeof item === "object" && item !== null && "key" in item && item.key === "packages"
+    )
+    const result = buildWhereCosmosQuery3("id", ir.filter ?? [], "Orders", {}, ir.select as any)
+
+    expect(packageSelects).toHaveLength(1)
+    expect(result.query.match(/\bAS\s+packages\b/g) ?? []).toHaveLength(1)
+  })
+})
+
 // Regression: `relation-every` previously walked its filter twice (once for the
 // shared `where` variable, once for the NOT-EXISTS branch), double-bumping the
 // shared `i` counter and shifting every subsequent @v index against the bound