@fjell/cache 4.7.11 → 4.7.13

package/dist/index.js

@@ -1081,10 +1081,10 @@ var find = async (finder, params = {}, locations = [], 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 });
+  logger12.debug("Generated query hash for find", { queryHash, finder, params, locations });
   const cachedItemKeys = await cacheMap.getQueryResult(queryHash);
   if (cachedItemKeys) {
-    logger12.debug("Using cached query results", { cachedKeyCount: cachedItemKeys.length });
+    logger12.debug("Using cached query results", { cachedKeyCount: cachedItemKeys.length, queryHash });
     const cachedItems = [];
     let allItemsAvailable = true;
     for (const itemKey of cachedItemKeys) {
@@ -1103,22 +1103,6 @@ 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);
@@ -1159,22 +1143,6 @@ 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);

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;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"}
+{"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,CAoEvD,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;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"}
+{"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,CAqDrD,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fjell/cache",
   "description": "Cache for Fjell",
-  "version": "4.7.11",
+  "version": "4.7.13",
   "keywords": [
     "cache",
     "fjell"
@@ -42,7 +42,8 @@
     "@fjell/logging": "^4.4.44",
     "@fjell/registry": "^4.4.33",
     "fast-safe-stringify": "^2.1.1",
-    "flatted": "^3.3.3"
+    "flatted": "^3.3.3",
+    "yocto-queue": "^1.2.1"
   },
   "devDependencies": {
     "@eslint/eslintrc": "^3.3.1",