@effect-app/infra 0.200.3 → 0.201.1

package/src/services/RepositoryBase.ts

@@ -26,13 +26,14 @@ import { makeFilters } from "@effect-app/infra/filter"
 import type { ParseResult, Schema } from "@effect-app/schema"
 import { NonNegativeInt } from "@effect-app/schema"
 import type { Context, NonEmptyArray, NonEmptyReadonlyArray } from "effect-app"
-import { Chunk, Effect, flow, Option, pipe, PubSub, ReadonlyArray, S } from "effect-app"
+import { Chunk, Effect, flow, Option, pipe, PubSub, ReadonlyArray, S, Unify } from "effect-app"
 import { runTerm } from "effect-app/Pure"
 import type { FixEnv, PureEnv } from "effect-app/Pure"
 import { assignTag } from "effect-app/service"
+import type { NoInfer } from "effect/Types"
 import { type InvalidStateError, NotFoundError, type OptimisticConcurrencyException } from "../errors.js"
 import type { FieldValues } from "../filter/types.js"
-import { make as makeQuery, page, query } from "./query.js"
+import { make as makeQuery, page } from "./query.js"
 import type { QAll, Query, QueryEnd, QueryProjection, QueryWhere } from "./query.js"
 import * as Q2 from "./query.js"
 import { ContextMapContainer } from "./Store/ContextMapContainer.js"
@@ -198,7 +199,7 @@ export class RepositoryBaseC3<
     q: (q: Query<Omit<PM, "_etag">>) => Query<Omit<PM, "_etag">> | QueryEnd<Omit<PM, "_etag">>,
     pure: Effect<A, E2, FixEnv<R2, Evt, T, T2>>
   ) =>
-    this.q2(flow(q, page({ limit: 1 }))).pipe(
+    this.q2(flow(q, page({ take: 1 }))).pipe(
       Effect.map(ReadonlyArray.toNonEmptyArray),
       Effect.flatMap(Effect.mapError(() => new NotFoundError({ type: this.itemType, id: q }))),
       Effect.andThen((_) => saveWithPure_(this, _[0], pure))
@@ -209,7 +210,7 @@ export class RepositoryBaseC3<
     pure: Effect<A, E2, FixEnv<R2, Evt, readonly T[], readonly T2[]>>,
     batchSize?: number
   ) =>
-    this.q2(flow(q, page({ limit: 1 }))).pipe(
+    this.q2(flow(q, page({ take: 1 }))).pipe(
       Effect.andThen((_) =>
         batchSize === undefined
           ? saveManyWithPure_(this, _, pure)
@@ -785,6 +786,50 @@ export function makeRepo<
             })
           }
 
+          const query: {
+            <
+              T extends { id: unknown },
+              PM extends PersistenceModelType<string>,
+              Evt,
+              ItemType extends string,
+              A,
+              R,
+              From extends FieldValues
+            >(
+              repo: Repository<T, PM, Evt, ItemType>,
+              q: QueryProjection<PM extends From ? From : never, A, R>
+            ): Effect.Effect<readonly A[], S.ParseResult.ParseError, R>
+            <
+              T extends { id: unknown },
+              PM extends PersistenceModelType<string>,
+              Evt,
+              ItemType extends string,
+              A,
+              R
+            >(
+              repo: Repository<T, PM, Evt, ItemType>,
+              q: QAll<NoInfer<PM>, A, R>
+            ): Effect.Effect<readonly A[], never, R>
+          } = (<
+            T extends { id: unknown },
+            PM extends PersistenceModelType<string>,
+            Evt,
+            ItemType extends string,
+            A,
+            R
+          >(repo: Repository<T, PM, Evt, ItemType>, q: QAll<PM, A, R>) => {
+            const a = Q2.toFilter(q)
+            return Effect.flatMap(
+              repo.utils.filter(a),
+              (_) =>
+                Unify.unify(
+                  a.schema
+                    ? repo.utils.parseMany2(_, a.schema as any)
+                    : repo.utils.parseMany(_)
+                )
+            )
+          }) as any
+
           const r: Repository<T, PM, Evt, ItemType> = {
             /**
              * @internal

package/src/services/query/dsl.ts

@@ -84,7 +84,7 @@ export class Or<TFieldValues extends FieldValues> extends Data.TaggedClass("or")
 
 export class Page<TFieldValues extends FieldValues> extends Data.TaggedClass("page")<{
   current: Query<TFieldValues> | QueryWhere<TFieldValues> | QueryEnd<TFieldValues>
-  limit?: number | undefined
+  take?: number | undefined
   skip?: number | undefined
 }> implements QueryEnd<TFieldValues> {
   readonly [QId]!: any
@@ -120,17 +120,17 @@ export const or: FilterContinuation = (...operation: any[]) => (current: any) =>
 
 export const order: <TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues>>(
   field: TFieldName,
-  desc?: boolean
+  direction?: "ASC" | "DESC"
 ) => (current: Query<TFieldValues> | QueryWhere<TFieldValues> | QueryEnd<TFieldValues>) => QueryEnd<TFieldValues> =
-  (field, desc) => (current) => new Order({ current, field, direction: desc ? "DESC" : "ASC" })
+  (field, direction = "ASC") => (current) => new Order({ current, field, direction })
 
 export const page: <TFieldValues extends FieldValues>(
-  page: { limit?: number; skip?: number }
+  page: { skip?: number; take?: number }
 ) => (current: Query<TFieldValues> | QueryWhere<TFieldValues> | QueryEnd<TFieldValues>) => QueryEnd<TFieldValues> =
-  ({ limit, skip }) => (current) =>
+  ({ skip, take }) => (current) =>
     new Page({
       current,
-      limit,
+      take,
       skip
     })
 

package/src/services/query/new-kid-interpreter.ts

@@ -1,41 +1,51 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { toNonEmptyArray } from "@effect-app/core/Array"
-import { Effect, Match, Option, pipe, S, Unify } from "effect-app"
-import type { NoInfer } from "effect/Types"
+import { Match, Option, pipe, S } from "effect-app"
+import { dropUndefinedT } from "effect-app/utils"
 import type { FieldValues } from "../../filter/types.js"
 import type { FieldPath } from "../../filter/types/path/eager.js"
-import { make, type Q, type QAll, type QueryProjection } from "../query.js"
-import type { Repository } from "../Repository.js"
-import type { PersistenceModelType } from "../Store.js"
+import { make, type Q, type QAll } from "../query.js"
 import type { FilterResult, QueryBuilder } from "../Store/filterApi/query.js"
 
+type Result<TFieldValues extends FieldValues, A = TFieldValues, R = never> = {
+  filter: FilterResult[]
+  schema: S.Schema<A, TFieldValues, R> | undefined
+  limit: number | undefined
+  skip: number | undefined
+  order: { key: FieldPath<TFieldValues>; direction: "ASC" | "DESC" }[]
+}
+
 const interpret = <TFieldValues extends FieldValues, A = TFieldValues, R = never>(_: QAll<TFieldValues, A, R>) => {
-  const values: FilterResult[] = []
   const a = _ as Q<TFieldValues>
 
-  let schema: S.Schema<A, TFieldValues, R> | undefined = undefined as any
-  let limit: number | undefined = undefined as any
-  let skip: number | undefined = undefined as any
-  const order: { field: FieldPath<TFieldValues>; direction: "ASC" | "DESC" }[] = []
+  const data: Result<TFieldValues, any, any> = {
+    filter: [],
+    schema: undefined,
+    limit: undefined,
+    skip: undefined,
+    order: []
+  }
 
-  const upd = (v: { schema: any; limit: any; skip: any; filter: readonly FilterResult[]; order: any[] }) => {
-    values.push(...v.filter)
-    order.push(...v.order)
-    limit = v.limit
-    skip = v.skip
-    schema = v.schema
+  const upd = (
+    v: Result<TFieldValues, any, any>
+  ) => {
+    data.filter.push(...v.filter)
+    data.order.push(...v.order)
+    data.limit = v.limit
+    data.skip = v.skip
+    data.schema = v.schema
   }
 
   pipe(
     a,
     Match.valueTags({
       value: () => {
-        // values.push(value)
+        // data.filter.push(value)
       },
       where: ({ current, operation }) => {
         upd(interpret(current))
-        values.push(
+        data.filter.push(
           {
             t: "where",
             path: operation[0],
@@ -47,11 +57,11 @@ const interpret = <TFieldValues extends FieldValues, A = TFieldValues, R = never
       and: ({ current, operation }) => {
         upd(interpret(current))
         if (typeof operation === "function") {
-          values.push(
+          data.filter.push(
             { t: "and-scope", result: interpret(operation(make())).filter }
           )
         } else {
-          values.push(
+          data.filter.push(
             {
               t: "and",
               path: operation[0],
@@ -64,11 +74,11 @@ const interpret = <TFieldValues extends FieldValues, A = TFieldValues, R = never
       or: ({ current, operation }) => {
         upd(interpret(current))
         if (typeof operation === "function") {
-          values.push(
+          data.filter.push(
             { t: "or-scope", result: interpret(operation(make())).filter }
           )
         } else {
-          values.push(
+          data.filter.push(
             {
               t: "or",
               path: operation[0],
@@ -78,66 +88,36 @@ const interpret = <TFieldValues extends FieldValues, A = TFieldValues, R = never
           )
         }
       },
-      order: ({ current }) => {
+      order: ({ current, direction, field }) => {
         upd(interpret(current))
+        data.order.push({ key: field, direction })
       },
       page: (v) => {
         upd(interpret(v.current))
-        limit = v.limit
-        skip = v.skip
+        data.limit = v.take
+        data.skip = v.skip
       },
       project: (v) => {
         upd(interpret(v.current))
-        schema = v.schema
+        data.schema = v.schema
       }
     })
   )
 
-  return {
-    filter: values,
-    limit,
-    skip,
-    schema,
-    order
-  }
+  return data
 }
 
-export const query: {
-  <
-    T extends { id: unknown },
-    PM extends PersistenceModelType<string>,
-    Evt,
-    ItemType extends string,
-    A,
-    R,
-    From extends FieldValues
-  >(
-    repo: Repository<T, PM, Evt, ItemType>,
-    q: QueryProjection<PM extends From ? From : never, A, R>
-  ): Effect.Effect<readonly A[], S.ParseResult.ParseError, R>
-  <
-    T extends { id: unknown },
-    PM extends PersistenceModelType<string>,
-    Evt,
-    ItemType extends string,
-    A,
-    R
-  >(
-    repo: Repository<T, PM, Evt, ItemType>,
-    q: QAll<NoInfer<PM>, A, R>
-  ): Effect.Effect<readonly T[], never, R>
-} = (<
-  T extends { id: unknown },
-  PM extends PersistenceModelType<string>,
-  Evt,
-  ItemType extends string,
+export const toFilter = <
+  TFieldValues extends FieldValues,
   A,
   R
->(repo: Repository<T, PM, Evt, ItemType>, q: QAll<PM, A, R>) => {
+>(
+  q: QAll<TFieldValues, A, R>
+) => {
   // TODO: Native interpreter for each db adapter, instead of the intermediate "new-kid" format
   const a = interpret(q)
   const schema = a.schema
-  let select: (keyof PM)[] = []
+  let select: (keyof TFieldValues)[] = []
   if (schema) {
     let t = schema.ast
     if (S.AST.isTransform(t)) {
@@ -147,23 +127,17 @@ export const query: {
       select = t.propertySignatures.map((_) => _.name) as any
     }
   }
-  return Effect.flatMap(
-    repo.utils.filter({
-      limit: a.limit,
-      skip: a.skip,
-      select: Option.getOrUndefined(toNonEmptyArray(select)),
-      filter: a.filter.length
-        ? {
-          type: "new-kid" as const,
-          build: () => a.filter
-        } as QueryBuilder<any>
-        : undefined
-    }),
-    (_) =>
-      Unify.unify(
-        schema
-          ? repo.utils.parseMany2(_, schema as any)
-          : repo.utils.parseMany(_)
-      )
-  )
-}) as any
+  return dropUndefinedT({
+    limit: a.limit,
+    skip: a.skip,
+    select: Option.getOrUndefined(toNonEmptyArray(select)),
+    schema,
+    order: Option.getOrUndefined(toNonEmptyArray(a.order)),
+    filter: a.filter.length
+      ? {
+        type: "new-kid" as const,
+        build: () => a.filter
+      } as QueryBuilder<any>
+      : undefined
+  })
+}

package/src/services/query.test.ts

@@ -1,37 +1,83 @@
 import { Effect, flow, pipe, S } from "effect-app"
-import { make, or, order, project, where } from "./query.js"
+import { TagClassMakeId } from "effect-app/service"
+import { pick } from "effect-app/utils"
+import { inspect } from "util"
+import { and, make, or, order, page, project, toFilter, where } from "./query.js"
 import { RepositoryDefaultImpl } from "./RepositoryBase.js"
-import { RequestContextContainer } from "./RequestContextContainer.js"
-
-const s = S.struct({ id: S.string, displayName: S.string, n: S.Date })
-type s = S.Schema.To<typeof s>
-type sfrom = S.Schema.From<typeof s>
-export class TestRepo extends RepositoryDefaultImpl<TestRepo>()<sfrom & { _etag: string | undefined }, never>()(
-  "test",
-  s
-) {}
-
-const a = pipe(
-  make<{ id: string; displayName: string; n: Date }>(),
+import { memFilter } from "./Store/Memory.js"
+
+export class s
+  extends S.Class<s>()({ id: S.StringId.withDefault, displayName: S.NonEmptyString255, n: S.Date.withDefault })
+{}
+export declare namespace s {
+  export type From = S.Schema.From<typeof s>
+}
+
+const MakeSomeService = Effect.succeed({ a: 1 })
+export class SomeService extends TagClassMakeId("SomeService", MakeSomeService)<SomeService>() {}
+
+const q = pipe(
+  make<s.From>(), // provided automatically inside Repo.q2()
   where("displayName", "Verona"),
   or(flow(
-    where("displayName", "Riley")
-    // and("resource._tag", "Printer")
+    where("displayName", "Riley"),
+    and("n", "gt", "2021-01-01T00:00:00Z") // TODO: work with To type translation, so Date?
   )),
-  order("displayName")
-)
-const q = pipe(
-  a,
-  //    page(2, 1)
+  order("displayName"),
+  page({ take: 10 }),
   project(
-    // User.struct.pipe(S.pick("displayName"))
     S.transformOrFail(
-      S.struct({ displayName: S.string }), // for projection performance benefit, this should be limited to the fields interested
-      S.struct({ displayName: S.string }),
-      (_) => Effect.andThen(RequestContextContainer, _),
+      S.struct({ displayName: S.string }), // for projection performance benefit, this should be limited to the fields interested, and leads to SELECT fields
+      S.struct(pick(s.fields, "displayName")),
+      (_) => Effect.andThen(SomeService, _),
       () => Effect.die(new Error("not implemented"))
     )
   )
 )
-console.log(q)
-console.log(TestRepo.q2(() => q))
+
+it("works", () => {
+  console.log("raw", inspect(q, undefined, 25))
+  const interpreted = toFilter(q)
+  console.log("interpreted", inspect(interpreted, undefined, 25))
+  const filtersBuilt = interpreted.filter.build()
+  console.log("filtersBuilt", inspect(filtersBuilt, undefined, 25))
+  const items = [
+    new s({ displayName: S.NonEmptyString255("Verona"), n: new Date("2020-01-01T00:00:00Z") }),
+    new s({ displayName: S.NonEmptyString255("Riley") }),
+    new s({ displayName: S.NonEmptyString255("Riley"), n: new Date("2020-01-01T00:00:00Z") })
+  ]
+    .map((_) => S.encodeSync(s)(_))
+
+  const processed = memFilter(interpreted)(items)
+
+  expect(processed).toEqual(items.slice(0, 2).toReversed().map(({ displayName }) => ({ displayName })))
+})
+
+it.skip("works with repo", () => {
+  class TestRepo extends RepositoryDefaultImpl<TestRepo>()<s.From & { _etag: string | undefined }, never>()(
+    "test",
+    s
+  ) {}
+  const q1 = TestRepo.q2(() => q)
+
+  // same as above, but with the `flow` helper
+  const q2 = TestRepo.q2(flow(
+    where("displayName", "Verona"),
+    or(flow(
+      where("displayName", "Riley"),
+      and("n", "gt", "2021-01-01T00:00:00Z") // TODO: work with To type translation, so Date?
+    )),
+    order("displayName"),
+    page({ take: 10 }),
+    project(
+      S.transformOrFail(
+        S.struct({ displayName: S.string }), // for projection performance benefit, this should be limited to the fields interested, and leads to SELECT fields
+        S.struct(pick(s.fields, "displayName")),
+        (_) => Effect.andThen(SomeService, _),
+        () => Effect.die(new Error("not implemented"))
+      )
+    )
+  ))
+
+  expect([q1, q2]).toEqual([q1, q1])
+})