@fjell/cache 4.5.0 → 4.5.2
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/dist/src/Aggregator.js +8 -0
- package/dist/src/Aggregator.js.map +1 -1
- package/dist/src/Cache.d.ts +1 -0
- package/dist/src/Cache.js +27 -1
- package/dist/src/Cache.js.map +1 -1
- package/package.json +2 -2
- package/src/Aggregator.ts +13 -0
- package/src/Cache.ts +40 -0
package/dist/src/Aggregator.js
CHANGED
|
@@ -148,6 +148,13 @@ export const createAggregator = (cache, { aggregates = {}, events = {} }) => {
|
|
|
148
148
|
const populatedItems = await Promise.all(items.map(async (item) => populate(item)));
|
|
149
149
|
return [cacheMap, populatedItems];
|
|
150
150
|
};
|
|
151
|
+
const set = async (key, v) => {
|
|
152
|
+
logger.default('set', { key, v });
|
|
153
|
+
// TODO: There should be some input validation here to ensure a valid item.
|
|
154
|
+
const [cacheMap, item] = await cache.set(key, v);
|
|
155
|
+
const populatedItem = await populate(item);
|
|
156
|
+
return [cacheMap, populatedItem];
|
|
157
|
+
};
|
|
151
158
|
const reset = async () => {
|
|
152
159
|
const cacheMap = await cache.reset();
|
|
153
160
|
return cacheMap;
|
|
@@ -164,6 +171,7 @@ export const createAggregator = (cache, { aggregates = {}, events = {} }) => {
|
|
|
164
171
|
update,
|
|
165
172
|
find,
|
|
166
173
|
reset,
|
|
174
|
+
set,
|
|
167
175
|
pkTypes: cache.pkTypes,
|
|
168
176
|
cacheMap: cache.cacheMap,
|
|
169
177
|
populate,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Aggregator.js","sourceRoot":"","sources":["../../src/Aggregator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Aggregator.js","sourceRoot":"","sources":["../../src/Aggregator.ts"],"names":[],"mappings":"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"}
|
package/dist/src/Cache.d.ts
CHANGED
|
@@ -12,6 +12,7 @@ export interface Cache<V extends Item<S, L1, L2, L3, L4, L5>, S extends string,
|
|
|
12
12
|
remove: (key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>) => Promise<CacheMap<V, S, L1, L2, L3, L4, L5>>;
|
|
13
13
|
update: (key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>, v: TypesProperties<V, S, L1, L2, L3, L4, L5>) => Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V]>;
|
|
14
14
|
find: (finder: string, finderParams: Record<string, string | number | boolean | Date | Array<string | number | boolean | Date>>, locations?: LocKeyArray<L1, L2, L3, L4, L5> | []) => Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V[]]>;
|
|
15
|
+
set: (key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>, v: Item<S, L1, L2, L3, L4, L5>) => Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V]>;
|
|
15
16
|
reset: () => Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>]>;
|
|
16
17
|
pkTypes: AllItemTypeArrays<S, L1, L2, L3, L4, L5>;
|
|
17
18
|
cacheMap: CacheMap<V, S, L1, L2, L3, L4, L5>;
|
package/dist/src/Cache.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isValidItemKey, validatePK } from "@fjell/core";
|
|
1
|
+
import { isItemKeyEqual, isValidItemKey, validatePK } from "@fjell/core";
|
|
2
2
|
import { CacheMap } from "./CacheMap";
|
|
3
3
|
import LibLogger from "./logger";
|
|
4
4
|
import { NotFoundError } from "@fjell/http-api";
|
|
@@ -52,6 +52,8 @@ export const createCache = (api, pkType, parentCache) => {
|
|
|
52
52
|
};
|
|
53
53
|
const action = async (key, action, body = {}) => {
|
|
54
54
|
logger.default('action', { key, action, body });
|
|
55
|
+
// TODO: This is validating the key, but it doesn't have knowledge of the pkType
|
|
56
|
+
// This should be looking at the parentCaches and calculating an array of pkTypes
|
|
55
57
|
if (!isValidItemKey(key)) {
|
|
56
58
|
logger.error('Key for Action is not a valid ItemKey: %j', key);
|
|
57
59
|
throw new Error('Key for Action is not a valid ItemKey');
|
|
@@ -87,6 +89,8 @@ export const createCache = (api, pkType, parentCache) => {
|
|
|
87
89
|
};
|
|
88
90
|
const get = async (key) => {
|
|
89
91
|
logger.default('get', { key });
|
|
92
|
+
// TODO: This is validating the key, but it doesn't have knowledge of the pkType
|
|
93
|
+
// This should be looking at the parentCaches and calculating an array of pkTypes
|
|
90
94
|
if (!isValidItemKey(key)) {
|
|
91
95
|
logger.error('Key for Get is not a valid ItemKey: %j', key);
|
|
92
96
|
throw new Error('Key for Get is not a valid ItemKey');
|
|
@@ -136,6 +140,8 @@ export const createCache = (api, pkType, parentCache) => {
|
|
|
136
140
|
};
|
|
137
141
|
const remove = async (key) => {
|
|
138
142
|
logger.default('remove', { key });
|
|
143
|
+
// TODO: This is validating the key, but it doesn't have knowledge of the pkType
|
|
144
|
+
// This should be looking at the parentCaches and calculating an array of pkTypes
|
|
139
145
|
if (!isValidItemKey(key)) {
|
|
140
146
|
logger.error('Key for Remove is not a valid ItemKey: %j', key);
|
|
141
147
|
throw new Error('Key for Remove is not a valid ItemKey');
|
|
@@ -152,6 +158,8 @@ export const createCache = (api, pkType, parentCache) => {
|
|
|
152
158
|
};
|
|
153
159
|
const update = async (key, v) => {
|
|
154
160
|
logger.default('update', { key, v });
|
|
161
|
+
// TODO: This is validating the key, but it doesn't have knowledge of the pkType
|
|
162
|
+
// This should be looking at the parentCaches and calculating an array of pkTypes
|
|
155
163
|
if (!isValidItemKey(key)) {
|
|
156
164
|
logger.error('Key for Update is not a valid ItemKey: %j', key);
|
|
157
165
|
throw new Error('Key for Update is not a valid ItemKey');
|
|
@@ -178,6 +186,23 @@ export const createCache = (api, pkType, parentCache) => {
|
|
|
178
186
|
cacheMap = new CacheMap(pkTypes);
|
|
179
187
|
return [cacheMap];
|
|
180
188
|
};
|
|
189
|
+
const set = async (key, v) => {
|
|
190
|
+
logger.default('set', { key, v });
|
|
191
|
+
// TODO: This is validating the key, but it doesn't have knowledge of the pkType
|
|
192
|
+
// This should be looking at the parentCaches and calculating an array of pkTypes
|
|
193
|
+
if (!isValidItemKey(key)) {
|
|
194
|
+
logger.error('Key for Update is not a valid ItemKey: %j', key);
|
|
195
|
+
throw new Error('Key for Update is not a valid ItemKey');
|
|
196
|
+
}
|
|
197
|
+
// TODO: This could be merged with the isValidItemKey check, later.
|
|
198
|
+
validatePK(v, pkType);
|
|
199
|
+
if (!isItemKeyEqual(key, v.key)) {
|
|
200
|
+
logger.error('Key does not match item key: %j != %j', key, v.key);
|
|
201
|
+
throw new Error('Key does not match item key');
|
|
202
|
+
}
|
|
203
|
+
cacheMap.set(key, v);
|
|
204
|
+
return [cacheMap, validatePK(v, pkType)];
|
|
205
|
+
};
|
|
181
206
|
return {
|
|
182
207
|
all,
|
|
183
208
|
one,
|
|
@@ -190,6 +215,7 @@ export const createCache = (api, pkType, parentCache) => {
|
|
|
190
215
|
update,
|
|
191
216
|
find,
|
|
192
217
|
reset,
|
|
218
|
+
set,
|
|
193
219
|
pkTypes,
|
|
194
220
|
cacheMap
|
|
195
221
|
};
|
package/dist/src/Cache.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cache.js","sourceRoot":"","sources":["../../src/Cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,cAAc,EAMd,UAAU,EACX,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,SAAS,MAAM,UAAU,CAAC;AAGjC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"Cache.js","sourceRoot":"","sources":["../../src/Cache.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@fjell/cache",
|
|
3
3
|
"description": "Cache for Fjell",
|
|
4
|
-
"version": "4.5.
|
|
4
|
+
"version": "4.5.2",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"type": "module",
|
|
7
7
|
"scripts": {
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"tsc-alias": "^1.8.10",
|
|
44
44
|
"typescript": "^5.7.3"
|
|
45
45
|
},
|
|
46
|
-
"packageManager": "yarn@4.
|
|
46
|
+
"packageManager": "yarn@4.7.0",
|
|
47
47
|
"repository": {
|
|
48
48
|
"type": "git",
|
|
49
49
|
"url": "git+https://github.com/getfjell/cache.git"
|
package/src/Aggregator.ts
CHANGED
|
@@ -250,6 +250,18 @@ export const createAggregator = <
|
|
|
250
250
|
return [cacheMap, populatedItems];
|
|
251
251
|
}
|
|
252
252
|
|
|
253
|
+
const set = async (
|
|
254
|
+
key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
|
|
255
|
+
v: Item<S, L1, L2, L3, L4, L5>
|
|
256
|
+
): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V]> => {
|
|
257
|
+
logger.default('set', { key, v });
|
|
258
|
+
|
|
259
|
+
// TODO: There should be some input validation here to ensure a valid item.
|
|
260
|
+
const [cacheMap, item] = await cache.set(key, v);
|
|
261
|
+
const populatedItem = await populate(item);
|
|
262
|
+
return [cacheMap, populatedItem];
|
|
263
|
+
}
|
|
264
|
+
|
|
253
265
|
const reset = async (): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>]> => {
|
|
254
266
|
const cacheMap = await cache.reset();
|
|
255
267
|
return cacheMap;
|
|
@@ -267,6 +279,7 @@ export const createAggregator = <
|
|
|
267
279
|
update,
|
|
268
280
|
find,
|
|
269
281
|
reset,
|
|
282
|
+
set,
|
|
270
283
|
pkTypes: cache.pkTypes,
|
|
271
284
|
cacheMap: cache.cacheMap,
|
|
272
285
|
populate,
|
package/src/Cache.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
AllItemTypeArrays,
|
|
3
3
|
ComKey,
|
|
4
|
+
isItemKeyEqual,
|
|
4
5
|
isValidItemKey,
|
|
5
6
|
Item,
|
|
6
7
|
ItemQuery,
|
|
@@ -78,6 +79,11 @@ export interface Cache<
|
|
|
78
79
|
locations?: LocKeyArray<L1, L2, L3, L4, L5> | []
|
|
79
80
|
) => Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V[]]>;
|
|
80
81
|
|
|
82
|
+
set: (
|
|
83
|
+
key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
|
|
84
|
+
v: Item<S, L1, L2, L3, L4, L5>
|
|
85
|
+
) => Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V]>;
|
|
86
|
+
|
|
81
87
|
reset: () => Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>]>;
|
|
82
88
|
|
|
83
89
|
pkTypes: AllItemTypeArrays<S, L1, L2, L3, L4, L5>;
|
|
@@ -164,6 +170,8 @@ export const createCache = <
|
|
|
164
170
|
): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V]> => {
|
|
165
171
|
logger.default('action', { key, action, body });
|
|
166
172
|
|
|
173
|
+
// TODO: This is validating the key, but it doesn't have knowledge of the pkType
|
|
174
|
+
// This should be looking at the parentCaches and calculating an array of pkTypes
|
|
167
175
|
if (!isValidItemKey(key)) {
|
|
168
176
|
logger.error('Key for Action is not a valid ItemKey: %j', key);
|
|
169
177
|
throw new Error('Key for Action is not a valid ItemKey');
|
|
@@ -211,6 +219,8 @@ export const createCache = <
|
|
|
211
219
|
key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
|
|
212
220
|
): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V | null]> => {
|
|
213
221
|
logger.default('get', { key });
|
|
222
|
+
// TODO: This is validating the key, but it doesn't have knowledge of the pkType
|
|
223
|
+
// This should be looking at the parentCaches and calculating an array of pkTypes
|
|
214
224
|
if (!isValidItemKey(key)) {
|
|
215
225
|
logger.error('Key for Get is not a valid ItemKey: %j', key);
|
|
216
226
|
throw new Error('Key for Get is not a valid ItemKey');
|
|
@@ -265,6 +275,8 @@ export const createCache = <
|
|
|
265
275
|
key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
|
|
266
276
|
): Promise<CacheMap<V, S, L1, L2, L3, L4, L5>> => {
|
|
267
277
|
logger.default('remove', { key });
|
|
278
|
+
// TODO: This is validating the key, but it doesn't have knowledge of the pkType
|
|
279
|
+
// This should be looking at the parentCaches and calculating an array of pkTypes
|
|
268
280
|
if (!isValidItemKey(key)) {
|
|
269
281
|
logger.error('Key for Remove is not a valid ItemKey: %j', key);
|
|
270
282
|
throw new Error('Key for Remove is not a valid ItemKey');
|
|
@@ -285,6 +297,8 @@ export const createCache = <
|
|
|
285
297
|
): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V]> => {
|
|
286
298
|
logger.default('update', { key, v });
|
|
287
299
|
|
|
300
|
+
// TODO: This is validating the key, but it doesn't have knowledge of the pkType
|
|
301
|
+
// This should be looking at the parentCaches and calculating an array of pkTypes
|
|
288
302
|
if (!isValidItemKey(key)) {
|
|
289
303
|
logger.error('Key for Update is not a valid ItemKey: %j', key);
|
|
290
304
|
throw new Error('Key for Update is not a valid ItemKey');
|
|
@@ -318,6 +332,31 @@ export const createCache = <
|
|
|
318
332
|
return [cacheMap];
|
|
319
333
|
}
|
|
320
334
|
|
|
335
|
+
const set = async (
|
|
336
|
+
key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
|
|
337
|
+
v: Item<S, L1, L2, L3, L4, L5>
|
|
338
|
+
): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V]> => {
|
|
339
|
+
logger.default('set', { key, v });
|
|
340
|
+
|
|
341
|
+
// TODO: This is validating the key, but it doesn't have knowledge of the pkType
|
|
342
|
+
// This should be looking at the parentCaches and calculating an array of pkTypes
|
|
343
|
+
if (!isValidItemKey(key)) {
|
|
344
|
+
logger.error('Key for Update is not a valid ItemKey: %j', key);
|
|
345
|
+
throw new Error('Key for Update is not a valid ItemKey');
|
|
346
|
+
}
|
|
347
|
+
|
|
348
|
+
// TODO: This could be merged with the isValidItemKey check, later.
|
|
349
|
+
validatePK(v, pkType);
|
|
350
|
+
|
|
351
|
+
if (!isItemKeyEqual(key, v.key)) {
|
|
352
|
+
logger.error('Key does not match item key: %j != %j', key, v.key);
|
|
353
|
+
throw new Error('Key does not match item key');
|
|
354
|
+
}
|
|
355
|
+
|
|
356
|
+
cacheMap.set(key, v as V);
|
|
357
|
+
return [cacheMap, validatePK(v, pkType) as V];
|
|
358
|
+
}
|
|
359
|
+
|
|
321
360
|
return {
|
|
322
361
|
all,
|
|
323
362
|
one,
|
|
@@ -330,6 +369,7 @@ export const createCache = <
|
|
|
330
369
|
update,
|
|
331
370
|
find,
|
|
332
371
|
reset,
|
|
372
|
+
set,
|
|
333
373
|
pkTypes,
|
|
334
374
|
cacheMap
|
|
335
375
|
}
|