@lenne.tech/nest-server 11.1.14 → 11.2.0

package/dist/types/graphql-upload.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Type definitions for graphql-upload
+ * graphql-upload uses deep imports, so we declare types for the specific modules
+ */
+
+declare module 'graphql-upload/graphqlUploadExpress.js' {
+  import { RequestHandler } from 'express';
+
+  interface GraphQLUploadOptions {
+    maxFiles?: number;
+    maxFileSize?: number;
+  }
+
+  function graphqlUploadExpress(options?: GraphQLUploadOptions): RequestHandler;
+
+  export = graphqlUploadExpress;
+}
+
+declare module 'graphql-upload/GraphQLUpload.js' {
+  import { GraphQLScalarType } from 'graphql';
+
+  const GraphQLUpload: GraphQLScalarType;
+
+  export = GraphQLUpload;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "11.1.14",
+  "version": "11.2.0",
   "description": "Modern, fast, powerful Node.js web framework in TypeScript based on Nest with a GraphQL API and a connection to MongoDB (or other databases).",
   "keywords": [
     "node",
@@ -14,7 +14,9 @@
   "homepage": "https://github.com/lenneTech/nest-server",
   "license": "MIT",
   "scripts": {
-    "build": "rimraf dist && nest build",
+    "build": "rimraf dist && nest build && npm run build:copy-types && npm run build:add-type-references",
+    "build:copy-types": "mkdir -p dist/types && cp src/types/*.d.ts dist/types/",
+    "build:add-type-references": "node scripts/add-type-references.js",
     "build:pack": "npm pack && echo 'use file:/ROOT_PATH_TO_TGZ_FILE to integrate the package'",
     "build:dev": "npm run build && yalc push --private",
     "docs": "npm run docs:ci && open http://127.0.0.1:8080/ && open ./public/index.html && compodoc -p tsconfig.json -s ",
@@ -65,15 +67,13 @@
     "node": ">= 20"
   },
   "dependencies": {
-    "@apollo/gateway": "2.11.2",
-    "@getbrevo/brevo": "1.0.1",
-    "@lenne.tech/mongoose-gridfs": "1.4.2",
-    "@lenne.tech/multer-gridfs-storage": "5.0.8",
+    "@apollo/gateway": "2.11.3",
+    "@getbrevo/brevo": "3.0.1",
     "@nestjs/apollo": "13.1.0",
     "@nestjs/common": "11.1.6",
     "@nestjs/core": "11.1.6",
     "@nestjs/graphql": "13.1.0",
-    "@nestjs/jwt": "11.0.0",
+    "@nestjs/jwt": "11.0.1",
     "@nestjs/mongoose": "11.0.3",
     "@nestjs/passport": "11.0.5",
     "@nestjs/platform-express": "11.1.6",
@@ -82,7 +82,7 @@
     "@nestjs/terminus": "11.0.0",
     "apollo-server-core": "3.13.0",
     "apollo-server-express": "3.13.0",
-    "bcrypt": "5.1.1",
+    "bcrypt": "6.0.0",
     "class-transformer": "0.5.1",
     "class-validator": "0.14.2",
     "compression": "1.8.1",
@@ -98,8 +98,8 @@
     "light-my-request": "6.6.0",
     "lodash": "4.17.21",
     "mongodb": "6.20.0",
-    "mongoose": "7.8.7",
-    "multer": "1.4.5-lts.2",
+    "mongoose": "8.19.1",
+    "multer": "2.0.2",
     "node-mailjet": "6.0.9",
     "nodemailer": "7.0.9",
     "nodemon": "3.1.10",
@@ -116,7 +116,7 @@
     "@compodoc/compodoc": "1.1.31",
     "@lenne.tech/eslint-config-ts": "2.1.3",
     "@nestjs/cli": "11.0.10",
-    "@nestjs/schematics": "11.0.8",
+    "@nestjs/schematics": "11.0.9",
     "@nestjs/testing": "11.1.6",
     "@swc/cli": "0.7.8",
     "@swc/core": "1.13.5",
@@ -125,11 +125,11 @@
     "@types/cookie-parser": "1.4.9",
     "@types/ejs": "3.1.5",
     "@types/express": "4.17.21",
-    "@types/jest": "29.5.14",
+    "@types/jest": "30.0.0",
     "@types/lodash": "4.17.20",
-    "@types/multer": "1.4.12",
-    "@types/node": "22.15.17",
-    "@types/nodemailer": "6.4.17",
+    "@types/multer": "2.0.0",
+    "@types/node": "24.7.1",
+    "@types/nodemailer": "7.0.2",
     "@types/passport": "1.0.17",
     "@types/supertest": "6.0.3",
     "@typescript-eslint/eslint-plugin": "8.46.0",
@@ -145,28 +145,26 @@
     "grunt-contrib-watch": "1.1.0",
     "grunt-sync": "0.8.2",
     "husky": "9.1.7",
-    "jest": "29.7.0",
+    "jest": "30.2.0",
     "npm-watch": "0.13.0",
     "pm2": "6.0.13",
     "prettier": "3.6.2",
     "pretty-quick": "4.2.2",
     "supertest": "7.1.4",
-    "ts-jest": "29.4.4",
+    "ts-jest": "29.4.5",
     "ts-loader": "9.5.4",
-    "ts-morph": "25.0.1",
+    "ts-morph": "27.0.0",
     "ts-node": "10.9.2",
     "tsconfig-paths": "4.2.0",
-    "typescript": "5.8.3",
+    "typescript": "5.9.3",
     "yalc": "1.0.0-pre.53"
   },
   "overrides": {
-    "multer-gridfs-storage": {
-      "multer": "$multer"
-    },
     "@lykmapipo/common": {
       "flat": "5.0.2",
       "mime": "2.6.0"
-    }
+    },
+    "ts-morph": "27.0.0"
   },
   "jest": {
     "collectCoverage": true,

package/src/core/common/helpers/gridfs.helper.ts

@@ -0,0 +1,227 @@
+import { mongo, Types } from 'mongoose';
+import { Readable } from 'stream';
+
+// Use Mongoose's MongoDB types to avoid BSON version conflicts
+const ObjectId = Types.ObjectId;
+
+/**
+ * GridFS File Info interface matching the structure from GridFS
+ * This is the normalized structure with contentType at root level
+ */
+export interface GridFSFileInfo {
+  _id: Types.ObjectId;
+  chunkSize: number;
+  /**
+   * Content type of the file
+   * Note: Stored in metadata.contentType in MongoDB, normalized to root level by helper
+   */
+  contentType?: string;
+  filename: string;
+  length: number;
+  metadata?: Record<string, any> & { contentType?: string };
+  uploadDate: Date;
+}
+
+/**
+ * Options for reading files from GridFS
+ */
+export interface GridFSReadOptions {
+  _id?: string | Types.ObjectId;
+  filename?: string;
+}
+/**
+ * Options for writing files to GridFS
+ */
+export interface GridFSWriteOptions {
+  contentType?: string;
+  filename: string;
+  metadata?: Record<string, any>;
+}
+
+type GridFSBucket = mongo.GridFSBucket;
+
+type GridFSBucketReadStream = mongo.GridFSBucketReadStream;
+
+/**
+ * Raw GridFS file structure as returned by MongoDB
+ * This is the internal structure before normalization
+ */
+interface RawGridFSFile {
+  _id: Types.ObjectId;
+  chunkSize: number;
+  filename: string;
+  length: number;
+  metadata?: Record<string, any> & { contentType?: string };
+  uploadDate: Date;
+}
+
+/**
+ * Helper class for GridFS operations using native MongoDB driver
+ * Provides Promise-based API for all GridFS operations
+ */
+export class GridFSHelper {
+  /**
+   * Normalize file info to ensure contentType is accessible at root level
+   * MongoDB stores contentType in metadata, but our API expects it at root
+   */
+  private static normalizeFileInfo(fileInfo: RawGridFSFile): GridFSFileInfo {
+    return {
+      ...fileInfo,
+      contentType: fileInfo.metadata?.contentType,
+    };
+  }
+
+  /**
+   * Write a file to GridFS from a stream
+   */
+  static writeFileFromStream(
+    bucket: GridFSBucket,
+    stream: Readable,
+    options: GridFSWriteOptions,
+  ): Promise<GridFSFileInfo> {
+    return new Promise((resolve, reject) => {
+      // Store contentType in metadata to avoid deprecation warning
+      const metadata = { ...options.metadata };
+      if (options.contentType) {
+        metadata.contentType = options.contentType;
+      }
+
+      const uploadStream = bucket.openUploadStream(options.filename, {
+        metadata,
+      });
+
+      uploadStream.on('error', (error) => {
+        reject(error);
+      });
+
+      uploadStream.on('finish', () => {
+        // Fetch the file info after upload completes
+        bucket
+          .find({ _id: uploadStream.id })
+          .toArray()
+          .then((files) => {
+            if (files && files.length > 0) {
+              resolve(GridFSHelper.normalizeFileInfo(files[0]));
+            } else {
+              reject(new Error('File uploaded but metadata not found'));
+            }
+          })
+          .catch(reject);
+      });
+
+      stream.pipe(uploadStream);
+    });
+  }
+
+  /**
+   * Read a file from GridFS to a buffer
+   */
+  static readFileToBuffer(bucket: GridFSBucket, options: GridFSReadOptions): Promise<Buffer> {
+    return new Promise((resolve, reject) => {
+      const chunks: Buffer[] = [];
+      let downloadStream: GridFSBucketReadStream;
+
+      if (options._id) {
+        const objectId = typeof options._id === 'string' ? new ObjectId(options._id) : options._id;
+        downloadStream = bucket.openDownloadStream(objectId);
+      } else if (options.filename) {
+        downloadStream = bucket.openDownloadStreamByName(options.filename);
+      } else {
+        return reject(new Error('Either _id or filename must be provided'));
+      }
+
+      downloadStream.on('data', (chunk) => {
+        chunks.push(chunk);
+      });
+
+      downloadStream.on('error', (error) => {
+        reject(error);
+      });
+
+      downloadStream.on('end', () => {
+        resolve(Buffer.concat(chunks));
+      });
+    });
+  }
+
+  /**
+   * Find file metadata by ID
+   */
+  static async findFileById(bucket: GridFSBucket, id: string | Types.ObjectId): Promise<GridFSFileInfo | null> {
+    const objectId = typeof id === 'string' ? new ObjectId(id) : id;
+    const files = await bucket.find({ _id: objectId }).toArray();
+    return files.length > 0 ? GridFSHelper.normalizeFileInfo(files[0]) : null;
+  }
+
+  /**
+   * Find file metadata by filename
+   */
+  static async findFileByName(bucket: GridFSBucket, filename: string): Promise<GridFSFileInfo | null> {
+    const files = await bucket.find({ filename }).toArray();
+    return files.length > 0 ? GridFSHelper.normalizeFileInfo(files[0]) : null;
+  }
+
+  /**
+   * Find files with filter and options
+   */
+  static async findFiles(bucket: GridFSBucket, filter: any = {}, options: any = {}): Promise<GridFSFileInfo[]> {
+    const files = await bucket.find(filter, options).toArray();
+    return files.map(file => GridFSHelper.normalizeFileInfo(file));
+  }
+
+  /**
+   * Delete a file from GridFS
+   */
+  static async deleteFile(bucket: GridFSBucket, id: string | Types.ObjectId): Promise<void> {
+    const objectId = typeof id === 'string' ? new ObjectId(id) : id;
+    await bucket.delete(objectId);
+  }
+
+  /**
+   * Open download stream by ID
+   */
+  static openDownloadStream(bucket: GridFSBucket, id: string | Types.ObjectId): GridFSBucketReadStream {
+    const objectId = typeof id === 'string' ? new ObjectId(id) : id;
+    return bucket.openDownloadStream(objectId);
+  }
+
+  /**
+   * Open download stream by name
+   */
+  static openDownloadStreamByName(bucket: GridFSBucket, filename: string): GridFSBucketReadStream {
+    return bucket.openDownloadStreamByName(filename);
+  }
+
+  /**
+   * Open upload stream
+   */
+  static openUploadStream(
+    bucket: GridFSBucket,
+    filename: string,
+    options?: { contentType?: string },
+  ): mongo.GridFSBucketWriteStream {
+    // Store contentType in metadata to avoid deprecation warning
+    if (options?.contentType) {
+      const metadata = { contentType: options.contentType };
+      return bucket.openUploadStream(filename, { metadata });
+    }
+    return bucket.openUploadStream(filename, options);
+  }
+
+  /**
+   * Open upload stream with specific ID
+   */
+  static openUploadStreamWithId(
+    bucket: GridFSBucket,
+    id: Types.ObjectId,
+    filename: string,
+    options?: { contentType?: string },
+  ): mongo.GridFSBucketWriteStream {
+    // Store contentType in metadata to avoid deprecation warning
+    if (options?.contentType) {
+      const metadata = { contentType: options.contentType };
+      return bucket.openUploadStreamWithId(id, filename, { metadata });
+    }
+    return bucket.openUploadStreamWithId(id, filename, options);
+  }
+}

package/src/core/common/services/brevo.service.ts

@@ -1,4 +1,4 @@
-import brevo = require('@getbrevo/brevo');
+import { SendSmtpEmail, TransactionalEmailsApi, TransactionalEmailsApiApiKeys } from '@getbrevo/brevo';
 import { Injectable } from '@nestjs/common';
 
 import { ConfigService } from './config.service';
@@ -9,15 +9,15 @@ import { ConfigService } from './config.service';
 @Injectable()
 export class BrevoService {
   brevoConfig: ConfigService['configFastButReadOnly']['brevo'];
+  private apiInstance: TransactionalEmailsApi;
 
   constructor(protected configService: ConfigService) {
-    const defaultClient = brevo.ApiClient.instance;
-    const apiKey = defaultClient.authentications['api-key'];
     this.brevoConfig = configService.configFastButReadOnly.brevo;
     if (!this.brevoConfig) {
       throw new Error('Brevo configuration not set!');
     }
-    apiKey.apiKey = this.brevoConfig.apiKey;
+    this.apiInstance = new TransactionalEmailsApi();
+    this.apiInstance.setApiKey(TransactionalEmailsApiApiKeys.apiKey, this.brevoConfig.apiKey);
   }
 
   /**
@@ -37,14 +37,15 @@ export class BrevoService {
       }
 
       // Prepare data
-      const apiInstance = new brevo.TransactionalEmailsApi();
-      const sendSmtpEmail = new brevo.SendSmtpEmail();
-      sendSmtpEmail.templateId = templateId;
-      sendSmtpEmail.to = [{ email: to }];
-      sendSmtpEmail.params = params;
+      const sendSmtpEmail: SendSmtpEmail = {
+        params,
+        templateId,
+        to: [{ email: to }],
+      };
 
       // Send email
-      return await apiInstance.sendTransacEmail(sendSmtpEmail);
+      const result = await this.apiInstance.sendTransacEmail(sendSmtpEmail);
+      return result.body;
     } catch (error) {
       console.error(error);
     }
@@ -75,16 +76,17 @@ export class BrevoService {
       }
 
       // Prepare data
-      const apiInstance = new brevo.TransactionalEmailsApi();
-      const sendSmtpEmail = new brevo.SendSmtpEmail();
-      sendSmtpEmail.htmlContent = html;
-      sendSmtpEmail.params = options?.params;
-      sendSmtpEmail.sender = this.brevoConfig.sender;
-      sendSmtpEmail.subject = subject;
-      sendSmtpEmail.to = [{ email: to }];
+      const sendSmtpEmail: SendSmtpEmail = {
+        htmlContent: html,
+        params: options?.params,
+        sender: this.brevoConfig.sender,
+        subject,
+        to: [{ email: to }],
+      };
 
       // Send email
-      return await apiInstance.sendTransacEmail(sendSmtpEmail);
+      const result = await this.apiInstance.sendTransacEmail(sendSmtpEmail);
+      return result.body;
     } catch (error) {
       console.error(error);
     }

package/src/core/common/services/crud.service.ts

@@ -105,7 +105,7 @@ export abstract class CrudService<
    * Get distinct values of a property
    */
   distinct(property: string): Promise<string[]> {
-    return this.mainDbModel.distinct(property);
+    return this.mainDbModel.distinct(property).exec() as Promise<string[]>;
   }
 
   /**
@@ -178,7 +178,7 @@ export abstract class CrudService<
           find = find.collation(collation);
         }
         if (serviceOptions?.select) {
-          find = find.select(serviceOptions.select);
+          find = find.select(serviceOptions.select) as any;
         }
         return find.exec();
       },
@@ -401,7 +401,7 @@ export abstract class CrudService<
           find = find.collation(collation);
         }
         if (serviceOptions?.select) {
-          find = find.select(serviceOptions.select);
+          find = find.select(serviceOptions.select) as any;
         }
         return find.exec();
       },

package/src/core/modules/file/core-file.controller.ts

@@ -1,4 +1,5 @@
 import { BadRequestException, Controller, Get, NotFoundException, Param, Res } from '@nestjs/common';
+import { Response } from 'express';
 
 import { Roles } from '../../common/decorators/roles.decorator';
 import { RoleEnum } from '../../common/enums/role.enum';
@@ -20,7 +21,7 @@ export abstract class CoreFileController {
    */
   @Get(':filename')
   @Roles(RoleEnum.S_EVERYONE)
-  async getFile(@Param('filename') filename: string, @Res() res) {
+  async getFile(@Param('filename') filename: string, @Res() res: Response) {
     if (!filename) {
       throw new BadRequestException('Missing filename for download');
     }
@@ -30,7 +31,7 @@ export abstract class CoreFileController {
       throw new NotFoundException('File not found');
     }
     const filestream = await this.fileService.getFileStream(file.id);
-    res.header('Content-Type', file.contentType);
+    res.header('Content-Type', file.contentType || 'application/octet-stream');
     res.header('Content-Disposition', `attachment; filename=${file.filename}`);
     return filestream.pipe(res);
   }