@effect-app/infra 1.1.15 → 1.2.1

package/src/services/Store/service.ts

@@ -3,8 +3,7 @@ import type { UniqueKey } from "@azure/cosmos"
 import { Context, Effect } from "effect-app"
 import type { NonEmptyReadonlyArray, Option, Secret } from "effect-app"
 import type { OptimisticConcurrencyException } from "../../errors.js"
-import type { FieldValues } from "../../filter/types.js"
-import type { QueryBuilder } from "./filterApi/query.js"
+import type { FilterResult } from "./filterApi/query.js"
 
 export type StoreConfig<E> = {
   uniqueKeys?: UniqueKey[]
@@ -33,7 +32,7 @@ export type Where =
     value: readonly (SupportedValues)[]
   }
 
-export type Filter<E extends FieldValues> = QueryBuilder<E>
+export type Filter = readonly FilterResult[]
 
 export interface O<Encoded extends { id: string }> {
   key: keyof Encoded
@@ -41,7 +40,7 @@ export interface O<Encoded extends { id: string }> {
 }
 
 export interface FilterArgs<Encoded extends { id: string }, U extends keyof Encoded = never> {
-  filter?: Filter<Encoded> | undefined
+  filter?: Filter | undefined
   select?: NonEmptyReadonlyArray<U> | undefined
   order?: NonEmptyReadonlyArray<O<Encoded>>
   limit?: number | undefined

package/src/services/Store/utils.ts

@@ -35,8 +35,8 @@ export const makeUpdateETag =
       return newE
     })
 
-export function codeFilter<E extends { id: string }, NE extends E>(filter: Filter<NE>) {
-  return (x: E) => codeFilter3_(filter.build(), x) ? Option.some(x as unknown as NE) : Option.none()
+export function codeFilter<E extends { id: string }, NE extends E>(filter: Filter) {
+  return (x: E) => codeFilter3_(filter, x) ? Option.some(x as unknown as NE) : Option.none()
 }
 
 export function lowercaseIfString<T>(val: T) {

package/src/services/query/dsl.ts

@@ -3,7 +3,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type { FieldValues } from "@effect-app/infra/filter/types"
 import type { FieldPath, FieldPathValue } from "@effect-app/infra/filter/types/path/eager"
-import type { Ops } from "@effect-app/infra/services/Store/filterApi/proxy"
+import type { Ops } from "@effect-app/infra/services/Store/filterApi/query"
 import type { NonNegativeInt } from "@effect-app/schema"
 import type { Option, Pipeable, S } from "effect-app"
 import { Data, flow } from "effect-app"
@@ -85,7 +85,7 @@ export class Initial<TFieldValues extends FieldValues> extends Data.TaggedClass(
 
 export class Where<TFieldValues extends FieldValues> extends Data.TaggedClass("where")<{
   current: Query<TFieldValues>
-  operation: [string, Ops, any] | [string, any]
+  operation: [string, Ops, any] | [string, any] | ((q: Query<TFieldValues>) => QueryWhere<TFieldValues>)
 }> implements QueryWhere<TFieldValues> {
   readonly [QId]!: any
 
@@ -181,7 +181,8 @@ export class Project<A, TFieldValues extends FieldValues, R, TType extends "one"
 
 export const make: <TFieldValues extends FieldValues>() => Query<TFieldValues> = () => new Initial()
 
-export const where: FilterWhere = (...operation: any[]) => (current: any) => new Where({ current, operation } as any)
+export const where: FilterWhere = (...operation: any[]) => (current: any) =>
+  new Where({ current, operation: typeof operation[0] === "function" ? flow(...operation as [any]) : operation } as any)
 
 export const and: FilterContinuation = (...operation: any[]) => (current: any) =>
   new And({ current, operation: typeof operation[0] === "function" ? flow(...operation as [any]) : operation } as any)
@@ -322,19 +323,193 @@ export type FilterWheres = {
   ) => QueryWhere<TFieldValues>
 }
 
-export type FilterWhere = {
-  <
-    TFieldValues extends FieldValues,
-    TFieldName extends FieldPath<TFieldValues>,
-    V extends FieldPathValue<TFieldValues, TFieldName>
-  >(f: {
-    path: TFieldName
-    op: Ops
-    value: V
-  }): (
-    current: Query<TFieldValues>
-  ) => QueryWhere<TFieldValues>
-} & FilterWheres
+export type FilterWhere =
+  & {
+    <TFieldValues extends FieldValues>(
+      fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues>
+    ): (current: Query<TFieldValues>) => QueryWhere<TFieldValues>
+
+    <TFieldValues extends FieldValues>(
+      fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues>,
+      fc: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>
+    ): (current: Query<TFieldValues>) => QueryWhere<TFieldValues>
+
+    <TFieldValues extends FieldValues>(
+      fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues>,
+      fc: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fd: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>
+    ): (current: Query<TFieldValues>) => QueryWhere<TFieldValues>
+
+    <TFieldValues extends FieldValues>(
+      fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues>,
+      fc: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fd: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fe: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>
+    ): (current: Query<TFieldValues>) => QueryWhere<TFieldValues>
+
+    <TFieldValues extends FieldValues>(
+      fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues>,
+      fc: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fd: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fe: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      ff: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>
+    ): (current: Query<TFieldValues>) => QueryWhere<TFieldValues>
+    <TFieldValues extends FieldValues>(
+      fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues>,
+      fc: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fd: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fe: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fg: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>
+    ): (current: Query<TFieldValues>) => QueryWhere<TFieldValues>
+    <TFieldValues extends FieldValues>(
+      fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues>,
+      fc: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fd: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fe: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fg: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fh: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>
+    ): (current: Query<TFieldValues>) => QueryWhere<TFieldValues>
+    <TFieldValues extends FieldValues>(
+      fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues>,
+      fc: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fd: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fe: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fg: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fh: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fi: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>
+    ): (current: Query<TFieldValues>) => QueryWhere<TFieldValues>
+    <TFieldValues extends FieldValues>(
+      fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues>,
+      fc: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fd: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fe: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fg: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fh: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fi: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fj: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>
+    ): (current: Query<TFieldValues>) => QueryWhere<TFieldValues>
+    <TFieldValues extends FieldValues>(
+      fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues>,
+      fc: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fd: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fe: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fg: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fh: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fi: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fj: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fk: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>
+    ): (current: Query<TFieldValues>) => QueryWhere<TFieldValues>
+    <TFieldValues extends FieldValues>(
+      fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues>,
+      fc: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fd: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fe: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fg: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fh: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fi: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fj: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fk: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fl: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>
+    ): (current: Query<TFieldValues>) => QueryWhere<TFieldValues>
+    <TFieldValues extends FieldValues>(
+      fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues>,
+      fc: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fd: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fe: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fg: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fh: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fi: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fj: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fk: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fl: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fm: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>
+    ): (current: Query<TFieldValues>) => QueryWhere<TFieldValues>
+    <TFieldValues extends FieldValues>(
+      fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues>,
+      fc: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fd: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fe: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fg: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fh: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fi: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fj: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fk: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fl: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fm: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>,
+      fn: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>
+    ): (current: Query<TFieldValues>) => QueryWhere<TFieldValues>
+  }
+  & {
+    <
+      TFieldValues extends FieldValues,
+      TFieldName extends FieldPath<TFieldValues>,
+      V extends FieldPathValue<TFieldValues, TFieldName>
+    >(f: {
+      path: TFieldName
+      op: Ops
+      value: V
+    }): (
+      current: Query<TFieldValues>
+    ) => QueryWhere<TFieldValues>
+  }
+  & FilterWheres
+  & {
+    <
+      TFieldValues extends FieldValues,
+      TFieldName extends FieldPath<TFieldValues>,
+      V extends FieldPathValue<TFieldValues, TFieldName>
+    >(
+      path: TFieldName,
+      value: V
+    ): (
+      current: Query<TFieldValues>
+    ) => QueryWhere<TFieldValues>
+    // breaks flow pipe type inference
+    // <
+    //   TFieldValues extends FieldValues,
+    //   TFieldName extends FieldPath<TFieldValues>,
+    //   V extends FieldPathValue<TFieldValues, TFieldName>
+    // >(
+    //   path: TFieldName,
+    //   op: "neq",
+    //   value: V
+    // ): (
+    //   current: Query<TFieldValues>
+    // ) => QueryWhere<TFieldValues>
+    <
+      TFieldValues extends FieldValues,
+      TFieldName extends FieldPath<TFieldValues>,
+      V extends FieldPathValue<TFieldValues, TFieldName>
+    >(
+      path: TFieldName,
+      op: "gt" | "gte" | "lt" | "lte" | "neq",
+      value: V // only numbers?
+    ): (
+      current: Query<TFieldValues>
+    ) => QueryWhere<TFieldValues>
+    <
+      TFieldValues extends FieldValues,
+      TFieldName extends FieldPath<TFieldValues>,
+      V extends string
+    >(
+      path: TFieldName,
+      op: "startsWith" | "endsWith" | "contains" | "notContains" | "notStartsWith" | "notEndsWith",
+      value: V
+    ): (
+      current: Query<TFieldValues>
+    ) => QueryWhere<TFieldValues>
+    <
+      TFieldValues extends FieldValues,
+      TFieldName extends FieldPath<TFieldValues>,
+      V extends FieldPathValue<TFieldValues, TFieldName>
+    >(
+      path: TFieldName,
+      op: "in" | "notIn",
+      value: readonly V[]
+    ): (
+      current: Query<TFieldValues>
+    ) => QueryWhere<TFieldValues>
+  }
 
 export type FilterContinuations = {
   <

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

@@ -6,7 +6,7 @@ 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 } from "../query.js"
-import type { FilterResult, QueryBuilder } from "../Store/filterApi/query.js"
+import type { FilterResult } from "../Store/filterApi/query.js"
 
 type Result<TFieldValues extends FieldValues, A = TFieldValues, R = never> = {
   filter: FilterResult[]
@@ -51,14 +51,20 @@ const interpret = <TFieldValues extends FieldValues, A = TFieldValues, R = never
       },
       where: ({ current, operation }) => {
         upd(interpret(current))
-        data.filter.push(
-          {
-            t: "where",
-            path: operation[0],
-            op: operation.length === 2 ? "eq" : operation[1],
-            value: operation.length === 2 ? operation[1] : operation[2]
-          }
-        )
+        if (typeof operation === "function") {
+          data.filter.push(
+            { t: "where-scope", result: interpret(operation(make())).filter }
+          )
+        } else {
+          data.filter.push(
+            {
+              t: "where",
+              path: operation[0],
+              op: operation.length === 2 ? "eq" : operation[1],
+              value: operation.length === 2 ? operation[1] : operation[2]
+            }
+          )
+        }
       },
       and: ({ current, operation }) => {
         upd(interpret(current))
@@ -153,10 +159,7 @@ export const toFilter = <
     ttype: a.ttype,
     mode: a.mode ?? "transform",
     filter: a.filter.length
-      ? {
-        type: "new-kid" as const,
-        build: () => a.filter
-      } as QueryBuilder<any>
+      ? a.filter
       : undefined
   })
 }

package/test/query.test.ts

@@ -60,7 +60,7 @@ it("merge", () => {
 
   const merge = (b: any) => (a: any) => pipe(a, and(() => b))
 
-  const r = pipe(a, merge(b), toFilter, (_) => _.filter.build())
+  const r = pipe(a, merge(b), toFilter, (_) => _.filter)
 
   // TODO: instead this should probably scope the first where/or together e.g (where x, or y) and (...)
   const expected = make().pipe(
@@ -68,7 +68,7 @@ it("merge", () => {
     or("c", "d"),
     and(where("d", "e"), or("f", "g")),
     toFilter,
-    (_) => _.filter.build()
+    (_) => _.filter
   )
 
   console.log(JSON.stringify({ r, expected }, undefined, 2))
@@ -79,9 +79,6 @@ 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 processed = memFilter(interpreted)(items.map((_) => S.encodeSync(Something)(_)))
 

package/_cjs/services/Store/filterApi/proxy.cjs

@@ -1,40 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.makeProxy = void 0;
-const ops = ["contains", "startsWith", "endsWith", "notContains", "notStartsWith", "notEndsWith", "in", "notIn", "eq", "neq", "gte", "gt", "lt", "lte"];
-const makeProxy = parentProp => new Proxy(Object.assign(() => {}, {
-  _proxies: {}
-}), {
-  apply(_target, _thisArg, argArray) {
-    return {
-      op: "eq",
-      value: argArray[0],
-      path: parentProp
-    };
-  },
-  get(target, prop) {
-    if (typeof prop !== "string") return undefined;
-    if (target._proxies[prop]) {
-      return target._proxies[prop];
-    }
-    if (ops.includes(prop)) {
-      return value => ({
-        op: prop,
-        path: parentProp,
-        value
-      });
-    }
-    let fullProp = prop;
-    if (parentProp) {
-      fullProp = `${parentProp}.${prop}`;
-    }
-    const p = makeProxy(fullProp);
-    target._proxies[prop] = p;
-    return p;
-  }
-});
-exports.makeProxy = makeProxy;
-//# sourceMappingURL=proxy.cjs.map

package/_cjs/services/Store/filterApi/proxy.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"proxy.cjs","names":["ops","makeProxy","parentProp","Proxy","Object","assign","_proxies","apply","_target","_thisArg","argArray","op","value","path","get","target","prop","undefined","includes","fullProp","p","exports"],"sources":["../../../../src/services/Store/filterApi/proxy.ts"],"sourcesContent":[null],"mappings":";;;;;;AAiEA,MAAMA,GAAG,GAAU,CACjB,UAAU,EACV,YAAY,EACZ,UAAU,EACV,aAAa,EACb,eAAe,EACf,aAAa,EACb,IAAI,EACJ,OAAO,EACP,IAAI,EACJ,KAAK,EACL,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,KAAK,CACN;AACM,MAAMC,SAAS,GAAIC,UAAmB,IAC3C,IAAIC,KAAK,CACPC,MAAM,CAACC,MAAM,CAAC,MAAK,CAAE,CAAC,EAAE;EACtBC,QAAQ,EAAE;CACX,CAAC,EACF;EACEC,KAAKA,CAACC,OAAO,EAAEC,QAAQ,EAAEC,QAAQ;IAC/B,OAAQ;MAAEC,EAAE,EAAE,IAAI;MAAEC,KAAK,EAAEF,QAAQ,CAAC,CAAC,CAAC;MAAEG,IAAI,EAAEX;IAAU,CAAE;EAC5D,CAAC;EACDY,GAAGA,CAACC,MAAM,EAAEC,IAAI;IACd,IAAI,OAAOA,IAAI,KAAK,QAAQ,EAAE,OAAOC,SAAS;IAC9C,IAAIF,MAAM,CAACT,QAAQ,CAACU,IAAI,CAAC,EAAE;MACzB,OAAOD,MAAM,CAACT,QAAQ,CAACU,IAAI,CAAC;IAC9B;IAEA,IAAIhB,GAAG,CAACkB,QAAQ,CAACF,IAAW,CAAC,EAAE;MAC7B,OAAQJ,KAAU,KAAM;QAAED,EAAE,EAAEK,IAAI;QAAEH,IAAI,EAAEX,UAAU;QAAEU;MAAK,CAAE,CAAC;IAChE;IACA,IAAIO,QAAQ,GAAGH,IAAI;IACnB,IAAId,UAAU,EAAE;MACdiB,QAAQ,GAAG,GAAGjB,UAAU,IAAIc,IAAI,EAAE;IACpC;IACA,MAAMI,CAAC,GAAGnB,SAAS,CAACkB,QAAQ,CAAC;IAC7BJ,MAAM,CAACT,QAAQ,CAACU,IAAI,CAAC,GAAGI,CAAC;IACzB,OAAOA,CAAC;EACV;CACD,CACF;AAAAC,OAAA,CAAApB,SAAA,GAAAA,SAAA","ignoreList":[]}

package/dist/services/Store/filterApi/proxy.d.ts

@@ -1,41 +0,0 @@
-import type { FieldValues } from "../../../filter/types.js";
-import type { FieldPath } from "../../../filter/types/path/eager.js";
-type NullOrUndefined<T, Fallback> = null extends T ? null : undefined extends T ? null : Fallback;
-export type InOps = "in" | "notIn";
-export type OtherOps = "endsWith" | "startsWith" | "notEndsWith" | "notStartsWith" | "contains" | "notContains" | "includes" | "notIncludes" | "eq" | "neq" | "gt" | "gte" | "lt" | "lte";
-export type Ops = OtherOps | InOps;
-type F<T extends FieldValues> = {
-    path: FieldPath<T>;
-    op: OtherOps;
-    value: string;
-};
-type FIn<T extends FieldValues> = {
-    op: InOps;
-    path: FieldPath<T>;
-    value: readonly string[];
-};
-type G<T extends FieldValues, Val> = {
-    (value: Val): F<T>;
-    startsWith: (value: string) => F<T>;
-    notStartsWith: (value: string) => F<T>;
-    endsWith: (value: string) => F<T>;
-    notEndsWith: (value: string) => F<T>;
-    contains: (value: string) => F<T>;
-    notContains: (value: string) => F<T>;
-    includes: (value: string) => F<T>;
-    notIncludes: (value: string) => F<T>;
-    in: (...value: readonly Val[]) => FIn<T>;
-    notIn: (...value: readonly Val[]) => FIn<T>;
-    eq: (value: Val) => F<T>;
-    neq: (value: Val) => F<T>;
-    gt: (value: Val) => F<T>;
-    gte: (value: Val) => F<T>;
-    lt: (value: Val) => F<T>;
-    lte: (value: Val) => F<T>;
-};
-export type Filter<T extends FieldValues, Ext = never> = {
-    [K in keyof T]-?: [T[K]] extends [Record<any, any> | undefined | null] ? Filter<T[K], NullOrUndefined<T[K], Ext>> & G<T, T[K] | Ext> : [T[K]] extends [Record<any, any>] ? Filter<T[K], NullOrUndefined<T[K], Ext>> & G<T, T[K] | Ext> : G<T, T[K] | Ext>;
-};
-export declare const makeProxy: (parentProp?: string) => any;
-export {};
-//# sourceMappingURL=proxy.d.ts.map

package/dist/services/Store/filterApi/proxy.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../../src/services/Store/filterApi/proxy.ts"],"names":[],"mappings":"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"}

package/dist/services/Store/filterApi/proxy.js

@@ -1,41 +0,0 @@
-const ops = [
-    "contains",
-    "startsWith",
-    "endsWith",
-    "notContains",
-    "notStartsWith",
-    "notEndsWith",
-    "in",
-    "notIn",
-    "eq",
-    "neq",
-    "gte",
-    "gt",
-    "lt",
-    "lte"
-];
-export const makeProxy = (parentProp) => new Proxy(Object.assign(() => { }, {
-    _proxies: {}
-}), {
-    apply(_target, _thisArg, argArray) {
-        return ({ op: "eq", value: argArray[0], path: parentProp });
-    },
-    get(target, prop) {
-        if (typeof prop !== "string")
-            return undefined;
-        if (target._proxies[prop]) {
-            return target._proxies[prop];
-        }
-        if (ops.includes(prop)) {
-            return (value) => ({ op: prop, path: parentProp, value });
-        }
-        let fullProp = prop;
-        if (parentProp) {
-            fullProp = `${parentProp}.${prop}`;
-        }
-        const p = makeProxy(fullProp);
-        target._proxies[prop] = p;
-        return p;
-    }
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJveHkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2VydmljZXMvU3RvcmUvZmlsdGVyQXBpL3Byb3h5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQWlFQSxNQUFNLEdBQUcsR0FBVTtJQUNqQixVQUFVO0lBQ1YsWUFBWTtJQUNaLFVBQVU7SUFDVixhQUFhO0lBQ2IsZUFBZTtJQUNmLGFBQWE7SUFDYixJQUFJO0lBQ0osT0FBTztJQUNQLElBQUk7SUFDSixLQUFLO0lBQ0wsS0FBSztJQUNMLElBQUk7SUFDSixJQUFJO0lBQ0osS0FBSztDQUNOLENBQUE7QUFDRCxNQUFNLENBQUMsTUFBTSxTQUFTLEdBQUcsQ0FBQyxVQUFtQixFQUFPLEVBQUUsQ0FDcEQsSUFBSSxLQUFLLENBQ1AsTUFBTSxDQUFDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsR0FBRSxDQUFDLEVBQUU7SUFDdEIsUUFBUSxFQUFFLEVBQXlCO0NBQ3BDLENBQUMsRUFDRjtJQUNFLEtBQUssQ0FBQyxPQUFPLEVBQUUsUUFBUSxFQUFFLFFBQVE7UUFDL0IsT0FBTyxDQUFDLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsUUFBUSxDQUFDLENBQUMsQ0FBQyxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsQ0FBQyxDQUFBO0lBQzdELENBQUM7SUFDRCxHQUFHLENBQUMsTUFBTSxFQUFFLElBQUk7UUFDZCxJQUFJLE9BQU8sSUFBSSxLQUFLLFFBQVE7WUFBRSxPQUFPLFNBQVMsQ0FBQTtRQUM5QyxJQUFJLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQztZQUMxQixPQUFPLE1BQU0sQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLENBQUE7UUFDOUIsQ0FBQztRQUVELElBQUksR0FBRyxDQUFDLFFBQVEsQ0FBQyxJQUFXLENBQUMsRUFBRSxDQUFDO1lBQzlCLE9BQU8sQ0FBQyxLQUFVLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsSUFBSSxFQUFFLElBQUksRUFBRSxVQUFVLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQTtRQUNoRSxDQUFDO1FBQ0QsSUFBSSxRQUFRLEdBQUcsSUFBSSxDQUFBO1FBQ25CLElBQUksVUFBVSxFQUFFLENBQUM7WUFDZixRQUFRLEdBQUcsR0FBRyxVQUFVLElBQUksSUFBSSxFQUFFLENBQUE7UUFDcEMsQ0FBQztRQUNELE1BQU0sQ0FBQyxHQUFHLFNBQVMsQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUM3QixNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUN6QixPQUFPLENBQUMsQ0FBQTtJQUNWLENBQUM7Q0FDRixDQUNGLENBQUEifQ==

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

@@ -1,109 +0,0 @@
-import type { FieldValues } from "../../../filter/types.js"
-import type { FieldPath } from "../../../filter/types/path/eager.js"
-
-type NullOrUndefined<T, Fallback> = null extends T ? null : undefined extends T ? null : Fallback
-
-export type InOps =
-  | "in"
-  | "notIn"
-
-export type OtherOps =
-  | "endsWith"
-  | "startsWith"
-  | "notEndsWith"
-  | "notStartsWith"
-  | "contains"
-  | "notContains"
-  | "includes"
-  | "notIncludes"
-  | "eq"
-  | "neq"
-  | "gt"
-  | "gte"
-  | "lt"
-  | "lte"
-
-// TODO: includes | notIncludes
-export type Ops = OtherOps | InOps
-type F<T extends FieldValues> = {
-  path: FieldPath<T>
-  op: OtherOps
-  value: string
-}
-
-type FIn<T extends FieldValues> = {
-  op: InOps
-  path: FieldPath<T>
-  value: readonly string[]
-}
-
-type G<T extends FieldValues, Val> = {
-  (value: Val): F<T>
-  startsWith: (value: string) => F<T>
-  notStartsWith: (value: string) => F<T>
-  endsWith: (value: string) => F<T>
-  notEndsWith: (value: string) => F<T>
-  contains: (value: string) => F<T>
-  notContains: (value: string) => F<T>
-  includes: (value: string) => F<T>
-  notIncludes: (value: string) => F<T>
-  in: (...value: readonly Val[]) => FIn<T>
-  notIn: (...value: readonly Val[]) => FIn<T>
-  eq: (value: Val) => F<T>
-  neq: (value: Val) => F<T>
-  gt: (value: Val) => F<T>
-  gte: (value: Val) => F<T>
-  lt: (value: Val) => F<T>
-  lte: (value: Val) => F<T>
-}
-
-export type Filter<T extends FieldValues, Ext = never> = {
-  [K in keyof T]-?: [T[K]] extends [Record<any, any> | undefined | null]
-    ? Filter<T[K], NullOrUndefined<T[K], Ext>> & G<T, T[K] | Ext>
-    : [T[K]] extends [Record<any, any>] ? Filter<T[K], NullOrUndefined<T[K], Ext>> & G<T, T[K] | Ext>
-    : G<T, T[K] | Ext>
-}
-const ops: Ops[] = [
-  "contains",
-  "startsWith",
-  "endsWith",
-  "notContains",
-  "notStartsWith",
-  "notEndsWith",
-  "in",
-  "notIn",
-  "eq",
-  "neq",
-  "gte",
-  "gt",
-  "lt",
-  "lte"
-]
-export const makeProxy = (parentProp?: string): any =>
-  new Proxy(
-    Object.assign(() => {}, {
-      _proxies: {} as Record<string, any>
-    }),
-    {
-      apply(_target, _thisArg, argArray) {
-        return ({ op: "eq", value: argArray[0], path: parentProp })
-      },
-      get(target, prop) {
-        if (typeof prop !== "string") return undefined
-        if (target._proxies[prop]) {
-          return target._proxies[prop]
-        }
-
-        if (ops.includes(prop as any)) {
-          return (value: any) => ({ op: prop, path: parentProp, value })
-        }
-        let fullProp = prop
-        if (parentProp) {
-          fullProp = `${parentProp}.${prop}`
-        }
-        const p = makeProxy(fullProp)
-        target._proxies[prop] = p
-        return p
-      }
-    }
-  )