@nestjs/common 9.1.5 → 9.1.6

package/cache/cache.providers.js

@@ -13,19 +13,25 @@ const default_options_1 = require("./default-options");
 function createCacheManager() {
     return {
         provide: cache_constants_1.CACHE_MANAGER,
-        useFactory: (options) => {
+        useFactory: async (options) => {
             const cacheManager = (0, load_package_util_1.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 = (store, options) => {
-                if (cacheManagerMajor < 5) {
+            const cacheManagerIsv5OrGreater = 'memoryStore' in cacheManager;
+            const cachingFactory = async (store, options) => {
+                if (!cacheManagerIsv5OrGreater) {
                     return cacheManager.caching(Object.assign(Object.assign({}, default_options_1.defaultCacheOptions), Object.assign(Object.assign({}, options), { store })));
                 }
-                return cacheManager.caching(store !== null && store !== void 0 ? store : 'memory', Object.assign(Object.assign({}, default_options_1.defaultCacheOptions), options));
+                let cache = 'memory';
+                default_options_1.defaultCacheOptions.ttl *= 1000;
+                if (typeof store === 'object' && 'create' in store) {
+                    cache = store.create;
+                }
+                else if (typeof store === 'function') {
+                    cache = store;
+                }
+                return cacheManager.caching(cache, Object.assign(Object.assign({}, default_options_1.defaultCacheOptions), options));
             };
             return Array.isArray(options)
-                ? cacheManager.multiCaching(options.map(option => cachingFactory(options.store, option)))
+                ? cacheManager.multiCaching(await Promise.all(options.map(option => cachingFactory(option.store, option))))
                 : cachingFactory(options.store, options);
         },
         inject: [cache_module_definition_1.MODULE_OPTIONS_TOKEN],

package/cache/interfaces/cache-manager.interface.d.ts

@@ -14,7 +14,7 @@ export interface CacheStore {
      * @param key cache key
      * @param value cache value
      */
-    set<T>(key: string, value: T, options?: CacheStoreSetOptions<T>): Promise<void> | void;
+    set<T>(key: string, value: T, options?: CacheStoreSetOptions<T> | number): Promise<void> | void;
     /**
      * Retrieve a key/value pair from the cache.
      *
@@ -62,9 +62,10 @@ export interface CacheManagerOptions {
      */
     store?: string | CacheStoreFactory | CacheStore;
     /**
-     * Time to live - amount of time in seconds that a response is cached before it
+     * Time to live - amount of time that a response is cached before it
      * is deleted. Subsequent request will call through the route handler and refresh
-     * the cache.  Defaults to 5 seconds.
+     * the cache.  Defaults to 5 seconds. In `cache-manager@^4` this value is in seconds.
+     * In `cache-manager@^5` this value is in milliseconds.
      */
     ttl?: number;
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/common",
-  "version": "9.1.5",
+  "version": "9.1.6",
   "description": "Nest - modern, fast, powerful node.js web framework (@common)",
   "author": "Kamil Mysliwiec",
   "homepage": "https://nestjs.com",

package/services/console-logger.service.d.ts

@@ -65,11 +65,13 @@ export declare class ConsoleLogger implements LoggerService {
     protected getTimestamp(): string;
     protected printMessages(messages: unknown[], context?: string, logLevel?: LogLevel, writeStreamType?: 'stdout' | 'stderr'): void;
     protected formatPid(pid: number): string;
+    protected formatContext(context: string): string;
     protected formatMessage(logLevel: LogLevel, message: unknown, pidMessage: string, formattedLogLevel: string, contextMessage: string, timestampDiff: string): string;
     protected stringifyMessage(message: unknown, logLevel: LogLevel): string;
     protected colorize(message: string, logLevel: LogLevel): string;
     protected printStackTrace(stack: string): void;
     private updateAndGetTimestampDiff;
+    protected formatTimestampDiff(timestampDiff: number): string;
     private getContextAndMessagesToPrint;
     private getContextAndStackAndMessagesToPrint;
     private getColorByLogLevel;

package/services/console-logger.service.js

@@ -116,7 +116,7 @@ let ConsoleLogger = ConsoleLogger_1 = class ConsoleLogger {
     printMessages(messages, context = '', logLevel = 'log', writeStreamType) {
         messages.forEach(message => {
             const pidMessage = this.formatPid(process.pid);
-            const contextMessage = context ? (0, cli_colors_util_1.yellow)(`[${context}] `) : '';
+            const contextMessage = this.formatContext(context);
             const timestampDiff = this.updateAndGetTimestampDiff();
             const formattedLogLevel = logLevel.toUpperCase().padStart(7, ' ');
             const formattedMessage = this.formatMessage(logLevel, message, pidMessage, formattedLogLevel, contextMessage, timestampDiff);
@@ -126,6 +126,9 @@ let ConsoleLogger = ConsoleLogger_1 = class ConsoleLogger {
     formatPid(pid) {
         return `[Nest] ${pid}  - `;
     }
+    formatContext(context) {
+        return context ? (0, cli_colors_util_1.yellow)(`[${context}] `) : '';
+    }
     formatMessage(logLevel, message, pidMessage, formattedLogLevel, contextMessage, timestampDiff) {
         const output = this.stringifyMessage(message, logLevel);
         pidMessage = this.colorize(pidMessage, logLevel);
@@ -151,11 +154,14 @@ let ConsoleLogger = ConsoleLogger_1 = class ConsoleLogger {
         var _a;
         const includeTimestamp = ConsoleLogger_1.lastTimestampAt && ((_a = this.options) === null || _a === void 0 ? void 0 : _a.timestamp);
         const result = includeTimestamp
-            ? (0, cli_colors_util_1.yellow)(` +${Date.now() - ConsoleLogger_1.lastTimestampAt}ms`)
+            ? this.formatTimestampDiff(Date.now() - ConsoleLogger_1.lastTimestampAt)
             : '';
         ConsoleLogger_1.lastTimestampAt = Date.now();
         return result;
     }
+    formatTimestampDiff(timestampDiff) {
+        return (0, cli_colors_util_1.yellow)(` +${timestampDiff}ms`);
+    }
     getContextAndMessagesToPrint(args) {
         if ((args === null || args === void 0 ? void 0 : args.length) <= 1) {
             return { messages: args, context: this.context };