@effect-app/infra 4.0.0-beta.11 → 4.0.0-beta.110
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 +721 -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/internal/internal.d.ts +3 -3
- package/dist/Model/Repository/internal/internal.d.ts.map +1 -1
- package/dist/Model/Repository/internal/internal.js +21 -16
- package/dist/Model/Repository/makeRepo.d.ts +2 -2
- package/dist/Model/Repository/makeRepo.d.ts.map +1 -1
- package/dist/Model/Repository/makeRepo.js +1 -1
- package/dist/Model/Repository/validation.d.ts +5 -4
- package/dist/Model/Repository/validation.d.ts.map +1 -1
- package/dist/Model/query/dsl.d.ts +9 -9
- 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 +2 -2
- 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 +19 -14
- 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 +3 -4
- package/dist/Store/Memory.d.ts +2 -2
- package/dist/Store/Memory.d.ts.map +1 -1
- package/dist/Store/Memory.js +4 -4
- 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 +186 -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 +370 -0
- package/dist/Store/index.d.ts +4 -1
- package/dist/Store/index.d.ts.map +1 -1
- package/dist/Store/index.js +12 -2
- package/dist/Store/service.d.ts +11 -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 +6 -4
- 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 +32 -18
- package/src/CUPS.ts +2 -2
- package/src/Emailer/service.ts +2 -2
- package/src/MainFiberSet.ts +2 -2
- package/src/Model/Repository/internal/internal.ts +75 -59
- package/src/Model/Repository/makeRepo.ts +2 -2
- 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 +352 -255
- package/src/Store/Disk.ts +2 -3
- package/src/Store/Memory.ts +4 -4
- package/src/Store/SQL/Pg.ts +328 -0
- package/src/Store/SQL/query.ts +409 -0
- package/src/Store/SQL.ts +686 -0
- package/src/Store/index.ts +15 -1
- package/src/Store/service.ts +26 -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 +6 -5
- 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 +5 -5
- 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 +18 -8
- 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 +162 -16
- package/test/rawQuery.test.ts +19 -17
- 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 +1 -1
- package/tsconfig.json +0 -1
|
@@ -0,0 +1,370 @@
|
|
|
1
|
+
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
2
|
+
import { Context, Layer, LayerMap } from "effect";
|
|
3
|
+
import { Effect, Option, Struct } from "effect-app";
|
|
4
|
+
import { toNonEmptyArray } from "effect-app/Array";
|
|
5
|
+
import { SqlClient } from "effect/unstable/sql";
|
|
6
|
+
import { OptimisticConcurrencyException } from "../errors.js";
|
|
7
|
+
import { InfraLogger } from "../logger.js";
|
|
8
|
+
import { storeId } from "./Memory.js";
|
|
9
|
+
import { StoreMaker } from "./service.js";
|
|
10
|
+
import { buildWhereSQLQuery, logQuery, sqliteDialect } from "./SQL/query.js";
|
|
11
|
+
import { makeETag } from "./utils.js";
|
|
12
|
+
export class WithNsTransaction extends Context.Service()("effect-app/WithNsTransaction") {
|
|
13
|
+
}
|
|
14
|
+
/** @internal */
|
|
15
|
+
export const parseRow = (row, idKey, defaultValues) => {
|
|
16
|
+
const data = (typeof row.data === "string" ? JSON.parse(row.data) : row.data);
|
|
17
|
+
return { ...defaultValues, ...data, [idKey]: row.id, _etag: row._etag ?? undefined };
|
|
18
|
+
};
|
|
19
|
+
const parseSelectRow = (row, idKey) => {
|
|
20
|
+
const result = {};
|
|
21
|
+
for (const [key, value] of Object.entries(row)) {
|
|
22
|
+
if (key === "id") {
|
|
23
|
+
result[idKey] = value;
|
|
24
|
+
result["id"] = value;
|
|
25
|
+
}
|
|
26
|
+
else if (typeof value === "string") {
|
|
27
|
+
try {
|
|
28
|
+
result[key] = JSON.parse(value);
|
|
29
|
+
}
|
|
30
|
+
catch {
|
|
31
|
+
result[key] = value;
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
else {
|
|
35
|
+
result[key] = value;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
return result;
|
|
39
|
+
};
|
|
40
|
+
function makeSQLStoreInt(dialect, jsonColumnType) {
|
|
41
|
+
return ({ prefix }) => Effect.gen(function* () {
|
|
42
|
+
const sql = yield* SqlClient.SqlClient;
|
|
43
|
+
return {
|
|
44
|
+
make: (name, idKey, seed, config) => Effect.gen(function* () {
|
|
45
|
+
const tableName = `${prefix}${name}`;
|
|
46
|
+
const defaultValues = config?.defaultValues ?? {};
|
|
47
|
+
const resolveNamespace = !config?.allowNamespace
|
|
48
|
+
? Effect.succeed("primary")
|
|
49
|
+
: storeId.asEffect().pipe(Effect.map((namespace) => {
|
|
50
|
+
if (namespace !== "primary" && !config.allowNamespace(namespace)) {
|
|
51
|
+
throw new Error(`Namespace ${namespace} not allowed!`);
|
|
52
|
+
}
|
|
53
|
+
return namespace;
|
|
54
|
+
}));
|
|
55
|
+
yield* sql
|
|
56
|
+
.unsafe(`CREATE TABLE IF NOT EXISTS "${tableName}" (id TEXT NOT NULL, _namespace TEXT NOT NULL DEFAULT 'primary', _etag TEXT, data ${jsonColumnType} NOT NULL, PRIMARY KEY (id, _namespace))`)
|
|
57
|
+
.pipe(Effect.orDie);
|
|
58
|
+
const toRow = (e) => {
|
|
59
|
+
const newE = makeETag(e);
|
|
60
|
+
const id = newE[idKey];
|
|
61
|
+
const { _etag, [idKey]: _id, ...rest } = newE;
|
|
62
|
+
const data = JSON.stringify(rest);
|
|
63
|
+
return { id, _etag: newE._etag, data, item: newE };
|
|
64
|
+
};
|
|
65
|
+
const exec = (query, params) => sql.unsafe(query, params).pipe(Effect.orDie);
|
|
66
|
+
const seedMarkerId = `__seed_marker__`;
|
|
67
|
+
const setInternal = (e, ns) => Effect.gen(function* () {
|
|
68
|
+
const row = toRow(e);
|
|
69
|
+
if (e._etag) {
|
|
70
|
+
yield* exec(`UPDATE "${tableName}" SET _etag = ?, data = ? WHERE id = ? AND _etag = ? AND _namespace = ?`, [row._etag, row.data, row.id, e._etag, ns]);
|
|
71
|
+
const existing = yield* exec(`SELECT _etag FROM "${tableName}" WHERE id = ? AND _namespace = ?`, [row.id, ns]);
|
|
72
|
+
const current = existing[0];
|
|
73
|
+
if (!current || current._etag !== row._etag) {
|
|
74
|
+
if (current) {
|
|
75
|
+
return yield* new OptimisticConcurrencyException({
|
|
76
|
+
type: name,
|
|
77
|
+
id: row.id,
|
|
78
|
+
current: current._etag,
|
|
79
|
+
found: e._etag,
|
|
80
|
+
code: 412
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
return yield* new OptimisticConcurrencyException({
|
|
84
|
+
type: name,
|
|
85
|
+
id: row.id,
|
|
86
|
+
current: "",
|
|
87
|
+
found: e._etag,
|
|
88
|
+
code: 404
|
|
89
|
+
});
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
yield* exec(`INSERT INTO "${tableName}" (id, _namespace, _etag, data) VALUES (?, ?, ?, ?)`, [row.id, ns, row._etag, row.data]);
|
|
94
|
+
}
|
|
95
|
+
return row.item;
|
|
96
|
+
});
|
|
97
|
+
const bulkSetInternal = (items, ns) => sql
|
|
98
|
+
.withTransaction(Effect.forEach(items, (e) => setInternal(e, ns)))
|
|
99
|
+
.pipe(Effect.orDie, Effect.map((_) => _));
|
|
100
|
+
const ctx = yield* Effect.context();
|
|
101
|
+
const seedCache = new Map();
|
|
102
|
+
const makeSeedEffect = (ns) => exec(`SELECT id FROM "${tableName}" WHERE id = ? AND _namespace = ?`, [seedMarkerId, `__seed__::${ns}`])
|
|
103
|
+
.pipe(Effect.flatMap((existing) => {
|
|
104
|
+
if (existing.length > 0)
|
|
105
|
+
return Effect.void;
|
|
106
|
+
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);
|
|
107
|
+
}));
|
|
108
|
+
const seedNamespace = Effect.fn("seedNamespace")(function* (ns) {
|
|
109
|
+
if (!seed)
|
|
110
|
+
return;
|
|
111
|
+
let cached = seedCache.get(ns);
|
|
112
|
+
if (!cached) {
|
|
113
|
+
cached = yield* Effect.cached(makeSeedEffect(ns));
|
|
114
|
+
seedCache.set(ns, cached);
|
|
115
|
+
}
|
|
116
|
+
yield* cached;
|
|
117
|
+
});
|
|
118
|
+
const resolveAndSeed = resolveNamespace.pipe(Effect.tap((ns) => seedNamespace(ns)));
|
|
119
|
+
const s = {
|
|
120
|
+
all: resolveAndSeed.pipe(Effect.flatMap((ns) => exec(`SELECT id, _etag, data FROM "${tableName}" WHERE _namespace = ?`, [ns])
|
|
121
|
+
.pipe(Effect.map((rows) => rows.map((r) => parseRow(r, idKey, defaultValues))), Effect.withSpan("SQL.all [effect-app/infra/Store]", {
|
|
122
|
+
attributes: {
|
|
123
|
+
"repository.table_name": tableName,
|
|
124
|
+
"repository.model_name": name,
|
|
125
|
+
"repository.namespace": ns
|
|
126
|
+
}
|
|
127
|
+
}, { captureStackTrace: false })))),
|
|
128
|
+
find: (id) => resolveAndSeed.pipe(Effect.flatMap((ns) => exec(`SELECT id, _etag, data FROM "${tableName}" WHERE id = ? AND _namespace = ?`, [id, ns])
|
|
129
|
+
.pipe(Effect.map((rows) => {
|
|
130
|
+
const row = rows[0];
|
|
131
|
+
return row
|
|
132
|
+
? Option.some(parseRow(row, idKey, defaultValues))
|
|
133
|
+
: Option.none();
|
|
134
|
+
}), Effect.withSpan("SQL.find [effect-app/infra/Store]", {
|
|
135
|
+
attributes: { "repository.table_name": tableName, "repository.model_name": name, id }
|
|
136
|
+
}, { captureStackTrace: false })))),
|
|
137
|
+
filter: (f) => {
|
|
138
|
+
const filter = f
|
|
139
|
+
.filter;
|
|
140
|
+
return resolveAndSeed
|
|
141
|
+
.pipe(Effect
|
|
142
|
+
.flatMap((ns) => Effect
|
|
143
|
+
.sync(() => {
|
|
144
|
+
const q = buildWhereSQLQuery(dialect, idKey, filter ? [{ t: "where-scope", result: filter, relation: "some" }] : [], tableName, defaultValues, f
|
|
145
|
+
.select, f
|
|
146
|
+
.order, f
|
|
147
|
+
.skip, f
|
|
148
|
+
.limit);
|
|
149
|
+
const hasWhere = q
|
|
150
|
+
.sql
|
|
151
|
+
.includes("WHERE");
|
|
152
|
+
const nsSql = hasWhere
|
|
153
|
+
? q
|
|
154
|
+
.sql
|
|
155
|
+
.replace("WHERE", `WHERE _namespace = ? AND`)
|
|
156
|
+
: q
|
|
157
|
+
.sql
|
|
158
|
+
.replace(`FROM "${tableName}"`, `FROM "${tableName}" WHERE _namespace = ?`);
|
|
159
|
+
return {
|
|
160
|
+
sql: nsSql,
|
|
161
|
+
params: [
|
|
162
|
+
ns,
|
|
163
|
+
...q
|
|
164
|
+
.params
|
|
165
|
+
]
|
|
166
|
+
};
|
|
167
|
+
})
|
|
168
|
+
.pipe(Effect
|
|
169
|
+
.tap((q) => logQuery(q)), Effect.flatMap((q) => exec(q.sql, q.params).pipe(Effect.map((rows) => {
|
|
170
|
+
if (f.select) {
|
|
171
|
+
return rows.map((r) => {
|
|
172
|
+
const selected = parseSelectRow(r, idKey);
|
|
173
|
+
return {
|
|
174
|
+
...Struct.pick(defaultValues, f.select.filter((_) => typeof _ === "string")),
|
|
175
|
+
...selected
|
|
176
|
+
};
|
|
177
|
+
});
|
|
178
|
+
}
|
|
179
|
+
return rows.map((r) => parseRow(r, idKey, defaultValues));
|
|
180
|
+
}))), Effect.withSpan("SQL.filter [effect-app/infra/Store]", {
|
|
181
|
+
attributes: { "repository.table_name": tableName, "repository.model_name": name }
|
|
182
|
+
}, { captureStackTrace: false }))));
|
|
183
|
+
},
|
|
184
|
+
set: (e) => resolveAndSeed.pipe(Effect.flatMap((ns) => setInternal(e, ns).pipe(Effect.withSpan("SQL.set [effect-app/infra/Store]", {
|
|
185
|
+
attributes: { "repository.table_name": tableName, "repository.model_name": name, id: e[idKey] }
|
|
186
|
+
}, { captureStackTrace: false })))),
|
|
187
|
+
batchSet: (items) => resolveAndSeed.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns).pipe(Effect.withSpan("SQL.batchSet [effect-app/infra/Store]", {
|
|
188
|
+
attributes: { "repository.table_name": tableName, "repository.model_name": name }
|
|
189
|
+
}, { captureStackTrace: false })))),
|
|
190
|
+
bulkSet: (items) => resolveAndSeed.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns).pipe(Effect.withSpan("SQL.bulkSet [effect-app/infra/Store]", {
|
|
191
|
+
attributes: { "repository.table_name": tableName, "repository.model_name": name }
|
|
192
|
+
}, { captureStackTrace: false })))),
|
|
193
|
+
batchRemove: (ids) => {
|
|
194
|
+
const placeholders = ids.map(() => "?").join(", ");
|
|
195
|
+
return resolveAndSeed.pipe(Effect.flatMap((ns) => exec(`DELETE FROM "${tableName}" WHERE id IN (${placeholders}) AND _namespace = ?`, [...ids, ns])
|
|
196
|
+
.pipe(Effect.asVoid, Effect.withSpan("SQL.batchRemove [effect-app/infra/Store]", {
|
|
197
|
+
attributes: { "repository.table_name": tableName, "repository.model_name": name }
|
|
198
|
+
}, { captureStackTrace: false }))));
|
|
199
|
+
},
|
|
200
|
+
queryRaw: (query) => s.all.pipe(Effect.map(query.memory), Effect.withSpan("SQL.queryRaw [effect-app/infra/Store]", {
|
|
201
|
+
attributes: { "repository.table_name": tableName, "repository.model_name": name }
|
|
202
|
+
}, { captureStackTrace: false }))
|
|
203
|
+
};
|
|
204
|
+
// Eagerly seed primary namespace on initialization
|
|
205
|
+
yield* seedNamespace("primary");
|
|
206
|
+
return s;
|
|
207
|
+
})
|
|
208
|
+
};
|
|
209
|
+
});
|
|
210
|
+
}
|
|
211
|
+
function makeSQLiteStorePerNs(withNsSql, { prefix }) {
|
|
212
|
+
return {
|
|
213
|
+
make: (name, idKey, seed, config) => Effect.gen(function* () {
|
|
214
|
+
const tableName = `${prefix}${name}`;
|
|
215
|
+
const defaultValues = config?.defaultValues ?? {};
|
|
216
|
+
const resolveNamespace = !config?.allowNamespace
|
|
217
|
+
? Effect.succeed("primary")
|
|
218
|
+
: storeId.asEffect().pipe(Effect.map((namespace) => {
|
|
219
|
+
if (namespace !== "primary" && !config.allowNamespace(namespace)) {
|
|
220
|
+
throw new Error(`Namespace ${namespace} not allowed!`);
|
|
221
|
+
}
|
|
222
|
+
return namespace;
|
|
223
|
+
}));
|
|
224
|
+
const toRow = (e) => {
|
|
225
|
+
const newE = makeETag(e);
|
|
226
|
+
const id = newE[idKey];
|
|
227
|
+
const { _etag, [idKey]: _id, ...rest } = newE;
|
|
228
|
+
const data = JSON.stringify(rest);
|
|
229
|
+
return { id, _etag: newE._etag, data, item: newE };
|
|
230
|
+
};
|
|
231
|
+
const exec = (ns, query, params) => withNsSql(ns, (sql) => sql.unsafe(query, params).pipe(Effect.orDie));
|
|
232
|
+
const ensureTable = (ns) => exec(ns, `CREATE TABLE IF NOT EXISTS "${tableName}" (id TEXT NOT NULL PRIMARY KEY, _etag TEXT, data JSON NOT NULL)`);
|
|
233
|
+
const seedMarkerId = `__seed_marker__`;
|
|
234
|
+
const setInternal = (e, ns) => Effect.gen(function* () {
|
|
235
|
+
const row = toRow(e);
|
|
236
|
+
if (e._etag) {
|
|
237
|
+
yield* exec(ns, `UPDATE "${tableName}" SET _etag = ?, data = ? WHERE id = ? AND _etag = ?`, [row._etag, row.data, row.id, e._etag]);
|
|
238
|
+
const existing = yield* exec(ns, `SELECT _etag FROM "${tableName}" WHERE id = ?`, [row.id]);
|
|
239
|
+
const current = existing[0];
|
|
240
|
+
if (!current || current._etag !== row._etag) {
|
|
241
|
+
if (current) {
|
|
242
|
+
return yield* new OptimisticConcurrencyException({
|
|
243
|
+
type: name,
|
|
244
|
+
id: row.id,
|
|
245
|
+
current: current._etag,
|
|
246
|
+
found: e._etag,
|
|
247
|
+
code: 412
|
|
248
|
+
});
|
|
249
|
+
}
|
|
250
|
+
return yield* new OptimisticConcurrencyException({
|
|
251
|
+
type: name,
|
|
252
|
+
id: row.id,
|
|
253
|
+
current: "",
|
|
254
|
+
found: e._etag,
|
|
255
|
+
code: 404
|
|
256
|
+
});
|
|
257
|
+
}
|
|
258
|
+
}
|
|
259
|
+
else {
|
|
260
|
+
yield* exec(ns, `INSERT INTO "${tableName}" (id, _etag, data) VALUES (?, ?, ?)`, [row.id, row._etag, row.data]);
|
|
261
|
+
}
|
|
262
|
+
return row.item;
|
|
263
|
+
});
|
|
264
|
+
const bulkSetInternal = (items, ns) => withNsSql(ns, (sql) => sql
|
|
265
|
+
.withTransaction(Effect.forEach(items, (e) => setInternal(e, ns)))
|
|
266
|
+
.pipe(Effect.orDie, Effect.map((_) => _)));
|
|
267
|
+
const ctx = yield* Effect.context();
|
|
268
|
+
const seedCache = new Map();
|
|
269
|
+
const makeSeedEffect = (ns) => exec(ns, `SELECT id FROM "${tableName}" WHERE id = ?`, [seedMarkerId])
|
|
270
|
+
.pipe(Effect.flatMap((existing) => {
|
|
271
|
+
if (existing.length > 0)
|
|
272
|
+
return Effect.void;
|
|
273
|
+
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(ns, `INSERT INTO "${tableName}" (id, _etag, data) VALUES (?, ?, ?)`, [seedMarkerId, null, JSON.stringify({ _marker: true })])), Effect.provide(ctx), Effect.orDie);
|
|
274
|
+
}));
|
|
275
|
+
const seedNamespace = Effect.fn("seedNamespace")(function* (ns) {
|
|
276
|
+
yield* ensureTable(ns);
|
|
277
|
+
if (!seed)
|
|
278
|
+
return;
|
|
279
|
+
let cached = seedCache.get(ns);
|
|
280
|
+
if (!cached) {
|
|
281
|
+
cached = yield* Effect.cached(makeSeedEffect(ns));
|
|
282
|
+
seedCache.set(ns, cached);
|
|
283
|
+
}
|
|
284
|
+
yield* cached;
|
|
285
|
+
});
|
|
286
|
+
const resolveAndSeed = resolveNamespace.pipe(Effect.tap((ns) => seedNamespace(ns)));
|
|
287
|
+
const s = {
|
|
288
|
+
all: resolveAndSeed.pipe(Effect.flatMap((ns) => exec(ns, `SELECT id, _etag, data FROM "${tableName}"`)
|
|
289
|
+
.pipe(Effect.map((rows) => rows.map((r) => parseRow(r, idKey, defaultValues))), Effect.withSpan("SQLite.all [effect-app/infra/Store]", {
|
|
290
|
+
attributes: {
|
|
291
|
+
"repository.table_name": tableName,
|
|
292
|
+
"repository.model_name": name,
|
|
293
|
+
"repository.namespace": ns
|
|
294
|
+
}
|
|
295
|
+
}, { captureStackTrace: false })))),
|
|
296
|
+
find: (id) => resolveAndSeed.pipe(Effect.flatMap((ns) => exec(ns, `SELECT id, _etag, data FROM "${tableName}" WHERE id = ?`, [id])
|
|
297
|
+
.pipe(Effect.map((rows) => {
|
|
298
|
+
const row = rows[0];
|
|
299
|
+
return row
|
|
300
|
+
? Option.some(parseRow(row, idKey, defaultValues))
|
|
301
|
+
: Option.none();
|
|
302
|
+
}), Effect.withSpan("SQLite.find [effect-app/infra/Store]", {
|
|
303
|
+
attributes: { "repository.table_name": tableName, "repository.model_name": name, id }
|
|
304
|
+
}, { captureStackTrace: false })))),
|
|
305
|
+
filter: (f) => {
|
|
306
|
+
const filter = f
|
|
307
|
+
.filter;
|
|
308
|
+
return resolveAndSeed
|
|
309
|
+
.pipe(Effect
|
|
310
|
+
.flatMap((ns) => Effect
|
|
311
|
+
.sync(() => buildWhereSQLQuery(sqliteDialect, idKey, filter ? [{ t: "where-scope", result: filter, relation: "some" }] : [], tableName, defaultValues, f
|
|
312
|
+
.select, f
|
|
313
|
+
.order, f
|
|
314
|
+
.skip, f
|
|
315
|
+
.limit))
|
|
316
|
+
.pipe(Effect
|
|
317
|
+
.tap((q) => logQuery(q)), Effect.flatMap((q) => exec(ns, q.sql, q.params).pipe(Effect.map((rows) => {
|
|
318
|
+
if (f.select) {
|
|
319
|
+
return rows.map((r) => {
|
|
320
|
+
const selected = parseSelectRow(r, idKey);
|
|
321
|
+
return {
|
|
322
|
+
...Struct.pick(defaultValues, f.select.filter((_) => typeof _ === "string")),
|
|
323
|
+
...selected
|
|
324
|
+
};
|
|
325
|
+
});
|
|
326
|
+
}
|
|
327
|
+
return rows.map((r) => parseRow(r, idKey, defaultValues));
|
|
328
|
+
}))), Effect.withSpan("SQLite.filter [effect-app/infra/Store]", {
|
|
329
|
+
attributes: { "repository.table_name": tableName, "repository.model_name": name }
|
|
330
|
+
}, { captureStackTrace: false }))));
|
|
331
|
+
},
|
|
332
|
+
set: (e) => resolveAndSeed.pipe(Effect.flatMap((ns) => setInternal(e, ns).pipe(Effect.withSpan("SQLite.set [effect-app/infra/Store]", {
|
|
333
|
+
attributes: { "repository.table_name": tableName, "repository.model_name": name, id: e[idKey] }
|
|
334
|
+
}, { captureStackTrace: false })))),
|
|
335
|
+
batchSet: (items) => resolveAndSeed.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns).pipe(Effect.withSpan("SQLite.batchSet [effect-app/infra/Store]", {
|
|
336
|
+
attributes: { "repository.table_name": tableName, "repository.model_name": name }
|
|
337
|
+
}, { captureStackTrace: false })))),
|
|
338
|
+
bulkSet: (items) => resolveAndSeed.pipe(Effect.flatMap((ns) => bulkSetInternal(items, ns).pipe(Effect.withSpan("SQLite.bulkSet [effect-app/infra/Store]", {
|
|
339
|
+
attributes: { "repository.table_name": tableName, "repository.model_name": name }
|
|
340
|
+
}, { captureStackTrace: false })))),
|
|
341
|
+
batchRemove: (ids) => {
|
|
342
|
+
const placeholders = ids.map(() => "?").join(", ");
|
|
343
|
+
return resolveAndSeed.pipe(Effect.flatMap((ns) => exec(ns, `DELETE FROM "${tableName}" WHERE id IN (${placeholders})`, [...ids])
|
|
344
|
+
.pipe(Effect.asVoid, Effect.withSpan("SQLite.batchRemove [effect-app/infra/Store]", {
|
|
345
|
+
attributes: { "repository.table_name": tableName, "repository.model_name": name }
|
|
346
|
+
}, { captureStackTrace: false }))));
|
|
347
|
+
},
|
|
348
|
+
queryRaw: (query) => s.all.pipe(Effect.map(query.memory), Effect.withSpan("SQLite.queryRaw [effect-app/infra/Store]", {
|
|
349
|
+
attributes: { "repository.table_name": tableName, "repository.model_name": name }
|
|
350
|
+
}, { captureStackTrace: false }))
|
|
351
|
+
};
|
|
352
|
+
yield* seedNamespace("primary");
|
|
353
|
+
return s;
|
|
354
|
+
})
|
|
355
|
+
};
|
|
356
|
+
}
|
|
357
|
+
export function SQLiteStoreLayer(cfg, options) {
|
|
358
|
+
if (options?.makeSqlClientLayer) {
|
|
359
|
+
return Layer.effectContext(Effect.gen(function* () {
|
|
360
|
+
const layerMap = yield* LayerMap.make((namespace) => options.makeSqlClientLayer(namespace), { idleTimeToLive: "10 minutes" });
|
|
361
|
+
const withNsSql = (ns, f) => SqlClient.SqlClient.use(f).pipe(Effect.provide(layerMap.get(ns)));
|
|
362
|
+
const storeMaker = makeSQLiteStorePerNs(withNsSql, cfg);
|
|
363
|
+
const withTransaction = (effect) => storeId.asEffect().pipe(Effect.flatMap((ns) => withNsSql(ns, (sql) => sql.withTransaction(effect).pipe(Effect.orDie))));
|
|
364
|
+
return StoreMaker.serviceMap(storeMaker).pipe(Context.add(WithNsTransaction, withTransaction));
|
|
365
|
+
}));
|
|
366
|
+
}
|
|
367
|
+
return StoreMaker
|
|
368
|
+
.toLayer(makeSQLStoreInt(sqliteDialect, "JSON")(cfg));
|
|
369
|
+
}
|
|
370
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SQL.js","sourceRoot":"","sources":["../../src/Store/SQL.ts"],"names":[],"mappings":"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"}
|
package/dist/Store/index.d.ts
CHANGED
|
@@ -1,5 +1,8 @@
|
|
|
1
1
|
import { Layer } from "effect-app";
|
|
2
|
+
import type { SqlClient } from "effect/unstable/sql";
|
|
2
3
|
import type { StorageConfig } from "./service.js";
|
|
3
|
-
export declare function StoreMakerLayer(cfg: StorageConfig
|
|
4
|
+
export declare function StoreMakerLayer(cfg: StorageConfig, options?: {
|
|
5
|
+
makeSqlClientLayer?: (namespace: string) => Layer.Layer<SqlClient.SqlClient>;
|
|
6
|
+
}): Layer.Layer<import("./service.js").StoreMaker, never, SqlClient.SqlClient>;
|
|
4
7
|
export * from "./service.js";
|
|
5
8
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Store/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,KAAK,EAAY,MAAM,YAAY,CAAA;AAKpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/Store/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,KAAK,EAAY,MAAM,YAAY,CAAA;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAKpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAIjD,wBAAgB,eAAe,CAC7B,GAAG,EAAE,aAAa,EAClB,OAAO,CAAC,EAAE;IAAE,kBAAkB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS,CAAC,CAAA;CAAE,8EA+B3F;AAED,cAAc,cAAc,CAAA"}
|
package/dist/Store/index.js
CHANGED
|
@@ -3,7 +3,9 @@ import { Effect, Layer, Redacted } from "effect-app";
|
|
|
3
3
|
import { CosmosStoreLayer } from "./Cosmos.js";
|
|
4
4
|
import { DiskStoreLayer } from "./Disk.js";
|
|
5
5
|
import { MemoryStoreLive } from "./Memory.js";
|
|
6
|
-
|
|
6
|
+
import { SQLiteStoreLayer } from "./SQL.js";
|
|
7
|
+
import { PgStoreLayer } from "./SQL/Pg.js";
|
|
8
|
+
export function StoreMakerLayer(cfg, options) {
|
|
7
9
|
return Effect
|
|
8
10
|
.sync(() => {
|
|
9
11
|
const storageUrl = Redacted.value(cfg.url);
|
|
@@ -16,6 +18,14 @@ export function StoreMakerLayer(cfg) {
|
|
|
16
18
|
console.log("Using disk store at " + dir);
|
|
17
19
|
return DiskStoreLayer(cfg, dir);
|
|
18
20
|
}
|
|
21
|
+
if (storageUrl.startsWith("sqlite://")) {
|
|
22
|
+
console.log("Using SQLite store");
|
|
23
|
+
return SQLiteStoreLayer(cfg, options);
|
|
24
|
+
}
|
|
25
|
+
if (storageUrl.startsWith("pg://")) {
|
|
26
|
+
console.log("Using PostgreSQL store");
|
|
27
|
+
return PgStoreLayer(cfg);
|
|
28
|
+
}
|
|
19
29
|
// if (storageUrl.startsWith("redis://")) {
|
|
20
30
|
// console.log("Using Redis store")
|
|
21
31
|
// return RedisStoreLayer(cfg)
|
|
@@ -26,4 +36,4 @@ export function StoreMakerLayer(cfg) {
|
|
|
26
36
|
.pipe(Layer.unwrap);
|
|
27
37
|
}
|
|
28
38
|
export * from "./service.js";
|
|
29
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU3RvcmUvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsdURBQXVEO0FBQ3ZELE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLFFBQVEsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUVwRCxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxhQUFhLENBQUE7QUFDOUMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLFdBQVcsQ0FBQTtBQUMxQyxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sYUFBYSxDQUFBO0FBRzdDLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLFVBQVUsQ0FBQTtBQUMzQyxPQUFPLEVBQUUsWUFBWSxFQUFFLE1BQU0sYUFBYSxDQUFBO0FBRTFDLE1BQU0sVUFBVSxlQUFlLENBQzdCLEdBQWtCLEVBQ2xCLE9BQTBGO0lBRTFGLE9BQU8sTUFBTTtTQUNWLElBQUksQ0FBQyxHQUFHLEVBQUU7UUFDVCxNQUFNLFVBQVUsR0FBRyxRQUFRLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUMxQyxJQUFJLFVBQVUsQ0FBQyxVQUFVLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQztZQUNwQyxPQUFPLENBQUMsR0FBRyxDQUFDLHVCQUF1QixDQUFDLENBQUE7WUFDcEMsT0FBTyxlQUFlLENBQUE7UUFDeEIsQ0FBQztRQUNELElBQUksVUFBVSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsRUFBRSxDQUFDO1lBQ3JDLE1BQU0sR0FBRyxHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLEVBQUUsQ0FBQyxDQUFBO1lBQzdDLE9BQU8sQ0FBQyxHQUFHLENBQUMsc0JBQXNCLEdBQUcsR0FBRyxDQUFDLENBQUE7WUFDekMsT0FBTyxjQUFjLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFBO1FBQ2pDLENBQUM7UUFDRCxJQUFJLFVBQVUsQ0FBQyxVQUFVLENBQUMsV0FBVyxDQUFDLEVBQUUsQ0FBQztZQUN2QyxPQUFPLENBQUMsR0FBRyxDQUFDLG9CQUFvQixDQUFDLENBQUE7WUFDakMsT0FBTyxnQkFBZ0IsQ0FBQyxHQUFHLEVBQUUsT0FBTyxDQUFDLENBQUE7UUFDdkMsQ0FBQztRQUNELElBQUksVUFBVSxDQUFDLFVBQVUsQ0FBQyxPQUFPLENBQUMsRUFBRSxDQUFDO1lBQ25DLE9BQU8sQ0FBQyxHQUFHLENBQUMsd0JBQXdCLENBQUMsQ0FBQTtZQUNyQyxPQUFPLFlBQVksQ0FBQyxHQUFHLENBQUMsQ0FBQTtRQUMxQixDQUFDO1FBQ0QsMkNBQTJDO1FBQzNDLHFDQUFxQztRQUNyQyxnQ0FBZ0M7UUFDaEMsSUFBSTtRQUVKLE9BQU8sQ0FBQyxHQUFHLENBQUMsdUJBQXVCLENBQUMsQ0FBQTtRQUNwQyxPQUFPLGdCQUFnQixDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQzlCLENBQUMsQ0FBQztTQUNELElBQUksQ0FBQyxLQUFLLENBQUMsTUFBTSxDQUFDLENBQUE7QUFDdkIsQ0FBQztBQUVELGNBQWMsY0FBYyxDQUFBIn0=
|
package/dist/Store/service.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { UniqueKey } from "@azure/cosmos";
|
|
2
|
-
import { Effect, type NonEmptyReadonlyArray, type Option, type Redacted
|
|
2
|
+
import { Context, Effect, type NonEmptyReadonlyArray, type Option, type Redacted } from "effect-app";
|
|
3
3
|
import type { OptimisticConcurrencyException } from "../errors.js";
|
|
4
4
|
import type { FilterResult } from "../Model/filter/filterApi.js";
|
|
5
5
|
import type { FieldValues } from "../Model/filter/types.js";
|
|
@@ -8,8 +8,8 @@ import { type RawQuery } from "../Model/query.js";
|
|
|
8
8
|
export interface StoreConfig<E> {
|
|
9
9
|
partitionValue: (e?: E) => string;
|
|
10
10
|
/**
|
|
11
|
-
* Primarily used for testing, creating namespaces in the database to separate data e.g to run multiple tests in isolation within the same database
|
|
12
|
-
*
|
|
11
|
+
* Primarily used for testing, creating namespaces in the database to separate data e.g to run multiple tests in isolation within the same database.
|
|
12
|
+
* Memory/Disk use separate store instances per namespace. CosmosDB uses namespace-prefixed partition keys. SQL uses a `_namespace` column.
|
|
13
13
|
*/
|
|
14
14
|
allowNamespace?: (namespace: string) => boolean;
|
|
15
15
|
/**
|
|
@@ -76,7 +76,7 @@ export interface Store<IdKey extends keyof Encoded, Encoded extends FieldValues,
|
|
|
76
76
|
batchRemove: (ids: NonEmptyReadonlyArray<Encoded[IdKey]>, partitionKey?: string) => Effect.Effect<void>;
|
|
77
77
|
queryRaw: <Out>(query: RawQuery<Encoded, Out>) => Effect.Effect<readonly Out[]>;
|
|
78
78
|
}
|
|
79
|
-
declare const StoreMaker_base:
|
|
79
|
+
declare const StoreMaker_base: Context.OpaqueClass<StoreMaker, "effect-app/StoreMaker", {
|
|
80
80
|
make: <IdKey extends keyof Encoded, Encoded extends FieldValues, R = never, E = never>(name: string, idKey: IdKey, seed?: Effect.Effect<Iterable<Encoded>, E, R>, config?: StoreConfig<Encoded>) => Effect.Effect<Store<IdKey, Encoded>, E, R>;
|
|
81
81
|
}>;
|
|
82
82
|
export declare class StoreMaker extends StoreMaker_base {
|
|
@@ -84,14 +84,20 @@ export declare class StoreMaker extends StoreMaker_base {
|
|
|
84
84
|
export declare const makeContextMap: () => {
|
|
85
85
|
get: (id: string) => string | undefined;
|
|
86
86
|
set: (id: string, eTag: string | undefined) => void;
|
|
87
|
+
getOrCreateStore: <T>(key: symbol, make: () => T) => T;
|
|
88
|
+
getOrCreateStoreEffect: <T, E, R>(key: symbol, make: Effect.Effect<T, E, R>) => Effect.Effect<T, E, R>;
|
|
87
89
|
};
|
|
88
|
-
declare const ContextMap_base:
|
|
90
|
+
declare const ContextMap_base: Context.OpaqueClass<ContextMap, "effect-app/ContextMap", {
|
|
89
91
|
get: (id: string) => string | undefined;
|
|
90
92
|
set: (id: string, eTag: string | undefined) => void;
|
|
93
|
+
getOrCreateStore: <T>(key: symbol, make: () => T) => T;
|
|
94
|
+
getOrCreateStoreEffect: <T, E, R>(key: symbol, make: Effect.Effect<T, E, R>) => Effect.Effect<T, E, R>;
|
|
91
95
|
}> & {
|
|
92
96
|
readonly make: Effect.Effect<{
|
|
93
97
|
get: (id: string) => string | undefined;
|
|
94
98
|
set: (id: string, eTag: string | undefined) => void;
|
|
99
|
+
getOrCreateStore: <T>(key: symbol, make: () => T) => T;
|
|
100
|
+
getOrCreateStoreEffect: <T, E, R>(key: symbol, make: Effect.Effect<T, E, R>) => Effect.Effect<T, E, R>;
|
|
95
101
|
}, never, never>;
|
|
96
102
|
};
|
|
97
103
|
export declare class ContextMap extends ContextMap_base {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/Store/service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,KAAK,qBAAqB,EAAE,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../../src/Store/service.ts"],"names":[],"mappings":"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"}
|
package/dist/Store/service.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import {
|
|
2
|
-
|
|
1
|
+
import { Context, Effect } from "effect-app";
|
|
2
|
+
import * as Semaphore from "effect/Semaphore";
|
|
3
|
+
export class StoreMaker extends Context.Opaque()("effect-app/StoreMaker") {
|
|
3
4
|
}
|
|
4
5
|
export const makeContextMap = () => {
|
|
5
6
|
const etags = new Map();
|
|
@@ -59,13 +60,30 @@ export const makeContextMap = () => {
|
|
|
59
60
|
// }
|
|
60
61
|
// }
|
|
61
62
|
// }
|
|
63
|
+
const store = new Map();
|
|
64
|
+
const sem = Semaphore.makeUnsafe(1);
|
|
62
65
|
return {
|
|
63
66
|
get: getEtag,
|
|
64
|
-
set: setEtag
|
|
65
|
-
|
|
67
|
+
set: setEtag,
|
|
68
|
+
getOrCreateStore: (key, make) => {
|
|
69
|
+
let value = store.get(key);
|
|
70
|
+
if (value === undefined) {
|
|
71
|
+
value = make();
|
|
72
|
+
store.set(key, value);
|
|
73
|
+
}
|
|
74
|
+
return value;
|
|
75
|
+
},
|
|
76
|
+
getOrCreateStoreEffect: (key, make) => sem.withPermits(1)(Effect.uninterruptible(Effect.gen(function* () {
|
|
77
|
+
const value = store.get(key);
|
|
78
|
+
if (value !== undefined)
|
|
79
|
+
return value;
|
|
80
|
+
const v = yield* make;
|
|
81
|
+
store.set(key, v);
|
|
82
|
+
return v;
|
|
83
|
+
})))
|
|
66
84
|
};
|
|
67
85
|
};
|
|
68
86
|
const makeMap = Effect.sync(() => makeContextMap());
|
|
69
|
-
export class ContextMap extends
|
|
87
|
+
export class ContextMap extends Context.Opaque()("effect-app/ContextMap", { make: makeMap }) {
|
|
70
88
|
}
|
|
71
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
89
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9TdG9yZS9zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUVBLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUEwRCxNQUFNLFlBQVksQ0FBQTtBQUNwRyxPQUFPLEtBQUssU0FBUyxNQUFNLGtCQUFrQixDQUFBO0FBeUY3QyxNQUFNLE9BQU8sVUFBVyxTQUFRLE9BQU8sQ0FBQyxNQUFNLEVBTzFDLENBQUMsdUJBQXVCLENBQUM7Q0FDNUI7QUFFRCxNQUFNLENBQUMsTUFBTSxjQUFjLEdBQUcsR0FBRyxFQUFFO0lBQ2pDLE1BQU0sS0FBSyxHQUFHLElBQUksR0FBRyxFQUFrQixDQUFBO0lBQ3ZDLE1BQU0sT0FBTyxHQUFHLENBQUMsRUFBVSxFQUFFLEVBQUUsQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFBO0lBQzdDLE1BQU0sT0FBTyxHQUFHLENBQUMsRUFBVSxFQUFFLElBQXdCLEVBQUUsRUFBRTtRQUN2RCxJQUFJLElBQUksS0FBSyxTQUFTLEVBQUUsQ0FBQztZQUN2QixLQUFLLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxDQUFBO1FBQ2xCLENBQUM7YUFBTSxDQUFDO1lBQ04sS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFFLEVBQUUsSUFBSSxDQUFDLENBQUE7UUFDckIsQ0FBQztJQUNILENBQUMsQ0FBQTtJQUVELCtCQUErQjtJQUMvQiwyQkFBMkI7SUFDM0IsZ0RBQWdEO0lBQ2hELE1BQU07SUFFTiwrQkFBK0I7SUFDL0IsMkJBQTJCO0lBQzNCLHNDQUFzQztJQUN0QyxNQUFNO0lBRU4sa0NBQWtDO0lBQ2xDLHdCQUF3QjtJQUN4QixvQ0FBb0M7SUFDcEMsU0FBUztJQUNULDJCQUEyQjtJQUMzQixjQUFjO0lBQ2QsSUFBSTtJQUVKLGlDQUFpQztJQUNqQyxvRkFBb0Y7SUFDcEYsb0lBQW9JO0lBQ3BJLGdCQUFnQjtJQUNoQixhQUFhO0lBQ2IsNEdBQTRHO0lBQzVHLHNDQUFzQztJQUN0QyxrRUFBa0U7SUFDbEUsdURBQXVEO0lBQ3ZELHNCQUFzQjtJQUN0QixzQkFBc0I7SUFDdEIsU0FBUztJQUNULHFDQUFxQztJQUNyQyx5Q0FBeUM7SUFDekMsaUJBQWlCO0lBQ2pCLDZCQUE2QjtJQUM3QixtQkFBbUI7SUFDbkIsK0NBQStDO0lBQy9DLHFCQUFxQjtJQUNyQixtQkFBbUI7SUFDbkIsMkNBQTJDO0lBQzNDLHlCQUF5QjtJQUN6QixzQkFBc0I7SUFDdEIsWUFBWTtJQUNaLGlCQUFpQjtJQUNqQix5Q0FBeUM7SUFDekMscURBQXFEO0lBQ3JELG9CQUFvQjtJQUNwQixVQUFVO0lBQ1YsUUFBUTtJQUNSLE1BQU07SUFDTixJQUFJO0lBRUosTUFBTSxLQUFLLEdBQUcsSUFBSSxHQUFHLEVBQW1CLENBQUE7SUFDeEMsTUFBTSxHQUFHLEdBQUcsU0FBUyxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUVuQyxPQUFPO1FBQ0wsR0FBRyxFQUFFLE9BQU87UUFDWixHQUFHLEVBQUUsT0FBTztRQUNaLGdCQUFnQixFQUFFLENBQUksR0FBVyxFQUFFLElBQWEsRUFBSyxFQUFFO1lBQ3JELElBQUksS0FBSyxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFrQixDQUFBO1lBQzNDLElBQUksS0FBSyxLQUFLLFNBQVMsRUFBRSxDQUFDO2dCQUN4QixLQUFLLEdBQUcsSUFBSSxFQUFFLENBQUE7Z0JBQ2QsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsS0FBSyxDQUFDLENBQUE7WUFDdkIsQ0FBQztZQUNELE9BQU8sS0FBSyxDQUFBO1FBQ2QsQ0FBQztRQUNELHNCQUFzQixFQUFFLENBQVUsR0FBVyxFQUFFLElBQTRCLEVBQTBCLEVBQUUsQ0FDckcsR0FBRyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsZUFBZSxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO1lBQzVELE1BQU0sS0FBSyxHQUFHLEtBQUssQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFrQixDQUFBO1lBQzdDLElBQUksS0FBSyxLQUFLLFNBQVM7Z0JBQUUsT0FBTyxLQUFLLENBQUE7WUFDckMsTUFBTSxDQUFDLEdBQUcsS0FBSyxDQUFDLENBQUMsSUFBSSxDQUFBO1lBQ3JCLEtBQUssQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFBO1lBQ2pCLE9BQU8sQ0FBQyxDQUFBO1FBQ1YsQ0FBQyxDQUFDLENBQUMsQ0FBQztLQUNQLENBQUE7QUFDSCxDQUFDLENBQUE7QUFFRCxNQUFNLE9BQU8sR0FBRyxNQUFNLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUFDLGNBQWMsRUFBRSxDQUFDLENBQUE7QUFFbkQsTUFBTSxPQUFPLFVBQVcsU0FBUSxPQUFPLENBQUMsTUFBTSxFQUFjLENBQUMsdUJBQXVCLEVBQUUsRUFBRSxJQUFJLEVBQUUsT0FBTyxFQUFFLENBQUM7Q0FDdkcifQ==
|