@effect-app/infra 1.36.1 → 1.39.0

package/dist/api/routing2.js

@@ -49,8 +49,6 @@ export const makeRouter = (middleware, devMode) => {
     const rpc = makeRpc(middleware);
     function matchFor(rsc) {
         const meta = rsc.meta;
-        if (!meta)
-            throw new Error("Resource has no meta specified"); // TODO: do something with moduleName+cur etc.
         const filtered = typedKeysOf(rsc).reduce((acc, cur) => {
             if (Predicate.isObject(rsc[cur]) && rsc[cur]["success"]) {
                 acc[cur] = rsc[cur];
@@ -124,7 +122,7 @@ export const makeRouter = (middleware, devMode) => {
                 return acc;
             }, {});
             const rpcRouter = RpcRouter.make(...Object.values(mapped));
-            const r = (class Router extends HttpRouter.Tag(meta.moduleName + "Router")() {
+            const r = (class Router extends HttpRouter.Tag(`${meta.moduleName}Router`)() {
             });
             const layer = r.use((router) => Effect.gen(function* () {
                 const httpApp = toHttpApp(rpcRouter, {
@@ -147,7 +145,98 @@ export const makeRouter = (middleware, devMode) => {
                 routes
             };
         };
+        const effect = (layers, make) => {
+            const r = (class Router extends HttpRouter.Tag(`${meta.moduleName}Router`)() {
+            });
+            const layer = r.use((router) => Effect.gen(function* () {
+                const controllers = yield* make;
+                // return make.pipe(Effect.map((c) => controllers(c, layers)))
+                const mapped = typedKeysOf(filtered).reduce((acc, cur) => {
+                    const handler = controllers[cur];
+                    const req = rsc[cur];
+                    acc[cur] = rpc.effect(handler._tag === "raw"
+                        ? class extends req {
+                            static success = S.encodedSchema(req.success);
+                            get [Serializable.symbol]() {
+                                return this.constructor;
+                            }
+                            get [Serializable.symbolResult]() {
+                                return {
+                                    failure: req.failure,
+                                    success: S.encodedSchema(req.success)
+                                };
+                            }
+                        }
+                        : req, (req) => Effect
+                        .annotateCurrentSpan("requestInput", Object.entries(req).reduce((prev, [key, value]) => {
+                        prev[key] = key === "password"
+                            ? "<redacted>"
+                            : typeof value === "string" || typeof value === "number" || typeof value === "boolean"
+                                ? typeof value === "string" && value.length > 256
+                                    ? (value.substring(0, 253) + "...")
+                                    : value
+                                : Array.isArray(value)
+                                    ? `Array[${value.length}]`
+                                    : value === null || value === undefined
+                                        ? `${value}`
+                                        : typeof value === "object" && value
+                                            ? `Object[${Object.keys(value).length}]`
+                                            : typeof value;
+                        return prev;
+                    }, {}))
+                        .pipe(
+                    // can't use andThen due to some being a function and effect
+                    Effect.zipRight(handler.handler(req)), Effect.tapErrorCause((cause) => Cause.isFailure(cause) ? logRequestError(cause) : Effect.void), Effect.tapDefect((cause) => Effect
+                        .all([
+                        reportRequestError(cause, {
+                            action: `${meta.moduleName}.${req._tag}`
+                        }),
+                        Rpc.currentHeaders.pipe(Effect.andThen((headers) => {
+                            return InfraLogger
+                                .logError("Finished request", cause)
+                                .pipe(Effect.annotateLogs({
+                                action: `${meta.moduleName}.${req._tag}`,
+                                req: pretty(req),
+                                headers: pretty(headers)
+                                // resHeaders: pretty(
+                                //   Object
+                                //     .entries(headers)
+                                //     .reduce((prev, [key, value]) => {
+                                //       prev[key] = value && typeof value === "string" ? snipString(value) : value
+                                //       return prev
+                                //     }, {} as Record<string, any>)
+                                // )
+                            }));
+                        }))
+                    ])), devMode ? (_) => _ : Effect.catchAllDefect(() => Effect.die("Internal Server Error")), Effect.withSpan("Request." + meta.moduleName + "." + req._tag, {
+                        captureStackTrace: () => handler.stack
+                    })), meta.moduleName); // TODO
+                    return acc;
+                }, {});
+                const rpcRouter = RpcRouter.make(...Object.values(mapped));
+                const httpApp = toHttpApp(rpcRouter, {
+                    spanPrefix: rsc
+                        .meta
+                        .moduleName + "."
+                });
+                const services = (yield* Effect.context()).pipe(Context.omit(Scope.Scope), Context.omit(Tracer.ParentSpan));
+                yield* router
+                    .all("/", (httpApp
+                    .pipe(HttpMiddleware.make(Effect.provide(services)))), 
+                // TODO: not queries.
+                { uninterruptible: true });
+            }));
+            // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+            const routes = layer.pipe(Layer.provideMerge(r.Live), layers ? Layer.provide(layers) : (_) => _);
+            // Effect.Effect<HttpRouter.HttpRouter<unknown, HttpRouter.HttpRouter.DefaultServices>, never, UserRouter>
+            return {
+                moduleName: meta.moduleName,
+                Router: r,
+                routes
+            };
+        };
         const r = {
+            effect,
             controllers,
             ...typedKeysOf(filtered).reduce((prev, cur) => {
                 ;
@@ -218,4 +307,4 @@ export const makeRouter = (middleware, devMode) => {
     }
     return { matchAll, matchFor };
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing2.js","sourceRoot":"","sources":["../../src/api/routing2.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing2.js","sourceRoot":"","sources":["../../src/api/routing2.ts"],"names":[],"mappings":"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"}

package/dist/services/Repository/ext.d.ts

@@ -26,7 +26,7 @@ export declare function byIdAndSaveWithPure<T extends {
     id: unknown;
 }, Encoded extends {
     id: string;
-}, Evt, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, id: T["id"]): <R, A, E, S2 extends T>(pure: Effect<A, E, FixEnv<R, Evt, T, S2>>) => Effect.Effect<A, import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | NotFoundError<ItemType> | E, Exclude<R, {
+}, Evt, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, id: T["id"]): <R, A, E, S2 extends T>(pure: Effect<A, E, FixEnv<R, Evt, T, S2>>) => Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | E | import("effect-app/client/errors").InvalidStateError | NotFoundError<ItemType>, Exclude<R, {
     env: import("effect-app/Pure").PureEnv<Evt, T, S2>;
 }>>;
 /**
@@ -39,7 +39,7 @@ export declare function handleByIdAndSaveWithPure<T extends {
     id: string;
 }, Evt, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>): <Req extends {
     id: T["id"];
-}, Context, R, A, E, S2 extends T>(pure: (req: Req, ctx: Context) => Effect<A, E, FixEnv<R, Evt, T, S2>>) => (req: Req, ctx: Context) => Effect.Effect<A, import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | E | NotFoundError<ItemType>, Exclude<R, {
+}, Context, R, A, E, S2 extends T>(pure: (req: Req, ctx: Context) => Effect<A, E, FixEnv<R, Evt, T, S2>>) => (req: Req, ctx: Context) => Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | E | import("effect-app/client/errors").InvalidStateError | NotFoundError<ItemType>, Exclude<R, {
     env: import("effect-app/Pure").PureEnv<Evt, T, S2>;
 }>>;
 /**
@@ -49,7 +49,7 @@ export declare function saveManyWithPure_<R, T extends {
     id: unknown;
 }, Encoded extends {
     id: string;
-}, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, items: Iterable<S1>, pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>): Effect.Effect<A, import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | E, Exclude<R, {
+}, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, items: Iterable<S1>, pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>): Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | E | import("effect-app/client/errors").InvalidStateError, Exclude<R, {
     env: import("effect-app/Pure").PureEnv<Evt, readonly S1[], readonly S2[]>;
 }>>;
 /**
@@ -59,14 +59,14 @@ export declare function saveWithPure_<R, T extends {
     id: unknown;
 }, Encoded extends {
     id: string;
-}, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, item: S1, pure: Effect<A, E, FixEnv<R, Evt, S1, S2>>): Effect.Effect<A, import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | E, Exclude<R, {
+}, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, item: S1, pure: Effect<A, E, FixEnv<R, Evt, S1, S2>>): Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E, Exclude<R, {
     env: import("effect-app/Pure").PureEnv<Evt, S1, S2>;
 }>>;
 export declare function saveAllWithEffectInt<T extends {
     id: unknown;
 }, Encoded extends {
     id: string;
-}, P extends T, Evt, ItemType extends string, R, E, A>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, gen: Effect<readonly [Iterable<P>, Iterable<Evt>, A], E, R>): Effect.Effect<A, import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | E, R>;
+}, P extends T, Evt, ItemType extends string, R, E, A>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, gen: Effect<readonly [Iterable<P>, Iterable<Evt>, A], E, R>): Effect.Effect<A, import("effect-app/client/errors").OptimisticConcurrencyException | E | import("effect-app/client/errors").InvalidStateError, R>;
 /**
  * @tsplus fluent Repository saveManyWithPureBatched
  */
@@ -74,7 +74,7 @@ export declare function saveManyWithPureBatched<T extends {
     id: unknown;
 }, Encoded extends {
     id: string;
-}, Evt, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, batchSize?: number): <R, A, E, S1 extends T, S2 extends T>(pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>) => (items: Iterable<S1>) => Effect.Effect<A[], import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | E, Exclude<R, {
+}, Evt, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, batchSize?: number): <R, A, E, S1 extends T, S2 extends T>(pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>) => (items: Iterable<S1>) => Effect.Effect<A[], import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E, Exclude<R, {
     env: import("effect-app/Pure").PureEnv<Evt, readonly S1[], readonly S2[]>;
 }>>;
 /**
@@ -84,7 +84,7 @@ export declare function saveManyWithPureBatched_<R, T extends {
     id: unknown;
 }, Encoded extends {
     id: string;
-}, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, items: Iterable<S1>, pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>, batchSize?: number): Effect.Effect<A[], import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | E, Exclude<R, {
+}, A, E, Evt, S1 extends T, S2 extends T, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>, items: Iterable<S1>, pure: Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>, batchSize?: number): Effect.Effect<A[], import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E, Exclude<R, {
     env: import("effect-app/Pure").PureEnv<Evt, readonly S1[], readonly S2[]>;
 }>>;
 /**
@@ -94,7 +94,7 @@ export declare function save<T extends {
     id: unknown;
 }, Encoded extends {
     id: string;
-}, Evt, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>): (items_0: T, ...items: T[]) => Effect<void, import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException>;
+}, Evt, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>): (items_0: T, ...items: T[]) => Effect<void, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError>;
 /**
  * @tsplus getter Repository saveWithEvents
  */
@@ -102,7 +102,7 @@ export declare function saveWithEvents<T extends {
     id: unknown;
 }, Encoded extends {
     id: string;
-}, Evt, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>): (events: Iterable<Evt>) => (items_0: T, ...items: T[]) => Effect<void, import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException>;
+}, Evt, ItemType extends string>(self: RepositoryBaseC<T, Encoded, Evt, ItemType>): (events: Iterable<Evt>) => (items_0: T, ...items: T[]) => Effect<void, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError>;
 /**
  * @tsplus fluent Repository updateWithEffect
  */
@@ -110,7 +110,7 @@ export declare function itemUpdateWithEffect<R, E, T extends {
     id: string;
 }, Encoded extends {
     id: string;
-}, Evt, ItemType extends string>(repo: RepositoryBaseC<T, Encoded, Evt, ItemType>, id: T["id"], mod: (item: T) => Effect<T, E, R>): Effect.Effect<void, import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | E | NotFoundError<ItemType>, R>;
+}, Evt, ItemType extends string>(repo: RepositoryBaseC<T, Encoded, Evt, ItemType>, id: T["id"], mod: (item: T) => Effect<T, E, R>): Effect.Effect<void, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | E | NotFoundError<ItemType>, R>;
 /**
  * @tsplus fluent Repository update
  */
@@ -118,7 +118,7 @@ export declare function itemUpdate<T extends {
     id: string;
 }, Encoded extends {
     id: string;
-}, Evt, ItemType extends string>(repo: RepositoryBaseC<T, Encoded, Evt, ItemType>, id: T["id"], mod: (item: T) => T): Effect.Effect<void, import("effect-app/client/errors").InvalidStateError | import("effect-app/client/errors").OptimisticConcurrencyException | NotFoundError<ItemType>, never>;
+}, Evt, ItemType extends string>(repo: RepositoryBaseC<T, Encoded, Evt, ItemType>, id: T["id"], mod: (item: T) => T): Effect.Effect<void, import("effect-app/client/errors").OptimisticConcurrencyException | import("effect-app/client/errors").InvalidStateError | NotFoundError<ItemType>, never>;
 /**
  * only use this as a shortcut if you don't have the item already
  * @tsplus fluent Repository removeById

package/dist/services/RepositoryBase.d.ts

@@ -88,8 +88,8 @@ export declare class RepositoryBaseC3<T extends {
     get(id: T["id"]): Effect.Effect<T, NotFoundError<ItemType>, never>;
     readonly log: (evt: Evt) => import("effect-app/Pure").PureLogT<any>;
     removeById(id: T["id"]): Effect.Effect<void, NotFoundError<ItemType>, never>;
-    readonly save: (items_0: T, ...items: T[]) => Effect<void, InvalidStateError | OptimisticConcurrencyException>;
-    readonly saveWithEvents: (events: Iterable<Evt>) => (items_0: T, ...items: T[]) => Effect<void, InvalidStateError | OptimisticConcurrencyException>;
+    readonly save: (items_0: T, ...items: T[]) => Effect<void, OptimisticConcurrencyException | InvalidStateError>;
+    readonly saveWithEvents: (events: Iterable<Evt>) => (items_0: T, ...items: T[]) => Effect<void, OptimisticConcurrencyException | InvalidStateError>;
     readonly queryAndSavePure: {
         <A, E2, R2, T2 extends T>(q: (q: Query<Encoded>) => QueryEnd<Encoded, "one">, pure: Effect<A, E2, FixEnv<R2, Evt, T, T2>>): Effect.Effect<A, InvalidStateError | OptimisticConcurrencyException | NotFoundError<ItemType> | E2, Exclude<R2, {
             env: PureEnv<Evt, T, T2>;
@@ -106,7 +106,7 @@ export declare class RepositoryBaseC3<T extends {
      */
     readonly handleByIdAndSaveWithPure: <Req extends {
         id: T["id"];
-    }, Context, R, A, E, S2 extends T>(pure: (req: Req, ctx: Context) => Effect<A, E, FixEnv<R, Evt, T, S2>>) => (req: Req, ctx: Context) => Effect.Effect<A, InvalidStateError | OptimisticConcurrencyException | NotFoundError<ItemType> | E, Exclude<R, {
+    }, Context, R, A, E, S2 extends T>(pure: (req: Req, ctx: Context) => Effect<A, E, FixEnv<R, Evt, T, S2>>) => (req: Req, ctx: Context) => Effect.Effect<A, OptimisticConcurrencyException | InvalidStateError | NotFoundError<ItemType> | E, Exclude<R, {
         env: PureEnv<Evt, T, S2>;
     }>>;
     saveManyWithPure: {
@@ -122,7 +122,7 @@ export declare class RepositoryBaseC3<T extends {
             env: PureEnv<Evt, T, S2>;
         }>>;
     };
-    saveWithPure<R, A, E, S1 extends T, S2 extends T>(item: S1, pure: Effect<A, E, FixEnv<R, Evt, S1, S2>>): Effect.Effect<A, InvalidStateError | OptimisticConcurrencyException | E, Exclude<R, {
+    saveWithPure<R, A, E, S1 extends T, S2 extends T>(item: S1, pure: Effect<A, E, FixEnv<R, Evt, S1, S2>>): Effect.Effect<A, OptimisticConcurrencyException | InvalidStateError | E, Exclude<R, {
         env: PureEnv<Evt, S1, S2>;
     }>>;
 }
@@ -145,7 +145,7 @@ export declare function makeRepo<Evt = never>(): <ItemType extends string, R, En
         config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
             partitionValue?: (a: Encoded) => string;
         };
-    }) => Effect.Effect<Repository<T, Encoded, Evt, ItemType>, E, R | RInitial | R2 | StoreMaker | ContextMapContainer>;
+    }) => Effect.Effect<Repository<T, Encoded, Evt, ItemType>, E, StoreMaker | ContextMapContainer | R | RInitial | R2>;
     Q: Query<Encoded>;
 };
 export declare function makeStore<Encoded extends {
@@ -156,7 +156,7 @@ export declare function makeStore<Encoded extends {
     id: unknown;
 }>(name: ItemType, schema: S.Schema<T, E, R>, mapTo: (e: E, etag: string | undefined) => Encoded) => <RInitial = never, EInitial = never>(makeInitial?: Effect<readonly T[], EInitial, RInitial>, config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
     partitionValue?: (a: Encoded) => string;
-}) => Effect.Effect<import("./Store.js").Store<Encoded, string, PersistenceModelType<Encoded>>, EInitial, R | RInitial | StoreMaker>;
+}) => Effect.Effect<import("./Store.js").Store<Encoded, string, PersistenceModelType<Encoded>>, EInitial, StoreMaker | R | RInitial>;
 export interface Repos<T extends {
     id: unknown;
 }, Encoded extends {

package/dist/services/Store/Cosmos/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../src/services/Store/Cosmos/query.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAAqB,MAAM,YAAY,CAAA;AAC7D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAGvD,OAAO,KAAK,EAAW,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAEpD,wBAAgB,QAAQ,CAAC,CAAC,EAAE;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,EAAE;QACV,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,eAAe,GAAG,SAAS,eAAe,EAAE,CAAA;KACpD,EAAE,CAAA;CACJ,qCAcA;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,SAAS,YAAY,EAAE,EAC/B,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,MAAM,CAAC,EAAE,qBAAqB,CAAC,MAAM,CAAC,EACtC,KAAK,CAAC,EAAE,qBAAqB,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAAA;CAAE,CAAC,EACzE,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM;;;;;;EA8Jf"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../src/services/Store/Cosmos/query.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,MAAM,EAAqB,MAAM,YAAY,CAAA;AAC7D,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAGvD,OAAO,KAAK,EAAW,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAEpD,wBAAgB,QAAQ,CAAC,CAAC,EAAE;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,EAAE;QACV,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,eAAe,GAAG,SAAS,eAAe,EAAE,CAAA;KACpD,EAAE,CAAA;CACJ,qCAcA;AAKD,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,SAAS,YAAY,EAAE,EAC/B,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,MAAM,CAAC,EAAE,qBAAqB,CAAC,MAAM,CAAC,EACtC,KAAK,CAAC,EAAE,qBAAqB,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAAA;CAAE,CAAC,EACzE,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM;;;;;;EAyKf"}

package/dist/services/Store/Cosmos/query.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return */
 import { Array, Effect, Equivalence, pipe } from "effect-app";
 import { assertUnreachable } from "effect-app/utils";
 import { InfraLogger } from "../../../logger.js";
@@ -12,6 +13,8 @@ export function logQuery(q) {
         }, {}), undefined, 2)
     }));
 }
+const arrayContains = (v) => v.map((_) => JSON.stringify(_)).join(", ");
+const vAsArr = (v) => v;
 export function buildWhereCosmosQuery3(filter, name, importedMarkerId, defaultValues, select, order, skip, limit) {
     const statement = (x, i) => {
         let k = x.path.includes(".-1.")
@@ -25,9 +28,17 @@ export function buildWhereCosmosQuery3(filter, name, importedMarkerId, defaultVa
             case "notIn":
                 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)`;
             case "startsWith":
@@ -150,4 +161,4 @@ export function buildWhereCosmosQuery3(filter, name, importedMarkerId, defaultVa
         ]
     };
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvc2VydmljZXMvU3RvcmUvQ29zbW9zL3F1ZXJ5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLFdBQVcsRUFBRSxJQUFJLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFFN0QsT0FBTyxFQUFFLGlCQUFpQixFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFDcEQsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLG9CQUFvQixDQUFBO0FBSWhELE1BQU0sVUFBVSxRQUFRLENBQUMsQ0FNeEI7SUFDQyxPQUFPLFdBQVc7U0FDZixRQUFRLENBQUMsY0FBYyxDQUFDO1NBQ3hCLElBQUksQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDO1FBQ3hCLEtBQUssRUFBRSxDQUFDLENBQUMsS0FBSztRQUNkLFVBQVUsRUFBRSxJQUFJLENBQUMsU0FBUyxDQUN4QixDQUFDLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxDQUFDLEdBQUcsRUFBRSxDQUFDLEVBQUUsRUFBRTtZQUM3QixHQUFHLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxLQUFLLENBQUE7WUFDckIsT0FBTyxHQUFHLENBQUE7UUFDWixDQUFDLEVBQUUsRUFBa0UsQ0FBQyxFQUN0RSxTQUFTLEVBQ1QsQ0FBQyxDQUNGO0tBQ0YsQ0FBQyxDQUFDLENBQUE7QUFDUCxDQUFDO0FBRUQsTUFBTSxVQUFVLHNCQUFzQixDQUNwQyxNQUErQixFQUMvQixJQUFZLEVBQ1osZ0JBQXdCLEVBQ3hCLGFBQXNDLEVBQ3RDLE1BQXNDLEVBQ3RDLEtBQXlFLEVBQ3pFLElBQWEsRUFDYixLQUFjO0lBRWQsTUFBTSxTQUFTLEdBQUcsQ0FBQyxDQUFVLEVBQUUsQ0FBUyxFQUFFLEVBQUU7UUFDMUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxRQUFRLENB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
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../src/services/Store/Cosmos/query.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAE7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAIhD,MAAM,UAAU,QAAQ,CAAC,CAMxB;IACC,OAAO,WAAW;SACf,QAAQ,CAAC,cAAc,CAAC;SACxB,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;QACxB,KAAK,EAAE,CAAC,CAAC,KAAK;QACd,UAAU,EAAE,IAAI,CAAC,SAAS,CACxB,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;YAC7B,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAA;YACrB,OAAO,GAAG,CAAA;QACZ,CAAC,EAAE,EAAkE,CAAC,EACtE,SAAS,EACT,CAAC,CACF;KACF,CAAC,CAAC,CAAA;AACP,CAAC;AAED,MAAM,aAAa,GAAG,CAAC,CAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AAC9E,MAAM,MAAM,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAqB,CAAA;AAEnD,MAAM,UAAU,sBAAsB,CACpC,MAA+B,EAC/B,IAAY,EACZ,gBAAwB,EACxB,aAAsC,EACtC,MAAsC,EACtC,KAAyE,EACzE,IAAa,EACb,KAAc;IAEd,MAAM,SAAS,GAAG,CAAC,CAAU,EAAE,CAAS,EAAE,EAAE;QAC1C,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC7B,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAE,EAAE;YAC1D,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAA;QAEjB,CAAC,GAAG,CAAC,CAAC,IAAI,IAAI,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QAEtF,MAAM,CAAC,GAAG,IAAI,GAAG,CAAC,CAAA;QAElB,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC;YACb,KAAK,IAAI;gBACP,OAAO,kBAAkB,CAAC,KAAK,CAAC,GAAG,CAAA;YACrC,KAAK,OAAO;gBACV,OAAO,uBAAuB,CAAC,KAAK,CAAC,IAAI,CAAA;YAE3C,KAAK,UAAU;gBACb,OAAO,kBAAkB,CAAC,KAAK,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;YAC5D,KAAK,aAAa;gBAChB,OAAO,uBAAuB,CAAC,KAAK,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;YAElE,KAAK,cAAc;gBACjB,OAAO,sBAAsB,CAAC,KAAK,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;YAChE,KAAK,iBAAiB;gBACpB,OAAO,2BAA2B,CAAC,KAAK,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;YAEtE,KAAK,cAAc;gBACjB,OAAO,sBAAsB,CAAC,KAAK,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA;YAChE,KAAK,iBAAiB;gBACpB,OAAO,2BAA2B,CAAC,KAAK,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;YAEtE,KAAK,UAAU;gBACb,OAAO,YAAY,CAAC,KAAK,CAAC,SAAS,CAAA;YAErC,KAAK,YAAY;gBACf,OAAO,cAAc,CAAC,KAAK,CAAC,SAAS,CAAA;YACvC,KAAK,UAAU;gBACb,OAAO,YAAY,CAAC,KAAK,CAAC,SAAS,CAAA;YACrC,KAAK,aAAa;gBAChB,OAAO,gBAAgB,CAAC,KAAK,CAAC,UAAU,CAAA;YAC1C,KAAK,eAAe;gBAClB,OAAO,kBAAkB,CAAC,KAAK,CAAC,UAAU,CAAA;YAC5C,KAAK,aAAa;gBAChB,OAAO,gBAAgB,CAAC,KAAK,CAAC,UAAU,CAAA;QAC5C,CAAC;QAED,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC;YACb,KAAK,IAAI;gBACP,OAAO,GAAG,CAAC,MAAM,CAAC,EAAE,CAAA;YACtB,KAAK,KAAK;gBACR,OAAO,GAAG,CAAC,OAAO,CAAC,EAAE,CAAA;YACvB,KAAK,IAAI;gBACP,OAAO,GAAG,CAAC,MAAM,CAAC,EAAE,CAAA;YACtB,KAAK,KAAK;gBACR,OAAO,GAAG,CAAC,OAAO,CAAC,EAAE,CAAA;YACvB,KAAK,KAAK;gBACR,OAAO,CAAC,CAAC,KAAK,KAAK,IAAI;oBACrB,CAAC,CAAC,WAAW,CAAC,WAAW;oBACzB,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAA;YACpB,KAAK,SAAS,CAAC;YACf,KAAK,IAAI;gBACP,OAAO,CAAC,CAAC,KAAK,KAAK,IAAI;oBACrB,CAAC,CAAC,WAAW,CAAC,UAAU;oBACxB,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAA;YACnB,OAAO,CAAC,CAAC,CAAC;gBACR,OAAO,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;YAChC,CAAC;QACH,CAAC;IACH,CAAC,CAAA;IAED,IAAI,CAAC,GAAG,CAAC,CAAA;IAET,MAAM,KAAK,GAAG,CAAC,KAA8B,EAAE,EAAE;QAC/C,IAAI,CAAC,GAAG,EAAE,CAAA;QACV,IAAI,CAAC,GAAG,CAAC,CAAA;QACT,MAAM,MAAM,GAAG,CAAC,CAAS,EAAE,EAAE;YAC3B,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAClE,CAAC,CAAA;QACD,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;YACtB,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;gBACZ,KAAK,OAAO;oBACV,CAAC,IAAI,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;oBACtB,MAAK;gBACP,KAAK,IAAI;oBACP,CAAC,IAAI,OAAO,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAA;oBAC/B,MAAK;gBACP,KAAK,KAAK;oBACR,CAAC,IAAI,QAAQ,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAA;oBAChC,MAAK;gBACP,KAAK,UAAU,CAAC,CAAC,CAAC;oBAChB,EAAE,CAAC,CAAA;oBACH,CAAC,IAAI,UAAU,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,GAAG,CAAA;oBAC/D,EAAE,CAAC,CAAA;oBACH,MAAK;gBACP,CAAC;gBACD,KAAK,WAAW,CAAC,CAAC,CAAC;oBACjB,EAAE,CAAC,CAAA;oBACH,CAAC,IAAI,WAAW,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,GAAG,CAAA;oBAChE,EAAE,CAAC,CAAA;oBACH,MAAK;gBACP,CAAC;gBACD,KAAK,aAAa,CAAC,CAAC,CAAC;oBACnB,OAAO;oBACP,CAAC,IAAI,MAAM,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAA;oBAC/C,OAAO;oBACP,MAAK;gBACP,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,CAAC,CAAA;IACV,CAAC,CAAA;IAED,kEAAkE;IAClE,iBAAiB;IACjB,kBAAkB;IAClB,gCAAgC;IAChC,gFAAgF;IAChF,6BAA6B;IAC7B,QAAQ;IACR,YAAY;IACZ,oBAAoB;IACpB,uCAAuC;IACvC,6BAA6B;IAE7B,oCAAoC;IACpC,UAAU;IACV,QAAQ;IACR,oDAAoD;IACpD,MAAM,SAAS,GAAG,CAAC,MAA+B,EAAa,EAAE,CAC/D,MAAM;SACH,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACb,CAAC,CAAC,CAAC,KAAK,WAAW,IAAI,CAAC,CAAC,CAAC,KAAK,UAAU,IAAI,CAAC,CAAC,CAAC,KAAK,aAAa;QAChE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;QACrB,CAAC,CAAC,CAAC,CAAC,CAAC,CACR,CAAA;IACL,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAA;IAChC,OAAO;QACL,KAAK,EAAE;aAEL,MAAM;YACJ,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;YAC7C,CAAC,CAAC,GACN;WACO,IAAI;;MAGT,IAAI,CACF,MAAM;aACH,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;aACtC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;aACnC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,EACpC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CACrC;aACE,IAAI,CAAC,IAAI,CACd;;wBAEoB,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;MAC/D,KAAK,CAAC,CAAC,CAAC,YAAY,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE;MACnF,IAAI,KAAK,SAAS,IAAI,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,KAAK,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;QACnG,UAAU,EAAE;YACV,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE;YACxC,GAAG,MAAM;iBACN,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gBACd,IAAI,EAAE,KAAK,CAAC,EAAE;gBACd,KAAK,EAAE,CAAC,CAAC,KAAK;aACf,CAAC,CAAC;SACN;KACF,CAAA;AACH,CAAC"}

package/dist/services/Store/codeFilter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codeFilter.d.ts","sourceRoot":"","sources":["../../../src/services/Store/codeFilter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAGjE,eAAO,MAAM,mBAAmB,GAAI,CAAC,KAAK,OAAO,KAAK,CAAC,YAgDtD,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,SAAS,YAAY,EAAE,WAAW,CAAC,YAA6B,CAAA;AAgDtG,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,SAAS,YAAY,EAAE,OAAO,CAAC,KAAG,OAIxE,CAAA"}
+{"version":3,"file":"codeFilter.d.ts","sourceRoot":"","sources":["../../../src/services/Store/codeFilter.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAKjE,eAAO,MAAM,mBAAmB,GAAI,CAAC,KAAK,OAAO,KAAK,CAAC,YAwDtD,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,SAAS,YAAY,EAAE,WAAW,CAAC,YAA6B,CAAA;AAgDtG,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,SAAS,YAAY,EAAE,OAAO,CAAC,KAAG,OAIxE,CAAA"}

package/dist/services/Store/codeFilter.js

@@ -1,6 +1,9 @@
+/* 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 { compare, greaterThan, greaterThanExclusive, lowerThan, lowerThanExclusive } from "./utils.js";
+const vAsArr = (v) => v;
 export const codeFilterStatement = (p, x) => {
     const k = get(x, p.path);
     switch (p.op) {
@@ -20,6 +23,14 @@ export const codeFilterStatement = (p, x) => {
             return k.includes(p.value);
         case "notIncludes":
             return !k.includes(p.value);
+        case "includes-any":
+            return (vAsArr(p.value)).some((_) => k?.includes(_));
+        case "notIncludes-any":
+            return !(vAsArr(p.value)).some((_) => k?.includes(_));
+        case "includes-all":
+            return (vAsArr(p.value)).every((_) => k?.includes(_));
+        case "notIncludes-all":
+            return !(vAsArr(p.value)).every((_) => k?.includes(_));
         case "contains":
             return k.toLowerCase().includes(p.value.toLowerCase());
         case "endsWith":
@@ -100,4 +111,4 @@ export const codeFilter3_ = (state, sut) => {
     const s = codeFilter3__(state, sut, statements);
     return eval(s);
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29kZUZpbHRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9TdG9yZS9jb2RlRmlsdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDbEMsT0FBTyxFQUFFLGlCQUFpQixFQUFFLEdBQUcsRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBRXpELE9BQU8sRUFBRSxPQUFPLEVBQUUsV0FBVyxFQUFFLG9CQUFvQixFQUFFLFNBQVMsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUV0RyxNQUFNLENBQUMsTUFBTSxtQkFBbUIsR0FBRyxDQUFJLENBQVUsRUFBRSxDQUFJLEVBQUUsRUFBRTtJQUN6RCxNQUFNLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUN4QixRQUFRLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUNiLEtBQUssSUFBSTtZQUNQLE9BQU8sQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDNUIsS0FBSyxPQUFPO1lBQ1YsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQzdCLEtBQUssSUFBSTtZQUNQLE9BQU8sU0FBUyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDOUIsS0FBSyxLQUFLO1lBQ1IsT0FBTyxrQkFBa0IsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ3ZDLEtBQUssSUFBSTtZQUNQLE9BQU8sV0FBVyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDaEMsS0FBSyxLQUFLO1lBQ1IsT0FBTyxvQkFBb0IsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEtBQUss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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29kZUZpbHRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9TdG9yZS9jb2RlRmlsdGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHVEQUF1RDtBQUN2RCwwREFBMEQ7QUFDMUQsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUNsQyxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsR0FBRyxFQUFFLE1BQU0sa0JBQWtCLENBQUE7QUFFekQsT0FBTyxFQUFFLE9BQU8sRUFBRSxXQUFXLEVBQUUsb0JBQW9CLEVBQUUsU0FBUyxFQUFFLGtCQUFrQixFQUFFLE1BQU0sWUFBWSxDQUFBO0FBRXRHLE1BQU0sTUFBTSxHQUFHLENBQUMsQ0FBUyxFQUFFLEVBQUUsQ0FBQyxDQUFxQixDQUFBO0FBRW5ELE1BQU0sQ0FBQyxNQUFNLG1CQUFtQixHQUFHLENBQUksQ0FBVSxFQUFFLENBQUksRUFBRSxFQUFFO0lBQ3pELE1BQU0sQ0FBQyxHQUFHLEdBQUcsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFBO0lBQ3hCLFFBQVEsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDO1FBQ2IsS0FBSyxJQUFJO1lBQ1AsT0FBTyxDQUFDLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUM1QixLQUFLLE9BQU87WUFDVixPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDN0IsS0FBSyxJQUFJO1lBQ1AsT0FBTyxTQUFTLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUM5QixLQUFLLEtBQUs7WUFDUixPQUFPLGtCQUFrQixDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDdkMsS0FBSyxJQUFJO1lBQ1AsT0FBTyxXQUFXLENBQUMsQ0FBQyxFQUFFLENBQUMs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

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

@@ -1,5 +1,5 @@
 export type InOps = "in" | "notIn";
-export type OtherOps = "endsWith" | "startsWith" | "notEndsWith" | "notStartsWith" | "contains" | "notContains" | "includes" | "notIncludes" | "eq" | "neq" | "gt" | "gte" | "lt" | "lte";
+export type OtherOps = "endsWith" | "startsWith" | "notEndsWith" | "notStartsWith" | "contains" | "notContains" | "includes" | "notIncludes" | "includes-any" | "notIncludes-any" | "includes-all" | "notIncludes-all" | "eq" | "neq" | "gt" | "gte" | "lt" | "lte";
 export type Ops = OtherOps | InOps;
 export type FilterScopes = {
     t: "or-scope";

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

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../src/services/Store/filterApi/query.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,KAAK,GACb,IAAI,GACJ,OAAO,CAAA;AAEX,MAAM,MAAM,QAAQ,GAChB,UAAU,GACV,YAAY,GACZ,aAAa,GACb,eAAe,GACf,UAAU,GACV,aAAa,GACb,UAAU,GACV,aAAa,GACb,IAAI,GACJ,KAAK,GACL,IAAI,GACJ,KAAK,GACL,IAAI,GACJ,KAAK,CAAA;AAGT,MAAM,MAAM,GAAG,GAAG,QAAQ,GAAG,KAAK,CAAA;AAElC,MAAM,MAAM,YAAY,GAAG;IACzB,CAAC,EAAE,UAAU,CAAA;IACb,MAAM,EAAE,YAAY,EAAE,CAAA;CACvB,GAAG;IACF,CAAC,EAAE,WAAW,CAAA;IACd,MAAM,EAAE,YAAY,EAAE,CAAA;CACvB,GAAG;IACF,CAAC,EAAE,aAAa,CAAA;IAChB,MAAM,EAAE,YAAY,EAAE,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,OAAO,GAAG;IACpB,EAAE,EAAE,GAAG,CAAA;IAEP,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,YAAY,GACpB;IACA,CAAC,EAAE,OAAO,CAAA;CACX,GAAG,OAAO,GACT;IACA,CAAC,EAAE,IAAI,CAAA;CACR,GAAG,OAAO,GACT;IACA,CAAC,EAAE,KAAK,CAAA;CACT,GAAG,OAAO,GACT,YAAY,CAAA"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../src/services/Store/filterApi/query.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,KAAK,GACb,IAAI,GACJ,OAAO,CAAA;AAEX,MAAM,MAAM,QAAQ,GAChB,UAAU,GACV,YAAY,GACZ,aAAa,GACb,eAAe,GACf,UAAU,GACV,aAAa,GACb,UAAU,GACV,aAAa,GACb,cAAc,GACd,iBAAiB,GACjB,cAAc,GACd,iBAAiB,GACjB,IAAI,GACJ,KAAK,GACL,IAAI,GACJ,KAAK,GACL,IAAI,GACJ,KAAK,CAAA;AAET,MAAM,MAAM,GAAG,GAAG,QAAQ,GAAG,KAAK,CAAA;AAElC,MAAM,MAAM,YAAY,GAAG;IACzB,CAAC,EAAE,UAAU,CAAA;IACb,MAAM,EAAE,YAAY,EAAE,CAAA;CACvB,GAAG;IACF,CAAC,EAAE,WAAW,CAAA;IACd,MAAM,EAAE,YAAY,EAAE,CAAA;CACvB,GAAG;IACF,CAAC,EAAE,aAAa,CAAA;IAChB,MAAM,EAAE,YAAY,EAAE,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,OAAO,GAAG;IACpB,EAAE,EAAE,GAAG,CAAA;IAEP,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,MAAM,MAAM,YAAY,GACpB;IACA,CAAC,EAAE,OAAO,CAAA;CACX,GAAG,OAAO,GACT;IACA,CAAC,EAAE,IAAI,CAAA;CACR,GAAG,OAAO,GACT;IACA,CAAC,EAAE,KAAK,CAAA;CACT,GAAG,OAAO,GACT,YAAY,CAAA"}

package/dist/services/query/dsl.d.ts

@@ -134,6 +134,8 @@ export type FilterWheres = {
     <TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues>, V extends FieldPathValue<TFieldValues, TFieldName>>(path: TFieldName, op: "gt" | "gte" | "lt" | "lte", value: V): (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>;
+    <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 = {
     <TFieldValues extends FieldValues>(fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues>): (current: Query<TFieldValues>) => QueryWhere<TFieldValues>;
@@ -160,13 +162,18 @@ export type FilterWhere = {
     <TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues>, V extends FieldPathValue<TFieldValues, TFieldName>>(path: TFieldName, op: "gt" | "gte" | "lt" | "lte" | "neq", value: V): (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>;
+    <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 = {
     <TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues>, V extends FieldPathValue<TFieldValues, TFieldName>>(path: TFieldName, value: V): (current: QueryWhere<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): (current: QueryWhere<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: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>;
     <TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues>, V extends FieldPathValue<TFieldValues, TFieldName>>(path: TFieldName, 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>): (current: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>;
     <TFieldValues extends FieldValues>(fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues>, fc: (query: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>): (current: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>;