@effect-app/infra 1.36.0 → 1.38.0

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@effect-app/infra",
-  "version": "1.36.0",
+  "version": "1.38.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
     "@azure/cosmos": "^4.1.1",
     "@azure/service-bus": "^7.9.5",
-    "@effect/rpc": "^0.43.3",
-    "@effect/rpc-http": "^0.41.3",
+    "@effect/rpc": "^0.43.4",
+    "@effect/rpc-http": "^0.41.4",
     "express-oauth2-jwt-bearer": "^1.6.0",
     "@faker-js/faker": "^8.4.1",
     "@sendgrid/helpers": "^8.0.0",
@@ -20,10 +20,10 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "6.1.0",
     "redlock": "^4.2.0",
-    "@effect-app/infra-adapters": "1.18.0",
-    "effect-app": "1.27.0",
-    "@effect-app/core": "1.16.0",
-    "@effect-app/schema": "1.18.0"
+    "@effect-app/core": "1.17.0",
+    "effect-app": "1.28.0",
+    "@effect-app/schema": "1.19.0",
+    "@effect-app/infra-adapters": "1.19.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.25.7",
@@ -39,13 +39,13 @@
     "mongodb": "6.9.0",
     "redis": "^3.1.2",
     "typescript": "^5.6.3",
-    "vitest": "^2.1.2"
+    "vitest": "^2.1.3"
   },
   "peerDependencies": {
     "express": "^4.21.1",
-    "@effect/platform": "^0.68.4",
+    "@effect/platform": "^0.68.5",
     "@effect/schema": "^0.75.4",
-    "@effect/sql": "^0.16.4",
+    "@effect/sql": "^0.16.5",
     "@effect/vitest": "^0.12.1",
     "effect": "^3.9.2"
   },

package/src/services/RepositoryBase.ts

@@ -525,11 +525,12 @@ export function makeRepo<
                   .pipe(Effect.orDie, Effect.withSpan("parseMany2", { captureStackTrace: false })))
           const filter = <U extends keyof Encoded = keyof Encoded>(args: FilterArgs<Encoded, U>) =>
             store
-              .filter(args)
+              .filter(
+                // always enforce id and _etag because they are system fields, required for etag tracking etc
+                { ...args, select: args.select ? [...args.select, "id", "_etag" as any] : undefined } as typeof args
+              )
               .pipe(Effect.tap((items) =>
-                args.select
-                  ? Effect.void
-                  : Effect.map(cms, ({ set }) => items.forEach((_) => set((_ as Encoded).id, (_ as PM)._etag)))
+                Effect.map(cms, ({ set }) => items.forEach((_) => set((_ as Encoded).id, (_ as PM)._etag)))
               ))
 
           // TODO: For raw we should use S.from, and drop the R...
@@ -543,7 +544,9 @@ export function makeRepo<
             const eff = a.mode === "project"
               ? filter(a)
                 // TODO: mapFrom but need to support per field and dependencies
-                .pipe(Effect.andThen(flow(S.decode(S.Array(a.schema ?? schema)), Effect.provide(rctx))))
+                .pipe(
+                  Effect.andThen(flow(S.decode(S.Array(a.schema ?? schema)), Effect.provide(rctx)))
+                )
               : a.mode === "collect"
               ? filter(a)
                 // TODO: mapFrom but need to support per field and dependencies

package/src/services/Store/Cosmos/query.ts

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return */
 import { Array, Effect, Equivalence, pipe } from "effect-app"
 import type { NonEmptyReadonlyArray } from "effect-app"
 import { assertUnreachable } from "effect-app/utils"
@@ -27,6 +28,9 @@ export function logQuery(q: {
     }))
 }
 
+const arrayContains = (v: any[]) => v.map((_) => JSON.stringify(_)).join(", ")
+const vAsArr = (v: string) => v as unknown as any[]
+
 export function buildWhereCosmosQuery3(
   filter: readonly FilterResult[],
   name: string,
@@ -53,9 +57,20 @@ export function buildWhereCosmosQuery3(
         return `(NOT ARRAY_CONTAINS(${v}, ${k}))`
 
       case "includes":
-        return `ARRAY_CONTAINS(${k}, ${v})`
+        return `ARRAY_CONTAINS(${k}, ${arrayContains(vAsArr(v))})`
       case "notIncludes":
-        return `(NOT ARRAY_CONTAINS(${k}, ${v}))`
+        return `(NOT ARRAY_CONTAINS(${k}, ${arrayContains(vAsArr(v))}))`
+
+      case "includes-any":
+        return `ARRAY_CONTAINS_ANY(${k}, ${arrayContains(vAsArr(v))})`
+      case "notIncludes-any":
+        return `(NOT ARRAY_CONTAINS_ANY(${k}, ${arrayContains(vAsArr(v))}))`
+
+      case "includes-all":
+        return `ARRAY_CONTAINS_ALL(${k}, ${arrayContains(vAsArr(v))})`
+      case "notIncludes-all":
+        return `(NOT ARRAY_CONTAINS_ALL(${k}, ${arrayContains(vAsArr(v))}))`
+
       case "contains":
         return `CONTAINS(${k}, ${v}, true)`
 

package/src/services/Store/Memory.ts

@@ -240,10 +240,8 @@ export const makeMemoryStore = () => ({
             return makeMemoryStoreInt(modelName, namespace, seed, config?.defaultValues)
               .pipe(
                 Effect.orDie,
-                Effect
-                  .provide(ctx),
-                Effect
-                  .tap((store) => Effect.sync(() => stores.set(namespace, store)))
+                Effect.provide(ctx),
+                Effect.tap((store) => Effect.sync(() => stores.set(namespace, store)))
               )
           }))
         }))

package/src/services/Store/codeFilter.ts

@@ -1,8 +1,12 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import { Array } from "effect-app"
 import { assertUnreachable, get } from "effect-app/utils"
 import type { FilterR, FilterResult } from "./filterApi/query.js"
 import { compare, greaterThan, greaterThanExclusive, lowerThan, lowerThanExclusive } from "./utils.js"
 
+const vAsArr = (v: string) => v as unknown as any[]
+
 export const codeFilterStatement = <E>(p: FilterR, x: E) => {
   const k = get(x, p.path)
   switch (p.op) {
@@ -22,6 +26,14 @@ export const codeFilterStatement = <E>(p: FilterR, x: E) => {
       return (k as Array<string>).includes(p.value)
     case "notIncludes":
       return !(k as Array<string>).includes(p.value)
+    case "includes-any":
+      return (vAsArr(p.value)).some((_) => (k as Array<string>)?.includes(_))
+    case "notIncludes-any":
+      return !(vAsArr(p.value)).some((_) => (k as Array<string>)?.includes(_))
+    case "includes-all":
+      return (vAsArr(p.value)).every((_) => (k as Array<string>)?.includes(_))
+    case "notIncludes-all":
+      return !(vAsArr(p.value)).every((_) => (k as Array<string>)?.includes(_))
     case "contains":
       return (k as string).toLowerCase().includes(p.value.toLowerCase())
     case "endsWith":

package/src/services/Store/filterApi/query.ts

@@ -11,6 +11,10 @@ export type OtherOps =
   | "notContains"
   | "includes"
   | "notIncludes"
+  | "includes-any"
+  | "notIncludes-any"
+  | "includes-all"
+  | "notIncludes-all"
   | "eq"
   | "neq"
   | "gt"
@@ -18,7 +22,6 @@ export type OtherOps =
   | "lt"
   | "lte"
 
-// TODO: includes | notIncludes
 export type Ops = OtherOps | InOps
 
 export type FilterScopes = {

package/src/services/query/dsl.ts

@@ -316,11 +316,41 @@ export type FilterWheres = {
     V extends FieldPathValue<TFieldValues, TFieldName>
   >(
     path: TFieldName,
-    op: "in" | "notIn",
+    op:
+      | "in"
+      | "notIn",
     value: readonly V[]
   ): (
     current: Query<TFieldValues>
   ) => QueryWhere<TFieldValues>
+  <
+    TFieldValues extends FieldValues,
+    TFieldName extends FieldPath<TFieldValues>,
+    V extends FieldPathValue<TFieldValues, TFieldName>
+  >(
+    path: TFieldName,
+    op:
+      | "includes"
+      | "notIncludes",
+    value: GetArV<V>
+  ): (
+    current: Query<TFieldValues>
+  ) => QueryWhere<TFieldValues>
+  <
+    TFieldValues extends FieldValues,
+    TFieldName extends FieldPath<TFieldValues>,
+    V extends FieldPathValue<TFieldValues, TFieldName>
+  >(
+    path: TFieldName,
+    op:
+      | "includes-any"
+      | "notIncludes-any"
+      | "includes-all"
+      | "notIncludes-all",
+    value: readonly GetArV<V>[]
+  ): (
+    current: Query<TFieldValues>
+  ) => QueryWhere<TFieldValues>
 }
 
 export type FilterWhere =
@@ -504,11 +534,41 @@ export type FilterWhere =
       V extends FieldPathValue<TFieldValues, TFieldName>
     >(
       path: TFieldName,
-      op: "in" | "notIn",
+      op:
+        | "in"
+        | "notIn",
       value: readonly V[]
     ): (
       current: Query<TFieldValues>
     ) => QueryWhere<TFieldValues>
+    <
+      TFieldValues extends FieldValues,
+      TFieldName extends FieldPath<TFieldValues>,
+      V extends FieldPathValue<TFieldValues, TFieldName>
+    >(
+      path: TFieldName,
+      op:
+        | "includes"
+        | "notIncludes",
+      value: GetArV<V>
+    ): (
+      current: Query<TFieldValues>
+    ) => QueryWhere<TFieldValues>
+    <
+      TFieldValues extends FieldValues,
+      TFieldName extends FieldPath<TFieldValues>,
+      V extends FieldPathValue<TFieldValues, TFieldName>
+    >(
+      path: TFieldName,
+      op:
+        | "includes-any"
+        | "notIncludes-any"
+        | "includes-all"
+        | "notIncludes-all",
+      value: readonly GetArV<V>[]
+    ): (
+      current: Query<TFieldValues>
+    ) => QueryWhere<TFieldValues>
   }
 
 export type FilterContinuations = {
@@ -562,13 +622,45 @@ export type FilterContinuations = {
     V extends FieldPathValue<TFieldValues, TFieldName>
   >(
     path: TFieldName,
-    op: "in" | "notIn",
+    op:
+      | "in"
+      | "notIn",
     value: readonly V[]
   ): (
     current: QueryWhere<TFieldValues>
   ) => QueryWhere<TFieldValues>
+  <
+    TFieldValues extends FieldValues,
+    TFieldName extends FieldPath<TFieldValues>,
+    V extends FieldPathValue<TFieldValues, TFieldName>
+  >(
+    path: TFieldName,
+    op:
+      | "includes"
+      | "notIncludes",
+    value: GetArV<V>
+  ): (
+    current: QueryWhere<TFieldValues>
+  ) => QueryWhere<TFieldValues>
+  <
+    TFieldValues extends FieldValues,
+    TFieldName extends FieldPath<TFieldValues>,
+    V extends FieldPathValue<TFieldValues, TFieldName>
+  >(
+    path: TFieldName,
+    op:
+      | "includes-any"
+      | "notIncludes-any"
+      | "includes-all"
+      | "notIncludes-all",
+    value: readonly GetArV<V>[]
+  ): (
+    current: QueryWhere<TFieldValues>
+  ) => QueryWhere<TFieldValues>
 }
 
+type GetArV<T> = T extends readonly (infer R)[] ? R : never
+
 export type FilterContinuationClosure = {
   <TFieldValues extends FieldValues>(
     fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues>