feat(core): normalize IDs to string inside default cache implementation

foscia-dev · Jul 3, 2024 · 4de6033 · 4de6033
1 parent d4c86d8
commit 4de6033
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/packages/core/src/blueprints/makeCache.ts b/packages/core/src/blueprints/makeCache.ts
@@ -7,6 +7,7 @@ type CacheConfig = Partial<RefsCacheConfig>;
 export default (config: CacheConfig = {}) => ({
   cache: makeRefsCacheWith({
     manager: weakRefManager,
+    normalizeId: (id) => String(id),
     ...config,
   }),
 });
diff --git a/packages/core/src/cache/makeRefsCacheWith.ts b/packages/core/src/cache/makeRefsCacheWith.ts
@@ -11,21 +11,23 @@ import { makeIdentifiersMap } from '@foscia/shared';
 export default (config: RefsCacheConfig): RefsCache => {
   const instances = makeIdentifiersMap<string, ModelIdType, unknown>();
 
-  const forget = async (type: string, id: ModelIdType) => instances.forget(type, id);
+  const normalizeId = config.normalizeId ?? ((v) => v);
+
+  const forget = async (type: string, id: ModelIdType) => instances.forget(type, normalizeId(id));
 
   const forgetAll = async (type: string) => instances.forgetAll(type);
 
   const clear = async () => instances.clear();
 
   const find = async (type: string, id: ModelIdType) => {
-    const ref = instances.find(type, id);
+    const ref = instances.find(type, normalizeId(id));
     if (!ref) {
       return null;
     }
 
     const instance = await config.manager.value(ref);
     if (!instance) {
-      await forget(type, id);
+      await forget(type, normalizeId(id));
 
       return null;
     }
@@ -34,7 +36,7 @@ export default (config: RefsCacheConfig): RefsCache => {
   };
 
   const put = async (type: string, id: ModelIdType, instance: ModelInstance) => {
-    instances.put(type, id, await config.manager.ref(instance));
+    instances.put(type, normalizeId(id), await config.manager.ref(instance));
   };
 
   return {

diff --git a/packages/core/src/cache/types.ts b/packages/core/src/cache/types.ts
@@ -1,6 +1,6 @@
-import { ModelInstance } from '@foscia/core/model/types';
+import { ModelIdType, ModelInstance } from '@foscia/core/model/types';
 import { CacheI } from '@foscia/core/types';
-import { Awaitable } from '@foscia/shared';
+import { Awaitable, Optional, Transformer } from '@foscia/shared';
 
 export type RefManager<R> = {
   ref(instance: ModelInstance): Awaitable<R>;
@@ -9,6 +9,7 @@ export type RefManager<R> = {
 
 export type RefsCacheConfig<R = unknown> = {
   manager: RefManager<R>;
+  normalizeId?: Optional<Transformer<ModelIdType>>;
 };
 
 export interface RefsCache extends CacheI {