@effect-app/infra 2.61.3 → 2.61.4

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @effect-app/infra
 
+## 2.61.4
+
+### Patch Changes
+
+- 50b470c: optimise
+
 ## 2.61.3
 
 ### Patch Changes

package/dist/QueueMaker/SQLQueue.d.ts

@@ -13,6 +13,6 @@ export declare function makeSQLQueue<Evt extends {
     _tag: string;
 }, EvtE, DrainEvtE>(queueName: NonEmptyString255, queueDrainName: NonEmptyString255, schema: S.Schema<Evt, EvtE>, drainSchema: S.Schema<DrainEvt, DrainEvtE>): Effect.Effect<{
     publish: (messages_0: Evt, ...messages: Evt[]) => Effect.Effect<void, never, never>;
-    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, import("../Store/ContextMapContainer.js").ContextMapContainer | import("../Store/Memory.js").storeId | import("../RequestContext.js").LocaleRef>, Tracer.ParentSpan>>;
+    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, import("../Store/Memory.js").storeId | import("../RequestContext.js").LocaleRef | import("../Store/ContextMapContainer.js").ContextMapContainer>, Tracer.ParentSpan>>;
 }, never, SqlClient.SqlClient>;
 //# sourceMappingURL=SQLQueue.d.ts.map

package/dist/QueueMaker/memQueue.d.ts

@@ -9,6 +9,6 @@ export declare function makeMemQueue<Evt extends {
     _tag: string;
 }, EvtE, DrainEvtE>(queueName: string, queueDrainName: string, schema: S.Schema<Evt, EvtE>, drainSchema: S.Schema<DrainEvt, DrainEvtE>): Effect.Effect<{
     publish: (messages_0: Evt, ...messages: Evt[]) => Effect.Effect<void, never, never>;
-    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, import("../Store/ContextMapContainer.js").ContextMapContainer | import("../Store/Memory.js").storeId | import("../RequestContext.js").LocaleRef>, Tracer.ParentSpan>>;
+    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, import("../Store/Memory.js").storeId | import("../RequestContext.js").LocaleRef | import("../Store/ContextMapContainer.js").ContextMapContainer>, Tracer.ParentSpan>>;
 }, never, MemQueue>;
 //# sourceMappingURL=memQueue.d.ts.map

package/dist/QueueMaker/sbqueue.d.ts

@@ -9,7 +9,7 @@ export declare function makeServiceBusQueue<Evt extends {
     id: StringId;
     _tag: string;
 }, EvtE, DrainEvtE>(queueName: string, queueDrainName: string, schema: S.Schema<Evt, EvtE>, drainSchema: S.Schema<DrainEvt, DrainEvtE>): Effect.Effect<{
-    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, import("effect/Scope").Scope | Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, import("../Store/ContextMapContainer.js").ContextMapContainer | import("../Store/Memory.js").storeId | import("../RequestContext.js").LocaleRef>, ServiceBusReceiverFactory>>;
+    drain: <DrainE, DrainR>(handleEvent: (ks: DrainEvt) => Effect<void, DrainE, DrainR>, sessionId?: string) => Effect.Effect<never, never, import("effect/Scope").Scope | Exclude<Exclude<Exclude<DrainR, Tracer.ParentSpan>, import("../Store/Memory.js").storeId | import("../RequestContext.js").LocaleRef | import("../Store/ContextMapContainer.js").ContextMapContainer>, ServiceBusReceiverFactory>>;
     publish: (messages_0: Evt, ...messages: Evt[]) => Effect.Effect<void, never, never>;
 }, never, ServiceBusReceiverFactory | import("@azure/service-bus").ServiceBusSender>;
 export declare function makeServiceBusLayers(url: string, queueName: string, queueDrainName: string): Layer.Layer<ServiceBusReceiverFactory | import("@azure/service-bus").ServiceBusSender, never, never>;

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

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/Store/Cosmos/query.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,MAAM,EAAe,KAAK,qBAAqB,EAAQ,MAAM,YAAY,CAAA;AAGzF,OAAO,KAAK,EAAW,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC5E,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,KAAK,EAAE,WAAW,EAClB,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,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC,EACpF,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;;;;eAwLc,GAAG;;EAOhC"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/Store/Cosmos/query.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,MAAM,EAAE,KAAK,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAGtE,OAAO,KAAK,EAAW,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAE5E,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,KAAK,EAAE,WAAW,EAClB,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,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC,EACpF,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;;;;eA2Mc,GAAG;;EAOhC"}

package/dist/Store/Cosmos/query.js

@@ -1,8 +1,9 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
-import { Array, Effect, Equivalence, pipe } from "effect-app";
+import { Array, Effect } from "effect-app";
 import { assertUnreachable } from "effect-app/utils";
 import { InfraLogger } from "../../logger.js";
+import { isRelationCheck } from "../codeFilter.js";
 export function logQuery(q) {
     return InfraLogger
         .logDebug("cosmos query")
@@ -82,7 +83,7 @@ export function buildWhereCosmosQuery3(idKey, filter, name, importedMarkerId, de
         }
     };
     let i = 0;
-    const print = (state, values) => {
+    const print = (state, values, isRelation = null) => {
         let s = "";
         let l = 0;
         const printN = (n) => {
@@ -101,19 +102,46 @@ export function buildWhereCosmosQuery3(idKey, filter, name, importedMarkerId, de
                     break;
                 case "or-scope": {
                     ++l;
-                    s += ` OR (\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`;
+                    const rel = isRelationCheck(e.result, isRelation);
+                    if (rel) {
+                        const rel = e.result[0].path.split(".-1.")[0];
+                        s += isRelation
+                            ? ` OR (\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`
+                            : ` OR (\n${printN(l + 1)}EXISTS(SELECT VALUE ${rel} FROM ${rel} IN f.${rel} WHERE ${print(e.result, values, rel)}))`;
+                    }
+                    else {
+                        s += ` OR (\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`;
+                    }
                     --l;
                     break;
                 }
                 case "and-scope": {
                     ++l;
-                    s += ` AND (\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`;
+                    const rel = isRelationCheck(e.result, isRelation);
+                    if (rel) {
+                        const rel = e.result[0].path.split(".-1.")[0];
+                        s += isRelation
+                            ? ` AND (\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`
+                            : ` AND (\n${printN(l + 1)}EXISTS(SELECT VALUE ${rel} FROM ${rel} IN f.${rel} WHERE ${print(e.result, values, rel)}))`;
+                    }
+                    else {
+                        s += ` AND (\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`;
+                    }
                     --l;
                     break;
                 }
                 case "where-scope": {
                     // ;++l
-                    s += `(\n${printN(l + 1)}${print(e.result, values)}\n)`;
+                    const rel = isRelationCheck(e.result, isRelation);
+                    if (rel) {
+                        const rel = e.result[0].path.split(".-1.")[0];
+                        s += isRelation
+                            ? `(\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`
+                            : `(\n${printN(l + 1)}EXISTS(SELECT VALUE ${rel} FROM ${rel} IN f.${rel} WHERE ${print(e.result, values, rel)}))`;
+                    }
+                    else {
+                        s += `(\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`;
+                    }
                     // ;--l
                     break;
                 }
@@ -145,7 +173,7 @@ export function buildWhereCosmosQuery3(idKey, filter, name, importedMarkerId, de
     // or you can end up with duplicates
     return {
         query: `
-    SELECT DISTINCT ${select
+    SELECT ${select
             ? `${select
                 .map((s) => typeof s === "string"
                 ? s === idKey ? "f.id" : `f["${s}"]` // x["y"} vs x.y, helps with reserved keywords like "value"
@@ -154,12 +182,6 @@ export function buildWhereCosmosQuery3(idKey, filter, name, importedMarkerId, de
             : "f"}
     FROM ${name} f
 
-    ${pipe(values
-            .filter((_) => _.path.includes(".-1."))
-            .map((_) => _.path.split(".-1.")[0])
-            .map((_) => `JOIN ${_} IN f.${_}`), Array.dedupeWith(Equivalence.string))
-            .join("\n")}
-
     WHERE f.id != @id ${filter.length ? `AND (${print(filter, values.map((_) => _.value))})` : ""}
     ${order ? `ORDER BY ${order.map((_) => `f.${_.key} ${_.direction}`).join(", ")}` : ""}
     ${skip !== undefined || limit !== undefined ? `OFFSET ${skip ?? 0} LIMIT ${limit ?? 999999}` : ""}`,
@@ -175,4 +197,4 @@ export function buildWhereCosmosQuery3(idKey, filter, name, importedMarkerId, de
         ]
     };
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/Store/Cosmos/query.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/Store/Cosmos/query.ts"],"names":[],"mappings":"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"}

package/dist/Store/Cosmos.js

@@ -190,7 +190,7 @@ function makeCosmosStore({ prefix }) {
                         const limit = f?.limit;
                         const filter = f.filter;
                         return Effect
-                            .sync(() => buildWhereCosmosQuery3(idKey, filter ?? [], name, importedMarkerId, defaultValues, f.select, f.order, skip, limit))
+                            .sync(() => buildWhereCosmosQuery3(idKey, filter ? [{ t: "where-scope", result: filter }] : [], name, importedMarkerId, defaultValues, f.select, f.order, skip, limit))
                             .pipe(Effect.tap((q) => logQuery(q)), Effect
                             .flatMap((q) => Effect.promise(() => f.select
                             ? container
@@ -301,4 +301,4 @@ export function CosmosStoreLayer(cfg) {
         .toLayer(makeCosmosStore(cfg))
         .pipe(Layer.provide(CosmosClientLayer(Redacted.value(cfg.url), cfg.dbName)));
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Cosmos.js","sourceRoot":"","sources":["../../src/Store/Cosmos.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Cosmos.js","sourceRoot":"","sources":["../../src/Store/Cosmos.ts"],"names":[],"mappings":"AAAA,uDAAuD;AAEvD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAA8B,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAC9H,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AACjD,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAC9E,OAAO,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAA;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAA;AAG1C,OAAO,EAAE,sBAAsB,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACpE,OAAO,EAAgG,UAAU,EAAE,MAAM,cAAc,CAAA;AAEvI,MAAM,SAAS,GACb,CAA2D,KAAY,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,EAAW,EAAE,EAAE,CAAC,CAAC;IAC/G,GAAG,CAAC;IACJ,EAAE;CACH,CAAC,CAAA;AACJ,MAAM,gBAAgB,GACpB,CAA2D,KAAY,EAAE,EAAE,CAC3E,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,EAA+D,EAAE,EAAE,CAC5E,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,CAAyC,CAAA;AAEnE,MAAM,sBAAsB;IACL;IAA0B;IAA/C,YAAqB,OAAe,EAAW,GAAa;QAAvC,YAAO,GAAP,OAAO,CAAQ;QAAW,QAAG,GAAH,GAAG,CAAU;IAAG,CAAC;CACjE,CAAC,oDAAoD;AAEtD,SAAS,eAAe,CAAC,EAAE,MAAM,EAAiB;IAChD,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACzB,MAAM,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC,CAAC,YAAY,CAAA;QAClC,OAAO;YACL,IAAI,EAAE,CACJ,IAAY,EACZ,KAAY,EACZ,IAAsC,EACtC,MAA6B,EAC7B,EAAE,CACF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAClB,MAAM,KAAK,GAAG,SAAS,CAAiB,KAAK,CAAC,CAAA;gBAC9C,MAAM,YAAY,GAAG,gBAAgB,CAAiB,KAAK,CAAC,CAAA;gBAG5D,MAAM,WAAW,GAAG,GAAG,MAAM,GAAG,IAAI,EAAE,CAAA;gBACtC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CACzB,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,cAAc,CAAC;oBAC7C,EAAE,EAAE,WAAW;oBACf,eAAe,EAAE,MAAM,EAAE,UAAU;wBACjC,CAAC,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,UAAU,EAAE;wBACnC,CAAC,CAAC,SAAS;iBACd,CAAC,CAAC,CACJ,CAAA;gBAED,MAAM,aAAa,GAAG,MAAM,EAAE,aAAa,IAAI,EAAE,CAAA;gBACjD,MAAM,SAAS,GAAG,EAAE,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;gBAC3C,MAAM,IAAI,GAAG,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;gBACvD,MAAM,SAAS,GAAG,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;gBAC7D,MAAM,gBAAgB,GAAG,WAAW,CAAA;gBAEpC,MAAM,OAAO,GAAG,CAAC,KAAgC,EAAE,EAAE,CACnD,MAAM;qBACH,GAAG,CAAC,QAAQ,CAAC;oBACZ,2CAA2C;oBAC3C,+CAA+C;oBAC/C,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;yBACjB,GAAG,CACF,CAAC,CAAC,EAAE,EAAE,CACJ;wBACE,CAAC;wBACD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;4BACzC,MAAM,EAAE,GAAG,EAAE,CACX,cAAc,CAAC;gCACb,aAAa,EAAE,QAAiB;gCAChC,YAAY,EAAE;oCACZ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC;oCACjC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC;oCACZ,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;iCACzC;gCACD,YAAY,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;6BACxC,CAAC;4BACJ,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CACf,cAAc,CAAC;gCACb,aAAa,EAAE,SAAkB;gCACjC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC;gCACZ,YAAY,EAAE;oCACZ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC;oCACjC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC;oCACZ,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;iCACzC;gCACD,OAAO,EAAE,IAAI;gCACb,YAAY,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;6BACxC,CAAC;yBACL,CAAC;qBACM,CACb,CAAA;oBACH,MAAM,OAAO,GAAG,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,IAAI,EAAE,CAAC,CAAC,CAAA;oBAEjF,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CACvC,OAAO;yBACJ,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAU,CAAC,EACjC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,EAAE,CACb,MAAM;yBACH,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;yBAC9C,IAAI,CACH,MAAM;yBACH,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,EAC7C,MAAM;yBACH,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE,CACrB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;wBAClB,MAAM,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC7B,CAAC,CAAC,UAAU,KAAK,GAAG,IAAI,CAAC,CAAC,UAAU,KAAK,GAAG,IAAI,CAAC,CAAC,UAAU,KAAK,GAAG,CACrE,CAAA;wBACD,IAAI,CAAC,EAAE,CAAC;4BACN,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,8BAA8B,CAChC;gCACE,IAAI,EAAE,IAAI;gCACV,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,IAAI,CAAC,CAAC;gCAC1C,IAAI,EAAE,CAAC,CAAC,UAAU;gCAClB,GAAG,EAAE,SAAS;6BACf,CACF,CACF,CAAA;wBACH,CAAC;wBACD,MAAM,EAAE,GAAG,SAAS,CAAC,IAAI,CACvB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,UAAU,GAAG,GAAG,IAAI,CAAC,CAAC,UAAU,GAAG,GAAG,CAAC,CAC1E,CAAA;wBACD,IAAI,EAAE,EAAE,CAAC;4BACP,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CACtB,IAAI,sBAAsB,CACxB,8BAA8B,GAAG,EAAE,CAAC,UAAU,EAC9C,SAAS,CACV,CACF,CAAA;wBACH,CAAC;wBACD,MAAM,EAAE,GAAG,SAAS,CAAC,IAAI,CACvB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,GAAG,GAAG,IAAI,CAAC,CAAC,UAAU,GAAG,GAAG,CAChD,CAAA;wBACD,IAAI,EAAE,EAAE,CAAC;4BACP,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CACtB,IAAI,sBAAsB,CACxB,8BAA8B,GAAG,EAAE,CAAC,UAAU,EAC9C,SAAS,CACV,CACF,CAAA;wBACH,CAAC;wBACD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;4BAC5B,GAAG,CAAC;4BACJ,oEAAoE;4BACpE,KAAK,EAAE,SAAS,CAAC,CAAC,CAAE,CAAC,IAAI;yBAC1B,CAAC,CAAC,CAAA;oBACL,CAAC,CAAC,CACH,CACJ,CACN,CAAA;oBAED,OAAO,WAAW,CAAC,IAAI,EAA+C,CAAA;gBACxE,CAAC,CAAC;qBACD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,yCAAyC,EAAE;oBAC/D,iBAAiB,EAAE,KAAK;oBACxB,UAAU,EAAE,EAAE,yBAAyB,EAAE,WAAW,EAAE,uBAAuB,EAAE,IAAI,EAAE;iBACtF,CAAC,CAAC,CAAA;gBAEP,MAAM,QAAQ,GAAG,CAAC,KAAgC,EAAE,EAAE;oBACpD,OAAO,MAAM;yBACV,OAAO,CAAC,GAAG,EAAE;wBACZ,MAAM,KAAK,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,GAAG,CAC1B,CAAC,CAAC,EAAE,EAAE,CACJ;4BACE,CAAC;4BACD,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;gCACzC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;oCACb,aAAa,EAAE,QAAiB;oCAChC,YAAY,EAAE;wCACZ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC;wCACjC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC;wCACZ,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;qCACzC;iCACF,CAAC;gCACF,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oCACjB,aAAa,EAAE,SAAkB;oCACjC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC;oCACZ,YAAY,EAAE;wCACZ,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC;wCACjC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC;wCACZ,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;qCACzC;oCACD,OAAO,EAAE,IAAI;iCACd,CAAC;6BACH,CAAC;yBACM,CACb,CAAA;wBAED,MAAM,EAAE,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;wBAElC,OAAO,MAAM;6BACV,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC;6BAC/D,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC,CAAC;4BAChD,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,IAAI,EAAE,CAAA;4BAC7B,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAC7B,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,GAAG,GAAG,IAAI,CAAC,CAAC,UAAU,GAAG,GAAG,CACrD,CAAA;4BACD,IAAI,WAAW,EAAE,CAAC;gCAChB,MAAM,IAAI,GAAG,WAAW,CAAC,UAAU,IAAI,CAAC,CAAA;gCACxC,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;oCACjD,OAAO,KAAK,CAAC,CAAC,IAAI,8BAA8B,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAA;gCACrF,CAAC;gCAED,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CACtB,IAAI,sBAAsB,CAAC,6BAA6B,GAAG,IAAI,CAAC,CACjE,CAAA;4BACH,CAAC;4BAED,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;gCAC5B,GAAG,CAAC;gCACJ,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,IAAI;6BACvB,CAAC,CAA8C,CAAA;wBAClD,CAAC,CAAC,CAAC,CAAC,CAAA;oBACR,CAAC,CAAC;yBACD,IAAI,CAAC,MAAM;yBACT,QAAQ,CAAC,0CAA0C,EAAE;wBACpD,iBAAiB,EAAE,KAAK;wBACxB,UAAU,EAAE,EAAE,yBAAyB,EAAE,WAAW,EAAE,uBAAuB,EAAE,IAAI,EAAE;qBACtF,CAAC,CAAC,CAAA;gBACT,CAAC,CAAA;gBAED,MAAM,CAAC,GAA0B;oBAC/B,QAAQ,EAAE,CAAM,KAA6B,EAAE,EAAE,CAC/C,MAAM;yBACH,IAAI,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;yBACpD,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAC9B,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAClB,SAAS;yBACN,KAAK;yBACL,KAAK,CAAM,CAAC,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,CAAC;yBAC1C,QAAQ,EAAE;yBACV,IAAI,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CACtB,SAAS,CAAC,GAAG,CACX,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,aAAa,EAAE,GAAG,YAAY,CAAC,CAAQ,CAAC,EAAE,CAAQ,CAChE,CACF,CACJ,CACF,EACD,MAAM;yBACH,QAAQ,CAAC,0CAA0C,EAAE;wBACpD,iBAAiB,EAAE,KAAK;wBACxB,UAAU,EAAE,EAAE,yBAAyB,EAAE,WAAW,EAAE,uBAAuB,EAAE,IAAI,EAAE;qBACtF,CAAC,CACL;oBACL,GAAG,EAAE,MAAM;yBACR,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;wBACX,KAAK,EAAE,iBAAiB,IAAI,sBAAsB;wBAClD,UAAU,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,CAAC;qBACvD,CAAC,CAAC;yBACF,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAC9B,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAClB,SAAS;yBACN,KAAK;yBACL,KAAK,CAAW,CAAC,CAAC;yBAClB,QAAQ,EAAE;yBACV,IAAI,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CACtB,SAAS,CAAC,GAAG,CACX,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,aAAa,EAAE,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAClD,CACF,CACJ,CACF,EACD,MAAM;yBACH,QAAQ,CAAC,qCAAqC,EAAE;wBAC/C,iBAAiB,EAAE,KAAK;wBACxB,UAAU,EAAE,EAAE,yBAAyB,EAAE,WAAW,EAAE,uBAAuB,EAAE,IAAI,EAAE;qBACtF,CAAC,CACL;oBACH;;uBAEG;oBACH,MAAM,EAAE,CACN,CAAyB,EACzB,EAAE;wBACF,MAAM,IAAI,GAAG,CAAC,EAAE,IAAI,CAAA;wBACpB,MAAM,KAAK,GAAG,CAAC,EAAE,KAAK,CAAA;wBACtB,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAA;wBAEvB,OAAO,MAAM;6BACV,IAAI,CAAC,GAAG,EAAE,CACT,sBAAsB,CACpB,KAAK,EACL,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EACpD,IAAI,EACJ,gBAAgB,EAChB,aAAa,EACb,CAAC,CAAC,MAAiG,EACnG,CAAC,CAAC,KAAsF,EACxF,IAAI,EACJ,KAAK,CACN,CACF;6BACA,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAC9B,MAAM;6BACH,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACb,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAClB,CAAC,CAAC,MAAM;4BACN,CAAC,CAAC,SAAS;iCACR,KAAK;iCACL,KAAK,CAAI,CAAC,CAAC;iCACX,QAAQ,EAAE;iCACV,IAAI,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CACtB,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAClB,CAAC;gCACC,GAAG,IAAI,CACL,aAAa,EACb,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAC/D;gCACD,GAAG,YAAY,CAAC,CAAQ,CAAC;6BAC1B,CAAQ,CACV,CACF;4BACH,CAAC,CAAC,SAAS;iCACR,KAAK;iCACL,KAAK,CAAW,CAAC,CAAC;iCAClB,QAAQ,EAAE;iCACV,IAAI,CAAC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CACtB,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,aAAa,EAAE,GAAG,YAAY,CAAC,CAAQ,CAAC,EAAE,CAAQ,CAAC,CACnF,CACN,CACF,CACJ;6BACA,IAAI,CACH,MAAM,CAAC,QAAQ,CAAC,wCAAwC,EAAE;4BACxD,iBAAiB,EAAE,KAAK;4BACxB,UAAU,EAAE,EAAE,yBAAyB,EAAE,WAAW,EAAE,uBAAuB,EAAE,IAAI,EAAE;yBACtF,CAAC,CACH,CAAA;oBACL,CAAC;oBACD,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,CACX,MAAM;yBACH,OAAO,CAAC,GAAG,EAAE,CACZ,SAAS;yBACN,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,EAAa,CAAC,CAAC;yBAC5D,IAAI,EAAW;yBACf,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CACrB,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,aAAa,EAAE,GAAG,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAClG,CACJ;yBACA,IAAI,CAAC,MAAM;yBACT,QAAQ,CAAC,sCAAsC,EAAE;wBAChD,iBAAiB,EAAE,KAAK;wBACxB,UAAU,EAAE;4BACV,yBAAyB,EAAE,WAAW;4BACtC,uBAAuB,EAAE,IAAI;4BAC7B,cAAc,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,EAAE,EAAa,CAAC;4BAClE,EAAE;yBACH;qBACF,CAAC,CAAC;oBACT,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CACT,MAAM;yBACH,KAAK,CACJ,MAAM;yBACH,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,EACxB;wBACE,MAAM,EAAE,GAAG,EAAE,CACX,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAClB,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC;4BACrB,GAAG,KAAK,CAAC,CAAC,CAAC;4BACX,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;yBACzC,CAAC,CACH;wBACH,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CACf,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAClB,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CACzD,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,EACzD;4BACE,eAAe,EAAE;gCACf,IAAI,EAAE,SAAS;gCACf,SAAS,EAAE,IAAI;6BAChB;yBACF,CACF,CACF;qBACJ,CACF;yBACA,IAAI,CACH,MAAM;yBACH,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;wBACb,IAAI,CAAC,CAAC,UAAU,KAAK,GAAG,IAAI,CAAC,CAAC,UAAU,KAAK,GAAG,IAAI,CAAC,CAAC,UAAU,KAAK,GAAG,EAAE,CAAC;4BACzE,OAAO,IAAI,8BAA8B,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,UAAU,EAAE,CAAC,CAAA;wBAC7F,CAAC;wBACD,IAAI,CAAC,CAAC,UAAU,GAAG,GAAG,IAAI,CAAC,CAAC,UAAU,GAAG,GAAG,EAAE,CAAC;4BAC7C,OAAO,MAAM,CAAC,GAAG,CACf,IAAI,sBAAsB,CACxB,6BAA6B,GAAG,CAAC,CAAC,UAAU,CAC7C,CACF,CAAA;wBACH,CAAC;wBACD,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;4BACxB,GAAG,CAAC;4BACJ,KAAK,EAAE,CAAC,CAAC,IAAI;yBACd,CAAC,CAAC,CAAA;oBACL,CAAC,CAAC,EACJ,MAAM;yBACH,QAAQ,CAAC,qCAAqC,EAAE;wBAC/C,iBAAiB,EAAE,KAAK;wBACxB,UAAU,EAAE;4BACV,yBAAyB,EAAE,WAAW;4BACtC,uBAAuB,EAAE,IAAI;4BAC7B,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC;yBACb;qBACF,CAAC,CACL;oBACL,QAAQ;oBACR,OAAO;oBACP,MAAM,EAAE,CAAC,CAAU,EAAE,EAAE,CACrB,MAAM;yBACH,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;yBAC3E,IAAI,CAAC,MAAM;yBACT,QAAQ,CAAC,wCAAwC,EAAE;wBAClD,iBAAiB,EAAE,KAAK;wBACxB,UAAU,EAAE,EAAE,yBAAyB,EAAE,WAAW,EAAE,uBAAuB,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE;qBACpG,CAAC,CAAC;iBACV,CAAA;gBAED,mBAAmB;gBACnB,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CACxC,SAAS;qBACN,IAAI,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;qBACxC,IAAI,EAAkB;qBACtB,IAAI,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CACzD,CAAA;gBAED,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC3B,KAAK,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,yBAAyB,GAAG,IAAI,CAAC,CAAA;oBAC5D,IAAI,IAAI,EAAE,CAAC;wBACT,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,CAAA;wBACrB,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CACzB,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EACvC,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CACf,MAAM,CAAC,KAAK,EACZ,MAAM;4BACJ,0GAA0G;6BACzG,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAChC,CACJ,CAAA;oBACH,CAAC;oBACD,mBAAmB;oBACnB,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CACzB,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC;wBACrB,aAAa,EAAE,gBAAgB;wBAC/B,EAAE,EAAE,gBAAgB;wBACpB,GAAG,EAAE,CAAC,CAAC;qBACR,CAAC,CACH,CAAA;gBACH,CAAC;gBACD,OAAO,CAAC,CAAA;YACV,CAAC,CAAC;SACL,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAkB;IACjD,OAAO,UAAU;SACd,OAAO,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;SAC7B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,iBAAiB,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;AAChF,CAAC"}

package/dist/Store/codeFilter.d.ts

@@ -2,7 +2,8 @@ import { Option } from "effect-app";
 import type { FilterR, FilterResult } from "../Model/filter/filterApi.js";
 import type { FieldValues } from "../Model/filter/types.js";
 import type { Filter } from "./service.js";
-export declare const codeFilterStatement: <E>(p: FilterR, x: E, isRelation: boolean) => boolean | ((x: any) => boolean);
+export declare const codeFilterStatement: <E>(p: FilterR, x: E) => boolean;
+export declare const isRelationCheck: (f: readonly FilterResult[], isRelation: string | null) => string | false;
 export declare const codeFilter3: <E>(state: readonly FilterResult[]) => (sut: E) => boolean;
 export declare const codeFilter3_: <E>(state: readonly FilterResult[], sut: E) => boolean;
 export declare function codeFilter<E extends FieldValues, NE extends E>(filter: Filter): (x: E) => Option.None<NE> | Option.Some<NE>;

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

@@ -1 +1 @@
-{"version":3,"file":"codeFilter.d.ts","sourceRoot":"","sources":["../../src/Store/codeFilter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,MAAM,EAAE,MAAM,YAAY,CAAA;AAE1C,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAuD1C,eAAO,MAAM,mBAAmB,GAAI,CAAC,EAAE,GAAG,OAAO,EAAE,GAAG,CAAC,EAAE,YAAY,OAAO,oBAE7D,GAAG,aAGjB,CAAA;AAyBD,eAAO,MAAM,WAAW,GAAI,CAAC,EAAE,OAAO,SAAS,YAAY,EAAE,MAAM,KAAK,CAAC,YAA6B,CAAA;AAwFtG,eAAO,MAAM,YAAY,GAAI,CAAC,EAAE,OAAO,SAAS,YAAY,EAAE,EAAE,KAAK,CAAC,KAAG,OAKxE,CAAA;AAED,wBAAgB,UAAU,CAAC,CAAC,SAAS,WAAW,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,IACpE,GAAG,CAAC,uCACb"}
+{"version":3,"file":"codeFilter.d.ts","sourceRoot":"","sources":["../../src/Store/codeFilter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,MAAM,EAAE,MAAM,YAAY,CAAA;AAE1C,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAuD1C,eAAO,MAAM,mBAAmB,GAAI,CAAC,EAAE,GAAG,OAAO,EAAE,GAAG,CAAC,YAA0B,CAAA;AAKjF,eAAO,MAAM,eAAe,GAAI,GAAG,SAAS,YAAY,EAAE,EAAE,YAAY,MAAM,GAAG,IAAI,mBAqBpF,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,CAAC,EAAE,OAAO,SAAS,YAAY,EAAE,MAAM,KAAK,CAAC,YAA6B,CAAA;AAwFtG,eAAO,MAAM,YAAY,GAAI,CAAC,EAAE,OAAO,SAAS,YAAY,EAAE,EAAE,KAAK,CAAC,KAAG,OAKxE,CAAA;AAED,wBAAgB,UAAU,CAAC,CAAC,SAAS,WAAW,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,IACpE,GAAG,CAAC,uCACb"}

package/dist/Store/codeFilter.js

@@ -53,13 +53,11 @@ const filterStatement = (x, p) => {
         }
     }
 };
-export const codeFilterStatement = (p, x, isRelation) => {
-    if (isRelation) {
-        return (x) => filterStatement(x, p);
-    }
-    return filterStatement(x, p);
-};
-const isRelationCheck = (f, isRelation) => {
+export const codeFilterStatement = (p, x) => filterStatement(x, p);
+// TODO: still prevent mixing relation checks with non-relation checks in the same filter scope
+// right now we ignore scoped combinations, because they allow us to scope relation checks too.
+// probably best to create a separate keyword and dsl for relation checks, so we can remove all the special casing alltogether..
+export const isRelationCheck = (f, isRelation) => {
     if (f.filter((_) => "path" in _).every((_) => "path" in _ && _.path.includes(".-1."))) {
         const first = f[0];
         const rel = first.path.split(".-1.")[0];
@@ -85,22 +83,22 @@ const codeFilter3__ = (state, sut, statements, isRelation = null) => {
     };
     // TODO: path str updates
     const process = isRelation
-        ? (e) => codeFilterStatement({ ...e, path: e.path.split(".-1.").slice(1).join(".-1.") }, sut, true)
-        : (e) => codeFilterStatement(e, sut, false);
-    const statement = () => isRelation ? `statements[${statements.length - 1}]()(el)` : `statements[${statements.length - 1}]()`;
+        ? (e, el) => codeFilterStatement({ ...e, path: e.path.split(".-1.").slice(1).join(".-1.") }, el ?? sut)
+        : (e, el) => codeFilterStatement(e, el ?? sut);
+    const statement = () => `statements[${statements.length - 1}](el)`;
     for (const e of state) {
         switch (e.t) {
             case "where": {
-                statements.push(() => process(e));
+                statements.push((el) => process(e, el));
                 s += statement();
                 break;
             }
             case "or":
-                statements.push(() => process(e));
+                statements.push((el) => process(e, el));
                 s += " || " + statement();
                 break;
             case "and":
-                statements.push(() => process(e));
+                statements.push((el) => process(e, el));
                 s += " && " + statement();
                 break;
             case "or-scope": {
@@ -161,4 +159,4 @@ export const codeFilter3_ = (state, sut) => {
 export function codeFilter(filter) {
     return (x) => codeFilter3_(filter, x) ? Option.some(x) : Option.none();
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"codeFilter.js","sourceRoot":"","sources":["../../src/Store/codeFilter.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"codeFilter.js","sourceRoot":"","sources":["../../src/Store/codeFilter.ts"],"names":[],"mappings":"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"}

package/dist/api/internal/RequestContextMiddleware.d.ts

@@ -1,5 +1,5 @@
 import { Effect } from "effect-app";
 import { HttpServerRequest, HttpServerResponse } from "effect-app/http";
 import { Locale } from "../../RequestContext.js";
-export declare const RequestContextMiddleware: (defaultLocale?: Locale) => <E, R>(app: import("@effect/platform/HttpApp").Default<E, R>) => Effect.Effect<HttpServerResponse.HttpServerResponse, E, HttpServerRequest.HttpServerRequest | Exclude<Exclude<R, import("effect/Tracer").ParentSpan>, import("../../Store/ContextMapContainer.js").ContextMapContainer | import("../../Store/Memory.js").storeId | import("../../RequestContext.js").LocaleRef>>;
+export declare const RequestContextMiddleware: (defaultLocale?: Locale) => <E, R>(app: import("@effect/platform/HttpApp").Default<E, R>) => Effect.Effect<HttpServerResponse.HttpServerResponse, E, HttpServerRequest.HttpServerRequest | Exclude<Exclude<R, import("effect/Tracer").ParentSpan>, import("../../Store/Memory.js").storeId | import("../../RequestContext.js").LocaleRef | import("../../Store/ContextMapContainer.js").ContextMapContainer>>;
 //# sourceMappingURL=RequestContextMiddleware.d.ts.map

package/dist/api/setupRequest.d.ts

@@ -9,6 +9,6 @@ export declare const getRC: Effect.Effect<{
     namespace: NonEmptyString255;
 }, never, never>;
 export declare const setupRequestContextFromCurrent: (name?: string, options?: Tracer.SpanOptions) => <R, E, A>(self: Effect<A, E, R>) => Effect.Effect<A, E, Exclude<Exclude<R, Tracer.ParentSpan>, ContextMapContainer>>;
-export declare function setupRequestContext<R, E, A>(self: Effect<A, E, R>, requestContext: RequestContext): Effect.Effect<A, E, Exclude<Exclude<R, Tracer.ParentSpan>, ContextMapContainer | storeId | LocaleRef>>;
-export declare function setupRequestContextWithCustomSpan<R, E, A>(self: Effect<A, E, R>, requestContext: RequestContext, name: string, options?: Tracer.SpanOptions): Effect.Effect<A, E, Exclude<Exclude<R, Tracer.ParentSpan>, ContextMapContainer | storeId | LocaleRef>>;
+export declare function setupRequestContext<R, E, A>(self: Effect<A, E, R>, requestContext: RequestContext): Effect.Effect<A, E, Exclude<Exclude<R, Tracer.ParentSpan>, storeId | LocaleRef | ContextMapContainer>>;
+export declare function setupRequestContextWithCustomSpan<R, E, A>(self: Effect<A, E, R>, requestContext: RequestContext, name: string, options?: Tracer.SpanOptions): Effect.Effect<A, E, Exclude<Exclude<R, Tracer.ParentSpan>, storeId | LocaleRef | ContextMapContainer>>;
 //# sourceMappingURL=setupRequest.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "2.61.3",
+  "version": "2.61.4",
   "license": "MIT",
   "type": "module",
   "dependencies": {

package/src/Store/Cosmos/query.ts

@@ -1,9 +1,10 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
-import { Array, Effect, Equivalence, type NonEmptyReadonlyArray, pipe } from "effect-app"
+import { Array, Effect, type NonEmptyReadonlyArray } from "effect-app"
 import { assertUnreachable } from "effect-app/utils"
 import { InfraLogger } from "../../logger.js"
 import type { FilterR, FilterResult } from "../../Model/filter/filterApi.js"
+import { isRelationCheck } from "../codeFilter.js"
 import type { SupportedValues } from "../service.js"
 
 export function logQuery(q: {
@@ -118,7 +119,7 @@ export function buildWhereCosmosQuery3(
 
   let i = 0
 
-  const print = (state: readonly FilterResult[], values: any[]) => {
+  const print = (state: readonly FilterResult[], values: any[], isRelation: string | null = null) => {
     let s = ""
     let l = 0
     const printN = (n: number) => {
@@ -137,19 +138,49 @@ export function buildWhereCosmosQuery3(
           break
         case "or-scope": {
           ++l
-          s += ` OR (\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`
+          const rel = isRelationCheck(e.result, isRelation)
+          if (rel) {
+            const rel = (e.result[0]! as { path: string }).path.split(".-1.")[0]
+            s += isRelation
+              ? ` OR (\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`
+              : ` OR (\n${printN(l + 1)}EXISTS(SELECT VALUE ${rel} FROM ${rel} IN f.${rel} WHERE ${
+                print(e.result, values, rel)
+              }))`
+          } else {
+            s += ` OR (\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`
+          }
           --l
           break
         }
         case "and-scope": {
           ++l
-          s += ` AND (\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`
+          const rel = isRelationCheck(e.result, isRelation)
+          if (rel) {
+            const rel = (e.result[0]! as { path: string }).path.split(".-1.")[0]
+            s += isRelation
+              ? ` AND (\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`
+              : ` AND (\n${printN(l + 1)}EXISTS(SELECT VALUE ${rel} FROM ${rel} IN f.${rel} WHERE ${
+                print(e.result, values, rel)
+              }))`
+          } else {
+            s += ` AND (\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`
+          }
           --l
           break
         }
         case "where-scope": {
           // ;++l
-          s += `(\n${printN(l + 1)}${print(e.result, values)}\n)`
+          const rel = isRelationCheck(e.result, isRelation)
+          if (rel) {
+            const rel = (e.result[0]! as { path: string }).path.split(".-1.")[0]
+            s += isRelation
+              ? `(\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`
+              : `(\n${printN(l + 1)}EXISTS(SELECT VALUE ${rel} FROM ${rel} IN f.${rel} WHERE ${
+                print(e.result, values, rel)
+              }))`
+          } else {
+            s += `(\n${printN(l + 1)}${print(e.result, values)}\n${printN(l)})`
+          }
           // ;--l
           break
         }
@@ -186,7 +217,7 @@ export function buildWhereCosmosQuery3(
   // or you can end up with duplicates
   return {
     query: `
-    SELECT DISTINCT ${
+    SELECT ${
       select
         ? `${
           select
@@ -201,17 +232,6 @@ export function buildWhereCosmosQuery3(
     }
     FROM ${name} f
 
-    ${
-      pipe(
-        values
-          .filter((_) => _.path.includes(".-1."))
-          .map((_) => _.path.split(".-1.")[0])
-          .map((_) => `JOIN ${_} IN f.${_}`),
-        Array.dedupeWith(Equivalence.string)
-      )
-        .join("\n")
-    }
-
     WHERE f.id != @id ${filter.length ? `AND (${print(filter, values.map((_) => _.value))})` : ""}
     ${order ? `ORDER BY ${order.map((_) => `f.${_.key} ${_.direction}`).join(", ")}` : ""}
     ${skip !== undefined || limit !== undefined ? `OFFSET ${skip ?? 0} LIMIT ${limit ?? 999999}` : ""}`,

package/src/Store/Cosmos.ts

@@ -288,7 +288,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
                 .sync(() =>
                   buildWhereCosmosQuery3(
                     idKey,
-                    filter ?? [],
+                    filter ? [{ t: "where-scope", result: filter }] : [],
                     name,
                     importedMarkerId,
                     defaultValues,

package/src/Store/codeFilter.ts

@@ -59,14 +59,12 @@ const filterStatement = (x: any, p: FilterR) => {
   }
 }
 
-export const codeFilterStatement = <E>(p: FilterR, x: E, isRelation: boolean) => {
-  if (isRelation) {
-    return (x: any) => filterStatement(x, p)
-  }
-  return filterStatement(x, p)
-}
+export const codeFilterStatement = <E>(p: FilterR, x: E) => filterStatement(x, p)
 
-const isRelationCheck = (f: readonly FilterResult[], isRelation: string | null) => {
+// TODO: still prevent mixing relation checks with non-relation checks in the same filter scope
+// right now we ignore scoped combinations, because they allow us to scope relation checks too.
+// probably best to create a separate keyword and dsl for relation checks, so we can remove all the special casing alltogether..
+export const isRelationCheck = (f: readonly FilterResult[], isRelation: string | null) => {
   if (f.filter((_) => "path" in _).every((_) => "path" in _ && _.path.includes(".-1."))) {
     const first = f[0] as { path: string }
     const rel = first.path.split(".-1.")[0]
@@ -104,23 +102,23 @@ const codeFilter3__ = <E>(
   // TODO: path str updates
 
   const process = isRelation
-    ? (e: FilterR) => codeFilterStatement({ ...e, path: e.path.split(".-1.").slice(1).join(".-1.") }, sut, true)
-    : (e: FilterR) => codeFilterStatement(e, sut, false)
-  const statement = () =>
-    isRelation ? `statements[${statements.length - 1}]()(el)` : `statements[${statements.length - 1}]()`
+    ? (e: FilterR, el: any) =>
+      codeFilterStatement({ ...e, path: e.path.split(".-1.").slice(1).join(".-1.") }, el ?? sut)
+    : (e: FilterR, el: any) => codeFilterStatement(e, el ?? sut)
+  const statement = () => `statements[${statements.length - 1}](el)`
   for (const e of state) {
     switch (e.t) {
       case "where": {
-        statements.push(() => process(e))
+        statements.push((el: any) => process(e, el))
         s += statement()
         break
       }
       case "or":
-        statements.push(() => process(e))
+        statements.push((el: any) => process(e, el))
         s += " || " + statement()
         break
       case "and":
-        statements.push(() => process(e))
+        statements.push((el: any) => process(e, el))
         s += " && " + statement()
         break
       case "or-scope": {

package/test/rawQuery.test.ts

@@ -2,7 +2,7 @@ import { describe, expect, it } from "@effect/vitest"
 import { Array, Config, Effect, Layer, Logger, LogLevel, ManagedRuntime, Option, Redacted, S } from "effect-app"
 import { LogLevels } from "effect-app/utils"
 import { setupRequestContextFromCurrent } from "../src/api/setupRequest.js"
-import { and, project, where } from "../src/Model/query.js"
+import { and, or, project, where } from "../src/Model/query.js"
 import { makeRepo } from "../src/Model/Repository/makeRepo.js"
 import { CosmosStoreLayer } from "../src/Store/Cosmos.js"
 import { MemoryStoreLive } from "../src/Store/Memory.js"
@@ -98,7 +98,6 @@ describe("select first-level array fields", () => {
 
       // ok crazy lol, "value" is a reserved word in CosmosDB, so we have to use t["value"] as a field name instead of t.value
       const items = yield* repo.queryRaw(projected, {
-        // TODO
         cosmos: () => ({
           query: `
           SELECT 
@@ -147,6 +146,8 @@ describe("select first-level array fields", () => {
       .pipe(Effect.provide(SomethingRepo.Test), rt.runPromise))
 })
 
+// NOTE: right now we cannot specify if all/"every" items must match the filter, or if at least one item (any/"some") must match the filter.
+// the current implementation is any/some, so we can always filter down in the code to narrow further..
 describe("filter first-level array fields as groups", () => {
   const test = Effect
     .gen(function*() {
@@ -155,8 +156,9 @@ describe("filter first-level array fields as groups", () => {
       const projected = S.Struct({ name: S.String, items: S.Array(S.Struct({ id: S.String, value: S.Number })) })
 
       // ok crazy lol, "value" is a reserved word in CosmosDB, so we have to use t["value"] as a field name instead of t.value
+      // deprecated; joins should be avoided because they're very expensive, and require DISTINCT to avoid duplicates
+      // which might affect results in unexpected ways?
       const items = yield* repo.queryRaw(projected, {
-        // TODO
         cosmos: () => ({
           query: `
           SELECT DISTINCT
@@ -177,30 +179,39 @@ describe("filter first-level array fields as groups", () => {
         )
       })
 
-      // problem 1:
-      // we cannot specify if all/"every" items must match the filter, or if at least one item (any/"some") must match the filter.
-      // we should start with supporting "any", and then add "all" support..
-      // good thing: cosmosdb currently defaults to "any", and we can always filter down to "all" after finished querying,
-      // "all" is more of an optimisation, so let's focus on problem 2
-
-      // problem 2:
-      // in memory is not implemented properly for array sub queries.
-      // 1. in the current situation, it only is somewhat implemented for eq and neq, nothing else.
-      // 2. we don't properly group the filters. you want to express; find Something where some item has both (value > 20 and description includes "d item")
-      // but in reality, you find Something where at least an item has value > 20, and at least an item has a description that includes "d item".
-      // subtle but very important difference.. in the sample query it would lead to showing 2 items instead of 1 item.
+      // we use EXISTS by default now: https://learn.microsoft.com/en-us/azure/cosmos-db/nosql/query/subquery#exists-expression
+      const itemsExists = yield* repo.queryRaw(projected, {
+        cosmos: () => ({
+          query: `
+          SELECT
+            f.name,
+            ARRAY (SELECT t.id,t["value"] FROM t in f.items) AS items
+          FROM Somethings f
+          WHERE EXISTS(SELECT VALUE item FROM item IN f.items WHERE item["value"] > @v1 AND CONTAINS(item.description, @v2, true))`,
+          parameters: [{ name: "@v1", value: 20 }, { name: "@v2", value: "d item" }]
+        }),
+        memory: Array.filterMap(({ items, name }) =>
+          items.some((_) => _.value > 20 && _.description.includes("d item"))
+            ? Option.some({
+              name,
+              items: items.map(({ id, value }) => ({ id, value }))
+            })
+            : Option.none()
+        )
+      })
 
-      // This should mean:
-      // Find all Somethings where at least one item (has value > 20 and description includes "d item")
-      // aka: somethings.filter(s => s.items.some((_) => _.value > 20 && _.description.includes("d item")))
-      // for this, codeFilter should be updated to support accordingly.
-      // (removing detection of ".-1." using 'some' check from `codeFilterStatement`, and moving it somehow higher up... higher up we need to detect and group sub-item checks!)
       const items2 = yield* repo.query(
         where("items.-1.value", "gt", 20),
         and("items.-1.description", "contains", "d item"),
         project(projected)
       )
 
+      const items2Or = yield* repo.query(
+        where("items.-1.value", "gt", 20),
+        or("items.-1.description", "contains", "d item"),
+        project(projected)
+      )
+
       // mixing relation check with scoped relationcheck
       const items3 = yield* repo.query(
         where("items.-1.value", "gt", 20),
@@ -208,6 +219,12 @@ describe("filter first-level array fields as groups", () => {
         project(projected)
       )
 
+      const items3Or = yield* repo.query(
+        where("items.-1.value", "gt", 20),
+        or(where("items.-1.description", "contains", "d item")),
+        project(projected)
+      )
+
       // broken in cosmos db somehow... returns twice record 2??
       // need to use DISTINCT..
       // https://stackoverflow.com/questions/51855660/cosmos-db-joins-give-duplicate-results
@@ -226,10 +243,7 @@ describe("filter first-level array fields as groups", () => {
         }
       ]
 
-      expect(items).toStrictEqual(expected)
-      expect(items2).toStrictEqual(expected)
-      expect(items3).toStrictEqual(expected)
-      expect(items4).toStrictEqual([
+      const both = [
         {
           name: "Item 1",
           items: [
@@ -244,7 +258,15 @@ describe("filter first-level array fields as groups", () => {
             { id: "2-2", value: 40 }
           ]
         }
-      ])
+      ]
+
+      expect(items).toStrictEqual(expected)
+      expect(itemsExists).toStrictEqual(expected)
+      expect(items2).toStrictEqual(expected)
+      expect(items2Or).toStrictEqual(both)
+      expect(items3).toStrictEqual(expected)
+      expect(items3Or).toStrictEqual(both)
+      expect(items4).toStrictEqual(both)
     })
     .pipe(setupRequestContextFromCurrent())