@fjell/cache 4.6.10 → 4.6.13

package/dist/index.cjs

@@ -7,9 +7,9 @@ const core = require('@fjell/core');
 const httpApi = require('@fjell/http-api');
 const registry = require('@fjell/registry');
 
-const LibLogger = Logging.getLogger('@fjell/cache');
+const logger$1.default = Logging.getLogger('@fjell/cache');
 
-const logger$5 = LibLogger.get('ItemAggregator');
+const logger$j = logger$1.default.get('ItemAggregator');
 const toCacheConfig = (config)=>{
     let cacheConfig;
     if (config.optional === undefined) {
@@ -24,7 +24,7 @@ const toCacheConfig = (config)=>{
 };
 const createAggregator = async (cache, { aggregates = {}, events = {} })=>{
     const populate = async (item)=>{
-        logger$5.default('populate', {
+        logger$j.default('populate', {
             item
         });
         for(const key in aggregates){
@@ -33,19 +33,19 @@ const createAggregator = async (cache, { aggregates = {}, events = {} })=>{
         for(const key in events){
             await populateEvent(key, item);
         }
-        logger$5.default('populate done', {
+        logger$j.default('populate done', {
             item
         });
         return item;
     };
     const populateAggregate = async (key, item)=>{
-        logger$5.default('populate aggregate key', {
+        logger$j.default('populate aggregate key', {
             key
         });
         const cacheConfig = toCacheConfig(aggregates[key]);
         if (item.refs === undefined) {
             if (cacheConfig.optional === false) {
-                logger$5.error('Item does not have refs an is not optional ' + JSON.stringify(item));
+                logger$j.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.events && Object.prototype.hasOwnProperty.call(item.events, key)) {
@@ -54,7 +54,7 @@ const createAggregator = async (cache, { aggregates = {}, events = {} })=>{
             }
         } else if (item.refs[key] === undefined) {
             if (cacheConfig.optional === false) {
-                logger$5.error('Item does not have mandatory ref with key, not optional ' + key + ' ' + JSON.stringify(item));
+                logger$j.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 {
                 if (item.events && Object.prototype.hasOwnProperty.call(item.events, key)) {
@@ -63,10 +63,10 @@ const createAggregator = async (cache, { aggregates = {}, events = {} })=>{
             }
         } else {
             const ref = item.refs[key];
-            logger$5.default('AGG Retrieving Item in Populate', {
+            logger$j.default('AGG Retrieving Item in Populate', {
                 key: ref
             });
-            const [, newItem] = await cacheConfig.cache.retrieve(ref);
+            const [, newItem] = await cacheConfig.cache.operations.retrieve(ref);
             if (newItem) {
                 if (item.aggs === undefined) {
                     item.aggs = {};
@@ -80,7 +80,7 @@ const createAggregator = async (cache, { aggregates = {}, events = {} })=>{
     };
     // 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$5.default('populate event key', {
+        logger$j.default('populate event key', {
             key
         });
         const cacheConfig = toCacheConfig(events[key]);
@@ -88,13 +88,13 @@ const createAggregator = async (cache, { aggregates = {}, events = {} })=>{
             throw new Error('Item does not have events ' + JSON.stringify(item));
         } else if (item.events[key] === undefined) {
             if (cacheConfig.optional === false) {
-                logger$5.error('Item does not have mandatory event with key ' + key + ' ' + JSON.stringify(item));
+                logger$j.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$5.error('populateEvent with an Event that does not have by', {
+                logger$j.error('populateEvent with an Event that does not have by', {
                     event,
                     ik: item.key,
                     eventKey: key
@@ -104,21 +104,21 @@ const createAggregator = async (cache, { aggregates = {}, events = {} })=>{
                     event
                 }));
             }
-            logger$5.default('EVENT Retrieving Item in Populate', {
+            logger$j.default('EVENT Retrieving Item in Populate', {
                 key: event.by
             });
-            const [, newItem] = await cacheConfig.cache.retrieve(event.by);
+            const [, newItem] = await cacheConfig.cache.operations.retrieve(event.by);
             if (newItem) {
                 event.agg = newItem;
             }
         }
     };
     const all = async (query = {}, locations = [])=>{
-        logger$5.default('all', {
+        logger$j.default('all', {
             query,
             locations
         });
-        const [cacheMap, items] = await cache.all(query, locations);
+        const [cacheMap, items] = await cache.operations.all(query, locations);
         const populatedItems = await Promise.all(items.map(async (item)=>populate(item)));
         return [
             cacheMap,
@@ -126,11 +126,11 @@ const createAggregator = async (cache, { aggregates = {}, events = {} })=>{
         ];
     };
     const one = async (query = {}, locations = [])=>{
-        logger$5.default('one', {
+        logger$j.default('one', {
             query,
             locations
         });
-        const [cacheMap, item] = await cache.one(query, locations);
+        const [cacheMap, item] = await cache.operations.one(query, locations);
         let populatedItem = null;
         if (item) {
             populatedItem = await populate(item);
@@ -141,12 +141,12 @@ const createAggregator = async (cache, { aggregates = {}, events = {} })=>{
         ];
     };
     const action = async (key, action, body = {})=>{
-        logger$5.default('action', {
+        logger$j.default('action', {
             key,
             action,
             body
         });
-        const [cacheMap, item] = await cache.action(key, action, body);
+        const [cacheMap, item] = await cache.operations.action(key, action, body);
         const populatedItem = await populate(item);
         return [
             cacheMap,
@@ -154,12 +154,12 @@ const createAggregator = async (cache, { aggregates = {}, events = {} })=>{
         ];
     };
     const allAction = async (action, body = {}, locations = [])=>{
-        logger$5.default('action', {
+        logger$j.default('action', {
             action,
             body,
             locations
         });
-        const [cacheMap, items] = await cache.allAction(action, body, locations);
+        const [cacheMap, items] = await cache.operations.allAction(action, body, locations);
         const populatedItems = await Promise.all(items.map(async (item)=>populate(item)));
         return [
             cacheMap,
@@ -167,23 +167,23 @@ const createAggregator = async (cache, { aggregates = {}, events = {} })=>{
         ];
     };
     const allFacet = async (facet, params = {}, locations = [])=>{
-        logger$5.default('allFacet', {
+        logger$j.default('allFacet', {
             facet,
             params,
             locations
         });
-        const [cacheMap, response] = await cache.allFacet(facet, params, locations);
+        const [cacheMap, response] = await cache.operations.allFacet(facet, params, locations);
         return [
             cacheMap,
             response
         ];
     };
     const create = async (v, locations = [])=>{
-        logger$5.default('create', {
+        logger$j.default('create', {
             v,
             locations
         });
-        const [cacheMap, item] = await cache.create(v, locations);
+        const [cacheMap, item] = await cache.operations.create(v, locations);
         const populatedItem = await populate(item);
         return [
             cacheMap,
@@ -191,10 +191,10 @@ const createAggregator = async (cache, { aggregates = {}, events = {} })=>{
         ];
     };
     const get = async (key)=>{
-        logger$5.default('get', {
+        logger$j.default('get', {
             key
         });
-        const [cacheMap, item] = await cache.get(key);
+        const [cacheMap, item] = await cache.operations.get(key);
         let populatedItem = null;
         if (item) {
             populatedItem = await populate(item);
@@ -205,10 +205,10 @@ const createAggregator = async (cache, { aggregates = {}, events = {} })=>{
         ];
     };
     const retrieve = async (key)=>{
-        logger$5.default('retrieve', {
+        logger$j.default('retrieve', {
             key
         });
-        const [cacheMap, item] = await cache.retrieve(key);
+        const [cacheMap, item] = await cache.operations.retrieve(key);
         let populatedItem = null;
         if (item) {
             populatedItem = await populate(item);
@@ -219,18 +219,18 @@ const createAggregator = async (cache, { aggregates = {}, events = {} })=>{
         ];
     };
     const remove = async (key)=>{
-        logger$5.default('remove', {
+        logger$j.default('remove', {
             key
         });
-        const cacheMap = await cache.remove(key);
+        const cacheMap = await cache.operations.remove(key);
         return cacheMap;
     };
     const update = async (key, v)=>{
-        logger$5.default('update', {
+        logger$j.default('update', {
             key,
             v
         });
-        const [cacheMap, item] = await cache.update(key, v);
+        const [cacheMap, item] = await cache.operations.update(key, v);
         const populatedItem = await populate(item);
         return [
             cacheMap,
@@ -239,23 +239,23 @@ const createAggregator = async (cache, { aggregates = {}, events = {} })=>{
     };
     // Facets are a pass-thru for aggregators
     const facet = async (key, facet)=>{
-        logger$5.default('facet', {
+        logger$j.default('facet', {
             key,
             facet
         });
-        const [cacheMap, response] = await cache.facet(key, facet);
+        const [cacheMap, response] = await cache.operations.facet(key, facet);
         return [
             cacheMap,
             response
         ];
     };
     const find = async (finder, finderParams = {}, locations = [])=>{
-        logger$5.default('find', {
+        logger$j.default('find', {
             finder,
             finderParams,
             locations
         });
-        const [cacheMap, items] = await cache.find(finder, finderParams, locations);
+        const [cacheMap, items] = await cache.operations.find(finder, finderParams, locations);
         const populatedItems = await Promise.all(items.map(async (item)=>populate(item)));
         return [
             cacheMap,
@@ -263,12 +263,12 @@ const createAggregator = async (cache, { aggregates = {}, events = {} })=>{
         ];
     };
     const findOne = async (finder, finderParams = {}, locations = [])=>{
-        logger$5.default('find', {
+        logger$j.default('find', {
             finder,
             finderParams,
             locations
         });
-        const [cacheMap, item] = await cache.findOne(finder, finderParams, locations);
+        const [cacheMap, item] = await cache.operations.findOne(finder, finderParams, locations);
         const populatedItem = await populate(item);
         return [
             cacheMap,
@@ -276,12 +276,12 @@ const createAggregator = async (cache, { aggregates = {}, events = {} })=>{
         ];
     };
     const set = async (key, v)=>{
-        logger$5.default('set', {
+        logger$j.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 [cacheMap, item] = await cache.operations.set(key, v);
         const populatedItem = await populate(item);
         return [
             cacheMap,
@@ -289,10 +289,17 @@ const createAggregator = async (cache, { aggregates = {}, events = {} })=>{
         ];
     };
     const reset = async ()=>{
-        const cacheMap = await cache.reset();
+        const cacheMap = await cache.operations.reset();
         return cacheMap;
     };
     return {
+        // Cache properties
+        coordinate: cache.coordinate,
+        registry: cache.registry,
+        api: cache.api,
+        cacheMap: cache.cacheMap,
+        operations: cache.operations,
+        // Cache operations exposed directly
         all,
         one,
         action,
@@ -308,8 +315,7 @@ const createAggregator = async (cache, { aggregates = {}, events = {} })=>{
         findOne,
         reset,
         set,
-        pkTypes: cache.pkTypes,
-        cacheMap: cache.cacheMap,
+        // Aggregator-specific operations
         populate,
         populateAggregate,
         populateEvent
@@ -329,7 +335,7 @@ function _define_property(obj, key, value) {
     }
     return obj;
 }
-const logger$4 = LibLogger.get("CacheMap");
+const logger$i = logger$1.default.get("CacheMap");
 // Normalize a key value to string for consistent comparison and hashing
 const normalizeKeyValue$1 = (value)=>{
     return String(value);
@@ -432,17 +438,17 @@ class CacheMap extends core.Dictionary {
     }
     allIn(locations) {
         if (locations.length === 0) {
-            logger$4.debug('Returning all items, LocKeys is empty');
+            logger$i.debug('Returning all items, LocKeys is empty');
             return this.values();
         } else {
             const locKeys = locations;
-            logger$4.debug('allIn', {
+            logger$i.debug('allIn', {
                 locKeys,
                 keys: this.keys().length
             });
             return this.keys().filter((key)=>key && core.isComKey(key)).filter((key)=>{
                 const ComKey = key;
-                logger$4.debug('Comparing Location Keys', {
+                logger$i.debug('Comparing Location Keys', {
                     locKeys,
                     ComKey
                 });
@@ -452,7 +458,7 @@ class CacheMap extends core.Dictionary {
     }
     // TODO: Can we do case insensitive matching?
     contains(query, locations) {
-        logger$4.debug('contains', {
+        logger$i.debug('contains', {
             query,
             locations
         });
@@ -460,7 +466,7 @@ class CacheMap extends core.Dictionary {
         return items.some((item)=>core.isQueryMatch(item, query));
     }
     queryIn(query, locations = []) {
-        logger$4.debug('queryIn', {
+        logger$i.debug('queryIn', {
             query,
             locations
         });
@@ -477,7 +483,272 @@ class CacheMap extends core.Dictionary {
     }
 }
 
-const logger$3 = LibLogger.get('Cache');
+const logger$h = logger$1.default.get('all');
+const all = async (api, cacheMap, pkType, query = {}, locations = [])=>{
+    logger$h.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 httpApi.NotFoundError) ; else {
+            throw e;
+        }
+    }
+    return [
+        cacheMap,
+        core.validatePK(ret, pkType)
+    ];
+};
+
+const logger$g = logger$1.default.get('one');
+const one = async (api, cacheMap, pkType, query = {}, locations = [])=>{
+    logger$g.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 httpApi.NotFoundError) ; else {
+            throw e;
+        }
+    }
+    return [
+        cacheMap,
+        retItem ? core.validatePK(retItem, pkType) : null
+    ];
+};
+
+const logger$f = logger$1.default.get('create');
+const create = async (api, cacheMap, pkType, v, locations = [])=>{
+    logger$f.default('create', {
+        v,
+        locations
+    });
+    const created = await api.create(v, locations);
+    cacheMap.set(created.key, created);
+    return [
+        cacheMap,
+        core.validatePK(created, pkType)
+    ];
+};
+
+const logger$e = logger$1.default.get('get');
+const get.get = async (api, cacheMap, pkType, key)=>{
+    logger$e.default('get', {
+        key
+    });
+    if (!core.isValidItemKey(key)) {
+        logger$e.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$e.error("Error getting item for key", {
+            key,
+            message: e.message,
+            stack: e.stack
+        });
+        throw e;
+    }
+    return [
+        cacheMap,
+        ret ? core.validatePK(ret, pkType) : null
+    ];
+};
+
+const logger$d = logger$1.default.get('retrieve');
+const retrieve = async (api, cacheMap, pkType, key)=>{
+    logger$d.default('retrieve', {
+        key
+    });
+    if (!core.isValidItemKey(key)) {
+        logger$d.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$d.default('Looking for Object in Cache', key);
+        retrieved = cacheMap.get(key);
+    } else {
+        logger$d.default('Object Not Found in Cache, Retrieving from Server API', {
+            key
+        });
+        [, retrieved] = await get.get(api, cacheMap, pkType, key);
+    }
+    const retValue = [
+        containsItemKey ? null : cacheMap,
+        retrieved ? core.validatePK(retrieved, pkType) : null
+    ];
+    return retValue;
+};
+
+const logger$c = logger$1.default.get('remove');
+const remove = async (api, cacheMap, key)=>{
+    logger$c.default('remove', {
+        key
+    });
+    if (!core.isValidItemKey(key)) {
+        logger$c.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$c.error("Error deleting item", {
+            error: e
+        });
+        throw e;
+    }
+    return cacheMap;
+};
+
+const logger$b = logger$1.default.get('update');
+const update = async (api, cacheMap, pkType, key, v)=>{
+    logger$b.default('update', {
+        key,
+        v
+    });
+    if (!core.isValidItemKey(key)) {
+        logger$b.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,
+            core.validatePK(updated, pkType)
+        ];
+    } catch (e) {
+        logger$b.error("Error updating item", {
+            error: e
+        });
+        throw e;
+    }
+};
+
+const logger$a = logger$1.default.get('action');
+const action = async (api, cacheMap, pkType, key, action, body = {})=>{
+    logger$a.default('action', {
+        key,
+        action,
+        body
+    });
+    if (!core.isValidItemKey(key)) {
+        logger$a.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,
+        core.validatePK(updated, pkType)
+    ];
+};
+
+const logger$9 = logger$1.default.get('allAction');
+const allAction = async (api, cacheMap, pkType, action, body = {}, locations = [])=>{
+    logger$9.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 httpApi.NotFoundError) ; else {
+            throw e;
+        }
+    }
+    return [
+        cacheMap,
+        core.validatePK(ret, pkType)
+    ];
+};
+
+const logger$8 = logger$1.default.get('facet');
+const facet = async (api, cacheMap, key, facet, params = {})=>{
+    logger$8.default('facet', {
+        key,
+        facet
+    });
+    const ret = await api.facet(key, facet, params);
+    return [
+        cacheMap,
+        ret
+    ];
+};
+
+const logger$7 = logger$1.default.get('allFacet');
+const allFacet = async (api, cacheMap, facet, params = {}, locations = [])=>{
+    logger$7.default('allFacet', {
+        facet,
+        params,
+        locations
+    });
+    const ret = await api.allFacet(facet, params, locations);
+    return [
+        cacheMap,
+        ret
+    ];
+};
+
+const logger$6 = logger$1.default.get('find');
+const find = async (api, cacheMap, pkType, finder, params = {}, locations = [])=>{
+    logger$6.default('find', {
+        finder,
+        params,
+        locations
+    });
+    const ret = await api.find(finder, params, locations);
+    ret.forEach((v)=>{
+        cacheMap.set(v.key, v);
+    });
+    return [
+        cacheMap,
+        core.validatePK(ret, pkType)
+    ];
+};
+
+const logger$5 = logger$1.default.get('findOne');
+const findOne = async (api, cacheMap, pkType, finder, finderParams = {}, locations = [])=>{
+    logger$5.default('findOne', {
+        finder,
+        finderParams,
+        locations
+    });
+    const ret = await api.findOne(finder, finderParams, locations);
+    cacheMap.set(ret.key, ret);
+    return [
+        cacheMap,
+        core.validatePK(ret, pkType)
+    ];
+};
+
+const logger$4 = logger$1.default.get('set');
 // Normalize a key value to string for consistent comparison
 const normalizeKeyValue = (value)=>{
     return String(value);
@@ -517,345 +788,119 @@ const normalizeKey = (key)=>{
     }
     return key;
 };
-const createCache = async (api, pkType, parentCache)=>{
-    let pkTypes = [
-        pkType
-    ];
-    if (parentCache) {
-        pkTypes = pkTypes.concat(parentCache.pkTypes);
+const set = async (cacheMap, pkType, key, v)=>{
+    logger$4.default('set', {
+        key,
+        v
+    });
+    if (!core.isValidItemKey(key)) {
+        logger$4.error('Key for Set is not a valid ItemKey: %j', key);
+        throw new Error('Key for Set is not a valid ItemKey');
     }
-    let cacheMap = new CacheMap(pkTypes);
-    const all = async (query = {}, locations = [])=>{
-        logger$3.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 httpApi.NotFoundError) ; else {
-                throw e;
-            }
-        }
-        return [
-            cacheMap,
-            core.validatePK(ret, pkType)
-        ];
-    };
-    const one = async (query = {}, locations = [])=>{
-        logger$3.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 httpApi.NotFoundError) ; else {
-                throw e;
-            }
-        }
-        return [
-            cacheMap,
-            retItem ? core.validatePK(retItem, pkType) : null
-        ];
-    };
-    const action = async (key, action, body = {})=>{
-        logger$3.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 (!core.isValidItemKey(key)) {
-            logger$3.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,
-            core.validatePK(updated, pkType)
-        ];
-    };
-    const allAction = async (action, body = {}, locations = [])=>{
-        logger$3.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 httpApi.NotFoundError) ; else {
-                throw e;
-            }
-        }
-        return [
-            cacheMap,
-            core.validatePK(ret, pkType)
-        ];
-    };
-    const allFacet = async (facet, params = {}, locations = [])=>{
-        logger$3.default('allFacet', {
-            facet,
-            params,
-            locations
-        });
-        const ret = await api.allFacet(facet, params, locations);
-        return [
-            cacheMap,
-            ret
-        ];
-    };
-    const create = async (v, locations = [])=>{
-        logger$3.default('create', {
-            v,
-            locations
-        });
-        const created = await api.create(v, locations);
-        cacheMap.set(created.key, created);
-        return [
-            cacheMap,
-            core.validatePK(created, pkType)
-        ];
-    };
-    const get = async (key)=>{
-        logger$3.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 (!core.isValidItemKey(key)) {
-            logger$3.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$3.error("Error getting item for key", {
-                key,
-                message: e.message,
-                stack: e.stack
-            });
-            throw e;
-        }
-        return [
-            cacheMap,
-            ret ? core.validatePK(ret, pkType) : null
-        ];
-    };
-    const retrieve = async (key)=>{
-        logger$3.default('retrieve', {
-            key
-        });
-        if (!core.isValidItemKey(key)) {
-            logger$3.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$3.default('Looking for Object in Cache', key);
-            retrieved = cacheMap.get(key);
-        } else {
-            logger$3.default('Object Not Found in Cache, Retrieving from Server API', {
-                key
-            });
-            [, retrieved] = await get(key);
-        }
-        const retValue = [
-            containsItemKey ? null : cacheMap,
-            retrieved ? core.validatePK(retrieved, pkType) : null
-        ];
-        // logger.debug('Returning from retrieve', { retValue });
-        return retValue;
-    };
-    const remove = async (key)=>{
-        logger$3.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 (!core.isValidItemKey(key)) {
-            logger$3.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$3.error("Error deleting item", {
-                error: e
-            });
-            throw e;
-        }
-        return cacheMap;
-    };
-    const update = async (key, v)=>{
-        logger$3.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 (!core.isValidItemKey(key)) {
-            logger$3.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,
-                core.validatePK(updated, pkType)
-            ];
-        } catch (e) {
-            logger$3.error("Error updating chat", {
-                error: e
-            });
-            throw e;
-        }
-    };
-    // Facets are a pass-thru for caches
-    const facet = async (key, facet, params = {})=>{
-        logger$3.default('facet', {
-            key,
-            facet
-        });
-        const ret = await api.facet(key, facet, params);
-        return [
-            cacheMap,
-            ret
-        ];
-    };
-    const find = async (finder, params = {}, locations = [])=>{
-        logger$3.default('find', {
-            finder,
-            params,
-            locations
-        });
-        const ret = await api.find(finder, params, locations);
-        ret.forEach((v)=>{
-            cacheMap.set(v.key, v);
-        });
-        return [
-            cacheMap,
-            core.validatePK(ret, pkType)
-        ];
-    };
-    const findOne = async (finder, finderParams = {}, locations = [])=>{
-        logger$3.default('findOne', {
-            finder,
-            finderParams,
-            locations
-        });
-        const ret = await api.findOne(finder, finderParams, locations);
-        cacheMap.set(ret.key, ret);
-        return [
-            cacheMap,
-            core.validatePK(ret, pkType)
-        ];
-    };
-    const reset = async ()=>{
-        cacheMap = new CacheMap(pkTypes);
-        return [
-            cacheMap
-        ];
-    };
-    const set = async (key, v)=>{
-        logger$3.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 (!core.isValidItemKey(key)) {
-            logger$3.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.
-        core.validatePK(v, pkType);
-        if (!isItemKeyEqualNormalized(key, v.key)) {
-            logger$3.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,
-            core.validatePK(v, pkType)
-        ];
-    };
-    return {
-        all,
-        one,
-        action,
-        allAction,
-        allFacet,
-        create,
-        get,
-        retrieve,
-        remove,
-        update,
-        facet,
-        find,
-        findOne,
-        reset,
-        set,
-        pkTypes,
+    // Validate the item's primary key
+    core.validatePK(v, pkType);
+    if (!isItemKeyEqualNormalized(key, v.key)) {
+        logger$4.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,
+        core.validatePK(v, pkType)
+    ];
+};
+
+const reset = async (coordinate)=>{
+    const cacheMap = new CacheMap(coordinate.kta);
+    return [
         cacheMap
+    ];
+};
+
+// Import all operation functions
+const createOperations = (api, coordinate, cacheMap, pkType)=>{
+    return {
+        all: (query, locations)=>all(api, cacheMap, pkType, query, locations),
+        one: (query, locations)=>one(api, cacheMap, pkType, query, locations),
+        create: (item, locations)=>create(api, cacheMap, pkType, item, locations),
+        get: (key)=>get.get(api, cacheMap, pkType, key),
+        retrieve: (key)=>retrieve(api, cacheMap, pkType, key),
+        remove: (key)=>remove(api, cacheMap, key),
+        update: (key, item)=>update(api, cacheMap, pkType, key, item),
+        action: (key, actionName, body)=>action(api, cacheMap, pkType, key, actionName, body),
+        allAction: (actionName, body, locations)=>allAction(api, cacheMap, pkType, actionName, body, locations),
+        facet: (key, facetName, params)=>facet(api, cacheMap, key, facetName, params),
+        allFacet: (facetName, params, locations)=>allFacet(api, cacheMap, facetName, params, locations),
+        find: (finder, params, locations)=>find(api, cacheMap, pkType, finder, params, locations),
+        findOne: (finder, params, locations)=>findOne(api, cacheMap, pkType, finder, params, locations),
+        set: (key, item)=>set(cacheMap, pkType, key, item),
+        reset: ()=>reset(coordinate)
     };
 };
 
-const logger$2 = LibLogger.get("Instance");
-const createInstance = (registry$1, coordinate, cache)=>{
-    logger$2.debug("createInstance", {
+const logger$3 = logger$1.default.get('Cache');
+const createCache = async (api, coordinate, registry)=>{
+    logger$3.debug('createCache', {
         coordinate,
-        cache,
-        registry: registry$1
+        registry
     });
-    const baseInstance = registry.createInstance(registry$1, coordinate);
+    // Create the cache map using the coordinate's key type array
+    const cacheMap = new CacheMap(coordinate.kta);
+    // Get the primary key type from the coordinate
+    const pkType = coordinate.kta[0];
+    // Create operations
+    const operations = createOperations(api, coordinate, cacheMap, pkType);
     return {
-        ...baseInstance,
-        cache
+        coordinate,
+        registry,
+        api,
+        cacheMap,
+        operations
     };
 };
+const isCache = (cache)=>{
+    return cache !== null && typeof cache === 'object' && 'coordinate' in cache && 'registry' in cache && 'api' in cache && 'cacheMap' in cache && 'operations' in cache;
+};
+
+const logger$2 = logger$1.default.get("Instance");
+const createInstance = async (registry, coordinate, api)=>{
+    logger$2.debug("createInstance", {
+        coordinate,
+        api,
+        registry
+    });
+    return await createCache(api, coordinate, registry);
+};
 const isInstance = (instance)=>{
-    return instance !== null && instance !== undefined && instance.coordinate !== undefined && instance.cache !== undefined && instance.registry !== undefined;
+    return instance !== null && typeof instance === 'object' && 'coordinate' in instance && 'registry' in instance && 'api' in instance && 'cacheMap' in instance && 'operations' in instance;
 };
 
-const logger$1 = LibLogger.get("InstanceFactory");
+const logger$1 = logger$1.default.get("InstanceFactory");
 /**
  * Factory function for creating cache instances
- */ const createInstanceFactory = (cache)=>{
+ */ const createInstanceFactory = (api)=>{
     return (coordinate, context)=>{
         logger$1.debug("Creating cache instance", {
             coordinate,
             registry: context.registry,
-            cache
-        });
-        return createInstance(context.registry, coordinate, cache);
+            api
+        });
+        // Since InstanceFactory must be synchronous but our createInstance is async,
+        // we need to create a special cache instance synchronously and defer the async initialization
+        const cacheMap = new CacheMap(coordinate.kta);
+        const pkType = coordinate.kta[0];
+        const operations = createOperations(api, coordinate, cacheMap, pkType);
+        return {
+            coordinate,
+            registry: context.registry,
+            api,
+            cacheMap,
+            operations
+        };
     };
 };
 
-const logger = LibLogger.get("Registry");
+const logger = logger$1.default.get("Registry");
 /**
  * Factory function for creating cache registries
  */ const createRegistryFactory = ()=>{
@@ -886,8 +931,10 @@ exports.createAggregator = createAggregator;
 exports.createCache = createCache;
 exports.createInstance = createInstance;
 exports.createInstanceFactory = createInstanceFactory;
+exports.createOperations = createOperations;
 exports.createRegistry = createRegistry;
 exports.createRegistryFactory = createRegistryFactory;
+exports.isCache = isCache;
 exports.isInstance = isInstance;
 exports.toCacheConfig = toCacheConfig;
 //# sourceMappingURL=index.cjs.map