@lenne.tech/nest-server 8.6.6 → 8.6.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "8.6.6",
+  "version": "8.6.7",
   "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,17 +57,17 @@
     "node": ">= 16.13.0"
   },
   "dependencies": {
-    "@apollo/gateway": "0.50.2",
-    "@nestjs/apollo": "10.0.12",
-    "@nestjs/common": "8.4.5",
-    "@nestjs/core": "8.4.5",
-    "@nestjs/graphql": "10.0.12",
+    "@apollo/gateway": "2.0.5",
+    "@nestjs/apollo": "10.0.14",
+    "@nestjs/common": "8.4.6",
+    "@nestjs/core": "8.4.6",
+    "@nestjs/graphql": "10.0.15",
     "@nestjs/jwt": "8.0.1",
     "@nestjs/mongoose": "9.1.0",
     "@nestjs/passport": "8.2.1",
-    "@nestjs/platform-express": "8.4.5",
-    "apollo-server-core": "3.7.0",
-    "apollo-server-express": "3.7.0",
+    "@nestjs/platform-express": "8.4.6",
+    "apollo-server-core": "3.8.2",
+    "apollo-server-express": "3.8.2",
     "bcrypt": "5.0.1",
     "class-transformer": "0.5.1",
     "class-validator": "0.13.2",
@@ -77,8 +78,8 @@
     "json-to-graphql-query": "2.2.4",
     "light-my-request": "5.0.0",
     "lodash": "4.17.21",
-    "mongodb": "4.6.0",
-    "mongoose": "6.3.4",
+    "mongodb": "4.7.0",
+    "mongoose": "6.3.6",
     "multer": "1.4.4",
     "node-mailjet": "3.4.1",
     "nodemailer": "6.7.5",
@@ -90,20 +91,20 @@
     "rxjs": "7.5.5"
   },
   "devDependencies": {
-    "@nestjs/testing": "8.4.5",
+    "@nestjs/testing": "8.4.6",
     "@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.36",
+    "@types/node": "16.11.39",
     "@types/node-mailjet": "3.3.9",
     "@types/nodemailer": "6.4.4",
-    "@types/passport": "1.0.7",
+    "@types/passport": "1.0.8",
     "@types/supertest": "2.0.12",
-    "@typescript-eslint/eslint-plugin": "5.25.0",
-    "@typescript-eslint/parser": "5.25.0",
+    "@typescript-eslint/eslint-plugin": "5.27.1",
+    "@typescript-eslint/parser": "5.27.1",
     "coffeescript": "2.7.0",
-    "eslint": "8.16.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",
     "pretty-quick": "3.1.3",
     "supertest": "6.2.3",
-    "ts-jest": "28.0.2",
-    "ts-morph": "14.0.0",
-    "ts-node": "10.8.0",
+    "ts-jest": "28.0.4",
+    "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/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/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;
@@ -148,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;
   } = {}
@@ -156,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,
@@ -191,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/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;

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;