@lenne.tech/nest-server 8.6.28 → 8.6.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "8.6.28",
+  "version": "8.6.29",
   "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",
@@ -18,7 +18,7 @@
     "build:pack": "npm pack && echo 'use file:/ROOT_PATH_TO_TGZ_FILE to integrate the package'",
     "docs": "npm run docs:ci && open ./public/index.html",
     "docs:bootstrap": "node extras/update-spectaql-version.mjs && npx -y spectaql ./spectaql.yml",
-    "docs:ci": "ts-node ./scripts/init-server.ts && npm run docs:boostrap",
+    "docs:ci": "ts-node ./scripts/init-server.ts && npm run docs:bootstrap",
     "format": "prettier --write 'src/**/*.ts'",
     "format:staged": "pretty-quick --staged",
     "lint": "eslint \"{src,tests}/**/*.ts\" --fix",

package/src/config.env.ts

@@ -1,5 +1,6 @@
 import { CronExpression } from '@nestjs/schedule';
 import { join } from 'path';
+import { merge } from './core/common/helpers/config.helper';
 import { IServerOptions } from './core/common/interfaces/server-options.interface';
 
 /**
@@ -22,8 +23,8 @@ const config: { [env: string]: IServerOptions } = {
     email: {
       smtp: {
         auth: {
-          user: 'rebeca68@ethereal.email',
-          pass: 'v5WUScAN98AzGbRjpc',
+          user: 'sandra98@ethereal.email',
+          pass: 'JCQQdz8xJEfBSewahK',
         },
         host: 'smtp.ethereal.email',
         port: 587,
@@ -34,8 +35,8 @@ const config: { [env: string]: IServerOptions } = {
         api_key_private: 'MAILJET_API_KEY_PRIVATE',
       },
       defaultSender: {
-        email: 'rebeca68@ethereal.email',
-        name: 'Rebeca Sixtyeight',
+        email: 'sandra98@ethereal.email',
+        name: 'Sandra Klein',
       },
       verificationLink: 'http://localhost:4200/user/verification',
       passwordResetLink: 'http://localhost:4200/user/password-reset',
@@ -51,6 +52,7 @@ const config: { [env: string]: IServerOptions } = {
     jwt: {
       secret: 'SECRET_OR_PRIVATE_KEY_DEV',
     },
+    loadLocalConfig: false,
     mongoose: {
       uri: 'mongodb://localhost/nest-server-dev',
     },
@@ -73,8 +75,8 @@ const config: { [env: string]: IServerOptions } = {
     email: {
       smtp: {
         auth: {
-          user: 'rebeca68@ethereal.email',
-          pass: 'v5WUScAN98AzGbRjpc',
+          user: 'sandra98@ethereal.email',
+          pass: 'JCQQdz8xJEfBSewahK',
         },
         host: 'smtp.ethereal.email',
         port: 587,
@@ -85,8 +87,8 @@ const config: { [env: string]: IServerOptions } = {
         api_key_private: 'MAILJET_API_KEY_PRIVATE',
       },
       defaultSender: {
-        email: 'rebeca68@ethereal.email',
-        name: 'Rebeca Sixtyeight',
+        email: 'sandra98@ethereal.email',
+        name: 'Sandra Klein',
       },
       verificationLink: 'http://localhost:4200/user/verification',
       passwordResetLink: 'http://localhost:4200/user/password-reset',
@@ -102,6 +104,7 @@ const config: { [env: string]: IServerOptions } = {
     jwt: {
       secret: 'SECRET_OR_PRIVATE_KEY_DEV',
     },
+    loadLocalConfig: false,
     mongoose: {
       uri: 'mongodb://localhost/nest-server-dev',
     },
@@ -124,8 +127,8 @@ const config: { [env: string]: IServerOptions } = {
     email: {
       smtp: {
         auth: {
-          user: 'rebeca68@ethereal.email',
-          pass: 'v5WUScAN98AzGbRjpc',
+          user: 'sandra98@ethereal.email',
+          pass: 'JCQQdz8xJEfBSewahK',
         },
         host: 'smtp.ethereal.email',
         port: 587,
@@ -136,8 +139,8 @@ const config: { [env: string]: IServerOptions } = {
         api_key_private: 'MAILJET_API_KEY_PRIVATE',
       },
       defaultSender: {
-        email: 'rebeca68@ethereal.email',
-        name: 'Rebeca Sixtyeight',
+        email: 'sandra98@ethereal.email',
+        name: 'Sandra Klein',
       },
       verificationLink: 'http://localhost:4200/user/verification',
       passwordResetLink: 'http://localhost:4200/user/password-reset',
@@ -153,6 +156,7 @@ const config: { [env: string]: IServerOptions } = {
     jwt: {
       secret: 'SECRET_OR_PRIVATE_KEY_PROD',
     },
+    loadLocalConfig: false,
     mongoose: {
       uri: 'mongodb://localhost/nest-server-prod',
     },
@@ -178,6 +182,29 @@ const env = process.env['NODE' + '_ENV'] || 'development';
 const envConfig = config[env] || config.development;
 console.info('Configured for: ' + envConfig.env + (env !== envConfig.env ? ' (requested: ' + env + ')' : ''));
 
+// Merge with localConfig (e.g. config.json)
+if (envConfig.loadLocalConfig) {
+  let localConfig;
+  if (typeof envConfig.loadLocalConfig === 'string') {
+    localConfig = require(envConfig.loadLocalConfig);
+    merge(envConfig, localConfig);
+  } else {
+    try {
+      // get config from src directory
+      localConfig = require(__dirname + '/config.json');
+      merge(envConfig, localConfig);
+    } catch {
+      try {
+        // if not found try to find in project directory
+        localConfig = require(__dirname + '/../config.json');
+        merge(envConfig, localConfig);
+      } catch (e) {
+        // No config.json found => nothing to do
+      }
+    }
+  }
+}
+
 /**
  * Export envConfig as default
  */

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

@@ -322,12 +322,12 @@ export function clone(object: any, options?: { proto?: boolean; circles?: boolea
   try {
     return rfdc(config)(object);
   } catch (e) {
-    console.info(e);
-    if (object.circle) {
+    console.debug(e);
+    if (!config.circles) {
       try {
         return rfdc({ ...config, ...{ circles: true } })(object);
       } catch (e) {
-        console.info(e);
+        console.debug(e);
         return _.clone(object);
       }
     } else {

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

@@ -202,18 +202,18 @@ export function mapClasses<T = Record<string, any>>(
       if (Array.isArray(value)) {
         const arr = [];
         for (const item of value) {
-          if (value instanceof targetClass) {
-            arr.push(value);
-          } else if (value instanceof Types.ObjectId) {
-            config.objectIdsToString ? arr.push(value.toHexString()) : arr.push(value);
-          } else if (typeof value === 'object') {
+          if (item instanceof targetClass) {
+            arr.push(item);
+          } else if (item instanceof Types.ObjectId) {
+            config.objectIdsToString ? arr.push(item.toHexString()) : arr.push(item);
+          } else if (typeof item === 'object') {
             if (targetClass.map) {
               arr.push(targetClass.map(item));
             } else {
               arr.push(plainToInstance(targetClass, item));
             }
           } else {
-            arr.push(value);
+            arr.push(item);
           }
         }
         target[prop] = arr as any;
@@ -285,18 +285,18 @@ export async function mapClassesAsync<T = Record<string, any>>(
       if (Array.isArray(value)) {
         const arr = [];
         for (const item of value) {
-          if (value instanceof targetClass) {
-            arr.push(value);
-          } else if (value instanceof Types.ObjectId) {
-            config.objectIdsToString ? arr.push(value.toHexString()) : arr.push(value);
-          } else if (typeof value === 'object') {
+          if (item instanceof targetClass) {
+            arr.push(item);
+          } else if (item instanceof Types.ObjectId) {
+            config.objectIdsToString ? arr.push(item.toHexString()) : arr.push(item);
+          } else if (typeof item === 'object') {
             if (targetClass.map) {
               arr.push(await targetClass.map(item));
             } else {
               arr.push(plainToInstance(targetClass, item));
             }
           } else {
-            arr.push(value);
+            arr.push(item);
           }
         }
         target[prop] = arr as any;

package/src/core/common/interfaces/server-options.interface.ts

@@ -128,6 +128,14 @@ export interface IServerOptions {
     secretOrPrivateKey?: string;
   } & JwtModuleOptions;
 
+  /**
+   * Load local configuration
+   * false: no local configuration is loaded,
+   * true: it tries to load ./config.json or ../config.json,
+   * string: path to configuration
+   */
+  loadLocalConfig?: boolean | string;
+
   /**
    * Configuration for Mongoose
    */