chore(): resolve conflicts

Author: kamilmysliwiec

Readme.md

@@ -128,6 +128,8 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
      <td align="center" valign="middle"><a href="https://polygon-software.ch/" target="_blank"><img src="https://nestjs.com/img/polygon-logo.svg" width="120" valign="middle" /></a></td>
    <td align="center" valign="middle"><a href="https://mobilereality.pl/" target="_blank"><img src="https://nestjs.com/img/mobile-reality-logo.png" width="45" valign="middle" /></a></td>
      <td align="center" valign="middle"><a href="https://boringowl.io/" target="_blank"><img src="https://nestjs.com/img/boringowl-logo.svg" width="120" valign="middle" /></a></td>
+ <td align="center" valign="middle"><a href="https://www.mobilefactory.jp/" target="_blank"><img src="https://nestjs.com/img/mobilefactory-logo.png" width="100" valign="middle" /></a></td>
+ <td align="center" valign="middle"><a href="https://db.nordbot.app/" target="_blank"><img src="https://nestjs.com/img/nord-logo.png" width="50" valign="middle" /></a></td>
   </tr></table>
 
 ## Backers

package-lock.json

@@ -58,7 +58,7 @@
     "cli-color": "2.0.2",
     "cors": "2.8.5",
     "express": "4.18.1",
-    "fast-json-stringify": "4.2.0",
+    "fast-json-stringify": "5.0.1",
     "fast-safe-stringify": "2.1.1",
     "graphql-subscriptions": "2.0.0",
     "iterare": "1.2.1",
@@ -72,7 +72,7 @@
   },
   "devDependencies": {
     "@codechecks/client": "0.1.12",
-    "@commitlint/cli": "17.0.2",
+    "@commitlint/cli": "17.0.3",
     "@commitlint/config-angular": "17.0.0",
     "@fastify/cors": "^8.0.0",
     "@fastify/formbody": "7.0.1",
@@ -81,8 +81,8 @@
     "@fastify/static": "5.0.0",
     "@grpc/grpc-js": "1.6.7",
     "@grpc/proto-loader": "0.6.13",
-    "@nestjs/apollo": "10.0.14",
-    "@nestjs/graphql": "10.0.15",
+    "@nestjs/apollo": "10.0.16",
+    "@nestjs/graphql": "10.0.16",
     "@nestjs/mongoose": "9.1.1",
     "@nestjs/typeorm": "8.0.4",
     "@types/amqplib": "0.8.2",
@@ -95,7 +95,8 @@
     "@types/gulp": "4.0.9",
     "@types/http-errors": "1.8.2",
     "@types/mocha": "9.1.1",
-    "@types/node": "17.0.43",
+    "@types/node": "18.0.0",
+    "@types/redis": "4.0.11",
     "@types/reflect-metadata": "0.1.0",
     "@types/sinon": "10.0.11",
     "@types/supertest": "2.0.12",
@@ -104,8 +105,8 @@
     "@typescript-eslint/parser": "4.33.0",
     "amqp-connection-manager": "4.1.3",
     "amqplib": "0.10.0",
-    "apollo-server-core": "3.8.2",
-    "apollo-server-express": "3.8.2",
+    "apollo-server-core": "3.9.0",
+    "apollo-server-express": "3.9.0",
     "artillery": "1.7.9",
     "body-parser": "1.20.0",
     "bytes": "3.1.2",
@@ -117,7 +118,7 @@
     "commitlint-circle": "1.0.0",
     "concurrently": "7.2.2",
     "conventional-changelog": "3.1.25",
-    "core-js": "3.23.1",
+    "core-js": "3.23.3",
     "coveralls": "3.1.1",
     "delete-empty": "3.0.0",
     "engine.io-client": "6.2.2",
@@ -128,7 +129,7 @@
     "fancy-log": "2.0.0",
     "fastify": "4.0.2",
     "graphql": "15.8.0",
-    "graphql-tools": "8.2.12",
+    "graphql-tools": "8.2.13",
     "gulp": "4.0.2",
     "gulp-clang-format": "1.0.27",
     "gulp-clean": "0.4.0",
@@ -144,19 +145,20 @@
     "lerna": "2.11.0",
     "lerna-changelog": "2.2.0",
     "light-my-request": "5.0.0",
-    "lint-staged": "13.0.1",
+    "lint-staged": "13.0.3",
     "markdown-table": "2.0.0",
     "merge-graphql-schemas": "1.7.8",
+    "middie": "6.1.0",
     "mocha": "10.0.0",
-    "mongoose": "6.3.8",
+    "mongoose": "6.4.0",
     "mqtt": "4.3.7",
     "multer": "1.4.4",
     "mysql2": "2.3.3",
     "nats": "2.7.1",
-    "nodemon": "2.0.16",
+    "nodemon": "2.0.18",
     "nyc": "15.1.0",
     "point-of-view": "6.3.0",
-    "prettier": "2.7.0",
+    "prettier": "2.7.1",
     "redis": "3.1.2",
     "rxjs-compat": "6.6.7",
     "sinon": "14.0.0",
@@ -167,7 +169,7 @@
     "ts-morph": "15.1.0",
     "ts-node": "10.8.1",
     "typeorm": "0.2.45",
-    "typescript": "4.7.3",
+    "typescript": "4.7.4",
     "wrk": "1.2.1",
     "ws": "8.8.0"
   },

package.json

@@ -5,7 +5,7 @@ import { CacheManagerOptions } from './cache-manager.interface';
 export type CacheModuleOptions<
   StoreConfig extends Record<any, any> = Record<string, any>,
 > =
-  // Store-specfic configuration takes precedence over cache module options due
+  // Store-specific configuration takes precedence over cache module options due
   // to how `createCacheManager` is implemented.
   CacheManagerOptions &
     StoreConfig & {

packages/common/cache/interfaces/cache-module.interface.ts

@@ -72,7 +72,7 @@ export interface INestApplicationContext {
   enableShutdownHooks(signals?: ShutdownSignal[] | string[]): this;
 
   /**
-   * Initalizes the Nest application.
+   * Initializes the Nest application.
    * Calls the Nest lifecycle events.
    * It isn't mandatory to call this method directly.
    *

packages/common/interfaces/nest-application-context.interface.ts

@@ -18,7 +18,7 @@ export type VersionValue =
 export interface VersionOptions {
   /**
    * Specifies an optional API Version. When configured, methods
-   * withing the controller will only be routed if the request version
+   * within the controller will only be routed if the request version
    * matches the specified value.
    *
    * Supported only by HTTP-based applications (does not apply to non-HTTP microservices).

packages/common/interfaces/version-options.interface.ts

@@ -188,7 +188,7 @@ export class ConsoleLogger implements LoggerService {
       const contextMessage = context ? yellow(`[${context}] `) : '';
       const timestampDiff = this.updateAndGetTimestampDiff();
       const formattedLogLevel = logLevel.toUpperCase().padStart(7, ' ');
-      const formatedMessage = this.formatMessage(
+      const formattedMessage = this.formatMessage(
         logLevel,
         message,
         pidMessage,
@@ -197,7 +197,7 @@ export class ConsoleLogger implements LoggerService {
         timestampDiff,
       );
 
-      process[writeStreamType ?? 'stdout'].write(formatedMessage);
+      process[writeStreamType ?? 'stdout'].write(formattedMessage);
     });
   }
 

packages/common/services/console-logger.service.ts

@@ -4,14 +4,14 @@ import { StreamableFile } from '../../file-stream';
 
 describe('StreamableFile', () => {
   describe('when input is a readable stream', () => {
-    it('should assing it to a stream class property', () => {
+    it('should assign it to a stream class property', () => {
       const stream = new Readable();
       const streamableFile = new StreamableFile(stream);
       expect(streamableFile.getStream()).to.equal(stream);
     });
   });
   describe('when input is an object with "pipe" method', () => {
-    it('should assing it to a stream class property', () => {
+    it('should assign it to a stream class property', () => {
       const stream = { pipe: () => {} };
       const streamableFile = new StreamableFile(stream as any);
       expect(streamableFile.getStream()).to.equal(stream);

packages/common/test/file-stream/streamable-file.spec.ts

@@ -26,7 +26,7 @@ export class LazyModuleLoader {
     );
     if (moduleInstances.length === 0) {
       // The module has been loaded already. In this case, we must
-      // retrieve a module reference from the exising container.
+      // retrieve a module reference from the existing container.
       const { token } = await this.moduleCompiler.compile(
         moduleClassOrDynamicDefinition,
       );

packages/core/injector/lazy-module-loader.ts

@@ -86,9 +86,6 @@ export class Reflector {
     metadataKey: TKey,
     targets: (Type<any> | Function)[],
   ): TResult {
-    const metadataCollection = this.getAll(metadataKey, targets).filter(
-      item => item !== undefined,
-    );
-    return metadataCollection[0];
+    return this.getAll(metadataKey, targets).find(item => item !== undefined);
   }
 }