@lenne.tech/nest-server 8.6.5 → 8.6.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "8.6.5",
+  "version": "8.6.8",
   "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",
@@ -26,8 +26,9 @@
     "reinit": "rimraf package-lock.json && rimraf node_modules && npm cache clean --force && npm i && npm run test:e2e && npm run build",
     "reinit:force": "rimraf package-lock.json && rimraf node_modules && npm cache clean --force && npm i --force && npm run test:e2e",
     "reinit:legacy": "rimraf package-lock.json && rimraf node_modules && npm cache clean --force && npm i --legacy-peer-deps && npm run test:e2e",
-    "start": "./node_modules/.bin/grunt",
+    "start": "npm run start:dev",
     "stop": "./node_modules/.bin/pm2 delete nest",
+    "start:pm2": "./node_modules/.bin/grunt",
     "start:prod": "./node_modules/.bin/grunt productive",
     "start:nodemon": "ts-node -r tsconfig-paths/register src/main.ts",
     "start:debug": "nodemon --config nodemon-debug.json",
@@ -56,54 +57,54 @@
     "node": ">= 16.13.0"
   },
   "dependencies": {
-    "@apollo/gateway": "0.50.2",
-    "@nestjs/apollo": "10.0.11",
-    "@nestjs/common": "8.4.5",
-    "@nestjs/core": "8.4.5",
-    "@nestjs/graphql": "10.0.11",
-    "@nestjs/jwt": "8.0.0",
-    "@nestjs/mongoose": "9.0.3",
-    "@nestjs/passport": "8.2.1",
-    "@nestjs/platform-express": "8.4.5",
-    "apollo-server-core": "3.7.0",
-    "apollo-server-express": "3.7.0",
+    "@apollo/gateway": "2.0.5",
+    "@nestjs/apollo": "10.0.16",
+    "@nestjs/common": "8.4.7",
+    "@nestjs/core": "8.4.7",
+    "@nestjs/graphql": "10.0.16",
+    "@nestjs/jwt": "8.0.1",
+    "@nestjs/mongoose": "9.1.1",
+    "@nestjs/passport": "8.2.2",
+    "@nestjs/platform-express": "8.4.7",
+    "apollo-server-core": "3.9.0",
+    "apollo-server-express": "3.9.0",
     "bcrypt": "5.0.1",
     "class-transformer": "0.5.1",
     "class-validator": "0.13.2",
     "ejs": "3.1.8",
     "graphql": "16.5.0",
     "graphql-subscriptions": "2.0.0",
-    "graphql-upload": "13.0.0",
+    "graphql-upload": "15.0.1",
     "json-to-graphql-query": "2.2.4",
-    "light-my-request": "4.10.1",
+    "light-my-request": "5.0.0",
     "lodash": "4.17.21",
-    "mongodb": "4.6.0",
-    "mongoose": "6.3.3",
+    "mongodb": "4.7.0",
+    "mongoose": "6.3.8",
     "multer": "1.4.4",
     "node-mailjet": "3.4.1",
     "nodemailer": "6.7.5",
     "nodemon": "2.0.16",
-    "passport": "0.5.2",
+    "passport": "0.6.0",
     "passport-jwt": "4.0.0",
     "reflect-metadata": "0.1.13",
     "rimraf": "3.0.2",
     "rxjs": "7.5.5"
   },
   "devDependencies": {
-    "@nestjs/testing": "8.4.5",
+    "@nestjs/testing": "8.4.7",
     "@types/ejs": "3.1.1",
-    "@types/jest": "27.5.1",
+    "@types/jest": "28.1.1",
     "@types/lodash": "4.14.182",
     "@types/multer": "1.4.7",
-    "@types/node": "16.11.35",
-    "@types/node-mailjet": "3.3.8",
+    "@types/node": "18.0.0",
+    "@types/node-mailjet": "3.3.9",
     "@types/nodemailer": "6.4.4",
-    "@types/passport": "1.0.7",
+    "@types/passport": "1.0.9",
     "@types/supertest": "2.0.12",
-    "@typescript-eslint/eslint-plugin": "5.23.0",
-    "@typescript-eslint/parser": "5.23.0",
+    "@typescript-eslint/eslint-plugin": "5.28.0",
+    "@typescript-eslint/parser": "5.28.0",
     "coffeescript": "2.7.0",
-    "eslint": "8.15.0",
+    "eslint": "8.17.0",
     "eslint-config-prettier": "8.5.0",
     "find-file-up": "2.0.1",
     "grunt": "1.5.3",
@@ -112,16 +113,16 @@
     "grunt-contrib-watch": "1.1.0",
     "grunt-sync": "0.8.2",
     "husky": "8.0.1",
-    "jest": "28.1.0",
+    "jest": "28.1.1",
     "pm2": "5.2.0",
-    "prettier": "2.6.2",
+    "prettier": "2.7.1",
     "pretty-quick": "3.1.3",
     "supertest": "6.2.3",
-    "ts-jest": "28.0.2",
-    "ts-morph": "14.0.0",
-    "ts-node": "10.7.0",
+    "ts-jest": "28.0.5",
+    "ts-morph": "15.1.0",
+    "ts-node": "10.8.1",
     "tsconfig-paths": "4.0.0",
-    "typescript": "4.6.4"
+    "typescript": "4.7.3"
   },
   "jest": {
     "collectCoverage": true,

package/src/core/common/decorators/restricted.decorator.ts

@@ -118,9 +118,8 @@ export const checkRestricted = (
 
       // Check roles
       if (roles.length) {
-        // Check roles
         if (
-          user?.hasRole(roles) ||
+          user?.hasRole?.(roles) ||
           (user?.id && roles.includes(RoleEnum.S_USER)) ||
           (roles.includes(RoleEnum.S_CREATOR) && getIncludedIds(config.dbObject?.createdBy, user))
         ) {

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

@@ -423,7 +423,9 @@ export function removeUnresolvedReferences<T = any>(
   if (typeof populated === 'object') {
     // populatedOptions is an array
     if (Array.isArray(populatedOptions)) {
-      populatedOptions.forEach((po) => removeUnresolvedReferences(populated, ignoreFirst ? po.populate : po, false));
+      populatedOptions.forEach((po) =>
+        removeUnresolvedReferences(populated, ignoreFirst && typeof po === 'object' ? po.populate : po, false)
+      );
       return populated;
     }
 
@@ -462,7 +464,10 @@ export async function popAndMap<T extends CoreModel>(
   let result;
   let populateOptions: PopulateOptions[] = [];
   if (populate) {
-    if (Array.isArray(populate) && typeof (populate as PopulateOptions[])[0]?.path === 'string') {
+    if (
+      Array.isArray(populate) &&
+      (typeof (populate as string[])[0] === 'string' || typeof (populate as PopulateOptions[])[0]?.path === 'string')
+    ) {
       populateOptions = populate as PopulateOptions[];
     } else if (Array.isArray(populate) && typeof (populate as SelectionNode[])[0]?.kind === 'string') {
       populateOptions = getPopulatOptionsFromSelections(populate as SelectionNode[]);

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

@@ -75,23 +75,21 @@ export function multerOptionsForImageUpload(options: {
   fileSize?: number;
   fileTypeRegex?: RegExp;
 }): MulterOptions {
-  // Default options
-  options = Object.assign(
-    {
-      fileSize: 1024 * 1024, // 1MB
-      fileTypeRegex: /jpeg|jpg|png/, // Images only
-    },
-    options
-  );
+  // Set config
+  const config = {
+    fileSize: 1024 * 1024, // 1MB
+    fileTypeRegex: /jpeg|jpg|png/, // Images only
+    ...options,
+  };
 
   return {
     // File filter
-    fileFilter: options.fileTypeRegex ? multerFileFilter(options.fileTypeRegex) : undefined,
+    fileFilter: config.fileTypeRegex ? multerFileFilter(config.fileTypeRegex) : undefined,
 
     // Limits
     limits: {
       // Limit of file size
-      fileSize: options.fileSize ? options.fileSize : undefined,
+      fileSize: config.fileSize ? config.fileSize : undefined,
     },
 
     // Automatic storage handling
@@ -100,7 +98,7 @@ export function multerOptionsForImageUpload(options: {
       // Destination for uploaded file
       // If destination is not set file will be buffered and can be processed
       // in the method
-      destination: options.destination ? options.destination : undefined,
+      destination: config.destination ? config.destination : undefined,
 
       // Generated random file name
       filename: multerRandomFileName(),

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

@@ -4,6 +4,8 @@ import { ComparisonOperatorEnum } from '../enums/comparison-operator.enum';
 import { LogicalOperatorEnum } from '../enums/logical-operator.enum';
 import { FilterInput } from '../inputs/filter.input';
 import { SortInput } from '../inputs/sort.input';
+import { getObjectIds } from './db.helper';
+import { assignPlain } from './input.helper';
 
 /**
  * Helper for filter handling
@@ -33,9 +35,72 @@ export class Filter {
   }
 }
 
+/**
+ * Helper function to create $and, $or or $nor filter
+ */
+export function findFilter(options?: {
+  conditions?: Record<string, any>[];
+  filterOptions?: FilterQuery<any>;
+  id?: any;
+  ids?: any[];
+  type?: '$and' | '$or' | '$nor';
+}): FilterQuery<any> {
+  const config = {
+    type: '$and',
+    ...options,
+  };
+
+  // Init filter Option
+  let filterOptions: FilterQuery<any> = config?.filterOptions;
+
+  // Check where condition
+  if (!filterOptions) {
+    filterOptions = {};
+    filterOptions[config.type] = [];
+  }
+
+  // Convert where condition to array
+  if (!Array.isArray(filterOptions?.[config.type])) {
+    filterOptions = {};
+    filterOptions[config.type] = [config?.filterOptions];
+  }
+
+  // ObjectId
+  if (config?.id) {
+    filterOptions[config.type].push({ _id: getObjectIds(config.id) });
+  }
+
+  // ObjectIds
+  if (config?.ids) {
+    if (!Array.isArray(config.ids)) {
+      config.ids = [config.ids];
+    }
+    filterOptions[config.type].push({ _id: { $in: getObjectIds(config.ids) } });
+  }
+
+  // Integrate conditions
+  if (config?.conditions) {
+    filterOptions[config.type] = [...filterOptions[config.type], ...config.conditions];
+  }
+
+  // Filter falsy values
+  filterOptions[config.type] = filterOptions[config.type].filter((value) => value);
+
+  // Optimizations
+  if (!filterOptions[config.type].length) {
+    filterOptions = {};
+  } else if (filterOptions[config.type].length === 1) {
+    const additionalProperties = filterOptions[config.type][0];
+    delete filterOptions[config.type];
+    assignPlain(filterOptions, additionalProperties);
+  }
+
+  // Return filter config
+  return filterOptions;
+}
+
 /**
  * Convert filter arguments to a query array
- * @param filterArgs
  */
 export function convertFilterArgsToQuery<T = any>(filterArgs: Partial<FilterArgs>): [FilterQuery<T>, QueryOptions] {
   return [generateFilterQuery(filterArgs?.filter), generateFindOptions(filterArgs)];

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

@@ -1,6 +1,7 @@
 import { BadRequestException, UnauthorizedException } from '@nestjs/common';
 import { plainToInstance } from 'class-transformer';
 import { validate } from 'class-validator';
+import { ValidatorOptions } from 'class-validator/types/validation/ValidatorOptions';
 import * as _ from 'lodash';
 import { checkRestricted } from '../decorators/restricted.decorator';
 import { ProcessType } from '../enums/process-type.enum';
@@ -182,6 +183,24 @@ export default class InputHelper {
   }
 }
 
+/**
+ * Assign plain objects to the target object and ignores undefined
+ */
+export function assignPlain(target: Record<any, any>, ...args: Record<any, any>[]): any {
+  return Object.assign(
+    target,
+    ...args.map(
+      // Prepare records
+      (item) =>
+        !item
+          ? // Return item if not an object
+            item
+          : // Return cloned record with undefined properties removed
+            filterProperties(JSON.parse(JSON.stringify(item)), (prop) => prop !== undefined)
+    )
+  );
+}
+
 /**
  * Check input
  */
@@ -194,11 +213,16 @@ export async function check(
     processType?: ProcessType;
     roles?: string | string[];
     throwError?: boolean;
+    validatorOptions?: ValidatorOptions;
   }
 ): Promise<any> {
   const config = {
     throwError: true,
     ...options,
+    validatorOptions: {
+      skipUndefinedProperties: true,
+      ...options?.validatorOptions,
+    },
   };
 
   // Check roles
@@ -212,7 +236,7 @@ export async function check(
       // check if user is logged in
       (roles.includes(RoleEnum.S_USER) && user?.id) ||
       // check if the user has at least one of the required roles
-      user.hasRole(roles) ||
+      user?.hasRole?.(roles) ||
       // check if the user is the creator
       (roles.includes(RoleEnum.S_CREATOR) && equalIds(config.dbObject?.createdBy, user))
     ) {
@@ -254,7 +278,7 @@ export async function check(
   }
 
   // Validate
-  const errors = await validate(value);
+  const errors = await validate(value, config.validatorOptions);
   if (errors.length > 0 && config.throwError) {
     throw new BadRequestException('Validation failed');
   }
@@ -264,6 +288,13 @@ export async function check(
   return value;
 }
 
+/**
+ * Combines objects to a new single plain object and ignores undefined
+ */
+export function combinePlain(...args: Record<any, any>[]): any {
+  return assignPlain({}, ...args);
+}
+
 /**
  * Standard error function
  */
@@ -273,6 +304,18 @@ export function errorFunction(caller: (...params) => any, message = 'Required pa
   throw err;
 }
 
+/**
+ * Filter function for objects
+ */
+export function filterProperties<T = Record<string, any>>(
+  obj: T,
+  filterFunction: (value?: any, key?: string, obj?: T) => boolean
+): Partial<T> {
+  return Object.keys(obj)
+    .filter((key) => filterFunction(obj[key], key, obj))
+    .reduce((res, key) => Object.assign(res, { [key]: obj[key] }), {});
+}
+
 /**
  * Check if parameter is an array
  */
@@ -433,6 +476,22 @@ export function returnFalse(): boolean {
   return false;
 }
 
+/**
+ * Match function to use instead of switch case
+ * Inspired by https://yusfuu.medium.com/dont-use-switch-or-if-else-in-javascript-instead-try-this-82f32616c269
+ *
+ * Example:
+ * const matched = match(expr, {
+ *   Oranges: 'Oranges are $0.59 a pound.',
+ *   Mangoes: 'Mangoes and papayas are $2.79 a pound.',
+ *   Papayas: 'Mangoes and papayas are $2.79 a pound.',
+ *   default: `Sorry, we are out of ${expr}.`,
+ * });
+ */
+export function match(expression: any, cases: Record<any, any>): any {
+  return cases[expression] || cases?.default;
+}
+
 /**
  * Map values into specific type
  */

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

@@ -55,6 +55,7 @@ export async function prepareInput<T = any>(
   currentUser: { [key: string]: any; id: string },
   options: {
     [key: string]: any;
+    checkRoles?: boolean;
     create?: boolean;
     clone?: boolean;
     getNewArray?: boolean;
@@ -68,7 +69,7 @@ export async function prepareInput<T = any>(
     clone: false,
     create: false,
     getNewArray: false,
-    removeUndefined: false,
+    removeUndefined: true,
     ...options,
   };
 
@@ -107,11 +108,7 @@ export async function prepareInput<T = any>(
   }
 
   // Process roles
-  if (
-    config.checkRoles &&
-    (input as Record<string, any>).roles &&
-    (!currentUser?.hasRole || !currentUser.hasRole(RoleEnum.ADMIN))
-  ) {
+  if (config.checkRoles && (input as Record<string, any>).roles && !currentUser?.hasRole?.(RoleEnum.ADMIN)) {
     if (!(currentUser as any)?.roles) {
       throw new UnauthorizedException('Missing roles of current user');
     } else {
@@ -152,6 +149,7 @@ export async function prepareOutput<T = { [key: string]: any; map: (...args: any
     [key: string]: any;
     clone?: boolean;
     getNewArray?: boolean;
+    removeSecrets?: boolean;
     removeUndefined?: boolean;
     targetModel?: new (...args: any[]) => T;
   } = {}
@@ -160,6 +158,7 @@ export async function prepareOutput<T = { [key: string]: any; map: (...args: any
   const config = {
     clone: false,
     getNewArray: false,
+    removeSecrets: true,
     removeUndefined: false,
     targetModel: undefined,
     ...options,
@@ -195,17 +194,17 @@ export async function prepareOutput<T = { [key: string]: any; map: (...args: any
   }
 
   // Remove password if exists
-  if (output.password) {
+  if (config.removeSecrets && output.password) {
     output.password = undefined;
   }
 
   // Remove verification token if exists
-  if (output.verificationToken) {
+  if (config.removeSecrets && output.verificationToken) {
     output.verificationToken = undefined;
   }
 
   // Remove password reset token if exists
-  if (output.passwordResetToken) {
+  if (config.removeSecrets && output.passwordResetToken) {
     output.passwordResetToken = undefined;
   }
 

package/src/core/common/interfaces/prepare-input-options.interface.ts

@@ -3,6 +3,7 @@
  */
 export interface PrepareInputOptions {
   [key: string]: any;
+  checkRoles?: boolean;
   create?: boolean;
   clone?: boolean;
   getNewArray?: boolean;

package/src/core/common/interfaces/prepare-output-options.interface.ts

@@ -5,6 +5,7 @@ export interface PrepareOutputOptions {
   [key: string]: any;
   clone?: boolean;
   getNewArray?: boolean;
+  removeSecrets?: boolean;
   removeUndefined?: boolean;
   targetModel?: new (...args: any[]) => any;
 }

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

@@ -1,4 +1,4 @@
-import { Model } from 'mongoose';
+import { Model, PopulateOptions } from 'mongoose';
 import { FieldSelection } from '../types/field-selection.type';
 import { PrepareInputOptions } from './prepare-input-options.interface';
 import { PrepareOutputOptions } from './prepare-output-options.interface';
@@ -22,15 +22,21 @@ export interface ServiceOptions {
     roles?: string[];
   };
 
-  // Field selection for results
+  // Field selection for results (will be overwritten by populate if populate was set)
   fieldSelection?: FieldSelection;
 
+  // Determines whether all restrictions are ignored
+  force?: boolean;
+
   // Overwrites type of input (array items)
   inputType?: new (...params: any[]) => any;
 
   // Overwrites type of output (array items)
   outputType?: new (...params: any[]) => any;
 
+  // Alias for fieldSelection (if both are set fieldSelection is overwritten by populate)
+  populate?: PopulateOptions | (PopulateOptions | string)[];
+
   // Process field selection
   // If {} or not set, then the field selection runs with defaults
   // If falsy, then the field selection will not be automatically executed

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

@@ -92,7 +92,10 @@ export abstract class CoreModel {
       mapId: false,
       ...options,
     };
-    return config.init ? map(data, this, config).init(config.init) : map(data, this, config);
+    if (config.init) {
+      this.init(config.init);
+    }
+    return map(data, this, config);
   }
 
   /**

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

@@ -2,6 +2,7 @@ import { NotFoundException } from '@nestjs/common';
 import { FilterArgs } from '../args/filter.args';
 import { merge } from '../helpers/config.helper';
 import { convertFilterArgsToQuery } from '../helpers/filter.helper';
+import { assignPlain } from '../helpers/input.helper';
 import { ServiceOptions } from '../interfaces/service-options.interface';
 import { CoreModel } from '../models/core-model.model';
 import { ModuleService } from './module.service';
@@ -14,7 +15,8 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
     merge({ prepareInput: { create: true } }, serviceOptions);
     return this.process(
       async (data) => {
-        return new this.mainDbModel({ ...data.input }).save();
+        const currentUserId = serviceOptions?.currentUser?.id;
+        return new this.mainDbModel({ ...data.input, createdBy: currentUserId, updatedBy: currentUserId }).save();
       },
       { input, serviceOptions }
     );
@@ -75,7 +77,8 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
     }
     return this.process(
       async (data) => {
-        return await Object.assign(dbObject, data.input).save();
+        const currentUserId = serviceOptions?.currentUser?.id;
+        return await assignPlain(dbObject, data.input, { updatedBy: currentUserId }).save();
       },
       { dbObject, input, serviceOptions }
     );
@@ -90,11 +93,11 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
       throw new NotFoundException(`No ${this.mainModelConstructor.name} found with ID: ${id}`);
     }
     return this.process(
-      async (data) => {
+      async () => {
         await this.mainDbModel.findByIdAndDelete(id).exec();
         return dbObject;
       },
-      { dbObject, input: id, serviceOptions }
+      { dbObject, serviceOptions }
     );
   }
 }

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

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { ConfigService } from './config.service';
-import * as mailjet from 'node-mailjet';
+import mailjet from 'node-mailjet';
 
 /**
  * Mailjet service

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

@@ -74,6 +74,7 @@ export abstract class ModuleService<T extends CoreModel = any> {
     const config = {
       checkRights: true,
       dbObject: options?.dbObject,
+      force: false,
       input: options?.input,
       processFieldSelection: {},
       prepareInput: {},
@@ -82,6 +83,22 @@ export abstract class ModuleService<T extends CoreModel = any> {
       ...options?.serviceOptions,
     };
 
+    // Note force configuration
+    if (config.force) {
+      config.checkRights = false;
+      if (typeof config.prepareInput === 'object') {
+        config.prepareInput.checkRoles = false;
+      }
+      if (typeof config.prepareOutput === 'object') {
+        config.prepareOutput.removeSecrets = false;
+      }
+    }
+
+    // Note populate
+    if (config.populate) {
+      config.fieldSelection = config.populate;
+    }
+
     // Prepare input
     if (config.prepareInput && this.prepareInput) {
       const opts = config.prepareInput;
@@ -150,7 +167,6 @@ export abstract class ModuleService<T extends CoreModel = any> {
    */
   async prepareInput(input: Record<string, any>, options: ServiceOptions = {}) {
     const config = {
-      targetModel: this.mainModelConstructor,
       ...options?.prepareInput,
     };
     return prepareInput(input, options.currentUser, config);

package/src/core/common/types/field-selection.type.ts

@@ -5,4 +5,4 @@ import { ResolveSelector } from '../interfaces/resolve-selector.interface';
 /**
  * Field selection to set fields of (populated) result
  */
-export type FieldSelection = PopulateOptions[] | SelectionNode[] | ResolveSelector;
+export type FieldSelection = PopulateOptions | (PopulateOptions | string)[] | SelectionNode[] | ResolveSelector;

package/src/core/modules/auth/guards/roles.guard.ts

@@ -38,7 +38,7 @@ export class RolesGuard extends AuthGuard('jwt') {
     }
 
     // Check user and user roles
-    if (!user || !user.hasRole(roles)) {
+    if (!user?.hasRole?.(roles)) {
       // Get args
       const args: any = GqlExecutionContext.create(context).getArgs();