@fjell/cache 4.4.3 → 4.5.1

package/dist/src/Aggregator.d.ts

@@ -0,0 +1,19 @@
+import { Item } from "@fjell/core";
+import { Cache } from "./Cache";
+export interface Aggregator<V extends Item<S, L1, L2, L3, L4, L5>, S extends string, L1 extends string = never, L2 extends string = never, L3 extends string = never, L4 extends string = never, L5 extends string = never> extends Cache<V, S, L1, L2, L3, L4, L5> {
+    populate: (item: V) => Promise<V>;
+    populateAggregate: (key: string, item: V) => Promise<void>;
+    populateEvent: (key: string, item: V) => Promise<void>;
+}
+export interface CacheConfig {
+    cache: any;
+    optional: boolean;
+}
+export interface AggregateConfig {
+    [key: string]: (CacheConfig);
+}
+export declare const toCacheConfig: <V extends Item<S, L1, L2, L3, L4, L5>, S extends string, L1 extends string = never, L2 extends string = never, L3 extends string = never, L4 extends string = never, L5 extends string = never>(config: CacheConfig | Cache<V, S, L1, L2, L3, L4, L5>) => CacheConfig;
+export declare const createAggregator: <V extends Item<S, L1, L2, L3, L4, L5>, S extends string, L1 extends string = never, L2 extends string = never, L3 extends string = never, L4 extends string = never, L5 extends string = never>(cache: Cache<V, S, L1, L2, L3, L4, L5>, { aggregates, events }: {
+    aggregates?: AggregateConfig;
+    events?: AggregateConfig;
+}) => Aggregator<V, S, L1, L2, L3, L4, L5>;

package/dist/src/Aggregator.js

@@ -0,0 +1,182 @@
+import LibLogger from "./logger";
+const logger = LibLogger.get('ItemAggregator');
+export const toCacheConfig = (config) => {
+    let cacheConfig;
+    if (config.optional === undefined) {
+        cacheConfig = { cache: config, optional: false };
+    }
+    else {
+        cacheConfig = config;
+    }
+    return cacheConfig;
+};
+export const createAggregator = (cache, { aggregates = {}, events = {} }) => {
+    const populate = async (item) => {
+        logger.default('populate', { item });
+        for (const key in aggregates) {
+            await populateAggregate(key, item);
+        }
+        for (const key in events) {
+            await populateEvent(key, item);
+        }
+        logger.default('populate done', { item });
+        return item;
+    };
+    const populateAggregate = async (key, item) => {
+        logger.default('populate aggregate key', { key });
+        const cacheConfig = toCacheConfig(aggregates[key]);
+        if (item.refs === undefined) {
+            if (cacheConfig.optional === false) {
+                logger.error('Item does not have refs an is not optional ' + JSON.stringify(item));
+                throw new Error('Item does not have refs an is not optional ' + JSON.stringify(item));
+            }
+        }
+        else if (item.refs[key] === undefined) {
+            if (cacheConfig.optional === false) {
+                logger.error('Item does not have mandatory ref with key, not optional ' +
+                    key + ' ' + JSON.stringify(item));
+                throw new Error('Item does not have mandatory ref with key, not optional ' +
+                    key + ' ' + JSON.stringify(item));
+            }
+        }
+        else {
+            const ref = item.refs[key];
+            logger.default('AGG Retrieving Item in Populate', { key: ref });
+            const [, newItem] = await cacheConfig.cache.retrieve(ref);
+            if (newItem) {
+                if (item.aggs === undefined) {
+                    item.aggs = {};
+                }
+                item.aggs[key] = {
+                    key: ref,
+                    item: newItem,
+                };
+            }
+        }
+    };
+    // TODO: I'm not a big fan that this just "automatically" assumes that the "by" key in event is a ref.
+    const populateEvent = async (key, item) => {
+        logger.default('populate event key', { key });
+        const cacheConfig = toCacheConfig(events[key]);
+        if (item.events === undefined) {
+            throw new Error('Item does not have events ' + JSON.stringify(item));
+        }
+        else if (item.events[key] === undefined) {
+            if (cacheConfig.optional === false) {
+                logger.error('Item does not have mandatory event with key ' + key + ' ' + JSON.stringify(item));
+                throw new Error('Item does not have mandatory event with key ' + key + ' ' + JSON.stringify(item));
+            }
+        }
+        else {
+            const event = item.events[key];
+            if (event.by === undefined) {
+                logger.error('populateEvent with an Event that does not have by', { event, ik: item.key, eventKey: key });
+                throw new Error('populateEvent with an Event that does not have by: ' + JSON.stringify({ key, event }));
+            }
+            logger.default('EVENT Retrieving Item in Populate', { key: event.by });
+            const [, newItem] = await cacheConfig.cache.retrieve(event.by);
+            if (newItem) {
+                event.agg = newItem;
+            }
+        }
+    };
+    const all = async (query = {}, locations = []) => {
+        logger.default('all', { query, locations });
+        const [cacheMap, items] = await cache.all(query, locations);
+        const populatedItems = await Promise.all(items.map(async (item) => populate(item)));
+        return [cacheMap, populatedItems];
+    };
+    const one = async (query = {}, locations = []) => {
+        logger.default('one', { query, locations });
+        const [cacheMap, item] = await cache.one(query, locations);
+        let populatedItem = null;
+        if (item) {
+            populatedItem = await populate(item);
+        }
+        return [cacheMap, populatedItem];
+    };
+    const action = async (key, action, body = {}) => {
+        logger.default('action', { key, action, body });
+        const [cacheMap, item] = await cache.action(key, action, body);
+        const populatedItem = await populate(item);
+        return [cacheMap, populatedItem];
+    };
+    const allAction = async (action, body = {}, locations = []) => {
+        logger.default('action', { action, body, locations });
+        const [cacheMap, items] = await cache.allAction(action, body, locations);
+        const populatedItems = await Promise.all(items.map(async (item) => populate(item)));
+        return [cacheMap, populatedItems];
+    };
+    const create = async (v, locations = []) => {
+        logger.default('create', { v, locations });
+        const [cacheMap, item] = await cache.create(v, locations);
+        const populatedItem = await populate(item);
+        return [cacheMap, populatedItem];
+    };
+    const get = async (key) => {
+        logger.default('get', { key });
+        const [cacheMap, item] = await cache.get(key);
+        let populatedItem = null;
+        if (item) {
+            populatedItem = await populate(item);
+        }
+        return [cacheMap, populatedItem];
+    };
+    const retrieve = async (key) => {
+        logger.default('retrieve', { key });
+        const [cacheMap, item] = await cache.retrieve(key);
+        let populatedItem = null;
+        if (item) {
+            populatedItem = await populate(item);
+        }
+        return [cacheMap, populatedItem];
+    };
+    const remove = async (key) => {
+        logger.default('remove', { key });
+        const cacheMap = await cache.remove(key);
+        return cacheMap;
+    };
+    const update = async (key, v) => {
+        logger.default('update', { key, v });
+        const [cacheMap, item] = await cache.update(key, v);
+        const populatedItem = await populate(item);
+        return [cacheMap, populatedItem];
+    };
+    const find = async (finder, finderParams, locations = []) => {
+        logger.default('find', { finder, finderParams, locations });
+        const [cacheMap, items] = await cache.find(finder, finderParams, locations);
+        const populatedItems = await Promise.all(items.map(async (item) => populate(item)));
+        return [cacheMap, populatedItems];
+    };
+    const set = async (key, v) => {
+        logger.default('set', { key, v });
+        // TODO: There should be some input validation here to ensure a valid item.
+        const [cacheMap, item] = await cache.set(key, v);
+        const populatedItem = await populate(item);
+        return [cacheMap, populatedItem];
+    };
+    const reset = async () => {
+        const cacheMap = await cache.reset();
+        return cacheMap;
+    };
+    return {
+        all,
+        one,
+        action,
+        allAction,
+        create,
+        get,
+        retrieve,
+        remove,
+        update,
+        find,
+        reset,
+        set,
+        pkTypes: cache.pkTypes,
+        cacheMap: cache.cacheMap,
+        populate,
+        populateAggregate,
+        populateEvent
+    };
+};
+//# sourceMappingURL=Aggregator.js.map

package/dist/src/Aggregator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Aggregator.js","sourceRoot":"","sources":["../../src/Aggregator.ts"],"names":[],"mappings":"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"}

package/dist/src/Cache.d.ts

@@ -1,5 +1,6 @@
-import { ComKey, Item, ItemQuery, LocKeyArray, PriKey, TypesProperties } from "@fjell/core";
+import { AllItemTypeArrays, ComKey, Item, ItemQuery, LocKeyArray, PriKey, TypesProperties } from "@fjell/core";
 import { CacheMap } from "./CacheMap";
+import { ClientApi } from "@fjell/client-api";
 export interface Cache<V extends Item<S, L1, L2, L3, L4, L5>, S extends string, L1 extends string = never, L2 extends string = never, L3 extends string = never, L4 extends string = never, L5 extends string = never> {
     all: (query?: ItemQuery, locations?: LocKeyArray<L1, L2, L3, L4, L5> | []) => Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V[]]>;
     one: (query?: ItemQuery, locations?: LocKeyArray<L1, L2, L3, L4, L5> | []) => Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V | null]>;
@@ -11,4 +12,9 @@ export interface Cache<V extends Item<S, L1, L2, L3, L4, L5>, S extends string,
     remove: (key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>) => Promise<CacheMap<V, S, L1, L2, L3, L4, L5>>;
     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]>;
     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[]]>;
+    set: (key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>, v: V) => Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V]>;
+    reset: () => Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>]>;
+    pkTypes: AllItemTypeArrays<S, L1, L2, L3, L4, L5>;
+    cacheMap: CacheMap<V, S, L1, L2, L3, L4, L5>;
 }
+export declare const createCache: <V extends Item<S, L1, L2, L3, L4, L5>, S extends string, L1 extends string = never, L2 extends string = never, L3 extends string = never, L4 extends string = never, L5 extends string = never>(api: ClientApi<V, S, L1, L2, L3, L4, L5>, pkType: S, parentCache?: Cache<Item<L1, L2, L3, L4, L5>, L1, L2, L3, L4, L5>) => Cache<V, S, L1, L2, L3, L4, L5>;

package/dist/src/Cache.js

@@ -1,2 +1,223 @@
-export {};
+import { isItemKeyEqual, isValidItemKey, validatePK } from "@fjell/core";
+import { CacheMap } from "./CacheMap";
+import LibLogger from "./logger";
+import { NotFoundError } from "@fjell/http-api";
+const logger = LibLogger.get('Cache');
+export const createCache = (api, pkType, parentCache) => {
+    let pkTypes = [pkType];
+    if (parentCache) {
+        pkTypes = pkTypes.concat(parentCache.pkTypes);
+    }
+    let cacheMap = new CacheMap(pkTypes);
+    const all = async (query = {}, locations = []) => {
+        logger.default('all', { query, locations });
+        let ret = [];
+        try {
+            ret = await api.all(query, {}, locations);
+            ret.forEach((v) => {
+                cacheMap.set(v.key, v);
+            });
+        }
+        catch (e) {
+            if (e instanceof NotFoundError) {
+            }
+            else {
+                throw e;
+            }
+        }
+        return [cacheMap, validatePK(ret, pkType)];
+    };
+    const one = async (query = {}, locations = []) => {
+        logger.default('one', { query, locations });
+        let retItem = null;
+        try {
+            retItem = await api.one(query, {}, locations);
+            if (retItem) {
+                cacheMap.set(retItem.key, retItem);
+            }
+        }
+        catch (e) {
+            if (e instanceof NotFoundError) {
+            }
+            else {
+                throw e;
+            }
+        }
+        return [
+            cacheMap,
+            retItem ?
+                validatePK(retItem, pkType) :
+                null
+        ];
+    };
+    const action = async (key, action, body = {}) => {
+        logger.default('action', { key, action, body });
+        // TODO: This is validating the key, but it doesn't have knowledge of the pkType
+        // This should be looking at the parentCaches and calculating an array of pkTypes
+        if (!isValidItemKey(key)) {
+            logger.error('Key for Action is not a valid ItemKey: %j', key);
+            throw new Error('Key for Action is not a valid ItemKey');
+        }
+        const updated = await api.action(key, action, body, {});
+        cacheMap.set(updated.key, updated);
+        return [cacheMap, validatePK(updated, pkType)];
+    };
+    const allAction = async (action, body = {}, locations = []) => {
+        logger.default('allAction', { action, body, locations });
+        let ret = [];
+        try {
+            ret = await api.allAction(action, body, {}, locations);
+            ret.forEach((v) => {
+                cacheMap.set(v.key, v);
+            });
+        }
+        catch (e) {
+            // istanbul ignore next
+            if (e instanceof NotFoundError) {
+            }
+            else {
+                throw e;
+            }
+        }
+        return [cacheMap, validatePK(ret, pkType)];
+    };
+    const create = async (v, locations = []) => {
+        logger.default('create', { v, locations });
+        const created = await api.create(v, {}, locations);
+        cacheMap.set(created.key, created);
+        return [cacheMap, validatePK(created, pkType)];
+    };
+    const get = async (key) => {
+        logger.default('get', { key });
+        // TODO: This is validating the key, but it doesn't have knowledge of the pkType
+        // This should be looking at the parentCaches and calculating an array of pkTypes
+        if (!isValidItemKey(key)) {
+            logger.error('Key for Get is not a valid ItemKey: %j', key);
+            throw new Error('Key for Get is not a valid ItemKey');
+        }
+        let ret;
+        try {
+            ret = await api.get(key, {});
+            if (ret) {
+                cacheMap.set(ret.key, ret);
+            }
+        }
+        catch (e) {
+            logger.error("Error getting item for key", { key, message: e.message, stack: e.stack });
+            throw e;
+        }
+        return [
+            cacheMap,
+            ret ?
+                validatePK(ret, pkType) :
+                null
+        ];
+    };
+    const retrieve = async (key) => {
+        logger.default('retrieve', { key });
+        if (!isValidItemKey(key)) {
+            logger.error('Key for Retrieve is not a valid ItemKey: %j', key);
+            throw new Error('Key for Retrieve is not a valid ItemKey');
+        }
+        const containsItemKey = cacheMap.includesKey(key);
+        let retrieved;
+        if (containsItemKey) {
+            logger.default('Looking for Object in Cache', key);
+            retrieved = cacheMap.get(key);
+        }
+        else {
+            logger.default('Object Not Found in Cache, Retrieving from Server API', { key });
+            [, retrieved] = await get(key);
+        }
+        const retValue = [
+            containsItemKey ? null : cacheMap,
+            retrieved ?
+                validatePK(retrieved, pkType) :
+                null
+        ];
+        // logger.debug('Returning from retrieve', { retValue });
+        return retValue;
+    };
+    const remove = async (key) => {
+        logger.default('remove', { key });
+        // TODO: This is validating the key, but it doesn't have knowledge of the pkType
+        // This should be looking at the parentCaches and calculating an array of pkTypes
+        if (!isValidItemKey(key)) {
+            logger.error('Key for Remove is not a valid ItemKey: %j', key);
+            throw new Error('Key for Remove is not a valid ItemKey');
+        }
+        try {
+            await api.remove(key, {});
+            cacheMap.delete(key);
+        }
+        catch (e) {
+            logger.error("Error deleting item", { error: e });
+            throw e;
+        }
+        return cacheMap;
+    };
+    const update = async (key, v) => {
+        logger.default('update', { key, v });
+        // TODO: This is validating the key, but it doesn't have knowledge of the pkType
+        // This should be looking at the parentCaches and calculating an array of pkTypes
+        if (!isValidItemKey(key)) {
+            logger.error('Key for Update is not a valid ItemKey: %j', key);
+            throw new Error('Key for Update is not a valid ItemKey');
+        }
+        try {
+            const updated = await api.update(key, v, {});
+            cacheMap.set(updated.key, updated);
+            return [cacheMap, validatePK(updated, pkType)];
+        }
+        catch (e) {
+            logger.error("Error updating chat", { error: e });
+            throw e;
+        }
+    };
+    const find = async (finder, finderParams, locations = []) => {
+        logger.default('find', { finder, finderParams, locations });
+        const ret = await api.find(finder, finderParams, {}, locations);
+        ret.forEach((v) => {
+            cacheMap.set(v.key, v);
+        });
+        return [cacheMap, validatePK(ret, pkType)];
+    };
+    const reset = async () => {
+        cacheMap = new CacheMap(pkTypes);
+        return [cacheMap];
+    };
+    const set = async (key, v) => {
+        logger.default('set', { key, v });
+        // TODO: This is validating the key, but it doesn't have knowledge of the pkType
+        // This should be looking at the parentCaches and calculating an array of pkTypes
+        if (!isValidItemKey(key)) {
+            logger.error('Key for Update is not a valid ItemKey: %j', key);
+            throw new Error('Key for Update is not a valid ItemKey');
+        }
+        // TODO: This could be merged with the isValidItemKey check, later.
+        validatePK(v, pkType);
+        if (!isItemKeyEqual(key, v.key)) {
+            logger.error('Key does not match item key: %j != %j', key, v.key);
+            throw new Error('Key does not match item key');
+        }
+        cacheMap.set(key, v);
+        return [cacheMap, validatePK(v, pkType)];
+    };
+    return {
+        all,
+        one,
+        action,
+        allAction,
+        create,
+        get,
+        retrieve,
+        remove,
+        update,
+        find,
+        reset,
+        set,
+        pkTypes,
+        cacheMap
+    };
+};
 //# sourceMappingURL=Cache.js.map

package/dist/src/Cache.js.map

@@ -1 +1 @@
-{"version":3,"file":"Cache.js","sourceRoot":"","sources":["../../src/Cache.ts"],"names":[],"mappings":""}
+{"version":3,"file":"Cache.js","sourceRoot":"","sources":["../../src/Cache.ts"],"names":[],"mappings":"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"}

package/dist/src/CacheRegistry.d.ts

@@ -1,13 +1,12 @@
 import { Item } from "@fjell/core";
-import { PItemCache } from "./PItemCache";
-import { CItemCache } from "./CItemCache";
+import { Cache } from "./Cache";
 export declare class CacheRegistry {
     private static instance;
     private configured;
     constructor();
     static getInstance(): CacheRegistry;
     private cacheMap;
-    registerCache: <S extends string, L1 extends string = never, L2 extends string = never, L3 extends string = never, L4 extends string = never, L5 extends string = never>(cache: PItemCache<Item<S>, S> | CItemCache<Item<S, L1, L2, L3, L4, L5>, S, L1, L2, L3, L4, L5>) => void;
+    registerCache: <S extends string, L1 extends string = never, L2 extends string = never, L3 extends string = never, L4 extends string = never, L5 extends string = never>(cache: Cache<Item<S, L1, L2, L3, L4, L5>, S, L1, L2, L3, L4, L5>) => void;
     isConfigured: () => boolean;
     markConfigured: () => void;
     getCache: (kts: string[]) => any;

package/dist/src/CacheRegistry.js

@@ -15,7 +15,7 @@ export class CacheRegistry {
     // TODO: My use of Generics has Boxed me into a corner where I can't reference AbstractCache without the types
     cacheMap = {};
     registerCache = (cache) => {
-        this.cacheMap[JSON.stringify(cache.getKeyTypes())] = cache;
+        this.cacheMap[JSON.stringify(cache.pkTypes)] = cache;
     };
     isConfigured = () => {
         return this.configured;

package/dist/src/CacheRegistry.js.map

@@ -1 +1 @@
-{"version":3,"file":"CacheRegistry.js","sourceRoot":"","sources":["../../src/CacheRegistry.ts"],"names":[],"mappings":"AAIA,OAAO,SAAS,MAAM,UAAU,CAAC;AAEjC,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AAE9C,MAAM,OAAO,aAAa;IAEhB,MAAM,CAAC,QAAQ,CAAgB;IAC/B,UAAU,GAAY,KAAK,CAAC;IAEpC;QACE,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;IACxC,CAAC;IAEM,MAAM,CAAC,WAAW;QAEvB,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC5B,aAAa,CAAC,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;QAC/C,CAAC;QACD,OAAO,aAAa,CAAC,QAAQ,CAAC;IAChC,CAAC;IAED,8GAA8G;IACtG,QAAQ,GAA0B,EAAE,CAAC;IAEtC,aAAa,GAAG,CAOrB,KAC8D,EAAQ,EAAE;QACxE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC;IAC7D,CAAC,CAAC;IAEK,YAAY,GAAG,GAAY,EAAE;QAClC,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC,CAAA;IAEM,cAAc,GAAG,GAAS,EAAE;QACjC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACzB,CAAC,CAAA;IAEM,QAAQ,GAAG,CAAC,GAAa,EAAO,EAAE;QACvC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;YAC5D,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC;CAEH"}
+{"version":3,"file":"CacheRegistry.js","sourceRoot":"","sources":["../../src/CacheRegistry.ts"],"names":[],"mappings":"AAEA,OAAO,SAAS,MAAM,UAAU,CAAC;AAEjC,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AAE9C,MAAM,OAAO,aAAa;IAEhB,MAAM,CAAC,QAAQ,CAAgB;IAC/B,UAAU,GAAY,KAAK,CAAC;IAEpC;QACE,MAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;IACxC,CAAC;IAEM,MAAM,CAAC,WAAW;QAEvB,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC;YAC5B,aAAa,CAAC,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC;QAC/C,CAAC;QACD,OAAO,aAAa,CAAC,QAAQ,CAAC;IAChC,CAAC;IAED,8GAA8G;IACtG,QAAQ,GAA0B,EAAE,CAAC;IAEtC,aAAa,GAAG,CAOrB,KAAgE,EAAQ,EAAE;QAC1E,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,KAAK,CAAC;IACvD,CAAC,CAAC;IAEK,YAAY,GAAG,GAAY,EAAE;QAClC,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC,CAAA;IAEM,cAAc,GAAG,GAAS,EAAE;QACjC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;IACzB,CAAC,CAAA;IAEM,QAAQ,GAAG,CAAC,GAAa,EAAO,EAAE;QACvC,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YACrB,MAAM,CAAC,KAAK,CAAC,6CAA6C,CAAC,CAAC;YAC5D,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACjE,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5C,CAAC,CAAC;CAEH"}

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/AItemAggregator.ts","../src/AItemCache.ts","../src/CItemCache.ts","../src/Cache.ts","../src/CacheMap.ts","../src/CacheRegistry.ts","../src/PItemCache.ts","../src/index.ts","../src/logger.ts","../tests/AItemAggregator.test.ts","../tests/AItemCache.test.ts","../tests/CItemCache.test.ts","../tests/CacheMap.test.ts","../tests/CacheRegistry.test.ts","../tests/PItemCache.test.ts"],"version":"5.7.3"}
+{"root":["../src/Aggregator.ts","../src/Cache.ts","../src/CacheMap.ts","../src/CacheRegistry.ts","../src/logger.ts","../tests/Aggregator.test.ts","../tests/Cache.test.ts","../tests/CacheMap.test.ts","../tests/CacheRegistry.test.ts","../tests/contained/Cache.test.ts","../tests/primary/Cache.test.ts"],"version":"5.7.3"}

package/package.json

@@ -1,16 +1,8 @@
 {
   "name": "@fjell/cache",
   "description": "Cache for Fjell",
-  "version": "4.4.3",
+  "version": "4.5.1",
   "license": "Apache-2.0",
-  "main": "./dist/src/index.js",
-  "exports": {
-    ".": {
-      "require": "./dist/src/index.js",
-      "types": "./dist/src/index.d.ts",
-      "default": "./dist/src/index.js"
-    }
-  },
   "type": "module",
   "scripts": {
     "lint": "eslint .",
@@ -51,7 +43,7 @@
     "tsc-alias": "^1.8.10",
     "typescript": "^5.7.3"
   },
-  "packageManager": "yarn@4.6.0",
+  "packageManager": "yarn@4.7.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/getfjell/cache.git"