@nestjs/core 11.1.28 → 11.1.29

package/helpers/barrier.js

@@ -11,6 +11,9 @@ class Barrier {
         this.promise = new Promise(resolve => {
             this.resolve = resolve;
         });
+        if (targetCount === 0) {
+            this.resolve();
+        }
     }
     /**
      * Signal that a participant has reached the barrier.
@@ -19,7 +22,7 @@ class Barrier {
      */
     signal() {
         this.currentCount += 1;
-        if (this.currentCount === this.targetCount) {
+        if (this.currentCount >= this.targetCount) {
             this.resolve();
         }
     }

package/injector/injector.js

@@ -328,16 +328,12 @@ class Injector {
             this.printFoundInModuleLog(name, relatedModule);
             instanceWrapperRef = providers.get(name);
             this.addDependencyMetadata(keyOrIndex, wrapper, instanceWrapperRef);
-            const inquirerId = this.getContextInquirerId(resolutionContext);
-            const instanceHost = instanceWrapperRef.getInstanceByContextId(this.getContextId(resolutionContext.contextId, instanceWrapperRef), inquirerId);
-            if (!instanceHost.isResolved && !instanceWrapperRef.forwardRef) {
-                /*
-                 * Provider will be loaded shortly in resolveComponentHost() once we pass the current
-                 * Barrier. We cannot load it here because doing so could incorrectly evaluate the
-                 * staticity of the dependency tree and lead to undefined / null injection.
-                 */
-                break;
-            }
+            /*
+             * Stop at the first direct export match. Continuing when the provider is
+             * already resolved would let a later import (e.g. a global forRoot module)
+             * override an explicit forFeature import for the same token.
+             */
+            break;
         }
         return instanceWrapperRef;
     }

package/injector/module-ref.js

@@ -56,9 +56,9 @@ class ModuleRef extends abstract_instance_resolver_1.AbstractInstanceResolver {
                 isPending: false,
             });
         }
-        return new Promise(async (resolve, reject) => {
-            try {
-                const callback = async (instances) => {
+        return new Promise((resolve, reject) => {
+            const callback = async (instances) => {
+                try {
                     const properties = await this.injector.resolveProperties(wrapper, moduleRef, undefined, {
                         contextId: contextId ?? constants_1.STATIC_CONTEXT,
                         inquirer: wrapper,
@@ -66,15 +66,17 @@ class ModuleRef extends abstract_instance_resolver_1.AbstractInstanceResolver {
                     const instance = new type(...instances);
                     this.injector.applyProperties(instance, properties);
                     resolve(instance);
-                };
-                await this.injector.resolveConstructorParams(wrapper, moduleRef, undefined, callback, {
-                    contextId: contextId ?? constants_1.STATIC_CONTEXT,
-                    inquirer: wrapper,
-                });
-            }
-            catch (err) {
-                reject(err);
-            }
+                }
+                catch (err) {
+                    reject(err);
+                }
+            };
+            this.injector
+                .resolveConstructorParams(wrapper, moduleRef, undefined, callback, {
+                contextId: contextId ?? constants_1.STATIC_CONTEXT,
+                inquirer: wrapper,
+            })
+                .catch(reject);
         });
     }
 }

package/middleware/builder.js

@@ -73,7 +73,11 @@ MiddlewareBuilder.ConfigProxy = class {
             .map(route => ({
             method: route.method,
             path: route.path,
-            regex: new RegExp('^(' + route.path.replace(regexMatchParams, wildcard) + ')$', 'g'),
+            // No `g` flag: each regex is reused across every route below, and a
+            // global regex advances `lastIndex` on a match, so the next `test()`
+            // would resume mid-string and fail the `^` anchor. The pattern is
+            // anchored and only used with `test()`, so `g` buys nothing anyway.
+            regex: new RegExp('^(' + route.path.replace(regexMatchParams, wildcard) + ')$'),
         }));
         return routes.filter(route => {
             const isOverlapped = (item) => {

package/nest-application-context.js

@@ -104,17 +104,10 @@ class NestApplicationContext extends abstract_instance_resolver_1.AbstractInstan
         if (this.isInitialized) {
             return this;
         }
-        /* eslint-disable-next-line no-async-promise-executor */
-        this.initializationPromise = new Promise(async (resolve, reject) => {
-            try {
-                await this.callInitHook();
-                await this.callBootstrapHook();
-                resolve();
-            }
-            catch (err) {
-                reject(err);
-            }
-        });
+        this.initializationPromise = (async () => {
+            await this.callInitHook();
+            await this.callBootstrapHook();
+        })();
         await this.initializationPromise;
         this.isInitialized = true;
         return this;

package/nest-application.d.ts

@@ -62,4 +62,5 @@ export declare class NestApplication extends NestApplicationContext<NestApplicat
     private getProtocol;
     private registerMiddleware;
     private applyInstanceDecoratorIfRegistered;
+    private applyFunctionDecoratorIfRegistered;
 }

package/nest-application.js

@@ -151,7 +151,7 @@ class NestApplication extends nest_application_context_1.NestApplicationContext
         return this;
     }
     use(...args) {
-        this.httpAdapter.use(...args);
+        this.httpAdapter.use(...this.applyFunctionDecoratorIfRegistered(args));
         return this;
     }
     useBodyParser(...args) {
@@ -329,5 +329,19 @@ class NestApplication extends nest_application_context_1.NestApplicationContext
         }
         return instances;
     }
+    applyFunctionDecoratorIfRegistered(args) {
+        if (!this.appOptions.instrument?.instanceDecorator) {
+            return args;
+        }
+        const [firstArg, secondArg] = args;
+        return [
+            (0, shared_utils_1.isFunction)(firstArg)
+                ? this.appOptions.instrument.instanceDecorator(firstArg)
+                : firstArg,
+            (0, shared_utils_1.isFunction)(secondArg)
+                ? this.appOptions.instrument.instanceDecorator(secondArg)
+                : secondArg,
+        ];
+    }
 }
 exports.NestApplication = NestApplication;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/core",
-  "version": "11.1.28",
+  "version": "11.1.29",
   "description": "Nest - modern, fast, powerful node.js web framework (@core)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -28,7 +28,7 @@
     "uid": "2.0.2"
   },
   "devDependencies": {
-    "@nestjs/common": "11.1.28"
+    "@nestjs/common": "11.1.29"
   },
   "peerDependencies": {
     "@nestjs/common": "^11.0.0",
@@ -49,5 +49,5 @@
       "optional": true
     }
   },
-  "gitHead": "dfaa376170168d12d9d28bcfe137a9bacce579a3"
+  "gitHead": "03587a112ebbbb53a6bc3875afb5a9205aa5a5f1"
 }

package/router/sse-stream.d.ts

@@ -22,6 +22,7 @@ export type HeaderStream = WritableHeaderStream & ReadHeaders;
  * - type
  * - id
  * - retry
+ * - comment
  *
  * If constructed with a HTTP Request, it will optimise the socket for streaming.
  * If this stream is piped to an HTTP Response, it will set appropriate headers.

package/router/sse-stream.js

@@ -3,14 +3,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SseStream = void 0;
 const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
 const stream_1 = require("stream");
+function serializeSseLines(value, prefix) {
+    return value
+        .split(/\r\n|\r|\n/)
+        .map(line => `${prefix}${line}\n`)
+        .join('');
+}
 function toDataString(data) {
     if ((0, shared_utils_1.isObject)(data)) {
         return toDataString(JSON.stringify(data));
     }
-    return data
-        .split(/\r\n|\r|\n/)
-        .map(line => `data: ${line}\n`)
-        .join('');
+    return serializeSseLines(data, 'data: ');
+}
+function toCommentString(comment) {
+    return serializeSseLines(comment, ': ');
+}
+function isCommentOnly(message) {
+    return (!(0, shared_utils_1.isNil)(message.comment) &&
+        (0, shared_utils_1.isUndefined)(message.data) &&
+        (0, shared_utils_1.isUndefined)(message.type) &&
+        (0, shared_utils_1.isUndefined)(message.retry));
 }
 /**
  * Adapted from https://raw.githubusercontent.com/EventSource/node-ssestream
@@ -21,6 +33,7 @@ function toDataString(data) {
  * - type
  * - id
  * - retry
+ * - comment
  *
  * If constructed with a HTTP Request, it will optimise the socket for streaming.
  * If this stream is piped to an HTTP Response, it will set appropriate headers.
@@ -84,12 +97,10 @@ class SseStream extends stream_1.Transform {
         this.commitHeaders();
         const sanitize = (val) => String(val).replace(/[\r\n]/g, '');
         let data = message.type ? `event: ${sanitize(message.type)}\n` : '';
-        data +=
-            message.id !== undefined && message.id !== null
-                ? `id: ${sanitize(message.id)}\n`
-                : '';
-        data += message.retry ? `retry: ${sanitize(message.retry)}\n` : '';
-        data += message.data ? toDataString(message.data) : '';
+        data += !(0, shared_utils_1.isNil)(message.id) ? `id: ${sanitize(message.id)}\n` : '';
+        data += !(0, shared_utils_1.isNil)(message.retry) ? `retry: ${sanitize(message.retry)}\n` : '';
+        data += !(0, shared_utils_1.isNil)(message.comment) ? toCommentString(message.comment) : '';
+        data += !(0, shared_utils_1.isNil)(message.data) ? toDataString(message.data) : '';
         data += '\n';
         this.push(data);
         callback();
@@ -98,7 +109,7 @@ class SseStream extends stream_1.Transform {
      * Calls `.write` but handles the drain if needed
      */
     writeMessage(message, cb) {
-        if (message.id === undefined || message.id === null) {
+        if ((0, shared_utils_1.isNil)(message.id) && !isCommentOnly(message)) {
             this.lastEventId++;
             message.id = this.lastEventId.toString();
         }