@lenne.tech/nest-server 10.2.9 → 10.2.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "10.2.9",
+  "version": "10.2.10",
   "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",

package/src/config.env.ts

@@ -305,26 +305,32 @@ console.info(`Configured for: ${envConfig.env}${env !== envConfig.env ? ` (reque
 if (envConfig.loadLocalConfig) {
   let localConfig;
   if (typeof envConfig.loadLocalConfig === 'string') {
-    import(envConfig.loadLocalConfig).then((loadedConfig) => {
-      localConfig = loadedConfig.default || loadedConfig;
-      merge(envConfig, localConfig);
-    }).catch(() => {
-      console.info(`Configuration ${envConfig.loadLocalConfig} not found!`);
-    });
+    import(envConfig.loadLocalConfig)
+      .then((loadedConfig) => {
+        localConfig = loadedConfig.default || loadedConfig;
+        merge(envConfig, localConfig);
+      })
+      .catch(() => {
+        console.info(`Configuration ${envConfig.loadLocalConfig} not found!`);
+      });
   } else {
     // get config from src directory
-    import(join(__dirname, 'config.json')).then((loadedConfig) => {
-      localConfig = loadedConfig.default || loadedConfig;
-      merge(envConfig, localConfig);
-    }).catch(() => {
-      // if not found try to find in project directory
-      import(join(__dirname, '..', 'config.json')).then((loadedConfig) => {
+    import(join(__dirname, 'config.json'))
+      .then((loadedConfig) => {
         localConfig = loadedConfig.default || loadedConfig;
         merge(envConfig, localConfig);
-      }).catch(() => {
-        console.info('No local config.json found!');
+      })
+      .catch(() => {
+        // if not found try to find in project directory
+        import(join(__dirname, '..', 'config.json'))
+          .then((loadedConfig) => {
+            localConfig = loadedConfig.default || loadedConfig;
+            merge(envConfig, localConfig);
+          })
+          .catch(() => {
+            console.info('No local config.json found!');
+          });
       });
-    });
   }
 }
 

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

@@ -227,9 +227,7 @@ export const checkRestricted = (
       // Throw error
       if (config.throwError) {
         throw new UnauthorizedException(
-          `The current user has no access rights for ${
-            propertyKey
-            }${data.constructor?.name ? ` of ${data.constructor.name}` : ''}`,
+          `The current user has no access rights for ${propertyKey}${data.constructor?.name ? ` of ${data.constructor.name}` : ''}`,
         );
       }
 

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

@@ -63,7 +63,8 @@ export function addIds(
     ) {
       const converted = result[0] instanceof Types.ObjectId ? getObjectIds(ids) : getStringIds(ids);
       result.push(...(converted as any));
-    } else { // Add ID
+    } else {
+      // Add ID
       result.push(...ids);
     }
   }
@@ -637,7 +638,6 @@ export async function setPopulates<T = Document | Query<any, any>>(
  * Get ID of element as string
  */
 function getStringId(element: any): string {
-
   // Check element
   if (!element) {
     return element;

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

@@ -207,11 +207,11 @@ export function generateFilterQuery<T = any>(
       case ComparisonOperatorEnum.REGEX:
         result[field] = not
           ? {
-            $not: {
-              $options: options || '',
-              $regex: new RegExp(value),
-            },
-          }
+              $not: {
+                $options: options || '',
+                $regex: new RegExp(value),
+              },
+            }
           : { $options: options || '', $regex: new RegExp(value) };
         break;
     }
@@ -224,10 +224,7 @@ export function generateFilterQuery<T = any>(
 /**
  * Generate find options
  */
-export function generateFindOptions(
-  filterArgs: Partial<FilterArgs>,
-  options?: { maxLimit?: number },
-): QueryOptions {
+export function generateFindOptions(filterArgs: Partial<FilterArgs>, options?: { maxLimit?: number }): QueryOptions {
   // Check filterArgs
   if (!filterArgs) {
     return {};
@@ -287,11 +284,8 @@ export function filterMerge<T = unknown>(
   return {
     filterQuery: (converted[0]
       ? { [config.operator]: [converted[0], filterQuery || {}] }
-      : filterQuery
-    ) as FilterQuery<T>,
-    queryOptions: converted[1] || config.queryOptions
-      ? { ...converted[1], ...config.queryOptions }
-      : undefined,
+      : filterQuery) as FilterQuery<T>,
+    queryOptions: converted[1] || config.queryOptions ? { ...converted[1], ...config.queryOptions } : undefined,
     samples: config.samples,
   };
 }

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

@@ -35,7 +35,11 @@ export class CheckSecurityInterceptor implements NestInterceptor {
           new Promise(() => {
             if (dataJson !== JSON.stringify(response)) {
               const id = getStringIds(data);
-              console.debug('CheckSecurityInterceptor: securityCheck changed data of type', data.constructor.name, id && !Array.isArray(id) ? `with ID: ${id}` : '');
+              console.debug(
+                'CheckSecurityInterceptor: securityCheck changed data of type',
+                data.constructor.name,
+                id && !Array.isArray(id) ? `with ID: ${id}` : '',
+              );
             }
           });
           return response;
@@ -64,7 +68,11 @@ export class CheckSecurityInterceptor implements NestInterceptor {
             new Promise(() => {
               if (itemJson !== JSON.stringify(response)) {
                 const id = getStringIds(item);
-                console.debug('CheckSecurityInterceptor: securityCheck changed item of type', item.constructor.name, id && !Array.isArray(id) ? `with ID: ${id}` : '');
+                console.debug(
+                  'CheckSecurityInterceptor: securityCheck changed item of type',
+                  item.constructor.name,
+                  id && !Array.isArray(id) ? `with ID: ${id}` : '',
+                );
               }
             });
             return response;

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

@@ -11,7 +11,7 @@ export interface ICorePersistenceModel<T extends CorePersistenceModel = any> {
       funcAllowed?: boolean;
       mapId?: boolean;
       merge?: boolean;
-    }
+    },
   ): any;
   new (): T;
 }

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

@@ -8,7 +8,8 @@ import { CronJobConfig } from './cron-job-config.interface';
  * This config can define timezone but not utcOffset,
  * if you want to use utcOffset, you have to use the CronJobConfigWithUtcOffset
  */
-export interface CronJobConfigWithTimeZone<OC extends CronOnCompleteCommand | null = null, C = null> extends CronJobConfig {
+export interface CronJobConfigWithTimeZone<OC extends CronOnCompleteCommand | null = null, C = null>
+  extends CronJobConfig {
   /**
    * Specify the timezone for the execution. This will modify the actual time relative to your timezone.
    * If the timezone is invalid, an error is thrown. Can be any string accepted by luxon's `DateTime.setZone()`

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

@@ -8,8 +8,8 @@ import { CronJobConfig } from './cron-job-config.interface';
  * This config can define utcOffset but not timezone,
  * if you want to use timezone, you have to use the CronJobConfigWithTimezone
  */
-export interface CronJobConfigWithUtcOffset<OC extends CronOnCompleteCommand | null = null, C = null> extends CronJobConfig {
-
+export interface CronJobConfigWithUtcOffset<OC extends CronOnCompleteCommand | null = null, C = null>
+  extends CronJobConfig {
   /**
    * Specify the timezone for the execution. This will modify the actual time relative to your timezone.
    * If the timezone is invalid, an error is thrown. Can be any string accepted by luxon's `DateTime.setZone()`

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

@@ -44,7 +44,7 @@ export interface IJwt {
   secretOrKeyProvider?: (
     request: Record<string, any>,
     rawJwtToken: string,
-    done: (err: any, secret: string) => any
+    done: (err: any, secret: string) => any,
   ) => any;
 
   /**
@@ -112,7 +112,10 @@ export interface IServerOptions {
    * Cron jobs configuration object with the name of the cron job function as key
    * and the cron expression or config as value
    */
-  cronJobs?: Record<string, CronExpression | CronJobConfigWithTimeZone | CronJobConfigWithUtcOffset | Date | Falsy | string>;
+  cronJobs?: Record<
+    string,
+    CronExpression | CronJobConfigWithTimeZone | CronJobConfigWithUtcOffset | Date | Falsy | string
+  >;
 
   /**
    * SMTP and template configuration for sending emails
@@ -207,17 +210,14 @@ export interface IServerOptions {
    * Whether to activate health check endpoints
    */
   healthCheck?: {
-
     /**
      * Configuration of single health checks
      */
     configs?: {
-
       /**
        * Configuration for database health check
        */
       database?: {
-
         /**
          * Whether to enable the database health check
          */
@@ -238,7 +238,6 @@ export interface IServerOptions {
        * Configuration for memory heap health check
        */
       memoryHeap?: {
-
         /**
          * Whether to enable the memory heap health check
          */
@@ -259,7 +258,6 @@ export interface IServerOptions {
        * Configuration for memory resident set size health check
        */
       memoryRss?: {
-
         /**
          * Whether to enable the memory resident set size health check
          */
@@ -280,7 +278,6 @@ export interface IServerOptions {
        * Configuration for disk space health check
        */
       storage?: {
-
         /**
          * Whether to enable the disk space health check
          */
@@ -368,7 +365,6 @@ export interface IServerOptions {
    * Configuration for Mongoose
    */
   mongoose?: {
-
     /**
      * Collation allows users to specify language-specific rules for string comparison,
      * such as rules for letter-case and accent marks.

package/src/core/common/plugins/complexity.plugin.ts

@@ -8,7 +8,10 @@ import { ConfigService } from '../services/config.service';
 
 @Plugin()
 export class ComplexityPlugin implements ApolloServerPlugin {
-  constructor(private gqlSchemaHost: GraphQLSchemaHost, private configService: ConfigService) {}
+  constructor(
+    private gqlSchemaHost: GraphQLSchemaHost,
+    private configService: ConfigService,
+  ) {}
 
   async requestDidStart(): Promise<GraphQLRequestListener> {
     const maxComplexity: number = this.configService.getFastButReadOnly('graphQl.maxComplexity');

package/src/core/common/services/core-cron-jobs.service.ts

@@ -32,7 +32,10 @@ export abstract class CoreCronJobs implements OnApplicationBootstrap {
    */
   protected constructor(
     protected schedulerRegistry: SchedulerRegistry,
-    protected cronJobs: Record<string, CronExpression | CronJobConfigWithTimeZone | CronJobConfigWithUtcOffset | Date | Falsy | string>,
+    protected cronJobs: Record<
+      string,
+      CronExpression | CronJobConfigWithTimeZone | CronJobConfigWithUtcOffset | Date | Falsy | string
+    >,
     options?: { log?: boolean },
   ) {
     this.config = {
@@ -72,8 +75,9 @@ export abstract class CoreCronJobs implements OnApplicationBootstrap {
       }
 
       // Prepare config
-      let conf: CronJobConfigWithTimeZone | CronJobConfigWithUtcOffset
-        = CronExpressionOrConfig as CronJobConfigWithTimeZone | CronJobConfigWithUtcOffset;
+      let conf: CronJobConfigWithTimeZone | CronJobConfigWithUtcOffset = CronExpressionOrConfig as
+        | CronJobConfigWithTimeZone
+        | CronJobConfigWithUtcOffset;
       if (typeof CronExpressionOrConfig === 'string' || CronExpressionOrConfig instanceof Date) {
         conf = {
           cronTime: CronExpressionOrConfig as Date | string,

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

@@ -1,5 +1,13 @@
 import { NotFoundException } from '@nestjs/common';
-import { AggregateOptions, Document, FilterQuery, Model as MongooseModel, PipelineStage, Query, QueryOptions } from 'mongoose';
+import {
+  AggregateOptions,
+  Document,
+  FilterQuery,
+  Model as MongooseModel,
+  PipelineStage,
+  Query,
+  QueryOptions,
+} from 'mongoose';
 
 import { FilterArgs } from '../args/filter.args';
 import { getStringIds } from '../helpers/db.helper';
@@ -16,7 +24,6 @@ export abstract class CrudService<
   CreateInput = any,
   UpdateInput = any,
 > extends ModuleService<Model> {
-
   /**
    * Aggregate
    * @param serviceOptions.aggregateOptions Aggregate options, see https://www.mongodb.com/docs/manual/core/aggregation-pipeline/
@@ -379,7 +386,6 @@ export abstract class CrudService<
 
     return this.process(
       async (data) => {
-
         // Prepare filter query
         const filterQuery = { filterQuery: data?.input?.filterQuery, queryOptions: data?.input?.queryOptions };
         if (data?.input instanceof FilterArgs) {
@@ -447,7 +453,7 @@ export abstract class CrudService<
    */
   async read(
     filter: { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions } | FilterArgs,
-    serviceOptions?: ServiceOptions
+    serviceOptions?: ServiceOptions,
   ): Promise<Model[]>;
 
   /**
@@ -476,7 +482,7 @@ export abstract class CrudService<
    */
   async readForce(
     filter: { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions } | FilterArgs,
-    serviceOptions?: ServiceOptions
+    serviceOptions?: ServiceOptions,
   ): Promise<Model[]>;
 
   /**
@@ -506,7 +512,7 @@ export abstract class CrudService<
    */
   async readRaw(
     filter: { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions } | FilterArgs,
-    serviceOptions?: ServiceOptions
+    serviceOptions?: ServiceOptions,
   ): Promise<Model[]>;
 
   /**
@@ -618,14 +624,17 @@ export abstract class CrudService<
     queryOrDocument: Document | Document[] | Query<unknown, unknown>,
     serviceOptions?: ServiceOptions,
   ): Promise<T> {
-    return this.process(() => {
-      if (queryOrDocument instanceof Query) {
-        if (serviceOptions?.select && queryOrDocument.select && typeof queryOrDocument.select === 'function') {
-          queryOrDocument.select(serviceOptions.select);
+    return this.process(
+      () => {
+        if (queryOrDocument instanceof Query) {
+          if (serviceOptions?.select && queryOrDocument.select && typeof queryOrDocument.select === 'function') {
+            queryOrDocument.select(serviceOptions.select);
+          }
+          return queryOrDocument.exec();
         }
-        return queryOrDocument.exec();
-      }
-      return queryOrDocument;
-    }, { serviceOptions });
+        return queryOrDocument;
+      },
+      { serviceOptions },
+    );
   }
 }

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

@@ -15,7 +15,10 @@ export class EmailService {
   /**
    * Inject services
    */
-  constructor(protected configService: ConfigService, protected templateService: TemplateService) {}
+  constructor(
+    protected configService: ConfigService,
+    protected templateService: TemplateService,
+  ) {}
 
   /**
    * Send a mail

package/src/core/common/services/model-doc.service.ts

@@ -20,11 +20,7 @@ export interface ModelDocSchemaConfig {
  */
 @Injectable()
 export class ModelDocService implements OnApplicationBootstrap {
-
-  constructor(
-    @InjectConnection() private readonly connection: Connection,
-  ) {
-  }
+  constructor(@InjectConnection() private readonly connection: Connection) {}
 
   /**
    * Lifecycle hook that is called right after the application has started.
@@ -40,7 +36,6 @@ export class ModelDocService implements OnApplicationBootstrap {
    * @protected
    */
   protected getSchemaJson(): Record<string, Record<string, ModelDocSchemaConfig>> {
-
     // Prepare results
     const results: Record<string, Record<string, ModelDocSchemaConfig>> = {};
 
@@ -59,11 +54,16 @@ export class ModelDocService implements OnApplicationBootstrap {
           isArray: path.instance === 'Array',
           name: path.path,
           ref: Array.isArray(obj) ? undefined : obj.ref,
-          type: path.instance === 'Array'
-            ? Array.isArray(obj)
-              ? obj[0]() === '' ? 'String' : obj[0]()
-              : typeof obj.type === 'function' ? obj.type.name : obj.type
-            : path.instance,
+          type:
+            path.instance === 'Array'
+              ? Array.isArray(obj)
+                ? obj[0]() === ''
+                  ? 'String'
+                  : obj[0]()
+                : typeof obj.type === 'function'
+                  ? obj.type.name
+                  : obj.type
+              : path.instance,
         };
         if (results[modelName][key].type === 'Mixed') {
           results[modelName][key].type = 'JSON';
@@ -118,7 +118,6 @@ export class ModelDocService implements OnApplicationBootstrap {
    * @protected
    */
   protected yUmlToSvg(yUmlText: string) {
-
     // Create diagrams
     // see https://github.com/jaime-olivares/yuml-diagram
     // and https://yuml.me/diagram/scruffy/class/samples

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

@@ -143,8 +143,16 @@ export abstract class ModuleService<T extends CoreModel = any> {
       const inputJSON = JSON.stringify(originalInput);
       const preparedInput = await this.prepareInput(config.input, config);
       new Promise(() => {
-        if (inputJSON?.replace(/"password":\s*"[^"]*"/, '') !== JSON.stringify(preparedInput)?.replace(/"password":\s*"[^"]*"/, '')) {
-          console.debug('CheckSecurityInterceptor: securityCheck changed input of type', originalInput.constructor.name, 'to type', preparedInput.constructor.name);
+        if (
+          inputJSON?.replace(/"password":\s*"[^"]*"/, '')
+          !== JSON.stringify(preparedInput)?.replace(/"password":\s*"[^"]*"/, '')
+        ) {
+          console.debug(
+            'CheckSecurityInterceptor: securityCheck changed input of type',
+            originalInput.constructor.name,
+            'to type',
+            preparedInput.constructor.name,
+          );
         }
       });
       config.input = preparedInput;

package/src/core/common/types/core-model-constructor.type.ts

@@ -12,7 +12,7 @@ export interface CoreModelConstructor<T extends CoreModel> {
       init?: any;
       item?: T;
       mapId?: boolean;
-    }
+    },
   ): T;
   mapDeep(
     this: new (...args: any[]) => T,
@@ -24,7 +24,7 @@ export interface CoreModelConstructor<T extends CoreModel> {
       init?: any;
       item?: T;
       mapId?: boolean;
-    }
+    },
   ): T;
   new (): T;
 }

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

@@ -18,7 +18,10 @@ export class CoreAuthController {
   /**
    * Import services
    */
-  constructor(protected readonly authService: CoreAuthService, protected readonly configService: ConfigService) {}
+  constructor(
+    protected readonly authService: CoreAuthService,
+    protected readonly configService: ConfigService,
+  ) {}
 
   /**
    * Logout user (from specific device)

package/src/core/modules/auth/core-auth.resolver.ts

@@ -23,7 +23,10 @@ export class CoreAuthResolver {
   /**
    * Import services
    */
-  constructor(protected readonly authService: CoreAuthService, protected readonly configService: ConfigService) {}
+  constructor(
+    protected readonly authService: CoreAuthService,
+    protected readonly configService: ConfigService,
+  ) {}
 
   // ===========================================================================
   // Mutations

package/src/core/modules/auth/services/core-auth.service.ts

@@ -206,7 +206,6 @@ export class CoreAuthService {
    * Get JWT and refresh token
    */
   protected async createTokens(userId: string, data?: { [key: string]: any; deviceId?: string }) {
-
     // Initializations
     const sameTokenIdPeriod: number = this.configService.getFastButReadOnly('jwt.sameTokenIdPeriod', 0);
     const deviceId = data?.deviceId || randomUUID();
@@ -288,10 +287,14 @@ export class CoreAuthService {
     }
     user.refreshTokens[deviceId] = { ...data, deviceId, tokenId: payload.tokenId };
     user.tempTokens[deviceId] = { createdAt: new Date().getTime(), deviceId, tokenId: payload.tokenId };
-    await this.userService.update(getStringIds(user), {
-      refreshTokens: user.refreshTokens,
-      tempTokens: user.tempTokens,
-    }, { force: true });
+    await this.userService.update(
+      getStringIds(user),
+      {
+        refreshTokens: user.refreshTokens,
+        tempTokens: user.tempTokens,
+      },
+      { force: true },
+    );
 
     // Return new token
     return newRefreshToken;

package/src/core/modules/auth/strategies/jwt-refresh.strategy.ts

@@ -9,7 +9,10 @@ import { CoreAuthService } from '../services/core-auth.service';
 
 @Injectable()
 export class JwtRefreshStrategy extends PassportStrategy(Strategy, AuthGuardStrategy.JWT_REFRESH) {
-  constructor(protected readonly authService: CoreAuthService, protected readonly configService: ConfigService) {
+  constructor(
+    protected readonly authService: CoreAuthService,
+    protected readonly configService: ConfigService,
+  ) {
     super({
       jwtFromRequest: ExtractJwt.fromExtractors([
         JwtRefreshStrategy.extractJWTFromCookie,

package/src/core/modules/auth/strategies/jwt.strategy.ts

@@ -16,7 +16,10 @@ export class JwtStrategy extends PassportStrategy(Strategy, AuthGuardStrategy.JW
   /**
    * Init JWT strategy
    */
-  constructor(protected readonly authService: CoreAuthService, protected readonly configService: ConfigService) {
+  constructor(
+    protected readonly authService: CoreAuthService,
+    protected readonly configService: ConfigService,
+  ) {
     super({
       jwtFromRequest: ExtractJwt.fromExtractors([
         JwtStrategy.extractJWTFromCookie,

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

@@ -27,7 +27,10 @@ export abstract class CoreFileService {
   /**
    * Include MongoDB connection and create File bucket
    */
-  protected constructor(protected readonly connection: Connection, bucketName = 'fs') {
+  protected constructor(
+    protected readonly connection: Connection,
+    bucketName = 'fs',
+  ) {
     this.files = createBucket({ bucketName, connection });
   }
 

package/src/core/modules/health-check/core-health-check.module.ts

@@ -14,5 +14,4 @@ import { CoreHealthCheckService } from './core-health-check.service';
   imports: [TerminusModule],
   providers: [CoreHealthCheckService, CoreHealthCheckResolver],
 })
-export class CoreHealthCheckModule {
-}
+export class CoreHealthCheckModule {}

package/src/core/modules/health-check/core-health-check.resolver.ts

@@ -5,7 +5,6 @@ import { RoleEnum } from '../../common/enums/role.enum';
 import { CoreHealthCheckService } from './core-health-check.service';
 import { CoreHealthCheckResult } from './core-health-check-result.model';
 
-
 /**
  * Resolver to process with user data
  */
@@ -15,8 +14,7 @@ export class CoreHealthCheckResolver {
   /**
    * Import services
    */
-  constructor(protected readonly healthCheckService: CoreHealthCheckService) {
-  }
+  constructor(protected readonly healthCheckService: CoreHealthCheckService) {}
 
   // ===========================================================================
   // Queries