@lenne.tech/nest-server 3.3.0 → 3.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "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",
@@ -52,11 +52,11 @@
     "node": ">= 16.13.0"
   },
   "dependencies": {
-    "@apollo/federation": "0.33.9",
-    "@apollo/gateway": "0.42.3",
+    "@apollo/gateway": "0.48.1",
+    "@nestjs/apollo": "10.0.2",
     "@nestjs/common": "8.2.6",
     "@nestjs/core": "8.2.6",
-    "@nestjs/graphql": "9.1.2",
+    "@nestjs/graphql": "10.0.2",
     "@nestjs/jwt": "8.0.0",
     "@nestjs/mongoose": "9.0.2",
     "@nestjs/passport": "8.1.0",
@@ -67,22 +67,24 @@
     "@types/jest": "27.4.0",
     "@types/lodash": "4.14.178",
     "@types/multer": "1.4.7",
-    "@types/node": "16.11.21",
+    "@types/node": "17.0.17",
     "@types/node-mailjet": "3.3.8",
     "@types/nodemailer": "6.4.4",
     "@types/passport": "1.0.7",
     "@types/supertest": "2.0.11",
-    "@typescript-eslint/eslint-plugin": "5.10.0",
-    "@typescript-eslint/parser": "5.10.0",
-    "apollo-server-core": "3.6.2",
-    "apollo-server-express": "3.6.2",
+    "@typescript-eslint/eslint-plugin": "5.11.0",
+    "@typescript-eslint/parser": "5.11.0",
+    "apollo-server-core": "3.6.3",
+    "apollo-server-express": "3.6.3",
     "bcrypt": "5.0.1",
     "class-transformer": "0.5.1",
     "class-validator": "0.13.2",
     "coffeescript": "2.6.1",
     "ejs": "3.1.6",
-    "fastify": "3.27.0",
-    "graphql": "15.8.0",
+    "eslint": "8.9.0",
+    "eslint-config-prettier": "8.3.0",
+    "fastify": "3.27.1",
+    "graphql": "16.3.0",
     "graphql-subscriptions": "2.0.0",
     "grunt": "1.4.1",
     "grunt-bg-shell": "2.3.3",
@@ -90,35 +92,33 @@
     "grunt-contrib-watch": "1.1.0",
     "grunt-sync": "0.8.2",
     "husky": "7.0.4",
-    "jest": "27.4.7",
-    "json-to-graphql-query": "2.2.0",
-    "light-my-request": "4.7.0",
+    "jest": "27.5.1",
+    "json-to-graphql-query": "2.2.2",
+    "light-my-request": "4.7.1",
     "lodash": "4.17.21",
-    "mongodb": "4.3.0",
-    "mongoose": "6.1.7",
+    "mongodb": "4.3.1",
+    "mongoose": "6.2.1",
     "multer": "1.4.4",
     "node-mailjet": "3.3.5",
     "nodemailer": "6.7.2",
     "nodemon": "2.0.15",
     "passport": "0.5.2",
     "passport-jwt": "4.0.0",
+    "prettier": "2.5.1",
+    "pretty-quick": "3.1.3",
     "reflect-metadata": "0.1.13",
     "rimraf": "3.0.2",
-    "rxjs": "7.5.2",
+    "rxjs": "7.5.4",
     "supertest": "6.2.2",
+    "ts-jest": "27.1.3",
     "ts-morph": "13.0.3",
-    "ts-node": "10.4.0",
-    "tsconfig-paths": "3.12.0"
+    "ts-node": "10.5.0",
+    "tsconfig-paths": "3.12.0",
+    "typescript": "4.5.5"
   },
   "devDependencies": {
-    "eslint": "8.7.0",
-    "eslint-config-prettier": "8.3.0",
     "find-file-up": "2.0.1",
-    "pm2": "5.1.2",
-    "prettier": "2.5.1",
-    "pretty-quick": "3.1.3",
-    "ts-jest": "27.1.3",
-    "typescript": "4.5.5"
+    "pm2": "5.1.2"
   },
   "jest": {
     "collectCoverage": true,

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

@@ -10,24 +10,44 @@ export class ServiceHelper {
   /**
    * Prepare input before save
    */
-  static async prepareInput(
-    input: Record<string, any>,
+  static async prepareInput<T = any>(
+    input: T,
     currentUser: { [key: string]: any; id: string },
-    options: { [key: string]: any; create?: boolean; clone?: boolean; removeUndefined?: boolean } = {}
-  ) {
+    options: {
+      [key: string]: any;
+      create?: boolean;
+      clone?: boolean;
+      getNewArray?: boolean;
+      removeUndefined?: boolean;
+    } = {}
+  ): Promise<T> {
     // Configuration
     const config = {
       checkRoles: false,
       clone: false,
       create: false,
+      getNewArray: false,
       removeUndefined: false,
       ...options,
     };
 
+    // Check input
+    if (typeof input !== 'object') {
+      return input;
+    }
+
+    // Process array
+    if (Array.isArray(input)) {
+      const processedArray = input.map(
+        async (item) => await ServiceHelper.prepareInput(item, currentUser, options)
+      ) as any;
+      return config.getNewArray ? processedArray : input;
+    }
+
     // Clone input
     if (config.clone) {
-      if (input.mapDeep && typeof input.mapDeep === 'function') {
-        input = Object.getPrototypeOf(input).mapDeep(input);
+      if ((input as Record<string, any>).mapDeep && typeof (input as any).mapDeep === 'function') {
+        input = await Object.getPrototypeOf(input).mapDeep(input);
       } else {
         input = _.cloneDeep(input);
       }
@@ -39,32 +59,36 @@ export class ServiceHelper {
     }
 
     // Process roles
-    if (config.checkRoles && input.roles && (!currentUser?.hasRole || !currentUser.hasRole(RoleEnum.ADMIN))) {
+    if (
+      config.checkRoles &&
+      (input as Record<string, any>).roles &&
+      (!currentUser?.hasRole || !currentUser.hasRole(RoleEnum.ADMIN))
+    ) {
       if (!(currentUser as any)?.roles) {
         throw new UnauthorizedException('Missing roles of current user');
       } else {
-        const allowedRoles = _.intersection(input.roles, (currentUser as any).roles);
-        if (allowedRoles.length !== input.roles.length) {
-          const missingRoles = _.difference(input.roles, (currentUser as any).roles);
+        const allowedRoles = _.intersection((input as Record<string, any>).roles, (currentUser as any).roles);
+        if (allowedRoles.length !== (input as Record<string, any>).roles.length) {
+          const missingRoles = _.difference((input as Record<string, any>).roles, (currentUser as any).roles);
           throw new UnauthorizedException('Current user not allowed setting roles: ' + missingRoles);
         }
-        input.roles = allowedRoles;
+        (input as Record<string, any>).roles = allowedRoles;
       }
     }
 
     // Hash password
-    if (input.password) {
-      input.password = await bcrypt.hash((input as any).password, 10);
+    if ((input as Record<string, any>).password) {
+      (input as Record<string, any>).password = await bcrypt.hash((input as any).password, 10);
     }
 
     // Set creator
     if (config.create && currentUser) {
-      input.createdBy = currentUser.id;
+      (input as Record<string, any>).createdBy = currentUser.id;
     }
 
     // Set updater
     if (currentUser) {
-      input.updatedBy = currentUser.id;
+      (input as Record<string, any>).updatedBy = currentUser.id;
     }
 
     // Return prepared input
@@ -74,22 +98,40 @@ export class ServiceHelper {
   /**
    * Prepare output before return
    */
-  static async prepareOutput<T = Record<string, any>>(
+  static async prepareOutput<T = { [key: string]: any; map: (...args: any[]) => any }>(
     output: any,
-    options: { [key: string]: any; clone?: boolean; removeUndefined?: boolean; targetModel?: Partial<T> } = {}
-  ) {
+    options: {
+      [key: string]: any;
+      clone?: boolean;
+      getNewArray?: boolean;
+      removeUndefined?: boolean;
+      targetModel?: new (...args: any[]) => T;
+    } = {}
+  ): Promise<T | T[] | any> {
     // Configuration
     const config = {
       clone: false,
+      getNewArray: false,
       removeUndefined: false,
       targetModel: undefined,
       ...options,
     };
 
+    // Check output
+    if (typeof output !== 'object') {
+      return output;
+    }
+
+    // Process array
+    if (Array.isArray(output)) {
+      const processedArray = output.map(async (item) => await ServiceHelper.prepareOutput(item, options)) as any;
+      return config.getNewArray ? processedArray : output;
+    }
+
     // Clone output
     if (config.clone) {
-      if (output.cloneDeep && typeof output.cloneDeep === 'function') {
-        output = Object.getPrototypeOf(output).cloneDeep(output);
+      if (output.mapDeep && typeof output.mapDeep === 'function') {
+        output = await Object.getPrototypeOf(output).mapDeep(output);
       } else {
         output = _.cloneDeep(output);
       }
@@ -97,7 +139,7 @@ export class ServiceHelper {
 
     // Map output if target model exist
     if (config.targetModel) {
-      output = (config.targetModel as any).map(output);
+      output = await (config.targetModel as any).map(output);
     }
 
     // Remove password if exists

package/src/core/common/interfaces/core-persistence-model.interface.ts

@@ -12,5 +12,6 @@ export interface ICorePersistenceModel<T extends CorePersistenceModel = any> {
       merge?: boolean;
     }
   ): any;
+  init(this: new (...args: any[]) => T, ...args: any[]): any;
   [key: string]: any;
 }

package/src/core/common/interfaces/server-options.interface.ts

@@ -1,8 +1,8 @@
-import { GqlModuleOptions } from '@nestjs/graphql';
+import { ApolloDriverConfig } from '@nestjs/apollo';
 import { JwtModuleOptions } from '@nestjs/jwt';
+import { MongooseModuleOptions } from '@nestjs/mongoose/dist/interfaces/mongoose-options.interface';
 import { ServeStaticOptions } from '@nestjs/platform-express/interfaces/serve-static-options.interface';
 import * as SMTPTransport from 'nodemailer/lib/smtp-transport';
-import { MongooseModuleOptions } from '@nestjs/mongoose/dist/interfaces/mongoose-options.interface';
 import { MailjetOptions } from './mailjet-options.interface';
 
 /**
@@ -20,37 +20,7 @@ export interface IServerOptions {
    * see https://docs.nestjs.com/graphql/quick-start
    * and https://www.apollographql.com/docs/apollo-server/api/apollo-server/
    */
-  graphQl?: {
-    /**
-     * Autogenerated schema file
-     * e.g. 'schema.gql'
-     */
-    autoSchemaFile?: string;
-
-    /**
-     * Function for context manipulation
-     * e.g. ({ req }) => ({ req })
-     */
-    context?: (context: { [key: string]: any; req: any }) => { [key: string]: any; req: any };
-
-    /**
-     * Enables and disables development mode helpers of apollo
-     * e.g. true
-     */
-    debug?: boolean;
-
-    /**
-     * Determines whether or not to install subscription handlers
-     * e.g. true
-     */
-    installSubscriptionHandlers?: boolean;
-
-    /**
-     * Enables and disables schema introspection
-     * e.g. true
-     */
-    introspection?: boolean;
-  } & GqlModuleOptions;
+  graphQl?: ApolloDriverConfig;
 
   /**
    * Configuration of JavaScript Web Token (JWT) module

package/src/core/common/models/core-model.model.ts

@@ -28,14 +28,19 @@ export abstract class CoreModel {
     options: {
       cloneDeep?: boolean;
       funcAllowed?: boolean;
-      init?: boolean;
+      init?: any;
       item?: T;
       mapId?: boolean;
     } = {}
   ): T {
+    const config = {
+      init: true,
+      ...options,
+    };
+
     const item = options.item || new this();
     delete options.item;
-    return item.map(data, options);
+    return item.map(data, config);
   }
 
   /**
@@ -52,14 +57,19 @@ export abstract class CoreModel {
     options: {
       cloneDeep?: boolean;
       funcAllowed?: boolean;
-      init?: boolean;
+      init?: any;
       item?: T;
       mapId?: boolean;
     } = {}
   ): T {
+    const config = {
+      init: true,
+      ...options,
+    };
+
     const item = options.item || new this();
     delete options.item;
-    return item.mapDeep(data, options);
+    return item.mapDeep(data, config);
   }
 
   /**
@@ -105,14 +115,14 @@ export abstract class CoreModel {
     options: {
       cloneDeep?: boolean;
       funcAllowed?: boolean;
-      init?: boolean;
+      init?: any;
       mapId?: boolean;
     } = {}
   ): this {
     const config = {
       cloneDeep: true,
       funcAllowed: false,
-      init: false,
+      init: undefined,
       mapId: false,
       ...options,
     };

package/src/core/common/models/core-persistence.model.ts

@@ -87,7 +87,7 @@ export abstract class CorePersistenceModel extends CoreModel {
   updatedAt: Date = undefined;
 
   // ===========================================================================
-  // Properties
+  // Methods
   // ===========================================================================
 
   /**

package/src/core.module.ts

@@ -10,6 +10,7 @@ import { EmailService } from './core/common/services/email.service';
 import { TemplateService } from './core/common/services/template.service';
 import { MongooseModule } from '@nestjs/mongoose';
 import { MailjetService } from './core/common/services/mailjet.service';
+import { ApolloDriver, ApolloDriverConfig } from '@nestjs/apollo';
 
 /**
  * Core module (dynamic)
@@ -106,7 +107,7 @@ export class CoreModule {
       module: CoreModule,
       imports: [
         MongooseModule.forRoot(config.mongoose.uri, config.mongoose.options),
-        GraphQLModule.forRoot(config.graphQl),
+        GraphQLModule.forRoot<ApolloDriverConfig>(Object.assign({ driver: ApolloDriver }, config.graphQl)),
       ],
       providers,
       exports: [ConfigService, EmailService, TemplateService, MailjetService],

package/src/server/common/models/persistence.model.ts

@@ -1,3 +1,4 @@
+import { Types } from 'mongoose';
 import * as mongoose from 'mongoose';
 import { Prop } from '@nestjs/mongoose';
 import { Field, ObjectType } from '@nestjs/graphql';
@@ -24,7 +25,7 @@ export abstract class PersistenceModel extends CorePersistenceModel {
     nullable: true,
   })
   @Prop({ type: mongoose.Schema.Types.ObjectId, ref: 'User' })
-  createdBy?: User = undefined;
+  createdBy?: Types.ObjectId | User = undefined;
 
   /**
    * User who last updated the object
@@ -36,7 +37,7 @@ export abstract class PersistenceModel extends CorePersistenceModel {
     nullable: true,
   })
   @Prop({ type: mongoose.Schema.Types.ObjectId, ref: 'User' })
-  updatedBy?: User = undefined;
+  updatedBy?: Types.ObjectId | User = undefined;
 
   // ===========================================================================
   // Properties