@lenne.tech/nest-server 10.2.7 → 10.2.9

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

@@ -1,6 +1,6 @@
 import { FieldNode, GraphQLResolveInfo, SelectionNode } from 'graphql';
-import _ = require('lodash');
 import { Document, Model, PopulateOptions, Query, Types } from 'mongoose';
+
 import { ResolveSelector } from '../interfaces/resolve-selector.interface';
 import { CoreModel } from '../models/core-model.model';
 import { FieldSelection } from '../types/field-selection.type';
@@ -8,6 +8,8 @@ import { IdsType } from '../types/ids.type';
 import { StringOrObjectId } from '../types/string-or-object-id.type';
 import { removePropertiesDeep } from './input.helper';
 
+import _ = require('lodash');
+
 // =====================================================================================================================
 // Export functions
 // =====================================================================================================================
@@ -27,7 +29,7 @@ import { removePropertiesDeep } from './input.helper';
 export function addIds(
   target: any,
   ids: StringOrObjectId | StringOrObjectId[],
-  convert: 'string' | 'object' | 'auto' | false = 'auto',
+  convert: 'auto' | 'object' | 'string' | false = 'auto',
   options?: { unique?: boolean },
 ): any[] {
   // Set config
@@ -67,7 +69,7 @@ export function addIds(
   }
 
   // Convert array
-  if (['string', 'object'].includes(convert as string)) {
+  if (['object', 'string'].includes(convert as string)) {
     for (let i = 0; i < result.length; i++) {
       result[i] = convert === 'string' ? getStringId(result[i]) : getObjectIds(result[i]);
     }
@@ -120,8 +122,8 @@ export function getIncludedIds(includes: IdsType, ids: IdsType, convert?: 'strin
 export function getIncludedIds(includes: IdsType, ids: IdsType, convert?: 'object'): Types.ObjectId[];
 export function getIncludedIds<T = IdsType>(
   includes: IdsType,
-  ids: T | IdsType,
-  convert?: 'string' | 'object',
+  ids: IdsType | T,
+  convert?: 'object' | 'string',
 ): T[] | null | undefined {
   if (!includes || !ids) {
     return undefined;
@@ -420,7 +422,7 @@ export function objectIdsToStrings(element: any, prepared: WeakMap<any, any> = n
  */
 export function removeUnresolvedReferences<T = any>(
   populated: T,
-  populatedOptions: string | PopulateOptions | PopulateOptions[] | (string | PopulateOptions)[],
+  populatedOptions: (PopulateOptions | string)[] | PopulateOptions | PopulateOptions[] | string,
   ignoreFirst = true,
 ): T {
   // Check parameter
@@ -446,7 +448,7 @@ export function removeUnresolvedReferences<T = any>(
 
     // populatedOptions is a string
     if (typeof populatedOptions === 'string') {
-      if (!['id', '_id'].includes(populatedOptions) && populated[populatedOptions] instanceof Types.ObjectId) {
+      if (!['_id', 'id'].includes(populatedOptions) && populated[populatedOptions] instanceof Types.ObjectId) {
         populated[populatedOptions] = null;
       }
       return populated;
@@ -455,7 +457,7 @@ export function removeUnresolvedReferences<T = any>(
     // populatedOptions is an PopulateOptions object
     if (populatedOptions.path) {
       const key = populatedOptions.path;
-      if (!['id', '_id'].includes(key) && populated[key] instanceof Types.ObjectId) {
+      if (!['_id', 'id'].includes(key) && populated[key] instanceof Types.ObjectId) {
         populated[key] = null;
       } else if (populatedOptions.populate) {
         removeUnresolvedReferences(populated[key], populatedOptions.populate, false);
@@ -471,7 +473,7 @@ export function removeUnresolvedReferences<T = any>(
  * Set populates, execute and map result
  */
 export async function popAndMap<T extends CoreModel>(
-  queryOrDocument: Query<any, any> | Document | Document[],
+  queryOrDocument: Document | Document[] | Query<any, any>,
   populate: FieldSelection,
   modelClass: new (...args: any[]) => T,
   mongooseModel?: Model<any>,
@@ -572,9 +574,9 @@ export function removeIds(source: any[], ids: StringOrObjectId | StringOrObjectI
 /**
  * Set populates via populates options array
  */
-export async function setPopulates<T = Query<any, any> | Document>(
+export async function setPopulates<T = Document | Query<any, any>>(
   queryOrDocument: T,
-  populateOptions: string[] | PopulateOptions[] | (string | PopulateOptions)[],
+  populateOptions: (PopulateOptions | string)[] | PopulateOptions[] | string[],
   mongooseModel: Model<any>,
   options?: { ignoreSelections: boolean },
 ): Promise<T> {
@@ -585,7 +587,7 @@ export async function setPopulates<T = Query<any, any> | Document>(
 
   // Filter populate options via model schema paths
   if (mongooseModel?.schema?.paths) {
-    populateOptions = populateOptions.filter((option: string | PopulateOptions) => {
+    populateOptions = populateOptions.filter((option: PopulateOptions | string) => {
       let key: string = option as string;
       if ((option as PopulateOptions)?.path) {
         key = (option as PopulateOptions)?.path;

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

@@ -1,6 +1,7 @@
 import { ExecutionContext } from '@nestjs/common';
 import { GqlContextType, GqlExecutionContext } from '@nestjs/graphql';
 import { PopulateOptions } from 'mongoose';
+
 import { getPopulateOptions } from './db.helper';
 import { removePropertiesDeep } from './input.helper';
 

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

@@ -1,6 +1,6 @@
-import { extname } from 'path';
 import { MulterOptions } from '@nestjs/platform-express/multer/interfaces/multer-options.interface';
 import { diskStorage } from 'multer';
+import { extname } from 'path';
 
 /**
  * Helper class for inputs

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

@@ -1,4 +1,5 @@
 import { FilterQuery, QueryOptions } from 'mongoose';
+
 import { FilterArgs } from '../args/filter.args';
 import { ComparisonOperatorEnum } from '../enums/comparison-operator.enum';
 import { LogicalOperatorEnum } from '../enums/logical-operator.enum';
@@ -45,7 +46,7 @@ export function findFilter(options?: {
   filterOptions?: FilterQuery<any>;
   id?: any;
   ids?: any[];
-  type?: '$and' | '$or' | '$nor';
+  type?: '$and' | '$nor' | '$or';
 }): FilterQuery<any> {
   const config = {
     type: '$and',
@@ -152,7 +153,7 @@ export function generateFilterQuery<T = any>(
   // Process single filter
   if (filter.singleFilter) {
     // Init variables
-    const { not, options, convertToObjectId, isReference } = filter.singleFilter;
+    const { convertToObjectId, isReference, not, options } = filter.singleFilter;
     let field = filter.singleFilter.field;
     let value = filter.singleFilter.value;
 
@@ -207,11 +208,11 @@ export function generateFilterQuery<T = any>(
         result[field] = not
           ? {
             $not: {
-              $regex: new RegExp(value),
               $options: options || '',
+              $regex: new RegExp(value),
             },
           }
-          : { $regex: new RegExp(value), $options: options || '' };
+          : { $options: options || '', $regex: new RegExp(value) };
         break;
     }
   }
@@ -273,7 +274,7 @@ export function filterMerge<T = unknown>(
   filterArgs: Partial<FilterArgs>,
   filterQuery: Partial<FilterQuery<T>>,
   options?: {
-    operator?: '$and' | '$or' | '$nor';
+    operator?: '$and' | '$nor' | '$or';
     queryOptions?: Partial<QueryOptions>;
     samples?: number;
   },

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

@@ -12,26 +12,27 @@ import {
   ValueNode,
   VariableNode,
 } from 'graphql';
+
 import _ = require('lodash');
 
 /**
  * Interface for GraphQLFieldsConfig
  */
 export interface GraphQLFieldsConfig {
-  processArguments: boolean;
   excludedFields: string[];
+  processArguments: boolean;
 }
 
 /**
  * Type ValueNodeWithValueField
  */
 export type ValueNodeWithValueField =
-  | VariableNode
-  | IntValueNode
+  | BooleanValueNode
+  | EnumValueNode
   | FloatValueNode
+  | IntValueNode
   | StringValueNode
-  | BooleanValueNode
-  | EnumValueNode;
+  | VariableNode;
 
 /**
  * GraphQLHelper
@@ -256,8 +257,8 @@ export function flattenAST(
   // Process configuration
   config = Object.assign(
     {
-      processArguments: false,
       excludedFields: [],
+      processArguments: false,
     },
     config,
   );

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

@@ -1,18 +1,20 @@
-import * as inspector from 'inspector';
-import * as util from 'util';
 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 { Kind } from 'graphql/index';
-import _ = require('lodash');
-import rfdc = require('rfdc');
+import * as inspector from 'inspector';
+import * as util from 'util';
+
 import { checkRestricted } from '../decorators/restricted.decorator';
 import { ProcessType } from '../enums/process-type.enum';
 import { RoleEnum } from '../enums/role.enum';
 import { merge } from './config.helper';
 import { equalIds } from './db.helper';
 
+import _ = require('lodash');
+import rfdc = require('rfdc');
+
 /**
  * Helper class for inputs
  * @deprecated use functions directly
@@ -23,7 +25,7 @@ export default class InputHelper {
    */
   public static async check(
     value: any,
-    user: { id: any; hasRole: (roles: string[]) => boolean },
+    user: { hasRole: (roles: string[]) => boolean; id: any },
     options?: {
       dbObject?: any;
       metatype?: any;
@@ -208,7 +210,7 @@ export function assignPlain(target: Record<any, any>, ...args: Record<any, any>[
  */
 export async function check(
   value: any,
-  user: { id: any; hasRole: (roles: string[]) => boolean },
+  user: { hasRole: (roles: string[]) => boolean; id: any },
   options?: {
     dbObject?: any;
     metatype?: any;
@@ -650,14 +652,14 @@ export function mapClass<T>(
   values: Partial<T>,
   ctor: new () => T,
   options?: {
-    cloneDeep?: boolean;
     circle?: boolean;
+    cloneDeep?: boolean;
     proto?: boolean;
   },
 ): T {
   const config = {
-    cloneDeep: true,
     circles: false,
+    cloneDeep: true,
     proto: false,
     ...options,
   };

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

@@ -1,5 +1,6 @@
 import { plainToInstance } from 'class-transformer';
 import { Types } from 'mongoose';
+
 import { clone } from './input.helper';
 
 /**
@@ -56,8 +57,8 @@ export function prepareMap<T = Record<string, any>>(
   source: Partial<T> | Record<string, any>,
   target: T,
   options: {
-    cloneDeep?: boolean;
     circles?: boolean;
+    cloneDeep?: boolean;
     funcAllowed?: boolean;
     mapId?: boolean;
     proto?: boolean;
@@ -65,8 +66,8 @@ export function prepareMap<T = Record<string, any>>(
 ): Partial<T> | Record<string, any> {
   // Set config
   const config = {
-    cloneDeep: true,
     circles: true,
+    cloneDeep: true,
     funcAllowed: false,
     mapId: false,
     proto: false,
@@ -79,7 +80,7 @@ export function prepareMap<T = Record<string, any>>(
   // Update properties
   for (const key of Object.keys(target)) {
     if (
-      (!['id', '_id'].includes(key) || config.mapId)
+      (!['_id', 'id'].includes(key) || config.mapId)
       && source[key] !== undefined
       && (config.funcAllowed || typeof (source[key] !== 'function'))
     ) {
@@ -102,8 +103,8 @@ export function map<T = Record<string, any>>(
   source: Partial<T> | Record<string, any>,
   target: T,
   options: {
-    cloneDeep?: boolean;
     circles?: boolean;
+    cloneDeep?: boolean;
     funcAllowed?: boolean;
     mapId?: boolean;
     proto?: boolean;
@@ -111,8 +112,8 @@ export function map<T = Record<string, any>>(
 ): T {
   // Set config
   const config = {
-    cloneDeep: true,
     circles: false,
+    cloneDeep: true,
     funcAllowed: false,
     mapId: false,
     proto: false,

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

@@ -1,9 +1,8 @@
 import { UnauthorizedException } from '@nestjs/common';
-import bcrypt = require('bcrypt');
 import { plainToInstance } from 'class-transformer';
 import { sha256 } from 'js-sha256';
-import _ = require('lodash');
 import { Types } from 'mongoose';
+
 import { RoleEnum } from '../enums/role.enum';
 import { PrepareInputOptions } from '../interfaces/prepare-input-options.interface';
 import { PrepareOutputOptions } from '../interfaces/prepare-output-options.interface';
@@ -13,6 +12,9 @@ import { ConfigService } from '../services/config.service';
 import { getStringIds } from './db.helper';
 import { clone, processDeep } from './input.helper';
 
+import bcrypt = require('bcrypt');
+import _ = require('lodash');
+
 /**
  * Helper class for services
  * @deprecated use functions directly
@@ -27,8 +29,8 @@ export default class ServiceHelper {
     options: {
       [key: string]: any;
       checkRoles?: boolean;
-      create?: boolean;
       clone?: boolean;
+      create?: boolean;
       getNewArray?: boolean;
       removeUndefined?: boolean;
       sha256?: boolean;
@@ -67,9 +69,9 @@ export async function prepareInput<T = any>(
     [key: string]: any;
     checkRoles?: boolean;
     circles?: boolean;
+    clone?: boolean;
     convertObjectIdsToString?: boolean;
     create?: boolean;
-    clone?: boolean;
     getNewArray?: boolean;
     proto?: boolean;
     removeUndefined?: boolean;
@@ -80,8 +82,8 @@ export async function prepareInput<T = any>(
   // Configuration
   const config = {
     checkRoles: false,
-    clone: false,
     circles: false,
+    clone: false,
     convertObjectIdsToString: true,
     create: false,
     getNewArray: false,
@@ -182,8 +184,8 @@ export async function prepareOutput<T = { [key: string]: any; map: (...args: any
   output: any,
   options: {
     [key: string]: any;
-    clone?: boolean;
     circles?: boolean;
+    clone?: boolean;
     getNewArray?: boolean;
     objectIdsToStrings?: boolean;
     proto?: boolean;
@@ -194,8 +196,8 @@ export async function prepareOutput<T = { [key: string]: any; map: (...args: any
 ): Promise<T | T[] | any> {
   // Configuration
   const config = {
-    clone: false,
     circles: false,
+    clone: false,
     getNewArray: false,
     objectIdsToStrings: true,
     proto: false,
@@ -281,20 +283,20 @@ export async function prepareOutput<T = { [key: string]: any; map: (...args: any
 export function prepareServiceOptions(
   serviceOptions: ServiceOptions,
   options?: {
-    clone?: boolean;
     circles?: boolean;
+    clone?: boolean;
     inputType?: any;
     outputType?: any;
-    subFieldSelection?: string;
-    proto?: boolean;
     prepareInput?: PrepareInputOptions;
     prepareOutput?: PrepareOutputOptions;
+    proto?: boolean;
+    subFieldSelection?: string;
   },
 ): ServiceOptions {
   // Set default values
   const config = {
-    clone: false,
     circles: true,
+    clone: false,
     proto: false,
     ...options,
   };

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

@@ -3,30 +3,32 @@ export function htmlTable(
   rows: string[][],
   options?: {
     tableStyle?: string;
+    tbodyStyle?: string;
+    tdStyle?: string;
+    thStyle?: string;
     theadStyle?: string;
     trHeadStyle?: string;
-    thStyle?: string;
-    tbodyStyle?: string;
     trStyle?: string;
-    tdStyle?: string;
   },
 ): string {
   const config = {
     tableStyle: 'width: 100%; border: 1px solid #000; border-collapse: collapse;',
-    trHeadStyle: 'background-color: #f0f0f0;',
+    tdStyle: 'border: 1px solid #000; padding: 10px;',
     thStyle: 'border: 1px solid #000; padding: 10px;',
-    tcStyle: 'border: 1px solid #000; padding: 10px;',
+    trHeadStyle: 'background-color: #f0f0f0;',
     ...options,
   };
-  let table = `<table style="${config.tableStyle}"><thead style="${config.theadStyle}"><tr style="${config.trHeadStyle}">`;
+  let table = `<table${config.tableStyle ? ` style="${config.tableStyle}"` : ''}><thead${
+    config.theadStyle ? ` style="${config.theadStyle}"` : ''
+  }><tr${config.trHeadStyle ? ` style="${config.trHeadStyle}"` : ''}>`;
   for (const head of header) {
-    table += `<th style="${config.thStyle}">${head}</th>`;
+    table += `<th${config.thStyle ? ` style="${config.thStyle}"` : ''}>${head}</th>`;
   }
-  table += '</tr></thead><tbody style="${config.tbodyStyle}">';
+  table += `</tr></thead><tbody${config.tbodyStyle ? ` style="${config.tbodyStyle}"` : ''}>`;
   for (const row of rows) {
-    table += `<tr style="${config.trStyle}">`;
+    table += `<tr${config.trStyle ? ` style="${config.trStyle}"` : ''}>`;
     for (const cell of row) {
-      table += `<td style="${config.tdStyle}">${cell}</td>`;
+      table += `<td${config.tdStyle ? ` style="${config.tdStyle}"` : ''}>${cell}</td>`;
     }
     table += '</tr>';
   }

package/src/core/common/inputs/combined-filter.input.ts

@@ -1,4 +1,5 @@
 import { Field, InputType } from '@nestjs/graphql';
+
 import { LogicalOperatorEnum } from '../enums/logical-operator.enum';
 import { maps } from '../helpers/model.helper';
 import { CoreInput } from './core-input.input';

package/src/core/common/inputs/filter.input.ts

@@ -1,4 +1,5 @@
 import { Field, InputType } from '@nestjs/graphql';
+
 import { CombinedFilterInput } from './combined-filter.input';
 import { CoreInput } from './core-input.input';
 import { SingleFilterInput } from './single-filter.input';

package/src/core/common/inputs/single-filter.input.ts

@@ -1,4 +1,5 @@
 import { Field, InputType } from '@nestjs/graphql';
+
 import { ComparisonOperatorEnum } from '../enums/comparison-operator.enum';
 import { JSON } from '../scalars/json.scalar';
 import { CoreInput } from './core-input.input';

package/src/core/common/inputs/sort.input.ts

@@ -1,4 +1,5 @@
 import { Field, InputType } from '@nestjs/graphql';
+
 import { SortOrderEnum } from '../enums/sort-order.emum';
 import { CoreInput } from './core-input.input';
 

package/src/core/common/interceptors/check-response.interceptor.ts

@@ -1,6 +1,7 @@
 import { CallHandler, ExecutionContext, Injectable, NestInterceptor } from '@nestjs/common';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+
 import { checkRestricted } from '../decorators/restricted.decorator';
 import { getContextData } from '../helpers/context.helper';
 

package/src/core/common/interceptors/check-security.interceptor.ts

@@ -1,6 +1,7 @@
 import { CallHandler, ExecutionContext, Injectable, NestInterceptor } from '@nestjs/common';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+
 import { getContextData } from '../helpers/context.helper';
 import { getStringIds } from '../helpers/db.helper';
 import { processDeep } from '../helpers/input.helper';

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

@@ -1,7 +1,8 @@
 import { CorePersistenceModel } from '../../..';
 
 export interface ICorePersistenceModel<T extends CorePersistenceModel = any> {
-  new (): T;
+  [key: string]: any;
+  init(this: new (...args: any[]) => T, ...args: any[]): any;
   map(
     this: new (...args: any[]) => T,
     data: Partial<T> | Record<string, any>,
@@ -12,6 +13,5 @@ export interface ICorePersistenceModel<T extends CorePersistenceModel = any> {
       merge?: boolean;
     }
   ): any;
-  init(this: new (...args: any[]) => T, ...args: any[]): any;
-  [key: string]: any;
+  new (): T;
 }

package/src/core/common/interfaces/cron-job-config-with-time-zone.interface.ts

@@ -1,4 +1,5 @@
 import { CronJobParams, CronOnCompleteCommand } from 'cron';
+
 import { CronJobConfig } from './cron-job-config.interface';
 
 /**

package/src/core/common/interfaces/cron-job-config-with-utc-offset.interface.ts

@@ -1,4 +1,5 @@
 import { CronJobParams, CronOnCompleteCommand } from 'cron';
+
 import { CronJobConfig } from './cron-job-config.interface';
 
 /**

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

@@ -1,4 +1,4 @@
 export interface MailjetOptions {
-  api_key_public: string;
   api_key_private: string;
+  api_key_public: string;
 }

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

@@ -4,9 +4,9 @@
 export interface PrepareInputOptions {
   [key: string]: any;
   checkRoles?: boolean;
+  clone?: boolean;
   convertObjectIdsToString?: boolean;
   create?: boolean;
-  clone?: boolean;
   getNewArray?: boolean;
   removeUndefined?: boolean;
   targetModel?: new (...args: any[]) => any;