@nestjs/platform-fastify 9.4.2 → 10.0.0

package/adapters/fastify-adapter.d.ts

@@ -8,7 +8,7 @@ import { AbstractHttpAdapter } from '@nestjs/core/adapters/http-adapter';
 import { FastifyBaseLogger, FastifyBodyParser, FastifyInstance, FastifyPluginAsync, FastifyPluginCallback, FastifyRegister, FastifyReply, FastifyRequest, FastifyServerOptions, RawReplyDefaultExpression, RawRequestDefaultExpression, RawServerBase, RawServerDefault, RequestGenericInterface } from 'fastify';
 import * as http2 from 'http2';
 import * as https from 'https';
-import { Chain as LightMyRequestChain, InjectOptions, Response as LightMyRequestResponse } from 'light-my-request';
+import { InjectOptions, Chain as LightMyRequestChain, Response as LightMyRequestResponse } from 'light-my-request';
 import { NestFastifyBodyParserOptions } from '../interfaces';
 import { FastifyStaticOptions, FastifyViewOptions } from '../interfaces/external';
 type FastifyHttp2SecureOptions<Server extends http2.Http2SecureServer, Logger extends FastifyBaseLogger = FastifyBaseLogger> = FastifyServerOptions<Server, Logger> & {

package/adapters/fastify-adapter.js

@@ -8,6 +8,7 @@ const http_adapter_1 = require("@nestjs/core/adapters/http-adapter");
 const fastify_1 = require("fastify");
 const Reply = require("fastify/lib/reply");
 const symbols_1 = require("fastify/lib/symbols");
+const pathToRegexp = require("path-to-regexp");
 // `querystring` is used internally in fastify for registering urlencoded body parser.
 const querystring_1 = require("querystring");
 /**
@@ -56,11 +57,10 @@ class FastifyAdapter extends http_adapter_1.AbstractHttpAdapter {
                 };
             },
             deriveConstraint: (req) => {
-                var _a, _b, _c, _d;
                 // Media Type (Accept Header) Versioning Handler
                 if (this.versioningOptions.type === common_1.VersioningType.MEDIA_TYPE) {
                     const MEDIA_TYPE_HEADER = 'Accept';
-                    const acceptHeaderValue = (((_a = req.headers) === null || _a === void 0 ? void 0 : _a[MEDIA_TYPE_HEADER]) || ((_b = req.headers) === null || _b === void 0 ? void 0 : _b[MEDIA_TYPE_HEADER.toLowerCase()]));
+                    const acceptHeaderValue = (req.headers?.[MEDIA_TYPE_HEADER] || req.headers?.[MEDIA_TYPE_HEADER.toLowerCase()]);
                     const acceptHeaderVersionParameter = acceptHeaderValue
                         ? acceptHeaderValue.split(';')[1]
                         : '';
@@ -70,8 +70,8 @@ class FastifyAdapter extends http_adapter_1.AbstractHttpAdapter {
                 }
                 // Header Versioning Handler
                 else if (this.versioningOptions.type === common_1.VersioningType.HEADER) {
-                    const customHeaderVersionParameter = ((_c = req.headers) === null || _c === void 0 ? void 0 : _c[this.versioningOptions.header]) ||
-                        ((_d = req.headers) === null || _d === void 0 ? void 0 : _d[this.versioningOptions.header.toLowerCase()]);
+                    const customHeaderVersionParameter = req.headers?.[this.versioningOptions.header] ||
+                        req.headers?.[this.versioningOptions.header.toLowerCase()];
                     return (0, shared_utils_1.isUndefined)(customHeaderVersionParameter)
                         ? common_1.VERSION_NEUTRAL // No version was supplied
                         : customHeaderVersionParameter;
@@ -86,9 +86,12 @@ class FastifyAdapter extends http_adapter_1.AbstractHttpAdapter {
         };
         const instance = instanceOrOptions && instanceOrOptions.server
             ? instanceOrOptions
-            : (0, fastify_1.fastify)(Object.assign({ constraints: {
+            : (0, fastify_1.fastify)({
+                constraints: {
                     version: this.versionConstraint,
-                } }, instanceOrOptions));
+                },
+                ...instanceOrOptions,
+            });
         this.setInstance(instance);
     }
     async init() {
@@ -180,7 +183,7 @@ class FastifyAdapter extends http_adapter_1.AbstractHttpAdapter {
         }
         if (fastifyReply.getHeader('Content-Type') !== undefined &&
             fastifyReply.getHeader('Content-Type') !== 'application/json' &&
-            (body === null || body === void 0 ? void 0 : body.statusCode) >= common_1.HttpStatus.BAD_REQUEST) {
+            body?.statusCode >= common_1.HttpStatus.BAD_REQUEST) {
             common_1.Logger.warn("Content-Type doesn't match Reply body, you might need a custom ExceptionFilter for non-JSON responses", FastifyAdapter.name);
             fastifyReply.header('Content-Type', 'application/json');
         }
@@ -200,7 +203,7 @@ class FastifyAdapter extends http_adapter_1.AbstractHttpAdapter {
         return response && response.view(view, options);
     }
     redirect(response, statusCode, url) {
-        const code = statusCode !== null && statusCode !== void 0 ? statusCode : common_1.HttpStatus.FOUND;
+        const code = statusCode ?? common_1.HttpStatus.FOUND;
         return response.status(code).redirect(url);
     }
     setErrorHandler(handler) {
@@ -273,7 +276,10 @@ class FastifyAdapter extends http_adapter_1.AbstractHttpAdapter {
         this._isParserRegistered = true;
     }
     useBodyParser(type, rawBody, options, parser) {
-        const parserOptions = Object.assign(Object.assign({}, (options || {})), { parseAs: 'buffer' });
+        const parserOptions = {
+            ...(options || {}),
+            parseAs: 'buffer',
+        };
         this.getInstance().addContentTypeParser(type, parserOptions, (req, body, done) => {
             if (rawBody === true && Buffer.isBuffer(body)) {
                 req.rawBody = body;
@@ -298,9 +304,19 @@ class FastifyAdapter extends http_adapter_1.AbstractHttpAdapter {
                 : path;
             // Fallback to "(.*)" to support plugins like GraphQL
             normalizedPath = normalizedPath === '/(.*)' ? '(.*)' : normalizedPath;
+            const re = pathToRegexp(normalizedPath);
             // The following type assertion is valid as we use import('@fastify/middie') rather than require('@fastify/middie')
             // ref https://github.com/fastify/middie/pull/55
-            this.instance.use(normalizedPath, callback);
+            this.instance.use(normalizedPath, (req, res, next) => {
+                const queryParamsIndex = req.originalUrl.indexOf('?');
+                const pathname = queryParamsIndex >= 0
+                    ? req.originalUrl.slice(0, queryParamsIndex)
+                    : req.originalUrl;
+                if (!re.exec(pathname + '/') && normalizedPath) {
+                    return next();
+                }
+                return callback(req, res, next);
+            });
         };
     }
     getType() {

package/interfaces/nest-fastify-application.interface.d.ts

@@ -1,13 +1,19 @@
 /// <reference types="node" />
-import { INestApplication } from '@nestjs/common';
-import { FastifyBodyParser, FastifyInstance, FastifyPluginAsync, FastifyPluginCallback, FastifyPluginOptions, FastifyRegisterOptions, RawServerBase } from 'fastify';
+import { INestApplication, HttpServer } from '@nestjs/common';
+import { FastifyBodyParser, FastifyInstance, FastifyPluginAsync, FastifyPluginCallback, FastifyPluginOptions, FastifyRegisterOptions, FastifyRequest, FastifyReply, RawServerBase, RawServerDefault } from 'fastify';
 import { Chain as LightMyRequestChain, InjectOptions, Response as LightMyRequestResponse } from 'light-my-request';
 import { FastifyStaticOptions, FastifyViewOptions } from './external';
 import { NestFastifyBodyParserOptions } from './nest-fastify-body-parser-options.interface';
 /**
  * @publicApi
  */
-export interface NestFastifyApplication extends INestApplication {
+export interface NestFastifyApplication<TServer extends RawServerBase = RawServerDefault> extends INestApplication<TServer> {
+    /**
+     * Returns the underlying HTTP adapter bounded to a Fastify app.
+     *
+     * @returns {HttpServer}
+     */
+    getHttpAdapter(): HttpServer<FastifyRequest, FastifyReply, FastifyInstance>;
     /**
      * A wrapper function around native `fastify.register()` method.
      * Example `app.register(require('@fastify/formbody'))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/platform-fastify",
-  "version": "9.4.2",
+  "version": "10.0.0",
   "description": "Nest - modern, fast, powerful node.js web framework (@platform-fastify)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -18,19 +18,19 @@
     "access": "public"
   },
   "dependencies": {
-    "@fastify/cors": "8.2.1",
+    "@fastify/cors": "8.3.0",
     "@fastify/formbody": "7.4.0",
     "@fastify/middie": "8.3.0",
-    "fastify": "4.17.0",
-    "light-my-request": "5.9.1",
+    "fastify": "4.18.0",
+    "light-my-request": "5.10.0",
     "path-to-regexp": "3.2.0",
-    "tslib": "2.5.2"
+    "tslib": "2.5.3"
   },
   "peerDependencies": {
     "@fastify/static": "^6.0.0",
     "@fastify/view": "^7.0.0",
-    "@nestjs/common": "^9.0.0",
-    "@nestjs/core": "^9.0.0"
+    "@nestjs/common": "^10.0.0",
+    "@nestjs/core": "^10.0.0"
   },
   "peerDependenciesMeta": {
     "@fastify/static": {