@effect-app/infra 4.0.0-beta.96 → 4.0.0-beta.98

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 (5) hide show
  1. package/CHANGELOG.md +14 -0
  2. package/dist/Store/Cosmos.d.ts.map +1 -1
  3. package/dist/Store/Cosmos.js +63 -34
  4. package/package.json +2 -2
  5. package/src/Store/Cosmos.ts +123 -90
package/CHANGELOG.md CHANGED
@@ -1,5 +1,19 @@
1
1
  # @effect-app/infra
2
2
 
3
+ ## 4.0.0-beta.98
4
+
5
+ ### Patch Changes
6
+
7
+ - 5aed2e3: Add span to Cosmos `batchRemove` and include `namespace` attribute on all Cosmos store spans.
8
+ - effect-app@4.0.0-beta.98
9
+
10
+ ## 4.0.0-beta.97
11
+
12
+ ### Patch Changes
13
+
14
+ - 3eb66e9: Fix CosmosDB store `filter` to trigger namespace seeding on first access. Previously, if `filter` was the first operation called on a namespace, seed data was never created.
15
+ - effect-app@4.0.0-beta.97
16
+
3
17
  ## 4.0.0-beta.96
4
18
 
5
19
  ### Patch Changes
package/dist/Store/Cosmos.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Cosmos.d.ts","sourceRoot":"","sources":["../../src/Store/Cosmos.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2B,KAAK,EAA8D,MAAM,YAAY,CAAA;AAUvH,OAAO,EAA8C,KAAK,aAAa,EAAgC,UAAU,EAAE,MAAM,cAAc,CAAA;AA6gBvI,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,yCAIlD"}
1
+ {"version":3,"file":"Cosmos.d.ts","sourceRoot":"","sources":["../../src/Store/Cosmos.ts"],"names":[],"mappings":"AAEA,OAAO,EAA2B,KAAK,EAA8D,MAAM,YAAY,CAAA;AAUvH,OAAO,EAA8C,KAAK,aAAa,EAAgC,UAAU,EAAE,MAAM,cAAc,CAAA;AA8iBvI,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,aAAa,yCAIlD"}
package/dist/Store/Cosmos.js CHANGED
@@ -41,6 +41,7 @@ function makeCosmosStore({ prefix }) {
41
41
  const base = config?.partitionValue(e) ?? "primary";
42
42
  return `${nsPrefix(ns)}${base}`;
43
43
  };
44
+ const nsBasePartitionKey = (ns) => `${nsPrefix(ns)}${basePartitionKey}`;
44
45
  const resolveNamespace = !config?.allowNamespace
45
46
  ? Effect.succeed("primary")
46
47
  : storeId.asEffect().pipe(Effect.map((namespace) => {
@@ -49,7 +50,6 @@ function makeCosmosStore({ prefix }) {
49
50
  }
50
51
  return namespace;
51
52
  }));
52
- const resolvePartitionKey = Effect.map(resolveNamespace, (ns) => `${nsPrefix(ns)}${basePartitionKey}`);
53
53
  const defaultValues = config?.defaultValues ?? {};
54
54
  const container = db.container(containerId);
55
55
  const bulk = container.items.bulk.bind(container.items);
@@ -74,7 +74,7 @@ function makeCosmosStore({ prefix }) {
74
74
  id: markerId,
75
75
  ttl: -1
76
76
  }))), Effect.provide(ctx), Effect.orDie);
77
- }));
77
+ }), Effect.withLogSpan(`Cosmos.seedCheck ${name} in ${ns} [effect-app/infra/Store]`), Effect.withSpan("Cosmos.seed [effect-app/infra/Store]", { attributes: { name, namespace: ns } }));
78
78
  };
79
79
  const seedNamespace = Effect.fn("seedNamespace")(function* (ns) {
80
80
  if (!seed)
@@ -87,7 +87,6 @@ function makeCosmosStore({ prefix }) {
87
87
  yield* cached;
88
88
  });
89
89
  const resolveAndSeed = resolveNamespace.pipe(Effect.tap((ns) => seedNamespace(ns)));
90
- const resolvePartitionKeyAndSeed = Effect.map(resolveAndSeed, (ns) => `${nsPrefix(ns)}${basePartitionKey}`);
91
90
  const bulkSetInternal = (items, ns) => Effect
92
91
  .gen(function* () {
93
92
  // TODO: disable batching if need atomicity
@@ -151,10 +150,11 @@ function makeCosmosStore({ prefix }) {
151
150
  }));
152
151
  }))));
153
152
  return batchResult.flat();
154
- });
155
- const bulkSet = (items) => resolveAndSeed.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns).pipe(Effect.withSpan("Cosmos.bulkSet [effect-app/infra/Store]", {
156
- attributes: { "repository.container_id": containerId, "repository.model_name": name }
157
- }, { captureStackTrace: false }))));
153
+ })
154
+ .pipe(Effect.withSpan("Cosmos.bulkSet [effect-app/infra/Store]", {
155
+ attributes: { "repository.container_id": containerId, "repository.model_name": name, namespace: ns }
156
+ }, { captureStackTrace: false }));
157
+ const bulkSet = (items) => resolveAndSeed.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns)));
158
158
  const batchSet = (items) => {
159
159
  return resolveAndSeed
160
160
  .pipe(Effect.flatMap((ns) => Effect
@@ -204,45 +204,67 @@ function makeCosmosStore({ prefix }) {
204
204
  _etag: result[i]?.eTag
205
205
  }));
206
206
  })));
207
- })))
207
+ })
208
208
  .pipe(Effect
209
209
  .withSpan("Cosmos.batchSet [effect-app/infra/Store]", {
210
- attributes: { "repository.container_id": containerId, "repository.model_name": name }
211
- }, { captureStackTrace: false }));
210
+ attributes: {
211
+ "repository.container_id": containerId,
212
+ "repository.model_name": name,
213
+ namespace: ns
214
+ }
215
+ }, { captureStackTrace: false }))));
212
216
  };
213
217
  const s = {
214
218
  queryRaw: (query) => Effect
215
- .all({ q: Effect.sync(() => query.cosmos({ name })), pk: resolvePartitionKeyAndSeed })
216
- .pipe(Effect.tap(({ q }) => logQuery(q)), Effect.flatMap(({ pk, q }) => Effect.promise(() => container
219
+ .all({ q: Effect.sync(() => query.cosmos({ name })), ns: resolveAndSeed })
220
+ .pipe(Effect.tap(({ q }) => logQuery(q)), Effect.flatMap(({ ns, q }) => Effect
221
+ .promise(() => container
217
222
  .items
218
- .query(q, { partitionKey: pk })
223
+ .query(q, { partitionKey: nsBasePartitionKey(ns) })
219
224
  .fetchAll()
220
- .then(({ resources }) => resources.map((_) => ({ ...defaultValues, ...mapReverseId(_) }))))), Effect
221
- .withSpan("Cosmos.queryRaw [effect-app/infra/Store]", {
222
- attributes: { "repository.container_id": containerId, "repository.model_name": name }
223
- }, { captureStackTrace: false })),
224
- batchRemove: (ids, partitionKey) => resolvePartitionKeyAndSeed.pipe(Effect.flatMap((pk) => Effect.promise(() => execBatch(mutable(ids.map((id) => dropUndefinedT({
225
+ .then(({ resources }) => resources.map((_) => ({ ...defaultValues, ...mapReverseId(_) }))))
226
+ .pipe(Effect.withSpan("Cosmos.queryRaw [effect-app/infra/Store]", {
227
+ attributes: {
228
+ "repository.container_id": containerId,
229
+ "repository.model_name": name,
230
+ namespace: ns
231
+ }
232
+ }, { captureStackTrace: false })))),
233
+ batchRemove: (ids, partitionKey) => resolveAndSeed.pipe(Effect.flatMap((ns) => Effect
234
+ .promise(() => execBatch(mutable(ids.map((id) => dropUndefinedT({
225
235
  operationType: "Delete",
226
236
  id
227
237
  // don't use this or we get an error that the request and some item partition key dont match - makese no sense
228
238
  // partitionKey: config?.partitionValue({ [idKey]: id } as Encoded)
229
- }))), partitionKey ?? pk)))),
239
+ }))), partitionKey ?? nsBasePartitionKey(ns)))
240
+ .pipe(Effect.withSpan("Cosmos.batchRemove [effect-app/infra/Store]", {
241
+ attributes: {
242
+ "repository.container_id": containerId,
243
+ "repository.model_name": name,
244
+ namespace: ns
245
+ }
246
+ }, { captureStackTrace: false })))),
230
247
  all: Effect
231
248
  .all({
232
249
  q: Effect.sync(() => ({
233
250
  query: `SELECT * FROM ${name}`,
234
251
  parameters: []
235
252
  })),
236
- pk: resolvePartitionKeyAndSeed
253
+ ns: resolveAndSeed
237
254
  })
238
- .pipe(Effect.tap(({ q }) => logQuery(q)), Effect.flatMap(({ pk, q }) => Effect.promise(() => container
255
+ .pipe(Effect.tap(({ q }) => logQuery(q)), Effect.flatMap(({ ns, q }) => Effect
256
+ .promise(() => container
239
257
  .items
240
- .query(q, { partitionKey: pk })
258
+ .query(q, { partitionKey: nsBasePartitionKey(ns) })
241
259
  .fetchAll()
242
- .then(({ resources }) => resources.map((_) => ({ ...defaultValues, ...mapReverseId(_) }))))), Effect
243
- .withSpan("Cosmos.all [effect-app/infra/Store]", {
244
- attributes: { "repository.container_id": containerId, "repository.model_name": name }
245
- }, { captureStackTrace: false })),
260
+ .then(({ resources }) => resources.map((_) => ({ ...defaultValues, ...mapReverseId(_) }))))
261
+ .pipe(Effect.withSpan("Cosmos.all [effect-app/infra/Store]", {
262
+ attributes: {
263
+ "repository.container_id": containerId,
264
+ "repository.model_name": name,
265
+ namespace: ns
266
+ }
267
+ }, { captureStackTrace: false })))),
246
268
  /**
247
269
  * May return duplicate results for "join_find", when matching more than once.
248
270
  */
@@ -253,13 +275,14 @@ function makeCosmosStore({ prefix }) {
253
275
  return Effect
254
276
  .all({
255
277
  q: Effect.sync(() => buildWhereCosmosQuery3(idKey, filter ? [{ t: "where-scope", result: filter, relation: "some" }] : [], name, defaultValues, f.select, f.order, skip, limit)),
256
- pk: resolvePartitionKey
278
+ ns: resolveAndSeed
257
279
  })
258
280
  .pipe(Effect.tap(({ q }) => logQuery(q)), Effect
259
- .flatMap(({ pk, q }) => Effect.promise(() => f.select
281
+ .flatMap(({ ns, q }) => Effect
282
+ .promise(() => f.select
260
283
  ? container
261
284
  .items
262
- .query(q, { partitionKey: pk })
285
+ .query(q, { partitionKey: nsBasePartitionKey(ns) })
263
286
  .fetchAll()
264
287
  .then(({ resources }) => resources.map((_) => ({
265
288
  ...pipe(defaultValues, Struct.pick(f.select.filter((_) => typeof _ === "string"))),
@@ -267,12 +290,16 @@ function makeCosmosStore({ prefix }) {
267
290
  })))
268
291
  : container
269
292
  .items
270
- .query(q, { partitionKey: pk })
293
+ .query(q, { partitionKey: nsBasePartitionKey(ns) })
271
294
  .fetchAll()
272
- .then(({ resources }) => resources.map(({ f }) => ({ ...defaultValues, ...mapReverseId(f) }))))))
295
+ .then(({ resources }) => resources.map(({ f }) => ({ ...defaultValues, ...mapReverseId(f) }))))
273
296
  .pipe(Effect.withSpan("Cosmos.filter [effect-app/infra/Store]", {
274
- attributes: { "repository.container_id": containerId, "repository.model_name": name }
275
- }, { captureStackTrace: false }));
297
+ attributes: {
298
+ "repository.container_id": containerId,
299
+ "repository.model_name": name,
300
+ namespace: ns
301
+ }
302
+ }, { captureStackTrace: false }))));
276
303
  },
277
304
  find: (id) => resolveAndSeed.pipe(Effect.flatMap((ns) => Effect
278
305
  .promise(() => container
@@ -285,6 +312,7 @@ function makeCosmosStore({ prefix }) {
285
312
  "repository.container_id": containerId,
286
313
  "repository.model_name": name,
287
314
  partitionValue: nsPartitionValue(ns, { [idKey]: id }),
315
+ namespace: ns,
288
316
  id
289
317
  }
290
318
  }, { captureStackTrace: false })))),
@@ -319,6 +347,7 @@ function makeCosmosStore({ prefix }) {
319
347
  attributes: {
320
348
  "repository.container_id": containerId,
321
349
  "repository.model_name": name,
350
+ namespace: ns,
322
351
  id: e[idKey]
323
352
  }
324
353
  }, { captureStackTrace: false })))),
@@ -337,4 +366,4 @@ export function CosmosStoreLayer(cfg) {
337
366
  .toLayer(makeCosmosStore(cfg))
338
367
  .pipe(Layer.provide(CosmosClientLayer(Redacted.value(cfg.url), cfg.dbName)));
339
368
  }
340
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Cosmos.js","sourceRoot":"","sources":["../../src/Store/Cosmos.ts"],"names":[],"mappings":"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"}
369
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Cosmos.js","sourceRoot":"","sources":["../../src/Store/Cosmos.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effect-app/infra",
3
- "version": "4.0.0-beta.96",
3
+ "version": "4.0.0-beta.98",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "dependencies": {
@@ -13,7 +13,7 @@
13
13
  "proper-lockfile": "^4.1.2",
14
14
  "pure-rand": "7.0.1",
15
15
  "query-string": "^9.3.1",
16
- "effect-app": "4.0.0-beta.96"
16
+ "effect-app": "4.0.0-beta.98"
17
17
  },
18
18
  "devDependencies": {
19
19
  "@azure/cosmos": "^4.9.2",
package/src/Store/Cosmos.ts CHANGED
@@ -57,6 +57,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
57
57
  const base = config?.partitionValue(e) ?? "primary"
58
58
  return `${nsPrefix(ns)}${base}`
59
59
  }
60
+ const nsBasePartitionKey = (ns: string) => `${nsPrefix(ns)}${basePartitionKey}`
60
61
  const resolveNamespace = !config?.allowNamespace
61
62
  ? Effect.succeed("primary")
62
63
  : storeId.asEffect().pipe(Effect.map((namespace) => {
@@ -65,7 +66,6 @@ function makeCosmosStore({ prefix }: StorageConfig) {
65
66
  }
66
67
  return namespace
67
68
  }))
68
- const resolvePartitionKey = Effect.map(resolveNamespace, (ns) => `${nsPrefix(ns)}${basePartitionKey}`)
69
69
 
70
70
  const defaultValues = config?.defaultValues ?? {}
71
71
  const container = db.container(containerId)
@@ -113,7 +113,9 @@ function makeCosmosStore({ prefix }: StorageConfig) {
113
113
  Effect.provide(ctx),
114
114
  Effect.orDie
115
115
  )
116
- })
116
+ }),
117
+ Effect.withLogSpan(`Cosmos.seedCheck ${name} in ${ns} [effect-app/infra/Store]`),
118
+ Effect.withSpan("Cosmos.seed [effect-app/infra/Store]", { attributes: { name, namespace: ns } })
117
119
  )
118
120
  }
119
121
  const seedNamespace = Effect.fn("seedNamespace")(function*(ns: string) {
@@ -128,7 +130,6 @@ function makeCosmosStore({ prefix }: StorageConfig) {
128
130
  const resolveAndSeed = resolveNamespace.pipe(
129
131
  Effect.tap((ns) => seedNamespace(ns))
130
132
  )
131
- const resolvePartitionKeyAndSeed = Effect.map(resolveAndSeed, (ns) => `${nsPrefix(ns)}${basePartitionKey}`)
132
133
 
133
134
  const bulkSetInternal = (items: NonEmptyReadonlyArray<PM>, ns: string) =>
134
135
  Effect
@@ -231,15 +232,14 @@ function makeCosmosStore({ prefix }: StorageConfig) {
231
232
 
232
233
  return batchResult.flat() as unknown as NonEmptyReadonlyArray<Encoded>
233
234
  })
234
-
235
- const bulkSet = (items: NonEmptyReadonlyArray<PM>) =>
236
- resolveAndSeed.pipe(Effect.flatMap((ns) =>
237
- bulkSetInternal(items, ns).pipe(
235
+ .pipe(
238
236
  Effect.withSpan("Cosmos.bulkSet [effect-app/infra/Store]", {
239
- attributes: { "repository.container_id": containerId, "repository.model_name": name }
237
+ attributes: { "repository.container_id": containerId, "repository.model_name": name, namespace: ns }
240
238
  }, { captureStackTrace: false })
241
239
  )
242
- ))
240
+
241
+ const bulkSet = (items: NonEmptyReadonlyArray<PM>) =>
242
+ resolveAndSeed.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns)))
243
243
 
244
244
  const batchSet = (items: NonEmptyReadonlyArray<PM>) => {
245
245
  return resolveAndSeed
@@ -303,52 +303,72 @@ function makeCosmosStore({ prefix }: StorageConfig) {
303
303
  })) as unknown as NonEmptyReadonlyArray<Encoded>
304
304
  })))
305
305
  })
306
+ .pipe(Effect
307
+ .withSpan("Cosmos.batchSet [effect-app/infra/Store]", {
308
+ attributes: {
309
+ "repository.container_id": containerId,
310
+ "repository.model_name": name,
311
+ namespace: ns
312
+ }
313
+ }, { captureStackTrace: false }))
306
314
  ))
307
- .pipe(Effect
308
- .withSpan("Cosmos.batchSet [effect-app/infra/Store]", {
309
- attributes: { "repository.container_id": containerId, "repository.model_name": name }
310
- }, { captureStackTrace: false }))
311
315
  }
312
316
 
313
317
  const s: Store<IdKey, Encoded> = {
314
318
  queryRaw: <Out>(query: RawQuery<Encoded, Out>) =>
315
319
  Effect
316
- .all({ q: Effect.sync(() => query.cosmos({ name })), pk: resolvePartitionKeyAndSeed })
320
+ .all({ q: Effect.sync(() => query.cosmos({ name })), ns: resolveAndSeed })
317
321
  .pipe(
318
322
  Effect.tap(({ q }) => logQuery(q)),
319
- Effect.flatMap(({ pk, q }) =>
320
- Effect.promise(() =>
321
- container
322
- .items
323
- .query<Out>(q, { partitionKey: pk })
324
- .fetchAll()
325
- .then(({ resources }) =>
326
- resources.map(
327
- (_) => ({ ...defaultValues, ...mapReverseId(_ as any) }) as Out
323
+ Effect.flatMap(({ ns, q }) =>
324
+ Effect
325
+ .promise(() =>
326
+ container
327
+ .items
328
+ .query<Out>(q, { partitionKey: nsBasePartitionKey(ns) })
329
+ .fetchAll()
330
+ .then(({ resources }) =>
331
+ resources.map(
332
+ (_) => ({ ...defaultValues, ...mapReverseId(_ as any) }) as Out
333
+ )
328
334
  )
329
- )
330
- )
331
- ),
332
- Effect
333
- .withSpan("Cosmos.queryRaw [effect-app/infra/Store]", {
334
- attributes: { "repository.container_id": containerId, "repository.model_name": name }
335
- }, { captureStackTrace: false })
335
+ )
336
+ .pipe(
337
+ Effect.withSpan("Cosmos.queryRaw [effect-app/infra/Store]", {
338
+ attributes: {
339
+ "repository.container_id": containerId,
340
+ "repository.model_name": name,
341
+ namespace: ns
342
+ }
343
+ }, { captureStackTrace: false })
344
+ )
345
+ )
336
346
  ),
337
347
  batchRemove: (ids, partitionKey?: string) =>
338
- resolvePartitionKeyAndSeed.pipe(Effect.flatMap((pk) =>
339
- Effect.promise(() =>
340
- execBatch(
341
- mutable(ids.map((id) =>
342
- dropUndefinedT({
343
- operationType: "Delete" as const,
344
- id
345
- // don't use this or we get an error that the request and some item partition key dont match - makese no sense
346
- // partitionKey: config?.partitionValue({ [idKey]: id } as Encoded)
347
- })
348
- )),
349
- partitionKey ?? pk
348
+ resolveAndSeed.pipe(Effect.flatMap((ns) =>
349
+ Effect
350
+ .promise(() =>
351
+ execBatch(
352
+ mutable(ids.map((id) =>
353
+ dropUndefinedT({
354
+ operationType: "Delete" as const,
355
+ id
356
+ // don't use this or we get an error that the request and some item partition key dont match - makese no sense
357
+ // partitionKey: config?.partitionValue({ [idKey]: id } as Encoded)
358
+ })
359
+ )),
360
+ partitionKey ?? nsBasePartitionKey(ns)
361
+ )
362
+ )
363
+ .pipe(
364
+ Effect.withSpan("Cosmos.batchRemove [effect-app/infra/Store]", {
365
+ attributes: {
366
+ "repository.container_id": containerId,
367
+ "repository.model_name": name,
368
+ namespace: ns
369
+ }
370
+ }, { captureStackTrace: false })
350
371
  )
351
- )
352
372
  )),
353
373
  all: Effect
354
374
  .all({
@@ -356,27 +376,33 @@ function makeCosmosStore({ prefix }: StorageConfig) {
356
376
  query: `SELECT * FROM ${name}`,
357
377
  parameters: []
358
378
  })),
359
- pk: resolvePartitionKeyAndSeed
379
+ ns: resolveAndSeed
360
380
  })
361
381
  .pipe(
362
382
  Effect.tap(({ q }) => logQuery(q)),
363
- Effect.flatMap(({ pk, q }) =>
364
- Effect.promise(() =>
365
- container
366
- .items
367
- .query<PMCosmos>(q, { partitionKey: pk })
368
- .fetchAll()
369
- .then(({ resources }) =>
370
- resources.map(
371
- (_) => ({ ...defaultValues, ...mapReverseId(_) })
383
+ Effect.flatMap(({ ns, q }) =>
384
+ Effect
385
+ .promise(() =>
386
+ container
387
+ .items
388
+ .query<PMCosmos>(q, { partitionKey: nsBasePartitionKey(ns) })
389
+ .fetchAll()
390
+ .then(({ resources }) =>
391
+ resources.map(
392
+ (_) => ({ ...defaultValues, ...mapReverseId(_) })
393
+ )
372
394
  )
373
- )
374
- )
375
- ),
376
- Effect
377
- .withSpan("Cosmos.all [effect-app/infra/Store]", {
378
- attributes: { "repository.container_id": containerId, "repository.model_name": name }
379
- }, { captureStackTrace: false })
395
+ )
396
+ .pipe(
397
+ Effect.withSpan("Cosmos.all [effect-app/infra/Store]", {
398
+ attributes: {
399
+ "repository.container_id": containerId,
400
+ "repository.model_name": name,
401
+ namespace: ns
402
+ }
403
+ }, { captureStackTrace: false })
404
+ )
405
+ )
380
406
  ),
381
407
  /**
382
408
  * May return duplicate results for "join_find", when matching more than once.
@@ -404,42 +430,47 @@ function makeCosmosStore({ prefix }: StorageConfig) {
404
430
  limit
405
431
  )
406
432
  ),
407
- pk: resolvePartitionKey
433
+ ns: resolveAndSeed
408
434
  })
409
435
  .pipe(
410
436
  Effect.tap(({ q }) => logQuery(q)),
411
437
  Effect
412
- .flatMap(({ pk, q }) =>
413
- Effect.promise(() =>
414
- f.select
415
- ? container
416
- .items
417
- .query<M>(q, { partitionKey: pk })
418
- .fetchAll()
419
- .then(({ resources }) =>
420
- resources.map((_) => ({
421
- ...pipe(
422
- defaultValues,
423
- Struct.pick(f.select!.filter((_) => typeof _ === "string") as never[])
424
- ),
425
- ...mapReverseId(_ as any)
426
- }))
427
- )
428
- : container
429
- .items
430
- .query<{ f: M }>(q, { partitionKey: pk })
431
- .fetchAll()
432
- .then(({ resources }) =>
433
- resources.map(({ f }) => ({ ...defaultValues, ...mapReverseId(f as any) }) as any)
434
- )
435
- )
438
+ .flatMap(({ ns, q }) =>
439
+ Effect
440
+ .promise(() =>
441
+ f.select
442
+ ? container
443
+ .items
444
+ .query<M>(q, { partitionKey: nsBasePartitionKey(ns) })
445
+ .fetchAll()
446
+ .then(({ resources }) =>
447
+ resources.map((_) => ({
448
+ ...pipe(
449
+ defaultValues,
450
+ Struct.pick(f.select!.filter((_) => typeof _ === "string") as never[])
451
+ ),
452
+ ...mapReverseId(_ as any)
453
+ }))
454
+ )
455
+ : container
456
+ .items
457
+ .query<{ f: M }>(q, { partitionKey: nsBasePartitionKey(ns) })
458
+ .fetchAll()
459
+ .then(({ resources }) =>
460
+ resources.map(({ f }) => ({ ...defaultValues, ...mapReverseId(f as any) }) as any)
461
+ )
462
+ )
463
+ .pipe(
464
+ Effect.withSpan("Cosmos.filter [effect-app/infra/Store]", {
465
+ attributes: {
466
+ "repository.container_id": containerId,
467
+ "repository.model_name": name,
468
+ namespace: ns
469
+ }
470
+ }, { captureStackTrace: false })
471
+ )
436
472
  )
437
473
  )
438
- .pipe(
439
- Effect.withSpan("Cosmos.filter [effect-app/infra/Store]", {
440
- attributes: { "repository.container_id": containerId, "repository.model_name": name }
441
- }, { captureStackTrace: false })
442
- )
443
474
  },
444
475
  find: (id) =>
445
476
  resolveAndSeed.pipe(Effect.flatMap((ns) =>
@@ -460,6 +491,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
460
491
  "repository.container_id": containerId,
461
492
  "repository.model_name": name,
462
493
  partitionValue: nsPartitionValue(ns, { [idKey]: id } as Encoded),
494
+ namespace: ns,
463
495
  id
464
496
  }
465
497
  }, { captureStackTrace: false }))
@@ -517,6 +549,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
517
549
  attributes: {
518
550
  "repository.container_id": containerId,
519
551
  "repository.model_name": name,
552
+ namespace: ns,
520
553
  id: e[idKey]
521
554
  }
522
555
  }, { captureStackTrace: false })