@effect-app/infra 0.170.5 → 0.171.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.
Files changed (90) hide show
  1. package/CHANGELOG.md +23 -0
  2. package/_cjs/api/routing/base.cjs.map +1 -1
  3. package/_cjs/api/routing/makeRequestHandler.cjs.map +1 -1
  4. package/_cjs/services/QueueMaker/errors.cjs.map +1 -1
  5. package/_cjs/services/Repository/dsl.cjs +70 -0
  6. package/_cjs/services/Repository/dsl.cjs.map +1 -0
  7. package/_cjs/services/Repository/ext.cjs +202 -0
  8. package/_cjs/services/Repository/ext.cjs.map +1 -0
  9. package/_cjs/services/Repository/service.cjs +6 -0
  10. package/_cjs/services/Repository/service.cjs.map +1 -0
  11. package/_cjs/services/Repository.cjs +32 -252
  12. package/_cjs/services/Repository.cjs.map +1 -1
  13. package/_cjs/services/RepositoryBase.cjs +173 -48
  14. package/_cjs/services/RepositoryBase.cjs.map +1 -1
  15. package/_cjs/services/RequestContextContainer.cjs +6 -7
  16. package/_cjs/services/RequestContextContainer.cjs.map +1 -1
  17. package/_cjs/services/Store/ContextMapContainer.cjs +6 -7
  18. package/_cjs/services/Store/ContextMapContainer.cjs.map +1 -1
  19. package/_cjs/services/Store/Memory.cjs.map +1 -1
  20. package/_cjs/services/Store/utils.cjs.map +1 -1
  21. package/_src/api/routing/base.ts +5 -3
  22. package/_src/api/routing/makeRequestHandler.ts +20 -12
  23. package/_src/rateLimit.ts +2 -2
  24. package/_src/services/Emailer/Sendgrid.ts +2 -2
  25. package/_src/services/QueueMaker/errors.ts +6 -3
  26. package/_src/services/QueueMaker/memQueue.ts +2 -2
  27. package/_src/services/QueueMaker/sbqueue.ts +2 -2
  28. package/_src/services/Repository/dsl.ts +137 -0
  29. package/_src/services/Repository/ext.ts +669 -0
  30. package/_src/services/Repository/service.ts +12 -0
  31. package/_src/services/Repository.ts +3 -791
  32. package/_src/services/RepositoryBase.ts +640 -13
  33. package/_src/services/RequestContextContainer.ts +14 -16
  34. package/_src/services/Store/ContextMapContainer.ts +6 -9
  35. package/_src/services/Store/Cosmos.ts +2 -2
  36. package/_src/services/Store/Disk.ts +2 -2
  37. package/_src/services/Store/Memory.ts +2 -1
  38. package/_src/services/Store/Redis.ts +2 -2
  39. package/_src/services/Store/utils.ts +4 -5
  40. package/_src/services/simpledb/cosmosdb.ts +1 -1
  41. package/_src/services/simpledb/diskdb.ts +1 -1
  42. package/_src/services/simpledb/memdb.ts +1 -1
  43. package/_src/services/simpledb/mongodb.ts +1 -1
  44. package/_src/services/simpledb/redisdb.ts +2 -2
  45. package/dist/api/routing/base.d.ts +1 -2
  46. package/dist/api/routing/base.d.ts.map +1 -1
  47. package/dist/api/routing/base.js +1 -1
  48. package/dist/api/routing/makeRequestHandler.d.ts.map +1 -1
  49. package/dist/api/routing/makeRequestHandler.js +15 -11
  50. package/dist/rateLimit.js +1 -1
  51. package/dist/services/Emailer/Sendgrid.js +1 -1
  52. package/dist/services/QueueMaker/errors.d.ts.map +1 -1
  53. package/dist/services/QueueMaker/errors.js +5 -2
  54. package/dist/services/QueueMaker/memQueue.js +1 -1
  55. package/dist/services/QueueMaker/sbqueue.js +1 -1
  56. package/dist/services/QueueMaker/service.d.ts +2 -2
  57. package/dist/services/Repository/dsl.d.ts +51 -0
  58. package/dist/services/Repository/dsl.d.ts.map +1 -0
  59. package/dist/services/Repository/dsl.js +55 -0
  60. package/dist/services/Repository/ext.d.ts +310 -0
  61. package/dist/services/Repository/ext.d.ts.map +1 -0
  62. package/dist/services/Repository/ext.js +166 -0
  63. package/dist/services/Repository/service.d.ts +10 -0
  64. package/dist/services/Repository/service.d.ts.map +1 -0
  65. package/dist/services/Repository/service.js +2 -0
  66. package/dist/services/Repository.d.ts +3 -363
  67. package/dist/services/Repository.d.ts.map +1 -1
  68. package/dist/services/Repository.js +4 -217
  69. package/dist/services/RepositoryBase.d.ts +241 -6
  70. package/dist/services/RepositoryBase.d.ts.map +1 -1
  71. package/dist/services/RepositoryBase.js +176 -52
  72. package/dist/services/RequestContextContainer.d.ts +3 -5
  73. package/dist/services/RequestContextContainer.d.ts.map +1 -1
  74. package/dist/services/RequestContextContainer.js +17 -16
  75. package/dist/services/Store/ContextMapContainer.d.ts +2 -5
  76. package/dist/services/Store/ContextMapContainer.d.ts.map +1 -1
  77. package/dist/services/Store/ContextMapContainer.js +7 -8
  78. package/dist/services/Store/Cosmos.js +1 -1
  79. package/dist/services/Store/Disk.js +1 -1
  80. package/dist/services/Store/Memory.d.ts.map +1 -1
  81. package/dist/services/Store/Memory.js +1 -1
  82. package/dist/services/Store/Redis.js +1 -1
  83. package/dist/services/Store/utils.d.ts.map +1 -1
  84. package/dist/services/Store/utils.js +1 -1
  85. package/dist/services/simpledb/cosmosdb.js +1 -1
  86. package/dist/services/simpledb/diskdb.js +1 -1
  87. package/dist/services/simpledb/memdb.js +1 -1
  88. package/dist/services/simpledb/mongodb.js +1 -1
  89. package/dist/services/simpledb/redisdb.js +1 -1
  90. package/package.json +37 -7
@@ -1,16 +1,24 @@
1
- import * as tsplus_module_1 from "effect/Effect";
2
- import * as tsplus_module_2 from "@effect-app/core/Array";
3
- import * as tsplus_module_3 from "@effect-app/core/_ext/Iterable";
4
- import * as tsplus_module_4 from "@effect-app/core/Effect";
5
- import * as tsplus_module_5 from "@effect-app/core/Chunk";
6
- import * as tsplus_module_6 from "@effect/schema/Schema";
7
- import * as tsplus_module_7 from "@effect-app/core/Function";
8
- import * as tsplus_module_8 from "effect/PubSub";
9
- import * as tsplus_module_9 from "@effect-app/infra/services/Repository";
10
- import * as tsplus_module_10 from "@effect-app/prelude/service";
1
+ import * as tsplus_module_1 from "@effect-app/prelude/_ext/misc";
2
+ import * as tsplus_module_2 from "effect/Effect";
3
+ import * as tsplus_module_3 from "@effect-app/infra/services/Repository/ext";
4
+ import * as tsplus_module_4 from "@effect-app/prelude/schema";
5
+ import * as tsplus_module_5 from "@effect-app/prelude/Pure";
6
+ import * as tsplus_module_6 from "@effect-app/core/Array";
7
+ import * as tsplus_module_7 from "@effect-app/core/_ext/Iterable";
8
+ import * as tsplus_module_8 from "@effect-app/core/Effect";
9
+ import * as tsplus_module_9 from "@effect-app/core/Chunk";
10
+ import * as tsplus_module_10 from "@effect/schema/Schema";
11
+ import * as tsplus_module_11 from "@effect-app/core/Function";
12
+ import * as tsplus_module_12 from "effect/PubSub";
13
+ import * as tsplus_module_13 from "@effect-app/prelude/service";
14
+ /* eslint-disable @typescript-eslint/no-explicit-any */
15
+ /* eslint-disable @typescript-eslint/ban-types */
16
+ // import type { ParserEnv } from "@effect-app/schema/custom/Parser"
17
+ import { AnyPureDSL, byIdAndSaveWithPure, get, queryAndSaveOnePureEffect, queryEffect, queryOneEffect, saveAllWithEffectInt, saveManyWithPure_, saveManyWithPureBatched_, saveWithPure_ } from "./Repository.js";
11
18
  import { StoreMaker } from "./Store.js";
12
19
  import { makeFilters } from "@effect-app/infra/filter";
13
20
  import { S } from "@effect-app/prelude";
21
+ import { NotFoundError } from "../errors.js";
14
22
  import { ContextMapContainer } from "./Store/ContextMapContainer.js";
15
23
  import { QueryBuilder } from "./Store/filterApi/query.js";
16
24
  /**
@@ -37,6 +45,114 @@ export class RepositoryBaseC2 extends RepositoryBaseC1 {
37
45
  this.changeFeed = this.impl.changeFeed;
38
46
  }
39
47
  }
48
+ export class RepositoryBaseC3 extends RepositoryBaseC2 {
49
+ constructor() {
50
+ super(...arguments);
51
+ this.log = (evt) => AnyPureDSL.log(evt);
52
+ this.save = (...items) => this.saveAndPublish(items);
53
+ this.saveWithEvents = (events) => (...items) => this.saveAndPublish(items, events);
54
+ }
55
+ get(id) {
56
+ return tsplus_module_2.flatMap(this
57
+ .find(id), (_) => tsplus_module_1.encaseMaybeInEffect_(_, () => new NotFoundError({ type: this.itemType, id })));
58
+ }
59
+ projectEffect(map) {
60
+ // TODO: a projection that gets sent to the db instead.
61
+ return tsplus_module_2.flatMap(map, (f) => tsplus_module_2.map(this
62
+ .utils
63
+ .filter(f), (_) => f.collect ? _.filterMap(f.collect) : _));
64
+ }
65
+ project(map) {
66
+ return tsplus_module_3.projectEffect(this, tsplus_module_2.sync(() => map));
67
+ }
68
+ /**
69
+ * TODO: count inside the db.
70
+ * @tsplus fluent Repository project
71
+ */
72
+ count(filter) {
73
+ return tsplus_module_2.map(tsplus_module_3.projectEffect(this, tsplus_module_2.sync(() => ({ filter }))), (_) => tsplus_module_4.NonNegativeInt(_.length));
74
+ }
75
+ /**
76
+ * @tsplus fluent Repository queryEffect
77
+ */
78
+ queryEffect(
79
+ // TODO: think about collectPM, collectE, and collect(Parsed)
80
+ map) {
81
+ return tsplus_module_2.flatMap(map, (f) => tsplus_module_2.map(tsplus_module_2.flatMap((f.filter ? this.utils.filter(f) : this.utils.all), (_) => this.utils.parseMany(_)), (_) => f.collect ? _.filterMap(f.collect) : _));
82
+ }
83
+ queryOneEffect(
84
+ // TODO: think about collectPM, collectE, and collect(Parsed)
85
+ map) {
86
+ return tsplus_module_2.flatMap(map, (f) => tsplus_module_2.flatMap(tsplus_module_2.flatMap((f.filter ? this.utils.filter({ filter: f.filter, limit: 1 }) : this.utils.all), (_) => this.utils.parseMany(_)), (_) => tsplus_module_2.map(tsplus_module_1.encaseMaybeInEffect_((f.collect ? _.filterMap(f.collect) : _)
87
+ .toNonEmpty, () => new NotFoundError({ type: this.itemType, id: f.filter })), (_) => _[0])));
88
+ }
89
+ /**
90
+ * @tsplus fluent Repository query
91
+ */
92
+ query(
93
+ // TODO: think about collectPM, collectE, and collect(Parsed)
94
+ map) {
95
+ return tsplus_module_3.queryEffect(this, tsplus_module_2.sync(() => map));
96
+ }
97
+ queryOne(map) {
98
+ return tsplus_module_3.queryOneEffect(this, tsplus_module_2.sync(() => map));
99
+ }
100
+ queryAndSaveOnePureEffect(map) {
101
+ return (pure) => tsplus_module_2.flatMap(queryOneEffect(this, map), (_) => saveWithPure_(this, _, pure));
102
+ }
103
+ queryAndSaveOnePure(map) {
104
+ return queryAndSaveOnePureEffect(this, tsplus_module_2.sync(() => map));
105
+ }
106
+ /**
107
+ * @tsplus fluent Repository queryAndSavePureEffect
108
+ */
109
+ queryAndSavePureEffect(map) {
110
+ return (pure) => tsplus_module_2.flatMap(queryEffect(this, map), (_) => tsplus_module_3.saveManyWithPure_(this, _, pure));
111
+ }
112
+ /**
113
+ * @tsplus fluent Repository queryAndSavePure
114
+ */
115
+ queryAndSavePure(map) {
116
+ return tsplus_module_3.queryAndSavePureEffect(this, tsplus_module_2.sync(() => map));
117
+ }
118
+ saveManyWithPure() {
119
+ return (pure) => (items) => saveManyWithPure_(this, items, pure);
120
+ }
121
+ byIdAndSaveWithPure(id) {
122
+ return (pure) => tsplus_module_2.flatMap(get(this, id), (item) => saveWithPure_(this, item, pure));
123
+ }
124
+ /**
125
+ * NOTE: it's not as composable, only useful when the request is simple, and only this part needs request args.
126
+ */
127
+ handleByIdAndSaveWithPure() {
128
+ return (pure) => (req, ctx) => byIdAndSaveWithPure(this, req.id)(pure(req, ctx));
129
+ }
130
+ saveManyWithPure_(items, pure) {
131
+ return saveAllWithEffectInt(this, tsplus_module_5.runTerm(pure, [...items]));
132
+ }
133
+ saveWithPure_(item, pure) {
134
+ return saveAllWithEffectInt(this, tsplus_module_2.map(tsplus_module_5.runTerm(pure, item), ([item, events, a]) => [[item], events, a]));
135
+ }
136
+ saveAllWithEffectInt(gen) {
137
+ return tsplus_module_2.flatMap(gen, ([items, events, a]) => tsplus_module_2.map(this.saveAndPublish(items, events), () => a));
138
+ }
139
+ queryAndSavePureEffectBatched(
140
+ // TODO: think about collectPM, collectE, and collect(Parsed)
141
+ map, batchSize = 100) {
142
+ return (pure) => tsplus_module_2.flatMap(queryEffect(this, map), (_) => tsplus_module_3.saveManyWithPureBatched_(this, _, pure, batchSize));
143
+ }
144
+ queryAndSavePureBatched(
145
+ // TODO: think about collectPM, collectE, and collect(Parsed)
146
+ map, batchSize = 100) {
147
+ return tsplus_module_3.queryAndSavePureEffectBatched(this, tsplus_module_2.sync(() => map), batchSize);
148
+ }
149
+ saveManyWithPureBatched(batchSize = 100) {
150
+ return (pure) => (items) => saveManyWithPureBatched_(this, items, pure, batchSize);
151
+ }
152
+ saveManyWithPureBatched_(items, pure, batchSize = 100) {
153
+ return tsplus_module_7.ext_forEach(tsplus_module_6.chunk_(items, batchSize), (batch) => saveAllWithEffectInt(this, tsplus_module_5.runTerm(pure, batch)));
154
+ }
155
+ }
40
156
  /**
41
157
  * A base implementation to create a repository.
42
158
  */
@@ -52,66 +168,74 @@ export function makeRepo() {
52
168
  }
53
169
  const mkStore = makeStore()(name, schema, mapTo);
54
170
  function make(args) {
55
- return tsplus_module_1.withLogSpan(tsplus_module_1.flatMap(tsplus_module_1.context(), rctx => {
56
- const encode = tsplus_module_7.flow(tsplus_module_6.encode(schema), tsplus_module_1.provide(rctx));
57
- const decode = tsplus_module_7.flow(tsplus_module_6.decode(schema), tsplus_module_1.provide(rctx));
58
- return tsplus_module_1.flatMap(mkStore(args.makeInitial, args.config), store => tsplus_module_1.flatMap(ContextMapContainer, ({ get }) => {
171
+ return tsplus_module_2.withLogSpan(tsplus_module_2.flatMap(tsplus_module_2.context(), rctx => {
172
+ const encode = tsplus_module_11.flow(tsplus_module_10.encode(schema), tsplus_module_2.provide(rctx));
173
+ const decode = tsplus_module_11.flow(tsplus_module_10.decode(schema), tsplus_module_2.provide(rctx));
174
+ return tsplus_module_2.flatMap(mkStore(args.makeInitial, args.config), store => tsplus_module_2.flatMap(ContextMapContainer, ({ get }) => {
59
175
  const cms = get.andThen((_) => ({
60
176
  get: (id) => _.get(`${name}.${id}`),
61
177
  set: (id, etag) => _.set(`${name}.${id}`, etag)
62
178
  }));
63
- return tsplus_module_1.flatMap(tsplus_module_1.context(), pubCfg => {
64
- const pub = "publishEvents" in args ? tsplus_module_7.flow(args.publishEvents, (_) => tsplus_module_1.provide(_, pubCfg)) : () => tsplus_module_1.unit;
65
- return tsplus_module_1.map(tsplus_module_8.unbounded(), changeFeed => {
66
- const allE = tsplus_module_1.flatMap(store.all, (items) => tsplus_module_1.map(cms, ({ set }) => items.map((_) => mapReverse(_, set))));
67
- const all = tsplus_module_1.flatMap(allE, (_) => tsplus_module_1.orDie(_.forEachEffect((_) => decode(_), { concurrency: "inherit", batching: true })));
179
+ return tsplus_module_2.flatMap(tsplus_module_2.context(), pubCfg => {
180
+ const pub = "publishEvents" in args ? tsplus_module_11.flow(args.publishEvents, (_) => tsplus_module_2.provide(_, pubCfg)) : () => tsplus_module_2.unit;
181
+ return tsplus_module_2.map(tsplus_module_12.unbounded(), changeFeed => {
182
+ const allE = tsplus_module_2.flatMap(store.all, (items) => tsplus_module_2.map(cms, ({ set }) => items.map((_) => mapReverse(_, set))));
183
+ const all = tsplus_module_2.flatMap(allE, (_) => tsplus_module_2.orDie(_.forEachEffect((_) => decode(_), { concurrency: "inherit", batching: true })));
68
184
  const structSchema = schema;
69
185
  const i = ("struct" in structSchema ? structSchema["struct"] : schema).pipe((_) => _.ast._tag === "Union"
70
186
  // we need to get the TypeLiteral, incase of class it's behind a transform...
71
187
  ? S.union(..._.ast.types.map((_) => S.make(_._tag === "Transform" ? _.from : _)
72
188
  .pipe(S.pick("id"))))
73
- : _.ast._tag === "Transform"
74
- ? S.make(_.ast.from)
75
- .pipe(S.pick("id"))
76
- : _.pipe(S.pick("id")));
77
- const encodeId = tsplus_module_7.flow(tsplus_module_6.encode(i), tsplus_module_1.provide(rctx));
189
+ : _
190
+ .ast
191
+ ._tag === "Transform"
192
+ ? S
193
+ .make(_
194
+ .ast
195
+ .from)
196
+ .pipe(S
197
+ .pick("id"))
198
+ : _
199
+ .pipe(S
200
+ .pick("id")));
201
+ const encodeId = tsplus_module_11.flow(tsplus_module_10.encode(i), tsplus_module_2.provide(rctx));
78
202
  function findE(_id) {
79
- return tsplus_module_1.flatMap(tsplus_module_1.orDie(tsplus_module_1.map(encodeId({ id: _id }), (_) => _.id)).andThen((id) => store
80
- .find(id)), (items) => tsplus_module_1.map(cms, ({ set }) => items.map((_) => mapReverse(_, set))));
203
+ return tsplus_module_2.flatMap(tsplus_module_2.orDie(tsplus_module_2.map(encodeId({ id: _id }), (_) => _.id)).andThen((id) => store
204
+ .find(id)), (items) => tsplus_module_2.map(cms, ({ set }) => items.map((_) => mapReverse(_, set))));
81
205
  }
82
206
  function find(id) {
83
- return tsplus_module_4.flatMapOption(findE(id), (_) => tsplus_module_1.orDie(decode(_)));
207
+ return tsplus_module_8.flatMapOption(findE(id), (_) => tsplus_module_2.orDie(decode(_)));
84
208
  }
85
- const saveAllE = (a) => tsplus_module_1.asUnit(tsplus_module_4.flatMapOption(tsplus_module_1.sync(() => tsplus_module_2.CollectionToNonEmptyReadonlyArray(a)), (a) => tsplus_module_1.flatMap(cms, ({ get, set }) => {
209
+ const saveAllE = (a) => tsplus_module_2.asUnit(tsplus_module_8.flatMapOption(tsplus_module_2.sync(() => tsplus_module_6.CollectionToNonEmptyReadonlyArray(a)), (a) => tsplus_module_2.flatMap(cms, ({ get, set }) => {
86
210
  const items = a.map((_) => mapToPersistenceModel(_, get));
87
- return tsplus_module_1.map(store.batchSet(items), ret => {
211
+ return tsplus_module_2.map(store.batchSet(items), ret => {
88
212
  ret.forEach((_) => set(_.id, _._etag));
89
213
  });
90
214
  })));
91
- const saveAll = (a) => tsplus_module_1.orDie(tsplus_module_3.ext_forEach(tsplus_module_2.ext_itToChunk(a), (_) => encode(_), { concurrency: "inherit", batching: true })).andThen(saveAllE);
215
+ const saveAll = (a) => tsplus_module_2.orDie(tsplus_module_7.ext_forEach(tsplus_module_6.ext_itToChunk(a), (_) => encode(_), { concurrency: "inherit", batching: true })).andThen(saveAllE);
92
216
  const saveAndPublish = (items, events = []) => {
93
- const it = tsplus_module_2.ext_itToChunk(items);
94
- return tsplus_module_1.asUnit(tsplus_module_4.flatMapOption(saveAll(it)
95
- .andThen(tsplus_module_1.sync(() => tsplus_module_2.CollectionToNonEmptyReadonlyArray(events)))
217
+ const it = tsplus_module_6.ext_itToChunk(items);
218
+ return tsplus_module_2.asUnit(tsplus_module_8.flatMapOption(saveAll(it)
219
+ .andThen(tsplus_module_2.sync(() => tsplus_module_6.CollectionToNonEmptyReadonlyArray(events)))
96
220
  // TODO: for full consistency the events should be stored within the same database transaction, and then picked up.
97
221
  , pub)
98
222
  .andThen(changeFeed
99
- .publish([tsplus_module_5.toArray(it), "save"])));
223
+ .publish([tsplus_module_9.toArray(it), "save"])));
100
224
  };
101
225
  function removeAndPublish(a, events = []) {
102
- return tsplus_module_1.gen(function* ($) {
226
+ return tsplus_module_2.gen(function* ($) {
103
227
  const { get, set } = yield* $(cms);
104
- const it = tsplus_module_2.ext_itToChunk(a);
105
- const items = yield* $(tsplus_module_1.orDie(tsplus_module_3.ext_forEach(it, (_) => encode(_), { concurrency: "inherit", batching: true })));
228
+ const it = tsplus_module_6.ext_itToChunk(a);
229
+ const items = yield* $(tsplus_module_2.orDie(tsplus_module_7.ext_forEach(it, (_) => encode(_), { concurrency: "inherit", batching: true })));
106
230
  // TODO: we should have a batchRemove on store so the adapter can actually batch...
107
231
  for (const e of items) {
108
232
  yield* $(store.remove(mapToPersistenceModel(e, get)));
109
233
  set(e.id, undefined);
110
234
  }
111
- yield* $(tsplus_module_4.flatMapOption(tsplus_module_1.sync(() => tsplus_module_2.CollectionToNonEmptyReadonlyArray(events))
235
+ yield* $(tsplus_module_8.flatMapOption(tsplus_module_2.sync(() => tsplus_module_6.CollectionToNonEmptyReadonlyArray(events))
112
236
  // TODO: for full consistency the events should be stored within the same database transaction, and then picked up.
113
237
  , pub));
114
- yield* $(changeFeed.publish([tsplus_module_5.toArray(it), "remove"]));
238
+ yield* $(changeFeed.publish([tsplus_module_9.toArray(it), "remove"]));
115
239
  });
116
240
  }
117
241
  const r = {
@@ -119,13 +243,13 @@ export function makeRepo() {
119
243
  * @internal
120
244
  */
121
245
  utils: {
122
- parseMany: (items) => tsplus_module_1.flatMap(cms, (cm) => tsplus_module_1.orDie(items
246
+ parseMany: (items) => tsplus_module_2.flatMap(cms, (cm) => tsplus_module_2.orDie(items
123
247
  .forEachEffect((_) => decode(mapReverse(_, cm.set)), { concurrency: "inherit", batching: true }))),
124
248
  filter: (args) => store
125
249
  .filter(args)
126
250
  .tap((items) => args.select
127
- ? tsplus_module_1.unit : tsplus_module_1.map(cms, ({ set }) => items.forEach((_) => set(_.id, _._etag)))),
128
- all: store.all.tap((items) => tsplus_module_1.map(cms, ({ set }) => items.forEach((_) => set(_.id, _._etag))))
251
+ ? tsplus_module_2.unit : tsplus_module_2.map(cms, ({ set }) => items.forEach((_) => set(_.id, _._etag)))),
252
+ all: store.all.tap((items) => tsplus_module_2.map(cms, ({ set }) => items.forEach((_) => set(_.id, _._etag))))
129
253
  },
130
254
  changeFeed,
131
255
  itemType: name,
@@ -152,7 +276,7 @@ export function makeRepo() {
152
276
  * @tsplus fluent Repository removeById
153
277
  */
154
278
  export function removeById(self, id) {
155
- return tsplus_module_1.flatMap(tsplus_module_9.get(self, id), (_) => self.removeAndPublish([_]));
279
+ return tsplus_module_2.flatMap(tsplus_module_3.get(self, id), (_) => self.removeAndPublish([_]));
156
280
  }
157
281
  export function makeWhere() {
158
282
  const f_ = makeFilters();
@@ -179,14 +303,14 @@ export function makeStore() {
179
303
  return (name, schema, mapTo) => {
180
304
  function encodeToPM() {
181
305
  const getEtag = () => undefined;
182
- return (t) => tsplus_module_1.map(tsplus_module_1.orDie(tsplus_module_6.encode(schema)(t)), (_) => mapToPersistenceModel(_, getEtag));
306
+ return (t) => tsplus_module_2.map(tsplus_module_2.orDie(tsplus_module_10.encode(schema)(t)), (_) => mapToPersistenceModel(_, getEtag));
183
307
  }
184
308
  function mapToPersistenceModel(e, getEtag) {
185
309
  return mapTo(e, getEtag(e.id));
186
310
  }
187
311
  function makeStore(makeInitial, config) {
188
- return tsplus_module_1.flatMap(StoreMaker, ({ make }) => tsplus_module_1.map(make(pluralize(name), makeInitial
189
- ? tsplus_module_1.withSpan((tsplus_module_1.flatMap(makeInitial, (_) => _.forEachEffect(encodeToPM()))), "Repository.makeInitial [effect-app/infra]", {
312
+ return tsplus_module_2.flatMap(StoreMaker, ({ make }) => tsplus_module_2.map(make(pluralize(name), makeInitial
313
+ ? tsplus_module_2.withSpan((tsplus_module_2.flatMap(makeInitial, (_) => _.forEachEffect(encodeToPM()))), "Repository.makeInitial [effect-app/infra]", {
190
314
  attributes: { "repository.model_name": name }
191
315
  })
192
316
  : undefined, {
@@ -207,27 +331,27 @@ export const RepositoryBaseImpl = () => {
207
331
  }
208
332
  }
209
333
  Cls.make = mkRepo.make;
210
- Cls.makeWith = ((a, b) => tsplus_module_1.map(mkRepo.make(a), b));
334
+ Cls.makeWith = ((a, b) => tsplus_module_2.map(mkRepo.make(a), b));
211
335
  Cls.where = makeWhere();
212
336
  Cls.query = QueryBuilder.make();
213
337
  Cls.type = undefined;
214
- return tsplus_module_10.assignTag()(Cls);
338
+ return tsplus_module_13.assignTag()(Cls);
215
339
  };
216
340
  };
217
341
  export const RepositoryDefaultImpl = () => {
218
342
  return () => (itemType, schema, jitM) => {
219
343
  const mkRepo = makeRepo()(itemType, schema, jitM ? (pm) => jitM(pm) : (pm) => pm, (e, _etag) => ({ ...e, _etag }));
220
- class Cls extends RepositoryBaseC2 {
344
+ class Cls extends RepositoryBaseC3 {
221
345
  constructor(impl) {
222
346
  super(itemType, impl);
223
347
  }
224
348
  }
225
349
  Cls.make = mkRepo.make;
226
- Cls.makeWith = ((a, b) => tsplus_module_1.map(mkRepo.make(a), b));
350
+ Cls.makeWith = ((a, b) => tsplus_module_2.map(mkRepo.make(a), b));
227
351
  Cls.where = makeWhere();
228
352
  Cls.query = QueryBuilder.make();
229
353
  Cls.type = undefined;
230
- return tsplus_module_10.assignTag()(Cls); // impl is missing, but its marked protected
354
+ return tsplus_module_13.assignTag()(Cls); // impl is missing, but its marked protected
231
355
  };
232
356
  };
233
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"RepositoryBase.js","sourceRoot":"","sources":["../../_src/services/RepositoryBase.ts"],"names":[],"mappings":"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"}
357
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"RepositoryBase.js","sourceRoot":"","sources":["../../_src/services/RepositoryBase.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,8 @@ import { TagClass } from "@effect-app/prelude/service";
2
2
  import { Effect } from "effect/Effect";
3
3
  import { Context } from "effect/Context";
4
4
  import { Option } from "@effect-app/core/Option";
5
+ import { NonEmptyString255 } from "@effect-app/prelude/schema";
6
+ import { FiberRef } from "effect/FiberRef";
5
7
  import { RequestContext } from "../RequestContext.js";
6
8
  declare const RequestContextContainer_base: (new (service: {
7
9
  requestContext: Effect<RequestContext>;
@@ -19,12 +21,8 @@ declare const RequestContextContainer_base: (new (service: {
19
21
  export declare class RequestContextContainer extends RequestContextContainer_base {
20
22
  static get get(): Effect<RequestContext, never, RequestContextContainer>;
21
23
  static get getOption(): import("effect/Effect").Effect<import("effect/Option").Option<RequestContext>, never, never>;
24
+ static readonly live: import("effect/Layer").Layer<RequestContextContainer, never, never>;
22
25
  }
23
- /**
24
- * @tsplus static RequestContextContainer.Ops live
25
- * @tsplus location "@effect-app/infra/services/RequestContextContainer"
26
- */
27
- export declare const live: import("effect/Layer").Layer<RequestContextContainer, never, never>;
28
26
  /**
29
27
  * @tsplus static RequestContext.Ops Tag
30
28
  * @tsplus location "@effect-app/infra/services/RequestContextContainer"
@@ -1 +1 @@
1
- {"version":3,"file":"RequestContextContainer.d.ts","sourceRoot":"","sources":["../../_src/services/RequestContextContainer.ts"],"names":[],"mappings":";;;;AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;;oBAOnC,OAAO,cAAc,CAAC;qBACrB,cAAc,KAAK,cAAc,KAAK,OAAO,cAAc,CAAC;eAClE,cAAc,KAAK,OAAO,IAAI,CAAC;;oBAF1B,OAAO,cAAc,CAAC;qBACrB,cAAc,KAAK,cAAc,KAAK,OAAO,cAAc,CAAC;eAClE,cAAc,KAAK,OAAO,IAAI,CAAC;;AAP5C;;;GAGG;AACH,qBAAa,uBAAwB,SAAQ,4BAIzC;IACF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,cAAc,EAAE,KAAK,EAAE,uBAAuB,CAAC,CAEvE;IACD,MAAM,KAAK,SAAS,iGAQnB;CACF;;;;;AAKD,eAAO,MAAM,IAAI,qEASwB,CAAA;;;;;AAGzC,eAAO,MAAM,KAAK,8DAAgD,CAAA;;;;;AAKlE,eAAO,MAAM,cAAc,QAAS,cAAc;;;;;;;CAchD,CAAA"}
1
+ {"version":3,"file":"RequestContextContainer.d.ts","sourceRoot":"","sources":["../../_src/services/RequestContextContainer.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;;oBAOnC,OAAO,cAAc,CAAC;qBACrB,cAAc,KAAK,cAAc,KAAK,OAAO,cAAc,CAAC;eAClE,cAAc,KAAK,OAAO,IAAI,CAAC;;oBAF1B,OAAO,cAAc,CAAC;qBACrB,cAAc,KAAK,cAAc,KAAK,OAAO,cAAc,CAAC;eAClE,cAAc,KAAK,OAAO,IAAI,CAAC;;AAP5C;;;GAGG;AACH,qBAAa,uBAAwB,SAAQ,4BAIzC;IACF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,cAAc,EAAE,KAAK,EAAE,uBAAuB,CAAC,CAEvE;IACD,MAAM,KAAK,SAAS,iGAQnB;IACD,MAAM,CAAC,QAAQ,CAAC,IAAI,sEASE;CACvB;;;;;AAGD,eAAO,MAAM,KAAK,8DAAgD,CAAA;;;;;AAKlE,eAAO,MAAM,cAAc,QAAS,cAAc;;;;;;;CAgBhD,CAAA"}
@@ -1,3 +1,4 @@
1
+ var _a;
1
2
  import * as tsplus_module_1 from "@effect-app/prelude/service";
2
3
  import * as tsplus_module_2 from "effect/Effect";
3
4
  import * as tsplus_module_3 from "effect/Option";
@@ -15,18 +16,16 @@ import { RequestContext } from "../RequestContext.js";
15
16
  */
16
17
  export class RequestContextContainer extends tsplus_module_1.TagClass() {
17
18
  static get get() {
18
- return tsplus_module_2.flatMap(RequestContextContainer, (_) => _.requestContext);
19
+ return tsplus_module_2.flatMap(_a, (_) => _.requestContext);
19
20
  }
20
21
  static get getOption() {
21
- return tsplus_module_2.flatMap(tsplus_module_2.contextWith((_) => tsplus_module_5.getOption(_, RequestContextContainer)), (requestContext) => tsplus_module_3.isSome(requestContext)
22
+ return tsplus_module_2.flatMap(tsplus_module_2.contextWith((_) => tsplus_module_5.getOption(_, _a)), (requestContext) => tsplus_module_3.isSome(requestContext)
22
23
  ? tsplus_module_2.map(requestContext.value.requestContext, tsplus_module_3.some)
23
24
  : tsplus_module_2.sync(() => tsplus_module_4.none));
24
25
  }
25
26
  }
26
- /**
27
- * @tsplus static RequestContextContainer.Ops live
28
- */
29
- export const live = tsplus_module_9.scoped(RequestContextContainer)(tsplus_module_2.map(tsplus_module_2.sync(() => new RequestContext({ name: tsplus_module_8.NonEmptyString255("_root_"), rootId: RequestId("_root_"), locale: "en" }))
27
+ _a = RequestContextContainer;
28
+ RequestContextContainer.live = tsplus_module_9.scoped(_a)(tsplus_module_2.map(tsplus_module_2.sync(() => new RequestContext({ name: tsplus_module_8.NonEmptyString255("_root_"), rootId: RequestId("_root_"), locale: "en" }))
30
29
  .andThen((tsplus_module_6.make)), (ref) => ({
31
30
  requestContext: tsplus_module_6.get(ref),
32
31
  update: (f) => tsplus_module_6.getAndUpdate(ref, f).tap((rc) => tsplus_module_2.annotateCurrentSpan(spanAttributes_1(rc))),
@@ -42,15 +41,17 @@ const spanAttributes_1 = (ctx) => ({
42
41
  "request.name": ctx.name,
43
42
  "request.locale": ctx.locale,
44
43
  "request.namespace": ctx.namespace,
45
- ...(ctx.userProfile?.sub ? {
46
- "request.user.sub": ctx
47
- .userProfile
48
- .sub,
49
- "request.user.roles": "roles" in ctx
50
- .userProfile
51
- ? ctx.userProfile.roles
52
- : undefined
53
- } : {})
44
+ ...(ctx.userProfile?.sub
45
+ ? {
46
+ "request.user.sub": ctx
47
+ .userProfile
48
+ .sub,
49
+ "request.user.roles": "roles" in ctx
50
+ .userProfile
51
+ ? ctx.userProfile.roles
52
+ : undefined
53
+ }
54
+ : {})
54
55
  });
55
56
  export const spanAttributes = spanAttributes_1;
56
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHRDb250YWluZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9fc3JjL3NlcnZpY2VzL1JlcXVlc3RDb250ZXh0Q29udGFpbmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUNuRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFFckQ7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLHVCQUF3QixTQUFRLGdCQUFBLFFBQVEsRUFJakQ7SUFDRixNQUFNLEtBQUssR0FBRztRQUNaLE9BQU8sd0JBQUEsdUJBQXVCLEVBQVMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxjQUFjLENBQUMsQ0FBQTtJQUNqRSxDQUFDO0lBQ0QsTUFBTSxLQUFLLFNBQVM7UUFDbEIsT0FBTyx3QkFBQSw0QkFDUSxDQUFDLENBQWlCLEVBQUUsRUFBRSxDQUFDLDBCQUFrQixDQUFDLEVBQUUsdUJBQXVCLENBQUMsQ0FBQyxFQUN6RSxDQUFDLGNBQWMsRUFBRSxFQUFFLENBQzFCLHVCQUFBLGNBQWMsQ0FBUztZQUNyQixDQUFDLENBQUMsb0JBQUEsY0FBYyxDQUFDLEtBQUssQ0FBQyxjQUFjLHVCQUFpQjtZQUN0RCxDQUFDLENBQUMscUJBQVksR0FBRyxFQUFFLHFCQUFZLENBQUMsQ0FDbkMsQ0FBQTtJQUNMLENBQUM7Q0FDRjtBQUVEOztHQUVHO0FBQ0gsTUFBTSxDQUFDLE1BQU0sSUFBSSxHQUFHLHVCQVNILHVCQUF1QixFQVRwQixvQkFBQSxxQkFDWixHQUFHLEVBQUUsQ0FBQyxJQUFJLGNBQWMsQ0FBQyxFQUFFLElBQUksRUFBRSxnQkFBQSxpQkFBaUIsQ0FBQyxRQUFRLENBQUMsRUFBRSxNQUFNLEVBQUUsU0FBUyxDQUFDLFFBQVEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFDO0tBQ2hILE9BQU8sQ0FBQyxDQUFBLG9CQUE2QixDQUFBLENBQUMsRUFDbEMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDYixjQUFjLHNCQUFFLEdBQUcsQ0FBSTtJQUN2QixNQUFNLEVBQUUsQ0FBQyxDQUF3QyxFQUFFLEVBQUUsQ0FDbkQsNkJBQUEsR0FBRyxFQUFjLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMscURBQTJCLEVBQUUsRUFBZ0IsQ0FBQztJQUNoRixLQUFLLEVBQUUsQ0FBQyxDQUFpQixFQUFFLEVBQUUsQ0FBQyxvQkFBQSxHQUFHLEVBQUssQ0FBQyxDQUFDLENBQUMsT0FBTywyQ0FBQyxDQUFDLEVBQWdCO0NBQ25FLENBQUMsQ0FBQyxDQUNvQyxDQUFBO0FBRXpDLDRDQUE0QztBQUM1QyxNQUFNLENBQUMsTUFBTSxLQUFLLEdBQUcsZ0JBQUEsVUFBVSxDQUFpQixpQkFBaUIsQ0FBQyxDQUFBO0FBRWxFOztHQUVHO0FBQ0ksTUFBTSxtQkFBaUIsQ0FBQyxHQUFtQixFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ3RELFlBQVksRUFBRSxHQUFHLENBQUMsRUFBRTtJQUNwQixjQUFjLEVBQUUsR0FBRyxDQUFDLElBQUk7SUFDeEIsZ0JBQWdCLEVBQUUsR0FBRyxDQUFDLE1BQU07SUFDNUIsbUJBQW1CLEVBQUUsR0FBRyxDQUFDLFNBQVM7SUFDbEMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxXQUFXLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQztRQUN2QixrQkFBa0IsRUFBRSxHQUFHO2FBQ3BCLFdBQVc7YUFDWCxHQUFHO1FBQ04sb0JBQW9CLEVBQUUsT0FBTyxJQUFJLEdBQUc7YUFDL0IsV0FBVztZQUNkLENBQUMsQ0FBQyxHQUFHLENBQUMsV0FBVyxDQUFDLEtBQUs7WUFDdkIsQ0FBQyxDQUFDLFNBQVM7S0FDZCxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7Q0FDVixDQUFDLENBQUE7YUFkVyxjQUFjIn0=
57
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHRDb250YWluZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9fc3JjL3NlcnZpY2VzL1JlcXVlc3RDb250ZXh0Q29udGFpbmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSxPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0seUJBQXlCLENBQUE7QUFDbkQsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLHNCQUFzQixDQUFBO0FBRXJEOzs7R0FHRztBQUNILE1BQU0sT0FBTyx1QkFBd0IsU0FBUSxnQkFBQSxRQUFRLEVBSWpEO0lBQ0YsTUFBTSxLQUFLLEdBQUc7UUFDWixPQUFPLHdCQUFBLEVBQXVCLEVBQVMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxjQUFjLENBQUMsQ0FBQTtJQUNqRSxDQUFDO0lBQ0QsTUFBTSxLQUFLLFNBQVM7UUFDbEIsT0FBTyx3QkFBQSw0QkFDUSxDQUFDLENBQWlCLEVBQUUsRUFBRSxDQUFDLDBCQUFrQixDQUFDLEVBQUUsRUFBdUIsQ0FBQyxDQUFDLEVBQ3pFLENBQUMsY0FBYyxFQUFFLEVBQUUsQ0FDMUIsdUJBQUEsY0FBYyxDQUFTO1lBQ3JCLENBQUMsQ0FBQyxvQkFBQSxjQUFjLENBQUMsS0FBSyxDQUFDLGNBQWMsdUJBQWlCO1lBQ3RELENBQUMsQ0FBQyxxQkFBWSxHQUFHLEVBQUUscUJBQVksQ0FBQyxDQUNuQyxDQUFBO0lBQ0wsQ0FBQzs7O0FBQ2UsNEJBQUksR0FBRyx1QkFTTixFQUFJLEVBVEUsb0JBQUEscUJBQ2YsR0FBRyxFQUFFLENBQUMsSUFBSSxjQUFjLENBQUMsRUFBRSxJQUFJLEVBQUUsZ0JBQUEsaUJBQWlCLENBQUMsUUFBUSxDQUFDLEVBQUUsTUFBTSxFQUFFLFNBQVMsQ0FBQyxRQUFRLENBQUMsRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLENBQUMsQ0FBQztLQUNoSCxPQUFPLENBQUMsQ0FBQSxvQkFBNkIsQ0FBQSxDQUFDLEVBQ2xDLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ2IsY0FBYyxzQkFBRSxHQUFHLENBQUk7SUFDdkIsTUFBTSxFQUFFLENBQUMsQ0FBd0MsRUFBRSxFQUFFLENBQ25ELDZCQUFBLEdBQUcsRUFBYyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLHFEQUEyQixFQUFFLEVBQWdCLENBQUM7SUFDaEYsS0FBSyxFQUFFLENBQUMsQ0FBaUIsRUFBRSxFQUFFLENBQUMsb0JBQUEsR0FBRyxFQUFLLENBQUMsQ0FBQyxDQUFDLE9BQU8sMkNBQUMsQ0FBQyxFQUFnQjtDQUNuRSxDQUFDLENBQUMsQ0FDaUIsQUFURixDQVNFO0FBR3hCLDRDQUE0QztBQUM1QyxNQUFNLENBQUMsTUFBTSxLQUFLLEdBQUcsZ0JBQUEsVUFBVSxDQUFpQixpQkFBaUIsQ0FBQyxDQUFBO0FBRWxFOztHQUVHO0FBQ0ksTUFBTSxtQkFBaUIsQ0FBQyxHQUFtQixFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQ3RELFlBQVksRUFBRSxHQUFHLENBQUMsRUFBRTtJQUNwQixjQUFjLEVBQUUsR0FBRyxDQUFDLElBQUk7SUFDeEIsZ0JBQWdCLEVBQUUsR0FBRyxDQUFDLE1BQU07SUFDNUIsbUJBQW1CLEVBQUUsR0FBRyxDQUFDLFNBQVM7SUFDbEMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxXQUFXLEVBQUUsR0FBRztRQUN0QixDQUFDLENBQUM7WUFDQSxrQkFBa0IsRUFBRSxHQUFHO2lCQUNwQixXQUFXO2lCQUNYLEdBQUc7WUFDTixvQkFBb0IsRUFBRSxPQUFPLElBQUksR0FBRztpQkFDL0IsV0FBVztnQkFDZCxDQUFDLENBQUMsR0FBRyxDQUFDLFdBQVcsQ0FBQyxLQUFLO2dCQUN2QixDQUFDLENBQUMsU0FBUztTQUNkO1FBQ0QsQ0FBQyxDQUFDLEVBQUUsQ0FBQztDQUNSLENBQUMsQ0FBQTthQWhCVyxjQUFjIn0=
@@ -2,6 +2,7 @@ import { TagClass } from "@effect-app/prelude/service";
2
2
  import { Effect } from "effect/Effect";
3
3
  import { Context } from "effect/Context";
4
4
  import { Option } from "@effect-app/core/Option";
5
+ import { FiberRef } from "effect/FiberRef";
5
6
  import { ContextMap } from "./service.js";
6
7
  declare const ContextMapContainer_base: (new (service: {
7
8
  get: Effect<ContextMap>;
@@ -16,12 +17,8 @@ declare const ContextMapContainer_base: (new (service: {
16
17
  export declare class ContextMapContainer extends ContextMapContainer_base {
17
18
  static get get(): Effect<ContextMap, never, ContextMapContainer>;
18
19
  static get getOption(): import("effect/Effect").Effect<import("effect/Option").Option<ContextMap>, never, never>;
20
+ static readonly live: import("effect/Layer").Layer<ContextMapContainer, never, never>;
19
21
  }
20
- /**
21
- * @tsplus static ContextMapContainer.Ops live
22
- * @tsplus location "@effect-app/infra/services/Store/ContextMapContainer"
23
- */
24
- export declare const live: import("effect/Layer").Layer<ContextMapContainer, never, never>;
25
22
  /**
26
23
  * @tsplus static ContextMap.Ops Tag
27
24
  * @tsplus location "@effect-app/infra/services/Store/ContextMapContainer"
@@ -1 +1 @@
1
- {"version":3,"file":"ContextMapContainer.d.ts","sourceRoot":"","sources":["../../../_src/services/Store/ContextMapContainer.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAE,UAAU,EAAkB,MAAM,cAAc,CAAA;;SAYlD,OAAO,UAAU,CAAC;WAChB,OAAO,IAAI,CAAC;;SADd,OAAO,UAAU,CAAC;WAChB,OAAO,IAAI,CAAC;;AALrB;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,wBAGrC;IACF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,mBAAmB,CAAC,CAE/D;IACD,MAAM,KAAK,SAAS,6FAQnB;CACF;;;;;AAKD,eAAO,MAAM,IAAI,iEAIoB,CAAA;;;;;AAGrC,eAAO,MAAM,KAAK,sDAA4C,CAAA"}
1
+ {"version":3,"file":"ContextMapContainer.d.ts","sourceRoot":"","sources":["../../../_src/services/Store/ContextMapContainer.ts"],"names":[],"mappings":";;;;;AAAA,OAAO,EAAE,UAAU,EAAkB,MAAM,cAAc,CAAA;;SAYlD,OAAO,UAAU,CAAC;WAChB,OAAO,IAAI,CAAC;;SADd,OAAO,UAAU,CAAC;WAChB,OAAO,IAAI,CAAC;;AALrB;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,wBAGrC;IACF,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,mBAAmB,CAAC,CAE/D;IACD,MAAM,KAAK,SAAS,6FAQnB;IAED,MAAM,CAAC,QAAQ,CAAC,IAAI,kEAIE;CACvB;;;;;AAGD,eAAO,MAAM,KAAK,sDAA4C,CAAA"}
@@ -1,3 +1,4 @@
1
+ var _a;
1
2
  import * as tsplus_module_1 from "@effect-app/prelude/service";
2
3
  import * as tsplus_module_2 from "effect/Effect";
3
4
  import * as tsplus_module_3 from "effect/Option";
@@ -17,19 +18,17 @@ import { makeContextMap } from "./service.js";
17
18
  */
18
19
  export class ContextMapContainer extends tsplus_module_1.TagClass() {
19
20
  static get get() {
20
- return tsplus_module_2.flatMap(ContextMapContainer, (_) => _.get);
21
+ return tsplus_module_2.flatMap(_a, (_) => _.get);
21
22
  }
22
23
  static get getOption() {
23
- return tsplus_module_2.flatMap(tsplus_module_2.contextWith((_) => tsplus_module_5.getOption(_, ContextMapContainer)), (ctx) => tsplus_module_3.isSome(ctx)
24
+ return tsplus_module_2.flatMap(tsplus_module_2.contextWith((_) => tsplus_module_5.getOption(_, _a)), (ctx) => tsplus_module_3.isSome(ctx)
24
25
  ? tsplus_module_2.map(ctx.value.get, tsplus_module_3.some)
25
26
  : tsplus_module_2.sync(() => tsplus_module_4.none));
26
27
  }
27
28
  }
28
- /**
29
- * @tsplus static ContextMapContainer.Ops live
30
- */
31
- export const live = tsplus_module_8.scoped(ContextMapContainer)(tsplus_module_2.map(tsplus_module_2.sync(() => makeContextMap())
32
- .andThen((tsplus_module_6.make)), (ref) => new ContextMapContainer({ get: tsplus_module_6.get(ref), start: tsplus_module_2.flatMap(tsplus_module_7.makeMap, (_) => tsplus_module_6.set(ref, _)) })));
29
+ _a = ContextMapContainer;
30
+ ContextMapContainer.live = tsplus_module_8.scoped(_a)(tsplus_module_2.map(tsplus_module_2.sync(() => makeContextMap())
31
+ .andThen((tsplus_module_6.make)), (ref) => new _a({ get: tsplus_module_6.get(ref), start: tsplus_module_2.flatMap(tsplus_module_7.makeMap, (_) => tsplus_module_6.set(ref, _)) })));
33
32
  /** @tsplus static ContextMap.Ops Tag */
34
33
  export const RCTag = tsplus_module_5.GenericTag("@services/RCTag");
35
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29udGV4dE1hcENvbnRhaW5lci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvU3RvcmUvQ29udGV4dE1hcENvbnRhaW5lci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7OztBQUFBLE9BQU8sRUFBYyxjQUFjLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFFekQsNkRBQTZEO0FBQzdELDBDQUEwQztBQUMxQyx5RUFBeUU7QUFDekUsNEdBQTRHO0FBQzVHLHlGQUF5RjtBQUV6Rjs7R0FFRztBQUNILE1BQU0sT0FBTyxtQkFBb0IsU0FBUSxnQkFBQSxRQUFRLEVBRzdDO0lBQ0YsTUFBTSxLQUFLLEdBQUc7UUFDWixPQUFPLHdCQUFBLG1CQUFtQixFQUFTLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDbEQsQ0FBQztJQUNELE1BQU0sS0FBSyxTQUFTO1FBQ2xCLE9BQU8sd0JBQUEsNEJBQ1EsQ0FBQyxDQUFpQixFQUFFLEVBQUUsQ0FBQywwQkFBa0IsQ0FBQyxFQUFFLG1CQUFtQixDQUFDLENBQUMsRUFDckUsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUNmLHVCQUFBLEdBQUcsQ0FBUztZQUNWLENBQUMsQ0FBQyxvQkFBQSxHQUFHLENBQUMsS0FBSyxDQUFDLEdBQUcsdUJBQWlCO1lBQ2hDLENBQUMsQ0FBQyxxQkFBWSxHQUFHLEVBQUUscUJBQVksQ0FBQyxDQUNuQyxDQUFBO0lBQ0wsQ0FBQztDQUNGO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLENBQUMsTUFBTSxJQUFJLEdBQUcsdUJBSUgsbUJBQW1CLEVBSmhCLG9CQUFBLHFCQUNaLEdBQUcsRUFBRSxDQUFDLGNBQWMsRUFBRSxDQUFDO0tBQzVCLE9BQU8sQ0FBQyxDQUFBLG9CQUF5QixDQUFBLENBQUMsRUFDOUIsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLElBQUksbUJBQW1CLENBQUMsRUFBRSxHQUFHLHNCQUFFLEdBQUcsQ0FBSSxFQUFFLEtBQUssRUFBRSxpREFBd0IsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLG9CQUFBLEdBQUcsRUFBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUN4RSxDQUFBO0FBRXJDLHdDQUF3QztBQUN4QyxNQUFNLENBQUMsTUFBTSxLQUFLLEdBQUcsZ0JBQUEsVUFBVSxDQUFhLGlCQUFpQixDQUFDLENBQUEifQ==
34
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29udGV4dE1hcENvbnRhaW5lci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvU3RvcmUvQ29udGV4dE1hcENvbnRhaW5lci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7QUFBQSxPQUFPLEVBQWMsY0FBYyxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRXpELDZEQUE2RDtBQUM3RCwwQ0FBMEM7QUFDMUMseUVBQXlFO0FBQ3pFLDRHQUE0RztBQUM1Ryx5RkFBeUY7QUFFekY7O0dBRUc7QUFDSCxNQUFNLE9BQU8sbUJBQW9CLFNBQVEsZ0JBQUEsUUFBUSxFQUc3QztJQUNGLE1BQU0sS0FBSyxHQUFHO1FBQ1osT0FBTyx3QkFBQSxFQUFtQixFQUFTLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDbEQsQ0FBQztJQUNELE1BQU0sS0FBSyxTQUFTO1FBQ2xCLE9BQU8sd0JBQUEsNEJBQ1EsQ0FBQyxDQUFpQixFQUFFLEVBQUUsQ0FBQywwQkFBa0IsQ0FBQyxFQUFFLEVBQW1CLENBQUMsQ0FBQyxFQUNyRSxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQ2YsdUJBQUEsR0FBRyxDQUFTO1lBQ1YsQ0FBQyxDQUFDLG9CQUFBLEdBQUcsQ0FBQyxLQUFLLENBQUMsR0FBRyx1QkFBaUI7WUFDaEMsQ0FBQyxDQUFDLHFCQUFZLEdBQUcsRUFBRSxxQkFBWSxDQUFDLENBQ25DLENBQUE7SUFDTCxDQUFDOzs7QUFFZSx3QkFBSSxHQUFHLHVCQUlOLEVBQUksRUFKRSxvQkFBQSxxQkFDZixHQUFHLEVBQUUsQ0FBQyxjQUFjLEVBQUUsQ0FBQztLQUM1QixPQUFPLENBQUMsQ0FBQSxvQkFBeUIsQ0FBQSxDQUFDLEVBQzlCLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxJQUFJLEVBQW1CLENBQUMsRUFBRSxHQUFHLHNCQUFFLEdBQUcsQ0FBSSxFQUFFLEtBQUssRUFBRSxpREFBd0IsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLG9CQUFBLEdBQUcsRUFBSyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUN2RixBQUpGLENBSUU7QUFHeEIsd0NBQXdDO0FBQ3hDLE1BQU0sQ0FBQyxNQUFNLEtBQUssR0FBRyxnQkFBQSxVQUFVLENBQWEsaUJBQWlCLENBQUMsQ0FBQSJ9