@fjell/cache 4.7.10 → 4.7.11

package/dist/index.js

@@ -957,15 +957,36 @@ import {
 import { NotFoundError as NotFoundError3 } from "@fjell/http-api";
 var logger9 = logger_default.get("allAction");
 var allAction = async (action2, body = {}, locations = [], context) => {
-  const { api, cacheMap, pkType } = context;
+  const { api, cacheMap, pkType, eventEmitter } = context;
   logger9.default("allAction", { action: action2, body, locations });
+  const existingItems = [];
+  if (locations && locations.length > 0) {
+    try {
+      const cachedItems = await cacheMap.allIn(locations);
+      if (cachedItems) {
+        existingItems.push(...cachedItems);
+      }
+    } catch (error) {
+      logger9.debug("Could not retrieve existing items for comparison", { error });
+    }
+  }
   logger9.debug("Invalidating location before allAction", { locations });
-  cacheMap.invalidateLocation(locations);
+  await cacheMap.invalidateLocation(locations);
   let ret = [];
   try {
     ret = await api.allAction(action2, body, locations);
     logger9.debug("Caching allAction results", { resultCount: ret.length });
+    const modifiedItems = [];
+    const newItems = [];
     for (const v of ret) {
+      const existedBefore = existingItems.some(
+        (existing) => JSON.stringify(existing.key) === JSON.stringify(v.key)
+      );
+      if (existedBefore) {
+        modifiedItems.push(v);
+      } else {
+        newItems.push(v);
+      }
       await cacheMap.set(v.key, v);
       const keyStr = JSON.stringify(v.key);
       context.ttlManager.onItemAdded(keyStr, cacheMap);
@@ -975,6 +996,55 @@ var allAction = async (action2, body = {}, locations = [], context) => {
         await cacheMap.delete(parsedKey);
       }
     }
+    for (const item of modifiedItems) {
+      logger9.debug("Emitting item_updated event for modified item", { key: item.key });
+      const itemEvent = CacheEventFactory.itemUpdated(
+        item.key,
+        item,
+        null,
+        // We don't have the previous item state
+        "operation"
+      );
+      eventEmitter.emit(itemEvent);
+    }
+    for (const item of newItems) {
+      logger9.debug("Emitting item_created event for new item", { key: item.key });
+      const itemEvent = CacheEventFactory.itemCreated(
+        item.key,
+        item,
+        "operation"
+      );
+      eventEmitter.emit(itemEvent);
+    }
+    if (modifiedItems.length > 0) {
+      const modifiedKeys = modifiedItems.map((item) => item.key);
+      logger9.debug("Invalidating individual item keys for modified items", {
+        keyCount: modifiedKeys.length,
+        keys: modifiedKeys
+      });
+      await cacheMap.invalidateItemKeys(modifiedKeys);
+    }
+    await cacheMap.clearQueryResults();
+    logger9.debug("Emitting query_invalidated event after allAction", {
+      eventType: "query_invalidated",
+      reason: "item_changed",
+      action: action2,
+      modifiedCount: modifiedItems.length,
+      newCount: newItems.length
+    });
+    const queryInvalidatedEvent = CacheEventFactory.createQueryInvalidatedEvent(
+      [],
+      // We don't track which specific queries were invalidated
+      "item_changed",
+      {
+        source: "operation",
+        context: {
+          operation: "allAction",
+          requestId: `allAction_${action2}_${Date.now()}`
+        }
+      }
+    );
+    eventEmitter.emit(queryInvalidatedEvent);
   } catch (e) {
     if (e instanceof NotFoundError3) {
     } else {
@@ -1008,7 +1078,7 @@ import {
 } from "@fjell/core";
 var logger12 = logger_default.get("find");
 var find = async (finder, params = {}, locations = [], context) => {
-  const { api, cacheMap, pkType, ttlManager } = context;
+  const { api, cacheMap, pkType, ttlManager, eventEmitter } = context;
   logger12.default("find", { finder, params, locations });
   const queryHash = createFinderHash(finder, params, locations);
   logger12.debug("Generated query hash for find", { queryHash });
@@ -1033,6 +1103,22 @@ var find = async (finder, params = {}, locations = [], context) => {
       cacheMap.deleteQueryResult(queryHash);
     }
   }
+  if (!cachedItemKeys) {
+    try {
+      const directCachedItems = await cacheMap.queryIn(params, locations);
+      if (directCachedItems && directCachedItems.length > 0) {
+        logger12.debug("Found items directly in cache, skipping API call", { itemCount: directCachedItems.length });
+        const itemKeys2 = directCachedItems.map((item) => item.key);
+        await cacheMap.setQueryResult(queryHash, itemKeys2);
+        logger12.debug("Cached query result from direct cache hit", { queryHash, itemKeyCount: itemKeys2.length });
+        const event2 = CacheEventFactory.createQueryEvent(params, locations, directCachedItems);
+        eventEmitter.emit(event2);
+        return [context, validatePK9(directCachedItems, pkType)];
+      }
+    } catch (error) {
+      logger12.debug("Error querying cache directly, proceeding to API", { error });
+    }
+  }
   const ret = await api.find(finder, params, locations);
   for (const v of ret) {
     await cacheMap.set(v.key, v);
@@ -1047,6 +1133,8 @@ var find = async (finder, params = {}, locations = [], context) => {
   const itemKeys = ret.map((item) => item.key);
   cacheMap.setQueryResult(queryHash, itemKeys);
   logger12.debug("Cached query result", { queryHash, itemKeyCount: itemKeys.length });
+  const event = CacheEventFactory.createQueryEvent(params, locations, ret);
+  eventEmitter.emit(event);
   return [context, validatePK9(ret, pkType)];
 };
 
@@ -1056,7 +1144,7 @@ import {
 } from "@fjell/core";
 var logger13 = logger_default.get("findOne");
 var findOne = async (finder, finderParams = {}, locations = [], context) => {
-  const { api, cacheMap, pkType, ttlManager } = context;
+  const { api, cacheMap, pkType, ttlManager, eventEmitter } = context;
   logger13.default("findOne", { finder, finderParams, locations });
   const queryHash = createFinderHash(finder, finderParams, locations);
   logger13.debug("Generated query hash for findOne", { queryHash });
@@ -1071,6 +1159,22 @@ var findOne = async (finder, finderParams = {}, locations = [], context) => {
       cacheMap.deleteQueryResult(queryHash);
     }
   }
+  if (!cachedItemKeys || cachedItemKeys.length === 0) {
+    try {
+      const directCachedItems = await cacheMap.queryIn(finderParams, locations);
+      if (directCachedItems && directCachedItems.length > 0) {
+        logger13.debug("Found items directly in cache, skipping API call", { itemCount: directCachedItems.length });
+        const firstItem = directCachedItems[0];
+        await cacheMap.setQueryResult(queryHash, [firstItem.key]);
+        logger13.debug("Cached query result from direct cache hit", { queryHash, itemKey: firstItem.key });
+        const event2 = CacheEventFactory.createQueryEvent(finderParams, locations, [firstItem]);
+        eventEmitter.emit(event2);
+        return [context, validatePK10(firstItem, pkType)];
+      }
+    } catch (error) {
+      logger13.debug("Error querying cache directly, proceeding to API", { error });
+    }
+  }
   const ret = await api.findOne(finder, finderParams, locations);
   cacheMap.set(ret.key, ret);
   const keyStr = JSON.stringify(ret.key);
@@ -1082,6 +1186,8 @@ var findOne = async (finder, finderParams = {}, locations = [], context) => {
   }
   cacheMap.setQueryResult(queryHash, [ret.key]);
   logger13.debug("Cached query result", { queryHash, itemKey: ret.key });
+  const event = CacheEventFactory.createQueryEvent(finderParams, locations, [ret]);
+  eventEmitter.emit(event);
   return [context, validatePK10(ret, pkType)];
 };
 

package/dist/ops/allAction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"allAction.d.ts","sourceRoot":"","sources":["../../src/ops/allAction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,WAAW,EAEZ,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAK/C,eAAO,MAAM,SAAS,GACpB,CAAC,SAAS,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EACrC,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EAEzB,QAAQ,MAAM,EACd,MAAM,GAAG,YAAK,EACd,YAAW,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,aAAK,EACpD,SAAS,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,KAC9C,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAsCvD,CAAC"}
+{"version":3,"file":"allAction.d.ts","sourceRoot":"","sources":["../../src/ops/allAction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,WAAW,EAEZ,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAM/C,eAAO,MAAM,SAAS,GACpB,CAAC,SAAS,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EACrC,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EAEzB,QAAQ,MAAM,EACd,MAAM,GAAG,YAAK,EACd,YAAW,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,aAAK,EACpD,SAAS,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,KAC9C,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAiIvD,CAAC"}

package/dist/ops/find.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../src/ops/find.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,WAAW,EAEZ,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAM/C,eAAO,MAAM,IAAI,GACf,CAAC,SAAS,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EACrC,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EAEzB,QAAQ,MAAM,EACd,QAAQ,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC,CAAC,YAAK,EACvG,YAAW,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,aAAK,EACpD,SAAS,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,KAC9C,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CA6DvD,CAAC"}
+{"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../src/ops/find.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,WAAW,EAEZ,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAO/C,eAAO,MAAM,IAAI,GACf,CAAC,SAAS,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EACrC,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EAEzB,QAAQ,MAAM,EACd,QAAQ,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC,CAAC,YAAK,EACvG,YAAW,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,aAAK,EACpD,SAAS,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,KAC9C,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CA0FvD,CAAC"}

package/dist/ops/findOne.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"findOne.d.ts","sourceRoot":"","sources":["../../src/ops/findOne.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,WAAW,EAEZ,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAM/C,eAAO,MAAM,OAAO,GAClB,CAAC,SAAS,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EACrC,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EAEzB,QAAQ,MAAM,EACd,cAAc,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC,CAAC,YAAK,EAC7G,YAAW,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,aAAK,EACpD,SAAS,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,KAC9C,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CA8CrD,CAAC"}
+{"version":3,"file":"findOne.d.ts","sourceRoot":"","sources":["../../src/ops/findOne.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,IAAI,EACJ,WAAW,EAEZ,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAO/C,eAAO,MAAM,OAAO,GAClB,CAAC,SAAS,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EACrC,CAAC,SAAS,MAAM,EAChB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EACzB,EAAE,SAAS,MAAM,GAAG,KAAK,EAEzB,QAAQ,MAAM,EACd,cAAc,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,IAAI,CAAC,CAAC,YAAK,EAC7G,YAAW,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,GAAG,EAAE,aAAK,EACpD,SAAS,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,KAC9C,OAAO,CAAC,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CA2ErD,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fjell/cache",
   "description": "Cache for Fjell",
-  "version": "4.7.10",
+  "version": "4.7.11",
   "keywords": [
     "cache",
     "fjell"
@@ -36,11 +36,11 @@
     "docs:test": "cd docs && npm run test"
   },
   "dependencies": {
-    "@fjell/client-api": "^4.4.27",
+    "@fjell/client-api": "^4.4.28",
     "@fjell/core": "^4.4.38",
     "@fjell/http-api": "^4.4.36",
     "@fjell/logging": "^4.4.44",
-    "@fjell/registry": "^4.4.32",
+    "@fjell/registry": "^4.4.33",
     "fast-safe-stringify": "^2.1.1",
     "flatted": "^3.3.3"
   },

package/debug-test.js

@@ -1,64 +0,0 @@
-import { MemoryCacheMap } from './dist/index.js';
-
-// Test data types
-const priKey1 = { kt: 'test', pk: '1' };
-const comKey1 = {
-  kt: 'test',
-  pk: '3',
-  loc: [{ kt: 'container', lk: 'container1' }]
-};
-
-// Create cache map
-const cacheMap = new MemoryCacheMap(['test', 'container']);
-
-// Add test items
-await cacheMap.set(priKey1, { key: priKey1, id: '1', name: 'Item 1', value: 100 });
-await cacheMap.set(comKey1, { key: comKey1, id: '3', name: 'Item 3', value: 300 });
-
-// Set query result
-const queryHash = 'test_query';
-cacheMap.setQueryResult(queryHash, [priKey1, comKey1]);
-
-console.log('Before invalidation:');
-console.log('Query result exists:', await cacheMap.hasQueryResult(queryHash));
-console.log('priKey1 exists:', await cacheMap.includesKey(priKey1));
-console.log('comKey1 exists:', await cacheMap.includesKey(comKey1));
-
-// Check the query result content
-const queryResult = await cacheMap.getQueryResult(queryHash);
-console.log('Query result content:', queryResult);
-
-// Check the internal query result cache
-console.log('Internal query result cache keys:', Object.keys(cacheMap.queryResultCache || {}));
-
-// Invalidate location
-const location = [{ kt: 'container', lk: 'container1' }];
-console.log('\nInvalidating location:', location);
-
-// Check what keys will be invalidated
-const itemsInLocation = await cacheMap.allIn(location);
-console.log('Items in location:', itemsInLocation);
-const keysToInvalidate = itemsInLocation.map(item => item.key);
-console.log('Keys to invalidate:', keysToInvalidate);
-
-await cacheMap.invalidateLocation(location);
-
-console.log('\nAfter invalidation:');
-console.log('Query result exists:', await cacheMap.hasQueryResult(queryHash));
-console.log('priKey1 exists:', await cacheMap.includesKey(priKey1));
-console.log('comKey1 exists:', await cacheMap.includesKey(comKey1));
-
-// Check what keys were actually invalidated
-console.log('\nAll keys after invalidation:', await cacheMap.keys());
-
-// Check if the query result was modified
-const queryResultAfter = await cacheMap.getQueryResult(queryHash);
-console.log('Query result content after:', queryResultAfter);
-
-// Check the internal query result cache again
-console.log('Internal query result cache keys after:', Object.keys(cacheMap.queryResultCache || {}));
-
-// Try to manually delete the query result to see if that works
-console.log('\nManually deleting query result...');
-await cacheMap.deleteQueryResult(queryHash);
-console.log('Query result exists after manual deletion:', await cacheMap.hasQueryResult(queryHash));