@lenne.tech/nest-server 9.0.7 → 9.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "9.0.7",
+  "version": "9.0.9",
   "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",
@@ -58,19 +58,19 @@
     "node": ">= 16.13.0"
   },
   "dependencies": {
-    "@apollo/gateway": "2.0.5",
-    "@nestjs/apollo": "10.0.22",
-    "@nestjs/common": "9.0.11",
-    "@nestjs/core": "9.0.11",
-    "@nestjs/graphql": "10.0.22",
+    "@apollo/gateway": "2.1.3",
+    "@nestjs/apollo": "10.1.3",
+    "@nestjs/common": "9.1.4",
+    "@nestjs/core": "9.1.4",
+    "@nestjs/graphql": "10.1.3",
     "@nestjs/jwt": "9.0.0",
     "@nestjs/mongoose": "9.2.0",
     "@nestjs/passport": "9.0.0",
-    "@nestjs/platform-express": "9.0.11",
+    "@nestjs/platform-express": "9.1.4",
     "@nestjs/schedule": "2.1.0",
-    "apollo-server-core": "3.10.2",
-    "apollo-server-express": "3.10.2",
-    "bcrypt": "5.0.1",
+    "apollo-server-core": "3.10.3",
+    "apollo-server-express": "3.10.3",
+    "bcrypt": "5.1.0",
     "class-transformer": "0.5.1",
     "class-validator": "0.13.2",
     "ejs": "3.1.8",
@@ -79,37 +79,37 @@
     "graphql-upload": "15.0.2",
     "js-sha256": "0.9.0",
     "json-to-graphql-query": "2.2.4",
-    "light-my-request": "5.5.1",
+    "light-my-request": "5.6.1",
     "lodash": "4.17.21",
-    "mongodb": "4.9.0",
-    "mongoose": "6.5.3",
+    "mongodb": "4.10.0",
+    "mongoose": "6.6.5",
     "mongoose-gridfs": "1.3.0",
     "multer": "1.4.5-lts.1",
     "node-mailjet": "5.1.1",
-    "nodemailer": "6.7.8",
-    "nodemon": "2.0.19",
+    "nodemailer": "6.8.0",
+    "nodemon": "2.0.20",
     "passport": "0.6.0",
     "passport-jwt": "4.0.0",
     "reflect-metadata": "0.1.13",
     "rfdc": "1.3.0",
     "rimraf": "3.0.2",
-    "rxjs": "7.5.6"
+    "rxjs": "7.5.7"
   },
   "devDependencies": {
-    "@nestjs/testing": "9.0.11",
+    "@nestjs/testing": "9.1.4",
     "@types/cron": "2.0.0",
     "@types/ejs": "3.1.1",
-    "@types/jest": "28.1.8",
-    "@types/lodash": "4.14.184",
+    "@types/jest": "29.1.2",
+    "@types/lodash": "4.14.186",
     "@types/multer": "1.4.7",
-    "@types/node": "18.7.13",
-    "@types/nodemailer": "6.4.5",
-    "@types/passport": "1.0.10",
+    "@types/node": "18.8.3",
+    "@types/nodemailer": "6.4.6",
+    "@types/passport": "1.0.11",
     "@types/supertest": "2.0.12",
-    "@typescript-eslint/eslint-plugin": "5.35.1",
-    "@typescript-eslint/parser": "5.35.1",
+    "@typescript-eslint/eslint-plugin": "5.39.0",
+    "@typescript-eslint/parser": "5.39.0",
     "coffeescript": "2.7.0",
-    "eslint": "8.23.0",
+    "eslint": "8.25.0",
     "eslint-config-prettier": "8.5.0",
     "find-file-up": "2.0.1",
     "grunt": "1.5.3",
@@ -118,16 +118,16 @@
     "grunt-contrib-watch": "1.1.0",
     "grunt-sync": "0.8.2",
     "husky": "8.0.1",
-    "jest": "28.1.3",
+    "jest": "29.1.2",
     "pm2": "5.2.0",
     "prettier": "2.7.1",
     "pretty-quick": "3.1.3",
-    "supertest": "6.2.4",
-    "ts-jest": "28.0.7",
-    "ts-morph": "15.1.0",
+    "supertest": "6.3.0",
+    "ts-jest": "29.0.3",
+    "ts-morph": "16.0.0",
     "ts-node": "10.9.1",
     "tsconfig-paths": "4.1.0",
-    "typescript": "4.8.2"
+    "typescript": "4.8.4"
   },
   "jest": {
     "collectCoverage": true,

package/src/config.env.ts

@@ -23,8 +23,8 @@ const config: { [env: string]: IServerOptions } = {
     email: {
       smtp: {
         auth: {
-          user: 'sandra98@ethereal.email',
-          pass: 'JCQQdz8xJEfBSewahK',
+          user: 'cade72@ethereal.email',
+          pass: 'jpvTwGYeSajEqDvRKT',
         },
         host: 'smtp.ethereal.email',
         port: 587,
@@ -35,7 +35,7 @@ const config: { [env: string]: IServerOptions } = {
         api_key_private: 'MAILJET_API_KEY_PRIVATE',
       },
       defaultSender: {
-        email: 'sandra98@ethereal.email',
+        email: 'cade72@ethereal.email',
         name: 'Sandra Klein',
       },
       verificationLink: 'http://localhost:4200/user/verification',
@@ -75,8 +75,8 @@ const config: { [env: string]: IServerOptions } = {
     email: {
       smtp: {
         auth: {
-          user: 'sandra98@ethereal.email',
-          pass: 'JCQQdz8xJEfBSewahK',
+          user: 'cade72@ethereal.email',
+          pass: 'jpvTwGYeSajEqDvRKT',
         },
         host: 'smtp.ethereal.email',
         port: 587,
@@ -87,7 +87,7 @@ const config: { [env: string]: IServerOptions } = {
         api_key_private: 'MAILJET_API_KEY_PRIVATE',
       },
       defaultSender: {
-        email: 'sandra98@ethereal.email',
+        email: 'cade72@ethereal.email',
         name: 'Sandra Klein',
       },
       verificationLink: 'http://localhost:4200/user/verification',
@@ -127,8 +127,8 @@ const config: { [env: string]: IServerOptions } = {
     email: {
       smtp: {
         auth: {
-          user: 'sandra98@ethereal.email',
-          pass: 'JCQQdz8xJEfBSewahK',
+          user: 'cade72@ethereal.email',
+          pass: 'jpvTwGYeSajEqDvRKT',
         },
         host: 'smtp.ethereal.email',
         port: 587,
@@ -139,7 +139,7 @@ const config: { [env: string]: IServerOptions } = {
         api_key_private: 'MAILJET_API_KEY_PRIVATE',
       },
       defaultSender: {
-        email: 'sandra98@ethereal.email',
+        email: 'cade72@ethereal.email',
         name: 'Sandra Klein',
       },
       verificationLink: 'http://localhost:4200/user/verification',

package/src/core/common/args/filter.args.ts

@@ -15,6 +15,16 @@ export class FilterArgs extends PaginationArgs {
   @IsOptional()
   filter?: FilterInput = undefined;
 
+  /**
+   * Get a specific number of random samples from filter results
+   */
+  @Field((type) => Number, {
+    description:
+      'Request only a specified number of samples from the filter results; if not specified, all results are returned.',
+    nullable: true,
+  })
+  samples?: number = undefined;
+
   // ===================================================================================================================
   // Methods
   // ===================================================================================================================

package/src/core/common/args/pagination.args.ts

@@ -1,5 +1,5 @@
-import { IsOptional, Max } from 'class-validator';
 import { ArgsType, Field, Int } from '@nestjs/graphql';
+import { IsOptional } from 'class-validator';
 import { maps } from '../helpers/model.helper';
 import { CoreInput } from '../inputs/core-input.input';
 import { SortInput } from '../inputs/sort.input';
@@ -12,10 +12,8 @@ export class PaginationArgs extends CoreInput {
   @Field((type) => Int, {
     description: 'Limit specifies the maximum number of elements found that are to be returned',
     nullable: true,
-    defaultValue: 25,
   })
   @IsOptional()
-  @Max(100)
   limit?: number = undefined;
 
   /**
@@ -24,7 +22,6 @@ export class PaginationArgs extends CoreInput {
   @Field((type) => Int, {
     description: 'Alias for skip',
     nullable: true,
-    defaultValue: 0,
   })
   @IsOptional()
   offset?: number = undefined;
@@ -35,7 +32,6 @@ export class PaginationArgs extends CoreInput {
   @Field((type) => Int, {
     description: 'Skip specifies how many found elements should be skipped on return',
     nullable: true,
-    defaultValue: undefined,
   })
   @IsOptional()
   skip?: number = undefined;
@@ -56,28 +52,14 @@ export class PaginationArgs extends CoreInput {
   @Field((type) => Int, {
     description: 'Alias for limit',
     nullable: true,
-    defaultValue: 25,
   })
   @IsOptional()
-  @Max(100)
   take?: number = undefined;
 
   // ===================================================================================================================
   // Methods
   // ===================================================================================================================
 
-  /**
-   * Initialize instance with default values instead of undefined
-   */
-  init(): this {
-    super.init();
-    this.limit = this.limit === undefined ? 25 : this.limit;
-    this.offset = this.offset === undefined ? 0 : this.offset;
-    this.skip = this.skip === undefined ? 0 : this.skip;
-    this.take = this.take === undefined ? 0 : this.take;
-    return this;
-  }
-
   /**
    * Mapping for Subtypes
    */

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

@@ -97,7 +97,7 @@ export async function prepareInput<T = any>(
   if (Array.isArray(input)) {
     const processedArray = config.getNewArray ? ([] as T & any[]) : input;
     for (let i = 0; i <= input.length - 1; i++) {
-      processedArray[i] = await prepareOutput(input[i], options);
+      processedArray[i] = await prepareInput(input[i], currentUser, options);
       if (processedArray[i] === undefined && config.removeUndefined) {
         processedArray.splice(i, 1);
       }

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

@@ -24,6 +24,24 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
     );
   }
 
+  /**
+   * Create item without checks or restrictions
+   * Warning: Disables the handling of rights and restrictions!
+   */
+  async createForce(input: any, serviceOptions: ServiceOptions = {}): Promise<T> {
+    serviceOptions = merge(serviceOptions, { force: true });
+    return this.create(input, serviceOptions);
+  }
+
+  /**
+   * Create item without checks, restrictions or preparations
+   * Warning: Disables the handling of rights and restrictions! The raw data may contain secrets (such as passwords).
+   */
+  async createRaw(input: any, serviceOptions: ServiceOptions = {}): Promise<T> {
+    serviceOptions = merge(serviceOptions, { prepareInput: null, prepareOutput: null });
+    return this.createForce(input, serviceOptions);
+  }
+
   /**
    * Get item by ID
    */
@@ -35,15 +53,44 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
     return this.process(async () => dbObject, { dbObject, serviceOptions });
   }
 
+  /**
+   * Get item by ID without checks or restrictions
+   * Warning: Disables the handling of rights and restrictions!
+   */
+  async getForce(id: string, serviceOptions: ServiceOptions = {}): Promise<T> {
+    serviceOptions = merge(serviceOptions, { force: true });
+    return this.get(id, serviceOptions);
+  }
+
+  /**
+   * Get item by ID without checks, restrictions or preparations
+   * Warning: Disables the handling of rights and restrictions! The raw data may contain secrets (such as passwords).
+   */
+  async getRaw(id: string, serviceOptions: ServiceOptions = {}): Promise<T> {
+    serviceOptions = merge(serviceOptions, { prepareInput: null, prepareOutput: null });
+    return this.getForce(id, serviceOptions);
+  }
+
   /**
    * Get items via filter
    */
   async find(
-    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions },
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
     serviceOptions?: ServiceOptions
   ): Promise<T[]> {
+    // If filter is not instance of FilterArgs a simple form with filterQuery and queryOptions is set
+    // and should not be processed as FilterArgs
+    if (!(filter instanceof FilterArgs) && serviceOptions?.inputType === FilterArgs) {
+      serviceOptions = Object.assign({ prepareInput: null }, serviceOptions, { inputType: null });
+    }
+
     return this.process(
       async (data) => {
+        // Return only a certain number of random samples
+        if (filter?.samples) {
+          return (await this.findAndCount(filter, serviceOptions)).items;
+        }
+
         // Prepare filter query
         const filterQuery = { filterQuery: data?.input?.filterQuery, queryOptions: data?.input?.queryOptions };
         if (data?.input instanceof FilterArgs) {
@@ -59,13 +106,43 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
     );
   }
 
+  /**
+   * Get items via filter without checks or restrictions
+   * Warning: Disables the handling of rights and restrictions!
+   */
+  async findForce(
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
+    serviceOptions: ServiceOptions = {}
+  ): Promise<T[]> {
+    serviceOptions = merge(serviceOptions, { force: true });
+    return this.find(filter, serviceOptions);
+  }
+
+  /**
+   * Get items via filter without checks, restrictions or preparations
+   * Warning: Disables the handling of rights and restrictions! The raw data may contain secrets (such as passwords).
+   */
+  async findRaw(
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
+    serviceOptions: ServiceOptions = {}
+  ): Promise<T[]> {
+    serviceOptions = merge(serviceOptions, { prepareInput: null, prepareOutput: null });
+    return this.findForce(filter, serviceOptions);
+  }
+
   /**
    * Get items and total count via filter
    */
   async findAndCount(
-    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions },
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
     serviceOptions?: ServiceOptions
   ): Promise<{ items: T[]; totalCount: number }> {
+    // If filter is not instance of FilterArgs a simple form with filterQuery and queryOptions is set
+    // and should not be processed as FilterArgs
+    if (!(filter instanceof FilterArgs) && serviceOptions?.inputType === FilterArgs) {
+      serviceOptions = Object.assign({ prepareInput: null }, serviceOptions, { inputType: null });
+    }
+
     return this.process(
       async (data) => {
         // Prepare filter query
@@ -77,12 +154,14 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
         }
 
         // Prepare aggregation (with fixed defined sequence)
-        const aggregation: PipelineStage[] = [
-          {
-            // Add pipeline stage 1: match
+        const aggregation: PipelineStage[] = [];
+
+        // Add pipeline stage 1: match
+        if (filterQuery.filterQuery) {
+          aggregation.push({
             $match: filterQuery.filterQuery,
-          },
-        ];
+          });
+        }
 
         // Prepare $facet
         const facet = {
@@ -109,6 +188,11 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
           }
         }
 
+        // Get a certain number of random samples
+        if (filter?.samples) {
+          facet.items.push({ $sample: { size: filter.samples } });
+        }
+
         // Set pipeline stage 3: facet => items (with skip & limit) and totalCount
         aggregation.push({ $facet: facet });
 
@@ -122,6 +206,30 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
     );
   }
 
+  /**
+   * Get items and total count via filter without checks or restrictions
+   * Warning: Disables the handling of rights and restrictions!
+   */
+  async findAndCountForce(
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
+    serviceOptions: ServiceOptions = {}
+  ): Promise<{ items: T[]; totalCount: number }> {
+    serviceOptions = merge(serviceOptions, { force: true });
+    return this.findAndCount(filter, serviceOptions);
+  }
+
+  /**
+   * Get items and total count via filter without checks, restrictions or preparations
+   * Warning: Disables the handling of rights and restrictions! The raw data may contain secrets (such as passwords).
+   */
+  async findAndCountRaw(
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
+    serviceOptions: ServiceOptions = {}
+  ): Promise<{ items: T[]; totalCount: number }> {
+    serviceOptions = merge(serviceOptions, { prepareInput: null, prepareOutput: null });
+    return this.findAndCountForce(filter, serviceOptions);
+  }
+
   /**
    * Find and update
    */
@@ -150,6 +258,30 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
     return await Promise.all(promises);
   }
 
+  /**
+   * Find and update without checks or restrictions
+   * Warning: Disables the handling of rights and restrictions!
+   */
+  async findAndUpdateForce(
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
+    serviceOptions: ServiceOptions = {}
+  ): Promise<T[]> {
+    serviceOptions = merge(serviceOptions, { force: true });
+    return this.findAndUpdate(filter, serviceOptions);
+  }
+
+  /**
+   * Find and update without checks, restrictions or preparations
+   * Warning: Disables the handling of rights and restrictions! The raw data may contain secrets (such as passwords).
+   */
+  async findAndUpdateRaw(
+    filter?: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions; samples?: number },
+    serviceOptions: ServiceOptions = {}
+  ): Promise<T[]> {
+    serviceOptions = merge(serviceOptions, { prepareInput: null, prepareOutput: null });
+    return this.findAndUpdateForce(filter, serviceOptions);
+  }
+
   /**
    * CRUD alias for get
    */
@@ -177,6 +309,66 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
     }
   }
 
+  /**
+   * CRUD alias for getForce
+   * Warning: Disables the handling of rights and restrictions!
+   */
+  async readForce(id: string, serviceOptions?: ServiceOptions): Promise<T>;
+
+  /**
+   * CRUD alias for findForce
+   * Warning: Disables the handling of rights and restrictions!
+   */
+  async readForce(
+    filter: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions },
+    serviceOptions?: ServiceOptions
+  ): Promise<T[]>;
+
+  /**
+   * CRUD alias for getForce or findForce
+   * Warning: Disables the handling of rights and restrictions!
+   */
+  async readForce(
+    input: string | FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions },
+    serviceOptions?: ServiceOptions
+  ): Promise<T | T[]> {
+    if (typeof input === 'string') {
+      return this.getForce(input, serviceOptions);
+    } else {
+      return this.findForce(input, serviceOptions);
+    }
+  }
+
+  /**
+   * CRUD alias for getRaw
+   * Warning: Disables the handling of rights and restrictions! The raw data may contain secrets (such as passwords).
+   */
+  async readRaw(id: string, serviceOptions?: ServiceOptions): Promise<T>;
+
+  /**
+   * CRUD alias for findRaw
+   * Warning: Disables the handling of rights and restrictions! The raw data may contain secrets (such as passwords).
+   */
+  async readRaw(
+    filter: FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions },
+    serviceOptions?: ServiceOptions
+  ): Promise<T[]>;
+
+  /**
+   * CRUD alias for getRaw or findRaw
+   * Warning: Disables the handling of rights and restrictions! The raw data may contain secrets (such as passwords).
+   */
+  async readRaw(
+    input: string | FilterArgs | { filterQuery?: FilterQuery<any>; queryOptions?: QueryOptions },
+    serviceOptions?: ServiceOptions
+  ): Promise<T | T[]> {
+    if (typeof input === 'string') {
+      return this.getRaw(input, serviceOptions);
+    } else {
+      return this.findRaw(input, serviceOptions);
+    }
+  }
+
   /**
    * Update item via ID
    */
@@ -194,6 +386,24 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
     );
   }
 
+  /**
+   * Update item via ID without checks or restrictions
+   * Warning: Disables the handling of rights and restrictions!
+   */
+  async updateForce(id: string, input: any, serviceOptions?: ServiceOptions): Promise<T> {
+    serviceOptions = merge(serviceOptions, { force: true });
+    return this.update(id, input, serviceOptions);
+  }
+
+  /**
+   * Update item via ID without checks, restrictions or preparations
+   * Warning: Disables the handling of rights and restrictions! The raw data may contain secrets (such as passwords).
+   */
+  async updateRaw(id: string, input: any, serviceOptions?: ServiceOptions): Promise<T> {
+    serviceOptions = merge(serviceOptions, { prepareInput: null, prepareOutput: null });
+    return this.updateForce(id, input, serviceOptions);
+  }
+
   /**
    * Delete item via ID
    */
@@ -210,4 +420,22 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
       { dbObject, serviceOptions }
     );
   }
+
+  /**
+   * Delete item via ID without checks or restrictions
+   * Warning: Disables the handling of rights and restrictions!
+   */
+  async deleteForce(id: string, serviceOptions?: ServiceOptions): Promise<T> {
+    serviceOptions = merge(serviceOptions, { force: true });
+    return this.delete(id, serviceOptions);
+  }
+
+  /**
+   * Delete item via ID without checks, restrictions or preparations
+   * Warning: Disables the handling of rights and restrictions! The raw data may contain secrets (such as passwords).
+   */
+  async deleteRaw(id: string, serviceOptions?: ServiceOptions): Promise<T> {
+    serviceOptions = merge(serviceOptions, { prepareInput: null, prepareOutput: null });
+    return this.deleteForce(id, serviceOptions);
+  }
 }