@lenne.tech/nest-server 10.8.9 → 10.8.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "10.8.9",
+  "version": "10.8.11",
   "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",
@@ -22,7 +22,8 @@
     "docs:ci": "ts-node ./scripts/init-server.ts && npm run docs:bootstrap && compodoc -p tsconfig.json",
     "format": "prettier --write 'src/**/*.ts'",
     "format:staged": "pretty-quick --staged",
-    "lint": "eslint \"{src,tests}/**/*.ts\" --fix",
+    "lint": "eslint './src/**/*.{ts,js,vue}'",
+    "lint:fix": "eslint './src/**/*.{ts,js,vue}' --fix",
     "prestart:prod": "npm run build",
     "reinit": "rimraf package-lock.json && rimraf node_modules && npm i && npm run lint && npm run test:e2e && npm run test:ci && npm run build",
     "reinit:clean": "rimraf package-lock.json && rimraf node_modules && npm cache clean --force && npm i && npm run test:e2e && npm run build",
@@ -49,7 +50,9 @@
     "prepack": "npm run prestart:prod",
     "prepublishOnly": "npm run lint && npm run test:ci",
     "preversion": "npm run lint",
-    "watch": "npm-watch"
+    "watch": "npm-watch",
+    "link:eslint": "yalc add @lenne.tech/eslint-config-ts && yalc link @lenne.tech/eslint-config-ts && npm install",
+    "unlink:eslint": "yalc remove @lenne.tech/eslint-config-ts && npm install"
   },
   "repository": {
     "type": "git",
@@ -94,10 +97,10 @@
     "json-to-graphql-query": "2.3.0",
     "light-my-request": "6.6.0",
     "lodash": "4.17.21",
-    "mongodb": "6.13.1",
+    "mongodb": "6.15.0",
     "mongoose": "7.8.6",
-    "multer": "1.4.5-lts.1",
-    "node-mailjet": "6.0.6",
+    "multer": "1.4.5-lts.2",
+    "node-mailjet": "6.0.8",
     "nodemailer": "6.10.0",
     "nodemon": "3.1.9",
     "passport": "0.7.0",
@@ -111,28 +114,28 @@
   "devDependencies": {
     "@babel/plugin-proposal-private-methods": "7.18.6",
     "@compodoc/compodoc": "1.1.26",
-    "@lenne.tech/eslint-config-ts": "0.0.16",
+    "@lenne.tech/eslint-config-ts": "1.0.8",
     "@nestjs/cli": "10.4.9",
     "@nestjs/schematics": "10.2.3",
     "@nestjs/testing": "10.4.15",
     "@swc/cli": "0.5.2",
-    "@swc/core": "1.10.18",
+    "@swc/core": "1.11.13",
     "@swc/jest": "0.2.37",
     "@types/compression": "1.7.5",
     "@types/cookie-parser": "1.4.8",
     "@types/ejs": "3.1.5",
     "@types/express": "4.17.21",
     "@types/jest": "29.5.14",
-    "@types/lodash": "4.17.15",
+    "@types/lodash": "4.17.16",
     "@types/multer": "1.4.12",
-    "@types/node": "22.13.5",
+    "@types/node": "22.13.14",
     "@types/nodemailer": "6.4.17",
     "@types/passport": "1.0.17",
-    "@types/supertest": "6.0.2",
-    "@typescript-eslint/eslint-plugin": "6.21.0",
-    "@typescript-eslint/parser": "6.21.0",
+    "@types/supertest": "6.0.3",
+    "@typescript-eslint/eslint-plugin": "8.28.0",
+    "@typescript-eslint/parser": "8.28.0",
     "coffeescript": "2.7.0",
-    "eslint": "8.57.1",
+    "eslint": "9.23.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-unused-imports": "4.1.4",
     "find-file-up": "2.0.1",
@@ -145,15 +148,15 @@
     "jest": "29.7.0",
     "npm-watch": "0.13.0",
     "pm2": "5.4.3",
-    "prettier": "3.5.2",
-    "pretty-quick": "4.0.0",
-    "supertest": "7.0.0",
-    "ts-jest": "29.2.6",
+    "prettier": "3.5.3",
+    "pretty-quick": "4.1.1",
+    "supertest": "7.1.0",
+    "ts-jest": "29.3.0",
     "ts-loader": "9.5.2",
     "ts-morph": "24.0.0",
     "ts-node": "10.9.2",
     "tsconfig-paths": "4.2.0",
-    "typescript": "5.7.3",
+    "typescript": "5.8.2",
     "yalc": "1.0.0-pre.53"
   },
   "overrides": {

package/src/core/common/args/filter.args.ts

@@ -9,7 +9,7 @@ export class FilterArgs extends PaginationArgs {
   /**
    * Filtering
    */
-  @Field(type => FilterInput, {
+  @Field(() => FilterInput, {
     description: 'Input for filtering',
     nullable: true,
   })
@@ -19,7 +19,7 @@ export class FilterArgs extends PaginationArgs {
   /**
    * Get a specific number of random samples from filter results
    */
-  @Field(type => Number, {
+  @Field(() => Number, {
     description:
       'Request only a specified number of samples from the filter results; if not specified, all results are returned.',
     nullable: true,

package/src/core/common/args/pagination.args.ts

@@ -10,7 +10,7 @@ export class PaginationArgs extends CoreInput {
   /**
    * Limit for pagination
    */
-  @Field(type => Int, {
+  @Field(() => Int, {
     description: 'Limit specifies the maximum number of elements found that are to be returned',
     nullable: true,
   })
@@ -20,7 +20,7 @@ export class PaginationArgs extends CoreInput {
   /**
    * Alias for skip
    */
-  @Field(type => Int, {
+  @Field(() => Int, {
     description: 'Alias for skip',
     nullable: true,
   })
@@ -30,7 +30,7 @@ export class PaginationArgs extends CoreInput {
   /**
    * Skip for pagination
    */
-  @Field(type => Int, {
+  @Field(() => Int, {
     description: 'Skip specifies how many found elements should be skipped on return',
     nullable: true,
   })
@@ -40,7 +40,7 @@ export class PaginationArgs extends CoreInput {
   /**
    * Sorting for pagination
    */
-  @Field(type => [SortInput], {
+  @Field(() => [SortInput], {
     description: 'Sorting the returned elements',
     nullable: true,
   })
@@ -50,7 +50,7 @@ export class PaginationArgs extends CoreInput {
   /**
    * Alias for limit
    */
-  @Field(type => Int, {
+  @Field(() => Int, {
     description: 'Alias for limit',
     nullable: true,
   })

package/src/core/common/decorators/graphql-service-options.decorator.ts

@@ -1,4 +1,4 @@
-import { ExecutionContext, createParamDecorator } from '@nestjs/common';
+import { createParamDecorator, ExecutionContext } from '@nestjs/common';
 
 import { currentUserDec, graphqlPopulateDec } from '../helpers/decorator.helper';
 import { ServiceOptions } from '../interfaces/service-options.interface';

package/src/core/common/decorators/graphql-user.decorator.ts

@@ -1,4 +1,4 @@
-import { ExecutionContext, createParamDecorator } from '@nestjs/common';
+import { createParamDecorator, ExecutionContext } from '@nestjs/common';
 import { GqlExecutionContext } from '@nestjs/graphql';
 
 /**

package/src/core/common/decorators/rest-user.decorator.ts

@@ -1,4 +1,4 @@
-import { ExecutionContext, createParamDecorator } from '@nestjs/common';
+import { createParamDecorator, ExecutionContext } from '@nestjs/common';
 
 /**
  * User decorator for REST request

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

@@ -28,28 +28,7 @@ export default class Config {
   }
 }
 
-/**
- * Special merge function (e.g. for configurations)
- *
- * It acts like the merge function of lodash:
- * - Source objects are merged into the destination object
- * - Source objects are applied from left to right
- * - Subsequent sources overwrite property assignments of previous sources
- *
- * except that arrays are not merged but overwrite arrays of previous sources.
- *
- * @param {any} obj destination object
- * @param {any[]} sources source objects
- * @returns {any}
- */
 
-export function merge(obj: Record<string, any>, ...sources: any[]): any {
-  return _.mergeWith(obj, ...sources, (objValue: any, srcValue: any) => {
-    if (Array.isArray(srcValue)) {
-      return srcValue;
-    }
-  });
-}
 
 /**
  * Get environment configuration (deeply merged into config object set via options)
@@ -193,3 +172,25 @@ export function getEnvironmentObject(options?: {
 
   return output;
 }
+
+/**
+ * Special merge function (e.g. for configurations)
+ *
+ * It acts like the merge function of lodash:
+ * - Source objects are merged into the destination object
+ * - Source objects are applied from left to right
+ * - Subsequent sources overwrite property assignments of previous sources
+ *
+ * except that arrays are not merged but overwrite arrays of previous sources.
+ *
+ * @param {any} obj destination object
+ * @param {any[]} sources source objects
+ * @returns {any}
+ */
+export function merge(obj: Record<string, any>, ...sources: any[]): any {
+  return _.mergeWith(obj, ...sources, (objValue: any, srcValue: any) => {
+    if (Array.isArray(srcValue)) {
+      return srcValue;
+    }
+  });
+}

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

@@ -112,6 +112,55 @@ export function equalIds(...ids: IdsType[]): boolean {
   return ids.every(id => getStringIds(id) === compare);
 }
 
+/**
+ * Get (and remove) elements with specific IDs from array
+ */
+export function getElementsViaIds<T = any>(
+  ids: any | any[],
+  array: T[],
+  options: {
+    splice?: boolean;
+    unique?: boolean;
+  } = {},
+): T[] {
+  // Config
+  const config = {
+    // Remove found elements from array
+    splice: false,
+
+    // Return unique elements
+    unique: false,
+
+    // Overwrite with options from parameters
+    ...options,
+  };
+
+  // Get and check indexes
+  const indexes = getIndexesViaIds(ids, array);
+  if (!indexes?.length) {
+    return [];
+  }
+
+  // Get elements
+  const elements = [];
+  indexes.forEach((index) => {
+    if (config.splice) {
+      elements.push(array.splice(index, 1)[0]);
+    } else {
+      elements.push(array[index]);
+    }
+  });
+
+  // Unique elements
+  if (config.unique) {
+    return elements.filter((value, index, self) => {
+      return self.findIndex(e => getStringIds(e)) === index;
+    });
+  }
+
+  // Return elements
+  return elements;
+}
 /**
  * Get included ids
  * @param includes IdsType, which should be checked if it contains the ID
@@ -121,11 +170,12 @@ export function equalIds(...ids: IdsType[]): boolean {
  */
 export function getIncludedIds(includes: IdsType, ids: IdsType, convert?: 'string'): string[];
 export function getIncludedIds(includes: IdsType, ids: IdsType, convert?: 'object'): Types.ObjectId[];
+
 export function getIncludedIds<T = IdsType>(
   includes: IdsType,
   ids: IdsType | T,
   convert?: 'object' | 'string',
-): T[] | null | undefined {
+): null | T[] | undefined {
   if (!includes || !ids) {
     return undefined;
   }
@@ -181,52 +231,26 @@ export function getIndexesViaIds(ids: IdsType, array: IdsType): number[] {
   // Return indexes
   return indexes;
 }
-
 /**
- * Get IDs from string of ObjectId array in a flat string array
+ * Get simple clone of object via JSON.stringify and JSON.parse
+ * @param obj
  */
-export function getStringIds(elements: any[], options?: { deep?: boolean; unique?: boolean }): string[];
-export function getStringIds(elements: any, options?: { deep?: boolean; unique?: boolean }): string;
-export function getStringIds<T extends any | any[]>(
-  elements: T,
-  options?: { deep?: boolean; unique?: boolean },
-): string | string[] {
-  // Process options
-  const { deep, unique } = {
-    deep: false,
-    unique: false,
-    ...options,
-  };
-
-  // Check elements
-  if (!elements) {
-    return elements as any;
-  }
-
-  // Init ids
-  let ids = [];
-
-  // Process non array
-  if (!Array.isArray(elements)) {
-    return getStringId(elements);
-  }
-
-  // Process array
-  for (const element of elements) {
-    if (Array.isArray(element)) {
-      if (deep) {
-        ids = ids.concat(getStringIds(element, { deep }));
-      }
-    } else {
-      const id = getStringId(element);
-      if (id) {
-        ids.push(id);
-      }
+export function getJSONClone<T = any>(obj: T): Partial<T> {
+  return JSON.parse(JSON.stringify(obj));
+}
+/**
+ * Get next field nodes
+ */
+export function getNextFieldNodes(nodes: readonly SelectionNode[]): FieldNode[] {
+  const result = [];
+  for (const node of nodes as FieldNode[]) {
+    if (node.name?.value) {
+      result.push(node);
+    } else if (node.selectionSet?.selections) {
+      result.push(...getNextFieldNodes(node.selectionSet.selections));
     }
   }
-
-  // Return (unique) ID array
-  return unique ? _.uniq(ids) : ids;
+  return result;
 }
 
 /**
@@ -241,56 +265,6 @@ export function getObjectIds<T extends any | any[]>(ids: T): Types.ObjectId | Ty
   return new Types.ObjectId(getStringId(ids));
 }
 
-/**
- * Get (and remove) elements with specific IDs from array
- */
-export function getElementsViaIds<T = any>(
-  ids: any | any[],
-  array: T[],
-  options: {
-    splice?: boolean;
-    unique?: boolean;
-  } = {},
-): T[] {
-  // Config
-  const config = {
-    // Remove found elements from array
-    splice: false,
-
-    // Return unique elements
-    unique: false,
-
-    // Overwrite with options from parameters
-    ...options,
-  };
-
-  // Get and check indexes
-  const indexes = getIndexesViaIds(ids, array);
-  if (!indexes?.length) {
-    return [];
-  }
-
-  // Get elements
-  const elements = [];
-  indexes.forEach((index) => {
-    if (config.splice) {
-      elements.push(array.splice(index, 1)[0]);
-    } else {
-      elements.push(array[index]);
-    }
-  });
-
-  // Unique elements
-  if (config.unique) {
-    return elements.filter((value, index, self) => {
-      return self.findIndex(e => getStringIds(e)) === index;
-    });
-  }
-
-  // Return elements
-  return elements;
-}
-
 /**
  * Get populate options from GraphQL resolve info
  */
@@ -332,21 +306,6 @@ export function getPopulateOptions(info: GraphQLResolveInfo, dotSeparatedSelect?
   return result;
 }
 
-/**
- * Get next field nodes
- */
-export function getNextFieldNodes(nodes: readonly SelectionNode[]): FieldNode[] {
-  const result = [];
-  for (const node of nodes as FieldNode[]) {
-    if (node.name?.value) {
-      result.push(node);
-    } else if (node.selectionSet?.selections) {
-      result.push(...getNextFieldNodes(node.selectionSet.selections));
-    }
-  }
-  return result;
-}
-
 /**
  * Get populate options from selections
  */
@@ -399,11 +358,52 @@ export function getPopulatOptionsFromSelections(selectionNodes: readonly Selecti
 }
 
 /**
- * Get simple clone of object via JSON.stringify and JSON.parse
- * @param obj
+ * Get IDs from string of ObjectId array in a flat string array
  */
-export function getJSONClone<T = any>(obj: T): Partial<T> {
-  return JSON.parse(JSON.stringify(obj));
+export function getStringIds(elements: any[], options?: { deep?: boolean; unique?: boolean }): string[];
+
+export function getStringIds(elements: any, options?: { deep?: boolean; unique?: boolean }): string;
+
+export function getStringIds<T extends any | any[]>(
+  elements: T,
+  options?: { deep?: boolean; unique?: boolean },
+): string | string[] {
+  // Process options
+  const { deep, unique } = {
+    deep: false,
+    unique: false,
+    ...options,
+  };
+
+  // Check elements
+  if (!elements) {
+    return elements as any;
+  }
+
+  // Init ids
+  let ids = [];
+
+  // Process non array
+  if (!Array.isArray(elements)) {
+    return getStringId(elements);
+  }
+
+  // Process array
+  for (const element of elements) {
+    if (Array.isArray(element)) {
+      if (deep) {
+        ids = ids.concat(getStringIds(element, { deep }));
+      }
+    } else {
+      const id = getStringId(element);
+      if (id) {
+        ids.push(id);
+      }
+    }
+  }
+
+  // Return (unique) ID array
+  return unique ? _.uniq(ids) : ids;
 }
 
 /**
@@ -442,58 +442,6 @@ export function objectIdsToStrings(element: any, prepared: WeakMap<any, any> = n
   return element;
 }
 
-/**
- * Remove unresolved references: ObjectId => null
- */
-export function removeUnresolvedReferences<T = any>(
-  populated: T,
-  populatedOptions: (PopulateOptions | string)[] | PopulateOptions | PopulateOptions[] | string,
-  ignoreFirst = true,
-): T {
-  // Check parameter
-  if (!populated || !populatedOptions) {
-    return populated;
-  }
-
-  // Process array
-  if (Array.isArray(populated)) {
-    populated.forEach(p => removeUnresolvedReferences(p, populatedOptions, false));
-    return populated;
-  }
-
-  // Process object
-  if (typeof populated === 'object') {
-    // populatedOptions is an array
-    if (Array.isArray(populatedOptions)) {
-      populatedOptions.forEach(po =>
-        removeUnresolvedReferences(populated, ignoreFirst && typeof po === 'object' ? po.populate : po, false),
-      );
-      return populated;
-    }
-
-    // populatedOptions is a string
-    if (typeof populatedOptions === 'string') {
-      if (!['_id', 'id'].includes(populatedOptions) && populated[populatedOptions] instanceof Types.ObjectId) {
-        populated[populatedOptions] = null;
-      }
-      return populated;
-    }
-
-    // populatedOptions is an PopulateOptions object
-    if (populatedOptions.path) {
-      const key = populatedOptions.path;
-      if (!['_id', 'id'].includes(key) && populated[key] instanceof Types.ObjectId) {
-        populated[key] = null;
-      } else if (populatedOptions.populate) {
-        removeUnresolvedReferences(populated[key], populatedOptions.populate, false);
-      }
-    }
-  }
-
-  // Process others
-  return populated;
-}
-
 /**
  * Set populates, execute and map result
  */
@@ -596,6 +544,58 @@ export function removeIds(source: any[], ids: StringOrObjectId | StringOrObjectI
   return source;
 }
 
+/**
+ * Remove unresolved references: ObjectId => null
+ */
+export function removeUnresolvedReferences<T = any>(
+  populated: T,
+  populatedOptions: (PopulateOptions | string)[] | PopulateOptions | PopulateOptions[] | string,
+  ignoreFirst = true,
+): T {
+  // Check parameter
+  if (!populated || !populatedOptions) {
+    return populated;
+  }
+
+  // Process array
+  if (Array.isArray(populated)) {
+    populated.forEach(p => removeUnresolvedReferences(p, populatedOptions, false));
+    return populated;
+  }
+
+  // Process object
+  if (typeof populated === 'object') {
+    // populatedOptions is an array
+    if (Array.isArray(populatedOptions)) {
+      populatedOptions.forEach(po =>
+        removeUnresolvedReferences(populated, ignoreFirst && typeof po === 'object' ? po.populate : po, false),
+      );
+      return populated;
+    }
+
+    // populatedOptions is a string
+    if (typeof populatedOptions === 'string') {
+      if (!['_id', 'id'].includes(populatedOptions) && populated[populatedOptions] instanceof Types.ObjectId) {
+        populated[populatedOptions] = null;
+      }
+      return populated;
+    }
+
+    // populatedOptions is an PopulateOptions object
+    if (populatedOptions.path) {
+      const key = populatedOptions.path;
+      if (!['_id', 'id'].includes(key) && populated[key] instanceof Types.ObjectId) {
+        populated[key] = null;
+      } else if (populatedOptions.populate) {
+        removeUnresolvedReferences(populated[key], populatedOptions.populate, false);
+      }
+    }
+  }
+
+  // Process others
+  return populated;
+}
+
 /**
  * Set populates via populates options array
  */

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

@@ -34,24 +34,6 @@ export default class FileHelper {
   }
 }
 
-/**
- * Get function to generate a random file name for multer with a certain
- * number of digits
- */
-export function multerRandomFileName(numberOfDigits = 32) {
-  return (req, file, cb) => {
-    // Generating a random string
-    const randomName = Array(numberOfDigits)
-      .fill(null)
-      .map(() => Math.round(Math.random() * 16).toString(16))
-      .join('');
-
-    // Calling the callback passing the random name generated with the
-    // original extension name
-    cb(null, `${randomName}${extname(file.originalname)}`);
-  };
-}
-
 /**
  * Get function to filter files for multer with a certain mimetype & extname
  */
@@ -105,3 +87,21 @@ export function multerOptionsForImageUpload(options: {
     }),
   };
 }
+
+/**
+ * Get function to generate a random file name for multer with a certain
+ * number of digits
+ */
+export function multerRandomFileName(numberOfDigits = 32) {
+  return (req, file, cb) => {
+    // Generating a random string
+    const randomName = Array(numberOfDigits)
+      .fill(null)
+      .map(() => Math.round(Math.random() * 16).toString(16))
+      .join('');
+
+    // Calling the callback passing the random name generated with the
+    // original extension name
+    cb(null, `${randomName}${extname(file.originalname)}`);
+  };
+}