@fjell/cache 4.6.4 → 4.6.5

package/package.json

@@ -1,7 +1,11 @@
 {
   "name": "@fjell/cache",
   "description": "Cache for Fjell",
-  "version": "4.6.4",
+  "version": "4.6.5",
+  "keywords": [
+    "cache",
+    "fjell"
+  ],
   "license": "Apache-2.0",
   "type": "module",
   "main": "./dist/index.cjs.js",
@@ -15,39 +19,32 @@
     }
   },
   "dependencies": {
-    "@fjell/client-api": "^4.4.4",
-    "@fjell/core": "^4.4.5",
-    "@fjell/http-api": "^4.4.3",
-    "@fjell/logging": "^4.4.5",
-    "d3": "^7.9.0",
-    "dayjs": "^1.11.13",
-    "react": "19.1.0"
+    "@fjell/client-api": "^4.4.5",
+    "@fjell/core": "^4.4.6",
+    "@fjell/http-api": "^4.4.4",
+    "@fjell/logging": "^4.4.6"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.27.2",
-    "@babel/preset-typescript": "^7.27.1",
     "@eslint/eslintrc": "^3.3.1",
-    "@eslint/js": "^9.30.0",
-    "@swc/core": "^1.12.7",
+    "@eslint/js": "^9.30.1",
+    "@swc/core": "^1.12.11",
     "@tsconfig/recommended": "^1.0.10",
-    "@types/babel__preset-env": "^7.10.0",
-    "@types/d3": "^7.4.3",
-    "@types/multer": "^1.4.13",
-    "@types/node": "^24.0.7",
-    "@typescript-eslint/eslint-plugin": "^8.35.0",
-    "@typescript-eslint/parser": "^8.35.0",
+    "@types/multer": "^2.0.0",
+    "@types/node": "^24.0.12",
+    "@typescript-eslint/eslint-plugin": "^8.36.0",
+    "@typescript-eslint/parser": "^8.36.0",
     "@vitest/coverage-v8": "^3.2.4",
     "@vitest/ui": "^3.2.4",
     "concurrently": "^9.2.0",
-    "eslint": "^9.30.0",
+    "eslint": "^9.30.1",
     "nodemon": "^3.1.10",
     "rimraf": "^6.0.1",
     "ts-node": "^10.9.2",
     "tsc-alias": "^1.8.16",
     "typescript": "^5.8.3",
-    "vite": "^7.0.0",
+    "vite": "^7.0.3",
     "vite-plugin-dts": "^4.5.4",
-    "vite-plugin-node": "^5.0.1",
+    "vite-plugin-node": "^7.0.0",
     "vitest": "^3.2.4"
   },
   "repository": {

package/.kodrdriv/config.yaml

@@ -1,14 +0,0 @@
-verbose: false
-model: gpt-4.1
-contextDirectories:
-  - .kodrdriv/context
-commit:
-  add: true
-  cached: true
-  sendit: true
-release:
-  from: main
-  to: HEAD
-publish:
-  mergeMethod: squash
-  dependencyUpdatePatterns: ["@fjell/*"]

package/.kodrdriv/context/content.md

@@ -1 +0,0 @@
-This is the Fjell Library for Client-side Caches

package/commit.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-set -e
-
-echo "Staging all changes..."
-git add .
-
-echo "Running kodrdriv commit..."
-pnpm dlx @eldrforge/kodrdriv commit 

package/release.sh

@@ -1,89 +0,0 @@
-#!/bin/bash
-set -e
-
-
-echo "Preparing for release: switching from workspace to remote dependencies."
-if [ -f "pnpm-workspace.yaml" ]; then
-    echo "Renaming pnpm-workspace.yaml to prevent workspace-protocol resolution"
-    mv pnpm-workspace.yaml pnpm-workspace.yaml.bak
-else
-    echo "pnpm-workspace.yaml not found, skipping rename."
-fi
-
-echo "Updating dependencies to latest versions from registry"
-pnpm update --latest
-
-echo "Staging changes for release commit"
-git add package.json pnpm-lock.yaml
-
-echo "Running clean, lint, build, and test..."
-pnpm run clean && pnpm run lint && pnpm run build && pnpm run test
-
-if git diff --staged --quiet; then
-  echo "No changes to commit, skipping commit."
-else
-  ./commit.sh
-fi
-
-echo "Bumping version..."
-pnpm version patch
-
-echo "Generating release notes..."
-pnpm dlx @eldrforge/kodrdriv release > RELEASE_NOTES.md
-
-echo "Pushing to origin..."
-git push --follow-tags
-
-echo "Creating GitHub pull request..."
-PR_URL=$(gh pr create --fill)
-PR_NUM=$(echo "$PR_URL" | grep -o '[0-9]*$')
-echo "Pull request created: $PR_URL"
-
-echo "Waiting for PR #$PR_NUM checks to complete..."
-while true; do
-  STATUS=$(gh pr view "$PR_NUM" --json statusCheckRollup --jq '.statusCheckRollup.state' 2>/dev/null)
-  if [[ -z "$STATUS" ]]; then
-    STATUS="PENDING"
-  fi
-  echo "PR status: $STATUS"
-  if [[ "$STATUS" == "SUCCESS" ]]; then
-    echo "All checks passed!"
-    break
-  elif [[ "$STATUS" == "FAILURE" || "$STATUS" == "ERROR" ]]; then
-    echo "PR checks failed."
-    gh pr checks "$PR_NUM"
-    exit 1
-  elif [[ "$STATUS" == "PENDING" || "$STATUS" == "EXPECTED" ]]; then
-    echo "Checks are pending... waiting 10 seconds."
-    sleep 10
-  else
-    echo "Unknown PR status: $STATUS. Waiting 10 seconds."
-    sleep 10
-  fi
-done
-
-echo "Merging PR #$PR_NUM..."
-gh pr merge "$PR_NUM" --squash --delete-branch
-
-echo "Checking out main branch..."
-git checkout main
-git pull origin main
-
-echo "Creating GitHub release..."
-TAG_NAME="v$(jq -r .version package.json)"
-gh release create "$TAG_NAME" --notes-file RELEASE_NOTES.md
-
-echo "Creating next release branch..."
-CURRENT_VERSION=$(jq -r .version package.json)
-MAJOR=$(echo "$CURRENT_VERSION" | cut -d. -f1)
-MINOR=$(echo "$CURRENT_VERSION" | cut -d. -f2)
-PATCH=$(echo "$CURRENT_VERSION" | cut -d. -f3)
-NEXT_PATCH=$((PATCH + 1))
-NEXT_VERSION="$MAJOR.$MINOR.$NEXT_PATCH"
-
-echo "Next version is $NEXT_VERSION"
-git checkout -b "release/v$NEXT_VERSION"
-git commit -m "feat: Start release v$NEXT_VERSION"
-git push -u origin "release/v$NEXT_VERSION"
-
-echo "Release process completed."

package/src/Aggregator.ts

@@ -1,330 +0,0 @@
-/* eslint-disable no-undefined */
-import {
-  ComKey,
-  Item,
-  ItemQuery,
-  LocKeyArray,
-  PriKey
-} from "@fjell/core";
-import { Cache } from "./Cache";
-import { CacheMap } from "./CacheMap";
-import LibLogger from "./logger";
-
-const logger = LibLogger.get('ItemAggregator');
-
-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 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 => {
-  let cacheConfig: CacheConfig;
-  if ((config as CacheConfig).optional === undefined) {
-    cacheConfig = { cache: config as any, optional: false };
-  } else {
-    cacheConfig = config as CacheConfig;
-  }
-  return cacheConfig;
-}
-
-export const createAggregator = async <
-  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
-    }
-): Promise<Aggregator<V, S, L1, L2, L3, L4, L5>> => {
-
-  const populate = async (item: V): Promise<V> => {
-    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: string, item: V) => {
-    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.events && Object.prototype.hasOwnProperty.call(item.events, key)) {
-          delete item.events[key];
-        }
-      }
-    } 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 {
-        if (item.events && Object.prototype.hasOwnProperty.call(item.events, key)) {
-          delete item.events[key];
-        }
-      }
-    } 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 as Item,
-        };
-      }
-    }
-  }
-
-  // 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: string, item: V) => {
-    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 as Item;
-      }
-    }
-  }
-
-  const all = async (
-    query: ItemQuery = {},
-    locations: LocKeyArray<L1, L2, L3, L4, L5> | [] = []
-  ):
-    Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V[]]> => {
-    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: ItemQuery = {},
-    locations: LocKeyArray<L1, L2, L3, L4, L5> | [] = []
-  ):
-    Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V | null]> => {
-    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: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
-    action: string,
-    body: any = {},
-  ): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V]> => {
-    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: string,
-    body: any = {},
-    locations: LocKeyArray<L1, L2, L3, L4, L5> | [] = []
-  ): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V[]]> => {
-    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 allFacet = async (
-    facet: string,
-    params: 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>, any]> => {
-    logger.default('allFacet', { facet, params, locations });
-    const [cacheMap, response] = await cache.allFacet(facet, params, locations);
-    return [cacheMap, response];
-  }
-
-  const create = async (
-    v: Partial<Item<S, L1, L2, L3, L4, L5>>,
-    locations: LocKeyArray<L1, L2, L3, L4, L5> | [] = []
-  ): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V]> => {
-    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: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
-  ): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V | null]> => {
-    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: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
-  ): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5> | null, V | null]> => {
-    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: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
-  ): Promise<CacheMap<V, S, L1, L2, L3, L4, L5>> => {
-    logger.default('remove', { key });
-    const cacheMap = await cache.remove(key);
-    return cacheMap;
-  }
-
-  const update = async (
-    key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
-    v: Partial<Item<S, L1, L2, L3, L4, L5>>,
-  ): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V]> => {
-    logger.default('update', { key, v });
-    const [cacheMap, item] = await cache.update(key, v);
-    const populatedItem = await populate(item);
-    return [cacheMap, populatedItem];
-  }
-
-  // Facets are a pass-thru for aggregators
-  const facet = async (
-    key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
-    facet: string,
-  ): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, any]> => {
-    logger.default('facet', { key, facet });
-    const [cacheMap, response] = await cache.facet(key, facet);
-    return [cacheMap, response];
-  }
-
-  const find = async (
-    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[]]> => {
-    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 findOne = async (
-    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]> => {
-    logger.default('find', { finder, finderParams, locations });
-    const [cacheMap, item] = await cache.findOne(finder, finderParams, locations);
-    const populatedItem = await populate(item);
-    return [cacheMap, populatedItem];
-  }
-
-  const set = async (
-    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]> => {
-    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 (): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>]> => {
-    const cacheMap = await cache.reset();
-    return cacheMap;
-  }
-
-  return {
-    all,
-    one,
-    action,
-    allAction,
-    allFacet,
-    create,
-    get,
-    retrieve,
-    remove,
-    update,
-    facet,
-    find,
-    findOne,
-    reset,
-    set,
-    pkTypes: cache.pkTypes,
-    cacheMap: cache.cacheMap,
-    populate,
-    populateAggregate,
-    populateEvent
-  }
-}

package/src/Cache.ts

@@ -1,428 +0,0 @@
-import {
-  AllItemTypeArrays,
-  ComKey,
-  isItemKeyEqual,
-  isValidItemKey,
-  Item,
-  ItemQuery,
-  LocKeyArray,
-  PriKey,
-  validatePK
-} from "@fjell/core";
-import { CacheMap } from "./CacheMap";
-import LibLogger from "./logger";
-
-import { ClientApi } from "@fjell/client-api";
-import { NotFoundError } from "@fjell/http-api";
-
-const logger = LibLogger.get('Cache');
-
-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]>
-
-  action: (
-    key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
-    action: string,
-    body?: any,
-  ) => Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V]>
-
-  allAction: (
-    action: string,
-    body?: any,
-    locations?: LocKeyArray<L1, L2, L3, L4, L5> | []
-  ) => Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V[]]>
-
-  allFacet: (
-    facet: string,
-    params?: 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>, any]>;
-
-  create: (
-    item: Partial<Item<S, L1, L2, L3, L4, L5>>,
-    locations?: LocKeyArray<L1, L2, L3, L4, L5> | []
-  ) => Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V]>;
-
-  get: (
-    key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
-  ) => Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V | null]>;
-
-  retrieve: (
-    key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
-  ) => Promise<[CacheMap<V, S, L1, L2, L3, L4, L5> | null, V | null]>;
-
-  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>,
-    item: Partial<Item<S, L1, L2, L3, L4, L5>>,
-  ) => Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V]>;
-
-  facet: (
-    key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
-    facet: string,
-    params?: Record<string, string | number | boolean | Date | Array<string | number | boolean | Date>>,
-  ) => Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, any]>;
-
-  find: (
-    finder: string,
-    params?: 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[]]>;
-
-  findOne: (
-    finder: string,
-    params?: 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>,
-    item: Item<S, L1, L2, L3, L4, L5>
-  ) => 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 const createCache = async <
-  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>
-): Promise<Cache<V, S, L1, L2, L3, L4, L5>> => {
-
-  let pkTypes: AllItemTypeArrays<S, L1, L2, L3, L4, L5> = [pkType];
-  if (parentCache) {
-    pkTypes = pkTypes.concat(parentCache.pkTypes as any) as unknown as AllItemTypeArrays<S, L1, L2, L3, L4, L5>;
-  }
-
-  let cacheMap: CacheMap<V, S, L1, L2, L3, L4, L5> =
-    new CacheMap<V, S, L1, L2, L3, L4, L5>(pkTypes as AllItemTypeArrays<S, L1, L2, L3, L4, L5>);
-
-  const all = async (
-    query: ItemQuery = {},
-    locations: LocKeyArray<L1, L2, L3, L4, L5> | [] = []
-  ):
-    Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V[]]> => {
-    logger.default('all', { query, locations });
-    let ret: V[] = [];
-    try {
-      ret = await api.all(query, locations);
-      ret.forEach((v) => {
-        cacheMap.set(v.key, v);
-      });
-    } catch (e: unknown) {
-      if (e instanceof NotFoundError) {
-      } else {
-        throw e;
-      }
-
-    }
-    return [cacheMap, validatePK(ret, pkType) as V[]];
-  }
-
-  const one = async (
-    query: ItemQuery = {},
-    locations: LocKeyArray<L1, L2, L3, L4, L5> | [] = []
-  ):
-    Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V | null]> => {
-    logger.default('one', { query, locations });
-
-    let retItem: V | null = null;
-    try {
-      retItem = await api.one(query, locations);
-      if (retItem) {
-        cacheMap.set(retItem.key, retItem);
-      }
-    } catch (e: unknown) {
-      if (e instanceof NotFoundError) {
-      } else {
-        throw e;
-      }
-
-    }
-    return [
-      cacheMap,
-      retItem ?
-        validatePK(retItem, pkType) as V :
-        null
-    ];
-  }
-
-  const action = async (
-    key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
-    action: string,
-    body: any = {},
-  ): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V]> => {
-    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) as V];
-  }
-
-  const allAction = async (
-    action: string,
-    body: any = {},
-    locations: LocKeyArray<L1, L2, L3, L4, L5> | [] = []
-  ): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V[]]> => {
-    logger.default('allAction', { action, body, locations });
-    let ret: V[] = [];
-    try {
-      ret = await api.allAction(action, body, locations);
-      ret.forEach((v) => {
-        cacheMap.set(v.key, v);
-      });
-    } catch (e: unknown) {
-      // istanbul ignore next
-      if (e instanceof NotFoundError) {
-      } else {
-        throw e;
-      }
-
-    }
-    return [cacheMap, validatePK(ret, pkType) as V[]];
-  }
-
-  const allFacet = async (
-    facet: string,
-    params: 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>, any]> => {
-    logger.default('allFacet', { facet, params, locations });
-    const ret = await api.allFacet(facet, params, locations);
-    return [cacheMap, ret];
-  }
-
-  const create = async (
-    v: Partial<Item<S, L1, L2, L3, L4, L5>>,
-    locations: LocKeyArray<L1, L2, L3, L4, L5> | [] = []
-  ): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V]> => {
-    logger.default('create', { v, locations });
-    const created = await api.create(v, locations);
-    cacheMap.set(created.key, created);
-    return [cacheMap, validatePK(created, pkType) as V];
-  }
-
-  const get = async (
-    key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
-  ): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, V | null]> => {
-    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: V | null;
-    try {
-      ret = await api.get(key);
-      if (ret) {
-        cacheMap.set(ret.key, ret);
-      }
-    } catch (e: any) {
-      logger.error("Error getting item for key", { key, message: e.message, stack: e.stack });
-      throw e;
-    }
-    return [
-      cacheMap,
-      ret ?
-        validatePK(ret, pkType) as V :
-        null
-    ];
-  }
-
-  const retrieve = async (
-    key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
-  ): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5> | null, V | null]> => {
-    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: V | null;
-    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: [CacheMap<V, S, L1, L2, L3, L4, L5> | null, V | null] = [
-      containsItemKey ? null : cacheMap,
-      retrieved ?
-        validatePK(retrieved, pkType) as V :
-        null
-    ];
-    // logger.debug('Returning from retrieve', { retValue });
-    return retValue;
-  }
-
-  const remove = async (
-    key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
-  ): Promise<CacheMap<V, S, L1, L2, L3, L4, L5>> => {
-    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: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
-    v: Partial<Item<S, L1, L2, L3, L4, L5>>,
-  ): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, 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) as V];
-    } catch (e) {
-      logger.error("Error updating chat", { error: e });
-      throw e;
-    }
-  }
-
-  // Facets are a pass-thru for caches
-  const facet = async (
-    key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
-    facet: string,
-    params: Record<string, string | number | boolean | Date | Array<string | number | boolean | Date>> = {},
-  ): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>, any]> => {
-    logger.default('facet', { key, facet });
-    const ret = await api.facet(key, facet, params);
-    return [cacheMap, ret];
-  }
-
-  const find = async (
-    finder: string,
-    params: 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[]]> => {
-    logger.default('find', { finder, params, locations });
-    const ret: V[] = await api.find(finder, params, locations);
-    ret.forEach((v) => {
-      cacheMap.set(v.key, v);
-    });
-    return [cacheMap, validatePK(ret, pkType) as V[]];
-  }
-
-  const findOne = async (
-    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]> => {
-    logger.default('findOne', { finder, finderParams, locations });
-    const ret = await api.findOne(finder, finderParams, locations);
-    cacheMap.set(ret.key, ret);
-    return [cacheMap, validatePK(ret, pkType) as V];
-  }
-
-  const reset = async (): Promise<[CacheMap<V, S, L1, L2, L3, L4, L5>]> => {
-    cacheMap = new CacheMap<V, S, L1, L2, L3, L4, L5>(pkTypes);
-    return [cacheMap];
-  }
-
-  const set = async (
-    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]> => {
-    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 as V);
-    return [cacheMap, validatePK(v, pkType) as V];
-  }
-
-  return {
-    all,
-    one,
-    action,
-    allAction,
-    allFacet,
-    create,
-    get,
-    retrieve,
-    remove,
-    update,
-    facet,
-    find,
-    findOne,
-    reset,
-    set,
-    pkTypes,
-    cacheMap
-  }
-}

package/src/CacheMap.ts

@@ -1,132 +0,0 @@
-import {
-  AllItemTypeArrays,
-  ComKey,
-  Dictionary,
-  isComKey,
-  isQueryMatch,
-  Item,
-  ItemQuery,
-  LocKeyArray,
-  PriKey
-} from "@fjell/core";
-import LibLogger from "./logger";
-
-const logger = LibLogger.get("CacheMap");
-
-// const isObj = (x: any) => typeof x === "object" && x !== null;
-
-// const intersection = (a: object, b: object): object => {
-//   const result: { [key: string]: any } = {}
-
-//   if (([a, b]).every(isObj)) {
-//     Object.keys(a).forEach((key) => {
-//       // @ts-ignore
-//       const value = a[key]
-//       // @ts-ignore
-//       const other = b[key]
-
-//       if (isObj(value)) {
-//         result[key] = intersection(value, other)
-//       } else if (value === other) {
-//         result[key] = value
-//       }
-//     })
-//   }
-
-//   return result
-// }
-
-// const removeEmptyObjects = (obj: object): object => {
-//   const result: { [key: string]: any } = {}
-
-//   Object.keys(obj).forEach((key) => {
-//     // @ts-ignore
-//     const value = obj[key];
-
-//     if (isObj(value)) {
-//       const nested = removeEmptyObjects(value);
-
-//       if (Object.keys(nested).length > 0) {
-//         result[key] = nested
-//       }
-//     } else if (value !== null) {
-//       result[key] = value
-//     }
-//   });
-
-//   return result;
-// }
-
-export class CacheMap<
-  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 Dictionary<ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>, V> {
-
-  private types: AllItemTypeArrays<S, L1, L2, L3, L4, L5>;
-
-  public constructor(
-    types: AllItemTypeArrays<S, L1, L2, L3, L4, L5>,
-    map?: { [key: string]: V },
-  ) {
-    super(map);
-    this.types = types;
-  }
-
-  public get(
-    key: ComKey<S, L1, L2, L3, L4, L5> | PriKey<S>,
-  ): V | null {
-    return super.get(key) as V | null;
-  }
-
-  public allIn(
-    locations: LocKeyArray<L1, L2, L3, L4, L5> | []
-  ): V[] {
-    if (locations.length === 0) {
-      logger.debug('Returning all items, LocKeys is empty');
-      return this.values();
-    } else {
-      const locKeys: LocKeyArray<L1, L2, L3, L4, L5> | [] = locations;
-      logger.debug('allIn', { locKeys, keys: this.keys().length });
-      return this.keys()
-        .filter((key) => key && isComKey(key))
-        .filter((key) => {
-          const ComKey = key as ComKey<S, L1, L2, L3, L4, L5>;
-          logger.debug('Comparing Location Keys', {
-            locKeys,
-            ComKey,
-          });
-          return JSON.stringify(locKeys) === JSON.stringify(ComKey.loc);
-        })
-        .map((key) => this.get(key) as V);
-    }
-  }
-
-  // TODO: Can we do case insensitive matching?
-  public contains(query: ItemQuery, locations: LocKeyArray<L1, L2, L3, L4, L5> | []): boolean {
-    logger.debug('contains', { query, locations });
-    const items = this.allIn(locations);
-
-    return items.some((item) => isQueryMatch(item, query));
-  }
-
-  public queryIn(
-    query: ItemQuery,
-    locations: LocKeyArray<L1, L2, L3, L4, L5> | [] = []
-  ): V[] {
-    logger.debug('queryIn', { query, locations });
-    const items = this.allIn(locations);
-
-    return items.filter((item) => isQueryMatch(item, query));
-  }
-
-  public clone(): CacheMap<V, S, L1, L2, L3, L4, L5> {
-    const clone = new CacheMap<V, S, L1, L2, L3, L4, L5>(this.types, this.map);
-    return clone;
-  }
-
-};

package/src/CacheRegistry.ts

@@ -1,66 +0,0 @@
-import { Item } from "@fjell/core";
-import { Cache } from "./Cache";
-import LibLogger from './logger';
-
-const logger = LibLogger.get('CacheRegistry');
-
-export class CacheRegistry {
-
-  private static instance: CacheRegistry;
-
-  public constructor() {
-    logger.debug('CacheRegistry instance created');
-  }
-
-  // TODO: My use of Generics has Boxed me into a corner where I can't reference AbstractCache without the types
-  private cacheMap: { [kt: string]: any } = {};
-
-  public registerCache = async <
-    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>): Promise<void> => {
-    try {
-      logger.debug('Attempting to register cache with pkTypes:', cache.pkTypes);
-      const key = JSON.stringify(cache.pkTypes);
-      if (this.cacheMap[key]) {
-        logger.debug(`Cache with pkTypes ${key} already exists, will be overwritten`);
-      }
-      this.cacheMap[key] = cache;
-      logger.debug('Cache registered successfully with key:', key);
-    } catch (error) {
-      logger.error('Failed to register cache:', error);
-      throw error;
-    }
-  };
-
-  public getCache = (kts: string[]): any => {
-    logger.debug('Attempting to get cache for key types:', kts);
-    
-    const key = JSON.stringify(kts);
-    logger.debug('Looking up cache with key:', key);
-    
-    const cache = this.cacheMap[key];
-    if (!cache) {
-      logger.warning(`No cache found for key types: ${key}`);
-    }
-    return cache;
-  };
-
-  public printRegisteredCaches = (): void => {
-    logger.debug('Printing all registered caches:');
-    const cacheCount = Object.keys(this.cacheMap).length;
-    logger.debug(`Total number of registered caches: ${cacheCount}`);
-    
-    if (cacheCount === 0) {
-      logger.debug('No caches are currently registered');
-    }
-    
-    Object.entries(this.cacheMap).forEach(([keyTypes]) => {
-      logger.debug(`Cache with key types: ${keyTypes}`);
-    });
-  };
-}

package/src/index.ts

@@ -1,4 +0,0 @@
-export * from './Aggregator';
-export * from './Cache';
-export * from './CacheMap';
-export * from './CacheRegistry';

package/src/logger.ts

@@ -1,5 +0,0 @@
-import Logging from '@fjell/logging';
-
-const LibLogger = Logging.getLogger('@fjell/cache');
-
-export default LibLogger;