@effect-app/infra 4.0.0-beta.12 → 4.0.0-beta.120
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 +794 -0
- package/dist/CUPS.d.ts +3 -3
- package/dist/CUPS.d.ts.map +1 -1
- package/dist/CUPS.js +3 -3
- package/dist/Emailer/service.d.ts +3 -3
- package/dist/Emailer/service.d.ts.map +1 -1
- package/dist/Emailer/service.js +3 -3
- package/dist/MainFiberSet.d.ts +2 -2
- package/dist/MainFiberSet.d.ts.map +1 -1
- package/dist/MainFiberSet.js +3 -3
- package/dist/Model/Repository/Registry.d.ts +20 -0
- package/dist/Model/Repository/Registry.d.ts.map +1 -0
- package/dist/Model/Repository/Registry.js +17 -0
- package/dist/Model/Repository/internal/internal.d.ts +3 -3
- package/dist/Model/Repository/internal/internal.d.ts.map +1 -1
- package/dist/Model/Repository/internal/internal.js +22 -16
- package/dist/Model/Repository/makeRepo.d.ts +5 -4
- package/dist/Model/Repository/makeRepo.d.ts.map +1 -1
- package/dist/Model/Repository/makeRepo.js +4 -1
- package/dist/Model/Repository/service.d.ts +5 -0
- package/dist/Model/Repository/service.d.ts.map +1 -1
- package/dist/Model/Repository/validation.d.ts +7 -6
- package/dist/Model/Repository/validation.d.ts.map +1 -1
- package/dist/Model/Repository.d.ts +1 -0
- package/dist/Model/Repository.d.ts.map +1 -1
- package/dist/Model/Repository.js +2 -1
- package/dist/Model/query/dsl.d.ts +9 -9
- package/dist/Model.d.ts +1 -0
- package/dist/Model.d.ts.map +1 -1
- package/dist/Model.js +2 -1
- package/dist/Operations.d.ts +2 -2
- package/dist/Operations.d.ts.map +1 -1
- package/dist/Operations.js +3 -3
- package/dist/OperationsRepo.d.ts +3 -3
- package/dist/OperationsRepo.d.ts.map +1 -1
- package/dist/OperationsRepo.js +3 -3
- package/dist/QueueMaker/SQLQueue.d.ts +2 -4
- package/dist/QueueMaker/SQLQueue.d.ts.map +1 -1
- package/dist/QueueMaker/SQLQueue.js +8 -6
- package/dist/QueueMaker/errors.d.ts +1 -1
- package/dist/QueueMaker/errors.d.ts.map +1 -1
- package/dist/QueueMaker/memQueue.js +3 -3
- package/dist/QueueMaker/sbqueue.js +3 -3
- package/dist/RequestContext.d.ts +22 -17
- package/dist/RequestContext.d.ts.map +1 -1
- package/dist/RequestContext.js +5 -5
- package/dist/RequestFiberSet.d.ts +2 -2
- package/dist/RequestFiberSet.d.ts.map +1 -1
- package/dist/RequestFiberSet.js +5 -5
- package/dist/Store/ContextMapContainer.d.ts +19 -3
- package/dist/Store/ContextMapContainer.d.ts.map +1 -1
- package/dist/Store/ContextMapContainer.js +13 -3
- package/dist/Store/Cosmos.d.ts.map +1 -1
- package/dist/Store/Cosmos.js +136 -68
- package/dist/Store/Disk.d.ts.map +1 -1
- package/dist/Store/Disk.js +24 -21
- package/dist/Store/Memory.d.ts +2 -2
- package/dist/Store/Memory.d.ts.map +1 -1
- package/dist/Store/Memory.js +26 -21
- package/dist/Store/SQL/Pg.d.ts +4 -0
- package/dist/Store/SQL/Pg.d.ts.map +1 -0
- package/dist/Store/SQL/Pg.js +191 -0
- package/dist/Store/SQL/query.d.ts +38 -0
- package/dist/Store/SQL/query.d.ts.map +1 -0
- package/dist/Store/SQL/query.js +367 -0
- package/dist/Store/SQL.d.ts +20 -0
- package/dist/Store/SQL.d.ts.map +1 -0
- package/dist/Store/SQL.js +381 -0
- package/dist/Store/index.d.ts +4 -1
- package/dist/Store/index.d.ts.map +1 -1
- package/dist/Store/index.js +15 -3
- package/dist/Store/service.d.ts +16 -5
- package/dist/Store/service.d.ts.map +1 -1
- package/dist/Store/service.js +24 -6
- package/dist/adapters/ServiceBus.d.ts +6 -6
- package/dist/adapters/ServiceBus.d.ts.map +1 -1
- package/dist/adapters/ServiceBus.js +9 -9
- package/dist/adapters/cosmos-client.d.ts +2 -2
- package/dist/adapters/cosmos-client.d.ts.map +1 -1
- package/dist/adapters/cosmos-client.js +3 -3
- package/dist/adapters/logger.d.ts.map +1 -1
- package/dist/adapters/memQueue.d.ts +2 -2
- package/dist/adapters/memQueue.d.ts.map +1 -1
- package/dist/adapters/memQueue.js +3 -3
- package/dist/adapters/mongo-client.d.ts +2 -2
- package/dist/adapters/mongo-client.d.ts.map +1 -1
- package/dist/adapters/mongo-client.js +3 -3
- package/dist/adapters/redis-client.d.ts +3 -3
- package/dist/adapters/redis-client.d.ts.map +1 -1
- package/dist/adapters/redis-client.js +3 -3
- package/dist/api/ContextProvider.d.ts +6 -6
- package/dist/api/ContextProvider.d.ts.map +1 -1
- package/dist/api/ContextProvider.js +6 -6
- package/dist/api/internal/auth.d.ts +1 -1
- package/dist/api/internal/events.d.ts +2 -2
- package/dist/api/internal/events.d.ts.map +1 -1
- package/dist/api/internal/events.js +11 -7
- package/dist/api/layerUtils.d.ts +5 -5
- package/dist/api/layerUtils.d.ts.map +1 -1
- package/dist/api/layerUtils.js +5 -5
- package/dist/api/routing/middleware/RouterMiddleware.d.ts +3 -3
- package/dist/api/routing/middleware/RouterMiddleware.d.ts.map +1 -1
- package/dist/api/routing/middleware/middleware.d.ts +35 -1
- package/dist/api/routing/middleware/middleware.d.ts.map +1 -1
- package/dist/api/routing/middleware/middleware.js +39 -1
- package/dist/api/routing.d.ts +1 -5
- package/dist/api/routing.d.ts.map +1 -1
- package/dist/api/routing.js +3 -2
- package/dist/api/setupRequest.d.ts +6 -3
- package/dist/api/setupRequest.d.ts.map +1 -1
- package/dist/api/setupRequest.js +11 -6
- package/dist/logger.d.ts.map +1 -1
- package/examples/query.ts +30 -26
- package/package.json +36 -18
- package/src/CUPS.ts +2 -2
- package/src/Emailer/service.ts +2 -2
- package/src/MainFiberSet.ts +2 -2
- package/src/Model/Repository/Registry.ts +33 -0
- package/src/Model/Repository/internal/internal.ts +76 -59
- package/src/Model/Repository/makeRepo.ts +7 -4
- package/src/Model/Repository/service.ts +6 -0
- package/src/Model/Repository.ts +1 -0
- package/src/Model.ts +1 -0
- package/src/Operations.ts +2 -2
- package/src/OperationsRepo.ts +2 -2
- package/src/QueueMaker/SQLQueue.ts +8 -7
- package/src/QueueMaker/memQueue.ts +2 -2
- package/src/QueueMaker/sbqueue.ts +2 -2
- package/src/RequestContext.ts +4 -4
- package/src/RequestFiberSet.ts +4 -4
- package/src/Store/ContextMapContainer.ts +41 -2
- package/src/Store/Cosmos.ts +350 -255
- package/src/Store/Disk.ts +37 -33
- package/src/Store/Memory.ts +29 -22
- package/src/Store/SQL/Pg.ts +321 -0
- package/src/Store/SQL/query.ts +409 -0
- package/src/Store/SQL.ts +674 -0
- package/src/Store/index.ts +17 -2
- package/src/Store/service.ts +31 -7
- package/src/adapters/ServiceBus.ts +8 -8
- package/src/adapters/cosmos-client.ts +2 -2
- package/src/adapters/memQueue.ts +2 -2
- package/src/adapters/mongo-client.ts +2 -2
- package/src/adapters/redis-client.ts +2 -2
- package/src/api/ContextProvider.ts +11 -11
- package/src/api/internal/events.ts +14 -9
- package/src/api/layerUtils.ts +8 -8
- package/src/api/routing/middleware/RouterMiddleware.ts +4 -4
- package/src/api/routing/middleware/middleware.ts +43 -0
- package/src/api/routing.ts +3 -3
- package/src/api/setupRequest.ts +27 -7
- package/test/contextProvider.test.ts +11 -11
- package/test/controller.test.ts +12 -9
- package/test/dist/contextProvider.test.d.ts.map +1 -1
- package/test/dist/controller.test.d.ts.map +1 -1
- package/test/dist/date-query.test.d.ts.map +1 -0
- package/test/dist/fixtures.d.ts +19 -9
- package/test/dist/fixtures.d.ts.map +1 -1
- package/test/dist/fixtures.js +11 -9
- package/test/dist/query.test.d.ts.map +1 -1
- package/test/dist/rawQuery.test.d.ts.map +1 -1
- package/test/dist/requires.test.d.ts.map +1 -1
- package/test/dist/rpc-multi-middleware.test.d.ts.map +1 -1
- package/test/dist/sql-store.test.d.ts.map +1 -0
- package/test/fixtures.ts +10 -8
- package/test/query.test.ts +182 -33
- package/test/rawQuery.test.ts +22 -18
- package/test/requires.test.ts +6 -5
- package/test/rpc-multi-middleware.test.ts +72 -3
- package/test/sql-store.test.ts +1064 -0
- package/test/validateSample.test.ts +12 -9
- package/tsconfig.json +0 -1
package/dist/Store/Cosmos.js
CHANGED
|
@@ -6,6 +6,7 @@ import { CosmosClient, CosmosClientLayer } from "../adapters/cosmos-client.js";
|
|
|
6
6
|
import { OptimisticConcurrencyException } from "../errors.js";
|
|
7
7
|
import { InfraLogger } from "../logger.js";
|
|
8
8
|
import { buildWhereCosmosQuery3, logQuery } from "./Cosmos/query.js";
|
|
9
|
+
import { storeId } from "./Memory.js";
|
|
9
10
|
import { StoreMaker } from "./service.js";
|
|
10
11
|
const makeMapId = (idKey) => ({ [idKey]: id, ...e }) => ({
|
|
11
12
|
...e,
|
|
@@ -32,9 +33,27 @@ function makeCosmosStore({ prefix }) {
|
|
|
32
33
|
id: containerId,
|
|
33
34
|
uniqueKeyPolicy: config?.uniqueKeys
|
|
34
35
|
? { uniqueKeys: config.uniqueKeys }
|
|
35
|
-
: undefined
|
|
36
|
+
: undefined,
|
|
37
|
+
partitionKey: {
|
|
38
|
+
paths: ["/_partitionKey"],
|
|
39
|
+
version: 2 // support large partitionkeys so that the hash is not based on just the first 100 bytes!
|
|
40
|
+
}
|
|
36
41
|
})));
|
|
37
|
-
const
|
|
42
|
+
const basePartitionKey = config?.partitionValue() ?? "primary";
|
|
43
|
+
const nsPrefix = (ns) => ns === "primary" ? "" : `${ns}::`;
|
|
44
|
+
const nsPartitionValue = (ns, e) => {
|
|
45
|
+
const base = config?.partitionValue(e) ?? "primary";
|
|
46
|
+
return `${nsPrefix(ns)}${base}`;
|
|
47
|
+
};
|
|
48
|
+
const nsBasePartitionKey = (ns) => `${nsPrefix(ns)}${basePartitionKey}`;
|
|
49
|
+
const resolveNamespace = !config?.allowNamespace
|
|
50
|
+
? Effect.succeed("primary")
|
|
51
|
+
: storeId.asEffect().pipe(Effect.map((namespace) => {
|
|
52
|
+
if (namespace !== "primary" && !config.allowNamespace(namespace)) {
|
|
53
|
+
throw new Error(`Namespace ${namespace} not allowed!`);
|
|
54
|
+
}
|
|
55
|
+
return namespace;
|
|
56
|
+
}));
|
|
38
57
|
const defaultValues = config?.defaultValues ?? {};
|
|
39
58
|
const container = db.container(containerId);
|
|
40
59
|
const bulk = container.items.bulk.bind(container.items);
|
|
@@ -42,7 +61,36 @@ function makeCosmosStore({ prefix }) {
|
|
|
42
61
|
// TODO: move the marker to a separate container and get rid of the checks on every query
|
|
43
62
|
// then need to clean up the actual data.. perhaps first do with a config toggle to prescribe to it.
|
|
44
63
|
const importedMarkerId = containerId;
|
|
45
|
-
const
|
|
64
|
+
const ctx = yield* Effect.context();
|
|
65
|
+
const seedCache = new Map();
|
|
66
|
+
const makeSeedEffect = (ns) => {
|
|
67
|
+
const markerId = ns === "primary" ? importedMarkerId : `${importedMarkerId}::${ns}`;
|
|
68
|
+
return Effect
|
|
69
|
+
.promise(() => container
|
|
70
|
+
.item(markerId, markerId)
|
|
71
|
+
.read()
|
|
72
|
+
.then(({ resource }) => Option.fromNullishOr(resource)))
|
|
73
|
+
.pipe(Effect.flatMap((marker) => {
|
|
74
|
+
if (Option.isSome(marker))
|
|
75
|
+
return Effect.void;
|
|
76
|
+
return InfraLogger.logInfo(`Creating mock data for ${name} (namespace: ${ns})`).pipe(Effect.andThen(seed), Effect.flatMap((m) => Effect.flatMapOption(Effect.succeed(toNonEmptyArray([...m])), (a) => bulkSetInternal(a, ns).pipe(Effect.orDie))), Effect.andThen(Effect.promise(() => container.items.create({
|
|
77
|
+
_partitionKey: markerId,
|
|
78
|
+
id: markerId,
|
|
79
|
+
ttl: -1
|
|
80
|
+
}))), Effect.provide(ctx), Effect.orDie);
|
|
81
|
+
}), Effect.withLogSpan(`Cosmos.seedCheck ${name} in ${ns} [effect-app/infra/Store]`), Effect.withSpan("Cosmos.seed [effect-app/infra/Store]", { attributes: { name, namespace: ns } }));
|
|
82
|
+
};
|
|
83
|
+
const seedNamespace = Effect.fn("seedNamespace")(function* (ns) {
|
|
84
|
+
if (!seed)
|
|
85
|
+
return;
|
|
86
|
+
let cached = seedCache.get(ns);
|
|
87
|
+
if (!cached) {
|
|
88
|
+
cached = yield* Effect.cached(Effect.uninterruptible(makeSeedEffect(ns)));
|
|
89
|
+
seedCache.set(ns, cached);
|
|
90
|
+
}
|
|
91
|
+
yield* cached;
|
|
92
|
+
});
|
|
93
|
+
const bulkSetInternal = (items, ns) => Effect
|
|
46
94
|
.gen(function* () {
|
|
47
95
|
// TODO: disable batching if need atomicity
|
|
48
96
|
// we delay and batch to keep low amount of RUs
|
|
@@ -55,7 +103,7 @@ function makeCosmosStore({ prefix }) {
|
|
|
55
103
|
resourceBody: {
|
|
56
104
|
...Struct.omit(x, ["_etag", idKey]),
|
|
57
105
|
id: x[idKey],
|
|
58
|
-
_partitionKey:
|
|
106
|
+
_partitionKey: nsPartitionValue(ns, x)
|
|
59
107
|
}
|
|
60
108
|
// don't use this or we get an error that the request and some item partition key dont match - makese no sense
|
|
61
109
|
// partitionKey: config?.partitionValue(x)
|
|
@@ -66,7 +114,7 @@ function makeCosmosStore({ prefix }) {
|
|
|
66
114
|
resourceBody: {
|
|
67
115
|
...Struct.omit(x, ["_etag", idKey]),
|
|
68
116
|
id: x[idKey],
|
|
69
|
-
_partitionKey:
|
|
117
|
+
_partitionKey: nsPartitionValue(ns, x)
|
|
70
118
|
},
|
|
71
119
|
ifMatch: eTag
|
|
72
120
|
// don't use this or we get an error that the request and some item partition key dont match - makese no sense
|
|
@@ -79,7 +127,7 @@ function makeCosmosStore({ prefix }) {
|
|
|
79
127
|
.map((x, i) => [i, x]), ([i, batch]) => Effect
|
|
80
128
|
.promise(() => bulk(batch.map(([, op]) => op)))
|
|
81
129
|
.pipe(Effect
|
|
82
|
-
.delay(Duration.millis(i === 0 ? 0 :
|
|
130
|
+
.delay(Duration.millis(i === 0 ? 0 : 150)), Effect
|
|
83
131
|
.flatMap((responses) => Effect.gen(function* () {
|
|
84
132
|
const r = responses.find((x) => x.statusCode === 412 || x.statusCode === 404 || x.statusCode === 409);
|
|
85
133
|
if (r) {
|
|
@@ -107,10 +155,12 @@ function makeCosmosStore({ prefix }) {
|
|
|
107
155
|
return batchResult.flat();
|
|
108
156
|
})
|
|
109
157
|
.pipe(Effect.withSpan("Cosmos.bulkSet [effect-app/infra/Store]", {
|
|
110
|
-
attributes: { "repository.container_id": containerId, "repository.model_name": name }
|
|
158
|
+
attributes: { "repository.container_id": containerId, "repository.model_name": name, namespace: ns }
|
|
111
159
|
}, { captureStackTrace: false }));
|
|
160
|
+
const bulkSet = (items) => resolveNamespace.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns)));
|
|
112
161
|
const batchSet = (items) => {
|
|
113
|
-
return
|
|
162
|
+
return resolveNamespace
|
|
163
|
+
.pipe(Effect.flatMap((ns) => Effect
|
|
114
164
|
.suspend(() => {
|
|
115
165
|
const batch = [...items].map((x) => [
|
|
116
166
|
x,
|
|
@@ -120,7 +170,7 @@ function makeCosmosStore({ prefix }) {
|
|
|
120
170
|
resourceBody: {
|
|
121
171
|
...Struct.omit(x, ["_etag", idKey]),
|
|
122
172
|
id: x[idKey],
|
|
123
|
-
_partitionKey:
|
|
173
|
+
_partitionKey: nsPartitionValue(ns, x)
|
|
124
174
|
}
|
|
125
175
|
// don't use this or we get an error that the request and some item partition key dont match - makese no sense
|
|
126
176
|
// partitionKey: config?.partitionValue(x)
|
|
@@ -131,7 +181,7 @@ function makeCosmosStore({ prefix }) {
|
|
|
131
181
|
resourceBody: {
|
|
132
182
|
...Struct.omit(x, ["_etag", idKey]),
|
|
133
183
|
id: x[idKey],
|
|
134
|
-
_partitionKey:
|
|
184
|
+
_partitionKey: nsPartitionValue(ns, x)
|
|
135
185
|
},
|
|
136
186
|
// don't use this or we get an error that the request and some item partition key dont match - makese no sense
|
|
137
187
|
// partitionKey: config?.partitionValue(x)
|
|
@@ -160,39 +210,65 @@ function makeCosmosStore({ prefix }) {
|
|
|
160
210
|
})
|
|
161
211
|
.pipe(Effect
|
|
162
212
|
.withSpan("Cosmos.batchSet [effect-app/infra/Store]", {
|
|
163
|
-
attributes: {
|
|
164
|
-
|
|
213
|
+
attributes: {
|
|
214
|
+
"repository.container_id": containerId,
|
|
215
|
+
"repository.model_name": name,
|
|
216
|
+
namespace: ns
|
|
217
|
+
}
|
|
218
|
+
}, { captureStackTrace: false }))));
|
|
165
219
|
};
|
|
166
220
|
const s = {
|
|
221
|
+
seedNamespace: (ns) => seedNamespace(ns),
|
|
167
222
|
queryRaw: (query) => Effect
|
|
168
|
-
.sync(() => query.cosmos({ name }))
|
|
169
|
-
.pipe(Effect.tap((q) => logQuery(q)), Effect.flatMap((q) => Effect
|
|
223
|
+
.all({ q: Effect.sync(() => query.cosmos({ name })), ns: resolveNamespace })
|
|
224
|
+
.pipe(Effect.tap(({ q }) => logQuery(q)), Effect.flatMap(({ ns, q }) => Effect
|
|
225
|
+
.promise(() => container
|
|
170
226
|
.items
|
|
171
|
-
.query(q, { partitionKey:
|
|
227
|
+
.query(q, { partitionKey: nsBasePartitionKey(ns) })
|
|
172
228
|
.fetchAll()
|
|
173
|
-
.then(({ resources }) => resources.map((_) => ({ ...defaultValues, ...mapReverseId(_) }))))
|
|
174
|
-
.withSpan("Cosmos.queryRaw [effect-app/infra/Store]", {
|
|
175
|
-
attributes: {
|
|
176
|
-
|
|
177
|
-
|
|
229
|
+
.then(({ resources }) => resources.map((_) => ({ ...defaultValues, ...mapReverseId(_) }))))
|
|
230
|
+
.pipe(Effect.withSpan("Cosmos.queryRaw [effect-app/infra/Store]", {
|
|
231
|
+
attributes: {
|
|
232
|
+
"repository.container_id": containerId,
|
|
233
|
+
"repository.model_name": name,
|
|
234
|
+
namespace: ns
|
|
235
|
+
}
|
|
236
|
+
}, { captureStackTrace: false })))),
|
|
237
|
+
batchRemove: (ids, partitionKey) => resolveNamespace.pipe(Effect.flatMap((ns) => Effect
|
|
238
|
+
.promise(() => execBatch(mutable(ids.map((id) => dropUndefinedT({
|
|
178
239
|
operationType: "Delete",
|
|
179
240
|
id
|
|
180
241
|
// don't use this or we get an error that the request and some item partition key dont match - makese no sense
|
|
181
242
|
// partitionKey: config?.partitionValue({ [idKey]: id } as Encoded)
|
|
182
|
-
}))), partitionKey ??
|
|
243
|
+
}))), partitionKey ?? nsBasePartitionKey(ns)))
|
|
244
|
+
.pipe(Effect.withSpan("Cosmos.batchRemove [effect-app/infra/Store]", {
|
|
245
|
+
attributes: {
|
|
246
|
+
"repository.container_id": containerId,
|
|
247
|
+
"repository.model_name": name,
|
|
248
|
+
namespace: ns
|
|
249
|
+
}
|
|
250
|
+
}, { captureStackTrace: false })))),
|
|
183
251
|
all: Effect
|
|
184
|
-
.
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
252
|
+
.all({
|
|
253
|
+
q: Effect.sync(() => ({
|
|
254
|
+
query: `SELECT * FROM ${name}`,
|
|
255
|
+
parameters: []
|
|
256
|
+
})),
|
|
257
|
+
ns: resolveNamespace
|
|
258
|
+
})
|
|
259
|
+
.pipe(Effect.tap(({ q }) => logQuery(q)), Effect.flatMap(({ ns, q }) => Effect
|
|
260
|
+
.promise(() => container
|
|
189
261
|
.items
|
|
190
|
-
.query(q, { partitionKey:
|
|
262
|
+
.query(q, { partitionKey: nsBasePartitionKey(ns) })
|
|
191
263
|
.fetchAll()
|
|
192
|
-
.then(({ resources }) => resources.map((_) => ({ ...defaultValues, ...mapReverseId(_) }))))
|
|
193
|
-
.withSpan("Cosmos.all [effect-app/infra/Store]", {
|
|
194
|
-
attributes: {
|
|
195
|
-
|
|
264
|
+
.then(({ resources }) => resources.map((_) => ({ ...defaultValues, ...mapReverseId(_) }))))
|
|
265
|
+
.pipe(Effect.withSpan("Cosmos.all [effect-app/infra/Store]", {
|
|
266
|
+
attributes: {
|
|
267
|
+
"repository.container_id": containerId,
|
|
268
|
+
"repository.model_name": name,
|
|
269
|
+
namespace: ns
|
|
270
|
+
}
|
|
271
|
+
}, { captureStackTrace: false })))),
|
|
196
272
|
/**
|
|
197
273
|
* May return duplicate results for "join_find", when matching more than once.
|
|
198
274
|
*/
|
|
@@ -201,12 +277,16 @@ function makeCosmosStore({ prefix }) {
|
|
|
201
277
|
const limit = f?.limit;
|
|
202
278
|
const filter = f.filter;
|
|
203
279
|
return Effect
|
|
204
|
-
.
|
|
205
|
-
|
|
206
|
-
|
|
280
|
+
.all({
|
|
281
|
+
q: Effect.sync(() => buildWhereCosmosQuery3(idKey, filter ? [{ t: "where-scope", result: filter, relation: "some" }] : [], name, defaultValues, f.select, f.order, skip, limit)),
|
|
282
|
+
ns: resolveNamespace
|
|
283
|
+
})
|
|
284
|
+
.pipe(Effect.tap(({ q }) => logQuery(q)), Effect
|
|
285
|
+
.flatMap(({ ns, q }) => Effect
|
|
286
|
+
.promise(() => f.select
|
|
207
287
|
? container
|
|
208
288
|
.items
|
|
209
|
-
.query(q, { partitionKey:
|
|
289
|
+
.query(q, { partitionKey: nsBasePartitionKey(ns) })
|
|
210
290
|
.fetchAll()
|
|
211
291
|
.then(({ resources }) => resources.map((_) => ({
|
|
212
292
|
...pipe(defaultValues, Struct.pick(f.select.filter((_) => typeof _ === "string"))),
|
|
@@ -214,16 +294,20 @@ function makeCosmosStore({ prefix }) {
|
|
|
214
294
|
})))
|
|
215
295
|
: container
|
|
216
296
|
.items
|
|
217
|
-
.query(q, { partitionKey:
|
|
297
|
+
.query(q, { partitionKey: nsBasePartitionKey(ns) })
|
|
218
298
|
.fetchAll()
|
|
219
|
-
.then(({ resources }) => resources.map(({ f }) => ({ ...defaultValues, ...mapReverseId(f) }))))
|
|
299
|
+
.then(({ resources }) => resources.map(({ f }) => ({ ...defaultValues, ...mapReverseId(f) }))))
|
|
220
300
|
.pipe(Effect.withSpan("Cosmos.filter [effect-app/infra/Store]", {
|
|
221
|
-
attributes: {
|
|
222
|
-
|
|
301
|
+
attributes: {
|
|
302
|
+
"repository.container_id": containerId,
|
|
303
|
+
"repository.model_name": name,
|
|
304
|
+
namespace: ns
|
|
305
|
+
}
|
|
306
|
+
}, { captureStackTrace: false }))));
|
|
223
307
|
},
|
|
224
|
-
find: (id) => Effect
|
|
308
|
+
find: (id) => resolveNamespace.pipe(Effect.flatMap((ns) => Effect
|
|
225
309
|
.promise(() => container
|
|
226
|
-
.item(id,
|
|
310
|
+
.item(id, nsPartitionValue(ns, { [idKey]: id }))
|
|
227
311
|
.read()
|
|
228
312
|
.then(({ resource }) => Option.fromNullishOr(resource).pipe(Option.map((_) => ({ ...defaultValues, ...mapReverseId(_) })))))
|
|
229
313
|
.pipe(Effect
|
|
@@ -231,18 +315,19 @@ function makeCosmosStore({ prefix }) {
|
|
|
231
315
|
attributes: {
|
|
232
316
|
"repository.container_id": containerId,
|
|
233
317
|
"repository.model_name": name,
|
|
234
|
-
partitionValue:
|
|
318
|
+
partitionValue: nsPartitionValue(ns, { [idKey]: id }),
|
|
319
|
+
namespace: ns,
|
|
235
320
|
id
|
|
236
321
|
}
|
|
237
|
-
}, { captureStackTrace: false })),
|
|
238
|
-
set: (e) => Option
|
|
322
|
+
}, { captureStackTrace: false })))),
|
|
323
|
+
set: (e) => resolveNamespace.pipe(Effect.flatMap((ns) => Option
|
|
239
324
|
.match(Option
|
|
240
325
|
.fromNullishOr(e._etag), {
|
|
241
326
|
onNone: () => Effect.promise(() => container.items.create({
|
|
242
327
|
...mapId(e),
|
|
243
|
-
_partitionKey:
|
|
328
|
+
_partitionKey: nsPartitionValue(ns, e)
|
|
244
329
|
})),
|
|
245
|
-
onSome: (eTag) => Effect.promise(() => container.item(e[idKey],
|
|
330
|
+
onSome: (eTag) => Effect.promise(() => container.item(e[idKey], nsPartitionValue(ns, e)).replace({ ...mapId(e), _partitionKey: nsPartitionValue(ns, e) }, {
|
|
246
331
|
accessCondition: {
|
|
247
332
|
type: "IfMatch",
|
|
248
333
|
condition: eTag
|
|
@@ -266,32 +351,15 @@ function makeCosmosStore({ prefix }) {
|
|
|
266
351
|
attributes: {
|
|
267
352
|
"repository.container_id": containerId,
|
|
268
353
|
"repository.model_name": name,
|
|
354
|
+
namespace: ns,
|
|
269
355
|
id: e[idKey]
|
|
270
356
|
}
|
|
271
|
-
}, { captureStackTrace: false })),
|
|
357
|
+
}, { captureStackTrace: false })))),
|
|
272
358
|
batchSet,
|
|
273
359
|
bulkSet
|
|
274
360
|
};
|
|
275
|
-
//
|
|
276
|
-
|
|
277
|
-
.item(importedMarkerId, importedMarkerId)
|
|
278
|
-
.read()
|
|
279
|
-
.then(({ resource }) => Option.fromNullishOr(resource)));
|
|
280
|
-
if (!Option.isSome(marker)) {
|
|
281
|
-
yield* InfraLogger.logInfo("Creating mock data for " + name);
|
|
282
|
-
if (seed) {
|
|
283
|
-
const m = yield* seed;
|
|
284
|
-
yield* Effect.flatMapOption(Effect.succeed(toNonEmptyArray([...m])), (a) => s.bulkSet(a).pipe(Effect.orDie, Effect
|
|
285
|
-
// we delay extra here, so that initial creation between Companies/POs also have an interval between them.
|
|
286
|
-
.delay(Duration.millis(1100))));
|
|
287
|
-
}
|
|
288
|
-
// Mark as imported
|
|
289
|
-
yield* Effect.promise(() => container.items.create({
|
|
290
|
-
_partitionKey: importedMarkerId,
|
|
291
|
-
id: importedMarkerId,
|
|
292
|
-
ttl: -1
|
|
293
|
-
}));
|
|
294
|
-
}
|
|
361
|
+
// Eagerly seed primary namespace on initialization
|
|
362
|
+
yield* seedNamespace("primary");
|
|
295
363
|
return s;
|
|
296
364
|
})
|
|
297
365
|
};
|
|
@@ -302,4 +370,4 @@ export function CosmosStoreLayer(cfg) {
|
|
|
302
370
|
.toLayer(makeCosmosStore(cfg))
|
|
303
371
|
.pipe(Layer.provide(CosmosClientLayer(Redacted.value(cfg.url), cfg.dbName)));
|
|
304
372
|
}
|
|
305
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Cosmos.js","sourceRoot":"","sources":["../../src/Store/Cosmos.ts"],"names":[],"mappings":"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"}
|
|
373
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Cosmos.js","sourceRoot":"","sources":["../../src/Store/Cosmos.ts"],"names":[],"mappings":"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"}
|
package/dist/Store/Disk.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Disk.d.ts","sourceRoot":"","sources":["../../src/Store/Disk.ts"],"names":[],"mappings":"AAKA,OAAO,EAAW,MAAM,EAAmB,MAAM,YAAY,CAAA;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAE3D,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,aAAa,EAAE,KAAK,KAAK,EAAE,KAAK,WAAW,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"Disk.d.ts","sourceRoot":"","sources":["../../src/Store/Disk.ts"],"names":[],"mappings":"AAKA,OAAO,EAAW,MAAM,EAAmB,MAAM,YAAY,CAAA;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAE3D,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,aAAa,EAAE,KAAK,KAAK,EAAE,KAAK,WAAW,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAoHtH;;;GAGG;AACH,wBAAgB,aAAa,CAAC,EAAE,MAAM,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM;WAMvD,KAAK,SAAS,MAAM,OAAO,EAAE,OAAO,SAAS,WAAW,EAAE,CAAC,EAAE,CAAC,QAC7D,MAAM,SACL,KAAK,SACL,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,WACpC,WAAW,CAAC,OAAO,CAAC;iBA0DpC;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,0DAEhE"}
|
package/dist/Store/Disk.js
CHANGED
|
@@ -35,9 +35,8 @@ function makeDiskStoreInt(prefix, idKey, namespace, dir, name, seed, defaultValu
|
|
|
35
35
|
}, { captureStackTrace: false }))
|
|
36
36
|
};
|
|
37
37
|
// lock file for cross-process coordination during initialization
|
|
38
|
-
const lockFile = file + ".lock";
|
|
39
38
|
// wrap initialization in file lock to prevent race conditions in multi-worker setups
|
|
40
|
-
const store = yield* fu.withFileLock(
|
|
39
|
+
const store = yield* fu.withFileLock(file, Effect.gen(function* () {
|
|
41
40
|
const shouldSeed = !(fs.existsSync(file));
|
|
42
41
|
const store = yield* makeMemoryStoreInt(name, idKey, namespace, shouldSeed
|
|
43
42
|
? seed
|
|
@@ -72,29 +71,33 @@ export function makeDiskStore({ prefix }, dir) {
|
|
|
72
71
|
}
|
|
73
72
|
return {
|
|
74
73
|
make: (name, idKey, seed, config) => Effect.gen(function* () {
|
|
75
|
-
const storesSem = Semaphore.makeUnsafe(1);
|
|
76
74
|
const primary = yield* makeDiskStoreInt(prefix, idKey, "primary", dir, name, seed, config?.defaultValues);
|
|
77
75
|
const stores = new Map([["primary", primary]]);
|
|
78
|
-
const ctx = yield* Effect.
|
|
76
|
+
const ctx = yield* Effect.context();
|
|
77
|
+
const semaphores = new Map();
|
|
78
|
+
const getSem = (ns) => {
|
|
79
|
+
let sem = semaphores.get(ns);
|
|
80
|
+
if (!sem) {
|
|
81
|
+
sem = Semaphore.makeUnsafe(1);
|
|
82
|
+
semaphores.set(ns, sem);
|
|
83
|
+
}
|
|
84
|
+
return sem;
|
|
85
|
+
};
|
|
86
|
+
const ensureStore = (namespace) => getSem(namespace).withPermits(1)(Effect.suspend(() => {
|
|
87
|
+
const existing = stores.get(namespace);
|
|
88
|
+
if (existing)
|
|
89
|
+
return Effect.succeed(existing);
|
|
90
|
+
if (config?.allowNamespace && !config.allowNamespace(namespace)) {
|
|
91
|
+
throw new Error(`Namespace ${namespace} not allowed!`);
|
|
92
|
+
}
|
|
93
|
+
return makeDiskStoreInt(prefix, idKey, namespace, dir, name, seed, config?.defaultValues)
|
|
94
|
+
.pipe(Effect.orDie, Effect.provide(ctx), Effect.tap((store) => Effect.sync(() => stores.set(namespace, store))));
|
|
95
|
+
}));
|
|
79
96
|
const getStore = !config?.allowNamespace
|
|
80
97
|
? Effect.succeed(primary)
|
|
81
|
-
: storeId.asEffect().pipe(Effect.flatMap((namespace) =>
|
|
82
|
-
const store = stores.get(namespace);
|
|
83
|
-
if (store) {
|
|
84
|
-
return Effect.succeed(store);
|
|
85
|
-
}
|
|
86
|
-
if (!config.allowNamespace(namespace)) {
|
|
87
|
-
throw new Error(`Namespace ${namespace} not allowed!`);
|
|
88
|
-
}
|
|
89
|
-
return storesSem.withPermits(1)(Effect.suspend(() => {
|
|
90
|
-
const existing = stores.get(namespace);
|
|
91
|
-
if (existing)
|
|
92
|
-
return Effect.sync(() => existing);
|
|
93
|
-
return makeDiskStoreInt(prefix, idKey, namespace, dir, name, seed, config?.defaultValues)
|
|
94
|
-
.pipe(Effect.orDie, Effect.provide(ctx), Effect.tap((store) => Effect.sync(() => stores.set(namespace, store))));
|
|
95
|
-
}));
|
|
96
|
-
}));
|
|
98
|
+
: storeId.asEffect().pipe(Effect.flatMap((namespace) => ensureStore(namespace)));
|
|
97
99
|
const s = {
|
|
100
|
+
seedNamespace: (namespace) => ensureStore(namespace).pipe(Effect.asVoid),
|
|
98
101
|
all: Effect.flatMap(getStore, (_) => _.all),
|
|
99
102
|
find: (...args) => Effect.flatMap(getStore, (_) => _.find(...args)),
|
|
100
103
|
filter: (...args) => Effect.flatMap(getStore, (_) => _.filter(...args)),
|
|
@@ -112,4 +115,4 @@ export function makeDiskStore({ prefix }, dir) {
|
|
|
112
115
|
export function DiskStoreLayer(config, dir) {
|
|
113
116
|
return StoreMaker.toLayer(makeDiskStore(config, dir));
|
|
114
117
|
}
|
|
115
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
118
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Disk.js","sourceRoot":"","sources":["../../src/Store/Disk.ts"],"names":[],"mappings":"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"}
|
package/dist/Store/Memory.d.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Context, Effect } from "effect-app";
|
|
2
2
|
import { NonEmptyString255 } from "effect-app/Schema";
|
|
3
3
|
import type { FieldValues } from "../Model/filter/types.js";
|
|
4
4
|
import { type FilterArgs, type PersistenceModelType, type Store, type StoreConfig, StoreMaker } from "./service.js";
|
|
5
5
|
export declare function memFilter<T extends FieldValues, U extends keyof T = never>(f: FilterArgs<T, U>): (c: T[]) => (U extends undefined ? T : Pick<T, U>)[];
|
|
6
|
-
declare const storeId_base:
|
|
6
|
+
declare const storeId_base: Context.Reference<NonEmptyString255>;
|
|
7
7
|
export declare class storeId extends storeId_base {
|
|
8
8
|
}
|
|
9
9
|
export declare function makeMemoryStoreInt<IdKey extends keyof Encoded, Encoded extends FieldValues, R = never, E = never>(modelName: string, idKey: IdKey, namespace: string, seed?: Effect.Effect<Iterable<Encoded>, E, R>, _defaultValues?: Partial<Encoded>): Effect.Effect<Store<IdKey, Encoded, PersistenceModelType<Encoded>>, E, R>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Memory.d.ts","sourceRoot":"","sources":["../../src/Store/Memory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,
|
|
1
|
+
{"version":3,"file":"Memory.d.ts","sourceRoot":"","sources":["../../src/Store/Memory.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,OAAO,EAAE,MAAM,EAAyF,MAAM,YAAY,CAAA;AAC1I,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAGrD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAE3D,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,oBAAoB,EAAE,KAAK,KAAK,EAAE,KAAK,WAAW,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGnH,wBAAgB,SAAS,CAAC,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,MAAM,CAAC,GAAG,KAAK,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,IAEpF,GAAG,CAAC,EAAE,KAAG,wCAAG,CA0DtB;;AAGD,qBAAa,OAAQ,SAAQ,YAAkF;CAAG;AAmBlH,wBAAgB,kBAAkB,CAAC,KAAK,SAAS,MAAM,OAAO,EAAE,OAAO,SAAS,WAAW,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,EAC/G,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,KAAK,EACZ,SAAS,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC7C,cAAc,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,6EAyJlC;AAED,eAAO,MAAM,eAAe;WACnB,KAAK,SAAS,MAAM,OAAO,EAAE,OAAO,SAAS,WAAW,EAAE,CAAC,EAAE,CAAC,aACxD,MAAM,SACV,KAAK,SACL,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,WACpC,WAAW,CAAC,OAAO,CAAC;CAmD/B,CAAA;AAEF,eAAO,MAAM,eAAe,wDAA2D,CAAA"}
|