@lenne.tech/nest-server 9.0.19 → 9.0.21

package/package.json

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

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/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/server/modules/user/user.module.ts

@@ -1,7 +1,6 @@
 import { Module } from '@nestjs/common';
 import { MongooseModule } from '@nestjs/mongoose';
 import { PubSub } from 'graphql-subscriptions';
-import { JSON } from '../../../core/common/scalars/json.scalar';
 import { ConfigService } from '../../../core/common/services/config.service';
 import { AvatarController } from './avatar.controller';
 import { User, UserSchema } from './user.model';
@@ -15,7 +14,6 @@ import { UserService } from './user.service';
   imports: [MongooseModule.forFeature([{ name: User.name, schema: UserSchema }])],
   controllers: [AvatarController],
   providers: [
-    JSON,
     UserResolver,
     ConfigService,
     UserService,

package/src/server/server.module.ts

@@ -2,6 +2,9 @@ import { Module } from '@nestjs/common';
 import { ScheduleModule } from '@nestjs/schedule';
 import envConfig from '../config.env';
 import { CoreModule } from '../core.module';
+import { Any } from '../core/common/scalars/any.scalar';
+import { DateScalar } from '../core/common/scalars/date.scalar';
+import { JSON } from '../core/common/scalars/json.scalar';
 import { CoreAuthService } from '../core/modules/auth/services/core-auth.service';
 import { CronJobs } from './common/services/cron-jobs.service';
 import { AuthModule } from './modules/auth/auth.module';
@@ -31,7 +34,7 @@ import { ServerController } from './server.controller';
     FileModule,
   ],
 
-  providers: [CronJobs],
+  providers: [Any, CronJobs, DateScalar, JSON],
 
   // Include REST controllers
   controllers: [ServerController],