@effect-app/infra 4.0.0-beta.84 → 4.0.0-beta.86
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 +14 -0
- package/dist/Store/Cosmos.d.ts.map +1 -1
- package/dist/Store/Cosmos.js +44 -32
- package/dist/Store/SQL/Pg.d.ts.map +1 -1
- package/dist/Store/SQL/Pg.js +65 -54
- package/dist/Store/SQL.d.ts.map +1 -1
- package/dist/Store/SQL.js +65 -54
- package/package.json +2 -2
- package/src/Store/Cosmos.ts +73 -42
- package/src/Store/SQL/Pg.ts +112 -80
- package/src/Store/SQL.ts +112 -80
package/dist/Store/SQL.js
CHANGED
|
@@ -60,8 +60,61 @@ function makeSQLStoreInt(dialect, jsonColumnType) {
|
|
|
60
60
|
return { id, _etag: newE._etag, data, item: newE };
|
|
61
61
|
};
|
|
62
62
|
const exec = (query, params) => sql.unsafe(query, params).pipe(Effect.orDie);
|
|
63
|
+
const seedMarkerId = `__seed_marker__`;
|
|
64
|
+
const setInternal = (e, ns) => Effect.gen(function* () {
|
|
65
|
+
const row = toRow(e);
|
|
66
|
+
if (e._etag) {
|
|
67
|
+
yield* exec(`UPDATE "${tableName}" SET _etag = ?, data = ? WHERE id = ? AND _etag = ? AND _namespace = ?`, [row._etag, row.data, row.id, e._etag, ns]);
|
|
68
|
+
const existing = yield* exec(`SELECT _etag FROM "${tableName}" WHERE id = ? AND _namespace = ?`, [row.id, ns]);
|
|
69
|
+
const current = existing[0];
|
|
70
|
+
if (!current || current._etag !== row._etag) {
|
|
71
|
+
if (current) {
|
|
72
|
+
return yield* new OptimisticConcurrencyException({
|
|
73
|
+
type: name,
|
|
74
|
+
id: row.id,
|
|
75
|
+
current: current._etag,
|
|
76
|
+
found: e._etag,
|
|
77
|
+
code: 412
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
return yield* new OptimisticConcurrencyException({
|
|
81
|
+
type: name,
|
|
82
|
+
id: row.id,
|
|
83
|
+
current: "",
|
|
84
|
+
found: e._etag,
|
|
85
|
+
code: 404
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
yield* exec(`INSERT INTO "${tableName}" (id, _namespace, _etag, data) VALUES (?, ?, ?, ?)`, [row.id, ns, row._etag, row.data]);
|
|
91
|
+
}
|
|
92
|
+
return row.item;
|
|
93
|
+
});
|
|
94
|
+
const bulkSetInternal = (items, ns) => sql
|
|
95
|
+
.withTransaction(Effect.forEach(items, (e) => setInternal(e, ns)))
|
|
96
|
+
.pipe(Effect.orDie, Effect.map((_) => _));
|
|
97
|
+
const ctx = yield* Effect.context();
|
|
98
|
+
const seedCache = new Map();
|
|
99
|
+
const makeSeedEffect = (ns) => exec(`SELECT id FROM "${tableName}" WHERE id = ? AND _namespace = ?`, [seedMarkerId, `__seed__::${ns}`])
|
|
100
|
+
.pipe(Effect.flatMap((existing) => {
|
|
101
|
+
if (existing.length > 0)
|
|
102
|
+
return Effect.void;
|
|
103
|
+
return InfraLogger.logInfo(`Seeding data for ${name} (namespace: ${ns})`).pipe(Effect.andThen(seed), Effect.flatMap((items) => Effect.flatMapOption(Effect.succeed(toNonEmptyArray([...items])), (a) => bulkSetInternal(a, ns))), Effect.andThen(exec(`INSERT INTO "${tableName}" (id, _namespace, _etag, data) VALUES (?, ?, ?, ?)`, [seedMarkerId, `__seed__::${ns}`, null, JSON.stringify({ _marker: true })])), Effect.provide(ctx), Effect.orDie);
|
|
104
|
+
}));
|
|
105
|
+
const seedNamespace = Effect.fn("seedNamespace")(function* (ns) {
|
|
106
|
+
if (!seed)
|
|
107
|
+
return;
|
|
108
|
+
let cached = seedCache.get(ns);
|
|
109
|
+
if (!cached) {
|
|
110
|
+
cached = yield* Effect.cached(makeSeedEffect(ns));
|
|
111
|
+
seedCache.set(ns, cached);
|
|
112
|
+
}
|
|
113
|
+
yield* cached;
|
|
114
|
+
});
|
|
115
|
+
const resolveAndSeed = resolveNamespace.pipe(Effect.tap((ns) => seedNamespace(ns)));
|
|
63
116
|
const s = {
|
|
64
|
-
all:
|
|
117
|
+
all: resolveAndSeed.pipe(Effect.flatMap((ns) => exec(`SELECT id, _etag, data FROM "${tableName}" WHERE _namespace = ?`, [ns])
|
|
65
118
|
.pipe(Effect.map((rows) => rows.map((r) => parseRow(r, idKey, defaultValues))), Effect.withSpan("SQL.all [effect-app/infra/Store]", {
|
|
66
119
|
attributes: {
|
|
67
120
|
"repository.table_name": tableName,
|
|
@@ -69,7 +122,7 @@ function makeSQLStoreInt(dialect, jsonColumnType) {
|
|
|
69
122
|
"repository.namespace": ns
|
|
70
123
|
}
|
|
71
124
|
}, { captureStackTrace: false })))),
|
|
72
|
-
find: (id) =>
|
|
125
|
+
find: (id) => resolveAndSeed.pipe(Effect.flatMap((ns) => exec(`SELECT id, _etag, data FROM "${tableName}" WHERE id = ? AND _namespace = ?`, [id, ns])
|
|
73
126
|
.pipe(Effect.map((rows) => {
|
|
74
127
|
const row = rows[0];
|
|
75
128
|
return row
|
|
@@ -81,7 +134,7 @@ function makeSQLStoreInt(dialect, jsonColumnType) {
|
|
|
81
134
|
filter: (f) => {
|
|
82
135
|
const filter = f
|
|
83
136
|
.filter;
|
|
84
|
-
return
|
|
137
|
+
return resolveAndSeed
|
|
85
138
|
.pipe(Effect
|
|
86
139
|
.flatMap((ns) => Effect
|
|
87
140
|
.sync(() => {
|
|
@@ -125,53 +178,18 @@ function makeSQLStoreInt(dialect, jsonColumnType) {
|
|
|
125
178
|
attributes: { "repository.table_name": tableName, "repository.model_name": name }
|
|
126
179
|
}, { captureStackTrace: false }))));
|
|
127
180
|
},
|
|
128
|
-
set: (e) =>
|
|
129
|
-
.gen(function* () {
|
|
130
|
-
const row = toRow(e);
|
|
131
|
-
if (e._etag) {
|
|
132
|
-
yield* exec(`UPDATE "${tableName}" SET _etag = ?, data = ? WHERE id = ? AND _etag = ? AND _namespace = ?`, [row._etag, row.data, row.id, e._etag, ns]);
|
|
133
|
-
const existing = yield* exec(`SELECT _etag FROM "${tableName}" WHERE id = ? AND _namespace = ?`, [row.id, ns]);
|
|
134
|
-
const current = existing[0];
|
|
135
|
-
if (!current || current._etag !== row._etag) {
|
|
136
|
-
if (current) {
|
|
137
|
-
return yield* new OptimisticConcurrencyException({
|
|
138
|
-
type: name,
|
|
139
|
-
id: row.id,
|
|
140
|
-
current: current._etag,
|
|
141
|
-
found: e._etag,
|
|
142
|
-
code: 412
|
|
143
|
-
});
|
|
144
|
-
}
|
|
145
|
-
return yield* new OptimisticConcurrencyException({
|
|
146
|
-
type: name,
|
|
147
|
-
id: row.id,
|
|
148
|
-
current: "",
|
|
149
|
-
found: e._etag,
|
|
150
|
-
code: 404
|
|
151
|
-
});
|
|
152
|
-
}
|
|
153
|
-
}
|
|
154
|
-
else {
|
|
155
|
-
yield* exec(`INSERT INTO "${tableName}" (id, _namespace, _etag, data) VALUES (?, ?, ?, ?)`, [row.id, ns, row._etag, row.data]);
|
|
156
|
-
}
|
|
157
|
-
return row.item;
|
|
158
|
-
})
|
|
159
|
-
.pipe(Effect.withSpan("SQL.set [effect-app/infra/Store]", {
|
|
181
|
+
set: (e) => resolveAndSeed.pipe(Effect.flatMap((ns) => setInternal(e, ns).pipe(Effect.withSpan("SQL.set [effect-app/infra/Store]", {
|
|
160
182
|
attributes: { "repository.table_name": tableName, "repository.model_name": name, id: e[idKey] }
|
|
161
183
|
}, { captureStackTrace: false })))),
|
|
162
|
-
batchSet: (items) =>
|
|
163
|
-
.withTransaction(Effect.forEach(items, (e) => s.set(e)))
|
|
164
|
-
.pipe(Effect.orDie, Effect.map((_) => _), Effect.withSpan("SQL.batchSet [effect-app/infra/Store]", {
|
|
184
|
+
batchSet: (items) => resolveAndSeed.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns).pipe(Effect.withSpan("SQL.batchSet [effect-app/infra/Store]", {
|
|
165
185
|
attributes: { "repository.table_name": tableName, "repository.model_name": name }
|
|
166
|
-
}, { captureStackTrace: false })),
|
|
167
|
-
bulkSet: (items) =>
|
|
168
|
-
.withTransaction(Effect.forEach(items, (e) => s.set(e)))
|
|
169
|
-
.pipe(Effect.orDie, Effect.map((_) => _), Effect.withSpan("SQL.bulkSet [effect-app/infra/Store]", {
|
|
186
|
+
}, { captureStackTrace: false })))),
|
|
187
|
+
bulkSet: (items) => resolveAndSeed.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns).pipe(Effect.withSpan("SQL.bulkSet [effect-app/infra/Store]", {
|
|
170
188
|
attributes: { "repository.table_name": tableName, "repository.model_name": name }
|
|
171
|
-
}, { captureStackTrace: false })),
|
|
189
|
+
}, { captureStackTrace: false })))),
|
|
172
190
|
batchRemove: (ids) => {
|
|
173
191
|
const placeholders = ids.map(() => "?").join(", ");
|
|
174
|
-
return
|
|
192
|
+
return resolveAndSeed.pipe(Effect.flatMap((ns) => exec(`DELETE FROM "${tableName}" WHERE id IN (${placeholders}) AND _namespace = ?`, [...ids, ns])
|
|
175
193
|
.pipe(Effect.asVoid, Effect.withSpan("SQL.batchRemove [effect-app/infra/Store]", {
|
|
176
194
|
attributes: { "repository.table_name": tableName, "repository.model_name": name }
|
|
177
195
|
}, { captureStackTrace: false }))));
|
|
@@ -180,15 +198,8 @@ function makeSQLStoreInt(dialect, jsonColumnType) {
|
|
|
180
198
|
attributes: { "repository.table_name": tableName, "repository.model_name": name }
|
|
181
199
|
}, { captureStackTrace: false }))
|
|
182
200
|
};
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
const count = existing[0]?.cnt ?? 0;
|
|
186
|
-
if (count === 0) {
|
|
187
|
-
yield* InfraLogger.logInfo("Seeding data for " + name);
|
|
188
|
-
const items = yield* seed;
|
|
189
|
-
yield* Effect.flatMapOption(Effect.succeed(toNonEmptyArray([...items])), (a) => s.bulkSet(a).pipe(Effect.orDie));
|
|
190
|
-
}
|
|
191
|
-
}
|
|
201
|
+
// Eagerly seed primary namespace on initialization
|
|
202
|
+
yield* seedNamespace("primary");
|
|
192
203
|
return s;
|
|
193
204
|
})
|
|
194
205
|
};
|
|
@@ -198,4 +209,4 @@ export function SQLiteStoreLayer(cfg) {
|
|
|
198
209
|
return StoreMaker
|
|
199
210
|
.toLayer(makeSQLStoreInt(sqliteDialect, "JSON")(cfg));
|
|
200
211
|
}
|
|
201
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SQL.js","sourceRoot":"","sources":["../../src/Store/SQL.ts"],"names":[],"mappings":"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"}
|
|
212
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SQL.js","sourceRoot":"","sources":["../../src/Store/SQL.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.
|
|
3
|
+
"version": "4.0.0-beta.86",
|
|
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.
|
|
16
|
+
"effect-app": "4.0.0-beta.86"
|
|
17
17
|
},
|
|
18
18
|
"devDependencies": {
|
|
19
19
|
"@azure/cosmos": "^4.9.2",
|
package/src/Store/Cosmos.ts
CHANGED
|
@@ -75,10 +75,64 @@ function makeCosmosStore({ prefix }: StorageConfig) {
|
|
|
75
75
|
// then need to clean up the actual data.. perhaps first do with a config toggle to prescribe to it.
|
|
76
76
|
const importedMarkerId = containerId
|
|
77
77
|
|
|
78
|
-
const
|
|
78
|
+
const ctx = yield* Effect.context<R>()
|
|
79
|
+
const seedCache = new Map<string, Effect.Effect<void>>()
|
|
80
|
+
const makeSeedEffect = (ns: string) => {
|
|
81
|
+
const markerId = ns === "primary" ? importedMarkerId : `${importedMarkerId}::${ns}`
|
|
82
|
+
return Effect
|
|
83
|
+
.promise(() =>
|
|
84
|
+
container
|
|
85
|
+
.item(markerId, markerId)
|
|
86
|
+
.read<{ id: string }>()
|
|
87
|
+
.then(({ resource }) => Option.fromNullishOr(resource))
|
|
88
|
+
)
|
|
89
|
+
.pipe(
|
|
90
|
+
Effect.flatMap((marker) => {
|
|
91
|
+
if (Option.isSome(marker)) return Effect.void
|
|
92
|
+
return InfraLogger.logInfo(`Creating mock data for ${name} (namespace: ${ns})`).pipe(
|
|
93
|
+
Effect.andThen(seed!),
|
|
94
|
+
Effect.flatMap((m) =>
|
|
95
|
+
Effect.flatMapOption(
|
|
96
|
+
Effect.succeed(toNonEmptyArray([...m])),
|
|
97
|
+
(a) =>
|
|
98
|
+
bulkSetInternal(a, ns).pipe(
|
|
99
|
+
Effect.orDie,
|
|
100
|
+
Effect.delay(Duration.millis(1100))
|
|
101
|
+
)
|
|
102
|
+
)
|
|
103
|
+
),
|
|
104
|
+
Effect.andThen(
|
|
105
|
+
Effect.promise(() =>
|
|
106
|
+
container.items.create({
|
|
107
|
+
_partitionKey: markerId,
|
|
108
|
+
id: markerId,
|
|
109
|
+
ttl: -1
|
|
110
|
+
})
|
|
111
|
+
)
|
|
112
|
+
),
|
|
113
|
+
Effect.provide(ctx),
|
|
114
|
+
Effect.orDie
|
|
115
|
+
)
|
|
116
|
+
})
|
|
117
|
+
)
|
|
118
|
+
}
|
|
119
|
+
const seedNamespace = Effect.fn("seedNamespace")(function*(ns: string) {
|
|
120
|
+
if (!seed) return
|
|
121
|
+
let cached = seedCache.get(ns)
|
|
122
|
+
if (!cached) {
|
|
123
|
+
cached = yield* Effect.cached(makeSeedEffect(ns))
|
|
124
|
+
seedCache.set(ns, cached)
|
|
125
|
+
}
|
|
126
|
+
yield* cached
|
|
127
|
+
})
|
|
128
|
+
const resolveAndSeed = resolveNamespace.pipe(
|
|
129
|
+
Effect.tap((ns) => seedNamespace(ns))
|
|
130
|
+
)
|
|
131
|
+
const resolvePartitionKeyAndSeed = Effect.map(resolveAndSeed, (ns) => `${nsPrefix(ns)}${basePartitionKey}`)
|
|
132
|
+
|
|
133
|
+
const bulkSetInternal = (items: NonEmptyReadonlyArray<PM>, ns: string) =>
|
|
79
134
|
Effect
|
|
80
135
|
.gen(function*() {
|
|
81
|
-
const ns = yield* resolveNamespace
|
|
82
136
|
// TODO: disable batching if need atomicity
|
|
83
137
|
// we delay and batch to keep low amount of RUs
|
|
84
138
|
const b = [...items]
|
|
@@ -177,12 +231,18 @@ function makeCosmosStore({ prefix }: StorageConfig) {
|
|
|
177
231
|
|
|
178
232
|
return batchResult.flat() as unknown as NonEmptyReadonlyArray<Encoded>
|
|
179
233
|
})
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
234
|
+
|
|
235
|
+
const bulkSet = (items: NonEmptyReadonlyArray<PM>) =>
|
|
236
|
+
resolveAndSeed.pipe(Effect.flatMap((ns) =>
|
|
237
|
+
bulkSetInternal(items, ns).pipe(
|
|
238
|
+
Effect.withSpan("Cosmos.bulkSet [effect-app/infra/Store]", {
|
|
239
|
+
attributes: { "repository.container_id": containerId, "repository.model_name": name }
|
|
240
|
+
}, { captureStackTrace: false })
|
|
241
|
+
)
|
|
242
|
+
))
|
|
183
243
|
|
|
184
244
|
const batchSet = (items: NonEmptyReadonlyArray<PM>) => {
|
|
185
|
-
return
|
|
245
|
+
return resolveAndSeed
|
|
186
246
|
.pipe(Effect.flatMap((ns) =>
|
|
187
247
|
Effect
|
|
188
248
|
.suspend(() => {
|
|
@@ -253,7 +313,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
|
|
|
253
313
|
const s: Store<IdKey, Encoded> = {
|
|
254
314
|
queryRaw: <Out>(query: RawQuery<Encoded, Out>) =>
|
|
255
315
|
Effect
|
|
256
|
-
.all({ q: Effect.sync(() => query.cosmos({ name })), pk:
|
|
316
|
+
.all({ q: Effect.sync(() => query.cosmos({ name })), pk: resolvePartitionKeyAndSeed })
|
|
257
317
|
.pipe(
|
|
258
318
|
Effect.tap(({ q }) => logQuery(q)),
|
|
259
319
|
Effect.flatMap(({ pk, q }) =>
|
|
@@ -275,7 +335,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
|
|
|
275
335
|
}, { captureStackTrace: false })
|
|
276
336
|
),
|
|
277
337
|
batchRemove: (ids, partitionKey?: string) =>
|
|
278
|
-
|
|
338
|
+
resolvePartitionKeyAndSeed.pipe(Effect.flatMap((pk) =>
|
|
279
339
|
Effect.promise(() =>
|
|
280
340
|
execBatch(
|
|
281
341
|
mutable(ids.map((id) =>
|
|
@@ -296,7 +356,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
|
|
|
296
356
|
query: `SELECT * FROM ${name}`,
|
|
297
357
|
parameters: []
|
|
298
358
|
})),
|
|
299
|
-
pk:
|
|
359
|
+
pk: resolvePartitionKeyAndSeed
|
|
300
360
|
})
|
|
301
361
|
.pipe(
|
|
302
362
|
Effect.tap(({ q }) => logQuery(q)),
|
|
@@ -382,7 +442,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
|
|
|
382
442
|
)
|
|
383
443
|
},
|
|
384
444
|
find: (id) =>
|
|
385
|
-
|
|
445
|
+
resolveAndSeed.pipe(Effect.flatMap((ns) =>
|
|
386
446
|
Effect
|
|
387
447
|
.promise(() =>
|
|
388
448
|
container
|
|
@@ -405,7 +465,7 @@ function makeCosmosStore({ prefix }: StorageConfig) {
|
|
|
405
465
|
}, { captureStackTrace: false }))
|
|
406
466
|
)),
|
|
407
467
|
set: (e) =>
|
|
408
|
-
|
|
468
|
+
resolveAndSeed.pipe(Effect.flatMap((ns) =>
|
|
409
469
|
Option
|
|
410
470
|
.match(
|
|
411
471
|
Option
|
|
@@ -466,38 +526,9 @@ function makeCosmosStore({ prefix }: StorageConfig) {
|
|
|
466
526
|
bulkSet
|
|
467
527
|
}
|
|
468
528
|
|
|
469
|
-
//
|
|
470
|
-
|
|
471
|
-
container
|
|
472
|
-
.item(importedMarkerId, importedMarkerId)
|
|
473
|
-
.read<{ id: string }>()
|
|
474
|
-
.then(({ resource }) => Option.fromNullishOr(resource))
|
|
475
|
-
)
|
|
529
|
+
// Eagerly seed primary namespace on initialization
|
|
530
|
+
yield* seedNamespace("primary")
|
|
476
531
|
|
|
477
|
-
if (!Option.isSome(marker)) {
|
|
478
|
-
yield* InfraLogger.logInfo("Creating mock data for " + name)
|
|
479
|
-
if (seed) {
|
|
480
|
-
const m = yield* seed
|
|
481
|
-
yield* Effect.flatMapOption(
|
|
482
|
-
Effect.succeed(toNonEmptyArray([...m])),
|
|
483
|
-
(a) =>
|
|
484
|
-
s.bulkSet(a).pipe(
|
|
485
|
-
Effect.orDie,
|
|
486
|
-
Effect
|
|
487
|
-
// we delay extra here, so that initial creation between Companies/POs also have an interval between them.
|
|
488
|
-
.delay(Duration.millis(1100))
|
|
489
|
-
)
|
|
490
|
-
)
|
|
491
|
-
}
|
|
492
|
-
// Mark as imported
|
|
493
|
-
yield* Effect.promise(() =>
|
|
494
|
-
container.items.create({
|
|
495
|
-
_partitionKey: importedMarkerId,
|
|
496
|
-
id: importedMarkerId,
|
|
497
|
-
ttl: -1
|
|
498
|
-
})
|
|
499
|
-
)
|
|
500
|
-
}
|
|
501
532
|
return s
|
|
502
533
|
})
|
|
503
534
|
}
|
package/src/Store/SQL/Pg.ts
CHANGED
|
@@ -78,8 +78,100 @@ function makePgStore({ prefix }: StorageConfig) {
|
|
|
78
78
|
const exec = (query: string, params?: readonly unknown[]) =>
|
|
79
79
|
sql.unsafe(query, params as any).pipe(Effect.orDie)
|
|
80
80
|
|
|
81
|
+
const seedMarkerId = `__seed_marker__`
|
|
82
|
+
|
|
83
|
+
const setInternal = (e: PM, ns: string) =>
|
|
84
|
+
Effect.gen(function*() {
|
|
85
|
+
const row = toRow(e)
|
|
86
|
+
if (e._etag) {
|
|
87
|
+
yield* exec(
|
|
88
|
+
`UPDATE "${tableName}" SET _etag = $1, data = $2 WHERE id = $3 AND _etag = $4 AND _namespace = $5`,
|
|
89
|
+
[row._etag, row.data, row.id, e._etag, ns]
|
|
90
|
+
)
|
|
91
|
+
const existing = yield* exec(
|
|
92
|
+
`SELECT _etag FROM "${tableName}" WHERE id = $1 AND _namespace = $2`,
|
|
93
|
+
[row.id, ns]
|
|
94
|
+
)
|
|
95
|
+
const current = (existing as any[])[0]
|
|
96
|
+
if (!current || current._etag !== row._etag) {
|
|
97
|
+
if (current) {
|
|
98
|
+
return yield* new OptimisticConcurrencyException({
|
|
99
|
+
type: name,
|
|
100
|
+
id: row.id,
|
|
101
|
+
current: current._etag,
|
|
102
|
+
found: e._etag,
|
|
103
|
+
code: 412
|
|
104
|
+
})
|
|
105
|
+
}
|
|
106
|
+
return yield* new OptimisticConcurrencyException({
|
|
107
|
+
type: name,
|
|
108
|
+
id: row.id,
|
|
109
|
+
current: "",
|
|
110
|
+
found: e._etag,
|
|
111
|
+
code: 404
|
|
112
|
+
})
|
|
113
|
+
}
|
|
114
|
+
} else {
|
|
115
|
+
yield* exec(
|
|
116
|
+
`INSERT INTO "${tableName}" (id, _namespace, _etag, data) VALUES ($1, $2, $3, $4)`,
|
|
117
|
+
[row.id, ns, row._etag, row.data]
|
|
118
|
+
)
|
|
119
|
+
}
|
|
120
|
+
return row.item
|
|
121
|
+
})
|
|
122
|
+
|
|
123
|
+
const bulkSetInternal = (items: NonEmptyReadonlyArray<PM>, ns: string) =>
|
|
124
|
+
sql
|
|
125
|
+
.withTransaction(Effect.forEach(items, (e) => setInternal(e, ns)))
|
|
126
|
+
.pipe(
|
|
127
|
+
Effect.orDie,
|
|
128
|
+
Effect.map((_) => _ as unknown as NonEmptyReadonlyArray<PM>)
|
|
129
|
+
)
|
|
130
|
+
|
|
131
|
+
const ctx = yield* Effect.context<R>()
|
|
132
|
+
const seedCache = new Map<string, Effect.Effect<void>>()
|
|
133
|
+
const makeSeedEffect = (ns: string) =>
|
|
134
|
+
exec(
|
|
135
|
+
`SELECT id FROM "${tableName}" WHERE id = $1 AND _namespace = $2`,
|
|
136
|
+
[seedMarkerId, `__seed__::${ns}`]
|
|
137
|
+
)
|
|
138
|
+
.pipe(
|
|
139
|
+
Effect.flatMap((existing) => {
|
|
140
|
+
if ((existing as any[]).length > 0) return Effect.void
|
|
141
|
+
return InfraLogger.logInfo(`Seeding data for ${name} (namespace: ${ns})`).pipe(
|
|
142
|
+
Effect.andThen(seed!),
|
|
143
|
+
Effect.flatMap((items) =>
|
|
144
|
+
Effect.flatMapOption(
|
|
145
|
+
Effect.succeed(toNonEmptyArray([...items])),
|
|
146
|
+
(a) => bulkSetInternal(a, ns)
|
|
147
|
+
)
|
|
148
|
+
),
|
|
149
|
+
Effect.andThen(
|
|
150
|
+
exec(
|
|
151
|
+
`INSERT INTO "${tableName}" (id, _namespace, _etag, data) VALUES ($1, $2, $3, $4)`,
|
|
152
|
+
[seedMarkerId, `__seed__::${ns}`, null, JSON.stringify({ _marker: true })]
|
|
153
|
+
)
|
|
154
|
+
),
|
|
155
|
+
Effect.provide(ctx),
|
|
156
|
+
Effect.orDie
|
|
157
|
+
)
|
|
158
|
+
})
|
|
159
|
+
)
|
|
160
|
+
const seedNamespace = Effect.fn("seedNamespace")(function*(ns: string) {
|
|
161
|
+
if (!seed) return
|
|
162
|
+
let cached = seedCache.get(ns)
|
|
163
|
+
if (!cached) {
|
|
164
|
+
cached = yield* Effect.cached(makeSeedEffect(ns))
|
|
165
|
+
seedCache.set(ns, cached)
|
|
166
|
+
}
|
|
167
|
+
yield* cached
|
|
168
|
+
})
|
|
169
|
+
const resolveAndSeed = resolveNamespace.pipe(
|
|
170
|
+
Effect.tap((ns) => seedNamespace(ns))
|
|
171
|
+
)
|
|
172
|
+
|
|
81
173
|
const s: Store<IdKey, Encoded> = {
|
|
82
|
-
all:
|
|
174
|
+
all: resolveAndSeed.pipe(Effect.flatMap((ns) =>
|
|
83
175
|
exec(`SELECT id, _etag, data FROM "${tableName}" WHERE _namespace = $1`, [ns])
|
|
84
176
|
.pipe(
|
|
85
177
|
Effect.map((rows) => (rows as any[]).map((r) => parseRow<Encoded>(r, idKey, defaultValues))),
|
|
@@ -94,7 +186,7 @@ function makePgStore({ prefix }: StorageConfig) {
|
|
|
94
186
|
)),
|
|
95
187
|
|
|
96
188
|
find: (id) =>
|
|
97
|
-
|
|
189
|
+
resolveAndSeed.pipe(Effect
|
|
98
190
|
.flatMap((ns) =>
|
|
99
191
|
exec(`SELECT id, _etag, data FROM "${tableName}" WHERE id = $1 AND _namespace = $2`, [id, ns])
|
|
100
192
|
.pipe(
|
|
@@ -114,7 +206,7 @@ function makePgStore({ prefix }: StorageConfig) {
|
|
|
114
206
|
const filter = f
|
|
115
207
|
.filter
|
|
116
208
|
type M = U extends undefined ? Encoded : Pick<Encoded, U>
|
|
117
|
-
return
|
|
209
|
+
return resolveAndSeed.pipe(Effect.flatMap((ns) =>
|
|
118
210
|
Effect
|
|
119
211
|
.sync(() => {
|
|
120
212
|
const q = buildWhereSQLQuery(
|
|
@@ -169,83 +261,36 @@ function makePgStore({ prefix }: StorageConfig) {
|
|
|
169
261
|
},
|
|
170
262
|
|
|
171
263
|
set: (e) =>
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
.
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
`UPDATE "${tableName}" SET _etag = $1, data = $2 WHERE id = $3 AND _etag = $4 AND _namespace = $5`,
|
|
179
|
-
[row._etag, row.data, row.id, e._etag, ns]
|
|
180
|
-
)
|
|
181
|
-
const existing = yield* exec(
|
|
182
|
-
`SELECT _etag FROM "${tableName}" WHERE id = $1 AND _namespace = $2`,
|
|
183
|
-
[row.id, ns]
|
|
184
|
-
)
|
|
185
|
-
const current = (existing as any[])[0]
|
|
186
|
-
if (!current || current._etag !== row._etag) {
|
|
187
|
-
if (current) {
|
|
188
|
-
return yield* new OptimisticConcurrencyException({
|
|
189
|
-
type: name,
|
|
190
|
-
id: row.id,
|
|
191
|
-
current: current._etag,
|
|
192
|
-
found: e._etag,
|
|
193
|
-
code: 412
|
|
194
|
-
})
|
|
195
|
-
}
|
|
196
|
-
return yield* new OptimisticConcurrencyException({
|
|
197
|
-
type: name,
|
|
198
|
-
id: row.id,
|
|
199
|
-
current: "",
|
|
200
|
-
found: e._etag,
|
|
201
|
-
code: 404
|
|
202
|
-
})
|
|
203
|
-
}
|
|
204
|
-
} else {
|
|
205
|
-
yield* exec(
|
|
206
|
-
`INSERT INTO "${tableName}" (id, _namespace, _etag, data) VALUES ($1, $2, $3, $4)`,
|
|
207
|
-
[row.id, ns, row._etag, row.data]
|
|
208
|
-
)
|
|
209
|
-
}
|
|
210
|
-
return row.item
|
|
211
|
-
})
|
|
212
|
-
.pipe(
|
|
213
|
-
Effect.withSpan("PgSQL.set [effect-app/infra/Store]", {
|
|
214
|
-
attributes: { "repository.table_name": tableName, "repository.model_name": name, id: e[idKey] }
|
|
215
|
-
}, { captureStackTrace: false })
|
|
216
|
-
)
|
|
264
|
+
resolveAndSeed.pipe(Effect.flatMap((ns) =>
|
|
265
|
+
setInternal(e, ns).pipe(
|
|
266
|
+
Effect.withSpan("PgSQL.set [effect-app/infra/Store]", {
|
|
267
|
+
attributes: { "repository.table_name": tableName, "repository.model_name": name, id: e[idKey] }
|
|
268
|
+
}, { captureStackTrace: false })
|
|
269
|
+
)
|
|
217
270
|
)),
|
|
218
271
|
|
|
219
272
|
batchSet: (items) =>
|
|
220
|
-
|
|
221
|
-
.
|
|
222
|
-
Effect.forEach(items, (e) => s.set(e))
|
|
223
|
-
)
|
|
224
|
-
.pipe(
|
|
225
|
-
Effect.orDie,
|
|
226
|
-
Effect.map((_) => _ as unknown as NonEmptyReadonlyArray<PM>),
|
|
273
|
+
resolveAndSeed.pipe(Effect.flatMap((ns) =>
|
|
274
|
+
bulkSetInternal(items, ns).pipe(
|
|
227
275
|
Effect.withSpan("PgSQL.batchSet [effect-app/infra/Store]", {
|
|
228
276
|
attributes: { "repository.table_name": tableName, "repository.model_name": name }
|
|
229
277
|
}, { captureStackTrace: false })
|
|
230
|
-
)
|
|
278
|
+
)
|
|
279
|
+
)),
|
|
231
280
|
|
|
232
281
|
bulkSet: (items) =>
|
|
233
|
-
|
|
234
|
-
.
|
|
235
|
-
Effect.forEach(items, (e) => s.set(e))
|
|
236
|
-
)
|
|
237
|
-
.pipe(
|
|
238
|
-
Effect.orDie,
|
|
239
|
-
Effect.map((_) => _ as unknown as NonEmptyReadonlyArray<PM>),
|
|
282
|
+
resolveAndSeed.pipe(Effect.flatMap((ns) =>
|
|
283
|
+
bulkSetInternal(items, ns).pipe(
|
|
240
284
|
Effect.withSpan("PgSQL.bulkSet [effect-app/infra/Store]", {
|
|
241
285
|
attributes: { "repository.table_name": tableName, "repository.model_name": name }
|
|
242
286
|
}, { captureStackTrace: false })
|
|
243
|
-
)
|
|
287
|
+
)
|
|
288
|
+
)),
|
|
244
289
|
|
|
245
290
|
batchRemove: (ids) => {
|
|
246
291
|
const placeholders = ids.map((_, i) => `$${i + 1}`).join(", ")
|
|
247
292
|
const nsPlaceholder = `$${ids.length + 1}`
|
|
248
|
-
return
|
|
293
|
+
return resolveAndSeed.pipe(Effect.flatMap((ns) =>
|
|
249
294
|
exec(
|
|
250
295
|
`DELETE FROM "${tableName}" WHERE id IN (${placeholders}) AND _namespace = ${nsPlaceholder}`,
|
|
251
296
|
[...ids, ns]
|
|
@@ -268,21 +313,8 @@ function makePgStore({ prefix }: StorageConfig) {
|
|
|
268
313
|
)
|
|
269
314
|
}
|
|
270
315
|
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
`SELECT COUNT(*) as cnt FROM "${tableName}" WHERE _namespace = $1`,
|
|
274
|
-
["primary"]
|
|
275
|
-
)
|
|
276
|
-
const count = Number((existing as any[])[0]?.cnt ?? 0)
|
|
277
|
-
if (count === 0) {
|
|
278
|
-
yield* InfraLogger.logInfo("Seeding data for " + name)
|
|
279
|
-
const items = yield* seed
|
|
280
|
-
yield* Effect.flatMapOption(
|
|
281
|
-
Effect.succeed(toNonEmptyArray([...items])),
|
|
282
|
-
(a) => s.bulkSet(a).pipe(Effect.orDie)
|
|
283
|
-
)
|
|
284
|
-
}
|
|
285
|
-
}
|
|
316
|
+
// Eagerly seed primary namespace on initialization
|
|
317
|
+
yield* seedNamespace("primary")
|
|
286
318
|
|
|
287
319
|
return s
|
|
288
320
|
})
|