@akanjs/nest 0.0.23 → 0.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/nest",
-  "version": "0.0.23",
+  "version": "0.0.24",
   "type": "commonjs",
   "publishConfig": {
     "access": "public"

package/src/interceptors.js

@@ -71,43 +71,39 @@ let CacheInterceptor = class {
     const signalKey = handler.name;
     const gqlMeta = (0, import_signal.getGqlMeta)(context.getClass(), signalKey);
     if (gqlMeta.type !== "Query" || !gqlMeta.signalOption.cache) {
-      if (gqlMeta.signalOption.cache) {
+      if (gqlMeta.signalOption.cache)
         __privateGet(this, _logger).warn(`CacheInterceptor: ${signalKey} is not Query endpoint or cache is not set`);
-      }
       return next.handle();
     }
     const args = (0, import_authGuards.getArgs)(context);
     const cacheKey = __privateMethod(this, _generateCacheKey, generateCacheKey_fn).call(this, signalKey, args);
-    try {
-      const cachedData = await __privateMethod(this, _getCache, getCache_fn).call(this, cacheKey);
-      if (cachedData) {
-        __privateGet(this, _logger).debug(`Cache hit for key: ${cacheKey}`);
-        const GlobalObservable = global.Observable ?? import_rxjs.Observable;
-        return new GlobalObservable((subscriber) => {
-          subscriber.next(cachedData);
-          subscriber.complete();
-        });
-      }
+    const cachedData = await __privateMethod(this, _getCache, getCache_fn).call(this, cacheKey);
+    if (cachedData) {
+      __privateGet(this, _logger).debug(`Cache hit for key: ${cacheKey}`);
       return next.handle().pipe(
-        (0, import_rxjs.map)((data) => {
-          const cacheDuration = gqlMeta.signalOption.cache;
-          if (typeof cacheDuration === "number") {
-            void __privateMethod(this, _setCache, setCache_fn).call(this, cacheKey, data, cacheDuration);
-            __privateGet(this, _logger).debug(`Cache set for key: ${cacheKey}`);
-          }
-          return data;
-        }),
+        (0, import_operators.map)(() => cachedData),
         (0, import_operators.catchError)((error) => {
           const errorMessage = error instanceof Error ? error.message : "Unknown error";
           __privateGet(this, _logger).error(`Error in cache interceptor for ${cacheKey}: ${errorMessage}`);
           return (0, import_rxjs.throwError)(() => error);
         })
       );
-    } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : "Unknown error";
-      __privateGet(this, _logger).error(`Cache error for ${cacheKey}: ${errorMessage}`);
-      return next.handle();
     }
+    return next.handle().pipe(
+      (0, import_operators.map)((data) => {
+        const cacheDuration = gqlMeta.signalOption.cache;
+        if (typeof cacheDuration === "number") {
+          void __privateMethod(this, _setCache, setCache_fn).call(this, cacheKey, data, cacheDuration);
+          __privateGet(this, _logger).debug(`Cache set for key: ${cacheKey}`);
+        }
+        return data;
+      }),
+      (0, import_operators.catchError)((error) => {
+        const errorMessage = error instanceof Error ? error.message : "Unknown error";
+        __privateGet(this, _logger).error(`Error in cache interceptor for ${cacheKey}: ${errorMessage}`);
+        return (0, import_rxjs.throwError)(() => error);
+      })
+    );
   }
 };
 _logger = new WeakMap();