@effect-app/infra 0.201.2 → 0.201.4

package/dist/services/RepositoryBase.js

@@ -69,6 +69,7 @@ export class RepositoryBaseC3 extends RepositoryBaseC2 {
     }
     save = (...items) => this.saveAndPublish(items);
     saveWithEvents = (events) => (...items) => this.saveAndPublish(items, events);
+    // TODO: Merge q2AndSave and SaveOne via `.one` ?
     q2AndSaveOnePure = (q, pure) => this.q2(flow(q, page({ take: 1 }))).pipe(Effect.map(ReadonlyArray.toNonEmptyArray), Effect.flatMap(Effect.mapError(() => new NotFoundError({ type: this.itemType, id: q }))), Effect.andThen((_) => saveWithPure_(this, _[0], pure)));
     q2AndSavePure = (q, pure, batchSize) => this.q2(flow(q, page({ take: 1 }))).pipe(Effect.andThen((_) => batchSize === undefined
         ? saveManyWithPure_(this, _, pure)
@@ -261,11 +262,14 @@ export function makeRepo() {
                         yield* $(changeFeed.publish([it, "remove"]));
                     });
                 }
-                const query = ((repo, q) => {
+                const query = ((q) => {
                     const a = Q2.toFilter(q);
-                    return Effect.flatMap(repo.utils.filter(a), (_) => Unify.unify(a.schema
-                        ? repo.utils.parseMany2(_, a.schema)
-                        : repo.utils.parseMany(_)));
+                    const eff = Effect.flatMap(r.utils.filter(a), (_) => Unify.unify(a.schema
+                        ? r.utils.parseMany2(_, a.schema)
+                        : r.utils.parseMany(_)));
+                    return a.ttype === "one"
+                        ? Effect.andThen(eff, flow(toNonEmptyArray, Effect.mapError(() => new NotFoundError({ id: "query", /* TODO */ type: name })), Effect.map((_) => _[0])))
+                        : eff;
                 });
                 const r = {
                     /**
@@ -310,7 +314,7 @@ export function makeRepo() {
                     all,
                     saveAndPublish,
                     removeAndPublish,
-                    q2: (q) => query(r, typeof q === "function" ? q(makeQuery()) : q)
+                    q2: (q) => query(typeof q === "function" ? q(makeQuery()) : q)
                 };
                 return r;
             })
@@ -435,4 +439,4 @@ export const RepositoryDefaultImpl = () => {
         return assignTag()(Object.assign(Cls, makeRepoFunctions(Cls))); // impl is missing, but its marked protected
     };
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"RepositoryBase.js","sourceRoot":"","sources":["../../src/services/RepositoryBase.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"RepositoryBase.js","sourceRoot":"","sources":["../../src/services/RepositoryBase.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,0DAA0D;AAC1D,4DAA4D;AAC5D,uDAAuD;AACvD,iDAAiD;AACjD,oEAAoE;AACpE,OAAO,EACL,UAAU,EACV,mBAAmB,EACnB,GAAG,EACH,WAAW,EACX,cAAc,EAEd,oBAAoB,EACpB,iBAAiB,EACjB,wBAAwB,EACxB,aAAa,EACd,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAIvC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAEtD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAEnD,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAC/F,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAEzC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAE9C,OAAO,EAA0B,aAAa,EAAuC,MAAM,cAAc,CAAA;AAEzG,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAEpD,OAAO,KAAK,EAAE,MAAM,YAAY,CAAA;AAChC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAA;AACpE,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAA;AA+B/C;;GAEG;AACH,MAAM,OAAgB,eAAe;CAiDpC;AAED,MAAM,OAAgB,gBAKpB,SAAQ,eAAqC;IAE3B;IADlB,YACkB,QAAkB;QAElC,KAAK,EAAE,CAAA;QAFS,aAAQ,GAAR,QAAQ,CAAU;IAGpC,CAAC;CACF;AAED,MAAM,OAAO,gBAKX,SAAQ,gBAAsC;IAGzB;IAFrB,YACE,QAAkB,EACC,IAAsC;QAEzD,KAAK,CAAC,QAAQ,CAAC,CAAA;QAFI,SAAI,GAAJ,IAAI,CAAkC;QAGzD,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAA;QAC9C,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAA;QAClD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAA;QAC1B,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;QACxB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAA;QAC5B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAA;QACtC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAA;QAC9B,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAA;IACxB,CAAC;IACD,mDAAmD;IAC1C,cAAc,CAAA;IACd,gBAAgB,CAAA;IAChB,IAAI,CAAA;IACJ,GAAG,CAAA;IACH,KAAK,CAAA;IACL,UAAU,CAAA;IACV,MAAM,CAAA;IACN,EAAE,CAAA;CACZ;AAED,MAAM,KAAK,GAAG,CAAC,CAAC,YAAY,CAAC,IAAI,EAAO,CAAA;AAExC,MAAM,OAAO,gBAKX,SAAQ,gBAAsC;IAC9C,GAAG,CAAC,EAAW;QACb,OAAO,MAAM,CAAC,OAAO,CACnB,IAAI;aACD,IAAI,CAAC,EAAE,CAAC,EACX,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,aAAa,CAAW,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,CAC1F,CAAA;IACH,CAAC;IAEQ,GAAG,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;IAEhD,UAAU,CAAC,EAAW;QACpB,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACxE,CAAC;IAED,KAAK,CAAC,MAAmB;QACvB,OAAO,MAAM,CAAC,GAAG,CACf,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EACnD,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAChC,CAAA;IACH,CAAC;IAEQ,IAAI,GAAG,CAAC,GAAG,KAAuB,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;IAEjE,cAAc,GAAG,CAAC,MAAqB,EAAE,EAAE,CAAC,CAAC,GAAG,KAAuB,EAAE,EAAE,CAClF,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IAEpC,iDAAiD;IACxC,gBAAgB,GAAG,CAC1B,CAE2F,EAC3F,IAA2C,EAC3C,EAAE,CACF,IAAI,CAAC,EAAE,CAAI,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CACzC,MAAM,CAAC,GAAG,CAAC,aAAa,CAAC,eAAe,CAAC,EACzC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,aAAa,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EACxF,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CACvD,CAAA;IAEM,aAAa,GAAG,CACvB,CAE2F,EAC3F,IAAiE,EACjE,SAAkB,EAClB,EAAE,CACF,IAAI,CAAC,EAAE,CAAI,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CACzC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACnB,SAAS,KAAK,SAAS;QACrB,CAAC,CAAC,iBAAiB,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC;QAClC,CAAC,CAAC,wBAAwB,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,CACvD,CACF,CAAA;IAEH;;OAEG;IACM,yBAAyB,GAAG,CACnC,IAAqE,EACrE,EAAE,CACJ,CAAC,GAAQ,EAAE,GAAY,EAAE,EAAE,CAAC,mBAAmB,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;IAE7E,gBAAgB,GAAG,CAOjB,KAAmB,EACnB,IAAgE,EAChE,EAAE,CACF,oBAAoB,CAClB,IAAI,EACJ,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,KAAK,CAAC,CAAC,CAC1B,CAAA;IAEH,mBAAmB,GAWf,CAAC,EAAE,EAAE,IAAI,EAAO,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,CAAA;IAEpG,YAAY,CAOV,IAAQ,EACR,IAA0C;QAE1C,OAAO,oBAAoB,CACzB,IAAI,EACJ,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC;aAChB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,CAChE,CAAA;IACH,CAAC;IAqCD,yBAAyB;IACzB,aAAa,CAMX,GAUC;QAED,uDAAuD;QACvD,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAC/B,MAAM,CAAC,GAAG,CACR,IAAI;aACD,KAAK;aACL,MAAM,CAAC,CAAC,CAAC,EACZ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAmB,CAC/E,CAAC,CAAA;IACN,CAAC;IAoBD,yBAAyB;IACzB,OAAO,CAIL,GAMC;QAED,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;IACnD,CAAC;IAED,yBAAyB;IACzB,WAAW;IAKT,6DAA6D;IAC7D,GAAwG;QAExG,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAC/B,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;aAC/C,IAAI,CACH,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAC9C,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAqB,CAAC,CAC7F,CAAC,CAAA;IACR,CAAC;IAgBD,yBAAyB;IACzB,cAAc;IAKZ,6DAA6D;IAC7D,GAAyE;QAEzE,OAAO,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAC/B,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;aAC5E,IAAI,CACH,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAC9C,MAAM;aACH,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACb,eAAe,CACb,CAAC,CAAC,OAAO;YACP,CAAC,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,OAAO,CAAC;YACvC,CAAC,CAAC,CAAqB,CAC1B;aACE,IAAI,CACH,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,aAAa,CAAW,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,EACzF,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACxB,CACJ,CACJ,CAAC,CAAA;IACR,CAAC;IAED,yBAAyB;IACzB,WAAW;IACT,6DAA6D;IAC7D,GAA0F;QAE1F,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;IACjD,CAAC;IAED,yBAAyB;IACzB,KAAK,CACH,CAA4E;QAE5E,OAAO,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAa,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IACrG,CAAC;IAUD,yBAAyB;IACzB,QAAQ,CACN,GAA2D;QAE3D,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;IACpD,CAAC;IAmCD,kBAAkB;IAClB,yBAAyB,CACvB,GAAQ;QAER,OAAO,CAAC,IAAS,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAA;IACtG,CAAC;IAuBD,kBAAkB;IAClB,mBAAmB,CACjB,GAAyD;QAEzD,OAAO,IAAI,CAAC,yBAAyB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;IAC/D,CAAC;IACD,kBAAkB;IAClB,sBAAsB,CAKpB,GAAuG;QAEvG,OAAO,CAA0B,IAAiE,EAAE,EAAE,CACpG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAA;IACjF,CAAC;IACD,kBAAkB;IAClB,gBAAgB,CAGd,GAAyF;QAEzF,OAAO,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;IAC5D,CAAC;IAED,yBAAyB;IACzB,6BAA6B;IAK3B,6DAA6D;IAC7D,GAAuG,EACvG,SAAS,GAAG,GAAG;QAEf,OAAO,CAA0B,IAAiE,EAAE,EAAE,CACpG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAA;IACnG,CAAC;IAED,yBAAyB;IACzB,uBAAuB;IAGrB,6DAA6D;IAC7D,GAAyF,EACzF,SAAS,GAAG,GAAG;QAEf,OAAO,IAAI,CAAC,6BAA6B,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,CAAA;IAC9E,CAAC;IAED,yBAAyB;IACzB,uBAAuB,CAOrB,KAAmB,EACnB,IAAgE,EAChE,SAAS,GAAG,GAAG;QAEf,OAAO,MAAM,CAAC,OAAO,CACnB,aAAa,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,EACtC,CAAC,KAAK,EAAE,EAAE,CACR,oBAAoB,CAClB,IAAI,EACJ,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CACrB,CACJ,CAAA;IACH,CAAC;CACF;AAGD;;GAEG;AACH,MAAM,UAAU,QAAQ;IAItB,OAAO,CAML,IAAc,EACd,MAA4B,EAC5B,OAAwC,EACxC,KAAgD,EAChD,EAAE;QACF,MAAM,KAAK,GAAG,SAAS,EAAM,CAAA;QAE7B,SAAS,qBAAqB,CAC5B,CAAO,EACP,OAA2C;YAE3C,OAAO,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QAChC,CAAC;QAED,SAAS,UAAU,CACjB,EAAE,KAAK,EAAE,GAAG,CAAC,EAAM,EACnB,OAAuD;YAEvD,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;YACpB,OAAO,OAAO,CAAC,CAAC,CAAC,CAAA;QACnB,CAAC;QAED,MAAM,OAAO,GAAG,SAAS,EAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;QAEpD,SAAS,IAAI,CACX,IAYG;YAEH,OAAO,MAAM;iBACV,GAAG,CAAC,QAAQ,CAAC,EAAC,CAAC;gBACd,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,EAAK,CAAC,CAAA;gBAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;gBAC3D,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;gBAE3D,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;gBAC9D,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAA;gBAC7C,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;oBACtC,GAAG,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;oBAC3C,GAAG,EAAE,CAAC,EAAU,EAAE,IAAwB,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC;iBAC5E,CAAC,CAAC,CAAA;gBAEH,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,EAAM,CAAC,CAAA;gBAC7C,MAAM,GAAG,GAAG,eAAe,IAAI,IAAI;oBACjC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;oBAClD,CAAC,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAA;gBACrB,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,EAA4B,CAAC,CAAA;gBAEzE,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CACnD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAC,CAAC;oBACpB,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;oBAC7B,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAA;gBAC7C,CAAC,CAAC,CACH,CAAC,CAAA;gBAEF,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CACxB,IAAI,EACJ,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAC1G,CAAA;gBAED,MAAM,YAAY,GAAG,MAA8C,CAAA;gBACnE,MAAM,CAAC,GAAG,CAAC,QAAQ,IAAI,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAChF,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,OAAO;oBACpB,6EAA6E;oBAC7E,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAChC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAgC;yBACxE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CACtB,CAAC;oBACF,CAAC,CAAC,CAAC;yBACE,GAAG;yBACH,IAAI,KAAK,WAAW;wBACzB,CAAC,CAAE,CAAC;6BACD,IAAI,CACH,CAAC;6BACE,GAAG;6BACH,IAAI,CACuB;6BAC/B,IAAI,CAAC,CAAC;6BACJ,IAAI,CAAC,IAAI,CAAC,CAAC;wBAChB,CAAC,CAAC,CAAC;6BACA,IAAI,CAAC,CAAC;6BACJ,IAAI,CAAC,IAAI,CAAC,CAAC,CACnB,CAAA;gBACD,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAA;gBACxD,SAAS,OAAO,CAAC,EAAc;oBAC7B,OAAO,MAAM,CAAC,OAAO,CACnB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EACd,CAAC,IAAI,EAAE,EAAE,CACP,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAC,CAAC;wBACpB,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;wBAC7B,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAA;oBACzD,CAAC,CAAC,CACL,CAAA;gBACH,CAAC;gBACD,SAAS,KAAK,CAAC,EAAW;oBACxB,OAAO,IAAI,CACT,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,EAChB,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EACvB,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CACxB,CAAA;gBACH,CAAC;gBAED,SAAS,IAAI,CAAC,EAAW;oBACvB,OAAO,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;gBACxE,CAAC;gBAED,MAAM,QAAQ,GAAG,CAAC,CAAiB,EAAE,EAAE,CACrC,MAAM;qBACH,aAAa,CACZ,MAAM;qBACH,IAAI,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EACtC,CAAC,CAAC,EAAE,EAAE,CACJ,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAC,CAAC;oBACpB,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;oBAClC,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAA;oBACzD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAA;oBAC3C,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA;gBACxC,CAAC,CAAC,CACL;qBACA,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;gBAExB,MAAM,OAAO,GAAG,CAAC,CAAc,EAAE,EAAE,CACjC,MAAM;qBACH,OAAO,CACN,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EACb,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAChB,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAC3C;qBACA,IAAI,CACH,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CACzB,CAAA;gBAEL,MAAM,cAAc,GAAG,CAAC,KAAkB,EAAE,SAAwB,EAAE,EAAE,EAAE;oBACxE,MAAM,EAAE,GAAG,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,CAAA;oBACpC,OAAO,OAAO,CAAC,EAAE,CAAC;yBACf,IAAI,CACH,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;oBAC/D,mHAAmH;oBACnH,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,EAAE,GAAG,CAAC,EACnC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,EAC/D,MAAM,CAAC,MAAM,CACd,CAAA;gBACL,CAAC,CAAA;gBAED,SAAS,gBAAgB,CAAC,CAAc,EAAE,SAAwB,EAAE;oBAClE,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAC,CAAC;wBAC3B,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;wBAClC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAA;wBACjB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CACpB,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CACpG,CAAA;wBACD,mFAAmF;wBACnF,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;4BACtB,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAA;4BACrD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,CAAA;wBACtB,CAAC;wBACD,KAAK,CAAC,CAAC,CAAC,CACN,MAAM;6BACH,IAAI,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;4BACzC,mHAAmH;6BAClH,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAC7C,CAAA;wBAED,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAA;oBAC9C,CAAC,CAAC,CAAA;gBACJ,CAAC;gBAED,MAAM,KAAK,GAcP,CAAC,CAGH,CAAiB,EAAE,EAAE;oBACrB,MAAM,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAA;oBACxB,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CACxB,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EACjB,CAAC,CAAC,EAAE,EAAE,CACJ,KAAK,CAAC,KAAK,CACT,CAAC,CAAC,MAAM;wBACN,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,MAAa,CAAC;wBACxC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CACzB,CACJ,CAAA;oBACD,OAAO,CAAC,CAAC,KAAK,KAAK,KAAK;wBACtB,CAAC,CAAC,MAAM,CAAC,OAAO,CACd,GAAG,EACH,IAAI,CACF,eAAe,EACf,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,aAAa,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,EAChF,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACxB,CACF;wBACD,CAAC,CAAC,GAAG,CAAA;gBACT,CAAC,CAAQ,CAAA;gBAET,MAAM,CAAC,GAAqC;oBAC1C;;uBAEG;oBACH,KAAK,EAAE;wBACL,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CACnB,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CACzB,MAAM;6BACH,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;6BAChG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;wBAC1B,UAAU,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAC5B,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,EAAE,CACzB,MAAM;6BACH,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAQ,CAAC,EAAE;4BACrE,WAAW,EAAE,SAAS;4BACtB,QAAQ,EAAE,IAAI;yBACf,CAAC;6BACD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;wBAC1B,MAAM,EAAE,CAAgC,IAAuB,EAAE,EAAE,CACjE,KAAK;6BACF,MAAM,CAAC,IAAI,CAAC;6BACZ,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACzB,IAAI,CAAC,MAAM;4BACT,CAAC,CAAC,MAAM,CAAC,IAAI;4BACb,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAE,CAAQ,CAAC,EAAE,EAAG,CAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAC3F,CAAC;wBACN,GAAG,EAAE,MAAM,CAAC,GAAG,CACb,KAAK,CAAC,GAAG,EACT,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAClF;qBACF;oBACD,MAAM,EAAE,CAAO,MAA2B,EAAE,EAAE;wBAC5C,+BAA+B;wBAC/B,MAAM,GAAG,GAAG,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;wBAC5B,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;wBACzC,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;wBACzC,OAAO;4BACL,GAAG,EAAE,GAAG;iCACL,IAAI,CACH,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAC3F,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EACvB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAU,CAAC,CAC9B;4BACH,IAAI,EAAE,CAAC,EAAY,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,GAAG,CAAC;4BACrD,KAAK,EAAE,CAAC,CAAM,EAAE,EAAE,CAChB,CAAC;iCACE,KAAK;iCACL,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;iCACrB,IAAI,CACH,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EACvB,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAU,CAAC,CAC9B;4BACL,IAAI,EAAE,CAAC,GAAG,GAAU,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;yBAC1E,CAAA;oBACH,CAAC;oBACD,UAAU;oBACV,QAAQ,EAAE,IAAI;oBACd,IAAI;oBACJ,GAAG;oBACH,cAAc;oBACd,gBAAgB;oBAChB,EAAE,EAAE,CAAC,CAAM,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAQ;iBAC3E,CAAA;gBACD,OAAO,CAAC,CAAA;YACV,CAAC,CAAC;iBACD,IAAI,CAAC,MAAM;gBACV,qGAAqG;iBACpG,WAAW,CAAC,mBAAmB,GAAG,IAAI,CAAC,CAAC,CAAA;QAC/C,CAAC;QAED,OAAO;YACL,IAAI;YACJ,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,CAAC,CAAC,YAAY,CAAC,IAAI,EAAM;YAChC,EAAE,EAAE,EAAE,CAAC,IAAI,EAAqB;SACjC,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,UAAU,CAMxB,IAAsC,EACtC,EAAW;IAEX,OAAO,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AAC9E,CAAC;AAED,MAAM,UAAU,SAAS;IACvB,MAAM,EAAE,GAAG,WAAW,EAAM,CAAA;IAG5B,SAAS,WAAW,CAAC,MAAsC;QACzD,OAAO,MAAM,CAAC,EAAE,CAAC,CAAA;IACnB,CAAC;IAED,SAAS,KAAK,CACZ,SAEyC,EACzC,IAAmB;QAEnB,OAAO,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE;YACvB,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YACvC,OAAO,CAAC;gBACN,IAAI;gBACJ,KAAK,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAmC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAiC;aACtG,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAED,MAAM,SAAS,GAAG,CAAC,CAAS,EAAE,EAAE,CAC9B,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;IACb,CAAC,CAAC,CAAC,GAAG,IAAI;IACV,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;QACjB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,KAAK;QACtC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAA;AAEb,MAAM,UAAU,SAAS;IAGvB,OAAO,CAML,IAAc,EACd,MAAyB,EACzB,KAA6C,EAC7C,EAAE;QACF,SAAS,UAAU;YACjB,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,SAAS,CAAA;YAC/B,OAAO,CAAC,CAAI,EAAE,EAAE,CACd,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CACtB,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CACrD,CAAA;QACL,CAAC;QAED,SAAS,qBAAqB,CAC5B,CAAI,EACJ,OAA2C;YAE3C,OAAO,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QAChC,CAAC;QAED,SAAS,SAAS,CAChB,WAAsD,EACtD,MAEC;YAED,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAC,CAAC;gBAC3B,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAA;gBAErC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CACpB,IAAI,CACF,SAAS,CAAC,IAAI,CAAC,EACf,WAAW;oBACT,CAAC,CAAC,WAAW;yBACV,IAAI,CACH,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,EAC5C,MAAM,CAAC,QAAQ,CAAC,2CAA2C,EAAE;wBAC3D,UAAU,EAAE,EAAE,uBAAuB,EAAE,IAAI,EAAE;qBAC9C,CAAC,CACH;oBACH,CAAC,CAAC,SAAS,EACb;oBACE,GAAG,MAAM;oBACT,cAAc,EAAE,MAAM,EAAE,cAAc;2BACjC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,+CAA+C;iBACxE,CACF,CACF,CAAA;gBACD,OAAO,KAAK,CAAA;YACd,CAAC,CAAC,CAAA;QACJ,CAAC;QAED,OAAO,SAAS,CAAA;IAClB,CAAC,CAAA;AACH,CAAC;AA4JD,MAAM,iBAAiB,GAAG,CAAC,GAAQ,EAAE,EAAE;IACrC,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAQ,CAAA;IACnD,MAAM,EACJ,mBAAmB,EACnB,IAAI,EACJ,GAAG,EACH,EAAE,EACF,gBAAgB,EAChB,aAAa,EACb,KAAK,EACL,WAAW,EACX,gBAAgB,EAChB,UAAU,EACV,IAAI,EACJ,cAAc,EACf,GAAG,MAAM,CAAC,gBAAgB,CAAC,GAAG,CAAQ,CAAA;IAEvC,MAAM,MAAM,GAAG,CAAC,CAAM,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;IAE3D,OAAO;QACL,GAAG;QACH,mBAAmB;QACnB,IAAI;QACJ,UAAU;QACV,cAAc;QACd,gBAAgB;QAChB,IAAI;QACJ,GAAG;QACH,KAAK;QACL,WAAW;QACX,EAAE;QACF,MAAM;QACN,gBAAgB;QAChB,aAAa;KACd,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAY,EAAE;IAC9C,OAAO,GAGH,EAAE,CACN,CACE,QAAkB,EAClB,MAA4B,EAC5B,IAAyB,EAYjB,EAAE;QAEV,MAAM,MAAM,GAAG,QAAQ,EAAW,CAChC,QAAQ,EACR,MAAM,EACN,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAS,EAC9D,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAChC,CAAA;QACD,MAAe,GAAI,SAAQ,gBAAsC;YAC/D;gBACE,KAAK,CAAC,QAAQ,CAAC,CAAA;YACjB,CAAC;YACD,MAAM,CAAU,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;YAClC,MAAM,CAAU,QAAQ,GAAG,CAAC,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAQ,CAAA;YAErF,MAAM,CAAU,KAAK,GAAG,SAAS,EAAM,CAAA;YACvC,MAAM,CAAU,KAAK,GAAG,CAAC,CAAC,YAAY,CAAC,IAAI,EAAM,CAAA;YACjD,MAAM,CAAU,IAAI,GAAqC,SAAgB,CAAA;;QAG3E,OAAO,SAAS,EAAW,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAQ,CAAA;IAChF,CAAC,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAY,EAAE;IACjD,OAAO,GAGH,EAAE,CACN,CACE,QAAkB,EAClB,MAA4B,EAC5B,IAAyB,EAcjB,EAAE;QAEV,MAAM,MAAM,GAAG,QAAQ,EAAW,CAChC,QAAQ,EACR,MAAM,EACN,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAS,EAC9D,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAChC,CAAA;QACD,MAAe,GAAI,SAAQ,gBAAsC;YAC/D,YACE,IAAsC;gBAEtC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;YACvB,CAAC;YACD,MAAM,CAAU,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;YAClC,MAAM,CAAU,QAAQ,GAAG,CAAC,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAQ,CAAA;YAErF,MAAM,CAAU,KAAK,GAAG,SAAS,EAAM,CAAA;YACvC,MAAM,CAAU,KAAK,GAAG,CAAC,CAAC,YAAY,CAAC,IAAI,EAAM,CAAA;YAEjD,MAAM,CAAU,IAAI,GAAqC,SAAgB,CAAA;;QAE3E,OAAO,SAAS,EAAW,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAQ,CAAA,CAAC,4CAA4C;IAC7H,CAAC,CAAA;AACH,CAAC,CAAA"}

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

@@ -3,22 +3,23 @@ import type { FieldPath, FieldPathValue } from "@effect-app/infra/filter/types/p
 import type { Ops } from "@effect-app/infra/services/Store/filterApi/proxy";
 import type { S } from "effect-app";
 import type { Covariant } from "effect/Types";
-export type QAll<TFieldValues extends FieldValues, A = TFieldValues, R = never> = Query<TFieldValues> | QueryWhere<TFieldValues> | QueryEnd<TFieldValues> | QueryProjection<TFieldValues, A, R>;
+export type QAll<TFieldValues extends FieldValues, A = TFieldValues, R = never, TType extends "one" | "many" = "many"> = Query<TFieldValues> | QueryWhere<TFieldValues> | QueryEnd<TFieldValues, TType> | QueryProjection<TFieldValues, A, R>;
 export declare const QId: unique symbol;
 export type QId = typeof QId;
-export interface QueryTogether<out TFieldValues extends FieldValues, out T extends "initial" | "where" | "end" | "projection" = "initial", out A = TFieldValues, out R = never> {
+export interface QueryTogether<out TFieldValues extends FieldValues, out T extends "initial" | "where" | "end" | "projection" = "initial", out A = TFieldValues, out R = never, out TType extends "many" | "one" = "many"> {
     readonly [QId]: {
         readonly _TFieldValues: Covariant<TFieldValues>;
         readonly _T: Covariant<T>;
         readonly _A: Covariant<A>;
         readonly _R: Covariant<R>;
+        readonly _TT: Covariant<TType>;
     };
 }
 export type Query<TFieldValues extends FieldValues> = QueryTogether<TFieldValues, "initial">;
 export type QueryWhere<TFieldValues extends FieldValues> = QueryTogether<TFieldValues, "where">;
-export type QueryEnd<TFieldValues extends FieldValues> = QueryTogether<TFieldValues, "end">;
-export type QueryProjection<TFieldValues extends FieldValues, A = TFieldValues, R = never> = QueryTogether<TFieldValues, "projection", A, R>;
-export type Q<TFieldValues extends FieldValues> = Initial<TFieldValues> | Where<TFieldValues> | And<TFieldValues> | Or<TFieldValues> | Order<TFieldValues, any> | Page<TFieldValues> | Project<any, TFieldValues, any>;
+export type QueryEnd<TFieldValues extends FieldValues, TType extends "many" | "one" = "many"> = QueryTogether<TFieldValues, "end", TFieldValues, never, TType>;
+export type QueryProjection<TFieldValues extends FieldValues, A = TFieldValues, R = never, TType extends "many" | "one" = "many"> = QueryTogether<TFieldValues, "projection", A, R, TType>;
+export type Q<TFieldValues extends FieldValues> = Initial<TFieldValues> | Where<TFieldValues> | And<TFieldValues> | Or<TFieldValues> | Order<TFieldValues, any> | Page<TFieldValues> | Project<any, TFieldValues, any> | One<TFieldValues>;
 declare const Initial_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => Readonly<A> & {
     readonly _tag: "value";
 };
@@ -65,6 +66,14 @@ export declare class Page<TFieldValues extends FieldValues> extends Page_base<{
 }> implements QueryEnd<TFieldValues> {
     readonly [QId]: any;
 }
+declare const One_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => Readonly<A> & {
+    readonly _tag: "one";
+};
+export declare class One<TFieldValues extends FieldValues> extends One_base<{
+    current: Query<TFieldValues> | QueryWhere<TFieldValues> | QueryEnd<TFieldValues>;
+}> implements QueryEnd<TFieldValues, "many"> {
+    readonly [QId]: any;
+}
 declare const Order_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => Readonly<A> & {
     readonly _tag: "order";
 };
@@ -78,8 +87,8 @@ export declare class Order<TFieldValues extends FieldValues, TFieldName extends
 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>;
+export declare class Project<A, TFieldValues extends FieldValues, R, TType extends "one" | "many" = "many"> extends Project_base<{
+    current: Query<TFieldValues> | QueryWhere<TFieldValues> | QueryEnd<TFieldValues, TType>;
     schema: S.Schema<A, TFieldValues, R>;
 }> implements QueryProjection<TFieldValues, A, R> {
     readonly [QId]: any;
@@ -93,7 +102,8 @@ export declare const page: <TFieldValues extends FieldValues>(page: {
     skip?: number;
     take?: number;
 }) => (current: Query<TFieldValues> | QueryWhere<TFieldValues> | QueryEnd<TFieldValues>) => QueryEnd<TFieldValues>;
-export declare const project: <TFieldValues extends FieldValues, A = FieldValues, R = never>(schema: S.Schema<A, TFieldValues, R>) => (current: Query<TFieldValues> | QueryWhere<TFieldValues> | QueryEnd<TFieldValues>) => QueryProjection<TFieldValues, A, R>;
+export declare const one: <TFieldValues extends FieldValues>(current: Query<TFieldValues> | QueryWhere<TFieldValues> | QueryEnd<TFieldValues>) => QueryEnd<TFieldValues, "one">;
+export declare const project: <TFieldValues extends FieldValues, A = FieldValues, R = never, TType extends "one" | "many" = "many">(schema: S.Schema<A, TFieldValues, R>) => (current: Query<TFieldValues> | QueryWhere<TFieldValues> | QueryEnd<TFieldValues, TType>) => QueryProjection<TFieldValues, A, R, TType>;
 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>;

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/dist/services/query/dsl.js

@@ -18,6 +18,9 @@ export class Or extends Data.TaggedClass("or") {
 export class Page extends Data.TaggedClass("page") {
     [QId];
 }
+export class One extends Data.TaggedClass("one") {
+    [QId];
+}
 export class Order extends Data.TaggedClass("order") {
     [QId];
 }
@@ -34,5 +37,15 @@ export const page = ({ skip, take }) => (current) => new Page({
     take,
     skip
 });
-export const project = (schema) => (current) => new Project({ current, schema });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZHNsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZpY2VzL3F1ZXJ5L2RzbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFPQSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBU2pDLE1BQU0sQ0FBQyxNQUFNLEdBQUcsR0FBRyxNQUFNLEVBQUUsQ0FBQTtBQXNDM0IsTUFBTSxPQUFPLE9BQTBDLFNBQVEsSUFBSSxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQXVCO0lBR25HLENBQUMsR0FBRyxDQUFDLENBQU07SUFDcEI7UUFDRSxLQUFLLENBQUMsRUFBRSxLQUFLLEVBQUUsU0FBa0IsRUFBRSxDQUFDLENBQUE7SUFDdEMsQ0FBQztDQUNGO0FBRUQsTUFBTSxPQUFPLEtBQXdDLFNBQVEsSUFBSSxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBR25GO0lBQ1MsQ0FBQyxHQUFHLENBQUMsQ0FBTTtDQUNyQjtBQUVELE1BQU0sT0FBTyxHQUFzQyxTQUFRLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUcvRTtJQUNTLENBQUMsR0FBRyxDQUFDLENBQU07Q0FDckI7QUFFRCxNQUFNLE9BQU8sRUFBcUMsU0FBUSxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FHN0U7SUFDUyxDQUFDLEdBQUcsQ0FBQyxDQUFNO0NBQ3JCO0FBRUQsTUFBTSxPQUFPLElBQXVDLFNBQVEsSUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBSWpGO0lBQ1MsQ0FBQyxHQUFHLENBQUMsQ0FBTTtDQUNyQjtBQUVELE1BQU0sT0FBTyxLQUNYLFNBQVEsSUFBSSxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBSTlCO0lBR08sQ0FBQyxHQUFHLENBQUMsQ0FBTTtDQUNyQjtBQUVELE1BQU0sT0FBTyxPQUFnRCxTQUFRLElBQUksQ0FBQyxXQUFXLENBQUMsU0FBUyxDQUc3RjtJQUNTLENBQUMsR0FBRyxDQUFDLENBQU07Q0FDckI7QUFFRCxNQUFNLENBQUMsTUFBTSxJQUFJLEdBQWdFLEdBQUcsRUFBRSxDQUFDLElBQUksT0FBTyxFQUFFLENBQUE7QUFFcEcsTUFBTSxDQUFDLE1BQU0sS0FBSyxHQUFnQixDQUFDLEdBQUcsU0FBZ0IsRUFBRSxFQUFFLENBQUMsQ0FBQyxPQUFZLEVBQUUsRUFBRSxDQUFDLElBQUksS0FBSyxDQUFDLEVBQUUsT0FBTyxFQUFFLFNBQVMsRUFBUyxDQUFDLENBQUE7QUFFckgsTUFBTSxDQUFDLE1BQU0sR0FBRyxHQUF1QixDQUFDLEdBQUcsU0FBZ0IsRUFBRSxFQUFFLENBQUMsQ0FBQyxPQUFZLEVBQUUsRUFBRSxDQUMvRSxJQUFJLEdBQUcsQ0FBQyxFQUFFLE9BQU8sRUFBRSxTQUFTLEVBQUUsT0FBTyxTQUFTLENBQUMsQ0FBQyxDQUFDLEtBQUssVUFBVSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsRUFBUyxDQUFDLENBQUE7QUFFdkcsTUFBTSxDQUFDLE1BQU0sRUFBRSxHQUF1QixDQUFDLEdBQUcsU0FBZ0IsRUFBRSxFQUFFLENBQUMsQ0FBQyxPQUFZLEVBQUUsRUFBRSxDQUM5RSxJQUFJLEVBQUUsQ0FBQyxFQUFFLE9BQU8sRUFBRSxTQUFTLEVBQUUsT0FBTyxTQUFTLENBQUMsQ0FBQyxDQUFDLEtBQUssVUFBVSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsRUFBUyxDQUFDLENBQUE7QUFFdEcsTUFBTSxDQUFDLE1BQU0sS0FBSyxHQUloQixDQUFDLEtBQUssRUFBRSxTQUFTLEdBQUcsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsSUFBSSxLQUFLLENBQUMsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUE7QUFFckYsTUFBTSxDQUFDLE1BQU0sSUFBSSxHQUdmLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FDOUIsSUFBSSxJQUFJLENBQUM7SUFDUCxPQUFPO0lBQ1AsSUFBSTtJQUNKLElBQUk7Q0FDTCxDQUFDLENBQUE7QUFFTixNQUFNLENBQUMsTUFBTSxPQUFPLEdBSXVCLENBQUMsTUFBTSxFQUFFLEVBQUUsQ0FBQyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsSUFBSSxPQUFPLENBQUMsRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLENBQUMsQ0FBQSJ9
+export const one = (current) => new One({
+    current
+});
+/*
+.andThen(flow(
+        toNonEmptyArray,
+        Effect.mapError(() => new NotFoundError<"User">({ id: auth0Id, type: "User" })),
+        Effect.map((_) => _[0])
+      ))
+*/
+export const project = (schema) => (current) => new Project({ current: current, /* TODO: why */ schema });
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZHNsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL3NlcnZpY2VzL3F1ZXJ5L2RzbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFPQSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBU2pDLE1BQU0sQ0FBQyxNQUFNLEdBQUcsR0FBRyxNQUFNLEVBQUUsQ0FBQTtBQW9EM0IsTUFBTSxPQUFPLE9BQTBDLFNBQVEsSUFBSSxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQXVCO0lBR25HLENBQUMsR0FBRyxDQUFDLENBQU07SUFDcEI7UUFDRSxLQUFLLENBQUMsRUFBRSxLQUFLLEVBQUUsU0FBa0IsRUFBRSxDQUFDLENBQUE7SUFDdEMsQ0FBQztDQUNGO0FBRUQsTUFBTSxPQUFPLEtBQXdDLFNBQVEsSUFBSSxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBR25GO0lBQ1MsQ0FBQyxHQUFHLENBQUMsQ0FBTTtDQUNyQjtBQUVELE1BQU0sT0FBTyxHQUFzQyxTQUFRLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUcvRTtJQUNTLENBQUMsR0FBRyxDQUFDLENBQU07Q0FDckI7QUFFRCxNQUFNLE9BQU8sRUFBcUMsU0FBUSxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FHN0U7SUFDUyxDQUFDLEdBQUcsQ0FBQyxDQUFNO0NBQ3JCO0FBRUQsTUFBTSxPQUFPLElBQXVDLFNBQVEsSUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBSWpGO0lBQ1MsQ0FBQyxHQUFHLENBQUMsQ0FBTTtDQUNyQjtBQUVELE1BQU0sT0FBTyxHQUFzQyxTQUFRLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUUvRTtJQUNTLENBQUMsR0FBRyxDQUFDLENBQU07Q0FDckI7QUFFRCxNQUFNLE9BQU8sS0FDWCxTQUFRLElBQUksQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUk5QjtJQUdPLENBQUMsR0FBRyxDQUFDLENBQU07Q0FDckI7QUFFRCxNQUFNLE9BQU8sT0FDWCxTQUFRLElBQUksQ0FBQyxXQUFXLENBQUMsU0FBUyxDQUdoQztJQUdPLENBQUMsR0FBRyxDQUFDLENBQU07Q0FDckI7QUFFRCxNQUFNLENBQUMsTUFBTSxJQUFJLEdBQWdFLEdBQUcsRUFBRSxDQUFDLElBQUksT0FBTyxFQUFFLENBQUE7QUFFcEcsTUFBTSxDQUFDLE1BQU0sS0FBSyxHQUFnQixDQUFDLEdBQUcsU0FBZ0IsRUFBRSxFQUFFLENBQUMsQ0FBQyxPQUFZLEVBQUUsRUFBRSxDQUFDLElBQUksS0FBSyxDQUFDLEVBQUUsT0FBTyxFQUFFLFNBQVMsRUFBUyxDQUFDLENBQUE7QUFFckgsTUFBTSxDQUFDLE1BQU0sR0FBRyxHQUF1QixDQUFDLEdBQUcsU0FBZ0IsRUFBRSxFQUFFLENBQUMsQ0FBQyxPQUFZLEVBQUUsRUFBRSxDQUMvRSxJQUFJLEdBQUcsQ0FBQyxFQUFFLE9BQU8sRUFBRSxTQUFTLEVBQUUsT0FBTyxTQUFTLENBQUMsQ0FBQyxDQUFDLEtBQUssVUFBVSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsRUFBUyxDQUFDLENBQUE7QUFFdkcsTUFBTSxDQUFDLE1BQU0sRUFBRSxHQUF1QixDQUFDLEdBQUcsU0FBZ0IsRUFBRSxFQUFFLENBQUMsQ0FBQyxPQUFZLEVBQUUsRUFBRSxDQUM5RSxJQUFJLEVBQUUsQ0FBQyxFQUFFLE9BQU8sRUFBRSxTQUFTLEVBQUUsT0FBTyxTQUFTLENBQUMsQ0FBQyxDQUFDLEtBQUssVUFBVSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsRUFBUyxDQUFDLENBQUE7QUFFdEcsTUFBTSxDQUFDLE1BQU0sS0FBSyxHQUloQixDQUFDLEtBQUssRUFBRSxTQUFTLEdBQUcsS0FBSyxFQUFFLEVBQUUsQ0FBQyxDQUFDLE9BQU8sRUFBRSxFQUFFLENBQUMsSUFBSSxLQUFLLENBQUMsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUE7QUFFckYsTUFBTSxDQUFDLE1BQU0sSUFBSSxHQUdmLENBQUMsRUFBRSxJQUFJLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FDOUIsSUFBSSxJQUFJLENBQUM7SUFDUCxPQUFPO0lBQ1AsSUFBSTtJQUNKLElBQUk7Q0FDTCxDQUFDLENBQUE7QUFFTixNQUFNLENBQUMsTUFBTSxHQUFHLEdBRXFCLENBQUMsT0FBTyxFQUFFLEVBQUUsQ0FDL0MsSUFBSSxHQUFHLENBQUM7SUFDTixPQUFPO0NBQ1IsQ0FBQyxDQUFBO0FBQ0o7Ozs7OztFQU1FO0FBRUYsTUFBTSxDQUFDLE1BQU0sT0FBTyxHQVM4QixDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUN4RSxJQUFJLE9BQU8sQ0FBQyxFQUFFLE9BQU8sRUFBRSxPQUFjLEVBQUUsZUFBZSxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUEifQ==

package/dist/services/query/new-kid-interpreter.d.ts

@@ -14,6 +14,7 @@ export declare const toFilter: <TFieldValues extends FieldValues, A, R>(q: QAll<
         key: import("../../filter/types/path/eager.js").Path<TFieldValues>;
         direction: "ASC" | "DESC";
     }[]];
+    ttype: "one" | "many";
     filter: QueryBuilder<any>;
 };
 //# sourceMappingURL=new-kid-interpreter.d.ts.map

package/dist/services/query/new-kid-interpreter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"new-kid-interpreter.d.ts","sourceRoot":"","sources":["../../../src/services/query/new-kid-interpreter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAuB,CAAC,EAAE,MAAM,YAAY,CAAA;AAEnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAExD,OAAO,EAAgB,KAAK,IAAI,EAAE,MAAM,aAAa,CAAA;AACrD,OAAO,KAAK,EAAgB,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAqG7E,eAAO,MAAM,QAAQ;;;;;;;mBA9F+B,KAAK,GAAG,MAAM;;;mBAAd,KAAK,GAAG,MAAM;;;CA+HjE,CAAA"}
+{"version":3,"file":"new-kid-interpreter.d.ts","sourceRoot":"","sources":["../../../src/services/query/new-kid-interpreter.ts"],"names":[],"mappings":"AAGA,OAAO,EAAuB,CAAC,EAAE,MAAM,YAAY,CAAA;AAEnD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAExD,OAAO,EAAgB,KAAK,IAAI,EAAE,MAAM,aAAa,CAAA;AACrD,OAAO,KAAK,EAAgB,YAAY,EAAE,MAAM,6BAA6B,CAAA;AA4G7E,eAAO,MAAM,QAAQ;;;;;;;mBArG+B,KAAK,GAAG,MAAM;;;mBAAd,KAAK,GAAG,MAAM;;;;CAuIjE,CAAA"}

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

@@ -11,7 +11,8 @@ const interpret = (_) => {
         schema: undefined,
         limit: undefined,
         skip: undefined,
-        order: []
+        order: [],
+        ttype: undefined
     };
     const upd = (v) => {
         data.filter.push(...v.filter);
@@ -61,6 +62,11 @@ const interpret = (_) => {
                 });
             }
         },
+        one: ({ current }) => {
+            upd(interpret(current));
+            data.limit = 1;
+            data.ttype = "one";
+        },
         order: ({ current, direction, field }) => {
             upd(interpret(current));
             data.order.push({ key: field, direction });
@@ -97,6 +103,7 @@ export const toFilter = (q) => {
         select: Option.getOrUndefined(toNonEmptyArray(select)),
         schema,
         order: Option.getOrUndefined(toNonEmptyArray(a.order)),
+        ttype: a.ttype,
         filter: a.filter.length
             ? {
                 type: "new-kid",
@@ -105,4 +112,4 @@ export const toFilter = (q) => {
             : undefined
     });
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV3LWtpZC1pbnRlcnByZXRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9xdWVyeS9uZXcta2lkLWludGVycHJldGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHVEQUF1RDtBQUN2RCw0REFBNEQ7QUFDNUQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFBO0FBQ3hELE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDbkQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBR2pELE9BQU8sRUFBRSxJQUFJLEVBQXFCLE1BQU0sYUFBYSxDQUFBO0FBV3JELE1BQU0sU0FBUyxHQUFHLENBQWdFLENBQTJCLEVBQUUsRUFBRTtJQUMvRyxNQUFNLENBQUMsR0FBRyxDQUFvQixDQUFBO0lBRTlCLE1BQU0sSUFBSSxHQUFtQztRQUMzQyxNQUFNLEVBQUUsRUFBRTtRQUNWLE1BQU0sRUFBRSxTQUFTO1FBQ2pCLEtBQUssRUFBRSxTQUFTO1FBQ2hCLElBQUksRUFBRSxTQUFTO1FBQ2YsS0FBSyxFQUFFLEVBQUU7S0FDVixDQUFBO0lBRUQsTUFBTSxHQUFHLEdBQUcsQ0FDVixDQUFpQyxFQUNqQyxFQUFFO1FBQ0YsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUE7UUFDN0IsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDM0IsSUFBSSxDQUFDLEtBQUssR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFBO1FBQ3BCLElBQUksQ0FBQyxJQUFJLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQTtRQUNsQixJQUFJLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxNQUFNLENBQUE7SUFDeEIs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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmV3LWtpZC1pbnRlcnByZXRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9zZXJ2aWNlcy9xdWVyeS9uZXcta2lkLWludGVycHJldGVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHVEQUF1RDtBQUN2RCw0REFBNEQ7QUFDNUQsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLHdCQUF3QixDQUFBO0FBQ3hELE9BQU8sRUFBRSxLQUFLLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDLEVBQUUsTUFBTSxZQUFZLENBQUE7QUFDbkQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtCQUFrQixDQUFBO0FBR2pELE9BQU8sRUFBRSxJQUFJLEVBQXFCLE1BQU0sYUFBYSxDQUFBO0FBWXJELE1BQU0sU0FBUyxHQUFHLENBQWdFLENBQTJCLEVBQUUsRUFBRTtJQUMvRyxNQUFNLENBQUMsR0FBRyxDQUFvQixDQUFBO0lBRTlCLE1BQU0sSUFBSSxHQUFtQztRQUMzQyxNQUFNLEVBQUUsRUFBRTtRQUNWLE1BQU0sRUFBRSxTQUFTO1FBQ2pCLEtBQUssRUFBRSxTQUFTO1FBQ2hCLElBQUksRUFBRSxTQUFTO1FBQ2YsS0FBSyxFQUFFLEVBQUU7UUFDVCxLQUFLLEVBQUUsU0FBUztLQUNqQixDQUFBO0lBRUQsTUFBTSxHQUFHLEdBQUcsQ0FDVixDQUFpQyxFQUNqQyxFQUFFO1FBQ0YsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUE7UUFDN0IsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDM0IsSUFBSSxDQUFDLEtBQUssR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFBO1FBQ3BCLElBQUksQ0FBQyxJQUFJLEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQTtRQUNsQixJQUFJLENBQUMsTUFBTSxHQUFHLENBQUMs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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.201.2",
+  "version": "0.201.4",
   "license": "MIT",
   "type": "module",
   "dependencies": {
@@ -19,9 +19,9 @@
     "pure-rand": "6.0.4",
     "redlock": "^4.2.0",
     "@effect-app/core": "0.148.0",
+    "@effect-app/fluent-extensions": "0.141.0",
     "effect-app": "0.175.1",
     "@effect-app/infra-adapters": "0.135.1",
-    "@effect-app/fluent-extensions": "0.141.0",
     "@effect-app/schema": "0.200.0"
   },
   "devDependencies": {

package/src/services/Repository/dsl.ts

@@ -29,7 +29,7 @@ export type AllDSL<T, Evt> =
  */
 export interface AllDSLExt<T, Evt> {
   modify: <R, E, A, S1 extends T, S2 extends T>(
-    pure: (items: readonly  S1[], dsl: PureDSL<readonly S1[], readonly S2[], Evt>) => Effect<A, E, R>
+    pure: (items: readonly S1[], dsl: PureDSL<readonly S1[], readonly S2[], Evt>) => Effect<A, E, R>
   ) => Effect<A, E, FixEnv<R, Evt, readonly S1[], readonly S2[]>>
   update: <R, E, S1 extends T, S2 extends T>(
     pure: (items: readonly S1[], log: (...evt: Evt[]) => PureLogT<Evt>) => Effect<readonly S2[], E, R>

package/src/services/RepositoryBase.ts

@@ -103,17 +103,22 @@ export abstract class RepositoryBaseC<
   /** @deprecated use q2 */
   abstract readonly mapped: Mapped<PM, Omit<PM, "_etag">>
   abstract readonly q2: {
-    <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>
+    <A, R, From extends FieldValues, TType extends "one" | "many" = "many">(
+      q: (
+        initial: Query<Omit<PM, "_etag">>
+      ) => QueryProjection<Omit<PM, "_etag"> extends From ? From : never, A, R, TType>
+    ): Effect.Effect<
+      TType extends "many" ? readonly A[] : A,
+      (TType extends "many" ? never : NotFoundError<ItemType>) | S.ParseResult.ParseError,
+      R
+    >
+    <R = never, TType extends "one" | "many" = "many">(
+      q: (initial: Query<Omit<PM, "_etag">>) => QAll<Omit<PM, "_etag">, T, R, TType>
+    ): Effect.Effect<TType extends "many" ? readonly T[] : T, TType extends "many" ? never : NotFoundError<ItemType>, 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>
   }
 }
 
@@ -195,13 +200,14 @@ export class RepositoryBaseC3<
   readonly saveWithEvents = (events: Iterable<Evt>) => (...items: NonEmptyArray<T>) =>
     this.saveAndPublish(items, events)
 
+  // TODO: Merge q2AndSave and SaveOne via `.one` ?
   readonly q2AndSaveOnePure = <A, E2, R2, T2 extends T>(
     q: (
       q: Query<Omit<PM, "_etag">>
     ) => Query<Omit<PM, "_etag">> | QueryWhere<Omit<PM, "_etag">> | QueryEnd<Omit<PM, "_etag">>,
     pure: Effect<A, E2, FixEnv<R2, Evt, T, T2>>
   ) =>
-    this.q2(flow(q, page({ take: 1 }))).pipe(
+    this.q2<A>(flow(q, page({ take: 1 }))).pipe(
       Effect.map(ReadonlyArray.toNonEmptyArray),
       Effect.flatMap(Effect.mapError(() => new NotFoundError({ type: this.itemType, id: q }))),
       Effect.andThen((_) => saveWithPure_(this, _[0], pure))
@@ -214,7 +220,7 @@ export class RepositoryBaseC3<
     pure: Effect<A, E2, FixEnv<R2, Evt, readonly T[], readonly T2[]>>,
     batchSize?: number
   ) =>
-    this.q2(flow(q, page({ take: 1 }))).pipe(
+    this.q2<A>(flow(q, page({ take: 1 }))).pipe(
       Effect.andThen((_) =>
         batchSize === undefined
           ? saveManyWithPure_(this, _, pure)
@@ -792,46 +798,42 @@ export function makeRepo<
 
           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 A[], never, R>
           } = (<
-            T extends { id: unknown },
-            PM extends PersistenceModelType<string>,
-            Evt,
-            ItemType extends string,
             A,
             R
-          >(repo: Repository<T, PM, Evt, ItemType>, q: QAll<PM, A, R>) => {
+          >(q: QAll<PM, A, R>) => {
             const a = Q2.toFilter(q)
-            return Effect.flatMap(
-              repo.utils.filter(a),
+            const eff = Effect.flatMap(
+              r.utils.filter(a),
               (_) =>
                 Unify.unify(
                   a.schema
-                    ? repo.utils.parseMany2(_, a.schema as any)
-                    : repo.utils.parseMany(_)
+                    ? r.utils.parseMany2(_, a.schema as any)
+                    : r.utils.parseMany(_)
                 )
             )
+            return a.ttype === "one"
+              ? Effect.andThen(
+                eff,
+                flow(
+                  toNonEmptyArray,
+                  Effect.mapError(() => new NotFoundError({ id: "query", /* TODO */ type: name })),
+                  Effect.map((_) => _[0])
+                )
+              )
+              : eff
           }) as any
 
           const r: Repository<T, PM, Evt, ItemType> = {
@@ -895,7 +897,7 @@ export function makeRepo<
             all,
             saveAndPublish,
             removeAndPublish,
-            q2: (q: any) => query(r, typeof q === "function" ? q(makeQuery()) : q) as any
+            q2: (q: any) => query(typeof q === "function" ? q(makeQuery()) : q) as any
           }
           return r
         })
@@ -1157,17 +1159,26 @@ export interface RepoFunctions<T extends { id: unknown }, PM extends { id: strin
   }
 
   readonly q2: {
-    <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>
+    <A, R, From extends FieldValues, TType extends "one" | "many" = "many">(
+      q: (
+        initial: Query<Omit<PM, "_etag">>
+      ) => QueryProjection<Omit<PM, "_etag"> extends From ? From : never, A, R, TType>
+    ): Effect.Effect<
+      TType extends "many" ? readonly A[] : A,
+      (TType extends "many" ? never : NotFoundError<ItemType>) | S.ParseResult.ParseError,
+      Service | R
+    >
+    <R = never, TType extends "one" | "many" = "many">(
+      q: (initial: Query<Omit<PM, "_etag">>) => QAll<Omit<PM, "_etag">, T, R, TType>
+    ): Effect.Effect<
+      TType extends "many" ? readonly T[] : T,
+      TType extends "many" ? never : NotFoundError<ItemType>,
+      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>
   }
 }