@lenne.tech/nest-server 9.4.0 → 10.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/nest-server",
-  "version": "9.4.0",
+  "version": "10.0.0",
   "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",
@@ -14,7 +14,7 @@
   "homepage": "https://github.com/lenneTech/nest-server",
   "license": "MIT",
   "scripts": {
-    "build": "rimraf dist && tsc -p tsconfig.build.json",
+    "build": "rimraf dist && nest build",
     "build:pack": "npm pack && echo 'use file:/ROOT_PATH_TO_TGZ_FILE to integrate the package'",
     "build:dev": "npm run build && yalc push --private",
     "docs": "npm run docs:ci && open ./public/index.html",
@@ -33,8 +33,10 @@
     "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",
-    "start:local": "NODE_ENV=local nodemon",
+    "start:dev": "nest start -b swc -w --type-check",
+    "start:dev:ts": "nodemon",
+    "start:local": "NODE_ENV=local nest start -b swc -w --type-check",
+    "start:local:ts": "NODE_ENV=local nodemon",
     "test": "NODE_ENV=local jest",
     "test:cov": "NODE_ENV=local jest --coverage",
     "test:debug": "NODE_ENV=local node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
@@ -60,16 +62,16 @@
     "node": ">= 16.13.0"
   },
   "dependencies": {
-    "@apollo/gateway": "2.4.0",
-    "@nestjs/apollo": "11.0.4",
-    "@nestjs/common": "9.3.12",
-    "@nestjs/core": "9.3.12",
-    "@nestjs/graphql": "11.0.4",
-    "@nestjs/jwt": "10.0.2",
-    "@nestjs/mongoose": "9.2.2",
-    "@nestjs/passport": "9.0.3",
-    "@nestjs/platform-express": "9.3.12",
-    "@nestjs/schedule": "2.2.0",
+    "@apollo/gateway": "2.4.9",
+    "@nestjs/apollo": "12.0.7",
+    "@nestjs/common": "10.0.5",
+    "@nestjs/core": "10.0.5",
+    "@nestjs/graphql": "12.0.8",
+    "@nestjs/jwt": "10.1.0",
+    "@nestjs/mongoose": "10.0.0",
+    "@nestjs/passport": "10.0.0",
+    "@nestjs/platform-express": "10.0.5",
+    "@nestjs/schedule": "3.0.1",
     "apollo-server-core": "3.11.1",
     "apollo-server-express": "3.11.1",
     "bcrypt": "5.1.0",
@@ -78,46 +80,52 @@
     "compression": "1.7.4",
     "cookie-parser": "1.4.6",
     "ejs": "3.1.9",
-    "graphql": "16.6.0",
+    "graphql": "16.7.1",
     "graphql-query-complexity": "0.12.0",
     "graphql-subscriptions": "2.0.0",
     "graphql-upload": "15.0.2",
     "js-sha256": "0.9.0",
     "json-to-graphql-query": "2.2.5",
-    "light-my-request": "5.9.1",
+    "light-my-request": "5.10.0",
     "lodash": "4.17.21",
-    "mongodb": "4.14.0",
-    "mongoose": "6.10.4",
+    "mongodb": "4.16.0",
+    "mongoose": "6.11.3",
     "mongoose-gridfs": "1.3.0",
     "multer": "1.4.5-lts.1",
     "multer-gridfs-storage": "5.0.2",
-    "node-mailjet": "6.0.2",
-    "nodemailer": "6.9.1",
-    "nodemon": "2.0.22",
+    "node-mailjet": "6.0.3",
+    "nodemailer": "6.9.3",
+    "nodemon": "3.0.1",
     "passport": "0.6.0",
     "passport-jwt": "4.0.1",
     "reflect-metadata": "0.1.13",
     "rfdc": "1.3.0",
-    "rimraf": "4.4.1",
-    "rxjs": "7.8.0"
+    "rimraf": "5.0.1",
+    "rxjs": "7.8.1"
   },
   "devDependencies": {
-    "@nestjs/testing": "9.3.12",
-    "@types/compression": "1.7.2",
+    "@nestjs/cli": "10.1.8",
+    "@nestjs/schematics": "10.0.1",
+    "@nestjs/testing": "10.0.5",
+    "@swc/cli": "^0.1.62",
+    "@swc/core": "1.3.69",
+    "@swc/jest": "0.2.26",
+    "@types/compression": "^1.7.2",
     "@types/cookie-parser": "1.4.3",
     "@types/cron": "2.0.1",
     "@types/ejs": "3.1.2",
-    "@types/jest": "29.5.0",
-    "@types/lodash": "4.14.192",
+    "@types/express": "4.17.17",
+    "@types/jest": "29.5.3",
+    "@types/lodash": "4.14.195",
     "@types/multer": "1.4.7",
-    "@types/node": "18.15.10",
-    "@types/nodemailer": "6.4.7",
+    "@types/node": "20.4.2",
+    "@types/nodemailer": "6.4.8",
     "@types/passport": "1.0.12",
     "@types/supertest": "2.0.12",
-    "@typescript-eslint/eslint-plugin": "5.57.0",
-    "@typescript-eslint/parser": "5.57.0",
+    "@typescript-eslint/eslint-plugin": "6.0.0",
+    "@typescript-eslint/parser": "6.0.0",
     "coffeescript": "2.7.0",
-    "eslint": "8.36.0",
+    "eslint": "8.45.0",
     "eslint-config-prettier": "8.8.0",
     "find-file-up": "2.0.1",
     "grunt": "1.6.1",
@@ -126,17 +134,18 @@
     "grunt-contrib-watch": "1.1.0",
     "grunt-sync": "0.8.2",
     "husky": "8.0.3",
-    "jest": "29.5.0",
+    "jest": "29.6.1",
     "npm-watch": "0.11.0",
     "pm2": "5.3.0",
-    "prettier": "2.8.7",
+    "prettier": "2.8.8",
     "pretty-quick": "3.1.3",
     "supertest": "6.3.3",
-    "ts-jest": "29.0.5",
-    "ts-morph": "17.0.1",
+    "ts-jest": "29.1.1",
+    "ts-loader": "9.4.4",
+    "ts-morph": "19.0.0",
     "ts-node": "10.9.1",
-    "tsconfig-paths": "4.1.2",
-    "typescript": "5.0.2",
+    "tsconfig-paths": "4.2.0",
+    "typescript": "5.1.6",
     "yalc": "1.0.0-pre.53"
   },
   "overrides": {
@@ -154,7 +163,7 @@
     ],
     "rootDir": "src",
     "testEnvironment": "node",
-    "testRegex": ".spec.ts$",
+    "testRegex": ".*\\.spec\\.ts$",
     "transform": {
       ".+\\.(t|j)s$": "ts-jest"
     }

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

@@ -4,7 +4,7 @@ import { ProcessType } from '../enums/process-type.enum';
 import { RoleEnum } from '../enums/role.enum';
 import { getIncludedIds } from '../helpers/db.helper';
 import { RequireAtLeastOne } from '../types/required-at-least-one.type';
-import * as _ from 'lodash';
+import _ = require('lodash');
 
 /**
  * Restricted meta key
@@ -137,6 +137,7 @@ export const checkRestricted = (
         roles.includes(RoleEnum.S_EVERYONE) ||
         user?.hasRole?.(roles) ||
         (user?.id && roles.includes(RoleEnum.S_USER)) ||
+        (roles.includes(RoleEnum.S_SELF) && getIncludedIds(config.dbObject, user)) ||
         (roles.includes(RoleEnum.S_CREATOR) && getIncludedIds(config.dbObject?.createdBy, user))
       ) {
         valid = true;

package/src/core/common/enums/role.enum.ts

@@ -53,4 +53,7 @@ export enum RoleEnum {
 
   // User must be the creator of the processed object(s) (see createdBy property of object(s))
   S_CREATOR = 's_creator',
+
+  // User must be herself/himself
+  S_SELF = 's_self',
 }

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

@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import _ = require('lodash');
 
 /**
  * Helper class for configurations

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

@@ -1,5 +1,5 @@
 import { FieldNode, GraphQLResolveInfo, SelectionNode } from 'graphql';
-import * as _ from 'lodash';
+import _ = require('lodash');
 import { Document, Model, PopulateOptions, Query, Types } from 'mongoose';
 import { ResolveSelector } from '../interfaces/resolve-selector.interface';
 import { CoreModel } from '../models/core-model.model';

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

@@ -12,7 +12,7 @@ import {
   ValueNode,
   VariableNode,
 } from 'graphql';
-import * as _ from 'lodash';
+import _ = require('lodash');
 
 /**
  * Interface for GraphQLFieldsConfig

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

@@ -3,8 +3,8 @@ import { plainToInstance } from 'class-transformer';
 import { validate } from 'class-validator';
 import { ValidatorOptions } from 'class-validator/types/validation/ValidatorOptions';
 import { Kind } from 'graphql/index';
-import * as _ from 'lodash';
-import * as rfdc from 'rfdc';
+import _ = require('lodash');
+import rfdc = require('rfdc');
 import { checkRestricted } from '../decorators/restricted.decorator';
 import { ProcessType } from '../enums/process-type.enum';
 import { RoleEnum } from '../enums/role.enum';
@@ -250,6 +250,8 @@ export async function check(
       (roles.includes(RoleEnum.S_USER) && user?.id) ||
       // check if the user has at least one of the required roles
       user?.hasRole?.(roles) ||
+      // check if the user is herself / himself
+      (roles.includes(RoleEnum.S_SELF) && equalIds(config.dbObject, user)) ||
       // check if the user is the creator
       (roles.includes(RoleEnum.S_CREATOR) && equalIds(config.dbObject?.createdBy, user))
     ) {

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

@@ -1,8 +1,8 @@
 import { UnauthorizedException } from '@nestjs/common';
-import * as bcrypt from 'bcrypt';
+import bcrypt = require('bcrypt');
 import { plainToInstance } from 'class-transformer';
 import { sha256 } from 'js-sha256';
-import * as _ from 'lodash';
+import _ = require('lodash');
 import { Types } from 'mongoose';
 import { RoleEnum } from '../enums/role.enum';
 import { PrepareInputOptions } from '../interfaces/prepare-input-options.interface';

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

@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import _ = require('lodash');
 import { cloneDeep } from 'lodash';
 import { BehaviorSubject, firstValueFrom } from 'rxjs';
 import { filter, map } from 'rxjs/operators';

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import * as nodemailer from 'nodemailer';
+import nodemailer = require('nodemailer');
 import { Attachment } from 'nodemailer/lib/mailer';
 import { isNonEmptyString, isTrue, returnFalse } from '../helpers/input.helper';
 import { ConfigService } from './config.service';

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

@@ -1,8 +1,6 @@
 import { HttpException, Injectable } from '@nestjs/common';
-import { template } from 'lodash';
 import { ConfigService } from './config.service';
-// eslint-disable-next-line
-const Mailjet = require('node-mailjet');
+import Mailjet from 'node-mailjet';
 
 /**
  * Mailjet service

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

@@ -1,4 +1,4 @@
-import * as _ from 'lodash';
+import _ = require('lodash');
 import { Document, Model, Types } from 'mongoose';
 import { ProcessType } from '../enums/process-type.enum';
 import { getStringIds, popAndMap } from '../helpers/db.helper';

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

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
-import * as ejs from 'ejs';
+import ejs = require('ejs');
 import { TemplateFunction } from 'ejs';
-import * as fs from 'fs';
+import fs = require('fs');
 import { join } from 'path';
 import { ConfigService } from './config.service';
 

package/src/core/modules/auth/guards/auth.guard.ts

@@ -3,7 +3,7 @@ import { GqlExecutionContext } from '@nestjs/graphql';
 import { AuthModuleOptions, Type } from '@nestjs/passport';
 import { defaultOptions } from '@nestjs/passport/dist/options';
 import { memoize } from '@nestjs/passport/dist/utils/memoize.util';
-import * as passport from 'passport';
+import passport = require('passport');
 import { AuthGuardStrategy } from '../auth-guard-strategy.enum';
 import { ExpiredRefreshTokenException } from '../exceptions/expired-refresh-token.exception';
 import { ExpiredTokenException } from '../exceptions/expired-token.exception';

package/src/core/modules/auth/services/core-auth.service.ts

@@ -1,6 +1,6 @@
 import { BadRequestException, Injectable, UnauthorizedException } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
-import * as bcrypt from 'bcrypt';
+import bcrypt = require('bcrypt');
 import { randomUUID } from 'crypto';
 import { sha256 } from 'js-sha256';
 import { getStringIds } from '../../../common/helpers/db.helper';

package/src/core/modules/user/core-user.service.ts

@@ -1,6 +1,6 @@
 import { BadRequestException, NotFoundException, UnprocessableEntityException } from '@nestjs/common';
-import * as bcrypt from 'bcrypt';
-import * as crypto from 'crypto';
+import bcrypt = require('bcrypt');
+import crypto = require('crypto');
 import { sha256 } from 'js-sha256';
 import { Document, Model } from 'mongoose';
 import { assignPlain, prepareServiceOptionsForCreate } from '../../common/helpers/input.helper';

package/src/core.module.ts

@@ -4,7 +4,7 @@ import { APP_PIPE } from '@nestjs/core';
 import { GraphQLModule } from '@nestjs/graphql';
 import { MongooseModule } from '@nestjs/mongoose';
 import { Context } from 'apollo-server-core';
-import * as graphqlUploadExpress from 'graphql-upload/graphqlUploadExpress.js';
+import graphqlUploadExpress = require('graphql-upload/graphqlUploadExpress.js');
 import { merge } from './core/common/helpers/config.helper';
 import { IServerOptions } from './core/common/interfaces/server-options.interface';
 import { MapAndValidatePipe } from './core/common/pipes/map-and-validate.pipe';

package/src/main.ts

@@ -1,8 +1,8 @@
 import { NestFactory } from '@nestjs/core';
 import { NestExpressApplication } from '@nestjs/platform-express';
 import { exec } from 'child_process';
-import * as compression from 'compression';
-import * as cookieParser from 'cookie-parser';
+import compression = require('compression');
+import cookieParser = require('cookie-parser');
 import envConfig from './config.env';
 import { HttpExceptionLogFilter } from './core/common/filters/http-exception-log.filter';
 import { ServerModule } from './server/server.module';

package/src/server/common/models/persistence.model.ts

@@ -1,5 +1,5 @@
 import { Types } from 'mongoose';
-import * as mongoose from 'mongoose';
+import mongoose = require('mongoose');
 import { Prop } from '@nestjs/mongoose';
 import { Field, ObjectType } from '@nestjs/graphql';
 import { CorePersistenceModel } from '../../../core/common/models/core-persistence.model';

package/src/server/modules/file/file.resolver.ts

@@ -1,7 +1,7 @@
 import { Args, Mutation, Query, Resolver } from '@nestjs/graphql';
-import * as fs from 'fs';
+import fs = require('fs');
 import { createWriteStream } from 'fs';
-import * as GraphQLUpload from 'graphql-upload/GraphQLUpload.js';
+import GraphQLUpload = require('graphql-upload/GraphQLUpload.js');
 import { Roles } from '../../../core/common/decorators/roles.decorator';
 import { RoleEnum } from '../../../core/common/enums/role.enum';
 import { FileUpload } from '../../../core/modules/file/interfaces/file-upload.interface';

package/src/server/modules/user/user.resolver.ts

@@ -62,7 +62,7 @@ export class UserResolver {
   async getUser(@GraphQLServiceOptions() serviceOptions: ServiceOptions, @Args('id') id: string): Promise<User> {
     return await this.userService.get(id, {
       ...serviceOptions,
-      roles: [RoleEnum.ADMIN, RoleEnum.S_CREATOR],
+      roles: [RoleEnum.ADMIN, RoleEnum.S_CREATOR, RoleEnum.S_SELF],
     });
   }
 
@@ -111,7 +111,7 @@ export class UserResolver {
   async deleteUser(@GraphQLServiceOptions() serviceOptions: ServiceOptions, @Args('id') id: string): Promise<User> {
     return await this.userService.delete(id, {
       ...serviceOptions,
-      roles: [RoleEnum.ADMIN, RoleEnum.S_CREATOR],
+      roles: [RoleEnum.ADMIN, RoleEnum.S_CREATOR, RoleEnum.S_SELF],
     });
   }
 
@@ -138,7 +138,7 @@ export class UserResolver {
     return await this.userService.update(id, input, {
       ...serviceOptions,
       inputType: UserInput,
-      roles: [RoleEnum.ADMIN, RoleEnum.S_CREATOR],
+      roles: [RoleEnum.ADMIN, RoleEnum.S_CREATOR, RoleEnum.S_SELF],
     });
   }
 

package/src/server/modules/user/user.service.ts

@@ -1,6 +1,6 @@
 import { Inject, Injectable, UnauthorizedException, UnprocessableEntityException } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
-import * as fs from 'fs';
+import fs = require('fs');
 import { PubSub } from 'graphql-subscriptions';
 import { Model } from 'mongoose';
 import { ServiceOptions } from '../../../core/common/interfaces/service-options.interface';

package/src/test/test.helper.ts

@@ -1,14 +1,11 @@
 import { INestApplication } from '@nestjs/common';
 import { Blob } from 'buffer';
-import * as fs from 'fs';
 import { createClient } from 'graphql-ws';
 import { jsonToGraphQLQuery } from 'json-to-graphql-query';
-import * as LightMyRequest from 'light-my-request';
 import { Types } from 'mongoose';
-import * as superagent from 'superagent';
-import * as supertest from 'supertest';
-import * as util from 'util';
-import * as ws from 'ws';
+import supertest = require('supertest');
+import util = require('util');
+import ws = require('ws');
 import { getStringIds } from '../core/common/helpers/db.helper';
 
 /**
@@ -66,7 +63,7 @@ export interface TestGraphQLConfig {
 }
 
 export interface TestGraphQLAttachment {
-  file: Blob | Buffer | fs.ReadStream | string | boolean | number;
+  file: Blob | Buffer | ReadableStream | string | boolean | number;
   options?: string | { filename?: string | undefined; contentType?: string | undefined };
 }
 
@@ -157,7 +154,7 @@ export class TestHelper {
    * Download file from URL
    * @return Superagent response with additional data field containing the content of the file
    */
-  download(url: string, token?: string): Promise<superagent.Response & { data: string }> {
+  download(url: string, token?: string): Promise<any> {
     return new Promise((resolve, reject) => {
       const request = supertest((this.app as INestApplication).getHttpServer()).get(url);
       if (token) {
@@ -176,9 +173,9 @@ export class TestHelper {
             err ? reject(err) : callback(null, null);
           });
         })
-        .end((err, res: superagent.Response) => {
-          (res as superagent.Response & { data: string }).data = Buffer.from(data, 'binary').toString();
-          err ? reject(err) : resolve(res as superagent.Response & { data: string });
+        .end((err, res: any) => {
+          (res as any & { data: string }).data = Buffer.from(data, 'binary').toString();
+          err ? reject(err) : resolve(res as any);
         });
     });
   }
@@ -269,7 +266,7 @@ export class TestHelper {
     }
 
     // Request configuration
-    const requestConfig: LightMyRequest.InjectOptions = {
+    const requestConfig: any = {
       method: 'POST',
       url: '/graphql',
       payload: { query },
@@ -320,7 +317,7 @@ export class TestHelper {
     const { token, statusCode, log, logError, attachments } = config;
 
     // Request configuration
-    const requestConfig: LightMyRequest.InjectOptions = {
+    const requestConfig: any = {
       method: config.method,
       url,
     };
@@ -427,7 +424,7 @@ export class TestHelper {
    */
   protected async getResponse(
     token: string,
-    requestConfig: LightMyRequest.InjectOptions,
+    requestConfig: any,
     statusCode: number,
     log: boolean,
     logError: boolean,