@nestjs/core 12.0.0-alpha.6 → 12.0.0

package/helpers/safe-instance-decorator.d.ts

@@ -0,0 +1,10 @@
+type InstanceDecorator = (target: unknown) => unknown;
+/**
+ * Wraps an `instrument.instanceDecorator` so that a decorator throwing on a
+ * given instance (e.g. when inspecting a Proxy whose traps throw outside of
+ * their intended context, such as `nestjs-cls` proxy providers) does not
+ * crash the application bootstrap. The original, undecorated instance is
+ * used instead and a warning is logged.
+ */
+export declare function makeSafeInstanceDecorator(decorator: InstanceDecorator): InstanceDecorator;
+export {};

package/helpers/safe-instance-decorator.js

@@ -0,0 +1,20 @@
+import { Logger } from '@nestjs/common';
+const logger = new Logger('InstrumentLogger');
+/**
+ * Wraps an `instrument.instanceDecorator` so that a decorator throwing on a
+ * given instance (e.g. when inspecting a Proxy whose traps throw outside of
+ * their intended context, such as `nestjs-cls` proxy providers) does not
+ * crash the application bootstrap. The original, undecorated instance is
+ * used instead and a warning is logged.
+ */
+export function makeSafeInstanceDecorator(decorator) {
+    return (target) => {
+        try {
+            return decorator(target);
+        }
+        catch (err) {
+            logger.warn(`The "instanceDecorator" function threw an error while decorating an instance (${err?.message ?? err}). The undecorated instance will be used instead.`);
+            return target;
+        }
+    };
+}

package/injector/injector.js

@@ -7,6 +7,7 @@ import { RuntimeException } from '../errors/exceptions/runtime.exception.js';
 import { UndefinedDependencyException } from '../errors/exceptions/undefined-dependency.exception.js';
 import { UnknownDependenciesException } from '../errors/exceptions/unknown-dependencies.exception.js';
 import { Barrier } from '../helpers/barrier.js';
+import { makeSafeInstanceDecorator } from '../helpers/safe-instance-decorator.js';
 import { STATIC_CONTEXT } from './constants.js';
 import { INQUIRER } from './inquirer/index.js';
 import { InstanceWrapper, } from './instance-wrapper.js';
@@ -18,7 +19,7 @@ export class Injector {
     constructor(options) {
         this.options = options;
         if (options?.instanceDecorator) {
-            this.instanceDecorator = options.instanceDecorator;
+            this.instanceDecorator = makeSafeInstanceDecorator(options.instanceDecorator);
         }
     }
     loadPrototype({ token }, collection, contextId = STATIC_CONTEXT) {
@@ -267,12 +268,23 @@ export class Injector {
              * that eventual lazily created instance will be merged with the prototype
              * instantiated beforehand.
              */
-            instanceHost.donePromise &&
+            if (instanceHost.donePromise) {
                 void instanceHost.donePromise
                     .then(() => this.loadProvider(instanceWrapper, moduleRef, resolutionContext))
                     .catch(err => {
                     instanceWrapper.settlementSignal?.error(err);
                 });
+            }
+            else {
+                /**
+                 * No load has ever been scheduled for this context (e.g., request-scoped
+                 * providers are no longer instantiated during static bootstrap, so a fresh
+                 * durable/request sub-tree host has no inherited `donePromise`).
+                 * Load it now; if a circular dependency is truly in-flight, the nested
+                 * lookup will find this host pending and defer through its `donePromise`.
+                 */
+                await this.loadProvider(instanceWrapper, instanceWrapper.host ?? moduleRef, resolutionContext);
+            }
         }
         if (instanceWrapper.async) {
             const host = instanceWrapper.getInstanceByContextId(this.getContextId(resolutionContext.contextId, instanceWrapper), inquirerId);

package/injector/module.js

@@ -4,6 +4,7 @@ import { InvalidClassException, RuntimeException, UnknownExportException, } from
 import { createContextId } from '../helpers/context-id-factory.js';
 import { getClassScope } from '../helpers/get-class-scope.js';
 import { isDurable } from '../helpers/is-durable.js';
+import { makeSafeInstanceDecorator } from '../helpers/safe-instance-decorator.js';
 import { UuidFactory } from '../inspector/uuid-factory.js';
 import { CONTROLLER_ID_KEY } from './constants.js';
 import { InstanceWrapper } from './instance-wrapper.js';
@@ -251,7 +252,9 @@ export class Module {
             token: providerToken,
             name: providerToken?.name || providerToken,
             metatype: null,
-            instance: instanceDecorator ? instanceDecorator(value) : value,
+            instance: instanceDecorator
+                ? makeSafeInstanceDecorator(instanceDecorator)(value)
+                : value,
             isResolved: true,
             async: value instanceof Promise,
             host: this,

package/internal.d.ts

@@ -5,28 +5,32 @@
  * @internal
  * @module
  */
-export { RuntimeException } from './errors/exceptions/runtime.exception.js';
+export * from './errors/exceptions/index.js';
 export { InvalidExceptionFilterException } from './errors/exceptions/invalid-exception-filter.exception.js';
+export { RuntimeException } from './errors/exceptions/runtime.exception.js';
 export { MESSAGES } from './constants.js';
 export { DependenciesScanner } from './scanner.js';
+export { STATIC_CONTEXT } from './injector/constants.js';
 export { Injector, InjectorDependencyContext } from './injector/injector.js';
 export { InstanceLoader } from './injector/instance-loader.js';
 export { InstanceWrapper } from './injector/instance-wrapper.js';
+export { InternalCoreModule } from './injector/internal-core-module/index.js';
 export { Module } from './injector/module.js';
-export { STATIC_CONTEXT } from './injector/constants.js';
-export { ExecutionContextHost } from './helpers/execution-context-host.js';
+export * from './inspector/index.js';
 export { ContextUtils, ParamProperties } from './helpers/context-utils.js';
+export { ExecutionContextHost } from './helpers/execution-context-host.js';
 export { HandlerMetadataStorage } from './helpers/handler-metadata-storage.js';
-export { RouterMethodFactory } from './helpers/router-method-factory.js';
 export { loadAdapter } from './helpers/load-adapter.js';
 export { optionalRequire } from './helpers/optional-require.js';
+export { RouterMethodFactory } from './helpers/router-method-factory.js';
+export { makeSafeInstanceDecorator } from './helpers/safe-instance-decorator.js';
 export { ParamsMetadata } from './helpers/interfaces/index.js';
+export { FORBIDDEN_MESSAGE } from './guards/constants.js';
 export { GuardsConsumer } from './guards/guards-consumer.js';
 export { GuardsContextCreator } from './guards/guards-context-creator.js';
-export { FORBIDDEN_MESSAGE } from './guards/constants.js';
+export { ParamsTokenFactory } from './pipes/params-token-factory.js';
 export { PipesConsumer } from './pipes/pipes-consumer.js';
 export { PipesContextCreator } from './pipes/pipes-context-creator.js';
-export { ParamsTokenFactory } from './pipes/params-token-factory.js';
 export { InterceptorsConsumer } from './interceptors/interceptors-consumer.js';
 export { InterceptorsContextCreator } from './interceptors/interceptors-context-creator.js';
 export { BaseExceptionFilterContext } from './exceptions/base-exception-filter-context.js';

package/internal.js

@@ -6,33 +6,37 @@
  * @module
  */
 // Errors
-export { RuntimeException } from './errors/exceptions/runtime.exception.js';
+export * from './errors/exceptions/index.js';
 export { InvalidExceptionFilterException } from './errors/exceptions/invalid-exception-filter.exception.js';
+export { RuntimeException } from './errors/exceptions/runtime.exception.js';
 // Constants
 export { MESSAGES } from './constants.js';
 // Scanner
 export { DependenciesScanner } from './scanner.js';
 // Injector
+export { STATIC_CONTEXT } from './injector/constants.js';
 export { Injector } from './injector/injector.js';
 export { InstanceLoader } from './injector/instance-loader.js';
 export { InstanceWrapper } from './injector/instance-wrapper.js';
+export { InternalCoreModule } from './injector/internal-core-module/index.js';
 export { Module } from './injector/module.js';
-export { STATIC_CONTEXT } from './injector/constants.js';
+export * from './inspector/index.js';
 // Helpers
-export { ExecutionContextHost } from './helpers/execution-context-host.js';
 export { ContextUtils } from './helpers/context-utils.js';
+export { ExecutionContextHost } from './helpers/execution-context-host.js';
 export { HandlerMetadataStorage } from './helpers/handler-metadata-storage.js';
-export { RouterMethodFactory } from './helpers/router-method-factory.js';
 export { loadAdapter } from './helpers/load-adapter.js';
 export { optionalRequire } from './helpers/optional-require.js';
+export { RouterMethodFactory } from './helpers/router-method-factory.js';
+export { makeSafeInstanceDecorator } from './helpers/safe-instance-decorator.js';
 // Guards
+export { FORBIDDEN_MESSAGE } from './guards/constants.js';
 export { GuardsConsumer } from './guards/guards-consumer.js';
 export { GuardsContextCreator } from './guards/guards-context-creator.js';
-export { FORBIDDEN_MESSAGE } from './guards/constants.js';
 // Pipes
+export { ParamsTokenFactory } from './pipes/params-token-factory.js';
 export { PipesConsumer } from './pipes/pipes-consumer.js';
 export { PipesContextCreator } from './pipes/pipes-context-creator.js';
-export { ParamsTokenFactory } from './pipes/params-token-factory.js';
 // Interceptors
 export { InterceptorsConsumer } from './interceptors/interceptors-consumer.js';
 export { InterceptorsContextCreator } from './interceptors/interceptors-context-creator.js';

package/nest-application.js

@@ -4,6 +4,7 @@ import { platform } from 'os';
 import { ApplicationConfig } from './application-config.js';
 import { MESSAGES } from './constants.js';
 import { optionalRequire } from './helpers/optional-require.js';
+import { makeSafeInstanceDecorator } from './helpers/safe-instance-decorator.js';
 import { Injector } from './injector/injector.js';
 import { MiddlewareContainer } from './middleware/container.js';
 import { MiddlewareModule } from './middleware/middleware-module.js';
@@ -411,7 +412,8 @@ export class NestApplication extends NestApplicationContext {
     }
     applyInstanceDecoratorIfRegistered(...instances) {
         if (this.appOptions.instrument?.instanceDecorator) {
-            return instances.map(instance => this.appOptions.instrument.instanceDecorator(instance));
+            const decorate = makeSafeInstanceDecorator(this.appOptions.instrument.instanceDecorator);
+            return instances.map(instance => decorate(instance));
         }
         return instances;
     }
@@ -419,15 +421,21 @@ export class NestApplication extends NestApplicationContext {
         if (!this.appOptions.instrument?.instanceDecorator) {
             return args;
         }
-        const [firstArg, secondArg] = args;
-        return [
-            isFunction(firstArg)
-                ? this.appOptions.instrument.instanceDecorator(firstArg)
-                : firstArg,
-            isFunction(secondArg)
-                ? this.appOptions.instrument.instanceDecorator(secondArg)
-                : secondArg,
-        ];
+        const decorate = makeSafeInstanceDecorator(this.appOptions.instrument.instanceDecorator);
+        // Decorators may return a non-function value for plain middleware
+        // functions; fall back to the original argument so the HTTP adapter
+        // always receives a valid handler.
+        const decorateFunction = (arg) => {
+            if (!isFunction(arg)) {
+                return arg;
+            }
+            const decorated = decorate(arg);
+            return isFunction(decorated) ? decorated : arg;
+        };
+        // Map over the original arguments to preserve arity: appending a trailing
+        // `undefined` to a single-argument `use(fn)` call would make Express 5's
+        // router throw "argument handler must be a function".
+        return args.map(decorateFunction);
     }
     async loadSocketModule() {
         if (!this.socketModule) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/core",
-  "version": "12.0.0-alpha.6",
+  "version": "12.0.0",
   "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": "^12.0.0-alpha.6"
+    "@nestjs/common": "12.0.0"
   },
   "peerDependencies": {
     "@nestjs/common": "^11.0.0",
@@ -57,5 +57,5 @@
       "optional": true
     }
   },
-  "gitHead": "4c38a5ab100f1d2a0d50602998968a25509525c7"
+  "gitHead": "6494a6c27400547ea6cd9b78da07b2e9c2547ca0"
 }