@effect-app/infra 0.24.3 → 0.25.1

package/_cjs/services/Operations/service.cjs

@@ -24,7 +24,7 @@ const Operations = tsplus_module_1.Tag();
  */
 exports.Operations = Operations;
 function forkOperation_1(self) {
-  return tsplus_module_5.untraced(() => tsplus_module_4.serviceWithEffect(Operations, Operations => tsplus_module_4.flatMap(scope => tsplus_module_4.tap(() => tsplus_module_3.forkDaemonReportRequestUnexpected(tsplus_module_2.use(scope)(self)))(tsplus_module_2.extend(scope)(Operations.register)))(tsplus_module_2.make())));
+  return tsplus_module_5.untraced(() => tsplus_module_4.serviceWithEffect(Operations, Operations => tsplus_module_4.flatMap(tsplus_module_2.make(), scope => tsplus_module_4.tap(tsplus_module_2.extend(Operations.register, scope), () => tsplus_module_3.forkDaemonReportRequestUnexpected(tsplus_module_2.use(self, scope))))));
 }
 /**
  * @tsplus getter function forkOperation
@@ -36,12 +36,12 @@ function forkOperationFunction(fnc) {
  * @tsplus static effect/io/Effect.Ops forkOperation
  */
 function forkOperation2(self) {
-  return tsplus_module_5.untraced(restore => tsplus_module_4.serviceWithEffect(Operations, Operations => tsplus_module_4.flatMap(scope => tsplus_module_4.tap(id => tsplus_module_3.forkDaemonReportRequestUnexpected(tsplus_module_2.use(scope)(restore(self)(id))))(tsplus_module_2.extend(scope)(Operations.register)))(tsplus_module_2.make())));
+  return tsplus_module_5.untraced(restore => tsplus_module_4.serviceWithEffect(Operations, Operations => tsplus_module_4.flatMap(tsplus_module_2.make(), scope => tsplus_module_4.tap(tsplus_module_2.extend(Operations.register, scope), id => tsplus_module_3.forkDaemonReportRequestUnexpected(tsplus_module_2.use(restore(self)(id), scope))))));
 }
 /**
  * @tsplus static effect/io/Effect.Ops forkOperationWithEffect
  */
 function forkOperationWithEffect(self, fnc) {
-  return tsplus_module_5.untraced(restore => tsplus_module_4.serviceWithEffect(Operations, Operations => tsplus_module_4.flatMap(scope => tsplus_module_4.tap(opId => tsplus_module_2.extend(scope)(tsplus_module_4.forkScoped(tsplus_module_4.interruptible(restore(fnc)(opId)))))(tsplus_module_4.tap(opId => tsplus_module_3.forkDaemonReportRequestUnexpected(tsplus_module_2.use(scope)(restore(self)(opId))))(tsplus_module_2.extend(scope)(Operations.register))))(tsplus_module_2.make())));
+  return tsplus_module_5.untraced(restore => tsplus_module_4.serviceWithEffect(Operations, Operations => tsplus_module_4.flatMap(tsplus_module_2.make(), scope => tsplus_module_4.tap(tsplus_module_4.tap(tsplus_module_2.extend(Operations.register, scope), opId => tsplus_module_3.forkDaemonReportRequestUnexpected(tsplus_module_2.use(restore(self)(opId), scope))), opId => tsplus_module_2.extend(tsplus_module_4.forkScoped(tsplus_module_4.interruptible(restore(fnc)(opId))), scope)))));
 }
 //# sourceMappingURL=service.cjs.map

package/_cjs/services/Operations/service.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"service.cjs","mappings":";;;;;;;;;;;;;;;;MAoBgBA,aAAa;AAAA;AAlBtB,MAAMC,YAAY,GAAGC,MAAM,CAAC,cAAc,CAAC;AAAA;AAa3C,MAAMC,UAAU,GAAkBC,mBAAG,EAAc;AAE1D;;;AAAA;AAGA,yBAAuCC,IAAqB;EAC1D,OAAOC,yBAAe,MACpBC,4CAAU,EACRJ,UAAU,IACRI,wBACWC,KAAK,IACZD,oBACO,MAAKE,kDAACC,oBAASF,KAAK,EAAdH,IAAI,CAAW,CAAkC,EAD9DK,uBAA2BF,KAAK,EAAhCL,UAAU,CAACQ,QAAQ,CAAc,CAC8B,EAHnED,sBAAY,CAIT,CACN,CACF;AACH;AAEA;;;AAGM,SAAUE,qBAAqB,CAAeC,GAAkC;EACpF,OAAQC,GAAQ,IAAKR,yBAAe,MAAKS,gBAACF,GAAG,CAACC,GAAG,CAAC,CAAc,CAAC;AACnE;AAEA;;;AAGM,SAAUE,cAAc,CAAUX,IAA4C;EAClF,OAAOC,yBAAeW,OAAO,IAC3BV,4CAAU,EACRJ,UAAU,IACRI,wBACWC,KAAK,IACZD,oBACOW,EAAE,IAAGT,kDAACC,oBAAsBF,KAAK,EAA3BS,OAAO,CAACZ,IAAI,CAAC,CAACa,EAAE,CAAC,CAAW,CAAkC,EAD3ER,uBAA2BF,KAAK,EAAhCL,UAAU,CAACQ,QAAQ,CAAc,CAC2C,EAHhFD,sBAAY,CAIT,CACN,CACF;AACH;AAEA;;;AAGM,SAAUS,uBAAuB,CACrCd,IAA0C,EAC1CQ,GAA4C;EAE5C,OAAOP,yBAAeW,OAAO,IAC3BV,4CAAU,EACRJ,UAAU,IACRI,wBACWC,KAAK,IACZD,oBAEOa,IAAI,IAAIV,uBAAmDF,KAAK,2DAAxDS,OAAO,CAACJ,GAAG,CAAC,CAACO,IAAI,CAAC,GAAuC,EAFxEb,oBACOa,IAAI,IAAGX,kDAACC,oBAAwBF,KAAK,EAA7BS,OAAO,CAACZ,IAAI,CAAC,CAACe,IAAI,CAAC,CAAW,CAAkC,EAD/EV,uBAA2BF,KAAK,EAAhCL,UAAU,CAACQ,QAAQ,CAAc,CAC+C,CACP,EAJ7ED,sBAAY,CAKT,CACN,CACF;AACH","names":["forkOperation","OperationsId","Symbol","Operations","tsplus_module_1","self","tsplus_module_5","tsplus_module_4","scope","tsplus_module_3","tsplus_module_2","register","forkOperationFunction","fnc","inp","forkOperation_1","forkOperation2","restore","id","forkOperationWithEffect","opId"],"sourceRoot":"","sources":["../../../_src/services/Operations/service.ts"],"sourcesContent":[null]}
+{"version":3,"file":"service.cjs","mappings":";;;;;;;;;;;;;;;;MAoBgBA,aAAa;AAAA;AAlBtB,MAAMC,YAAY,GAAGC,MAAM,CAAC,cAAc,CAAC;AAAA;AAa3C,MAAMC,UAAU,GAAkBC,mBAAG,EAAc;AAE1D;;;AAAA;AAGA,yBAAuCC,IAAqB;EAC1D,OAAOC,yBAAe,MACpBC,4CAAU,EACRJ,UAAU,IACRI,8CAAY,EACDC,KAAK,IACZD,qDAAU,CAACE,QAAQ,EAAQD,KAAK,CAAC,EAC1B,MAAKE,kDAACC,wBAAI,EAAKH,KAAK,CAAC,CAAkC,CAAC,CAChE,CACN,CACF;AACH;AAEA;;;AAGM,SAAUI,qBAAqB,CAAeC,GAAkC;EACpF,OAAQC,GAAQ,IAAKR,yBAAe,MAAKS,gBAACF,GAAG,CAACC,GAAG,CAAC,CAAc,CAAC;AACnE;AAEA;;;AAGM,SAAUE,cAAc,CAAUX,IAA4C;EAClF,OAAOC,yBAAeW,OAAO,IAC3BV,4CAAU,EACRJ,UAAU,IACRI,8CAAY,EACDC,KAAK,IACZD,qDAAU,CAACE,QAAQ,EAAQD,KAAK,CAAC,EAC1BU,EAAE,IAAGR,kDAACC,2BAAO,CAACN,IAAI,CAAC,CAACa,EAAE,CAAC,EAAKV,KAAK,CAAC,CAAkC,CAAC,CAC7E,CACN,CACF;AACH;AAEA;;;AAGM,SAAUW,uBAAuB,CACrCd,IAA0C,EAC1CQ,GAA4C;EAE5C,OAAOP,yBAAeW,OAAO,IAC3BV,4CAAU,EACRJ,UAAU,IACRI,8CAAY,EACDC,KAAK,IACZD,yEAAU,CAACE,QAAQ,EAAQD,KAAK,CAAC,EAC1BY,IAAI,IAAGV,kDAACC,2BAAO,CAACN,IAAI,CAAC,CAACe,IAAI,CAAC,EAAKZ,KAAK,CAAC,CAAkC,CAAC,EACzEY,IAAI,IAAIT,uFAAO,CAACE,GAAG,CAAC,CAACO,IAAI,CAAC,IAAiCZ,KAAK,CAAC,CAAC,CAC1E,CACN,CACF;AACH","names":["forkOperation","OperationsId","Symbol","Operations","tsplus_module_1","self","tsplus_module_5","tsplus_module_4","scope","register","tsplus_module_3","tsplus_module_2","forkOperationFunction","fnc","inp","forkOperation_1","forkOperation2","restore","id","forkOperationWithEffect","opId"],"sourceRoot":"","sources":["../../../_src/services/Operations/service.ts"],"sourcesContent":[null]}

package/_cjs/services/QueueMaker/errors.cjs

@@ -42,13 +42,13 @@ const reportQueueError = (cause, context) => tsplus_module_1.serviceWithEffect(t
  */
 exports.reportQueueError = reportQueueError;
 function forkDaemonReportQueue(self) {
-  return tsplus_module_1.daemonChildren(tsplus_module_1.fork(tsplus_module_1.tapErrorCause(reportQueueError)(self)));
+  return tsplus_module_1.daemonChildren(tsplus_module_1.fork(tsplus_module_1.tapErrorCause(self, reportQueueError)));
 }
 const reportFatalQueueError = (0, _errorReporter.reportError)(cause => new FatalQueueException(cause));
 exports.reportFatalQueueError = reportFatalQueueError;
 function reportFailure(name) {
-  return self => tsplus_module_1.tap(exit => exit._tag === "Failure" ? reportFatalQueueError(exit.cause, {
+  return self => tsplus_module_1.tap(tsplus_module_1.exit(self), exit => exit._tag === "Failure" ? reportFatalQueueError(exit.cause, {
     name
-  }) : tsplus_module_3.unit)(tsplus_module_1.exit(self));
+  }) : tsplus_module_3.unit);
 }
 //# sourceMappingURL=errors.cjs.map

package/_cjs/services/QueueMaker/errors.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"errors.cjs","mappings":";;;;;;;;;;;;AAAA;AACA;AAAyD;AAAA;AAGnD,MAAOA,gBAAoB,SAAQC,sBAAiB;EACxDC,YAAYC,KAAe;IACzB,KAAK,CAACA,KAAK,EAAE,SAAS,CAAC;EACzB;;AACD;AAEK,MAAOC,mBAAuB,SAAQH,sBAAiB;EAC3DC,YAAYC,KAAe;IACzB,KAAK,CAACA,KAAK,EAAE,SAAS,CAAC;EACzB;;AACD;AAED,MAAME,iBAAiB,GAAG,8BAAW,EAACF,KAAK,IAAI,IAAIH,gBAAgB,CAACG,KAAK,CAAC,CAAC;AAEpE,MAAMG,gBAAgB,GAAG,CAACH,KAAqB,EAAEI,OAA6C,KACnGC,uDAAoCC,cAAc,IAChDD,2BAAOH,iBAAiB,CAACF,KAAK,EAAE;EAAEM,cAAc;EAAE,GAAGF;AAAO,CAAE,CAAC,CAAC,CACjE;AAEH;;;;;;;;;AAAA;AASM,SAAUG,qBAAqB,CAAUC,IAAqB;EAClE,2DAAOH,8BAAmBF,gBAAgB,EAAnCK,IAAI,CAAgC;AAC7C;AAEO,MAAMC,qBAAqB,GAAG,8BAAW,EAC9CT,KAAK,IAAI,IAAIC,mBAAmB,CAACD,KAAK,CAAC,CACxC;AAAA;AAEK,SAAUU,aAAa,CAACC,IAAY;EACxC,OAAiBH,IAAqB,IACpCH,oBAAcO,IAAI,IAChBA,IAAI,CAACC,IAAI,KAAK,SAAS,GACnBJ,qBAAqB,CAACG,IAAI,CAACZ,KAAK,EAAE;IAAEW;EAAI,CAAE,CAAC,GAC5CG,oBAAY,uBAHjBN,IAAI,EAIH;AACL","names":["MessageException","CauseException","constructor","cause","FatalQueueException","reportQueueError_","reportQueueError","context","tsplus_module_1","requestContext","forkDaemonReportQueue","self","reportFatalQueueError","reportFailure","name","exit","_tag","tsplus_module_3"],"sourceRoot":"","sources":["../../../_src/services/QueueMaker/errors.ts"],"sourcesContent":[null]}
+{"version":3,"file":"errors.cjs","mappings":";;;;;;;;;;;;AAAA;AACA;AAAyD;AAAA;AAGnD,MAAOA,gBAAoB,SAAQC,sBAAiB;EACxDC,YAAYC,KAAe;IACzB,KAAK,CAACA,KAAK,EAAE,SAAS,CAAC;EACzB;;AACD;AAEK,MAAOC,mBAAuB,SAAQH,sBAAiB;EAC3DC,YAAYC,KAAe;IACzB,KAAK,CAACA,KAAK,EAAE,SAAS,CAAC;EACzB;;AACD;AAED,MAAME,iBAAiB,GAAG,8BAAW,EAACF,KAAK,IAAI,IAAIH,gBAAgB,CAACG,KAAK,CAAC,CAAC;AAEpE,MAAMG,gBAAgB,GAAG,CAAIH,KAAe,EAAEI,OAA6C,KAChGC,uDAAoCC,cAAc,IAChDD,2BAAOH,iBAAiB,CAACF,KAAK,EAAE;EAAEM,cAAc;EAAE,GAAGF;AAAO,CAAE,CAAC,CAAC,CACjE;AAEH;;;;;;;;;AAAA;AASM,SAAUG,qBAAqB,CAAUC,IAAqB;EAClE,2DAAOH,kCAAI,EAAeF,gBAAgB,CAAC;AAC7C;AAEO,MAAMM,qBAAqB,GAAG,8BAAW,EAC9CT,KAAK,IAAI,IAAIC,mBAAmB,CAACD,KAAK,CAAC,CACxC;AAAA;AAEK,SAAUU,aAAa,CAACC,IAAY;EACxC,OAAiBH,IAAqB,IACpCH,6CAAI,GAAUO,IAAI,IAChBA,IAAI,CAACC,IAAI,KAAK,SAAS,GACnBJ,qBAAqB,CAACG,IAAI,CAACZ,KAAK,EAAE;IAAEW;EAAI,CAAE,CAAC,GAC5CG,oBAAY,CAChB;AACL","names":["MessageException","CauseException","constructor","cause","FatalQueueException","reportQueueError_","reportQueueError","context","tsplus_module_1","requestContext","forkDaemonReportQueue","self","reportFatalQueueError","reportFailure","name","exit","_tag","tsplus_module_3"],"sourceRoot":"","sources":["../../../_src/services/QueueMaker/errors.ts"],"sourcesContent":[null]}

package/_cjs/services/QueueMaker/memQueue.cjs

@@ -35,30 +35,29 @@ function makeMemQueue(queueName, queueDrainName, encoder, makeHandleEvent, provi
         const requestContext = yield* $(tsplus_module_1.service(tsplus_module_2.tag));
         return yield* $(tsplus_module_4.forkDaemonReportQueue(tsplus_module_3.ext_forEach(messages, m => tsplus_module_1.asUnit(
         // we JSON encode, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
-        tsplus_module_1.flatMap(_ => q.offer(_))(tsplus_module_1.sync(() => JSON.stringify(encoder({
+        tsplus_module_1.flatMap(tsplus_module_1.sync(() => JSON.stringify(encoder({
           body: m,
           meta: requestContext
         })))
         // .tap((msg) => info("Publishing Mem Message: " + utils.inspect(msg)))
-        )))));
+        , _ => q.offer(_))))));
       }),
-
       drain: tsplus_module_1.gen(function* ($) {
         const handleEvent = yield* $(makeHandleEvent);
         const processMessage = msg =>
         // we JSON parse, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
-        tsplus_module_1.flatMap(({
+        tsplus_module_1.flatMap(tsplus_module_1.orDie(tsplus_module_1.flatMap(tsplus_module_1.sync(() => JSON.parse(msg)), parseDrain)), ({
           body,
           meta
         }) => provideContext(tsplus_module_2.RequestContext.inherit(meta, {
           id: body.id,
           locale: "en",
           name: tsplus_module_7.ReasonableString(body._tag)
-        }))(tsplus_module_1.zipRight(silence(handleEvent(body)))(tsplus_module_1.tap(() => _Memory.restoreFromRequestContext)(tsplus_module_6.logAnnotates({
+        }))(tsplus_module_1.zipRight(tsplus_module_1.tap(tsplus_module_6.logAnnotates({
           body: tsplus_module_5.RecordPretty(tsplus_module_5.object$(body)),
           meta: tsplus_module_5.RecordPretty(tsplus_module_5.object$(meta))
-        })(tsplus_module_1.logDebug(`$$ [${queueDrainName}] Processing incoming message`))))))(tsplus_module_1.orDie(tsplus_module_1.flatMap(parseDrain)(tsplus_module_1.sync(() => JSON.parse(msg)))));
-        return yield* $(tsplus_module_1.forkScoped(tsplus_module_9.setupReq3((0, _errors2.reportFailure)("drain")(tsplus_module_1.forever(tsplus_module_1.flatMap(x => tsplus_module_1.flatMap(_ => tsplus_module_8.join(_))(tsplus_module_1.fork(tsplus_module_1.uninterruptible(processMessage(x)))))(qReply.take()))), "Queue.ReceiveMessage")));
+        })(tsplus_module_1.logDebug(`$$ [${queueDrainName}] Processing incoming message`)), () => _Memory.restoreFromRequestContext), silence(handleEvent(body)))));
+        return yield* $(tsplus_module_1.forkScoped(tsplus_module_9.setupReq3((0, _errors2.reportFailure)("drain")(tsplus_module_1.forever(tsplus_module_1.flatMap(qReply.take(), x => tsplus_module_1.flatMap(tsplus_module_1.fork(tsplus_module_1.uninterruptible(processMessage(x))), _ => tsplus_module_8.join(_))))), "Queue.ReceiveMessage")));
       })
     };
   });
@@ -66,9 +65,9 @@ function makeMemQueue(queueName, queueDrainName, encoder, makeHandleEvent, provi
 // We want the Queue to continue processing even on errors per messages
 // must make sure that the errors are processed/handled beforehand.
 function silence(inp) {
-  return tsplus_module_1.flatMap(result => tsplus_module_1.gen(function* ($) {
+  return tsplus_module_1.flatMap(tsplus_module_1.exit(inp), result => tsplus_module_1.gen(function* ($) {
     const requestContext = yield* $(tsplus_module_1.service(tsplus_module_2.tag));
-    return yield* $(tsplus_module_12.match(cause => {
+    return yield* $(tsplus_module_12.match(result, cause => {
       if (tsplus_module_10.isInterrupted(cause)) {
         return tsplus_module_1.failCause(cause);
       }
@@ -76,7 +75,7 @@ function silence(inp) {
         requestContext
       });
       return tsplus_module_11.unit;
-    }, () => tsplus_module_11.unit)(result));
-  }))(tsplus_module_1.exit(inp));
+    }, () => tsplus_module_11.unit));
+  }));
 }
 //# sourceMappingURL=memQueue.cjs.map

package/_cjs/services/QueueMaker/memQueue.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"memQueue.cjs","mappings":"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","names":["makeMemQueue","queueName","queueDrainName","encoder","makeHandleEvent","provideContext","parseDrain","tsplus_module_1","$","mem","MemQueue","q","getOrCreateQueue","qReply","publish","messages","requestContext","tsplus_module_3","m","_","offer","JSON","stringify","body","meta","drain","handleEvent","processMessage","msg","RequestContext","inherit","id","locale","name","tsplus_module_7","_tag","silence","restoreFromRequestContext","tsplus_module_6","parse","tsplus_module_9","x","tsplus_module_8","take","inp","result","tsplus_module_12","cause","tsplus_module_10","tsplus_module_11"],"sourceRoot":"","sources":["../../../_src/services/QueueMaker/memQueue.ts"],"sourcesContent":[null]}
+{"version":3,"file":"memQueue.cjs","mappings":";;;;;;;;;;;;;;;;;;;AAAA;AAGA;AACA;AAA6D;AAAA;AAG7D;;;AAGM,SAAUA,YAAY,CAC1BC,SAAiB,EACjBC,cAAsB,EACtBC,OAAyD,EACzDC,eAAwF,EACxFC,cAEuC,EACvCC,UAGmF;EAEnF,OAAOC,oBAAW,WAAUC,CAAC;IAC3B,MAAMC,GAAG,GAAG,OAAOD,CAAC,yBAACE,kBAAQ,EAAQ;IACrC,MAAMC,CAAC,GAAG,OAAOH,CAAC,CAACC,GAAG,CAACG,gBAAgB,CAACX,SAAS,CAAC,CAAC;IACnD,MAAMY,MAAM,GAAG,OAAOL,CAAC,CAACC,GAAG,CAACG,gBAAgB,CAACV,cAAc,CAAC,CAAC;IAE7D,OAAO;MACLY,OAAO,EAAE,CAAC,GAAGC,QAAQ,KACnBR,oBAAW,WAAUC,CAAC;QACpB,MAAMQ,cAAc,GAAG,OAAOR,CAAC,8CAA2B;QAC1D,OAAO,OAAOA,CAAC,uCACbS,oCAAQ,EAAeC,CAAC,IAAGX;QACzB;QACAA,mDACEY,IAAI,CAACC,SAAS,CACZjB,OAAO,CAAC;UAAEkB,IAAI,EAAEH,CAAC;UAAEI,IAAI,EAAEN;QAAc,CAAE,CAAC,CAC3C;QAED;QAAA,EACSO,CAAC,IAAIZ,CAAC,CAACa,KAAK,CAACD,CAAC,CAAC,CAAC,CAClB,CACV,EAEF;MACH,CAAC,CAAC;MACJE,KAAK,EAAElB,oBAAW,WAAUC,CAAC;QAC3B,MAAMkB,WAAW,GAAG,OAAOlB,CAAC,CAACJ,eAAe,CAAC;QAC7C,MAAMuB,cAAc,GAAIC,GAAW;QACjC;QACArB,iGAAOY,IAAI,CAACU,KAAK,CAACD,GAAG,CAAC,CAAC,EACZtB,UAAU,CAAC,GAEX,CAAC;UAAEe,IAAI;UAAEC;QAAI,CAAE,KAOlBjB,cAAc,CACZyB,8BAAc,CAACC,OAAO,CAACT,IAAI,EAAE;UAC3BU,EAAE,EAAEX,IAAI,CAACW,EAAE;UACXC,MAAM,EAAE,IAAa;UACrBC,IAAI,EAAEC,gCAAgB,CAACd,IAAI,CAACe,IAAI;SACjC,CAAC,CACH,CAZL7B,6CAES8B,6BAAoB;UAAEhB,IAAI,uDAAEA,IAAI,EAAU;UAAEC,IAAI,uDAAEA,IAAI;QAAU,CAAE,CAAC,CAF5Ef,yBACY,OAAOL,cAAc,+BAA+B,CAAC,GAE1D,MAAMoC,iCAAyB,CAAC,EAC3BC,OAAO,CAACb,WAAW,CAACL,IAAI,CAAC,CAAC,CAAC,CASpC,CACJ;QACL,OAAO,OAAOb,CAAC,4BACbgC,0BAGS,0BAAa,EAAC,OAAO,CAAC,yBAH/BjC,8BAAM,CAACkC,IAAI,EAAE,EACFC,CAAC,IAAInC,2FAAc,CAACmC,CAAC,CAAC,IAA8BnB,CAAC,IAAGoB,qBAACpB,CAAC,CAAK,CAAC,CAAC,IAGpD,sBAAsB,CAAC,EAEhD;MACH,CAAC;KAC+B;EACpC,CAAC,CAAC;AACJ;AAEA;AACA;AACM,SAAUgB,OAAO,CAAUK,GAAoB;EACnD,OAAOrC,gDAAG,GAAcsC,MAAM,IAC5BtC,oBAAW,WAAUC,CAAC;IACpB,MAAMQ,cAAc,GAAG,OAAOR,CAAC,8CAA2B;IAC1D,OAAO,OAAOA,CAAC,CACbsC,6BAAM,EACJC,KAAK,IAAG;MACN,IAAIC,oCAAK,CAAgB,EAAE;QACzB,iCAAQD,KAAsB;;MAEhC,6BAAgB,EAACA,KAAK,EAAE;QAAE/B;MAAc,CAAE,CAAC;MAC3C;IACF,CAAC,EACD,MAAKiC,qBAAY,CAClB,CACF;EACH,CAAC,CAAC,CACH;AACH","names":["makeMemQueue","queueName","queueDrainName","encoder","makeHandleEvent","provideContext","parseDrain","tsplus_module_1","$","mem","MemQueue","q","getOrCreateQueue","qReply","publish","messages","requestContext","tsplus_module_3","m","JSON","stringify","body","meta","_","offer","drain","handleEvent","processMessage","msg","parse","RequestContext","inherit","id","locale","name","tsplus_module_7","_tag","tsplus_module_6","restoreFromRequestContext","silence","tsplus_module_9","take","x","tsplus_module_8","inp","result","tsplus_module_12","cause","tsplus_module_10","tsplus_module_11"],"sourceRoot":"","sources":["../../../_src/services/QueueMaker/memQueue.ts"],"sourcesContent":[null]}

package/_cjs/services/QueueMaker/sbqueue.cjs

@@ -33,22 +33,22 @@ function makeServiceBusQueue(_queueName, queueDrainName, encoder, makeHandleEven
         const handleEvent = yield* $(makeHandleEvent);
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         function processMessage(messageBody) {
-          return tsplus_module_1.asUnit(tsplus_module_1.orDie(tsplus_module_6.setupReq3(tsplus_module_1.flatMap(({
+          return tsplus_module_1.asUnit(tsplus_module_1.orDie(tsplus_module_6.setupReq3(tsplus_module_1.flatMap(tsplus_module_1.tapErrorCause(tsplus_module_1.orDie(tsplus_module_1.flatMap(tsplus_module_1.sync(() => JSON.parse(messageBody)), x => parseDrain(x))), report), ({
             body,
             meta
           }) => provideContext(tsplus_module_7.RequestContext.inherit(meta, {
             id: body.id,
             locale: "en",
             name: tsplus_module_5.ReasonableString(body._tag)
-          }))(tsplus_module_1.tapErrorCause(report)(tsplus_module_1.zipRight(handleEvent(body))(tsplus_module_1.tap(() => _Memory.restoreFromRequestContext)(tsplus_module_4.logAnnotates({
+          }))(tsplus_module_1.tapErrorCause(tsplus_module_1.zipRight(tsplus_module_1.tap(tsplus_module_4.logAnnotates({
             body: tsplus_module_3.RecordPretty(tsplus_module_3.object$(body)),
             meta: tsplus_module_3.RecordPretty(tsplus_module_3.object$(meta))
-          })(tsplus_module_1.logDebug(`$$ [${queueDrainName}] Processing incoming message`)))))))(tsplus_module_1.tapErrorCause(report)(tsplus_module_1.orDie(tsplus_module_1.flatMap(x => parseDrain(x))(tsplus_module_1.sync(() => JSON.parse(messageBody)))))), "Queue.ReceiveMessage")));
+          })(tsplus_module_1.logDebug(`$$ [${queueDrainName}] Processing incoming message`)), () => _Memory.restoreFromRequestContext), handleEvent(body)), report))), "Queue.ReceiveMessage")));
         }
-        return yield* $(tsplus_module_1.provideSomeLayer(receiverLayer)((0, _ServiceBus.subscribe)({
+        return yield* $(tsplus_module_1.provideSomeLayer((0, _ServiceBus.subscribe)({
           processMessage: x => tsplus_module_1.uninterruptible(processMessage(x.body)),
           processError: err => tsplus_module_1.sync(() => (0, _errorReporter.captureException)(err.error))
-        })));
+        }), receiverLayer));
       }),
       publish: (...messages) => tsplus_module_1.gen(function* ($) {
         const requestContext = yield* $(tsplus_module_1.service(tsplus_module_7.tag));

package/_cjs/services/QueueMaker/sbqueue.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"sbqueue.cjs","mappings":"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","names":["makeServiceBusQueue","_queueName","queueDrainName","encoder","makeHandleEvent","provideContext","parseDrain","tsplus_module_1","$","s","Sender","receiver","Receiver","receiverLayer","tsplus_module_2","drain","handleEvent","processMessage","messageBody","tsplus_module_6","body","meta","RequestContext","inherit","id","locale","name","tsplus_module_5","_tag","report","restoreFromRequestContext","tsplus_module_4","x","JSON","parse","processError","err","error","publish","messages","requestContext","sendMessages","map","stringify","messageId","contentType","makeServiceBusLayers","url","queueName","tsplus_module_9","cause"],"sourceRoot":"","sources":["../../../_src/services/QueueMaker/sbqueue.ts"],"sourcesContent":[null]}
+{"version":3,"file":"sbqueue.cjs","mappings":"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","names":["makeServiceBusQueue","_queueName","queueDrainName","encoder","makeHandleEvent","provideContext","parseDrain","tsplus_module_1","$","s","Sender","receiver","Receiver","receiverLayer","tsplus_module_2","drain","handleEvent","processMessage","messageBody","tsplus_module_6","JSON","parse","x","report","body","meta","RequestContext","inherit","id","locale","name","tsplus_module_5","_tag","tsplus_module_4","restoreFromRequestContext","processError","err","error","publish","messages","requestContext","sendMessages","map","stringify","messageId","contentType","makeServiceBusLayers","url","queueName","tsplus_module_9","cause"],"sourceRoot":"","sources":["../../../_src/services/QueueMaker/sbqueue.ts"],"sourcesContent":[null]}

package/_cjs/services/Repository.cjs

@@ -74,25 +74,25 @@ const AnyPureDSL = {
  */
 exports.AnyPureDSL = AnyPureDSL;
 function get_1(self, id) {
-  return tsplus_module_3.flatMap(_ => tsplus_module_2.encaseMaybeInEffect_(_, () => new _errors.NotFoundError(self.itemType, id)))(self.find(id));
+  return tsplus_module_3.flatMap(self.find(id), _ => tsplus_module_2.encaseMaybeInEffect_(_, () => new _errors.NotFoundError(self.itemType, id)));
 }
 /**
  * @tsplus fluent Repository filter
  */
 function filter(self, filter) {
-  return tsplus_module_3.map(_ => tsplus_module_4.filter(filter)(_))(self.all);
+  return tsplus_module_3.map(self.all, _ => tsplus_module_4.filter(_, filter));
 }
 /**
  * @tsplus fluent Repository filterAll
  */
 function filterAll(self, map) {
-  return tsplus_module_3.map(map)(self.all);
+  return tsplus_module_3.map(self.all, map);
 }
 /**
  * @tsplus fluent Repository collect
  */
 function collect(self, collect) {
-  return tsplus_module_3.map(_ => tsplus_module_4.filterMap(collect)(_))(self.all);
+  return tsplus_module_3.map(self.all, _ => tsplus_module_4.filterMap(collect)(_));
 }
 /**
  * @tsplus getter Repository log
@@ -106,10 +106,10 @@ function log(_) {
  */
 function projectEffect_1(self, map) {
   // TODO: a projection that gets sent to the db instead.
-  return tsplus_module_3.flatMap(f => tsplus_module_3.map(_ => f.collect ? tsplus_module_4.filterMap(f.collect)(_) : _)(f.filter ? self.utils.filter(f.filter, {
+  return tsplus_module_3.flatMap(map, f => tsplus_module_3.map(f.filter ? self.utils.filter(f.filter, {
     limit: f.limit,
     skip: f.skip
-  }) : self.utils.all))(map);
+  }) : self.utils.all, _ => f.collect ? tsplus_module_4.filterMap(f.collect)(_) : _));
 }
 /**
  * TODO: project inside the db.
@@ -124,12 +124,12 @@ function project(self, map) {
 function queryEffect_1(self,
 // TODO: think about collectPM, collectE, and collect(Parsed)
 map) {
-  return tsplus_module_3.flatMap(f => tsplus_module_3.map(_ => f.collect ? tsplus_module_4.filterMap(f.collect)(_) : _)(tsplus_module_3.map(_ => _.map(_ => self.utils.parse(_)))(tsplus_module_3.flatMap(items => tsplus_module_3.map(({
-    set
-  }) => items.map(_ => self.utils.mapReverse(_, set)))(tsplus_module_3.service(_Store.ContextMap)))(f.filter ? self.utils.filter(f.filter, {
+  return tsplus_module_3.flatMap(map, f => tsplus_module_3.map(tsplus_module_3.map(tsplus_module_3.flatMap(f.filter ? self.utils.filter(f.filter, {
     limit: f.limit,
     skip: f.skip
-  }) : self.utils.all))))(map);
+  }) : self.utils.all, items => tsplus_module_3.map(tsplus_module_3.service(_Store.ContextMap), ({
+    set
+  }) => items.map(_ => self.utils.mapReverse(_, set)))), _ => _.map(_ => self.utils.parse(_))), _ => f.collect ? tsplus_module_4.filterMap(f.collect)(_) : _));
 }
 /**
  * @tsplus fluent Repository queryOneEffect
@@ -137,11 +137,11 @@ map) {
 function queryOneEffect_1(self,
 // TODO: think about collectPM, collectE, and collect(Parsed)
 map) {
-  return tsplus_module_3.flatMap(f => tsplus_module_3.flatMap(_ => tsplus_module_3.map(_ => _[0])(tsplus_module_2.encaseMaybeInEffect_(tsplus_module_5.ChunkToNonEmptyReadonlyArray(f.collect ? tsplus_module_4.filterMap(f.collect)(_) : _), () => new _errors.NotFoundError(self.itemType, JSON.stringify(f.filter)))))(tsplus_module_3.map(_ => _.map(_ => self.utils.parse(_)))(tsplus_module_3.flatMap(items => tsplus_module_3.map(({
-    set
-  }) => items.map(_ => self.utils.mapReverse(_, set)))(tsplus_module_3.service(_Store.ContextMap)))(f.filter ? self.utils.filter(f.filter, {
+  return tsplus_module_3.flatMap(map, f => tsplus_module_3.flatMap(tsplus_module_3.map(tsplus_module_3.flatMap(f.filter ? self.utils.filter(f.filter, {
     limit: 1
-  }) : self.utils.all))))(map);
+  }) : self.utils.all, items => tsplus_module_3.map(tsplus_module_3.service(_Store.ContextMap), ({
+    set
+  }) => items.map(_ => self.utils.mapReverse(_, set)))), _ => _.map(_ => self.utils.parse(_))), _ => tsplus_module_3.map(tsplus_module_2.encaseMaybeInEffect_(tsplus_module_5.ChunkToNonEmptyReadonlyArray(f.collect ? tsplus_module_4.filterMap(f.collect)(_) : _), () => new _errors.NotFoundError(self.itemType, JSON.stringify(f.filter))), _ => _[0])));
 }
 /**
  * @tsplus fluent Repository query
@@ -165,7 +165,7 @@ map) {
 function queryAndSavePureEffect_1(self,
 // TODO: think about collectPM, collectE, and collect(Parsed)
 map) {
-  return pure => tsplus_module_6.untraced(restore => tsplus_module_3.flatMap(restore(_ => saveManyWithPure_1(self, _, pure)))(queryEffect_1(self, map)));
+  return pure => tsplus_module_6.untraced(restore => tsplus_module_3.flatMap(queryEffect_1(self, map), restore(_ => saveManyWithPure_1(self, _, pure))));
 }
 /**
  * @tsplus fluent Repository queryAndSavePure
@@ -185,7 +185,7 @@ function saveManyWithPure(self) {
  * @tsplus fluent Repository byIdAndSaveWithPure
  */
 function byIdAndSaveWithPure_1(self, id) {
-  return pure => tsplus_module_3.flatMap(item => saveWithPure_1(self, item, pure))(get_1(self, id));
+  return pure => tsplus_module_3.flatMap(get_1(self, id), item => saveWithPure_1(self, item, pure));
 }
 /**
  * NOTE: it's not as composable, only useful when the request is simple, and only this part needs request args.
@@ -204,10 +204,10 @@ function saveManyWithPure_1(self, items, pure) {
  * @tsplus fluent Repository saveWithPure_
  */
 function saveWithPure_1(self, item, pure) {
-  return saveAllWithEffectInt(self, tsplus_module_3.map(([item, events, a]) => [[item], events, a])(tsplus_module_1.runTerm(pure, item)));
+  return saveAllWithEffectInt(self, tsplus_module_3.map(tsplus_module_1.runTerm(pure, item), ([item, events, a]) => [[item], events, a]));
 }
 function saveAllWithEffectInt(self, gen) {
-  return tsplus_module_6.untraced(restore => tsplus_module_3.flatMap(([items, events, a]) => tsplus_module_3.map(() => a)(restore(() => self.saveAndPublish(items, events))()))(gen));
+  return tsplus_module_6.untraced(restore => tsplus_module_3.flatMap(gen, ([items, events, a]) => tsplus_module_3.map(restore(() => self.saveAndPublish(items, events))(), () => a)));
 }
 /**
  * @tsplus fluent Repository queryAndSavePureEffectBatched
@@ -215,7 +215,7 @@ function saveAllWithEffectInt(self, gen) {
 function queryAndSavePureEffectBatched_1(self,
 // TODO: think about collectPM, collectE, and collect(Parsed)
 map, batchSize = 100) {
-  return pure => tsplus_module_3.flatMap(_ => saveManyWithPureBatched_1(self, _, pure, batchSize))(queryEffect_1(self, map));
+  return pure => tsplus_module_3.flatMap(queryEffect_1(self, map), _ => saveManyWithPureBatched_1(self, _, pure, batchSize));
 }
 /**
  * @tsplus fluent Repository queryAndSavePureBatched
@@ -260,10 +260,10 @@ function makeOneDSL() {
 function makeDSL() {
   const dsl = AnyPureDSL;
   function modify(pure) {
-    return tsplus_module_3.flatMap(items => pure(items, dsl))(dsl.get);
+    return tsplus_module_3.flatMap(dsl.get, items => pure(items, dsl));
   }
   function update(pure) {
-    return tsplus_module_3.flatMap(items => tsplus_module_3.tap(dsl.set)(pure(items, dsl.log)))(dsl.get);
+    return tsplus_module_3.flatMap(dsl.get, items => tsplus_module_3.tap(pure(items, dsl.log), dsl.set));
   }
   function withDSL(pure) {
     return pure(AnyPureDSL);

package/_cjs/services/Repository.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Repository.cjs","mappings":"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","names":["get","projectEffect","queryEffect","queryOneEffect","queryAndSavePureEffect","byIdAndSaveWithPure","saveManyWithPure_","saveWithPure_","queryAndSavePureEffectBatched","saveManyWithPureBatched_","AnyPureDSL","tsplus_module_1","set","log","evt","self","id","tsplus_module_3","_","tsplus_module_2","NotFoundError","itemType","find","filter","tsplus_module_4","all","filterAll","map","collect","f","utils","limit","skip","project","projectEffect_1","parse","items","mapReverse","ContextMap","JSON","stringify","query","queryEffect_1","queryOne","queryOneEffect_1","pure","tsplus_module_6","restore","saveManyWithPure_1","queryAndSavePure","queryAndSavePureEffect_1","saveManyWithPure","item","saveWithPure_1","get_1","handleByIdAndSaveWithPure","req","ctx","byIdAndSaveWithPure_1","saveAllWithEffectInt","events","a","gen","saveAndPublish","batchSize","saveManyWithPureBatched_1","queryAndSavePureBatched","queryAndSavePureEffectBatched_1","saveManyWithPureBatched","tsplus_module_7","batch","anyDSL","makeDSL","makeAllDSL","dsl","updateWithOne","upd","update","updateWith","makeOneDSL","modify","withDSL","Object","assign","ifAny","fn","tsplus_module_8","ifAny_","save","saveWithEvents"],"sourceRoot":"","sources":["../../_src/services/Repository.ts"],"sourcesContent":[null]}
+{"version":3,"file":"Repository.cjs","mappings":"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","names":["get","projectEffect","queryEffect","queryOneEffect","queryAndSavePureEffect","byIdAndSaveWithPure","saveManyWithPure_","saveWithPure_","queryAndSavePureEffectBatched","saveManyWithPureBatched_","AnyPureDSL","tsplus_module_1","set","log","evt","self","id","tsplus_module_3","find","_","tsplus_module_2","NotFoundError","itemType","filter","all","tsplus_module_4","filterAll","map","collect","f","utils","limit","skip","project","projectEffect_1","items","ContextMap","mapReverse","parse","JSON","stringify","query","queryEffect_1","queryOne","queryOneEffect_1","pure","tsplus_module_6","restore","saveManyWithPure_1","queryAndSavePure","queryAndSavePureEffect_1","saveManyWithPure","item","saveWithPure_1","handleByIdAndSaveWithPure","req","ctx","byIdAndSaveWithPure_1","saveAllWithEffectInt","events","a","gen","saveAndPublish","batchSize","saveManyWithPureBatched_1","queryAndSavePureBatched","queryAndSavePureEffectBatched_1","saveManyWithPureBatched","tsplus_module_7","batch","anyDSL","makeDSL","makeAllDSL","dsl","updateWithOne","upd","update","updateWith","makeOneDSL","modify","withDSL","Object","assign","ifAny","fn","tsplus_module_8","ifAny_","save","saveWithEvents"],"sourceRoot":"","sources":["../../_src/services/Repository.ts"],"sourcesContent":[null]}

package/_cjs/services/Store/Cosmos.cjs

@@ -49,10 +49,10 @@ function makeCosmosStore({
         const bulk = container.items.bulk.bind(container.items);
         const execBatch = container.items.batch.bind(container.items);
         const importedMarkerId = containerId;
-        const bulkSet = items => tsplus_module_1.logAnnotate("cosmos.db", containerId)(tsplus_module_5.instr(tsplus_module_1.gen(function* ($) {
+        const bulkSet = items => tsplus_module_1.logAnnotate(tsplus_module_5.instr(tsplus_module_1.gen(function* ($) {
           // TODO: disable batching if need atomicity
           // we delay and batch to keep low amount of RUs
-          const b = [...items].map(x => [x, tsplus_module_2.match(() => ({
+          const b = [...items].map(x => [x, tsplus_module_2.match(tsplus_module_2.fromNullable(x._etag), () => ({
             operationType: "Create",
             resourceBody: {
               ...(0, tsplus_module_6.omit)(x, "_etag"),
@@ -68,9 +68,9 @@ function makeCosmosStore({
             },
             ifMatch: eTag,
             partitionKey: config?.partitionValue(x)
-          }))(tsplus_module_2.fromNullable(x._etag))]);
+          }))]);
           const batches = tsplus_module_3.chunk_(b, config?.maxBulkSize ?? 10).toReadonlyArray();
-          const batchResult = yield* $(tsplus_module_4.ext_forEach(batches.map((x, i) => [i, x]), ([i, batch]) => tsplus_module_1.flatMap(responses => tsplus_module_1.gen(function* ($) {
+          const batchResult = yield* $(tsplus_module_4.ext_forEach(batches.map((x, i) => [i, x]), ([i, batch]) => tsplus_module_1.flatMap(tsplus_module_1.delay(tsplus_module_1.promise(() => bulk(batch.map(([, op]) => op))), tsplus_module_3.millis_(i === 0 ? 0 : 1100)), responses => tsplus_module_1.gen(function* ($) {
             const r = responses.find(x => x.statusCode === 412);
             if (r) {
               return yield* $(tsplus_module_1.fail(new _errors.OptimisticConcurrencyException(name, JSON.stringify(r.resourceBody?.["id"]))));
@@ -84,12 +84,12 @@ function makeCosmosStore({
               // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
               _etag: responses[i].eTag
             }));
-          }))(tsplus_module_1.delay(tsplus_module_3.millis_(i === 0 ? 0 : 1100))(tsplus_module_1.promise(() => bulk(batch.map(([, op]) => op)))))));
+          }))));
           return batchResult.toReadonlyArray().flat();
-        }), "cosmos.bulkSet"));
+        }), "cosmos.bulkSet"), "cosmos.db", containerId);
         const batchSet = items => {
-          return tsplus_module_1.logAnnotate("cosmos.db", containerId)(tsplus_module_5.instr(tsplus_module_1.suspendSucceed(() => {
-            const batch = [...items].map(x => [x, tsplus_module_2.match(() => ({
+          return tsplus_module_1.logAnnotate(tsplus_module_5.instr(tsplus_module_1.suspendSucceed(() => {
+            const batch = [...items].map(x => [x, tsplus_module_2.match(tsplus_module_2.fromNullable(x._etag), () => ({
               operationType: "Create",
               resourceBody: {
                 ...(0, tsplus_module_6.omit)(x, "_etag"),
@@ -103,9 +103,9 @@ function makeCosmosStore({
                 _partitionKey: config?.partitionValue(x)
               },
               ifMatch: eTag
-            }))(tsplus_module_2.fromNullable(x._etag))]);
+            }))]);
             const ex = batch.map(([, c]) => c);
-            return tsplus_module_1.flatMap(x => tsplus_module_1.gen(function* ($) {
+            return tsplus_module_1.flatMap(tsplus_module_1.promise(() => execBatch(ex, ex[0]?.resourceBody._partitionKey)), x => tsplus_module_1.gen(function* ($) {
               const result = x.result ?? [];
               const firstFailed = result.find(x => x.statusCode > 299 || x.statusCode < 200);
               if (firstFailed) {
@@ -119,20 +119,22 @@ function makeCosmosStore({
                 ...e,
                 _etag: result[i]?.eTag
               }));
-            }))(tsplus_module_1.promise(() => execBatch(ex, ex[0]?.resourceBody._partitionKey)));
-          }), "cosmos.batchSet"));
+            }));
+          }), "cosmos.batchSet"), "cosmos.db", containerId);
         };
         const s = {
-          all: tsplus_module_1.logAnnotate("cosmos.db", containerId)(tsplus_module_5.instr(tsplus_module_1.flatMap(q => tsplus_module_1.promise(() => container.items.query(q).fetchAll().then(({
-            resources
-          }) => tsplus_module_3.ext_itToChunk(resources))))(tsplus_module_1.tap(q => logQuery(q))(tsplus_module_1.sync(() => ({
+          all: tsplus_module_1.logAnnotate(tsplus_module_5.instr(tsplus_module_1.flatMap(tsplus_module_1.tap(tsplus_module_1.sync(() => ({
             query: `SELECT * FROM ${name} f WHERE f.id != @id`,
             parameters: [{
               name: "@id",
               value: importedMarkerId
             }]
-          })))), "cosmos.all")),
-          filterJoinSelect: (filter, cursor) => tsplus_module_1.logAnnotate("cosmos.db", containerId)(tsplus_module_5.instr(tsplus_module_1.map(a => {
+          })), q => logQuery(q)), q => tsplus_module_1.promise(() => container.items.query(q).fetchAll().then(({
+            resources
+          }) => tsplus_module_3.ext_itToChunk(resources)))), "cosmos.all"), "cosmos.db", containerId),
+          filterJoinSelect: (filter, cursor) => tsplus_module_1.logAnnotate(tsplus_module_5.instr(tsplus_module_1.map(tsplus_module_4.ext_forEach(filter.keys, k => tsplus_module_1.flatMap(tsplus_module_1.tap(tsplus_module_1.sync(() => buildFilterJoinSelectCosmosQuery(filter, k, name, cursor?.skip, cursor?.limit)), q => logQuery(q)), q => tsplus_module_1.promise(() => container.items.query(q).fetchAll().then(({
+            resources
+          }) => tsplus_module_3.ext_itToChunk(resources))))), a => {
             const v = a.flatMap(_ => _).map(x => tsplus_module_6.spread(x, ({
               r,
               ...rest
@@ -141,42 +143,29 @@ function makeCosmosStore({
               ...r
             })));
             return tsplus_module_7.fromIterable(v);
-          })(tsplus_module_4.ext_forEach(filter.keys, k => tsplus_module_1.flatMap(q => tsplus_module_1.promise(() => container.items.query(q).fetchAll().then(({
-            resources
-          }) => tsplus_module_3.ext_itToChunk(resources))))(tsplus_module_1.tap(q => logQuery(q))(tsplus_module_1.sync(() => buildFilterJoinSelectCosmosQuery(filter, k, name, cursor?.skip, cursor?.limit)))))), "cosmos.filterJoinSelect")),
+          }), "cosmos.filterJoinSelect"), "cosmos.db", containerId),
           /**
            * May return duplicate results for "join_find", when matching more than once.
            */
           filter: (filter, cursor) => {
             const skip = cursor?.skip;
             const limit = cursor?.limit;
-            return tsplus_module_1.logAnnotate("cosmos.db", containerId)(tsplus_module_5.instr(filter.type === "join_find"
+            return tsplus_module_1.logAnnotate(tsplus_module_5.instr(filter.type === "join_find"
             // This is a problem if one of the multiple joined arrays can be empty!
             // https://stackoverflow.com/questions/60320780/azure-cosmosdb-sql-join-not-returning-results-when-the-child-contains-empty-arra
             // so we use multiple queries instead.
-            ? tsplus_module_1.map(_ => _.flatMap(_ => _))(tsplus_module_4.ext_forEach(filter.keys, k => tsplus_module_1.flatMap(q => tsplus_module_1.promise(() => container.items.query(q).fetchAll().then(({
+            ? tsplus_module_1.map(tsplus_module_4.ext_forEach(filter.keys, k => tsplus_module_1.flatMap(tsplus_module_1.tap(tsplus_module_1.sync(() => buildFindJoinCosmosQuery(filter, k, name, skip, limit)), q => logQuery(q)), q => tsplus_module_1.promise(() => container.items.query(q).fetchAll().then(({
               resources
-            }) => tsplus_module_3.ext_itToChunk(resources))))(tsplus_module_1.tap(q => logQuery(q))(tsplus_module_1.sync(() => buildFindJoinCosmosQuery(filter, k, name, skip, limit)))))) : tsplus_module_1.flatMap(q => tsplus_module_1.promise(() => container.items.query(q).fetchAll().then(({
+            }) => tsplus_module_3.ext_itToChunk(resources))))), _ => _.flatMap(_ => _)) : tsplus_module_1.flatMap(tsplus_module_1.tap(tsplus_module_1.sync(() => buildCosmosQuery(filter, name, importedMarkerId, skip, limit)), q => logQuery(q)), q => tsplus_module_1.promise(() => container.items.query(q).fetchAll().then(({
               resources
-            }) => tsplus_module_3.ext_itToChunk(resources.map(_ => _.f)))))(tsplus_module_1.tap(q => logQuery(q))(tsplus_module_1.sync(() => buildCosmosQuery(filter, name, importedMarkerId, skip, limit)))), "cosmos.filter"));
+            }) => tsplus_module_3.ext_itToChunk(resources.map(_ => _.f))))), "cosmos.filter"), "cosmos.db", containerId);
           },
-          find: id => tsplus_module_1.logAnnotate("cosmos.db", containerId)(tsplus_module_5.instr(tsplus_module_1.promise(() => container.item(id, config?.partitionValue({
+          find: id => tsplus_module_1.logAnnotate(tsplus_module_5.instr(tsplus_module_1.promise(() => container.item(id, config?.partitionValue({
             id
           })).read().then(({
             resource
-          }) => tsplus_module_2.fromNullable(resource))), "cosmos.find")),
-          set: e => tsplus_module_1.logAnnotate("cosmos.db", containerId)(tsplus_module_5.instr(tsplus_module_1.flatMap(x => {
-            if (x.statusCode === 412) {
-              return tsplus_module_1.fail(new _errors.OptimisticConcurrencyException(name, e.id));
-            }
-            if (x.statusCode > 299 || x.statusCode < 200) {
-              return tsplus_module_1.die(new CosmosDbOperationError("not able to update record: " + x.statusCode));
-            }
-            return tsplus_module_1.sync(() => ({
-              ...e,
-              _etag: x.etag
-            }));
-          })(tsplus_module_2.match(() => tsplus_module_1.promise(() => container.items.create({
+          }) => tsplus_module_2.fromNullable(resource))), "cosmos.find"), "cosmos.db", containerId),
+          set: e => tsplus_module_1.logAnnotate(tsplus_module_5.instr(tsplus_module_1.flatMap(tsplus_module_2.match(tsplus_module_2.fromNullable(e._etag), () => tsplus_module_1.promise(() => container.items.create({
             ...e,
             _partitionKey: config?.partitionValue(e)
           })), eTag => tsplus_module_1.promise(() => container.item(e.id, config?.partitionValue(e)).replace({
@@ -187,10 +176,21 @@ function makeCosmosStore({
               type: "IfMatch",
               condition: eTag
             }
-          })))(tsplus_module_2.fromNullable(e._etag))), "cosmos.set")),
+          }))), x => {
+            if (x.statusCode === 412) {
+              return tsplus_module_1.fail(new _errors.OptimisticConcurrencyException(name, e.id));
+            }
+            if (x.statusCode > 299 || x.statusCode < 200) {
+              return tsplus_module_1.die(new CosmosDbOperationError("not able to update record: " + x.statusCode));
+            }
+            return tsplus_module_1.sync(() => ({
+              ...e,
+              _etag: x.etag
+            }));
+          }), "cosmos.set"), "cosmos.db", containerId),
           batchSet,
           bulkSet,
-          remove: e => tsplus_module_1.logAnnotate("cosmos.db", containerId)(tsplus_module_5.instr(tsplus_module_1.promise(() => container.item(e.id, config?.partitionValue(e)).delete()), "cosmos.remove"))
+          remove: e => tsplus_module_1.logAnnotate(tsplus_module_5.instr(tsplus_module_1.promise(() => container.item(e.id, config?.partitionValue(e)).delete()), "cosmos.remove"), "cosmos.db", containerId)
         };
         // handle mock data
         const marker = yield* $(tsplus_module_1.promise(() => container.item(importedMarkerId, importedMarkerId).read().then(({
@@ -200,7 +200,7 @@ function makeCosmosStore({
           console.log("Creating mock data for " + name);
           if (seed) {
             const m = yield* $(seed);
-            yield* $(tsplus_module_8.flatMapOption(tsplus_module_1.sync(() => tsplus_module_3.toNonEmptyArray([...m.values()])), a => tsplus_module_1.delay(tsplus_module_3.millis_(1100))(tsplus_module_1.orDie(s.bulkSet(a)))));
+            yield* $(tsplus_module_8.flatMapOption(tsplus_module_1.sync(() => tsplus_module_3.toNonEmptyArray([...m.values()])), a => tsplus_module_1.delay(tsplus_module_1.orDie(s.bulkSet(a)), tsplus_module_3.millis_(1100))));
           }
           // Mark as imported
           yield* $(tsplus_module_1.promise(() => container.items.create({
@@ -314,6 +314,6 @@ class CosmosDbOperationError {
   }
 }
 function CosmosStoreLive(config) {
-  return tsplus_module_8.toLayer(tsplus_module_1.flatMap(makeCosmosStore)(tsplus_module_1.config(config)), _service.StoreMaker);
+  return tsplus_module_1.toLayer(tsplus_module_1.flatMap(tsplus_module_1.config(config), makeCosmosStore), _service.StoreMaker);
 }
 //# sourceMappingURL=Cosmos.cjs.map