@effect-app/infra 0.200.1 → 0.200.3

package/dist/services/query/new-kid-interpreter.js

@@ -0,0 +1,110 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+import { toNonEmptyArray } from "@effect-app/core/Array";
+import { Effect, Match, Option, pipe, S, Unify } from "effect-app";
+import { make } from "../query.js";
+const interpret = (_) => {
+    const values = [];
+    const a = _;
+    let schema = undefined;
+    let limit = undefined;
+    let skip = undefined;
+    const order = [];
+    const upd = (v) => {
+        values.push(...v.filter);
+        order.push(...v.order);
+        limit = v.limit;
+        skip = v.skip;
+        schema = v.schema;
+    };
+    pipe(a, Match.valueTags({
+        value: () => {
+            // values.push(value)
+        },
+        where: ({ current, operation }) => {
+            upd(interpret(current));
+            values.push({
+                t: "where",
+                path: operation[0],
+                op: operation.length === 2 ? "eq" : operation[1],
+                value: operation.length === 2 ? operation[1] : operation[2]
+            });
+        },
+        and: ({ current, operation }) => {
+            upd(interpret(current));
+            if (typeof operation === "function") {
+                values.push({ t: "and-scope", result: interpret(operation(make())).filter });
+            }
+            else {
+                values.push({
+                    t: "and",
+                    path: operation[0],
+                    op: operation.length === 2 ? "eq" : operation[1],
+                    value: operation.length === 2 ? operation[1] : operation[2]
+                });
+            }
+        },
+        or: ({ current, operation }) => {
+            upd(interpret(current));
+            if (typeof operation === "function") {
+                values.push({ t: "or-scope", result: interpret(operation(make())).filter });
+            }
+            else {
+                values.push({
+                    t: "or",
+                    path: operation[0],
+                    op: operation.length === 2 ? "eq" : operation[1],
+                    value: operation.length === 2 ? operation[1] : operation[2]
+                });
+            }
+        },
+        order: ({ current }) => {
+            upd(interpret(current));
+        },
+        page: (v) => {
+            upd(interpret(v.current));
+            limit = v.limit;
+            skip = v.skip;
+        },
+        project: (v) => {
+            upd(interpret(v.current));
+            schema = v.schema;
+        }
+    }));
+    return {
+        filter: values,
+        limit,
+        skip,
+        schema,
+        order
+    };
+};
+export const query = ((repo, q) => {
+    // TODO: Native interpreter for each db adapter, instead of the intermediate "new-kid" format
+    const a = interpret(q);
+    const schema = a.schema;
+    let select = [];
+    if (schema) {
+        let t = schema.ast;
+        if (S.AST.isTransform(t)) {
+            t = t.from;
+        }
+        if (S.AST.isTypeLiteral(t)) {
+            select = t.propertySignatures.map((_) => _.name);
+        }
+    }
+    return Effect.flatMap(repo.utils.filter({
+        limit: a.limit,
+        skip: a.skip,
+        select: Option.getOrUndefined(toNonEmptyArray(select)),
+        filter: a.filter.length
+            ? {
+                type: "new-kid",
+                build: () => a.filter
+            }
+            : undefined
+    }), (_) => Unify.unify(schema
+        ? repo.utils.parseMany2(_, schema)
+        : repo.utils.parseMany(_)));
+});
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV3LWtpZC1pbnRlcnByZXRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9xdWVyeS9uZXcta2lkLWludGVycHJldGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHVEQUF1RDtBQUN2RCw0REFBNEQ7QUFDNUQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFBO0FBQ3hELE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FBQyxFQUFFLEtBQUssRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUlsRSxPQUFPLEVBQUUsSUFBSSxFQUEyQyxNQUFNLGFBQWEsQ0FBQTtBQUszRSxNQUFNLFNBQVMsR0FBRyxDQUFnRSxDQUEyQixFQUFFLEVBQUU7SUFDL0csTUFBTSxNQUFNLEdBQW1CLEVBQUUsQ0FBQTtJQUNqQyxNQUFNLENBQUMsR0FBRyxDQUFvQixDQUFBO0lBRTlCLElBQUksTUFBTSxHQUE2QyxTQUFnQixDQUFBO0lBQ3ZFLElBQUksS0FBSyxHQUF1QixTQUFnQixDQUFBO0lBQ2hELElBQUksSUFBSSxHQUF1QixTQUFnQixDQUFBO0lBQy9DLE1BQU0sS0FBSyxHQUFvRSxFQUFFLENBQUE7SUFFakYsTUFBTSxHQUFHLEdBQUcsQ0FBQyxDQUF3RixFQUFFLEVBQUU7UUFDdkcsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUN4QixLQUFLLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ3RCLEtBQUssR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFBO1FBQ2YsSUFBSSxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUE7UUFDYixNQUFNLEdBQUcsQ0FBQyxDQUFDLE1BQU0sQ0FBQTtJQUNuQixDQUFDLENBQUE7SUFFRCxJQUFJLENBQ0YsQ0FBQyxFQUNELEtBQUssQ0FBQyxT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

package/dist/services/query.d.ts

@@ -1,164 +1,3 @@
-import type { FieldValues } from "@effect-app/infra/filter/types";
-import type { FieldPath, FieldPathValue } from "@effect-app/infra/filter/types/path/eager";
-import type { Repository } from "@effect-app/infra/services/Repository";
-import type { PersistenceModelType } from "@effect-app/infra/services/Store";
-import type { Ops } from "@effect-app/infra/services/Store/filterApi/proxy";
-import { Effect, S } from "effect-app";
-import type { NoInfer } from "effect/Types";
-export type QAll<TFieldValues extends FieldValues, A = TFieldValues, R = never> = Query<TFieldValues> | QueryWhere<TFieldValues> | QueryEnd<TFieldValues> | QueryProjection<TFieldValues, A, R>;
-export interface Query<TFieldValues extends FieldValues> {
-    readonly args: {
-        TFieldValues: TFieldValues;
-    };
-    readonly _id: unique symbol;
-}
-export interface QueryWhere<TFieldValues extends FieldValues> {
-    readonly args: {
-        TFieldValues: TFieldValues;
-    };
-    readonly _id2: unique symbol;
-}
-export interface QueryEnd<TFieldValues extends FieldValues> {
-    readonly args: {
-        TFieldValues: TFieldValues;
-    };
-    readonly _id3: unique symbol;
-}
-export interface QueryProjection<TFieldValues extends FieldValues, A = TFieldValues, R = never> {
-    readonly args: {
-        TFieldValues: TFieldValues;
-        A: A;
-        R: R;
-    };
-    readonly _id4: unique symbol;
-}
-export type Q<TFieldValues extends FieldValues> = Initial<TFieldValues> | Where<TFieldValues> | And<TFieldValues> | Or<TFieldValues> | Order<TFieldValues, any> | Page<TFieldValues> | Project<any, TFieldValues, any>;
-declare const Initial_base: new <A_1 extends Record<string, any> = {}>(args: import("effect/Types").Equals<A_1, {}> extends true ? void : { readonly [P in keyof A_1 as P extends "_tag" ? never : P]: A_1[P]; }) => Readonly<A_1> & {
-    readonly _tag: "value";
-};
-export declare class Initial<TFieldValues extends FieldValues> extends Initial_base<{
-    value: "initial";
-}> implements Query<TFieldValues> {
-    readonly _id: any;
-    readonly args: any;
-    constructor();
-}
-declare const Where_base: new <A_1 extends Record<string, any> = {}>(args: import("effect/Types").Equals<A_1, {}> extends true ? void : { readonly [P in keyof A_1 as P extends "_tag" ? never : P]: A_1[P]; }) => Readonly<A_1> & {
-    readonly _tag: "where";
-};
-export declare class Where<TFieldValues extends FieldValues> extends Where_base<{
-    current: Query<TFieldValues>;
-    operation: [string, Ops, any] | [string, any];
-}> implements QueryWhere<TFieldValues> {
-    _id2: any;
-    _id: any;
-    readonly args: any;
-}
-declare const And_base: new <A_1 extends Record<string, any> = {}>(args: import("effect/Types").Equals<A_1, {}> extends true ? void : { readonly [P in keyof A_1 as P extends "_tag" ? never : P]: A_1[P]; }) => Readonly<A_1> & {
-    readonly _tag: "and";
-};
-export declare class And<TFieldValues extends FieldValues> extends And_base<{
-    current: Query<TFieldValues>;
-    operation: [string, Ops, any] | [string, any] | ((q: Query<TFieldValues>) => QueryWhere<TFieldValues>);
-}> implements QueryWhere<TFieldValues> {
-    _id2: any;
-    _id: any;
-    readonly args: any;
-}
-declare const Or_base: new <A_1 extends Record<string, any> = {}>(args: import("effect/Types").Equals<A_1, {}> extends true ? void : { readonly [P in keyof A_1 as P extends "_tag" ? never : P]: A_1[P]; }) => Readonly<A_1> & {
-    readonly _tag: "or";
-};
-export declare class Or<TFieldValues extends FieldValues> extends Or_base<{
-    current: Query<TFieldValues>;
-    operation: [string, Ops, any] | [string, any] | ((q: Query<TFieldValues>) => QueryWhere<TFieldValues>);
-}> implements QueryWhere<TFieldValues> {
-    _id2: any;
-    _id: any;
-    readonly args: any;
-}
-declare const Page_base: new <A_1 extends Record<string, any> = {}>(args: import("effect/Types").Equals<A_1, {}> extends true ? void : { readonly [P in keyof A_1 as P extends "_tag" ? never : P]: A_1[P]; }) => Readonly<A_1> & {
-    readonly _tag: "page";
-};
-export declare class Page<TFieldValues extends FieldValues> extends Page_base<{
-    current: Query<TFieldValues> | QueryWhere<TFieldValues> | QueryEnd<TFieldValues>;
-    limit?: number | undefined;
-    skip?: number | undefined;
-}> implements QueryEnd<TFieldValues> {
-    _id3: any;
-    readonly args: any;
-}
-declare const Order_base: new <A_1 extends Record<string, any> = {}>(args: import("effect/Types").Equals<A_1, {}> extends true ? void : { readonly [P in keyof A_1 as P extends "_tag" ? never : P]: A_1[P]; }) => Readonly<A_1> & {
-    readonly _tag: "order";
-};
-export declare class Order<TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues>> extends Order_base<{
-    current: Query<TFieldValues> | QueryWhere<TFieldValues> | QueryEnd<TFieldValues>;
-    field: TFieldName;
-    direction: "ASC" | "DESC";
-}> implements QueryEnd<TFieldValues> {
-    _id3: any;
-    readonly args: any;
-}
-declare const Project_base: new <A_1 extends Record<string, any> = {}>(args: import("effect/Types").Equals<A_1, {}> extends true ? void : { readonly [P in keyof A_1 as P extends "_tag" ? never : P]: A_1[P]; }) => Readonly<A_1> & {
-    readonly _tag: "project";
-};
-export declare class Project<A, TFieldValues extends FieldValues, R> extends Project_base<{
-    current: Query<TFieldValues> | QueryWhere<TFieldValues> | QueryEnd<TFieldValues>;
-    schema: S.Schema<A, TFieldValues, R>;
-}> implements QueryProjection<TFieldValues, A, R> {
-    _id4: any;
-    readonly args: any;
-}
-export declare const where: FilterWhere;
-export declare const and: FilterContinuation;
-export declare const or: FilterContinuation;
-export declare const order: <TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues>>(field: TFieldName, desc?: boolean) => (current: Query<TFieldValues> | QueryWhere<TFieldValues> | QueryEnd<TFieldValues>) => QueryEnd<TFieldValues>;
-export declare const page: <TFieldValues extends FieldValues>(page: {
-    limit?: number;
-    skip?: number;
-}) => (current: Query<TFieldValues> | QueryWhere<TFieldValues> | QueryEnd<TFieldValues>) => QueryEnd<TFieldValues>;
-export declare const project: <TFieldValues extends FieldValues, A, R>(schema: S.Schema<A, TFieldValues, R>) => (current: Query<TFieldValues> | QueryWhere<TFieldValues> | QueryEnd<TFieldValues>) => QueryProjection<TFieldValues, A, R>;
-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 FieldPathValue<TFieldValues, TFieldName>>(path: TFieldName, op: "in" | "notIn", value: readonly V[]): (current: Query<TFieldValues>) => QueryWhere<TFieldValues>;
-};
-export type FilterWhere = {
-    <TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues>, V extends FieldPathValue<TFieldValues, TFieldName>>(f: {
-        path: TFieldName;
-        op: Ops;
-        value: V;
-    }): (current: Query<TFieldValues>) => QueryWhere<TFieldValues>;
-} & FilterWheres;
-export type 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 FieldPathValue<TFieldValues, TFieldName>>(path: TFieldName, op: "in" | "notIn", value: readonly V[]): (current: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>;
-};
-export type FilterContinuation = {
-    <TFieldValues extends FieldValues>(fb: (current: Query<TFieldValues>) => QueryWhere<TFieldValues>): (current: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>;
-    <TFieldValues extends FieldValues, TFieldName extends FieldPath<TFieldValues>, V extends FieldPathValue<TFieldValues, TFieldName>>(f: {
-        path: TFieldName;
-        op: Ops;
-        value: V;
-    }): (current: QueryWhere<TFieldValues>) => QueryWhere<TFieldValues>;
-} & FilterContinuations;
-export declare const make: <TFieldValues extends FieldValues>() => Query<TFieldValues>;
-export interface A {
-    a: string;
-    b: number;
-    c: boolean;
-}
-export declare const query: {
-    <T extends {
-        id: unknown;
-    }, PM extends PersistenceModelType<string>, Evt, ItemType extends string, A, R, From extends FieldValues>(repo: Repository<T, PM, Evt, ItemType>, q: QueryProjection<PM extends From ? From : never, A, R>): Effect.Effect<readonly A[], S.ParseResult.ParseError, R>;
-    <T extends {
-        id: unknown;
-    }, PM extends PersistenceModelType<string>, Evt, ItemType extends string, A, R>(repo: Repository<T, PM, Evt, ItemType>, q: QAll<NoInfer<PM>, A, R>): Effect.Effect<readonly T[], never, R>;
-};
-export {};
+export * from "./query/dsl.js";
+export * from "./query/new-kid-interpreter.js";
 //# sourceMappingURL=query.d.ts.map

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

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

package/dist/services/query.js

@@ -1,157 +1,3 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import { toNonEmptyArray } from "@effect-app/core/Array";
-import { Data, Effect, Match, Option, pipe, S, Unify } from "effect-app";
-export class Initial extends Data.TaggedClass("value") {
-    _id;
-    args;
-    constructor() {
-        super({ value: "initial" });
-    }
-}
-export class Where extends Data.TaggedClass("where") {
-    _id2;
-    _id;
-    args;
-}
-export class And extends Data.TaggedClass("and") {
-    _id2;
-    _id;
-    args;
-}
-export class Or extends Data.TaggedClass("or") {
-    _id2;
-    _id;
-    args;
-}
-export class Page extends Data.TaggedClass("page") {
-    _id3;
-    args;
-}
-export class Order extends Data.TaggedClass("order") {
-    _id3;
-    args;
-}
-export class Project extends Data.TaggedClass("project") {
-    _id4;
-    args;
-}
-const wh = (...operation) => (current) => new Where({ current, operation });
-export const where = wh;
-export const and = (...operation) => (current) => new And({ current, operation: typeof operation[0] === "function" ? operation[0] : operation });
-export const or = (...operation) => (current) => new Or({ current, operation: typeof operation[0] === "function" ? operation[0] : operation });
-export const order = (field, desc) => (current) => new Order({ current, field, direction: desc ? "DESC" : "ASC" });
-export const page = ({ limit, skip }) => (current) => new Page({
-    current,
-    limit,
-    skip
-});
-export const project = (schema) => (current) => new Project({ current, schema });
-export const make = () => new Initial();
-const interpret = (_) => {
-    const values = [];
-    const a = _;
-    let schema = undefined;
-    let limit = undefined;
-    let skip = undefined;
-    const order = [];
-    const upd = (v) => {
-        values.push(...v.filter);
-        order.push(...v.order);
-        limit = v.limit;
-        skip = v.skip;
-        schema = v.schema;
-    };
-    pipe(a, Match.valueTags({
-        value: () => {
-            // values.push(value)
-        },
-        where: ({ current, operation }) => {
-            upd(interpret(current));
-            values.push({
-                t: "where",
-                path: operation[0],
-                op: operation.length === 2 ? "eq" : operation[1],
-                value: operation.length === 2 ? operation[1] : operation[2]
-            });
-        },
-        and: ({ current, operation }) => {
-            upd(interpret(current));
-            if (typeof operation === "function") {
-                values.push({ t: "and-scope", result: interpret(operation(make())).filter });
-            }
-            else {
-                values.push({
-                    t: "and",
-                    path: operation[0],
-                    op: operation.length === 2 ? "eq" : operation[1],
-                    value: operation.length === 2 ? operation[1] : operation[2]
-                });
-            }
-        },
-        or: ({ current, operation }) => {
-            upd(interpret(current));
-            if (typeof operation === "function") {
-                values.push({ t: "or-scope", result: interpret(operation(make())).filter });
-            }
-            else {
-                values.push({
-                    t: "or",
-                    path: operation[0],
-                    op: operation.length === 2 ? "eq" : operation[1],
-                    value: operation.length === 2 ? operation[1] : operation[2]
-                });
-            }
-        },
-        order: ({ current }) => {
-            upd(interpret(current));
-        },
-        page: (v) => {
-            upd(interpret(v.current));
-            limit = v.limit;
-            skip = v.skip;
-        },
-        project: (v) => {
-            upd(interpret(v.current));
-            schema = v.schema;
-        }
-    }));
-    // TODO
-    return {
-        filter: values,
-        limit,
-        skip,
-        schema,
-        order
-    };
-};
-export const query = ((repo, q) => {
-    // TODO: Native interpreter for each db adapter, instead of the intermediate "new-kid" format
-    const a = interpret(q);
-    const schema = a.schema;
-    let select = [];
-    if (schema) {
-        let t = schema.ast;
-        if (S.AST.isTransform(t)) {
-            t = t.from;
-        }
-        if (S.AST.isTypeLiteral(t)) {
-            select = t.propertySignatures.map((_) => _.name);
-        }
-    }
-    return pipe(a.filter.length === 0
-        ? repo.utils.all
-        : repo.utils.filter({
-            limit: a.limit,
-            skip: a.skip,
-            select: Option.getOrUndefined(toNonEmptyArray(select)),
-            filter: a.filter.length
-                ? {
-                    type: "new-kid",
-                    build: () => a.filter
-                }
-                : undefined
-        }), Effect.flatMap((_) => Unify.unify(schema
-        ? repo.utils.parseMany2(_, schema)
-        : repo.utils.parseMany(_))));
-});
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/services/query.ts"],"names":[],"mappings":"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"}
+export * from "./query/dsl.js";
+export * from "./query/new-kid-interpreter.js";
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicXVlcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc2VydmljZXMvcXVlcnkudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyxnQkFBZ0IsQ0FBQTtBQUM5QixjQUFjLGdDQUFnQyxDQUFBIn0=

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

@@ -0,0 +1 @@
+{"version":3,"file":"query.test.d.ts","sourceRoot":"","sources":["../../src/services/query.test.ts"],"names":[],"mappings":";;;;;;;;;WAQiF,MAAM,GAAG,SAAS;;;;;;;;;;WAAlB,MAAM,GAAG,SAAS;;;;;;;;;;WAAlB,MAAM,GAAG,SAAS;;;;;;;;;;WAAlB,MAAM,GAAG,SAAS;;AAAnG,qBAAa,QAAS,SAAQ,aAG7B;CAAG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.200.1",
+  "version": "0.200.3",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -21,8 +21,8 @@
     "@effect-app/core": "0.148.0",
     "@effect-app/fluent-extensions": "0.141.0",
     "effect-app": "0.175.0",
-    "@effect-app/schema": "0.199.0",
-    "@effect-app/infra-adapters": "0.135.0"
+    "@effect-app/infra-adapters": "0.135.0",
+    "@effect-app/schema": "0.199.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.9",
@@ -646,6 +646,26 @@
         "default": "./_cjs/services/query.cjs"
       }
     },
+    "./services/query/dsl": {
+      "import": {
+        "types": "./dist/services/query/dsl.d.ts",
+        "default": "./dist/services/query/dsl.js"
+      },
+      "require": {
+        "types": "./dist/services/query/dsl.d.ts",
+        "default": "./_cjs/services/query/dsl.cjs"
+      }
+    },
+    "./services/query/new-kid-interpreter": {
+      "import": {
+        "types": "./dist/services/query/new-kid-interpreter.d.ts",
+        "default": "./dist/services/query/new-kid-interpreter.js"
+      },
+      "require": {
+        "types": "./dist/services/query/new-kid-interpreter.d.ts",
+        "default": "./_cjs/services/query/new-kid-interpreter.cjs"
+      }
+    },
     "./test.arbs": {
       "import": {
         "types": "./dist/test.arbs.d.ts",

package/src/services/RepositoryBase.ts

@@ -1,3 +1,6 @@
+/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable @typescript-eslint/ban-types */
 // import type { ParserEnv } from "@effect-app/schema/custom/Parser"
@@ -99,17 +102,17 @@ export abstract class RepositoryBaseC<
   /** @deprecated use q2 */
   abstract readonly mapped: Mapped<PM, Omit<PM, "_etag">>
   abstract readonly q2: {
-    <A, R, From extends FieldValues>(
-      q: (initial: Query<Omit<PM, "_etag">>) => QueryProjection<Omit<PM, "_etag"> extends From ? From : never, A, R>
-    ): Effect.Effect<readonly A[], S.ParseResult.ParseError, R>
     <R = never>(
       q: (initial: Query<Omit<PM, "_etag">>) => QAll<Omit<PM, "_etag">, T, R>
     ): Effect.Effect<readonly T[], never, R>
+    <A, R, From extends FieldValues>(
+      q: (initial: Query<Omit<PM, "_etag">>) => QueryProjection<Omit<PM, "_etag"> extends From ? From : never, A, R>
+    ): Effect.Effect<readonly A[], S.ParseResult.ParseError, R>
 
+    <R = never>(q: QAll<Omit<PM, "_etag">, T, R>): Effect.Effect<readonly T[], never, R>
     <A, R, From extends FieldValues>(
       q: QueryProjection<Omit<PM, "_etag"> extends From ? From : never, A, R>
     ): Effect.Effect<readonly A[], S.ParseResult.ParseError, R>
-    <R = never>(q: QAll<Omit<PM, "_etag">, T, R>): Effect.Effect<readonly T[], never, R>
   }
 }
 
@@ -1052,13 +1055,13 @@ export interface RepoFunctions<T extends { id: unknown }, PM extends { id: strin
   byIdAndSaveWithPure: {
     <R, A, E, S2 extends T>(
       id: T["id"],
-      pure: Effect<A, E, FixEnv<R, never, T, S2>>
+      pure: Effect<A, E, FixEnv<R, Evt, T, S2>>
     ): Effect<
       A,
       InvalidStateError | OptimisticConcurrencyException | E | NotFoundError<ItemType>,
       | Service
       | Exclude<R, {
-        env: PureEnv<never, T, S2>
+        env: PureEnv<Evt, T, S2>
       }>
     >
   }
@@ -1105,17 +1108,17 @@ export interface RepoFunctions<T extends { id: unknown }, PM extends { id: strin
   }
 
   readonly q2: {
-    <A, R, From extends FieldValues>(
-      q: (initial: Query<Omit<PM, "_etag">>) => QueryProjection<Omit<PM, "_etag"> extends From ? From : never, A, R>
-    ): Effect.Effect<readonly A[], S.ParseResult.ParseError, Service | R>
     <R = never>(
       q: (initial: Query<Omit<PM, "_etag">>) => QAll<Omit<PM, "_etag">, T, R>
     ): Effect.Effect<readonly T[], never, Service | R>
+    <A, R, From extends FieldValues>(
+      q: (initial: Query<Omit<PM, "_etag">>) => QueryProjection<Omit<PM, "_etag"> extends From ? From : never, A, R>
+    ): Effect.Effect<readonly A[], S.ParseResult.ParseError, Service | R>
 
+    <R = never>(q: QAll<Omit<PM, "_etag">, T, R>): Effect.Effect<readonly T[], never, Service | R>
     <A, R, From extends FieldValues>(
       q: QueryProjection<Omit<PM, "_etag"> extends From ? From : never, A, R>
     ): Effect.Effect<readonly A[], S.ParseResult.ParseError, Service | R>
-    <R = never>(q: QAll<Omit<PM, "_etag">, T, R>): Effect.Effect<readonly T[], never, Service | R>
   }
 }