@nestjs/core 9.3.5 → 9.3.6

package/index.d.ts

@@ -6,6 +6,7 @@ export * from './discovery';
 export * from './exceptions';
 export * from './helpers';
 export * from './injector';
+export * from './inspector';
 export * from './metadata-scanner';
 export * from './middleware';
 export * from './nest-application';

package/index.js

@@ -20,6 +20,7 @@ tslib_1.__exportStar(require("./discovery"), exports);
 tslib_1.__exportStar(require("./exceptions"), exports);
 tslib_1.__exportStar(require("./helpers"), exports);
 tslib_1.__exportStar(require("./injector"), exports);
+tslib_1.__exportStar(require("./inspector"), exports);
 tslib_1.__exportStar(require("./metadata-scanner"), exports);
 tslib_1.__exportStar(require("./middleware"), exports);
 tslib_1.__exportStar(require("./nest-application"), exports);

package/injector/container.d.ts

@@ -50,4 +50,5 @@ export declare class NestContainer {
     registerCoreModuleRef(moduleRef: Module): void;
     getModuleTokenFactory(): ModuleTokenFactory;
     registerRequestProvider<T = any>(request: T, contextId: ContextId): void;
+    private shouldInitOnPreview;
 }

package/injector/container.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NestContainer = void 0;
 const constants_1 = require("@nestjs/common/constants");
 const exceptions_1 = require("../errors/exceptions");
+const initialize_on_preview_allowlist_1 = require("../inspector/initialize-on-preview.allowlist");
 const serialized_graph_1 = require("../inspector/serialized-graph");
 const request_constants_1 = require("../router/request/request-constants");
 const compiler_1 = require("./compiler");
@@ -54,6 +55,7 @@ class NestContainer {
         }
         const moduleRef = new module_1.Module(type, this);
         moduleRef.token = token;
+        moduleRef.initOnPreview = this.shouldInitOnPreview(type);
         this.modules.set(token, moduleRef);
         const updatedScope = [].concat(scope, type);
         await this.addDynamicMetadata(token, dynamicMetadata, updatedScope);
@@ -175,5 +177,8 @@ class NestContainer {
             isResolved: true,
         });
     }
+    shouldInitOnPreview(type) {
+        return initialize_on_preview_allowlist_1.InitializeOnPreviewAllowlist.has(type);
+    }
 }
 exports.NestContainer = NestContainer;

package/injector/injector.js

@@ -330,7 +330,7 @@ class Injector {
             .forEach(item => (instance[item.key] = item.instance));
     }
     async instantiateClass(instances, wrapper, targetMetatype, contextId = constants_2.STATIC_CONTEXT, inquirer) {
-        var _a;
+        var _a, _b;
         const { metatype, inject } = wrapper;
         const inquirerId = this.getInquirerId(inquirer);
         const instanceHost = targetMetatype.getInstanceByContextId(this.getContextId(contextId, targetMetatype), inquirerId);
@@ -338,7 +338,7 @@ class Injector {
             wrapper.isInRequestScope(contextId, inquirer) ||
             wrapper.isLazyTransient(contextId, inquirer) ||
             wrapper.isExplicitlyRequested(contextId, inquirer);
-        if ((_a = this.options) === null || _a === void 0 ? void 0 : _a.preview) {
+        if (((_a = this.options) === null || _a === void 0 ? void 0 : _a.preview) && !((_b = wrapper.host) === null || _b === void 0 ? void 0 : _b.initOnPreview)) {
             instanceHost.isResolved = true;
             return instanceHost.instance;
         }

package/injector/module-token-factory.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModuleTokenFactory = void 0;
 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 xxhash_1 = require("@node-rs/xxhash");
+const crypto_1 = require("crypto");
 const fast_safe_stringify_1 = require("fast-safe-stringify");
 const CLASS_STR = 'class ';
 const CLASS_STR_LEN = CLASS_STR.length;
@@ -53,7 +53,7 @@ class ModuleTokenFactory {
         return metatype.name;
     }
     hashString(value) {
-        return (0, xxhash_1.xxh32)(value).toString();
+        return (0, crypto_1.createHash)('sha256').update(value).digest('hex');
     }
     replacer(key, value) {
         if ((0, shared_utils_1.isFunction)(value)) {

package/injector/module.d.ts

@@ -19,6 +19,7 @@ export declare class Module {
     private readonly _controllers;
     private readonly _exports;
     private _distance;
+    private _initOnPreview;
     private _isGlobal;
     private _token;
     constructor(_metatype: Type<any>, container: NestContainer);
@@ -28,6 +29,8 @@ export declare class Module {
     get name(): string;
     get isGlobal(): boolean;
     set isGlobal(global: boolean);
+    get initOnPreview(): boolean;
+    set initOnPreview(initOnPreview: boolean);
     get providers(): Map<InstanceToken, InstanceWrapper<Injectable>>;
     get middlewares(): Map<InstanceToken, InstanceWrapper<Injectable>>;
     get imports(): Set<Module>;

package/injector/module.js

@@ -24,6 +24,7 @@ class Module {
         this._controllers = new Map();
         this._exports = new Set();
         this._distance = 0;
+        this._initOnPreview = false;
         this._isGlobal = false;
         this.addCoreProviders();
         this._id = this.generateUuid();
@@ -46,6 +47,12 @@ class Module {
     set isGlobal(global) {
         this._isGlobal = global;
     }
+    get initOnPreview() {
+        return this._initOnPreview;
+    }
+    set initOnPreview(initOnPreview) {
+        this._initOnPreview = initOnPreview;
+    }
     get providers() {
         return this._providers;
     }
@@ -399,9 +406,9 @@ class Module {
     }
     generateUuid() {
         var _a, _b, _c;
-        const UUID_NAMESPACE = 'fb848993-0c82-4b9e-ae95-3c3c1dbe3d6b';
+        const prefix = 'M_';
         const key = (_b = (_a = this.name) === null || _a === void 0 ? void 0 : _a.toString()) !== null && _b !== void 0 ? _b : (_c = this.token) === null || _c === void 0 ? void 0 : _c.toString();
-        return key ? uuid_factory_1.UuidFactory.get(key, UUID_NAMESPACE) : (0, random_string_generator_util_1.randomStringGenerator)();
+        return key ? uuid_factory_1.UuidFactory.get(`${prefix}_${key}`) : (0, random_string_generator_util_1.randomStringGenerator)();
     }
 }
 exports.Module = Module;

package/inspector/deterministic-uuid-registry.d.ts

@@ -1,5 +1,6 @@
 export declare class DeterministicUuidRegistry {
     private static readonly registry;
-    static get(str: string, namespace?: string, inc?: number): any;
+    static get(str: string, inc?: number): any;
     static clear(): void;
+    private static hashCode;
 }

package/inspector/deterministic-uuid-registry.js

@@ -1,23 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeterministicUuidRegistry = void 0;
-const xxhash_1 = require("@node-rs/xxhash");
-const DEFAULT_UUID_NAMESPACE = 'efa0df42-88af-474f-9cad-4206a2319f07';
 class DeterministicUuidRegistry {
-    static get(str, namespace = DEFAULT_UUID_NAMESPACE, inc = 0) {
-        const id = inc
-            ? (0, xxhash_1.xxh32)(`${namespace}_${str}_${inc}`)
-            : (0, xxhash_1.xxh32)(`${namespace}_${str}`);
-        const idAsString = `${id}`;
-        if (this.registry.has(idAsString)) {
-            return this.get(str, namespace, inc + 1);
+    static get(str, inc = 0) {
+        const key = inc ? `${str}_${inc}` : `${str}`;
+        if (this.registry.has(key)) {
+            return this.get(str, inc + 1);
         }
-        this.registry.add(idAsString);
-        return idAsString;
+        const id = this.hashCode(key);
+        this.registry.set(id, true);
+        return id;
     }
     static clear() {
         this.registry.clear();
     }
+    static hashCode(s) {
+        let h = 0;
+        for (let i = 0; i < s.length; i++)
+            h = (Math.imul(31, h) + s.charCodeAt(i)) | 0;
+        return h.toString();
+    }
 }
 exports.DeterministicUuidRegistry = DeterministicUuidRegistry;
-DeterministicUuidRegistry.registry = new Set();
+DeterministicUuidRegistry.registry = new Map();

package/inspector/index.d.ts

@@ -0,0 +1,2 @@
+export * from './graph-inspector';
+export * from './initialize-on-preview.allowlist';

package/inspector/index.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./graph-inspector"), exports);
+tslib_1.__exportStar(require("./initialize-on-preview.allowlist"), exports);

package/inspector/initialize-on-preview.allowlist.d.ts

@@ -0,0 +1,6 @@
+import { Type } from '@nestjs/common';
+export declare class InitializeOnPreviewAllowlist {
+    private static readonly allowlist;
+    static add(type: Type): void;
+    static has(type: Type): boolean;
+}

package/inspector/initialize-on-preview.allowlist.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.InitializeOnPreviewAllowlist = void 0;
+class InitializeOnPreviewAllowlist {
+    static add(type) {
+        this.allowlist.set(type, true);
+    }
+    static has(type) {
+        return this.allowlist.has(type);
+    }
+}
+exports.InitializeOnPreviewAllowlist = InitializeOnPreviewAllowlist;
+InitializeOnPreviewAllowlist.allowlist = new WeakMap();

package/inspector/on-preview-allowlist.registry.js

@@ -0,0 +1 @@
+"use strict";

package/inspector/serialized-graph.js

@@ -83,8 +83,7 @@ class SerializedGraph {
         return JSON.stringify(this.toJSON(), replacer, 2);
     }
     generateUuidByEdgeDefinition(edgeDefinition) {
-        const UUID_NAMESPACE = '7a6d19ab-ec88-419f-a833-062532c468a7';
-        return deterministic_uuid_registry_1.DeterministicUuidRegistry.get(JSON.stringify(edgeDefinition), UUID_NAMESPACE);
+        return deterministic_uuid_registry_1.DeterministicUuidRegistry.get(JSON.stringify(edgeDefinition));
     }
 }
 exports.SerializedGraph = SerializedGraph;

package/inspector/uuid-factory.d.ts

@@ -5,5 +5,5 @@ export declare enum UuidFactoryMode {
 export declare class UuidFactory {
     private static _mode;
     static set mode(value: UuidFactoryMode);
-    static get(key?: string, namespace?: string): any;
+    static get(key?: string): any;
 }

package/inspector/uuid-factory.js

@@ -12,9 +12,9 @@ class UuidFactory {
     static set mode(value) {
         this._mode = value;
     }
-    static get(key = '', namespace) {
+    static get(key = '') {
         return this._mode === UuidFactoryMode.Deterministic
-            ? deterministic_uuid_registry_1.DeterministicUuidRegistry.get(key, namespace)
+            ? deterministic_uuid_registry_1.DeterministicUuidRegistry.get(key)
             : (0, random_string_generator_util_1.randomStringGenerator)();
     }
 }

package/nest-application-context.d.ts

@@ -23,7 +23,7 @@ export declare class NestApplicationContext<TOptions extends NestApplicationCont
     private readonly moduleCompiler;
     private shutdownCleanupRef?;
     private _instanceLinksHost;
-    private _moduleRefsByDistance?;
+    private _moduleRefsForHooksByDistance?;
     protected get instanceLinksHost(): InstanceLinksHost;
     constructor(container: NestContainer, appOptions?: TOptions, contextModule?: Module, scope?: Type<any>[]);
     selectContextModule(): void;
@@ -165,6 +165,6 @@ export declare class NestApplicationContext<TOptions extends NestApplicationCont
      */
     protected callBeforeShutdownHook(signal?: string): Promise<void>;
     protected assertNotInPreviewMode(methodName: string): void;
-    private getModulesSortedByDistance;
+    private getModulesToTriggerHooksOn;
     private printInPreviewModeWarning;
 }

package/nest-application-context.js

@@ -219,10 +219,7 @@ class NestApplicationContext extends abstract_instance_resolver_1.AbstractInstan
      * modules and its children.
      */
     async callInitHook() {
-        if (this.appOptions.preview) {
-            return;
-        }
-        const modulesSortedByDistance = this.getModulesSortedByDistance();
+        const modulesSortedByDistance = this.getModulesToTriggerHooksOn();
         for (const module of modulesSortedByDistance) {
             await (0, hooks_1.callModuleInitHook)(module);
         }
@@ -232,10 +229,7 @@ class NestApplicationContext extends abstract_instance_resolver_1.AbstractInstan
      * modules and its children.
      */
     async callDestroyHook() {
-        if (this.appOptions.preview) {
-            return;
-        }
-        const modulesSortedByDistance = this.getModulesSortedByDistance();
+        const modulesSortedByDistance = this.getModulesToTriggerHooksOn();
         for (const module of modulesSortedByDistance) {
             await (0, hooks_1.callModuleDestroyHook)(module);
         }
@@ -245,10 +239,7 @@ class NestApplicationContext extends abstract_instance_resolver_1.AbstractInstan
      * modules and its children.
      */
     async callBootstrapHook() {
-        if (this.appOptions.preview) {
-            return;
-        }
-        const modulesSortedByDistance = this.getModulesSortedByDistance();
+        const modulesSortedByDistance = this.getModulesToTriggerHooksOn();
         for (const module of modulesSortedByDistance) {
             await (0, hooks_1.callModuleBootstrapHook)(module);
         }
@@ -258,10 +249,7 @@ class NestApplicationContext extends abstract_instance_resolver_1.AbstractInstan
      * modules and children.
      */
     async callShutdownHook(signal) {
-        if (this.appOptions.preview) {
-            return;
-        }
-        const modulesSortedByDistance = this.getModulesSortedByDistance();
+        const modulesSortedByDistance = this.getModulesToTriggerHooksOn();
         for (const module of modulesSortedByDistance) {
             await (0, hooks_1.callAppShutdownHook)(module, signal);
         }
@@ -271,10 +259,7 @@ class NestApplicationContext extends abstract_instance_resolver_1.AbstractInstan
      * modules and children.
      */
     async callBeforeShutdownHook(signal) {
-        if (this.appOptions.preview) {
-            return;
-        }
-        const modulesSortedByDistance = this.getModulesSortedByDistance();
+        const modulesSortedByDistance = this.getModulesToTriggerHooksOn();
         for (const module of modulesSortedByDistance) {
             await (0, hooks_1.callBeforeAppShutdownHook)(module, signal);
         }
@@ -286,14 +271,18 @@ class NestApplicationContext extends abstract_instance_resolver_1.AbstractInstan
             throw new Error(error);
         }
     }
-    getModulesSortedByDistance() {
-        if (this._moduleRefsByDistance) {
-            return this._moduleRefsByDistance;
+    getModulesToTriggerHooksOn() {
+        var _a;
+        if (this._moduleRefsForHooksByDistance) {
+            return this._moduleRefsForHooksByDistance;
         }
         const modulesContainer = this.container.getModules();
         const compareFn = (a, b) => b.distance - a.distance;
-        this._moduleRefsByDistance = Array.from(modulesContainer.values()).sort(compareFn);
-        return this._moduleRefsByDistance;
+        const modulesSortedByDistance = Array.from(modulesContainer.values()).sort(compareFn);
+        this._moduleRefsForHooksByDistance = ((_a = this.appOptions) === null || _a === void 0 ? void 0 : _a.preview)
+            ? modulesSortedByDistance.filter(moduleRef => moduleRef.initOnPreview)
+            : modulesSortedByDistance;
+        return this._moduleRefsForHooksByDistance;
     }
     printInPreviewModeWarning() {
         this.logger.warn('------------------------------------------------');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/core",
-  "version": "9.3.5",
+  "version": "9.3.6",
   "description": "Nest - modern, fast, powerful node.js web framework (@core)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -27,7 +27,6 @@
     }
   },
   "dependencies": {
-    "@node-rs/xxhash": "^1.3.0",
     "@nuxtjs/opencollective": "0.3.2",
     "fast-safe-stringify": "2.1.1",
     "iterare": "1.2.1",
@@ -36,7 +35,7 @@
     "uid": "2.0.1"
   },
   "devDependencies": {
-    "@nestjs/common": "9.3.5"
+    "@nestjs/common": "9.3.6"
   },
   "peerDependencies": {
     "@nestjs/common": "^9.0.0",