@effect-app/infra 0.130.1 → 0.131.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,19 @@
1
1
  # @effect-app/infra
2
2
 
3
+ ## 0.131.0
4
+
5
+ ### Minor Changes
6
+
7
+ - c6efdeb: update packages
8
+
9
+ ### Patch Changes
10
+
11
+ - Updated dependencies [c6efdeb]
12
+ - @effect-app/infra-adapters@0.83.0
13
+ - @effect-app/prelude@0.105.0
14
+ - @effect-app/schema@0.90.0
15
+ - @effect-app/core@0.96.0
16
+
3
17
  ## 0.130.1
4
18
 
5
19
  ### Patch Changes
@@ -7,13 +7,11 @@ exports.makeMemQueue = makeMemQueue;
7
7
  var tsplus_module_1 = _interopRequireWildcard(require("@effect-app/prelude/schema"));
8
8
  var tsplus_module_2 = _interopRequireWildcard(require("@effect-app/schema/ext2"));
9
9
  var tsplus_module_3 = _interopRequireWildcard(require("effect/Effect"));
10
- var tsplus_module_4 = _interopRequireWildcard(require("effect/Option"));
11
- var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/core/Option"));
12
- var tsplus_module_6 = _interopRequireWildcard(require("@effect-app/core/_ext/Iterable"));
13
- var tsplus_module_7 = _interopRequireWildcard(require("@effect-app/infra/services/QueueMaker/errors"));
14
- var tsplus_module_8 = _interopRequireWildcard(require("@effect-app/prelude/utils"));
15
- var tsplus_module_9 = _interopRequireWildcard(require("@effect-app/infra/api/setupRequest"));
16
- var tsplus_module_10 = _interopRequireWildcard(require("effect/Fiber"));
10
+ var tsplus_module_4 = _interopRequireWildcard(require("@effect-app/core/_ext/Iterable"));
11
+ var tsplus_module_5 = _interopRequireWildcard(require("@effect-app/infra/services/QueueMaker/errors"));
12
+ var tsplus_module_6 = _interopRequireWildcard(require("@effect-app/prelude/utils"));
13
+ var tsplus_module_7 = _interopRequireWildcard(require("@effect-app/infra/api/setupRequest"));
14
+ var tsplus_module_8 = _interopRequireWildcard(require("effect/Fiber"));
17
15
  var _memQueue = require("@effect-app/infra-adapters/memQueue");
18
16
  var _RequestContext = require("@effect-app/infra/RequestContext");
19
17
  var _ids = require("@effect-app/prelude/ids");
@@ -44,9 +42,9 @@ function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
44
42
  return {
45
43
  publish: (...messages) => tsplus_module_3.gen(function* ($) {
46
44
  const requestContext = yield* $(rcc.requestContext);
47
- const currentSpan = yield* $(tsplus_module_3.currentSpan);
48
- const span = tsplus_module_5.getOrUndefined(tsplus_module_4.map(currentSpan, _effect.Tracer.externalSpan));
49
- return yield* $(tsplus_module_7.forkDaemonReportQueue(tsplus_module_6.ext_forEach(messages, m => tsplus_module_3.asUnit(
45
+ const currentSpan = yield* $(tsplus_module_3.orDie(tsplus_module_3.currentSpan));
46
+ const span = _effect.Tracer.externalSpan(currentSpan);
47
+ return yield* $(tsplus_module_5.forkDaemonReportQueue(tsplus_module_4.ext_forEach(messages, m => tsplus_module_3.asUnit(
50
48
  // we JSON encode, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
51
49
  tsplus_module_3.flatMap(tsplus_module_3.sync(() => JSON.stringify(wireSchema.encodeSync({
52
50
  body: m,
@@ -67,9 +65,9 @@ function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
67
65
  tsplus_module_3.flatMap(tsplus_module_3.orDie(tsplus_module_3.flatMap(tsplus_module_3.sync(() => JSON.parse(msg)), parseDrain)), ({
68
66
  body,
69
67
  meta
70
- }) => tsplus_module_3.withSpan(tsplus_module_9.setupRequestContext(tsplus_module_3.zipRight(tsplus_module_3.logDebug(`$$ [${queueDrainName}] Processing incoming message`).pipe(tsplus_module_3.annotateLogs({
71
- body: tsplus_module_8.RecordPretty(tsplus_module_8.object$(body)),
72
- meta: tsplus_module_8.RecordPretty(tsplus_module_8.object$(meta))
68
+ }) => tsplus_module_3.withSpan(tsplus_module_7.setupRequestContext(tsplus_module_3.zipRight(tsplus_module_3.logDebug(`$$ [${queueDrainName}] Processing incoming message`).pipe(tsplus_module_3.annotateLogs({
69
+ body: tsplus_module_6.RecordPretty(tsplus_module_6.object$(body)),
70
+ meta: tsplus_module_6.RecordPretty(tsplus_module_6.object$(meta))
73
71
  })), handleEvent(body)).pipe(silenceAndReportError), _RequestContext.RequestContext.inherit(meta.requestContext, {
74
72
  id: (0, _ids.RequestId)(body.id),
75
73
  locale: "en",
@@ -80,7 +78,7 @@ function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
80
78
  },
81
79
  parent: meta.span ? _effect.Tracer.externalSpan(meta.span) : undefined
82
80
  }));
83
- return yield* $(tsplus_module_3.forkScoped(tsplus_module_3.forever(tsplus_module_3.flatMap(qDrain.take, x => tsplus_module_3.flatMap(tsplus_module_3.fork(tsplus_module_3.uninterruptible(processMessage(x))), _ => tsplus_module_10.join(_)))
81
+ return yield* $(tsplus_module_3.forkScoped(tsplus_module_3.forever(tsplus_module_3.flatMap(qDrain.take, x => tsplus_module_3.flatMap(tsplus_module_3.fork(tsplus_module_3.uninterruptible(processMessage(x))), _ => tsplus_module_8.join(_)))
84
82
  // TODO: normally a failed item would be returned to the queue and retried up to X times.
85
83
  // .flatMap(_ => _._tag === "Failure" && !isInterrupted ? qDrain.offer(x) : Effect.unit) // TODO: retry count tracking and max retries.
86
84
  .pipe(silenceAndReportError))));
@@ -1 +1 @@
1
- {"version":3,"file":"memQueue.cjs","names":["_memQueue","require","_RequestContext","_ids","_effect","_RequestContextContainer","_errors2","_service","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","makeMemQueue","queueName","queueDrainName","schema","drainSchema","tsplus_module_3","gen","$","mem","MemQueue","q","getOrCreateQueue","qDrain","rcc","RequestContextContainer","wireSchema","tsplus_module_1","struct","body","meta","QueueMeta","drainW","parseDrain","tsplus_module_2","parseCondemnDie","publish","messages","requestContext","currentSpan","span","tsplus_module_5","getOrUndefined","tsplus_module_4","map","Tracer","externalSpan","tsplus_module_7","forkDaemonReportQueue","tsplus_module_6","ext_forEach","m","asUnit","flatMap","sync","JSON","stringify","encodeSync","_","offer","makeDrain","handleEvent","silenceAndReportError","reportNonInterruptedFailure","name","processMessage","msg","orDie","parse","withSpan","tsplus_module_9","setupRequestContext","zipRight","logDebug","pipe","annotateLogs","tsplus_module_8","RecordPretty","object$","RequestContext","inherit","id","RequestId","locale","NonEmptyString255","_tag","attributes","parent","undefined","forkScoped","forever","take","x","fork","uninterruptible","tsplus_module_10","join"],"sources":["../../../_src/services/QueueMaker/memQueue.ts"],"sourcesContent":[null],"mappings":"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"}
1
+ {"version":3,"file":"memQueue.cjs","names":["_memQueue","require","_RequestContext","_ids","_effect","_RequestContextContainer","_errors2","_service","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","makeMemQueue","queueName","queueDrainName","schema","drainSchema","tsplus_module_3","gen","$","mem","MemQueue","q","getOrCreateQueue","qDrain","rcc","RequestContextContainer","wireSchema","tsplus_module_1","struct","body","meta","QueueMeta","drainW","parseDrain","tsplus_module_2","parseCondemnDie","publish","messages","requestContext","currentSpan","orDie","span","Tracer","externalSpan","tsplus_module_5","forkDaemonReportQueue","tsplus_module_4","ext_forEach","m","asUnit","flatMap","sync","JSON","stringify","encodeSync","_","offer","makeDrain","handleEvent","silenceAndReportError","reportNonInterruptedFailure","name","processMessage","msg","parse","withSpan","tsplus_module_7","setupRequestContext","zipRight","logDebug","pipe","annotateLogs","tsplus_module_6","RecordPretty","object$","RequestContext","inherit","id","RequestId","locale","NonEmptyString255","_tag","attributes","parent","undefined","forkScoped","forever","take","x","fork","uninterruptible","tsplus_module_8","join"],"sources":["../../../_src/services/QueueMaker/memQueue.ts"],"sourcesContent":[null],"mappings":"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"}
@@ -11,10 +11,8 @@ var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/prelude/schem
11
11
  var tsplus_module_4 = _interopRequireWildcard(require("@effect-app/prelude/utils"));
12
12
  var tsplus_module_5 = _interopRequireWildcard(require("effect/Effect"));
13
13
  var tsplus_module_6 = _interopRequireWildcard(require("@effect-app/infra/api/setupRequest"));
14
- var tsplus_module_7 = _interopRequireWildcard(require("effect/Option"));
15
- var tsplus_module_8 = _interopRequireWildcard(require("@effect-app/core/Option"));
16
- var tsplus_module_9 = _interopRequireWildcard(require("@effect-app/infra/services/QueueMaker/errors"));
17
- var tsplus_module_10 = _interopRequireWildcard(require("effect/Layer"));
14
+ var tsplus_module_7 = _interopRequireWildcard(require("@effect-app/infra/services/QueueMaker/errors"));
15
+ var tsplus_module_8 = _interopRequireWildcard(require("effect/Layer"));
18
16
  var _ServiceBus = require("@effect-app/infra-adapters/ServiceBus");
19
17
  var _errorReporter = require("@effect-app/infra/errorReporter");
20
18
  var _RequestContext = require("@effect-app/infra/RequestContext");
@@ -80,9 +78,9 @@ function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema) {
80
78
  }),
81
79
  publish: (...messages) => tsplus_module_5.gen(function* ($) {
82
80
  const requestContext = yield* $(rcc.requestContext);
83
- const currentSpan = yield* $(tsplus_module_5.currentSpan);
84
- const span = tsplus_module_8.getOrUndefined(tsplus_module_7.map(currentSpan, _effect.Tracer.externalSpan));
85
- return yield* $(tsplus_module_9.forkDaemonReportQueue(tsplus_module_5.promise(() => s.sendMessages(messages.map(m => ({
81
+ const currentSpan = yield* $(tsplus_module_5.orDie(tsplus_module_5.currentSpan));
82
+ const span = _effect.Tracer.externalSpan(currentSpan);
83
+ return yield* $(tsplus_module_7.forkDaemonReportQueue(tsplus_module_5.promise(() => s.sendMessages(messages.map(m => ({
86
84
  body: JSON.stringify(wireSchema.encodeSync({
87
85
  body: m,
88
86
  meta: {
@@ -102,6 +100,6 @@ function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema) {
102
100
  * @tsplus static QueueMaker.Ops makeServiceBusLayers
103
101
  */
104
102
  function makeServiceBusLayers(url, queueName, queueDrainName) {
105
- return tsplus_module_10.provide((0, _ServiceBus.LiveServiceBusClient)(url))(tsplus_module_10.merge((0, _ServiceBus.LiveSender)(queueName))((0, _ServiceBus.LiveReceiver)(queueDrainName)));
103
+ return tsplus_module_8.provide((0, _ServiceBus.LiveServiceBusClient)(url))(tsplus_module_8.merge((0, _ServiceBus.LiveSender)(queueName))((0, _ServiceBus.LiveReceiver)(queueDrainName)));
106
104
  }
107
105
  //# sourceMappingURL=sbqueue.cjs.map
@@ -1 +1 @@
1
- {"version":3,"file":"sbqueue.cjs","names":["_ServiceBus","require","_errorReporter","_RequestContext","_ids","_schema2","_effect","_RequestContextContainer","_errors2","_service","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","makeServiceBusQueue","_queueName","queueDrainName","schema","drainSchema","wireSchema","struct","body","meta","QueueMeta","drainW","parseDrain","tsplus_module_1","parseCondemnDie","tsplus_module_5","gen","$","s","Sender","receiver","Receiver","receiverLayer","tsplus_module_2","makeLayer","silenceAndReportError","reportNonInterruptedFailure","name","reportError","reportNonInterruptedFailureCause","rcc","RequestContextContainer","makeDrain","handleEvent","processMessage","messageBody","tapErrorCause","flatMap","orDie","sync","JSON","parse","x","withSpan","tsplus_module_6","setupRequestContext","zipRight","logDebug","pipe","annotateLogs","tsplus_module_4","RecordPretty","object$","RequestContext","inherit","requestContext","id","RequestId","locale","tsplus_module_3","NonEmptyString255","_tag","attributes","parent","span","Tracer","externalSpan","undefined","provide","subscribe","uninterruptible","processError","err","captureException","error","publish","messages","currentSpan","tsplus_module_8","getOrUndefined","tsplus_module_7","map","tsplus_module_9","forkDaemonReportQueue","promise","sendMessages","m","stringify","encodeSync","messageId","contentType","makeServiceBusLayers","url","queueName","tsplus_module_10","LiveServiceBusClient","merge","LiveSender","LiveReceiver"],"sources":["../../../_src/services/QueueMaker/sbqueue.ts"],"sourcesContent":[null],"mappings":"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"}
1
+ {"version":3,"file":"sbqueue.cjs","names":["_ServiceBus","require","_errorReporter","_RequestContext","_ids","_schema2","_effect","_RequestContextContainer","_errors2","_service","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","makeServiceBusQueue","_queueName","queueDrainName","schema","drainSchema","wireSchema","struct","body","meta","QueueMeta","drainW","parseDrain","tsplus_module_1","parseCondemnDie","tsplus_module_5","gen","$","s","Sender","receiver","Receiver","receiverLayer","tsplus_module_2","makeLayer","silenceAndReportError","reportNonInterruptedFailure","name","reportError","reportNonInterruptedFailureCause","rcc","RequestContextContainer","makeDrain","handleEvent","processMessage","messageBody","tapErrorCause","flatMap","orDie","sync","JSON","parse","x","withSpan","tsplus_module_6","setupRequestContext","zipRight","logDebug","pipe","annotateLogs","tsplus_module_4","RecordPretty","object$","RequestContext","inherit","requestContext","id","RequestId","locale","tsplus_module_3","NonEmptyString255","_tag","attributes","parent","span","Tracer","externalSpan","undefined","provide","subscribe","uninterruptible","processError","err","captureException","error","publish","messages","currentSpan","tsplus_module_7","forkDaemonReportQueue","promise","sendMessages","map","m","stringify","encodeSync","messageId","contentType","makeServiceBusLayers","url","queueName","tsplus_module_8","LiveServiceBusClient","merge","LiveSender","LiveReceiver"],"sources":["../../../_src/services/QueueMaker/sbqueue.ts"],"sourcesContent":[null],"mappings":"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"}
@@ -33,8 +33,8 @@ export function makeMemQueue<
33
33
  publish: (...messages) =>
34
34
  Effect.gen(function*($) {
35
35
  const requestContext = yield* $(rcc.requestContext)
36
- const currentSpan = yield* $(Effect.currentSpan)
37
- const span = currentSpan.map(Tracer.externalSpan).value
36
+ const currentSpan = yield* $(Effect.currentSpan.orDie)
37
+ const span = Tracer.externalSpan(currentSpan)
38
38
  return yield* $(
39
39
  messages
40
40
  .forEachEffect((m) =>
@@ -91,8 +91,8 @@ export function makeServiceBusQueue<
91
91
  publish: (...messages) =>
92
92
  Effect.gen(function*($) {
93
93
  const requestContext = yield* $(rcc.requestContext)
94
- const currentSpan = yield* $(Effect.currentSpan)
95
- const span = currentSpan.map(Tracer.externalSpan).value
94
+ const currentSpan = yield* $(Effect.currentSpan.orDie)
95
+ const span = Tracer.externalSpan(currentSpan)
96
96
  return yield* $(
97
97
  Effect
98
98
  .promise(() =>
@@ -1,13 +1,11 @@
1
1
  import * as tsplus_module_1 from "@effect-app/prelude/schema";
2
2
  import * as tsplus_module_2 from "@effect-app/schema/ext2";
3
3
  import * as tsplus_module_3 from "effect/Effect";
4
- import * as tsplus_module_4 from "effect/Option";
5
- import * as tsplus_module_5 from "@effect-app/core/Option";
6
- import * as tsplus_module_6 from "@effect-app/core/_ext/Iterable";
7
- import * as tsplus_module_7 from "@effect-app/infra/services/QueueMaker/errors";
8
- import * as tsplus_module_8 from "@effect-app/prelude/utils";
9
- import * as tsplus_module_9 from "@effect-app/infra/api/setupRequest";
10
- import * as tsplus_module_10 from "effect/Fiber";
4
+ import * as tsplus_module_4 from "@effect-app/core/_ext/Iterable";
5
+ import * as tsplus_module_5 from "@effect-app/infra/services/QueueMaker/errors";
6
+ import * as tsplus_module_6 from "@effect-app/prelude/utils";
7
+ import * as tsplus_module_7 from "@effect-app/infra/api/setupRequest";
8
+ import * as tsplus_module_8 from "effect/Fiber";
11
9
  import { MemQueue } from "@effect-app/infra-adapters/memQueue";
12
10
  import { RequestContext } from "@effect-app/infra/RequestContext";
13
11
  import { RequestId } from "@effect-app/prelude/ids";
@@ -30,9 +28,9 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
30
28
  return {
31
29
  publish: (...messages) => tsplus_module_3.gen(function* ($) {
32
30
  const requestContext = yield* $(rcc.requestContext);
33
- const currentSpan = yield* $(tsplus_module_3.currentSpan);
34
- const span = tsplus_module_5.getOrUndefined(tsplus_module_4.map(currentSpan, Tracer.externalSpan));
35
- return yield* $(tsplus_module_7.forkDaemonReportQueue(tsplus_module_6.ext_forEach(messages, (m) => tsplus_module_3.asUnit(
31
+ const currentSpan = yield* $(tsplus_module_3.orDie(tsplus_module_3.currentSpan));
32
+ const span = Tracer.externalSpan(currentSpan);
33
+ return yield* $(tsplus_module_5.forkDaemonReportQueue(tsplus_module_4.ext_forEach(messages, (m) => tsplus_module_3.asUnit(
36
34
  // we JSON encode, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
37
35
  tsplus_module_3.flatMap(tsplus_module_3.sync(() => JSON.stringify(wireSchema.encodeSync({ body: m, meta: { requestContext, span } })))
38
36
  // .tap((msg) => info("Publishing Mem Message: " + utils.inspect(msg)))
@@ -42,8 +40,8 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
42
40
  const silenceAndReportError = reportNonInterruptedFailure({ name: "MemQueue.drain." + queueDrainName });
43
41
  const processMessage = (msg) =>
44
42
  // we JSON parse, because that is what the wire also does, and it reveals holes in e.g unknown encoders (Date->String)
45
- tsplus_module_3.flatMap(tsplus_module_3.orDie(tsplus_module_3.flatMap(tsplus_module_3.sync(() => JSON.parse(msg)), parseDrain)), ({ body, meta }) => tsplus_module_3.withSpan(tsplus_module_9.setupRequestContext(tsplus_module_3.zipRight(tsplus_module_3.logDebug(`$$ [${queueDrainName}] Processing incoming message`)
46
- .pipe(tsplus_module_3.annotateLogs({ body: tsplus_module_8.RecordPretty(tsplus_module_8.object$(body)), meta: tsplus_module_8.RecordPretty(tsplus_module_8.object$(meta)) })), handleEvent(body))
43
+ tsplus_module_3.flatMap(tsplus_module_3.orDie(tsplus_module_3.flatMap(tsplus_module_3.sync(() => JSON.parse(msg)), parseDrain)), ({ body, meta }) => tsplus_module_3.withSpan(tsplus_module_7.setupRequestContext(tsplus_module_3.zipRight(tsplus_module_3.logDebug(`$$ [${queueDrainName}] Processing incoming message`)
44
+ .pipe(tsplus_module_3.annotateLogs({ body: tsplus_module_6.RecordPretty(tsplus_module_6.object$(body)), meta: tsplus_module_6.RecordPretty(tsplus_module_6.object$(meta)) })), handleEvent(body))
47
45
  .pipe(silenceAndReportError), RequestContext.inherit(meta.requestContext, {
48
46
  id: RequestId(body.id),
49
47
  locale: "en",
@@ -55,7 +53,7 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
55
53
  : undefined
56
54
  }));
57
55
  return yield* $(tsplus_module_3.forkScoped(tsplus_module_3.forever(tsplus_module_3.flatMap(qDrain
58
- .take, (x) => tsplus_module_3.flatMap(tsplus_module_3.fork(tsplus_module_3.uninterruptible(processMessage(x))), (_) => tsplus_module_10.join(_)))
56
+ .take, (x) => tsplus_module_3.flatMap(tsplus_module_3.fork(tsplus_module_3.uninterruptible(processMessage(x))), (_) => tsplus_module_8.join(_)))
59
57
  // TODO: normally a failed item would be returned to the queue and retried up to X times.
60
58
  // .flatMap(_ => _._tag === "Failure" && !isInterrupted ? qDrain.offer(x) : Effect.unit) // TODO: retry count tracking and max retries.
61
59
  .pipe(silenceAndReportError))));
@@ -63,4 +61,4 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema) {
63
61
  };
64
62
  });
65
63
  }
66
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtUXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9fc3JjL3NlcnZpY2VzL1F1ZXVlTWFrZXIvbWVtUXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQTtBQUM5RCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDakUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBQ25ELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUE7QUFDL0IsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0JBQStCLENBQUE7QUFDdkUsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQ3pELE9BQU8sRUFBa0IsU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRXhEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLFlBQVksQ0FLMUIsU0FBaUIsRUFDakIsY0FBc0IsRUFDdEIsTUFBbUQsRUFDbkQsV0FBNEQ7SUFFNUQsT0FBTyxvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQzNCLE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUM5QixNQUFNLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUE7UUFDbkQsTUFBTSxNQUFNLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFBO1FBQzdELE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFBO1FBRTdDLE1BQU0sVUFBVSxHQUFHLGdCQUFBLE1BQU0sQ0FBQyxFQUFF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
64
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtUXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9fc3JjL3NlcnZpY2VzL1F1ZXVlTWFrZXIvbWVtUXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0scUNBQXFDLENBQUE7QUFDOUQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBQ2pFLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUNuRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFBUSxDQUFBO0FBQy9CLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLCtCQUErQixDQUFBO0FBQ3ZFLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUN6RCxPQUFPLEVBQWtCLFNBQVMsRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUV4RDs7R0FFRztBQUNILE1BQU0sVUFBVSxZQUFZLENBSzFCLFNBQWlCLEVBQ2pCLGNBQXNCLEVBQ3RCLE1BQW1ELEVBQ25ELFdBQTREO0lBRTVELE9BQU8sb0JBQVcsUUFBUSxDQUFDLEVBQUMsQ0FBQztRQUMzQixNQUFNLEdBQUcsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUE7UUFDOUIsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFBO1FBQ25ELE1BQU0sTUFBTSxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsZ0JBQWdCLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQTtRQUM3RCxNQUFNLEdBQUcsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsdUJBQXVCLENBQUMsQ0FBQTtRQUU3QyxNQUFNLFVBQVUsR0FBRyxnQkFBQSxNQUFNLENBQUMsRUFBRSxJ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
@@ -4,10 +4,8 @@ import * as tsplus_module_3 from "@effect-app/prelude/schema";
4
4
  import * as tsplus_module_4 from "@effect-app/prelude/utils";
5
5
  import * as tsplus_module_5 from "effect/Effect";
6
6
  import * as tsplus_module_6 from "@effect-app/infra/api/setupRequest";
7
- import * as tsplus_module_7 from "effect/Option";
8
- import * as tsplus_module_8 from "@effect-app/core/Option";
9
- import * as tsplus_module_9 from "@effect-app/infra/services/QueueMaker/errors";
10
- import * as tsplus_module_10 from "effect/Layer";
7
+ import * as tsplus_module_7 from "@effect-app/infra/services/QueueMaker/errors";
8
+ import * as tsplus_module_8 from "effect/Layer";
11
9
  import { LiveReceiver, LiveSender, LiveServiceBusClient, Receiver, Sender, subscribe } from "@effect-app/infra-adapters/ServiceBus";
12
10
  import { captureException } from "@effect-app/infra/errorReporter";
13
11
  import { RequestContext } from "@effect-app/infra/RequestContext";
@@ -59,9 +57,9 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
59
57
  }),
60
58
  publish: (...messages) => tsplus_module_5.gen(function* ($) {
61
59
  const requestContext = yield* $(rcc.requestContext);
62
- const currentSpan = yield* $(tsplus_module_5.currentSpan);
63
- const span = tsplus_module_8.getOrUndefined(tsplus_module_7.map(currentSpan, Tracer.externalSpan));
64
- return yield* $(tsplus_module_9.forkDaemonReportQueue(tsplus_module_5.promise(() => s.sendMessages(messages.map((m) => ({
60
+ const currentSpan = yield* $(tsplus_module_5.orDie(tsplus_module_5.currentSpan));
61
+ const span = Tracer.externalSpan(currentSpan);
62
+ return yield* $(tsplus_module_7.forkDaemonReportQueue(tsplus_module_5.promise(() => s.sendMessages(messages.map((m) => ({
65
63
  body: JSON.stringify(wireSchema.encodeSync({ body: m, meta: { requestContext, span } })),
66
64
  messageId: m.id, /* correllationid: requestId */
67
65
  contentType: "application/json"
@@ -74,6 +72,6 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
74
72
  * @tsplus static QueueMaker.Ops makeServiceBusLayers
75
73
  */
76
74
  export function makeServiceBusLayers(url, queueName, queueDrainName) {
77
- return tsplus_module_10.provide(LiveServiceBusClient(url))((tsplus_module_10.merge(LiveSender(queueName))(LiveReceiver(queueDrainName))));
75
+ return tsplus_module_8.provide(LiveServiceBusClient(url))((tsplus_module_8.merge(LiveSender(queueName))(LiveReceiver(queueDrainName))));
78
76
  }
79
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2JxdWV1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvUXVldWVNYWtlci9zYnF1ZXVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSxPQUFPLEVBQ0wsWUFBWSxFQUNaLFVBQVUsRUFDVixvQkFBb0IsRUFDcEIsUUFBUSxFQUNSLE1BQU0sRUFDTixTQUFTLEVBQ1YsTUFBTSx1Q0FBdUMsQ0FBQTtBQUU5QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQTtBQUNsRSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDakUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBQ25ELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUMzQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFBUSxDQUFBO0FBQy9CLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLCtCQUErQixDQUFBO0FBQ3ZFLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxnQ0FBZ0MsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUMzRixPQUFPLEVBQWtCLFNBQVMsRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUV4RDs7R0FFRztBQUNILE1BQU0sVUFBVSxtQkFBbUIsQ0FLakMsVUFBa0IsRUFDbEIsY0FBc0IsRUFDdEIsTUFBbUQsRUFDbkQsV0FBNEQ7SUFFNUQsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDO1FBQ3hCLElBQUksRUFBRSxNQUFNO1FBQ1osSUFBSSxFQUFFLFNBQVM7S0FDaEIsQ0FBQyxDQUFBO0lBQ0YsTUFBTSxNQUFNLEdBQUcsTUFBTSxDQUFDLEVBQUUsSUFBSSxFQUFFLFdBQVcsRUFBRSxJQUFJLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQTtJQUM3RCxNQUFNLFVBQVUsbUNBQUcsTUFBTSxDQUFnQixDQUFBO0lBRXpDLE9BQU8sb0JB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
77
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2JxdWV1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvUXVldWVNYWtlci9zYnF1ZXVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7O0FBQUEsT0FBTyxFQUNMLFlBQVksRUFDWixVQUFVLEVBQ1Ysb0JBQW9CLEVBQ3BCLFFBQVEsRUFDUixNQUFNLEVBQ04sU0FBUyxFQUNWLE1BQU0sdUNBQXVDLENBQUE7QUFFOUMsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0saUNBQWlDLENBQUE7QUFDbEUsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGtDQUFrQyxDQUFBO0FBQ2pFLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUNuRCxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDM0MsT0FBTyxFQUFFLE1BQU0sRUFBRSxNQUFNLFFBQVEsQ0FBQTtBQUMvQixPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSwrQkFBK0IsQ0FBQTtBQUN2RSxPQUFPLEVBQUUsMkJBQTJCLEVBQUUsZ0NBQWdDLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFDM0YsT0FBTyxFQUFrQixTQUFTLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFFeEQ7O0dBRUc7QUFDSCxNQUFNLFVBQVUsbUJBQW1CLENBS2pDLFVBQWtCLEVBQ2xCLGNBQXNCLEVBQ3RCLE1BQW1ELEVBQ25ELFdBQTREO0lBRTVELE1BQU0sVUFBVSxHQUFHLE1BQU0sQ0FBQztRQUN4QixJQUFJLEVBQUUsTUFBTTtRQUNaLElBQUksRUFBRSxTQUFTO0tBQ2hCLENBQUMsQ0FBQTtJQUNGLE1BQU0sTUFBTSxHQUFHLE1BQU0sQ0FBQyxFQUFFLElBQUksRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLFNBQVMsRUFBRSxDQUFDLENBQUE7SUFDN0QsTUFBTSxVQUFVLG1DQUFHLE1BQU0sQ0FBZ0IsQ0FBQTtJQUV6QyxPQUFPLG9CQUFX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
@@ -100,7 +100,7 @@ export declare function makeRepo<PM extends {
100
100
  value: A_1;
101
101
  readonly S: PM;
102
102
  };
103
- }) => Where | readonly [Where, ...Where[]], mode?: "or" | "and" | undefined) => Filter<PM>;
103
+ }) => Where | readonly [Where, ...Where[]], mode?: "and" | "or" | undefined) => Filter<PM>;
104
104
  query: (fn: (f: import("./Store/filterApi/query.js").FilterTest<PM>, fields: import("./Store/filterApi/proxy.js").Filter<PM, never>) => QueryBuilder<PM>) => QueryBuilder<PM>;
105
105
  };
106
106
  /**
@@ -7,8 +7,8 @@ import type { DBRecord } from "./shared.js";
7
7
  import { OptimisticLockException } from "./shared.js";
8
8
  import * as simpledb from "./simpledb.js";
9
9
  export declare function createContext<TKey extends string, EA, A extends DBRecord<TKey>>(): <REncode, RDecode, EDecode>(type: string, encode: (record: A) => Effect<REncode, never, EA>, decode: (d: EA) => Effect<RDecode, EDecode, A>, indexes: IndexingPolicy) => import("effect/Effect").Effect<Cosmos.CosmosClient, import("effect/Cause").UnknownException, {
10
- find: (id: string) => import("effect/Effect").Effect<Cosmos.CosmosClient | simpledb.RecordCache | RDecode, import("effect/Cause").UnknownException | simpledb.InvalidStateError, import("effect/Option").Option<A>>;
10
+ find: (id: string) => import("effect/Effect").Effect<RDecode | Cosmos.CosmosClient | simpledb.RecordCache, import("effect/Cause").UnknownException | simpledb.InvalidStateError, import("effect/Option").Option<A>>;
11
11
  findBy: (parameters: Record<string, string>) => import("effect/Effect").Effect<Cosmos.CosmosClient, import("effect/Cause").UnknownException, import("effect/Option").Option<any>>;
12
- save: (record: A) => import("effect/Effect").Effect<Cosmos.CosmosClient | simpledb.RecordCache | REncode, OptimisticLockException, A>;
12
+ save: (record: A) => import("effect/Effect").Effect<REncode | Cosmos.CosmosClient | simpledb.RecordCache, OptimisticLockException, A>;
13
13
  }>;
14
14
  //# sourceMappingURL=cosmosdb.d.ts.map
@@ -6,7 +6,7 @@ import * as simpledb from "./simpledb.js";
6
6
  export declare function createContext<TKey extends string, EA, A extends DBRecord<TKey>>(): <REncode, RDecode, EDecode>(type: string, encode: (record: A) => Effect<REncode, never, EA>, decode: (d: EA) => Effect<RDecode, EDecode, A>, schemaVersion: string, makeIndexKey: (r: A) => Index, dir?: string) => {
7
7
  find: (id: string) => import("effect/Effect").Effect<simpledb.RecordCache | RDecode, simpledb.InvalidStateError, import("effect/Option").Option<A>>;
8
8
  findByIndex: (index: Index) => import("effect/Effect").Effect<never, never, import("effect/Option").Option<TKey & {}>>;
9
- save: (record: A) => import("effect/Effect").Effect<simpledb.RecordCache | REncode, CouldNotAquireDbLockException | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, A>;
9
+ save: (record: A) => import("effect/Effect").Effect<simpledb.RecordCache | REncode, import("./shared.js").OptimisticLockException | simpledb.InvalidStateError | CouldNotAquireDbLockException, A>;
10
10
  };
11
11
  export declare function initialise(dir: string): void;
12
12
  //# sourceMappingURL=diskdb.d.ts.map
@@ -6,9 +6,9 @@ import type { DBRecord, Index } from "./shared.js";
6
6
  import { CouldNotAquireDbLockException } from "./shared.js";
7
7
  import * as simpledb from "./simpledb.js";
8
8
  export declare function createContext<TKey extends string, EA, A extends DBRecord<TKey>>(): <REncode, RDecode, EDecode>(type: string, encode: (record: A) => Effect<REncode, never, EA>, decode: (d: EA) => Effect<RDecode, EDecode, A>, schemaVersion: string, makeIndexKey: (r: A) => Index) => {
9
- find: (id: string) => import("effect/Effect").Effect<RedisClient | simpledb.RecordCache | RDecode, simpledb.InvalidStateError, import("effect/Option").Option<A>>;
9
+ find: (id: string) => import("effect/Effect").Effect<simpledb.RecordCache | RDecode | RedisClient, simpledb.InvalidStateError, import("effect/Option").Option<A>>;
10
10
  findByIndex: (index: Index) => import("effect/Effect").Effect<RedisClient, import("@effect-app/infra-adapters/redis-client").ConnectionException, import("effect/Option").Option<TKey>>;
11
- save: (record: A) => import("effect/Effect").Effect<RedisClient | simpledb.RecordCache | REncode, CouldNotAquireDbLockException | import("./shared.js").OptimisticLockException | simpledb.InvalidStateError, A>;
11
+ save: (record: A) => import("effect/Effect").Effect<simpledb.RecordCache | REncode | RedisClient, import("./shared.js").OptimisticLockException | simpledb.InvalidStateError | CouldNotAquireDbLockException, A>;
12
12
  };
13
13
  declare const RedisSerializedDBRecord_base: S.Class<RedisSerializedDBRecord, S.SchemaProperties<S.ToProps<{
14
14
  version: S.SchemaDefaultSchema<unknown, string, string, string, {}>;
@@ -17,7 +17,7 @@ export interface RecordCache extends ReturnType<typeof makeLiveRecordCache> {
17
17
  }
18
18
  export declare const RecordCache: import("effect/Context").Tag<RecordCache, RecordCache>;
19
19
  export declare const LiveRecordCache: import("effect/Layer").Layer<never, never, RecordCache>;
20
- export declare function find<R, RDecode, EDecode, E, EA, A>(tryRead: (id: string) => Effect<R, E, Option<CachedRecord<EA>>>, decode: (d: EA) => Effect<RDecode, EDecode, A>, type: string): (id: string) => import("effect/Effect").Effect<RecordCache | R | RDecode, InvalidStateError | E, import("effect/Option").Option<A>>;
21
- export declare function storeDirectly<R, E, TKey extends string, A extends DBRecord<TKey>>(save: (r: A, version: Option<Version>) => Effect<R, E, CachedRecord<A>>, type: string): (record: A) => import("effect/Effect").Effect<RecordCache | R, E, A>;
20
+ export declare function find<R, RDecode, EDecode, E, EA, A>(tryRead: (id: string) => Effect<R, E, Option<CachedRecord<EA>>>, decode: (d: EA) => Effect<RDecode, EDecode, A>, type: string): (id: string) => import("effect/Effect").Effect<R | RDecode | RecordCache, E | InvalidStateError, import("effect/Option").Option<A>>;
21
+ export declare function storeDirectly<R, E, TKey extends string, A extends DBRecord<TKey>>(save: (r: A, version: Option<Version>) => Effect<R, E, CachedRecord<A>>, type: string): (record: A) => import("effect/Effect").Effect<R | RecordCache, E, A>;
22
22
  export declare function store<R, E, R2, E2, TKey extends string, EA, A extends DBRecord<TKey>>(tryRead: (id: string) => Effect<R, E, Option<CachedRecord<EA>>>, save: (r: A, version: Option<Version>) => Effect<R, E, CachedRecord<A>>, lock: (id: string) => Effect<R2 | Scope, E2, unknown>, type: string): (record: A) => import("effect/Effect").Effect<RecordCache | R | Exclude<R2, import("effect/Scope").Scope>, OptimisticLockException | InvalidStateError | E | E2, A>;
23
23
  //# sourceMappingURL=simpledb.d.ts.map
package/package.json CHANGED
@@ -1,12 +1,12 @@
1
1
  {
2
2
  "name": "@effect-app/infra",
3
- "version": "0.130.1",
3
+ "version": "0.131.0",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "dependencies": {
7
7
  "@azure/cosmos": "^4.0.0",
8
8
  "@azure/service-bus": "^7.9.3",
9
- "effect": "^2.0.0-next.61",
9
+ "effect": "^2.0.0-next.62",
10
10
  "@faker-js/faker": "^8.3.1",
11
11
  "@sendgrid/helpers": "^8.0.0",
12
12
  "@sendgrid/mail": "^8.1.0",
@@ -18,10 +18,10 @@
18
18
  "proper-lockfile": "^4.1.2",
19
19
  "pure-rand": "6.0.4",
20
20
  "redlock": "^4.2.0",
21
- "@effect-app/core": "0.95.1",
22
- "@effect-app/prelude": "0.104.1",
23
- "@effect-app/schema": "0.89.1",
24
- "@effect-app/infra-adapters": "0.82.1"
21
+ "@effect-app/core": "0.96.0",
22
+ "@effect-app/infra-adapters": "0.83.0",
23
+ "@effect-app/prelude": "0.105.0",
24
+ "@effect-app/schema": "0.90.0"
25
25
  },
26
26
  "devDependencies": {
27
27
  "@babel/cli": "^7.23.4",