@effect-app/infra 4.0.0-beta.22 → 4.0.0-beta.220

package/src/Model/query/dsl.ts

@@ -54,7 +54,7 @@ type ExtractFieldValuesRefined<T> = T extends QueryTogether<any, infer TFieldVal
 
 export type RelationDirection = "some" | "every"
 export type Relation = { relation: RelationDirection }
-export type Query<TFieldValues extends FieldValues> = QueryTogether<TFieldValues, TFieldValues, false, "initial">
+export type Query<TFieldValues extends FieldValues> = QueryTogether<TFieldValues, TFieldValues>
 export type QueryWhere<
   TFieldValues extends FieldValues,
   TFieldValuesRefined extends TFieldValues = TFieldValues,
@@ -97,6 +97,86 @@ export type QueryProjection<
   R,
   TType
 >
+
+export type ComputedProjectionOperation = (q: Query<any>) => QueryWhere<any, any, any>
+
+export type ComputedProjectionMathExpression =
+  | {
+    readonly _tag: "field"
+    readonly field: string
+  }
+  | {
+    readonly _tag: "mul"
+    readonly left: ComputedProjectionMathExpression
+    readonly right: ComputedProjectionMathExpression
+  }
+
+export type ComputedProjectionExpression =
+  | {
+    readonly _tag: "relation-count"
+    readonly path: string
+    readonly operation?: ComputedProjectionOperation
+  }
+  | {
+    readonly _tag: "relation-any"
+    readonly path: string
+    readonly operation?: ComputedProjectionOperation
+  }
+  | {
+    readonly _tag: "relation-every"
+    readonly path: string
+    readonly operation: ComputedProjectionOperation
+  }
+  | {
+    readonly _tag: "relation-distinct-count"
+    readonly path: string
+    readonly field: string
+    readonly operation?: ComputedProjectionOperation
+  }
+  | {
+    readonly _tag: "relation-sum"
+    readonly path: string
+    readonly field: string
+    readonly operation?: ComputedProjectionOperation
+  }
+  | {
+    readonly _tag: "relation-sum-expr"
+    readonly path: string
+    readonly expression: ComputedProjectionMathExpression
+    readonly operation?: ComputedProjectionOperation
+  }
+  | {
+    readonly _tag: "relation-sum-expr-by"
+    readonly path: string
+    readonly expression: ComputedProjectionMathExpression
+    readonly unit: string
+    readonly operation?: ComputedProjectionOperation
+  }
+  | {
+    readonly _tag: "relation-sum-expr-normalized"
+    readonly path: string
+    readonly expression: ComputedProjectionMathExpression
+    readonly unit: string
+    readonly toBase: string
+    readonly factors: Readonly<Record<string, number>>
+    readonly operation?: ComputedProjectionOperation
+  }
+  | {
+    readonly _tag: "relation-collect"
+    readonly path: string
+    readonly field: string
+    readonly distinct: boolean
+    readonly operation?: ComputedProjectionOperation
+  }
+  | {
+    readonly _tag: "relation-collect-fields"
+    readonly path: string
+    readonly fields: readonly string[]
+    readonly distinct: boolean
+    readonly operation?: ComputedProjectionOperation
+  }
+
+export type ComputedProjectionMap = Readonly<Record<string, ComputedProjectionExpression>>
 export type Q<TFieldValues extends FieldValues> =
   | Initial<TFieldValues>
   | Where<TFieldValues>
@@ -211,6 +291,7 @@ export class Project<A, TFieldValues extends FieldValues, R, TType extends "one"
     current: Query<TFieldValues> | QueryWhere<any, TFieldValues> | QueryEnd<TFieldValues, TType>
     schema: S.Codec<A, TFieldValues, R>
     mode: "collect" | "project" | "transform"
+    computed?: ComputedProjectionMap
   }>
   implements QueryProjection<TFieldValues, A, R>
 {
@@ -299,6 +380,35 @@ export const count: {
   ): QueryProjection<ExtractFieldValuesRefined<Q>, NonNegativeInt, never, "count", ExtractExclusiveness<Q>>
 } = (current) => new Count({ current })
 
+/**
+ * Attach a projection schema to a query.
+ *
+ * The `select` clause sent to the store is derived from the schema's encoded
+ * AST property names (top-level + per-array sub-keys), so a projection always
+ * narrows what is read from the store. The repository augments that select
+ * with `id` and `_etag` for change tracking. See {@link toFilter} and the
+ * dispatch in `Repository/internal/internal.ts`.
+ *
+ * Modes — pick based on shape of the decoded value and on whether the
+ * persistence-model (PM) reverse-mapping is needed:
+ *
+ * - `"transform"` (default when `mode` omitted): goes through the repo's
+ *   `parseMany`/`parseMany2` pipeline. The raw row is reverse-mapped via the
+ *   etag/PM cache (re-injecting `_etag` and any PM-shape state) before
+ *   decoding. Decode failures `orDie` (error channel = `never`). Use when
+ *   the schema operates on the full PM shape (e.g. full-entity reads that
+ *   must preserve etag tracking).
+ *
+ * - `"project"`: decodes the raw encoded row directly with the supplied
+ *   schema. No PM reverse-mapping, no etag cache merge. Decode failures
+ *   surface as `S.SchemaError`. Use for slim DTOs / aggregations that do not
+ *   need etag tracking and whose schema input is a plain subset of `Encoded`.
+ *
+ * - `"collect"`: like `"project"`, but the schema yields `Option<A>` and
+ *   `None` values are dropped post-decode (`Array.getSomes`). Use to filter
+ *   rows during decode (e.g. discriminated-union narrowing where some rows
+ *   should not appear in the result).
+ */
 export const project: {
   <
     Q extends Query<any> | QueryWhere<any, any, any> | QueryEnd<any, "one" | "many", any>,
@@ -356,6 +466,226 @@ export const project: {
   ) => QueryProjection<ExtractFieldValuesRefined<Q>, A, R, ExtractTType<Q>, E>
 } = (schema: any, mode = "transform") => (current: any) => new Project({ current, schema, mode } as any)
 
+export const relation = <TFieldValues extends FieldValues>(
+  path: FieldPath<TFieldValues>
+) => ({
+  count: (operation?: ComputedProjectionOperation): ComputedProjectionExpression =>
+    operation
+      ? {
+        _tag: "relation-count",
+        path: path as string,
+        operation
+      }
+      : {
+        _tag: "relation-count",
+        path: path as string
+      },
+  any: (operation?: ComputedProjectionOperation): ComputedProjectionExpression =>
+    operation
+      ? {
+        _tag: "relation-any",
+        path: path as string,
+        operation
+      }
+      : {
+        _tag: "relation-any",
+        path: path as string
+      },
+  every: (operation: ComputedProjectionOperation): ComputedProjectionExpression => ({
+    _tag: "relation-every",
+    path: path as string,
+    operation
+  }),
+  distinctCount: (field: string, operation?: ComputedProjectionOperation): ComputedProjectionExpression =>
+    operation
+      ? {
+        _tag: "relation-distinct-count",
+        path: path as string,
+        field,
+        operation
+      }
+      : {
+        _tag: "relation-distinct-count",
+        path: path as string,
+        field
+      },
+  sum: (field: string, operation?: ComputedProjectionOperation): ComputedProjectionExpression =>
+    operation
+      ? {
+        _tag: "relation-sum",
+        path: path as string,
+        field,
+        operation
+      }
+      : {
+        _tag: "relation-sum",
+        path: path as string,
+        field
+      },
+  sumExpr: (
+    expression: ComputedProjectionMathExpression,
+    operation?: ComputedProjectionOperation
+  ): ComputedProjectionExpression =>
+    operation
+      ? {
+        _tag: "relation-sum-expr",
+        path: path as string,
+        expression,
+        operation
+      }
+      : {
+        _tag: "relation-sum-expr",
+        path: path as string,
+        expression
+      },
+  sumExprBy: (
+    expression: ComputedProjectionMathExpression,
+    options: { unit: string },
+    operation?: ComputedProjectionOperation
+  ): ComputedProjectionExpression =>
+    operation
+      ? {
+        _tag: "relation-sum-expr-by",
+        path: path as string,
+        expression,
+        unit: options.unit,
+        operation
+      }
+      : {
+        _tag: "relation-sum-expr-by",
+        path: path as string,
+        expression,
+        unit: options.unit
+      },
+  sumExprNormalized: (
+    expression: ComputedProjectionMathExpression,
+    options: { unit: string; toBase: string; factors: Readonly<Record<string, number>> },
+    operation?: ComputedProjectionOperation
+  ): ComputedProjectionExpression =>
+    operation
+      ? {
+        _tag: "relation-sum-expr-normalized",
+        path: path as string,
+        expression,
+        unit: options.unit,
+        toBase: options.toBase,
+        factors: options.factors,
+        operation
+      }
+      : {
+        _tag: "relation-sum-expr-normalized",
+        path: path as string,
+        expression,
+        unit: options.unit,
+        toBase: options.toBase,
+        factors: options.factors
+      },
+  collect: (field: string, operation?: ComputedProjectionOperation): ComputedProjectionExpression =>
+    operation
+      ? {
+        _tag: "relation-collect",
+        path: path as string,
+        field,
+        distinct: false,
+        operation
+      }
+      : {
+        _tag: "relation-collect",
+        path: path as string,
+        field,
+        distinct: false
+      },
+  collectDistinct: (field: string, operation?: ComputedProjectionOperation): ComputedProjectionExpression =>
+    operation
+      ? {
+        _tag: "relation-collect",
+        path: path as string,
+        field,
+        distinct: true,
+        operation
+      }
+      : {
+        _tag: "relation-collect",
+        path: path as string,
+        field,
+        distinct: true
+      },
+  collectFields: (fields: readonly string[], operation?: ComputedProjectionOperation): ComputedProjectionExpression =>
+    operation
+      ? {
+        _tag: "relation-collect-fields",
+        path: path as string,
+        fields,
+        distinct: false,
+        operation
+      }
+      : {
+        _tag: "relation-collect-fields",
+        path: path as string,
+        fields,
+        distinct: false
+      },
+  collectDistinctFields: (
+    fields: readonly string[],
+    operation?: ComputedProjectionOperation
+  ): ComputedProjectionExpression =>
+    operation
+      ? {
+        _tag: "relation-collect-fields",
+        path: path as string,
+        fields,
+        distinct: true,
+        operation
+      }
+      : {
+        _tag: "relation-collect-fields",
+        path: path as string,
+        fields,
+        distinct: true
+      }
+})
+
+export const expr = {
+  field: (field: string): ComputedProjectionMathExpression => ({ _tag: "field", field }),
+  mul: (
+    left: ComputedProjectionMathExpression,
+    right: ComputedProjectionMathExpression
+  ): ComputedProjectionMathExpression => ({ _tag: "mul", left, right })
+} as const
+
+export const computed = <T extends ComputedProjectionMap>(value: T): T => value
+
+export const projectComputed: {
+  <
+    Q extends Query<any> | QueryWhere<any, any, any> | QueryEnd<any, "one" | "many", any>,
+    I extends Record<string, unknown>,
+    A = ExtractFieldValuesRefined<Q>,
+    R = never,
+    E extends boolean = ExtractExclusiveness<Q>
+  >(
+    schema: S.Codec<Option.Option<A>, I, R>,
+    computedProjection: ComputedProjectionMap,
+    mode: "collect"
+  ): (
+    current: Q
+  ) => QueryProjection<ExtractFieldValuesRefined<Q>, A, R, ExtractTType<Q>, E>
+
+  <
+    Q extends Query<any> | QueryWhere<any, any, any> | QueryEnd<any, "one" | "many", any>,
+    I extends Record<string, unknown>,
+    A = ExtractFieldValuesRefined<Q>,
+    R = never,
+    E extends boolean = ExtractExclusiveness<Q>
+  >(
+    schema: S.Codec<A, I, R>,
+    computedProjection: ComputedProjectionMap,
+    mode?: "project"
+  ): (
+    current: Q
+  ) => QueryProjection<ExtractFieldValuesRefined<Q>, A, R, ExtractTType<Q>, E>
+} = (schema: any, computedProjection: ComputedProjectionMap, mode = "project") => (current: any) =>
+  new Project({ current, schema, mode, computed: computedProjection } as any)
+
 type GetArV<T> = T extends readonly (infer R)[] ? R : never
 
 export type FilterContinuations<IsCurrentInitial extends boolean = false> = {
@@ -1538,7 +1868,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues, TFieldValuesRefined2, E2>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined2, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined2>
 
   <
     TFieldValues extends FieldValues,
@@ -1555,7 +1885,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined3, E3>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined3, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined3>
 
   <
     TFieldValues extends FieldValues,
@@ -1577,7 +1907,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined4, E4>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined4, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined4>
 
   <
     TFieldValues extends FieldValues,
@@ -1604,7 +1934,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined5, E5>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined5, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined5>
 
   <
     TFieldValues extends FieldValues,
@@ -1636,7 +1966,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined6, E6>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined6, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined6>
 
   <
     TFieldValues extends FieldValues,
@@ -1673,7 +2003,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined7, E7>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined7, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined7>
 
   <
     TFieldValues extends FieldValues,
@@ -1715,7 +2045,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined8, E8>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined2, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined2>
 
   <
     TFieldValues extends FieldValues,
@@ -1762,7 +2092,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined9, E9>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined9, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined9>
 
   <
     TFieldValues extends FieldValues,
@@ -1814,7 +2144,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined10, E10>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined10, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined10>
 
   <
     TFieldValues extends FieldValues,
@@ -1871,7 +2201,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined11, E11>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined11, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined11>
 
   <
     TFieldValues extends FieldValues,
@@ -1933,7 +2263,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined12, E12>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined12, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined12>
 
   <
     TFieldValues extends FieldValues,
@@ -2000,7 +2330,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined13, E13>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined13, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined13>
 
   <
     TFieldValues extends FieldValues,
@@ -2072,7 +2402,7 @@ export type NestedQueriesFreeDisjointRefinement = {
     ) => QueryWhere<TFieldValues, TFieldValuesRefined14, E14>
   ): (
     current: QueryWhere<TFieldValues, TFieldValuesRefined, E>
-  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined14, false>
+  ) => QueryWhere<TFieldValues, TFieldValuesRefined | TFieldValuesRefined14>
 }
 
 export type FilterWhere =
@@ -2099,12 +2429,12 @@ export type WhereEveryOrSome =
       subPath: TFieldName,
       dude: (
         current: Query<TFieldValues[TFieldName][number]>
-      ) => QueryWhere<TFieldValues[TFieldName][number], TFieldValues[TFieldName][number], false>,
+      ) => QueryWhere<TFieldValues[TFieldName][number], TFieldValues[TFieldName][number]>,
       ...dudes: ((
-        current: QueryWhere<TFieldValues[TFieldName][number], TFieldValues[TFieldName][number], false>
-      ) => QueryWhere<TFieldValues[TFieldName][number], TFieldValues[TFieldName][number], false>)[]
+        current: QueryWhere<TFieldValues[TFieldName][number], TFieldValues[TFieldName][number]>
+      ) => QueryWhere<TFieldValues[TFieldName][number], TFieldValues[TFieldName][number]>)[]
     ): (
       current: Query<TFieldValues>
-    ) => QueryWhere<TFieldValues, TFieldValues, false>
+    ) => QueryWhere<TFieldValues, TFieldValues>
   }
   & FilterContinuationsWithSubpath