Merge pull request #254 from lenneTech/develop

Release 9.0.22

package.json

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

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

@@ -648,11 +648,22 @@ export function instanceofArray(arr: any[], strict = false): string {
 
 /**
  * Process data via function deep
- * @param data
- * @param func
- * @param processedObjects
  */
-export function processDeep(data: any, func: (data: any) => any, processedObjects = new WeakMap()): any {
+export function processDeep(
+  data: any,
+  func: (data: any) => any,
+  options?: {
+    processedObjects?: WeakMap<new () => any, boolean>;
+    specialClasses?: ((new (args: any[]) => any) | string)[];
+  }
+): any {
+  // Set options
+  const { processedObjects, specialClasses } = {
+    processedObjects: new WeakMap(),
+    specialClasses: [],
+    ...options,
+  };
+
   // Prevent circular processing
   if (typeof data === 'object') {
     if (processedObjects.get(data)) {
@@ -663,13 +674,21 @@ export function processDeep(data: any, func: (data: any) => any, processedObject
 
   // Process array
   if (Array.isArray(data)) {
-    return data.map((item) => processDeep(item, func));
+    return data.map((item) => processDeep(item, func, { processedObjects, specialClasses }));
   }
 
   // Process object
   if (typeof data === 'object') {
+    for (const specialClass of specialClasses) {
+      if (
+        (typeof specialClass === 'string' && specialClass === data.constructor.name) ||
+        (typeof specialClass !== 'string' && data instanceof specialClass)
+      ) {
+        return func(data);
+      }
+    }
     for (const [key, value] of Object.entries(data)) {
-      data[key] = processDeep(value, func, processedObjects);
+      data[key] = processDeep(value, func, { processedObjects, specialClasses });
     }
     return data;
   }

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

@@ -10,7 +10,8 @@ import { PrepareOutputOptions } from '../interfaces/prepare-output-options.inter
 import { ResolveSelector } from '../interfaces/resolve-selector.interface';
 import { ServiceOptions } from '../interfaces/service-options.interface';
 import { ConfigService } from '../services/config.service';
-import { clone } from './input.helper';
+import { getStringIds } from './db.helper';
+import { clone, processDeep } from './input.helper';
 
 /**
  * Helper class for services
@@ -66,6 +67,7 @@ export async function prepareInput<T = any>(
     [key: string]: any;
     checkRoles?: boolean;
     circles?: boolean;
+    convertObjectIdsToString?: boolean;
     create?: boolean;
     clone?: boolean;
     getNewArray?: boolean;
@@ -80,6 +82,7 @@ export async function prepareInput<T = any>(
     checkRoles: false,
     clone: false,
     circles: false,
+    convertObjectIdsToString: true,
     create: false,
     getNewArray: false,
     proto: false,
@@ -114,6 +117,20 @@ export async function prepareInput<T = any>(
     }
   }
 
+  // Convert ObjectIds to string
+  if (config.convertObjectIdsToString) {
+    input = processDeep(
+      input,
+      (property) => {
+        if (property instanceof Types.ObjectId) {
+          property = getStringIds(property);
+        }
+        return property;
+      },
+      { specialClasses: ['ObjectId'] }
+    );
+  }
+
   // Map input if target model exist
   if (config.targetModel && !(input instanceof config.targetModel)) {
     if ((config.targetModel as any)?.map) {

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

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

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

@@ -111,7 +111,7 @@ export abstract class ModuleService<T extends CoreModel = any> {
       if (!opts.targetModel && config.inputType) {
         opts.targetModel = config.inputType;
       }
-      config.input = await this.prepareInput(config.input, opts);
+      config.input = await this.prepareInput(config.input, config);
     }
 
     // Get DB object
@@ -156,7 +156,7 @@ export abstract class ModuleService<T extends CoreModel = any> {
       if (config.outputPath) {
         _.set(result, config.outputPath, await this.prepareOutput(_.get(result, config.outputPath), opts));
       } else {
-        result = await this.prepareOutput(result, opts);
+        result = await this.prepareOutput(result, config);
       }
     }