@nestjs/core 11.0.0-next.2 → 11.0.0-next.4

package/injector/container.js

@@ -100,6 +100,9 @@ class NestContainer {
         await this.addDynamicMetadata(token, dynamicMetadata, updatedScope);
         if (this.isGlobalModule(type, dynamicMetadata)) {
             moduleRef.isGlobal = true;
+            // Set global module distance to MAX_VALUE to ensure their lifecycle hooks
+            // are always executed first (when initializing the application)
+            moduleRef.distance = Number.MAX_VALUE;
             this.addGlobalModule(moduleRef);
         }
         return moduleRef;

package/nest-application-context.js

@@ -269,7 +269,9 @@ class NestApplicationContext extends abstract_instance_resolver_1.AbstractInstan
      * modules and children.
      */
     async callShutdownHook(signal) {
-        const modulesSortedByDistance = this.getModulesToTriggerHooksOn();
+        const modulesSortedByDistance = [
+            ...this.getModulesToTriggerHooksOn(),
+        ].reverse();
         for (const module of modulesSortedByDistance) {
             await (0, hooks_1.callAppShutdownHook)(module, signal);
         }
@@ -279,7 +281,9 @@ class NestApplicationContext extends abstract_instance_resolver_1.AbstractInstan
      * modules and children.
      */
     async callBeforeShutdownHook(signal) {
-        const modulesSortedByDistance = this.getModulesToTriggerHooksOn();
+        const modulesSortedByDistance = [
+            ...this.getModulesToTriggerHooksOn(),
+        ].reverse();
         for (const module of modulesSortedByDistance) {
             await (0, hooks_1.callBeforeAppShutdownHook)(module, signal);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/core",
-  "version": "11.0.0-next.2",
+  "version": "11.0.0-next.4",
   "description": "Nest - modern, fast, powerful node.js web framework (@core)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -36,7 +36,7 @@
     "uid": "2.0.2"
   },
   "devDependencies": {
-    "@nestjs/common": "^11.0.0-next.2"
+    "@nestjs/common": "^11.0.0-next.4"
   },
   "peerDependencies": {
     "@nestjs/common": "^10.0.0",

package/router/legacy-route-converter.js

@@ -22,14 +22,14 @@ class LegacyRouteConverter {
             if (normalizedRoute !== '/(.*)/') {
                 this.printWarning(route);
             }
-            return route.replace('(.*)', '*path');
+            return route.replace('(.*)', '{*path}');
         }
         if (normalizedRoute.endsWith('/*/')) {
             // Skip printing warning for the "all" wildcard.
             if (normalizedRoute !== '/*/') {
                 this.printWarning(route);
             }
-            return route.replace('*', '*path');
+            return route.replace('*', '{*path}');
         }
         if (normalizedRoute.endsWith('/+/')) {
             this.printWarning(route);

package/scanner.js

@@ -30,8 +30,11 @@ class DependenciesScanner {
         });
         await this.scanModulesForDependencies();
         this.addScopedEnhancersMetadata();
-        this.container.bindGlobalScope();
+        // Modules distance calculation should be done after all modules are scanned
+        // but before global modules are registered (linked to all modules).
+        // Global modules have their distance set to MAX anyway.
         this.calculateModulesDistance();
+        this.container.bindGlobalScope();
     }
     async scanForModules({ moduleDefinition, lazy, scope = [], ctxRegistry = [], overrides = [], }) {
         const { moduleRef: moduleInstance, inserted: moduleInserted } = (await this.insertOrOverrideModule(moduleDefinition, overrides, scope)) ??
@@ -207,7 +210,8 @@ class DependenciesScanner {
             const moduleImports = moduleRef.imports;
             moduleImports.forEach(importedModuleRef => {
                 if (importedModuleRef) {
-                    if (distance > importedModuleRef.distance) {
+                    if (distance > importedModuleRef.distance &&
+                        !importedModuleRef.isGlobal) {
                         importedModuleRef.distance = distance;
                     }
                     calculateDistance(importedModuleRef, distance + 1, localModulesStack);

package/injector/module-token-factory.d.ts

@@ -1,14 +0,0 @@
-import { DynamicModule } from '@nestjs/common';
-import { Type } from '@nestjs/common/interfaces/type.interface';
-export declare class ModuleTokenFactory {
-    private readonly moduleTokenCache;
-    private readonly moduleIdsCache;
-    private readonly logger;
-    create(metatype: Type<unknown>, dynamicModuleMetadata?: Partial<DynamicModule> | undefined): string;
-    getStaticModuleToken(moduleId: string, moduleName: string): string;
-    getStringifiedOpaqueToken(opaqueToken: object | undefined): string;
-    getModuleId(metatype: Type<unknown>): string;
-    getModuleName(metatype: Type<any>): string;
-    private hashString;
-    private replacer;
-}

package/injector/module-token-factory.js

@@ -1,84 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModuleTokenFactory = void 0;
-const common_1 = require("@nestjs/common");
-const random_string_generator_util_1 = require("@nestjs/common/utils/random-string-generator.util");
-const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
-const crypto_1 = require("crypto");
-const fast_safe_stringify_1 = require("fast-safe-stringify");
-const perf_hooks_1 = require("perf_hooks");
-const CLASS_STR = 'class ';
-const CLASS_STR_LEN = CLASS_STR.length;
-class ModuleTokenFactory {
-    constructor() {
-        this.moduleTokenCache = new Map();
-        this.moduleIdsCache = new WeakMap();
-        this.logger = new common_1.Logger(ModuleTokenFactory.name, {
-            timestamp: true,
-        });
-    }
-    create(metatype, dynamicModuleMetadata) {
-        const moduleId = this.getModuleId(metatype);
-        if (!dynamicModuleMetadata) {
-            return this.getStaticModuleToken(moduleId, this.getModuleName(metatype));
-        }
-        const opaqueToken = {
-            id: moduleId,
-            module: this.getModuleName(metatype),
-            dynamic: dynamicModuleMetadata,
-        };
-        const start = perf_hooks_1.performance.now();
-        const opaqueTokenString = this.getStringifiedOpaqueToken(opaqueToken);
-        const timeSpentInMs = perf_hooks_1.performance.now() - start;
-        if (timeSpentInMs > 10) {
-            const formattedTimeSpent = timeSpentInMs.toFixed(2);
-            this.logger.warn(`The module "${opaqueToken.module}" is taking ${formattedTimeSpent}ms to serialize, this may be caused by larger objects statically assigned to the module. More details: https://github.com/nestjs/nest/issues/12738`);
-        }
-        return this.hashString(opaqueTokenString);
-    }
-    getStaticModuleToken(moduleId, moduleName) {
-        const key = `${moduleId}_${moduleName}`;
-        if (this.moduleTokenCache.has(key)) {
-            return this.moduleTokenCache.get(key);
-        }
-        const hash = this.hashString(key);
-        this.moduleTokenCache.set(key, hash);
-        return hash;
-    }
-    getStringifiedOpaqueToken(opaqueToken) {
-        // Uses safeStringify instead of JSON.stringify to support circular dynamic modules
-        // The replacer function is also required in order to obtain real class names
-        // instead of the unified "Function" key
-        return opaqueToken ? (0, fast_safe_stringify_1.default)(opaqueToken, this.replacer) : '';
-    }
-    getModuleId(metatype) {
-        let moduleId = this.moduleIdsCache.get(metatype);
-        if (moduleId) {
-            return moduleId;
-        }
-        moduleId = (0, random_string_generator_util_1.randomStringGenerator)();
-        this.moduleIdsCache.set(metatype, moduleId);
-        return moduleId;
-    }
-    getModuleName(metatype) {
-        return metatype.name;
-    }
-    hashString(value) {
-        return (0, crypto_1.createHash)('sha256').update(value).digest('hex');
-    }
-    replacer(key, value) {
-        if ((0, shared_utils_1.isFunction)(value)) {
-            const funcAsString = value.toString();
-            const isClass = funcAsString.slice(0, CLASS_STR_LEN) === CLASS_STR;
-            if (isClass) {
-                return value.name;
-            }
-            return funcAsString;
-        }
-        if ((0, shared_utils_1.isSymbol)(value)) {
-            return value.toString();
-        }
-        return value;
-    }
-}
-exports.ModuleTokenFactory = ModuleTokenFactory;