Merge pull request #10368 from nestjs/revert-10360-fix/cache-v5

Revert "fix: update factory to account for old v4 syntax for cache stores"
nestjs · Oct 5, 2022 · ca8e48b · ca8e48b
2 parents ea61e29 + 530af92
commit ca8e48b
Showing 1 changed file with 5 additions and 13 deletions.
diff --git a/packages/common/cache/cache.providers.ts b/packages/common/cache/cache.providers.ts
@@ -13,40 +13,32 @@ import { CacheManagerOptions } from './interfaces/cache-manager.interface';
 export function createCacheManager(): Provider {
   return {
     provide: CACHE_MANAGER,
-    useFactory: async (options: CacheManagerOptions) => {
+    useFactory: (options: CacheManagerOptions) => {
       const cacheManager = loadPackage('cache-manager', 'CacheModule', () =>
         require('cache-manager'),
       );
       // eslint-disable-next-line @typescript-eslint/no-var-requires
       const cacheManagerVersion = require('cache-manager/package.json').version;
       const cacheManagerMajor = cacheManagerVersion.split('.')[0];
-      const cachingFactory = async (
+      const cachingFactory = (
         store: CacheManagerOptions['store'],
         options: Omit<CacheManagerOptions, 'store'>,
-      ): Promise<Record<string, any>> => {
+      ): Record<string, any> => {
         if (cacheManagerMajor < 5) {
           return cacheManager.caching({
             ...defaultCacheOptions,
             ...{ ...options, store },
           });
         }
-        let cache: string | Function = 'memory';
-        if (typeof store === 'object' && 'create' in store) {
-          cache = store.create;
-        } else if (typeof store === 'function') {
-          cache = store;
-        }
-        return cacheManager.caching(cache, {
+        return cacheManager.caching(store ?? 'memory', {
           ...defaultCacheOptions,
           ...options,
         });
       };
 
       return Array.isArray(options)
         ? cacheManager.multiCaching(
-            await Promise.all(
-              options.map(option => cachingFactory(option.store, option)),
-            ),
+            options.map(option => cachingFactory(options.store, option)),
           )
         : cachingFactory(options.store, options);
     },