chore: update deps

Rmannn · Rmannn · commit 930bf4b648dd · 2022-04-27T14:57:48.000+02:00
- move mongodb to peerDependencies
- eslint bump
- bump version
- bump yarn to berry version
diff --git a/.eslintrc b/.eslintrc
@@ -5,12 +5,20 @@
     "parserOptions": {
         "project": "./tsconfig.json"
     },
-    "ignorePatterns": ["typedoc.js", "docs/*"],
-    "extends": ["standard-with-typescript", "prettier"],
+    "ignorePatterns": [
+        "typedoc.js",
+        "docs/*"
+    ],
+    "extends": [
+        "eslint:recommended",
+        "plugin:@typescript-eslint/eslint-recommended",
+        "plugin:@typescript-eslint/recommended",
+        "prettier"
+    ],
     "root": true,
     "rules": {
         "@typescript-eslint/explicit-function-return-type": "off",
         "@typescript-eslint/no-explicit-any": "off",
         "@typescript-eslint/no-empty-interface": "off"
     }
-}
+}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,7 +16,7 @@ jobs:
 
         strategy:
             matrix:
-                node-version: [12.x, 14.x, 15.x]
+                node-version: [14.x, 16.x, 18.x]
                 mongodb-version: [4.2, 4.2, 4.4, 5.0]
 
         steps:
@@ -37,8 +37,7 @@ jobs:
                   yarn run build
                   yarn run test:cov
             - name: Codecov
-              uses: codecov/codecov-action@v1.0.5
+              uses: codecov/codecov-action@v2
               with:
-                  token: ${{ secrets.CODECOV_TOKEN }}
                   file: ./coverage/coverage-final.json
                   fail_ci_if_error: true
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,5 @@ coverage/
 dist/
 *.tgz
 .DS_Store
+.yarn/install-state.gz
+.yarn/cache
diff --git a/.npmignore b/.npmignore
@@ -19,3 +19,5 @@ renovate.json
 .github/
 dist/test/
 coverage/
+.yarn*
+CHANGELOG.md
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -3,7 +3,8 @@
     "typescript.tsdk": "./node_modules/typescript/lib",
     "editor.formatOnSave": true,
     "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
+        "source.fixAll.eslint": true,
+        "source.organizeImports": true
     },
     "[javascript]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
diff --git a/.yarn/releases/yarn-3.2.0.cjs b/.yarn/releases/yarn-3.2.0.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -0,0 +1 @@
+yarnPath: .yarn/releases/yarn-3.2.0.cjs
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "nestjs-mongo",
-    "version": "0.13.2",
+    "version": "0.14.0",
     "description": "A NestJS module that provide a simple mongodb orm like",
     "keywords": [
         "nestjs",
@@ -17,51 +17,47 @@
     "peerDependencies": {
         "@nestjs/common": "^8",
         "@nestjs/core": "^8",
-        "reflect-metadata": "^0.1.13",
-        "class-validator": "^0.13.1"
+        "class-validator": "^0.13.1",
+        "mongodb": "^4.5.0",
+        "reflect-metadata": "^0.1.13"
     },
     "dependencies": {
         "class-transformer": "0.5.1",
         "cls-hooked": "4.2.2",
-        "debug": "4.3.3",
+        "debug": "4.3.4",
         "global": "4.4.0",
         "lodash": "4.17.21",
-        "mongodb": "4.3.1",
         "slugify": "1.6.5",
         "uuid": "8.3.2"
     },
     "devDependencies": {
-        "@nestjs/common": "8.2.6",
-        "@nestjs/core": "8.2.6",
-        "@nestjs/testing": "8.2.6",
-        "@nestjs/platform-express": "8.2.6",
-        "@types/cls-hooked": "4.3.3",
-        "@types/debug": "4.1.7",
-        "@types/jest": "27.4.0",
-        "@types/lodash": "4.14.178",
-        "@types/supertest": "2.0.11",
-        "@typescript-eslint/eslint-plugin": "5.10.2",
-        "@typescript-eslint/parser": "^4.0.1",
-        "@types/node": "17.0.14",
-        "class-validator": "0.13.2",
-        "eslint": "^7.12.1",
-        "eslint-config-prettier": "8.3.0",
-        "eslint-plugin-import": "2.25.4",
-        "eslint-plugin-node": "^11.1.0",
-        "eslint-plugin-prefer-arrow": "1.2.3",
-        "eslint-plugin-promise": "^5.0.0",
-        "eslint-plugin-standard": "5.0.0",
-        "eslint-config-standard-with-typescript": "^21.0.1",
-        "jest": "27.4.7",
-        "prettier": "2.5.1",
-        "reflect-metadata": "0.1.13",
-        "rxjs": "7.5.2",
-        "supertest": "6.2.2",
-        "ts-jest": "27.1.3",
-        "ts-node": "10.4.0",
-        "tsconfig-paths": "3.12.0",
-        "typedoc": "0.22.11",
-        "typescript": "4.5.5"
+        "@nestjs/common": "^8.4.4",
+        "@nestjs/core": "^8.4.4",
+        "@nestjs/platform-express": "^8.4.4",
+        "@nestjs/testing": "^8.4.4",
+        "@types/cls-hooked": "^4.3.3",
+        "@types/debug": "^4.1.7",
+        "@types/jest": "^27.4.1",
+        "@types/lodash": "^4.14.182",
+        "@types/node": "^17.0.27",
+        "@types/supertest": "^2.0.12",
+        "@typescript-eslint/eslint-plugin": "^5.21.0",
+        "@typescript-eslint/parser": "^5.21.0",
+        "class-validator": "^0.13.2",
+        "eslint": "^8.14.0",
+        "eslint-config-prettier": "^8.5.0",
+        "eslint-plugin-import": "^2.26.0",
+        "jest": "^27.5.1",
+        "mongodb": "^4.5.0",
+        "prettier": "^2.6.2",
+        "reflect-metadata": "^0.1.13",
+        "rxjs": "^7.5.5",
+        "supertest": "^6.2.3",
+        "ts-jest": "^27.1.4",
+        "ts-node": "^10.7.0",
+        "tsconfig-paths": "^3.14.1",
+        "typedoc": "^0.22.15",
+        "typescript": "^4.6.3"
     },
     "scripts": {
         "build": "rm -Rf dist && tsc -b tsconfig.build.json",
@@ -93,6 +89,7 @@
         "coverageDirectory": "../coverage"
     },
     "engines": {
-        "node": ">=0.12"
-    }
+        "node": ">=0.14"
+    },
+    "packageManager": "yarn@3.2.0"
 }
diff --git a/src/entity/manager.ts b/src/entity/manager.ts
@@ -144,7 +144,7 @@ export class EntityManager {
     async validate<Model extends EntityInterface = any>(
         obj: Model,
         validatorOptions: ValidatorOptions = {},
-        throwError: boolean = false
+        throwError = false
     ) {
         const errors = await validate(obj, {
             validationError: { target: true, value: true },
diff --git a/src/entity/repository.ts b/src/entity/repository.ts
@@ -68,7 +68,7 @@ export class EntityRepository<Model extends EntityInterface> {
         return this.em.merge(entity, data, excludePrefixes);
     }
 
-    async validate(entity: Model, validatorOptions: ValidatorOptions = {}, throwError: boolean = false) {
+    async validate(entity: Model, validatorOptions: ValidatorOptions = {}, throwError = false) {
         return await this.em.validate(entity, validatorOptions, throwError);
     }
 }
diff --git a/src/entity/service.ts b/src/entity/service.ts
@@ -55,7 +55,7 @@ export abstract class EntityService<
     }
 
     async list(filter: Filter, ResponseType: any, ...rest: any[]): Promise<PaginatedData<Model>> {
-        const cursor = await this.repository.find(filter.toQuery());
+        const cursor = await this.repository.find(filter.toQuery(), ...rest);
 
         if (!isEmpty(filter.orderBy)) {
             cursor.sort(filter.getSort());
diff --git a/src/helpers.ts b/src/helpers.ts
@@ -1,5 +1,5 @@
 export const isClass = (fn: any) => /^\s*class/.test(fn.toString());
 
-export function getObjectName(o: Object): string {
+export function getObjectName(o: any): string {
     return o.constructor.name;
 }
diff --git a/src/module/core.ts b/src/module/core.ts
@@ -43,6 +43,7 @@ export class MongoModule implements OnModuleDestroy {
         const mongoClientProvider = {
             provide: mongoConnectionToken,
             useFactory: async (config: MongoModuleOptions): Promise<MongoClient> => {
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
                 const { uri, exceptionFactory, ...mongoOpts } = config;
                 const client = new MongoClient(uri, mongoOpts);
                 return await client.connect();
diff --git a/src/module/interfaces.ts b/src/module/interfaces.ts
@@ -21,14 +21,14 @@ export interface MongoModuleAsyncOptions extends Pick<ModuleMetadata, 'imports'>
     inject?: any[];
 }
 
-export interface MongoFeatureModelOptions {
-    model: Type<EntityInterface>;
-    repository?: Type<EntityRepository<EntityInterface>>;
+export interface MongoFeatureModelOptions<Model extends EntityInterface, Repository extends EntityRepository<Model>> {
+    model: Type<Model>;
+    repository?: Type<Repository>;
 }
 
 export interface MongoFeatureOptions {
     connectionName?: string;
-    models: Array<MongoFeatureModelOptions | Type<EntityInterface>>;
+    models: Array<MongoFeatureModelOptions<any, any> | Type<EntityInterface>>;
 }
 
 export type ExceptionFactory = (errors: ValidationError[]) => any;
diff --git a/src/relationship/constraint.ts b/src/relationship/constraint.ts
@@ -13,7 +13,7 @@ export class IsValidRelationshipConstraint implements ValidatorConstraintInterfa
     private em: EntityManager;
     private message: string;
 
-    defaultMessage?(args?: IsValidRelationshipValidationArguments): string {
+    defaultMessage?(): string {
         return this.message;
     }
 
diff --git a/src/relationship/metadata.ts b/src/relationship/metadata.ts
@@ -11,7 +11,7 @@ import {
     RelationshipCascade,
     RelationshipMetadata,
     RelationshipMetadataOptions,
-    RelationshipTypeDescriptor,
+    RelationshipTypeDescriptor
 } from './interfaces';
 
 /**
@@ -49,7 +49,7 @@ export function setRelationshipMetadata<R extends EntityInterface = any>(
  * @param obj The instance of the entity (only required if the type of the relationship is dynamic)
  */
 export function getRelationshipMetadata<R extends EntityInterface = any>(
-    target: Function,
+    target: any,
     property: string,
     em?: EntityManager,
     obj?: any
diff --git a/src/serializer/serializer.ts b/src/serializer/serializer.ts
@@ -8,7 +8,7 @@ export function toJSON() {
     const proto = Object.getPrototypeOf(this);
 
     const json = Object.entries(Object.getOwnPropertyDescriptors(proto))
-        .filter(([_, { get }]) => typeof get === 'function')
+        .filter(([, { get }]) => typeof get === 'function')
         .reduce(
             (obj, [key]) => ({
                 ...obj,
diff --git a/src/session/middleware.ts b/src/session/middleware.ts
@@ -10,7 +10,7 @@ export class SessionLoaderMiddleware implements NestMiddleware {
     protected log = Debug(`${DEBUG}:SessionLoaderMiddleware`);
     protected static readonly ns = createNamespace(SESSION_LOADER_NAMESPACE);
 
-    use(_: Request, __: Response, next: Function) {
+    use(_: Request, __: Response, next: (error?: Error | any) => void) {
         SessionLoaderMiddleware.ns.run(() => {
             this.log('Running namespace %s', SESSION_LOADER_NAMESPACE);
             next();
diff --git a/src/session/orchestrator.ts b/src/session/orchestrator.ts
@@ -7,13 +7,11 @@ import { Debugger } from 'debug';
  */
 export class TransactionsOrchestrator {
     protected readonly jobs: Array<Promise<any>> = [];
-    protected current: number = 0;
+    protected current = 0;
 
     constructor(protected readonly log: Debugger) {}
 
-    async addJob<F extends () => Promise<any>>(
-        jobFunc: F
-    ): Promise<ReturnType<F>> {
+    async addJob<F extends () => Promise<any>>(jobFunc: F): Promise<ReturnType<F>> {
         const current = this.current;
         this.log('Registering job %s on orchestrator', current);
 
diff --git a/src/validation/unique/constraint.ts b/src/validation/unique/constraint.ts
@@ -3,7 +3,7 @@ import {
     ValidationArguments,
     ValidationOptions,
     ValidatorConstraint,
-    ValidatorConstraintInterface,
+    ValidatorConstraintInterface
 } from 'class-validator';
 
 import { Entity } from '../../entity/entity';
@@ -21,7 +21,7 @@ export class IsUniqueConstraint implements ValidatorConstraintInterface {
     private em: EntityManager;
     private message: string;
 
-    defaultMessage?(args?: ValidationArguments): string {
+    defaultMessage?(): string {
         return this.message;
     }
 
diff --git a/test/objectid/objectid.spec.ts b/test/objectid/objectid.spec.ts
@@ -1,5 +1,5 @@
-import { ObjectId } from 'bson';
 import { plainToClass } from 'class-transformer';
+import { ObjectId } from 'mongodb';
 
 import { EntityTest } from '../entity/entity';
 import { EntityRelationship } from '../relationship/entity.relationship';
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+yarnPath: .yarn/releases/yarn-3.2.0.cjs`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ export class EntityRepository<Model extends EntityInterface> {`
`68`	`68`	`return this.em.merge(entity, data, excludePrefixes);`
`69`	`69`	`}`
`70`	`70`
`71`		`- async validate(entity: Model, validatorOptions: ValidatorOptions = {}, throwError: boolean = false) {`
	`71`	`+ async validate(entity: Model, validatorOptions: ValidatorOptions = {}, throwError = false) {`
`72`	`72`	`return await this.em.validate(entity, validatorOptions, throwError);`
`73`	`73`	`}`
`74`	`74`	`}`