@effect-app/infra 0.170.6 → 0.172.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 +34 -0
- package/_cjs/services/Operations/live.cjs +8 -9
- package/_cjs/services/Operations/live.cjs.map +1 -1
- package/_cjs/services/Repository/dsl.cjs +70 -0
- package/_cjs/services/Repository/dsl.cjs.map +1 -0
- package/_cjs/services/Repository/ext.cjs +217 -0
- package/_cjs/services/Repository/ext.cjs.map +1 -0
- package/_cjs/services/Repository/service.cjs +6 -0
- package/_cjs/services/Repository/service.cjs.map +1 -0
- package/_cjs/services/Repository.cjs +32 -252
- package/_cjs/services/Repository.cjs.map +1 -1
- package/_cjs/services/RepositoryBase.cjs +173 -48
- package/_cjs/services/RepositoryBase.cjs.map +1 -1
- package/_cjs/services/RequestContextContainer.cjs +13 -14
- package/_cjs/services/RequestContextContainer.cjs.map +1 -1
- package/_cjs/services/Store/ContextMapContainer.cjs +9 -10
- package/_cjs/services/Store/ContextMapContainer.cjs.map +1 -1
- package/_cjs/services/Store/codeFilter.cjs +2 -2
- package/_cjs/services/Store/utils.cjs +8 -9
- package/_cjs/services/Store/utils.cjs.map +1 -1
- package/_cjs/services/simpledb/diskdb.cjs +1 -2
- package/_cjs/services/simpledb/diskdb.cjs.map +1 -1
- package/_cjs/services/simpledb/simpledb.cjs +5 -6
- package/_cjs/services/simpledb/simpledb.cjs.map +1 -1
- package/_src/api/express/schema/routing.ts +6 -6
- package/_src/services/Operations/live.ts +1 -1
- package/_src/services/Repository/dsl.ts +137 -0
- package/_src/services/Repository/ext.ts +707 -0
- package/_src/services/Repository/service.ts +12 -0
- package/_src/services/Repository.ts +3 -815
- package/_src/services/RepositoryBase.ts +621 -4
- package/_src/services/RequestContextContainer.ts +1 -1
- package/_src/services/Store/ContextMapContainer.ts +1 -1
- package/_src/services/Store/codeFilter.ts +2 -2
- package/_src/services/Store/utils.ts +9 -9
- package/_src/services/simpledb/diskdb.ts +1 -1
- package/_src/services/simpledb/simpledb.ts +1 -1
- package/dist/services/Operations/live.js +9 -10
- package/dist/services/QueueMaker/service.d.ts +2 -2
- package/dist/services/Repository/dsl.d.ts +51 -0
- package/dist/services/Repository/dsl.d.ts.map +1 -0
- package/dist/services/Repository/dsl.js +55 -0
- package/dist/services/Repository/ext.d.ts +324 -0
- package/dist/services/Repository/ext.d.ts.map +1 -0
- package/dist/services/Repository/ext.js +180 -0
- package/dist/services/Repository/service.d.ts +10 -0
- package/dist/services/Repository/service.d.ts.map +1 -0
- package/dist/services/Repository/service.js +2 -0
- package/dist/services/Repository.d.ts +3 -363
- package/dist/services/Repository.d.ts.map +1 -1
- package/dist/services/Repository.js +4 -217
- package/dist/services/RepositoryBase.d.ts +241 -6
- package/dist/services/RepositoryBase.d.ts.map +1 -1
- package/dist/services/RepositoryBase.js +164 -48
- package/dist/services/RequestContextContainer.js +14 -15
- package/dist/services/Store/ContextMapContainer.js +10 -11
- package/dist/services/Store/codeFilter.js +3 -3
- package/dist/services/Store/utils.js +10 -11
- package/dist/services/simpledb/cosmosdb.d.ts +2 -2
- package/dist/services/simpledb/diskdb.d.ts +1 -1
- package/dist/services/simpledb/diskdb.js +2 -3
- package/dist/services/simpledb/memdb.d.ts +1 -1
- package/dist/services/simpledb/redisdb.d.ts +5 -5
- package/dist/services/simpledb/shared.d.ts +5 -5
- package/dist/services/simpledb/simpledb.d.ts +2 -2
- package/dist/services/simpledb/simpledb.js +5 -6
- package/package.json +37 -7
|
@@ -1,16 +1,24 @@
|
|
|
1
|
-
import * as tsplus_module_1 from "effect/
|
|
2
|
-
import * as tsplus_module_2 from "
|
|
3
|
-
import * as tsplus_module_3 from "@effect-app/
|
|
4
|
-
import * as tsplus_module_4 from "@effect-app/
|
|
5
|
-
import * as tsplus_module_5 from "@effect-app/
|
|
6
|
-
import * as tsplus_module_6 from "@effect/
|
|
7
|
-
import * as tsplus_module_7 from "@effect-app/core/
|
|
8
|
-
import * as tsplus_module_8 from "effect/
|
|
9
|
-
import * as tsplus_module_9 from "@effect-app/
|
|
10
|
-
import * as tsplus_module_10 from "@effect
|
|
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,19 +168,19 @@ export function makeRepo() {
|
|
|
52
168
|
}
|
|
53
169
|
const mkStore = makeStore()(name, schema, mapTo);
|
|
54
170
|
function make(args) {
|
|
55
|
-
return
|
|
56
|
-
const encode =
|
|
57
|
-
const decode =
|
|
58
|
-
return
|
|
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
|
|
64
|
-
const pub = "publishEvents" in args ?
|
|
65
|
-
return
|
|
66
|
-
const allE =
|
|
67
|
-
const all =
|
|
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...
|
|
@@ -82,44 +198,44 @@ export function makeRepo() {
|
|
|
82
198
|
: _
|
|
83
199
|
.pipe(S
|
|
84
200
|
.pick("id")));
|
|
85
|
-
const encodeId =
|
|
201
|
+
const encodeId = tsplus_module_11.flow(tsplus_module_10.encode(i), tsplus_module_2.provide(rctx));
|
|
86
202
|
function findE(_id) {
|
|
87
|
-
return
|
|
88
|
-
.find(id)), (items) =>
|
|
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))));
|
|
89
205
|
}
|
|
90
206
|
function find(id) {
|
|
91
|
-
return
|
|
207
|
+
return tsplus_module_8.flatMapOption(findE(id), (_) => tsplus_module_2.orDie(decode(_)));
|
|
92
208
|
}
|
|
93
|
-
const saveAllE = (a) =>
|
|
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 }) => {
|
|
94
210
|
const items = a.map((_) => mapToPersistenceModel(_, get));
|
|
95
|
-
return
|
|
211
|
+
return tsplus_module_2.map(store.batchSet(items), ret => {
|
|
96
212
|
ret.forEach((_) => set(_.id, _._etag));
|
|
97
213
|
});
|
|
98
214
|
})));
|
|
99
|
-
const saveAll = (a) =>
|
|
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);
|
|
100
216
|
const saveAndPublish = (items, events = []) => {
|
|
101
|
-
const it =
|
|
102
|
-
return
|
|
103
|
-
.andThen(
|
|
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)))
|
|
104
220
|
// TODO: for full consistency the events should be stored within the same database transaction, and then picked up.
|
|
105
221
|
, pub)
|
|
106
222
|
.andThen(changeFeed
|
|
107
|
-
.publish([
|
|
223
|
+
.publish([tsplus_module_9.toArray(it), "save"])));
|
|
108
224
|
};
|
|
109
225
|
function removeAndPublish(a, events = []) {
|
|
110
|
-
return
|
|
226
|
+
return tsplus_module_2.gen(function* ($) {
|
|
111
227
|
const { get, set } = yield* $(cms);
|
|
112
|
-
const it =
|
|
113
|
-
const items = yield* $(
|
|
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 })));
|
|
114
230
|
// TODO: we should have a batchRemove on store so the adapter can actually batch...
|
|
115
231
|
for (const e of items) {
|
|
116
232
|
yield* $(store.remove(mapToPersistenceModel(e, get)));
|
|
117
233
|
set(e.id, undefined);
|
|
118
234
|
}
|
|
119
|
-
yield* $(
|
|
235
|
+
yield* $(tsplus_module_8.flatMapOption(tsplus_module_2.sync(() => tsplus_module_6.CollectionToNonEmptyReadonlyArray(events))
|
|
120
236
|
// TODO: for full consistency the events should be stored within the same database transaction, and then picked up.
|
|
121
237
|
, pub));
|
|
122
|
-
yield* $(changeFeed.publish([
|
|
238
|
+
yield* $(changeFeed.publish([tsplus_module_9.toArray(it), "remove"]));
|
|
123
239
|
});
|
|
124
240
|
}
|
|
125
241
|
const r = {
|
|
@@ -127,13 +243,13 @@ export function makeRepo() {
|
|
|
127
243
|
* @internal
|
|
128
244
|
*/
|
|
129
245
|
utils: {
|
|
130
|
-
parseMany: (items) =>
|
|
246
|
+
parseMany: (items) => tsplus_module_2.flatMap(cms, (cm) => tsplus_module_2.orDie(items
|
|
131
247
|
.forEachEffect((_) => decode(mapReverse(_, cm.set)), { concurrency: "inherit", batching: true }))),
|
|
132
248
|
filter: (args) => store
|
|
133
249
|
.filter(args)
|
|
134
250
|
.tap((items) => args.select
|
|
135
|
-
?
|
|
136
|
-
all: store.all.tap((items) =>
|
|
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))))
|
|
137
253
|
},
|
|
138
254
|
changeFeed,
|
|
139
255
|
itemType: name,
|
|
@@ -160,7 +276,7 @@ export function makeRepo() {
|
|
|
160
276
|
* @tsplus fluent Repository removeById
|
|
161
277
|
*/
|
|
162
278
|
export function removeById(self, id) {
|
|
163
|
-
return
|
|
279
|
+
return tsplus_module_2.flatMap(tsplus_module_3.get(self, id), (_) => self.removeAndPublish([_]));
|
|
164
280
|
}
|
|
165
281
|
export function makeWhere() {
|
|
166
282
|
const f_ = makeFilters();
|
|
@@ -187,14 +303,14 @@ export function makeStore() {
|
|
|
187
303
|
return (name, schema, mapTo) => {
|
|
188
304
|
function encodeToPM() {
|
|
189
305
|
const getEtag = () => undefined;
|
|
190
|
-
return (t) =>
|
|
306
|
+
return (t) => tsplus_module_2.map(tsplus_module_2.orDie(tsplus_module_10.encode(schema)(t)), (_) => mapToPersistenceModel(_, getEtag));
|
|
191
307
|
}
|
|
192
308
|
function mapToPersistenceModel(e, getEtag) {
|
|
193
309
|
return mapTo(e, getEtag(e.id));
|
|
194
310
|
}
|
|
195
311
|
function makeStore(makeInitial, config) {
|
|
196
|
-
return
|
|
197
|
-
?
|
|
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]", {
|
|
198
314
|
attributes: { "repository.model_name": name }
|
|
199
315
|
})
|
|
200
316
|
: undefined, {
|
|
@@ -215,27 +331,27 @@ export const RepositoryBaseImpl = () => {
|
|
|
215
331
|
}
|
|
216
332
|
}
|
|
217
333
|
Cls.make = mkRepo.make;
|
|
218
|
-
Cls.makeWith = ((a, b) =>
|
|
334
|
+
Cls.makeWith = ((a, b) => tsplus_module_2.map(mkRepo.make(a), b));
|
|
219
335
|
Cls.where = makeWhere();
|
|
220
336
|
Cls.query = QueryBuilder.make();
|
|
221
337
|
Cls.type = undefined;
|
|
222
|
-
return
|
|
338
|
+
return tsplus_module_13.assignTag()(Cls);
|
|
223
339
|
};
|
|
224
340
|
};
|
|
225
341
|
export const RepositoryDefaultImpl = () => {
|
|
226
342
|
return () => (itemType, schema, jitM) => {
|
|
227
343
|
const mkRepo = makeRepo()(itemType, schema, jitM ? (pm) => jitM(pm) : (pm) => pm, (e, _etag) => ({ ...e, _etag }));
|
|
228
|
-
class Cls extends
|
|
344
|
+
class Cls extends RepositoryBaseC3 {
|
|
229
345
|
constructor(impl) {
|
|
230
346
|
super(itemType, impl);
|
|
231
347
|
}
|
|
232
348
|
}
|
|
233
349
|
Cls.make = mkRepo.make;
|
|
234
|
-
Cls.makeWith = ((a, b) =>
|
|
350
|
+
Cls.makeWith = ((a, b) => tsplus_module_2.map(mkRepo.make(a), b));
|
|
235
351
|
Cls.where = makeWhere();
|
|
236
352
|
Cls.query = QueryBuilder.make();
|
|
237
353
|
Cls.type = undefined;
|
|
238
|
-
return
|
|
354
|
+
return tsplus_module_13.assignTag()(Cls); // impl is missing, but its marked protected
|
|
239
355
|
};
|
|
240
356
|
};
|
|
241
|
-
//# 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":";;;;;;;;;;;;;AAAA,uDAAuD;AACvD,iDAAiD;AACjD,oEAAoE;AACpE,OAAO,EACL,UAAU,EACV,mBAAmB,EACnB,GAAG,EACH,yBAAyB,EACzB,WAAW,EACX,cAAc,EAEd,oBAAoB,EACpB,iBAAiB,EACjB,wBAAwB,EACxB,aAAa,EACd,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAKvC,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AACtD,OAAO,EAAE,CAAC,EAAE,MAAM,qBAAqB,CAAA;AAEvC,OAAO,EAA0B,aAAa,EAAuC,MAAM,cAAc,CAAA;AACzG,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAA;AACpE,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAEzD;;GAEG;AACH,MAAM,OAAgB,eAAe;CAwBpC;AAED,MAAM,OAAgB,gBAKpB,SAAQ,eAAqC;IAC7C,YACkB,QAAkB;QAElC,KAAK,EAAE,CAAA;QAFS,aAAQ,GAAR,QAAQ,CAAU;IAGpC,CAAC;CACF;AAED,MAAM,OAAO,gBAKX,SAAQ,gBAAsC;IAC9C,YACE,QAAkB,EACC,IAAsC;QAEzD,KAAK,CAAC,QAAQ,CAAC,CAAA;QAFI,SAAI,GAAJ,IAAI,CAAkC;QAI3D,mDAAmD;QAC1C,mBAAc,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,CAAA;QACzC,qBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAA;QAC7C,SAAI,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAA;QACrB,QAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAA;QACnB,UAAK,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAA;QACvB,eAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAA;IAP1C,CAAC;CAQF;AAED,MAAM,OAAO,gBAKX,SAAQ,gBAAsC;IALhD;;QAoBW,QAAG,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QAgkBvC,SAAI,GAAG,CAAC,GAAG,KAAuB,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAA;QAEjE,mBAAc,GAAG,CACxB,MAAqB,EACrB,EAAE,CACJ,CAAC,GAAG,KAAuB,EAAE,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;IACpE,CAAC;IAplBC,GAAG,CAOD,EAAW;QAEX,OAAO,wBAAA,IAAI;aACR,IAAI,CAAC,EAAE,CAAC,EACA,CAAC,CAAC,EAAE,EAAE,CAAC,qCAAA,CAAC,EAAgB,GAAG,EAAE,CAAC,IAAI,aAAa,CAAW,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IACrG,CAAC;IAgDD,aAAa,CAWX,GAUC;QAED,uDAAuD;QACvD,OAAO,wBAAA,GAAG,EAAS,CAAC,CAAC,EAAE,EAAE,CACvB,oBAAA,IAAI;aACD,KAAK;aACL,MAAM,CAAC,CAAC,CAAC,EACL,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAmB,CAAC,CACxE,CAAA;IACH,CAAC;IAoCD,OAAO,CASL,GAMC;QAED,OAAO,8BAAA,IAAI,EAAe,qBAAY,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;IACnD,CAAC;IAED;;;OAGG;IACH,KAAK,CAOH,MAAmB;QAEnB,OAAO,oBAAA,8BAAA,IAAI,EACM,qBAAY,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAC1C,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAA,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;IACzC,CAAC;IAED;;OAEG;IACH,WAAW;IAUT,6DAA6D;IAC7D,GAAwG;QAExG,OAAO,wBAAA,GAAG,EAAS,CAAC,CAAC,EAAE,EAAE,CACvB,oBAAA,wBAAA,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EACvC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EACnC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAe,CAAC,CACpE,CAAA;IACH,CAAC;IA8BD,cAAc;IAUZ,6DAA6D;IAC7D,GAAyE;QAEzE,OAAO,wBAAA,GAAG,EAAS,CAAC,CAAC,EAAE,EAAE,CACvB,wBAAA,wBAAA,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EACpE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAC/B,CAAC,CAAC,EAAE,EAAE,CACb,oBAAA,qCAAA,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAe,CAAC;aACnD,UAAU,EACK,GAAG,EAAE,CAAC,IAAI,aAAa,CAAW,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,EACpF,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACpB,CACJ,CAAA;IACH,CAAC;IAED;;OAEG;IACH,KAAK;IAQH,6DAA6D;IAC7D,GAA0F;QAE1F,OAAO,4BAAA,IAAI,EAAa,qBAAY,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;IACjD,CAAC;IAwBD,QAAQ,CAQN,GAA2D;QAE3D,OAAO,+BAAA,IAAI,EAAgB,qBAAY,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;IACpD,CAAC;IA8CD,yBAAyB,CAEvB,GAAQ;QAER,OAAO,CAAC,IAAS,EAAE,EAAE,CACnB,wBAAA,cAAc,CAAC,IAAI,EAAE,GAAG,CAAC,EACd,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAA;IACnD,CAAC;IAoCD,mBAAmB,CAEjB,GAA2C;QAE3C,OAAO,yBAAyB,CAAC,IAAI,EAAE,qBAAY,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;IAChE,CAAC;IAED;;OAEG;IACH,sBAAsB,CAUpB,GAAuG;QAEvG,OAAO,CAA0B,IAA+C,EAAE,EAAE,CAClF,wBAAA,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,EACX,CAAC,CAAC,EAAE,EAAE,CAAC,kCAAA,IAAI,EAAmB,CAAC,EAAE,IAAI,CAAC,CAAC,CAAA;IACtD,CAAC;IAED;;OAEG;IACH,gBAAgB,CAQd,GAAyF;QAEzF,OAAO,uCAAA,IAAI,EAAwB,qBAAY,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC,CAAA;IAC5D,CAAC;IAED,gBAAgB;QAMd,OAAO,CAAsC,IAA8C,EAAE,EAAE,CAC/F,CAAC,KAAmB,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IAC/D,CAAC;IAED,mBAAmB,CAK4B,EAAW;QACxD,OAAO,CAAwB,IAAyC,EAAE,EAAE,CAC1E,wBAAA,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,EAAS,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAA;IACpE,CAAC;IAED;;OAEG;IACH,yBAAyB;QAMvB,OAAO,CACL,IAAqE,EACrE,EAAE,CACJ,CAAC,GAAQ,EAAE,GAAY,EAAE,EAAE,CAAC,mBAAmB,CAAC,IAAI,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAA;IAC/E,CAAC;IAED,iBAAiB,CAYf,KAAmB,EACnB,IAA8C;QAE9C,OAAO,oBAAoB,CACzB,IAAI,EACJ,wBAAA,IAAI,EAAS,CAAC,GAAG,KAAK,CAAC,CAAC,CACzB,CAAA;IACH,CAAC;IAED,aAAa,CAYX,IAAQ,EACR,IAA0C;QAE1C,OAAO,oBAAoB,CACzB,IAAI,EACJ,oBAAA,wBAAA,IAAI,EACO,IAAI,CAAC,EACT,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CACnD,CAAA;IACH,CAAC;IAED,oBAAoB,CAWlB,GAA2D;QAE3D,OAAO,wBAAA,GAAG,EAEN,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAA,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,EAAK,GAAG,EAAE,CAAC,CAAC,CAAC,CACxE,CAAA;IACL,CAAC;IAED,6BAA6B;IAU3B,6DAA6D;IAC7D,GAAuG,EACvG,SAAS,GAAG,GAAG;QAEf,OAAO,CAA0B,IAA+C,EAAE,EAAE,CAClF,wBAAA,WAAW,CAAC,IAAI,EAAE,GAAG,CAAC,EACX,CAAC,CAAC,EAAE,EAAE,CAAC,yCAAA,IAAI,EAA0B,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAA;IACxE,CAAC;IAED,uBAAuB;IAQrB,6DAA6D;IAC7D,GAAyF,EACzF,SAAS,GAAG,GAAG;QAEf,OAAO,8CAAA,IAAI,EAA+B,qBAAY,GAAG,EAAE,CAAC,GAAG,CAAC,EAAE,SAAS,CAAC,CAAA;IAC9E,CAAC;IAED,uBAAuB,CAKwB,SAAS,GAAG,GAAG;QAC5D,OAAO,CAAsC,IAA8C,EAAE,EAAE,CAC/F,CAAC,KAAmB,EAAE,EAAE,CAAC,wBAAwB,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,CAAC,CAAA;IACjF,CAAC;IAED,wBAAwB,CAYtB,KAAmB,EACnB,IAA8C,EAC9C,SAAS,GAAG,GAAG;QAEf,OAAO,4BAAA,uBAAA,KAAK,EACH,SAAS,CAAC,EACF,CAAC,KAAK,EAAE,EAAE,CACvB,oBAAoB,CAClB,IAAI,EACJ,wBAAA,IAAI,EAAS,KAAK,CAAC,CACpB,CACF,CAAA;IACL,CAAC;CAQF;AAGD;;GAEG;AACH,MAAM,UAAU,QAAQ;IAItB,OAAO,CAML,IAAc,EACd,MAA4B,EAC5B,OAAwC,EACxC,KAAgD,EAChD,EAAE;QACF,MAAM,KAAK,GAAG,SAAS,EAAM,CAAA;QAE7B,SAAS,qBAAqB,CAC5B,CAAO,EACP,OAA2C;YAE3C,OAAO,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QAChC,CAAC;QAED,SAAS,UAAU,CACjB,EAAE,KAAK,EAAE,GAAG,CAAC,EAAM,EACnB,OAAuD;YAEvD,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,CAAA;YACpB,OAAO,OAAO,CAAC,CAAC,CAAC,CAAA;QACnB,CAAC;QAED,MAAM,OAAO,GAAG,SAAS,EAAM,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,CAAA;QAEpD,SAAS,IAAI,CACX,IAYG;YAEH,OAAO,oDACU,yBAAmB,EAA5B,IAAI;gBACV,MAAM,MAAM,GAAG,iBAAA,IAAI,yBAAC,MAAM,GAAS,wBAAe,IAAI,CAAC,CAAC,CAAA;gBACxD,MAAM,MAAM,GAAG,iBAAA,IAAI,yBAAC,MAAM,GAAS,wBAAe,IAAI,CAAC,CAAC,CAAA;+CAExC,OAAO,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,EAAhD,KAAK,4BACO,mBAAmB,GAA/B,EAAE,GAAG,EAAE;oBACb,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;wBAC9B,GAAG,EAAE,CAAC,EAAU,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,IAAI,EAAE,EAAE,CAAC;wBAC3C,GAAG,EAAE,CAAC,EAAU,EAAE,IAAwB,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAI,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC;qBAC5E,CAAC,CAAC,CAAA;mDAEc,yBAAoB,EAA/B,MAAM;wBACZ,MAAM,GAAG,GAAG,eAAe,IAAI,IAAI,CAAC,CAAC,CAAC,iBAAA,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,wBAAA,CAAC,EAAS,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,qBAAY,CAAA;mDACvF,4BAA4C,EAA3D,UAAU;4BAEhB,MAAM,IAAI,GAAG,wBAAA,KAAK,CAAC,GAAG,EAAS,CAAC,KAAK,EAAE,EAAE,qBAEnB,GAAG,GAAf,EAAE,GAAG,EAAE,KACN,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAC3C,CACH,CAAA;4BAED,MAAM,GAAG,GAAG,wBAAA,IAAI,EAAS,CAAC,CAAC,EAAE,EAAE,uBAC7B,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAM,CACpF,CAAA;4BAED,MAAM,YAAY,GAAG,MAA8C,CAAA;4BACnE,MAAM,CAAC,GAAG,CAAC,QAAQ,IAAI,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAChF,CAAC,CAAC,GAAG,CAAC,IAAI,KAAK,OAAO;gCACpB,6EAA6E;gCAC7E,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAChC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAgC;qCACxE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CACtB,CAAC;gCACF,CAAC,CAAC,CAAC;qCACE,GAAG;qCACH,IAAI,KAAK,WAAW;oCACzB,CAAC,CAAE,CAAC;yCACD,IAAI,CACH,CAAC;yCACE,GAAG;yCACH,IAAI,CACuB;yCAC/B,IAAI,CAAC,CAAC;yCACJ,IAAI,CAAC,IAAI,CAAC,CAAC;oCAChB,CAAC,CAAC,CAAC;yCACA,IAAI,CAAC,CAAC;yCACJ,IAAI,CAAC,IAAI,CAAC,CAAC,CACnB,CAAA;4BACD,MAAM,QAAQ,GAAG,iBAAA,IAAI,yBAAC,CAAC,GAAS,wBAAe,IAAI,CAAC,CAAC,CAAA;4BACrD,SAAS,KAAK,CAAC,GAAY;gCACzB,OAAO,wBAAA,sBAAA,oBAAA,QAAQ,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,EACrB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAEhB,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CACd,KAAK;qCACF,IAAI,CAAC,EAAuB,CAAC,CACjC,EACQ,CAAC,KAAK,EAAE,EAAE,qBAEG,GAAG,GAAf,EAAE,GAAG,EAAE,KACN,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAC3C,CACH,CAAA;4BACL,CAAC;4BAED,SAAS,IAAI,CAAC,EAAW;gCACvB,OAAO,8BAAA,KAAK,CAAC,EAAE,CAAC,EAAY,CAAC,CAAC,EAAE,EAAE,uBAAC,MAAM,CAAC,CAAC,CAAC,CAAM,CAAC,CAAA;4BACrD,CAAC;4BAED,MAAM,QAAQ,GAAG,CAAC,CAAiB,EAAE,EAAE,wBACrC,8BAAA,qBACQ,GAAG,EAAE,mDAAC,CAAC,CAAgB,CAAC,EAClB,CAAC,CAAC,EAAE,EAAE,yBAES,GAAG,GAApB,EAAE,GAAG,EAAE,GAAG,EAAE;gCAClB,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAA;2DAC3C,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAA7B,GAAG;oCACT,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAA;;8BACtC,CACH,CACM,CAAA;4BAEX,MAAM,OAAO,GAAG,CAAC,CAAc,EAAE,EAAE,CACjC,sBAAA,0DAAA,CAAC,GAAuB,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAO,OAAO,CAAC,QAAQ,CAAC,CAAA;4BAE/G,MAAM,cAAc,GAAG,CAAC,KAAkB,EAAE,SAAwB,EAAE,EAAE,EAAE;gCACxE,MAAM,EAAE,iCAAG,KAAK,CAAQ,CAAA;gCACxB,8BAAO,8BAAA,OAAO,CAAC,EAAE,CAAC;qCACf,OAAO,CAAC,qBAAY,GAAG,EAAE,mDAAC,MAAM,CAAgB,CAAC,CAAC;gCACnD,mHAAmH;kCACvG,GAAG,CAAC;qCACf,OAAO,CAAC,UAAU;qCAChB,OAAO,CAAC,yBAAC,EAAE,GAAU,MAAM,CAAC,CAAC,CAAC,EAC1B;4BACX,CAAC,CAAA;4BAED,SAAS,gBAAgB,CAAC,CAAc,EAAE,SAAwB,EAAE;gCAClE,OAAO,oBAAW,QAAQ,CAAC,EAAC,CAAC;oCAC3B,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;oCAClC,MAAM,EAAE,iCAAG,CAAC,CAAQ,CAAA;oCACpB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,uBAAC,4BAAA,EAAE,EAAe,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAO,CAAA;oCAC5G,mFAAmF;oCACnF,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;wCACtB,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAA;wCACrD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,SAAS,CAAC,CAAA;oCACtB,CAAC;oCACD,KAAK,CAAC,CAAC,CAAC,CACN,8BAAA,qBACQ,GAAG,EAAE,mDAAC,MAAM,CAAgB,CAAC;oCACnC,mHAAmH;sCACvG,GAAG,CAAC,CACnB,CAAA;oCAED,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,yBAAC,EAAE,GAAU,QAAQ,CAAC,CAAC,CAAC,CAAA;gCACtD,CAAC,CAAC,CAAA;4BACJ,CAAC;4BAED,MAAM,CAAC,GAAqC;gCAC1C;;mCAEG;gCACH,KAAK,EAAE;oCACL,SAAS,EAAE,CAAC,KAAK,EAAE,EAAE,CACnB,wBAAA,GAAG,EAAS,CAAC,EAAE,EAAE,EAAE,uBACjB,KAAK;yCACF,aAAa,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAC1F,CACT;oCACH,MAAM,EAAE,CAAgC,IAAuB,EAAE,EAAE,CACjE,KAAK;yCACF,MAAM,CAAC,IAAI,CAAC;yCACZ,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACb,IAAI,CAAC,MAAM;wCACT,CAAC,sBACD,CAAC,CAAC,oBAAA,GAAG,EAAK,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAE,CAAQ,CAAC,EAAE,EAAG,CAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CACnF;oCACL,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,oBAAA,GAAG,EAAK,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;iCAC9F;gCACD,UAAU;gCACV,QAAQ,EAAE,IAAI;gCACd,IAAI;gCACJ,GAAG;gCACH,cAAc;gCACd,gBAAgB;6BACjB,CAAA;4BACD,OAAO,CAAC,CAAA;;;;gBAGK,mBAAmB,GAAG,IAAI,CAAC,CAAA;QAC5C,CAAC;QAED,OAAO;YACL,IAAI;YACJ,KAAK;YACL,KAAK,EAAE,YAAY,CAAC,IAAI,EAAM;SAC/B,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,UAAU,CAMxB,IAAsC,EACtC,EAAW;IAEX,OAAO,wBAAA,oBAAA,IAAI,EAAK,EAAE,CAAC,EAAS,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AAChE,CAAC;AAED,MAAM,UAAU,SAAS;IACvB,MAAM,EAAE,GAAG,WAAW,EAAM,CAAA;IAG5B,SAAS,WAAW,CAAC,MAAsC;QACzD,OAAO,MAAM,CAAC,EAAE,CAAC,CAAA;IACnB,CAAC;IAED,SAAS,KAAK,CACZ,SAEyC,EACzC,IAAmB;QAEnB,OAAO,WAAW,CAAC,CAAC,CAAC,EAAE,EAAE;YACvB,MAAM,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YACvC,OAAO,CAAC;gBACN,IAAI;gBACJ,KAAK,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAmC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAiC;aACtG,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC;AAED,MAAM,SAAS,GAAG,CAAC,CAAS,EAAE,EAAE,CAC9B,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;IACb,CAAC,CAAC,CAAC,GAAG,IAAI;IACV,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;QACjB,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,KAAK;QACtC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAA;AAEb,MAAM,UAAU,SAAS;IAGvB,OAAO,CAML,IAAc,EACd,MAAyB,EACzB,KAA6C,EAC7C,EAAE;QACF,SAAS,UAAU;YACjB,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,SAAS,CAAA;YAC/B,OAAO,CAAC,CAAI,EAAE,EAAE,CACd,0CAAA,wBAAA,MAAM,EACI,CAAC,CAAC,GAEL,CAAC,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAA;QACpD,CAAC;QAED,SAAS,qBAAqB,CAC5B,CAAI,EACJ,OAA2C;YAE3C,OAAO,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;QAChC,CAAC;QAED,SAAS,SAAS,CAChB,WAAsD,EACtD,MAEC;YAED,+BACqB,UAAU,GAAvB,EAAE,IAAI,EAAE,yBAGZ,IAAI,CACF,SAAS,CAAC,IAAI,CAAC,EACf,WAAW;gBACT,CAAC,CAAC,yBAAA,CAAC,wBAAA,WAAW,EACH,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EACrC,2CAA2C,EAAE;oBACrD,UAAU,EAAE,EAAE,uBAAuB,EAAE,IAAI,EAAE;iBAC9C,CAAC;gBACJ,CAAC,CAAC,SAAS,EACb;gBACE,GAAG,MAAM;gBACT,cAAc,EAAE,MAAM,EAAE,cAAc;uBACjC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,+CAA+C;aACxE,CACF,EAfG,KAAK,IAiBJ,KAAK,GACZ;QACJ,CAAC;QAED,OAAO,SAAS,CAAA;IAClB,CAAC,CAAA;AACH,CAAC;AAgDD,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAY,EAAE;IAC9C,OAAO,GAGH,EAAE,CACN,CACE,QAAkB,EAClB,MAA4B,EAC5B,IAAyB,EAWjB,EAAE;QAEV,MAAM,MAAM,GAAG,QAAQ,EAAW,CAChC,QAAQ,EACR,MAAM,EACN,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAS,EAC9D,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAChC,CAAA;QACD,MAAe,GAAI,SAAQ,gBAAsC;YAC/D;gBACE,KAAK,CAAC,QAAQ,CAAC,CAAA;YACjB,CAAC;;QACe,QAAI,GAAG,MAAM,CAAC,IAAI,CAAA;QAClB,YAAQ,GAAG,CAAC,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE,CAAC,oBAAA,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAK,CAAC,CAAC,CAAQ,CAAA;QAE7D,SAAK,GAAG,SAAS,EAAM,CAAA;QACvB,SAAK,GAAG,YAAY,CAAC,IAAI,EAAM,CAAA;QAC/B,QAAI,GAAqC,SAAgB,CAAA;QAE3E,OAAO,iBAAA,SAAS,EAAW,CAAC,GAAG,CAAQ,CAAA;IACzC,CAAC,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,qBAAqB,GAAG,GAAY,EAAE;IACjD,OAAO,GAGH,EAAE,CACN,CACE,QAAkB,EAClB,MAA4B,EAC5B,IAAyB,EAajB,EAAE;QAEV,MAAM,MAAM,GAAG,QAAQ,EAAW,CAChC,QAAQ,EACR,MAAM,EACN,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAS,EAC9D,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAChC,CAAA;QACD,MAAe,GAAI,SAAQ,gBAAsC;YAC/D,YACE,IAAsC;gBAEtC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAA;YACvB,CAAC;;QACe,QAAI,GAAG,MAAM,CAAC,IAAI,CAAA;QAClB,YAAQ,GAAG,CAAC,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE,CAAC,oBAAA,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAK,CAAC,CAAC,CAAQ,CAAA;QAE7D,SAAK,GAAG,SAAS,EAAM,CAAA;QACvB,SAAK,GAAG,YAAY,CAAC,IAAI,EAAM,CAAA;QAE/B,QAAI,GAAqC,SAAgB,CAAA;QAE3E,OAAO,iBAAA,SAAS,EAAW,CAAC,GAAG,CAAQ,CAAA,CAAC,4CAA4C;IACtF,CAAC,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -2,12 +2,11 @@ var _a;
|
|
|
2
2
|
import * as tsplus_module_1 from "@effect-app/prelude/service";
|
|
3
3
|
import * as tsplus_module_2 from "effect/Effect";
|
|
4
4
|
import * as tsplus_module_3 from "effect/Option";
|
|
5
|
-
import * as tsplus_module_4 from "
|
|
6
|
-
import * as tsplus_module_5 from "effect/
|
|
7
|
-
import * as tsplus_module_6 from "effect/
|
|
8
|
-
import * as tsplus_module_7 from "@effect-app/
|
|
9
|
-
import * as tsplus_module_8 from "
|
|
10
|
-
import * as tsplus_module_9 from "effect/Layer";
|
|
5
|
+
import * as tsplus_module_4 from "effect/Context";
|
|
6
|
+
import * as tsplus_module_5 from "effect/FiberRef";
|
|
7
|
+
import * as tsplus_module_6 from "@effect-app/infra/services/Store/Memory";
|
|
8
|
+
import * as tsplus_module_7 from "@effect-app/prelude/schema";
|
|
9
|
+
import * as tsplus_module_8 from "effect/Layer";
|
|
11
10
|
import { RequestId } from "@effect-app/prelude/ids";
|
|
12
11
|
import { RequestContext } from "../RequestContext.js";
|
|
13
12
|
/**
|
|
@@ -19,20 +18,20 @@ export class RequestContextContainer extends tsplus_module_1.TagClass() {
|
|
|
19
18
|
return tsplus_module_2.flatMap(_a, (_) => _.requestContext);
|
|
20
19
|
}
|
|
21
20
|
static get getOption() {
|
|
22
|
-
return tsplus_module_2.flatMap(tsplus_module_2.contextWith((_) =>
|
|
21
|
+
return tsplus_module_2.flatMap(tsplus_module_2.contextWith((_) => tsplus_module_4.getOption(_, _a)), (requestContext) => tsplus_module_3.isSome(requestContext)
|
|
23
22
|
? tsplus_module_2.map(requestContext.value.requestContext, tsplus_module_3.some)
|
|
24
|
-
: tsplus_module_2.sync(() =>
|
|
23
|
+
: tsplus_module_2.sync(() => tsplus_module_3.none()));
|
|
25
24
|
}
|
|
26
25
|
}
|
|
27
26
|
_a = RequestContextContainer;
|
|
28
|
-
RequestContextContainer.live =
|
|
29
|
-
.andThen((
|
|
30
|
-
requestContext:
|
|
31
|
-
update: (f) =>
|
|
32
|
-
start: (a) =>
|
|
27
|
+
RequestContextContainer.live = tsplus_module_8.scoped(_a)(tsplus_module_2.map(tsplus_module_2.sync(() => new RequestContext({ name: tsplus_module_7.NonEmptyString255("_root_"), rootId: RequestId("_root_"), locale: "en" }))
|
|
28
|
+
.andThen((tsplus_module_5.make)), (ref) => ({
|
|
29
|
+
requestContext: tsplus_module_5.get(ref),
|
|
30
|
+
update: (f) => tsplus_module_5.getAndUpdate(ref, f).tap((rc) => tsplus_module_2.annotateCurrentSpan(spanAttributes_1(rc))),
|
|
31
|
+
start: (a) => tsplus_module_5.set(ref, a).andThen(tsplus_module_6.restoreFromRequestContext(a))
|
|
33
32
|
})));
|
|
34
33
|
/** @tsplus static RequestContext.Ops Tag */
|
|
35
|
-
export const RCTag =
|
|
34
|
+
export const RCTag = tsplus_module_4.GenericTag("@services/RCTag");
|
|
36
35
|
/**
|
|
37
36
|
* @tsplus getter RequestContext spanAttributes
|
|
38
37
|
*/
|
|
@@ -54,4 +53,4 @@ const spanAttributes_1 = (ctx) => ({
|
|
|
54
53
|
: {})
|
|
55
54
|
});
|
|
56
55
|
export const spanAttributes = spanAttributes_1;
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
56
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHRDb250YWluZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9fc3JjL3NlcnZpY2VzL1JlcXVlc3RDb250ZXh0Q29udGFpbmVyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsTUFBTSx5QkFBeUIsQ0FBQTtBQUNuRCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sc0JBQXNCLENBQUE7QUFFckQ7OztHQUdHO0FBQ0gsTUFBTSxPQUFPLHVCQUF3QixTQUFRLGdCQUFBLFFBQVEsRUFJakQ7SUFDRixNQUFNLEtBQUssR0FBRztRQUNaLE9BQU8sd0JBQUEsRUFBdUIsRUFBUyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxDQUFBO0lBQ2pFLENBQUM7SUFDRCxNQUFNLEtBQUssU0FBUztRQUNsQixPQUFPLHdCQUFBLDRCQUNRLENBQUMsQ0FBaUIsRUFBRSxFQUFFLENBQUMsMEJBQWtCLENBQUMsRUFBRSxFQUF1QixDQUFDLENBQUMsRUFDekUsQ0FBQyxjQUFjLEVBQUUsRUFBRSxDQUMxQix1QkFBQSxjQUFjLENBQVM7WUFDckIsQ0FBQyxDQUFDLG9CQUFBLGNBQWMsQ0FBQyxLQUFLLENBQUMsY0FBYyx1QkFBaUI7WUFDdEQsQ0FBQyxDQUFDLHFCQUFZLEdBQUcsRUFBRSxDQUFDLHNCQUFhLENBQUMsQ0FDckMsQ0FBQTtJQUNMLENBQUM7OztBQUNlLDRCQUFJLEdBQUcsdUJBU04sRUFBSSxFQVRFLG9CQUFBLHFCQUNmLEdBQUcsRUFBRSxDQUFDLElBQUksY0FBYyxDQUFDLEVBQUUsSUFBSSxFQUFFLGdCQUFBLGlCQUFpQixDQUFDLFFBQVEsQ0FBQyxFQUFFLE1BQU0sRUFBRSxTQUFTLENBQUMsUUFBUSxDQUFDLEVBQUUsTUFBTSxFQUFFLElBQUksRUFBRSxDQUFDLENBQUM7S0FDaEgsT0FBTyxDQUFDLENBQUEsb0JBQTZCLENBQUEsQ0FBQyxFQUNsQyxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUNiLGNBQWMsc0JBQUUsR0FBRyxDQUFJO0lBQ3ZCLE1BQU0sRUFBRSxDQUFDLENBQXdDLEVBQUUsRUFBRSxDQUNuRCw2QkFBQSxHQUFHLEVBQWMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxxREFBMkIsRUFBRSxFQUFnQixDQUFDO0lBQ2hGLEtBQUssRUFBRSxDQUFDLENBQWlCLEVBQUUsRUFBRSxDQUFDLG9CQUFBLEdBQUcsRUFBSyxDQUFDLENBQUMsQ0FBQyxPQUFPLDJDQUFDLENBQUMsRUFBZ0I7Q0FDbkUsQ0FBQyxDQUFDLENBQ2lCLEFBVEYsQ0FTRTtBQUd4Qiw0Q0FBNEM7QUFDNUMsTUFBTSxDQUFDLE1BQU0sS0FBSyxHQUFHLGdCQUFBLFVBQVUsQ0FBaUIsaUJBQWlCLENBQUMsQ0FBQTtBQUVsRTs7R0FFRztBQUNJLE1BQU0sbUJBQWlCLENBQUMsR0FBbUIsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUN0RCxZQUFZLEVBQUUsR0FBRyxDQUFDLEVBQUU7SUFDcEIsY0FBYyxFQUFFLEdBQUcsQ0FBQyxJQUFJO0lBQ3hCLGdCQUFnQixFQUFFLEdBQUcsQ0FBQyxNQUFNO0lBQzVCLG1CQUFtQixFQUFFLEdBQUcsQ0FBQyxTQUFTO0lBQ2xDLEdBQUcsQ0FBQyxHQUFHLENBQUMsV0FBVyxFQUFFLEdBQUc7UUFDdEIsQ0FBQyxDQUFDO1lBQ0Esa0JBQWtCLEVBQUUsR0FBRztpQkFDcEIsV0FBVztpQkFDWCxHQUFHO1lBQ04sb0JBQW9CLEVBQUUsT0FBTyxJQUFJLEdBQUc7aUJBQy9CLFdBQVc7Z0JBQ2QsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUMsS0FBSztnQkFDdkIsQ0FBQyxDQUFDLFNBQVM7U0FDZDtRQUNELENBQUMsQ0FBQyxFQUFFLENBQUM7Q0FDUixDQUFDLENBQUE7YUFoQlcsY0FBYyJ9
|
|
@@ -2,11 +2,10 @@ var _a;
|
|
|
2
2
|
import * as tsplus_module_1 from "@effect-app/prelude/service";
|
|
3
3
|
import * as tsplus_module_2 from "effect/Effect";
|
|
4
4
|
import * as tsplus_module_3 from "effect/Option";
|
|
5
|
-
import * as tsplus_module_4 from "
|
|
6
|
-
import * as tsplus_module_5 from "effect/
|
|
7
|
-
import * as tsplus_module_6 from "effect/
|
|
8
|
-
import * as tsplus_module_7 from "
|
|
9
|
-
import * as tsplus_module_8 from "effect/Layer";
|
|
5
|
+
import * as tsplus_module_4 from "effect/Context";
|
|
6
|
+
import * as tsplus_module_5 from "effect/FiberRef";
|
|
7
|
+
import * as tsplus_module_6 from "@effect-app/infra/services/Store/service";
|
|
8
|
+
import * as tsplus_module_7 from "effect/Layer";
|
|
10
9
|
import { makeContextMap } from "./service.js";
|
|
11
10
|
// TODO: we have to create a new contextmap on every request.
|
|
12
11
|
// we want to share one map during startup
|
|
@@ -21,14 +20,14 @@ export class ContextMapContainer extends tsplus_module_1.TagClass() {
|
|
|
21
20
|
return tsplus_module_2.flatMap(_a, (_) => _.get);
|
|
22
21
|
}
|
|
23
22
|
static get getOption() {
|
|
24
|
-
return tsplus_module_2.flatMap(tsplus_module_2.contextWith((_) =>
|
|
23
|
+
return tsplus_module_2.flatMap(tsplus_module_2.contextWith((_) => tsplus_module_4.getOption(_, _a)), (ctx) => tsplus_module_3.isSome(ctx)
|
|
25
24
|
? tsplus_module_2.map(ctx.value.get, tsplus_module_3.some)
|
|
26
|
-
: tsplus_module_2.sync(() =>
|
|
25
|
+
: tsplus_module_2.sync(() => tsplus_module_3.none()));
|
|
27
26
|
}
|
|
28
27
|
}
|
|
29
28
|
_a = ContextMapContainer;
|
|
30
|
-
ContextMapContainer.live =
|
|
31
|
-
.andThen((
|
|
29
|
+
ContextMapContainer.live = tsplus_module_7.scoped(_a)(tsplus_module_2.map(tsplus_module_2.sync(() => makeContextMap())
|
|
30
|
+
.andThen((tsplus_module_5.make)), (ref) => new _a({ get: tsplus_module_5.get(ref), start: tsplus_module_2.flatMap(tsplus_module_6.makeMap, (_) => tsplus_module_5.set(ref, _)) })));
|
|
32
31
|
/** @tsplus static ContextMap.Ops Tag */
|
|
33
|
-
export const RCTag =
|
|
34
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
32
|
+
export const RCTag = tsplus_module_4.GenericTag("@services/RCTag");
|
|
33
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ29udGV4dE1hcENvbnRhaW5lci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvU3RvcmUvQ29udGV4dE1hcENvbnRhaW5lci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7OztBQUFBLE9BQU8sRUFBYyxjQUFjLEVBQUUsTUFBTSxjQUFjLENBQUE7QUFFekQsNkRBQTZEO0FBQzdELDBDQUEwQztBQUMxQyx5RUFBeUU7QUFDekUsNEdBQTRHO0FBQzVHLHlGQUF5RjtBQUV6Rjs7R0FFRztBQUNILE1BQU0sT0FBTyxtQkFBb0IsU0FBUSxnQkFBQSxRQUFRLEVBRzdDO0lBQ0YsTUFBTSxLQUFLLEdBQUc7UUFDWixPQUFPLHdCQUFBLEVBQW1CLEVBQVMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUNsRCxDQUFDO0lBQ0QsTUFBTSxLQUFLLFNBQVM7UUFDbEIsT0FBTyx3QkFBQSw0QkFDUSxDQUFDLENBQWlCLEVBQUUsRUFBRSxDQUFDLDBCQUFrQixDQUFDLEVBQUUsRUFBbUIsQ0FBQyxDQUFDLEVBQ3JFLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FDZix1QkFBQSxHQUFHLENBQVM7WUFDVixDQUFDLENBQUMsb0JBQUEsR0FBRyxDQUFDLEtBQUssQ0FBQyxHQUFHLHVCQUFpQjtZQUNoQyxDQUFDLENBQUMscUJBQVksR0FBRyxFQUFFLENBQUMsc0JBQWEsQ0FBQyxDQUNyQyxDQUFBO0lBQ0wsQ0FBQzs7O0FBRWUsd0JBQUksR0FBRyx1QkFJTixFQUFJLEVBSkUsb0JBQUEscUJBQ2YsR0FBRyxFQUFFLENBQUMsY0FBYyxFQUFFLENBQUM7S0FDNUIsT0FBTyxDQUFDLENBQUEsb0JBQXlCLENBQUEsQ0FBQyxFQUM5QixDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsSUFBSSxFQUFtQixDQUFDLEVBQUUsR0FBRyxzQkFBRSxHQUFHLENBQUksRUFBRSxLQUFLLEVBQUUsaURBQXdCLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxvQkFBQSxHQUFHLEVBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FDdkYsQUFKRixDQUlFO0FBR3hCLHdDQUF3QztBQUN4QyxNQUFNLENBQUMsTUFBTSxLQUFLLEdBQUcsZ0JBQUEsVUFBVSxDQUFhLGlCQUFpQixDQUFDLENBQUEifQ==
|
|
@@ -65,7 +65,7 @@ export const codeFilterStatement = (p, x) => {
|
|
|
65
65
|
// return codeFilterStatement(p, x)
|
|
66
66
|
// })
|
|
67
67
|
// ? Option.some(x as unknown as NE)
|
|
68
|
-
// : Option.none
|
|
68
|
+
// : Option.none()
|
|
69
69
|
// export const and = <E extends { id: string }, NE extends E>(filters: readonly FilterResult[], x: E): Option<NE> =>
|
|
70
70
|
// filters
|
|
71
71
|
// .every((p) => {
|
|
@@ -81,7 +81,7 @@ export const codeFilterStatement = (p, x) => {
|
|
|
81
81
|
// return codeFilterStatement(p, x)
|
|
82
82
|
// })
|
|
83
83
|
// ? Option.some(x as unknown as NE)
|
|
84
|
-
// : Option.none
|
|
84
|
+
// : Option.none()
|
|
85
85
|
// // TODO: how to handle and/or outside scopes.
|
|
86
86
|
// // TODO: the scopes are not about and every, or some.. they're about logical grouping. It's a logical group + and/or etc.
|
|
87
87
|
// // TODO: how to convert this to code? would we compile an actual function body instead?!
|
|
@@ -137,4 +137,4 @@ export const codeFilter3_ = (state, sut) => {
|
|
|
137
137
|
}
|
|
138
138
|
return eval(s);
|
|
139
139
|
};
|
|
140
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
140
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29kZUZpbHRlci5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvU3RvcmUvY29kZUZpbHRlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsT0FBTyxFQUFFLGlCQUFpQixFQUFFLEdBQUcsRUFBRSxNQUFNLDJCQUEyQixDQUFBO0FBRWxFLE9BQU8sRUFBRSxPQUFPLEVBQUUsV0FBVyxFQUFFLG9CQUFvQixFQUFFLFNBQVMsRUFBRSxrQkFBa0IsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUV0RyxNQUFNLENBQUMsTUFBTSxtQkFBbUIsR0FBRyxDQUFJLENBQVUsRUFBRSxDQUFJLEVBQUUsRUFBRTtJQUN6RCxNQUFNLENBQUMsR0FBRyxHQUFHLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUN4QixRQUFRLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQztRQUNiLEtBQUssSUFBSTtZQUNQLE9BQU8sQ0FBQyxDQUFDLEtBQUssQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUE7UUFDNUIsS0FBSyxPQUFPO1lBQ1YsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxDQUFBO1FBQzdCLEtBQUssSUFBSTtZQUNQLE9BQU8sU0FBUyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDOUIsS0FBSyxLQUFLO1lBQ1IsT0FBTyxrQkFBa0IsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ3ZDLEtBQUssSUFBSTtZQUNQLE9BQU8sV0FBVyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLENBQUE7UUFDaEMsS0FBSyxLQUFLO1lBQ1IsT0FBTyxvQkFBb0IsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFBO1FBQ3pDLEtBQUssVUFBVTtZQUNiLE9BQVEsQ0FB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
|