@lenne.tech/nest-server 9.0.20 → 9.0.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "9.0.20",
+  "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",
@@ -30,7 +30,7 @@
     "start": "npm run start:local",
     "stop": "./node_modules/.bin/pm2 delete nest",
     "start:pm2": "./node_modules/.bin/grunt",
-    "start:prod": "./node_modules/.bin/grunt productive",
+    "start:prod": "./node_modules/.bin/grunt production",
     "start:nodemon": "ts-node -r tsconfig-paths/register src/main.ts",
     "start:debug": "nodemon --config nodemon-debug.json",
     "start:dev": "nodemon",

package/src/config.env.ts

@@ -160,7 +160,7 @@ const config: { [env: string]: IServerOptions } = {
       verificationLink: 'http://localhost:4200/user/verification',
       passwordResetLink: 'http://localhost:4200/user/password-reset',
     },
-    env: 'productive',
+    env: 'production',
     execAfterInit: 'npm run docs:bootstrap',
     filter: {
       maxLimit: null,

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

@@ -44,6 +44,9 @@ export const Restricted = (...rolesOrMember: RestrictedType): ClassDecorator & P
  * Get restricted data for (property of) object
  */
 export const getRestricted = (object: unknown, propertyKey?: string): RestrictedType => {
+  if (!object) {
+    return null;
+  }
   if (!propertyKey) {
     return Reflect.getMetadata(restrictedMetaKey, object);
   }

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

@@ -7,6 +7,7 @@ import * as rfdc from 'rfdc';
 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';
 
 /**
@@ -537,6 +538,24 @@ export function isString(parameter: string, falseFunction: (...params) => any =
   return typeof parameter === 'string' ? true : falseFunction(isString);
 }
 
+/**
+ * Merge plain objects deep into target object and ignores undefined
+ */
+export function mergePlain(target: Record<any, any>, ...args: Record<any, any>[]): any {
+  return merge(
+    target,
+    ...args.map(
+      // Prepare records
+      (item) =>
+        !item
+          ? // Return item if not an object
+            item
+          : // Return cloned record with undefined properties removed
+            filterProperties(clone(item, { circles: false }), (prop) => prop !== undefined)
+    )
+  );
+}
+
 /**
  * Alternative for errorFunction
  */
@@ -629,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)) {
@@ -644,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;
   }

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

@@ -9,9 +9,6 @@ import { clone } from './input.helper';
 export class ModelHelper {
   /**
    * Remove all properties from source which are not in target
-   * @param source
-   * @param target
-   * @param options
    */
   public static prepareMap<T = Record<string, any>>(
     source: Partial<T> | Record<string, any>,
@@ -54,9 +51,6 @@ export class ModelHelper {
 
 /**
  * Remove all properties from source which are not in target
- * @param source
- * @param target
- * @param options
  */
 export function prepareMap<T = Record<string, any>>(
   source: Partial<T> | Record<string, any>,
@@ -176,7 +170,7 @@ export function mapClasses<T = Record<string, any>>(
   input: Record<string, any>,
   mapping: Record<string, new (...args: any[]) => any>,
   target?: T,
-  options?: { objectIdsToString?: boolean }
+  options?: { objectIdsToString?: boolean; removeUndefinedProperties?: boolean }
 ): T {
   // Check params
   if (!target) {
@@ -189,6 +183,7 @@ export function mapClasses<T = Record<string, any>>(
   // Get config
   const config = {
     objectIdsToString: true,
+    removeUndefinedProperties: false,
     ...options,
   };
 
@@ -238,7 +233,7 @@ export function mapClasses<T = Record<string, any>>(
       }
 
       // Others
-      else {
+      else if (!config.removeUndefinedProperties || value !== undefined) {
         target[prop] = value;
       }
     }
@@ -259,7 +254,7 @@ export async function mapClassesAsync<T = Record<string, any>>(
   input: Record<string, any>,
   mapping: Record<string, new (...args: any[]) => any>,
   target?: T,
-  options?: { objectIdsToString?: boolean }
+  options?: { objectIdsToString?: boolean; removeUndefinedProperties?: boolean }
 ): Promise<T> {
   // Check params
   if (!target) {
@@ -272,6 +267,7 @@ export async function mapClassesAsync<T = Record<string, any>>(
   // Get config
   const config = {
     objectIdsToString: true,
+    removeUndefinedProperties: false,
     ...options,
   };
 
@@ -321,7 +317,7 @@ export async function mapClassesAsync<T = Record<string, any>>(
       }
 
       // Others
-      else {
+      else if (!config.removeUndefinedProperties || value !== undefined) {
         target[prop] = value;
       }
     }
@@ -329,3 +325,37 @@ export async function mapClassesAsync<T = Record<string, any>>(
 
   return target;
 }
+
+/**
+ * Same as mapClasses but with option removeUndefinedProperties = true as default
+ */
+export function mapInputClasses<T = Record<string, any>>(
+  input: Record<string, any>,
+  mapping: Record<string, new (...args: any[]) => any>,
+  target?: T,
+  options?: { objectIdsToString?: boolean; removeUndefinedProperties?: boolean }
+) {
+  // Get config
+  const config = {
+    removeUndefinedProperties: true,
+    ...options,
+  };
+  return mapClasses(input, mapping, target, options);
+}
+
+/**
+ * Same as mapClassesAsync but with option removeUndefinedProperties = true as default
+ */
+export function mapInputClassesAsync<T = Record<string, any>>(
+  input: Record<string, any>,
+  mapping: Record<string, new (...args: any[]) => any>,
+  target?: T,
+  options?: { objectIdsToString?: boolean; removeUndefinedProperties?: boolean }
+) {
+  // Get config
+  const config = {
+    removeUndefinedProperties: true,
+    ...options,
+  };
+  return mapClassesAsync(input, mapping, target, options);
+}

package/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) {

package/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;

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

@@ -4,7 +4,7 @@ import { FilterArgs } from '../args/filter.args';
 import { merge } from '../helpers/config.helper';
 import { getStringIds } from '../helpers/db.helper';
 import { convertFilterArgsToQuery } from '../helpers/filter.helper';
-import { assignPlain } from '../helpers/input.helper';
+import { mergePlain } from '../helpers/input.helper';
 import { ServiceOptions } from '../interfaces/service-options.interface';
 import { CoreModel } from '../models/core-model.model';
 import { ConfigService } from './config.service';
@@ -388,7 +388,7 @@ export abstract class CrudService<T extends CoreModel = any> extends ModuleServi
     return this.process(
       async (data) => {
         const currentUserId = serviceOptions?.currentUser?.id;
-        return await assignPlain(dbObject, data.input, { updatedBy: currentUserId }).save();
+        return await mergePlain(dbObject, data.input, { updatedBy: currentUserId }).save();
       },
       { dbObject, input, serviceOptions }
     );

package/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);
       }
     }