@effect-app/infra 0.210.11 → 0.211.1

package/dist/services/Store/utils.js

@@ -1,5 +1,4 @@
-import { Effect, Option, ReadonlyArray } from "effect-app";
-import { get } from "effect-app/utils";
+import { Effect, Option } from "effect-app";
 import objectHash from "object-hash";
 import { OptimisticConcurrencyException } from "../../errors.js";
 import { codeFilter3_ } from "./codeFilter.js";
@@ -23,143 +22,7 @@ export const makeUpdateETag = (type) => (e, current) => Effect.gen(function* ($)
     return newE;
 });
 export function codeFilter(filter) {
-    return (x) => filter.type === "new-kid"
-        ? codeFilter3_(filter.build(), x) ? Option.some(x) : Option.none()
-        : filter.type === "startsWith"
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            ? lowercaseIfString(x[filter.by]).startsWith(filter.value.toLowerCase())
-                ? Option.some(x)
-                : Option.none()
-            : filter.type === "endsWith"
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                ? lowercaseIfString(x[filter.by]).endsWith(filter.value.toLowerCase())
-                    ? Option.some(x)
-                    : Option.none()
-                : filter.type === "contains"
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-                    ? lowercaseIfString(x[filter.by]).includes(filter.value.toLowerCase())
-                        ? Option.some(x)
-                        : Option.none()
-                    : filter.type === "join_find"
-                        ? filter.keys.some((k) => {
-                            const value = get(x, k);
-                            // we mimic the behavior of cosmosdb; if the shape in db does not match what we're looking for, we imagine false hit
-                            return (value
-                                && value.some((v) => compare(v[filter.valueKey], filter.value)));
-                        })
-                            ? Option.some(x)
-                            : Option.none()
-                        // TODO: support mixed or/and
-                        : filter.mode === "or"
-                            ? filter
-                                .where
-                                .some((p) => {
-                                const k = get(x, p.key);
-                                switch (p.t) {
-                                    case "in":
-                                        return p.value.includes(k);
-                                    case "not-in":
-                                        return !p.value.includes(k);
-                                    case "lt":
-                                        return lowerThan(k, p.value);
-                                    case "lte":
-                                        return lowerThanExclusive(k, p.value);
-                                    case "gt":
-                                        return greaterThan(k, p.value);
-                                    case "gte":
-                                        return greaterThanExclusive(k, p.value);
-                                    case "includes":
-                                        return k.includes(p.value);
-                                    case "not-includes":
-                                        return !k.includes(p.value);
-                                    case "contains":
-                                        return k.toLowerCase().includes(p.value.toLowerCase());
-                                    case "ends-with":
-                                        return k.toLowerCase().endsWith(p.value.toLowerCase());
-                                    case "starts-with":
-                                        return k.toLowerCase().startsWith(p.value.toLowerCase());
-                                    case "not-contains":
-                                        return !k.toLowerCase().includes(p.value.toLowerCase());
-                                    case "not-ends-with":
-                                        return !k.toLowerCase().endsWith(p.value.toLowerCase());
-                                    case "not-starts-with":
-                                        return !k.toLowerCase().startsWith(p.value.toLowerCase());
-                                    case "not-eq":
-                                        return !compare(k, p.value);
-                                    case "eq":
-                                    case undefined:
-                                        return compare(k, p.value);
-                                }
-                            })
-                                ? Option.some(x)
-                                : Option.none()
-                            : filter
-                                .where
-                                .every((p) => {
-                                const k = get(x, p.key);
-                                switch (p.t) {
-                                    case "in":
-                                        return p.value.includes(k);
-                                    case "not-in":
-                                        return !p.value.includes(k);
-                                    case "lt":
-                                        return lowerThan(k, p.value);
-                                    case "lte":
-                                        return lowerThanExclusive(k, p.value);
-                                    case "gt":
-                                        return greaterThan(k, p.value);
-                                    case "gte":
-                                        return greaterThanExclusive(k, p.value);
-                                    case "includes":
-                                        return k.includes(p.value);
-                                    case "not-includes":
-                                        return !k.includes(p.value);
-                                    case "contains":
-                                        return k.toLowerCase().includes(p.value.toLowerCase());
-                                    case "ends-with":
-                                        return k.toLowerCase().endsWith(p.value.toLowerCase());
-                                    case "starts-with":
-                                        return k.toLowerCase().startsWith(p.value.toLowerCase());
-                                    case "not-contains":
-                                        return !k.toLowerCase().includes(p.value.toLowerCase());
-                                    case "not-ends-with":
-                                        return !k.toLowerCase().endsWith(p.value.toLowerCase());
-                                    case "not-starts-with":
-                                        return !k.toLowerCase().startsWith(p.value.toLowerCase());
-                                    case "not-eq":
-                                        return p.key.includes(".-1.")
-                                            ? get(x, p.key.split(".-1.")[0])
-                                                // TODO: or vs and
-                                                .every((_) => !compare(get(_, p.key.split(".-1.")[1]), p.value))
-                                            : !compare(k, p.value);
-                                    case "eq":
-                                    case undefined:
-                                        return p.key.includes(".-1.")
-                                            ? get(x, p.key.split(".-1.")[0])
-                                                // TODO: or vs and
-                                                .some((_) => compare(get(_, p.key.split(".-1.")[1]), p.value))
-                                            : compare(k, p.value);
-                                }
-                            })
-                                ? Option.some(x)
-                                : Option.none();
-}
-export function codeFilterJoinSelect(filter) {
-    return (x) => ReadonlyArray
-        .filterMap(filter
-        .keys, (k) => {
-        const value = get(x, k);
-        // we mimic the behavior of cosmosdb; if the shape in db does not match what we're looking for, we imagine false hit
-        return value
-            ? Option.some(ReadonlyArray.filterMap(value, (v) => 
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
-            compare(v[filter.valueKey], filter.value)
-                ? Option.some({ ...v, _rootId: x.id })
-                : Option.none()))
-            : Option.none();
-    })
-        .flatMap((_) => _);
+    return (x) => codeFilter3_(filter.build(), x) ? Option.some(x) : Option.none();
 }
 export function lowercaseIfString(val) {
     if (typeof val === "string") {
@@ -182,4 +45,4 @@ export function greaterThan(valA, valB) {
 export function greaterThanExclusive(valA, valB) {
     return valA >= valB;
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/services/Store/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC1D,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AACtC,OAAO,UAAU,MAAM,aAAa,CAAA;AACpC,OAAO,EAAE,8BAA8B,EAAE,MAAM,iBAAiB,CAAA;AAChE,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAG9C,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,EAAE,KAAK,EAAE,GAAG,CAAC,EAAK,EACf,EAAE,CAAE,CAAC;IACR,GAAG,CAAC;IACJ,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;CACrB,CAAS,CAAA;AACV,MAAM,CAAC,MAAM,cAAc,GACzB,CAAC,IAAY,EAAE,EAAE,CAAC,CAAwD,CAAI,EAAE,OAAkB,EAAE,EAAE,CACpG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAC,CAAC;IACpB,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;QACZ,KAAK,CAAC,CAAC,CAAC,CACN,MAAM,CAAC,QAAQ,CACb,OAAO,EACP,GAAG,EAAE,CAAC,IAAI,8BAA8B,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAC1F,CACF,CAAA;IACH,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC;QAC9D,OAAO,KAAK,CAAC,CAAC,CAAC,CACb,IAAI,8BAA8B,CAAC;YACjC,IAAI;YACJ,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,EAAE;YACpB,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,KAAK;YAC5B,KAAK,EAAE,CAAC,CAAC,KAAK;SACf,CAAC,CACH,CAAA;IACH,CAAC;IACD,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;IACxB,OAAO,IAAI,CAAA;AACb,CAAC,CAAC,CAAA;AAEN,MAAM,UAAU,UAAU,CAAyC,MAAkB;IACnF,OAAO,CAAC,CAAI,EAAE,EAAE,CACd,MAAM,CAAC,IAAI,KAAK,SAAS;QACvB,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAkB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE;QACnF,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY;YAC9B,8DAA8D;YAC9D,CAAC,CAAC,iBAAiB,CAAE,CAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;gBAC/E,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAkB,CAAC;gBACjC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE;YACjB,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU;gBAC5B,8DAA8D;gBAC9D,CAAC,CAAC,iBAAiB,CAAE,CAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;oBAC7E,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAkB,CAAC;oBACjC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE;gBACjB,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU;oBAC5B,8DAA8D;oBAC9D,6DAA6D;oBAC7D,CAAC,CAAC,iBAAiB,CAAE,CAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;wBAC7E,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAkB,CAAC;wBACjC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE;oBACjB,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,WAAW;wBAC7B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;4BACrB,MAAM,KAAK,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,CAA8B,CAAA;4BACpD,oHAAoH;4BACpH,OAAO,CACL,KAAK;mCACF,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,CAChE,CAAA;wBACH,CAAC,CAAC;4BACF,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAkB,CAAC;4BACjC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE;wBACjB,6BAA6B;wBAC7B,CAAC,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI;4BACtB,CAAC,CAAC,MAAM;iCACH,KAAK;iCACL,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;gCACV,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAA;gCACvB,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;oCACZ,KAAK,IAAI;wCACP,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;oCAC5B,KAAK,QAAQ;wCACX,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;oCAC7B,KAAK,IAAI;wCACP,OAAO,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAA;oCAC9B,KAAK,KAAK;wCACR,OAAO,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAA;oCACvC,KAAK,IAAI;wCACP,OAAO,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAA;oCAChC,KAAK,KAAK;wCACR,OAAO,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAA;oCACzC,KAAK,UAAU;wCACb,OAAQ,CAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;oCAC/C,KAAK,cAAc;wCACjB,OAAO,CAAE,CAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;oCAChD,KAAK,UAAU;wCACb,OAAQ,CAAY,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAA;oCACpE,KAAK,WAAW;wCACd,OAAQ,CAAY,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAA;oCACpE,KAAK,aAAa;wCAChB,OAAQ,CAAY,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAA;oCACtE,KAAK,cAAc;wCACjB,OAAO,CAAE,CAAY,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAA;oCACrE,KAAK,eAAe;wCAClB,OAAO,CAAE,CAAY,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAA;oCACrE,KAAK,iBAAiB;wCACpB,OAAO,CAAE,CAAY,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAA;oCACvE,KAAK,QAAQ;wCACX,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAA;oCAC7B,KAAK,IAAI,CAAC;oCACV,KAAK,SAAS;wCACZ,OAAO,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAA;gCAC9B,CAAC;4BACH,CAAC,CAAC;gCACJ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAkB,CAAC;gCACjC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE;4BACjB,CAAC,CAAC,MAAM;iCACH,KAAK;iCACL,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;gCACX,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAA;gCACvB,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;oCACZ,KAAK,IAAI;wCACP,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;oCAC5B,KAAK,QAAQ;wCACX,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;oCAC7B,KAAK,IAAI;wCACP,OAAO,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAA;oCAC9B,KAAK,KAAK;wCACR,OAAO,kBAAkB,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAA;oCACvC,KAAK,IAAI;wCACP,OAAO,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAA;oCAChC,KAAK,KAAK;wCACR,OAAO,oBAAoB,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAA;oCACzC,KAAK,UAAU;wCACb,OAAQ,CAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;oCAC/C,KAAK,cAAc;wCACjB,OAAO,CAAE,CAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;oCAChD,KAAK,UAAU;wCACb,OAAQ,CAAY,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAA;oCACpE,KAAK,WAAW;wCACd,OAAQ,CAAY,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAA;oCACpE,KAAK,aAAa;wCAChB,OAAQ,CAAY,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAA;oCACtE,KAAK,cAAc;wCACjB,OAAO,CAAE,CAAY,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAA;oCACrE,KAAK,eAAe;wCAClB,OAAO,CAAE,CAAY,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAA;oCACrE,KAAK,iBAAiB;wCACpB,OAAO,CAAE,CAAY,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAA;oCACvE,KAAK,QAAQ;wCACX,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC;4CAC3B,CAAC,CAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAW;gDACzC,kBAAkB;iDACjB,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;4CACnE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAA;oCAC1B,KAAK,IAAI,CAAC;oCACV,KAAK,SAAS;wCACZ,OAAO,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC;4CAC3B,CAAC,CAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAW;gDACzC,kBAAkB;iDACjB,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC;4CACjE,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAA;gCAC3B,CAAC;4BACH,CAAC,CAAC;gCACN,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAkB,CAAC;gCACjC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;AACrB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAClC,MAAwB;IAExB,OAAO,CAAC,CAAI,EAAE,EAAE,CACd,aAAa;SACV,SAAS,CACR,MAAM;SACH,IAAI,EACP,CAAC,CAAC,EAAE,EAAE;QACJ,MAAM,KAAK,GAAG,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QACvB,oHAAoH;QACpH,OAAO,KAAK;YACV,CAAC,CAAC,MAAM,CAAC,IAAI,CACX,aAAa,CAAC,SAAS,CAAC,KAAsB,EAAE,CAAC,CAAC,EAAE,EAAE;YACpD,8DAA8D;YAC9D,OAAO,CAAE,CAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC;gBAChD,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC;gBACtC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CACrB;YACD,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;IACnB,CAAC,CACF;SACA,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;AACxB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAI,GAAM;IACzC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5B,OAAO,GAAG,CAAC,WAAW,EAAE,CAAA;IAC1B,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AAED,MAAM,UAAU,OAAO,CAAC,IAAa,EAAE,IAAa;IAClD,OAAO,IAAI,KAAK,IAAI,CAAA;AACtB,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,IAAsB,EAAE,IAAsB;IACtE,OAAO,IAAI,GAAG,IAAI,CAAA;AACpB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAsB,EAAE,IAAsB;IAC/E,OAAO,IAAI,IAAI,IAAI,CAAA;AACrB,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,IAAsB,EAAE,IAAsB;IACxE,OAAO,IAAI,GAAG,IAAI,CAAA;AACpB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,IAAsB,EAAE,IAAsB;IACjF,OAAO,IAAI,IAAI,IAAI,CAAA;AACrB,CAAC"}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvc2VydmljZXMvU3RvcmUvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDM0MsT0FBTyxVQUFVLE1BQU0sYUFBYSxDQUFBO0FBQ3BDLE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLGlCQUFpQixDQUFBO0FBQ2hFLE9BQU8sRUFBRSxZQUFZLEVBQUUsTUFBTSxpQkFBaUIsQ0FBQTtBQUc5QyxNQUFNLENBQUMsTUFBTSxRQUFRLEdBQUcsQ0FDdEIsRUFBRSxLQUFLLEVBQUUsR0FBRyxDQUFDLEVBQUssRUFDZixFQUFFLENBQUUsQ0FBQztJQUNSLEdBQUcsQ0FBQztJQUNKLEtBQUssRUFBRSxVQUFVLENBQUMsQ0FBQyxDQUFDO0NBQ3JCLENBQVMsQ0FBQTtBQUNWLE1BQU0sQ0FBQyxNQUFNLGNBQWMsR0FDekIsQ0FBQyxJQUFZLEVBQUUsRUFBRSxDQUFDLENBQXdELENBQUksRUFBRSxPQUFrQixFQUFFLEVBQUUsQ0FDcEcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxRQUFRLENBQUMsRUFBQyxDQUFDO0lBQ3BCLElBQUksQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQ1osS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUNOLE1BQU0sQ0FBQyxRQUFRLENBQ2IsT0FBTyxFQUNQLEdBQUcsRUFBRSxDQUFDLElBQUksOEJBQThCLENBQUMsRUFBRSxJQUFJLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsT0FBTyxFQUFFLEVBQUUsRUFBRSxLQUFLLEVBQUUsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDLENBQzFGLENBQ0YsQ0FBQTtJQUNILENBQUM7SUFDRCxJQUFJLE1BQU0sQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLElBQUksT0FBTyxDQUFDLEtBQUssQ0FBQyxLQUFLLEtBQUssQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFDO1FBQzlELE9BQU8sS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUNiLElBQUksOEJBQThCLENBQUM7WUFDakMsSUFBSTtZQUNKLEVBQUUsRUFBRSxPQUFPLENBQUMsS0FBSyxDQUFDLEVBQUU7WUFDcEIsT0FBTyxFQUFFLE9BQU8sQ0FBQyxLQUFLLENBQUMsS0FBSztZQUM1QixLQUFLLEVBQUUsQ0FBQyxDQUFDLEtBQUs7U0FDZixDQUFDLENBQ0gsQ0FBQTtJQUNILENBQUM7SUFDRCxNQUFNLElBQUksR0FBRyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDeEIsT0FBTyxJQUFJLENBQUE7QUFDYixDQUFDLENBQUMsQ0FBQTtBQUVOLE1BQU0sVUFBVSxVQUFVLENBQXlDLE1BQWtCO0lBQ25GLE9BQU8sQ0FBQyxDQUFJLEVBQUUsRUFBRSxDQUFDLFlBQVksQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBa0IsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxFQUFFLENBQUE7QUFDcEcsQ0FBQztBQUVELE1BQU0sVUFBVSxpQkFBaUIsQ0FBSSxHQUFNO0lBQ3pDLElBQUksT0FBTyxHQUFHLEtBQUssUUFBUSxFQUFFLENBQUM7UUFDNUIsT0FBTyxHQUFHLENBQUMsV0FBVyxFQUFFLENBQUE7SUFDMUIsQ0FBQztJQUNELE9BQU8sR0FBRyxDQUFBO0FBQ1osQ0FBQztBQUVELE1BQU0sVUFBVSxPQUFPLENBQUMsSUFBYSxFQUFFLElBQWE7SUFDbEQsT0FBTyxJQUFJLEtBQUssSUFBSSxDQUFBO0FBQ3RCLENBQUM7QUFFRCxNQUFNLFVBQVUsU0FBUyxDQUFDLElBQXNCLEVBQUUsSUFBc0I7SUFDdEUsT0FBTyxJQUFJLEdBQUcsSUFBSSxDQUFBO0FBQ3BCLENBQUM7QUFFRCxNQUFNLFVBQVUsa0JBQWtCLENBQUMsSUFBc0IsRUFBRSxJQUFzQjtJQUMvRSxPQUFPLElBQUksSUFBSSxJQUFJLENBQUE7QUFDckIsQ0FBQztBQUVELE1BQU0sVUFBVSxXQUFXLENBQUMsSUFBc0IsRUFBRSxJQUFzQjtJQUN4RSxPQUFPLElBQUksR0FBRyxJQUFJLENBQUE7QUFDcEIsQ0FBQztBQUVELE1BQU0sVUFBVSxvQkFBb0IsQ0FBQyxJQUFzQixFQUFFLElBQXNCO0lBQ2pGLE9BQU8sSUFBSSxJQUFJLElBQUksQ0FBQTtBQUNyQixDQUFDIn0=

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

@@ -122,7 +122,7 @@ export type FilterWheres = {
     <TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues>, V extends FieldPathValue<TFieldValues, TFieldName>>(path: TFieldName, value: V): (current: Query<TFieldValues>) => QueryWhere<TFieldValues>;
     <TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues>, V extends FieldPathValue<TFieldValues, TFieldName>>(path: TFieldName, op: "neq", value: V): (current: Query<TFieldValues>) => QueryWhere<TFieldValues>;
     <TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues>, V extends FieldPathValue<TFieldValues, TFieldName>>(path: TFieldName, op: "gt" | "gte" | "lt" | "lte", value: V): (current: Query<TFieldValues>) => QueryWhere<TFieldValues>;
-    <TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues>, V extends FieldPathValue<TFieldValues, TFieldName>>(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 string>(path: TFieldName, op: "startsWith" | "endsWith" | "contains" | "notContains" | "notStartsWith" | "notEndsWith", value: V): (current: Query<TFieldValues>) => QueryWhere<TFieldValues>;
     <TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues>, V extends FieldPathValue<TFieldValues, TFieldName>>(path: TFieldName, op: "in" | "notIn", value: readonly V[]): (current: Query<TFieldValues>) => QueryWhere<TFieldValues>;
 };
 export type FilterWhere = {
@@ -136,7 +136,7 @@ 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: "neq", 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", value: V): (current: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>;
-    <TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues>, V extends FieldPathValue<TFieldValues, TFieldName>>(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 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>;
 };
 export type FilterContinuation = {

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.210.11",
+  "version": "0.211.1",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -19,9 +19,9 @@
     "pure-rand": "6.0.4",
     "redlock": "^4.2.0",
     "@effect-app/core": "0.150.5",
-    "@effect-app/fluent-extensions": "0.143.4",
     "@effect-app/schema": "0.203.4",
     "@effect-app/infra-adapters": "0.137.19",
+    "@effect-app/fluent-extensions": "0.143.4",
     "effect-app": "0.181.8"
   },
   "devDependencies": {
@@ -216,16 +216,6 @@
         "default": "./_cjs/errors.cjs"
       }
     },
-    "./filter": {
-      "import": {
-        "types": "./dist/filter.d.ts",
-        "default": "./dist/filter.js"
-      },
-      "require": {
-        "types": "./dist/filter.d.ts",
-        "default": "./_cjs/filter.cjs"
-      }
-    },
     "./filter/types": {
       "import": {
         "types": "./dist/filter/types.d.ts",

package/src/services/RepositoryBase.ts

@@ -16,12 +16,11 @@ import {
   saveWithPure_
 } from "./Repository.js"
 import { StoreMaker } from "./Store.js"
-import type { Filter, FilterArgs, FilterFunc, PersistenceModelType, StoreConfig, Where } from "./Store.js"
+import type { Filter, FilterArgs, FilterFunc, PersistenceModelType, StoreConfig } from "./Store.js"
 import type {} from "effect/Equal"
 import type {} from "effect/Hash"
 import { toNonEmptyArray } from "@effect-app/core/Array"
 import { flatMapOption } from "@effect-app/core/Effect"
-import { makeFilters } from "@effect-app/infra/filter"
 import type { ParseResult, Schema } from "@effect-app/schema"
 import { NonNegativeInt } from "@effect-app/schema"
 import type { Context, NonEmptyArray, NonEmptyReadonlyArray } from "effect-app"
@@ -360,8 +359,6 @@ export function makeRepo<
     mapFrom: (pm: Omit<PM, "_etag">) => From,
     mapTo: (e: From, etag: string | undefined) => PM
   ) => {
-    const where = makeWhere<PM>()
-
     function mapToPersistenceModel(
       e: From,
       getEtag: (id: string) => string | undefined
@@ -670,7 +667,6 @@ export function makeRepo<
 
     return {
       make,
-      Where: where,
       Query: QB.QueryBuilder.make<PM>(),
       Q: Q.make<Omit<PM, "_etag">>()
     }
@@ -693,31 +689,6 @@ export function removeById<
   return get(self, id).pipe(Effect.flatMap((_) => self.removeAndPublish([_])))
 }
 
-export function makeWhere<PM extends { id: string; _etag: string | undefined }>() {
-  const f_ = makeFilters<PM>()
-  type WhereFilter = typeof f_
-
-  function makeFilter_(filter: (f: WhereFilter) => Filter<PM>) {
-    return filter(f_)
-  }
-
-  function where(
-    makeWhere: (
-      f: WhereFilter
-    ) => Where | readonly [Where, ...Where[]],
-    mode?: "or" | "and"
-  ) {
-    return makeFilter_((f) => {
-      const m = makeWhere ? makeWhere(f) : []
-      return ({
-        mode,
-        where: (Array.isArray(m) ? m as unknown as [Where, ...Where[]] : [m]) as readonly [Where, ...Where[]]
-      })
-    })
-  }
-  return where
-}
-
 const pluralize = (s: string) =>
   s.endsWith("s")
     ? s + "es"
@@ -829,8 +800,6 @@ export interface Repos<
     f: (r: Repository<T, PM, Evt, ItemType>) => Out
   ): Effect<Out, E, StoreMaker | ContextMapContainer | R | RInitial | R2>
   /** @deprecated use `Q` instead */
-  readonly Where: ReturnType<typeof makeWhere<PM>>
-  /** @deprecated use `Q` instead */
   readonly Query: ReturnType<typeof QB.QueryBuilder.make<PM>>
   readonly Q: ReturnType<typeof Q.make<PM>>
   readonly type: Repository<T, PM, Evt, ItemType>
@@ -1005,7 +974,8 @@ const makeRepoFunctions = (tag: any) => {
     queryLegacy,
     mapped,
     queryAndSavePure,
-    saveManyWithPure
+    saveManyWithPure,
+    use: (body: any) => Effect.andThen(tag, body)
   }
 }
 
@@ -1044,7 +1014,6 @@ export const RepositoryBaseImpl = <Service>() => {
       static readonly make = mkRepo.make
       static readonly makeWith = ((a: any, b: any) => Effect.map(mkRepo.make(a), b)) as any
 
-      static readonly Where = makeWhere<PM>()
       static readonly Query = QB.QueryBuilder.make<PM>()
       static readonly Q = Q.make<From>()
       static readonly type: Repository<T, PM, Evt, ItemType> = undefined as any
@@ -1093,7 +1062,6 @@ export const RepositoryDefaultImpl = <Service>() => {
       static readonly make = mkRepo.make
       static readonly makeWith = ((a: any, b: any) => Effect.map(mkRepo.make(a), b)) as any
 
-      static readonly Where = makeWhere<PM>()
       static readonly Query = QB.QueryBuilder.make<PM>()
       static readonly Q = Q.make<From>()
 

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

@@ -2,7 +2,7 @@ import { Effect, Equivalence, pipe, ReadonlyArray } from "effect-app"
 import type { NonEmptyReadonlyArray } from "effect-app"
 import { assertUnreachable } from "effect-app/utils"
 import type { FilterR, FilterResult } from "../filterApi/query.js"
-import type { FilterJoinSelect, JoinFindFilter, LegacyFilter, StoreWhereFilter, SupportedValues } from "../service.js"
+import type { SupportedValues } from "../service.js"
 
 export function logQuery(q: {
   query: string
@@ -26,208 +26,6 @@ export function logQuery(q: {
     }))
 }
 
-/**
- * @deprecated: should build Select into Where query
- */
-export function buildFilterJoinSelectCosmosQuery(
-  filter: FilterJoinSelect,
-  k: string,
-  name: string,
-  skip?: number,
-  limit?: number
-) {
-  const lm = skip !== undefined || limit !== undefined ? `OFFSET ${skip ?? 0} LIMIT ${limit ?? 999999}` : ""
-  return {
-    query: `
-SELECT r, f.id as _rootId
-FROM ${name} f
-JOIN r IN f.${k}
-WHERE r.${filter.valueKey} = @value
-${lm}
-`,
-    parameters: [{ name: "@value", value: filter.value }]
-  }
-}
-
-/**
- * @deprecated: is now part of Where query as k.-1.valueKey
- */
-export function buildFindJoinCosmosQuery(
-  filter: JoinFindFilter,
-  k: string,
-  name: string,
-  skip?: number,
-  limit?: number
-) {
-  const lm = skip !== undefined || limit !== undefined ? `OFFSET ${skip ?? 0} LIMIT ${limit ?? 999999}` : ""
-  return {
-    query: `
-SELECT DISTINCT VALUE f
-FROM ${name} f
-JOIN r IN f.${k}
-WHERE r.${filter.valueKey} = @value
-${lm}`,
-    parameters: [{ name: "@value", value: filter.value }]
-  }
-}
-
-/**
- * @deprecated: should build into Where query
- */
-export function buildLegacyCosmosQuery<PM>(
-  filter: LegacyFilter<PM>,
-  name: string,
-  importedMarkerId: string,
-  defaultValues: Record<string, unknown>,
-  skip?: number,
-  limit?: number
-) {
-  if (Object.keys(defaultValues).length) {
-    throw new Error("defaultValues not supported with legacy cosmos query: " + JSON.stringify(defaultValues))
-  }
-  const lm = skip !== undefined || limit !== undefined ? `OFFSET ${skip ?? 0} LIMIT ${limit ?? 999999}` : ""
-  return {
-    query: `
-    SELECT f
-    FROM ${name} f
-    WHERE f.id != @id AND f.${
-      String(
-        filter.by
-      )
-    } LIKE @filter
-  ${lm}`,
-    parameters: [
-      { name: "@id", value: importedMarkerId },
-      {
-        name: "@filter",
-        value: filter.type === "endsWith"
-          ? `%${filter.value}`
-          : filter.type === "contains"
-          ? `%${filter.value}%`
-          : `${filter.value}%`
-      }
-    ]
-  }
-}
-
-export function buildWhereCosmosQuery(
-  filter: StoreWhereFilter,
-  name: string,
-  importedMarkerId: string,
-  defaultValues: Record<string, unknown>,
-  skip?: number,
-  limit?: number
-) {
-  const lm = skip !== undefined || limit !== undefined ? `OFFSET ${skip ?? 0} LIMIT ${limit ?? 999999}` : ""
-
-  return {
-    query: `
-    SELECT f
-    FROM ${name} f
-    ${
-      pipe(
-        filter
-          .where
-          .filter((_) => _.key.includes(".-1."))
-          .map((_) => _.key.split(".-1.")[0])
-          .map((_) => `JOIN ${_} IN f.${_}`),
-        ReadonlyArray.dedupeWith(Equivalence.string)
-      )
-        .join("\n")
-    }
-    WHERE f.id != @id AND ${
-      filter
-        .where
-        .map((_) =>
-          _.key.includes(".-1.")
-            ? { ..._, f: _.key.split(".-1.")[0], key: _.key.split(".-1.")[1]! }
-            : { ..._, f: "f" }
-        )
-        .map(
-          (x, i) => {
-            let k = `${x.f}.${x.key}`
-            k = x.key in defaultValues ? `(${k} ?? ${JSON.stringify(defaultValues[x.key])})` : k
-            const v = `@v${i}`
-
-            switch (x.t) {
-              case "in":
-                return `ARRAY_CONTAINS(${v}, ${k})`
-              case "not-in":
-                return `(NOT ARRAY_CONTAINS(${v}, ${k}))`
-
-              case "includes":
-                return `ARRAY_CONTAINS(${k}, ${v})`
-              case "not-includes":
-                return `(NOT ARRAY_CONTAINS(${k}, ${v}))`
-              case "contains":
-                return `CONTAINS(${k}, ${v}, true)`
-              case "starts-with":
-                return `STARTSWITH(${k}, ${v}, true)`
-              case "ends-with":
-                return `ENDSWITH(${k}, ${v}, true)`
-              case "not-contains":
-                return `NOT(CONTAINS(${k}, ${v}, true))`
-              case "not-starts-with":
-                return `NOT(STARTSWITH(${k}, ${v}, true))`
-              case "not-ends-with":
-                return `NOT(ENDSWITH(${k}, ${v}, true))`
-            }
-
-            switch (x.t) {
-              case "lt":
-                return `${k} < ${v}`
-              case "lte":
-                return `${k} <= ${v}`
-              case "gt":
-                return `${k} > ${v}`
-              case "gte":
-                return `${k} >= ${v}`
-              case "not-eq":
-                return x.value === null
-                  ? `IS_NULL(${k}) = false`
-                  : `${k} <> ${v}`
-              case undefined:
-              case "eq":
-                return x.value === null
-                  ? `IS_NULL(${k}) = true`
-                  : `${k} = ${v}`
-            }
-          }
-        )
-        .join(filter.mode === "or" ? " OR " : " AND ")
-    }
-    ${lm}`,
-    parameters: [
-      { name: "@id", value: importedMarkerId },
-      ...filter
-        .where
-        .map((x, i) => ({
-          name: `@v${i}`,
-          value: x.value
-        }))
-    ]
-  }
-}
-
-// function isArray(t: SupportedValues | readonly SupportedValues[]): t is readonly SupportedValues[] {
-//   return Array.isArray(t)
-// }
-
-export function buildCosmosQuery<PM>(
-  filter: LegacyFilter<PM> | StoreWhereFilter,
-  name: string,
-  importedMarkerId: string,
-  defaultValues: Record<string, unknown>,
-  skip?: number,
-  limit?: number
-) {
-  return filter.type === "startsWith"
-      || filter.type === "endsWith"
-      || filter.type === "contains"
-    ? buildLegacyCosmosQuery(filter, name, importedMarkerId, defaultValues, skip, limit)
-    : buildWhereCosmosQuery(filter, name, importedMarkerId, defaultValues, skip, limit)
-}
-
 export function buildWhereCosmosQuery3(
   filter: readonly FilterResult[],
   name: string,