@nestjs/core 8.2.6 → 8.4.0

package/Readme.md

@@ -54,7 +54,7 @@ With official support, you can get expert help straight from Nest core team. We
 
 ## Support
 
-Nest is an MIT-licensed open source project. It can grow thanks to the sponsors and support by the amazing backers. If you'd like to join them, please [read more here](https://docs.nestjs.com/support).
+Nest is an MIT-licensed open source project. It can grow thanks to the sponsors and support from the amazing backers. If you'd like to join them, please [read more here](https://docs.nestjs.com/support).
 
 #### Principal Sponsors
 <table style="text-align:center;"><tr>
@@ -84,7 +84,8 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
 <a href="https://www.myleodsc.com/" target="_blank"><img src="https://nestjs.com/img/myleo-logo.png" width="180" valign="middle" /></td><td>
 <a href="https://careers.meetdandy.com/?gh_src=063ba61e3us" target="_blank"><img src="https://nestjs.com/img/dandy-roles-logo.svg" width="150" valign="middle" /></td><td>
 <a href="https://www.castlecraft.in" target="_blank"><img src="https://nestjs.com/img/castlecraft-logo.png" width="150" valign="middle" /></td>
-<td><a href="https://www.tinystacks.com" target="_blank"><img src="https://nestjs.com/img/tinystacks-logo.png#1" width="140" valign="middle" /></td></tr></table>
+<td><a href="https://www.tinystacks.com" target="_blank"><img src="https://nestjs.com/img/tinystacks-logo.png#1" width="140" valign="middle" /></td>
+<td><a href="https://n.inc" target="_blank"><img src="https://nestjs.com/img/n-inc-logo.svg" width="120" valign="middle" /></td></tr></table>
 
 #### Sponsors
 
@@ -118,6 +119,11 @@ Nest is an MIT-licensed open source project. It can grow thanks to the sponsors
 <td align="center" valign="middle"><a href="https://www.naologic.com/" target="_blank"><img src="https://nestjs.com/img/naologic-logo.svg" width="125" valign="middle" /></a></td>
   <td align="center" valign="middle"><a href="https://messaged.com/" target="_blank"><img src="https://nestjs.com/img/messaged-logo.png" width="50" valign="middle" /></a></td>
   <td align="center" valign="middle"><a href="https://triplecore.io" target="_blank"><img src="https://nestjs.com/img/triplecore-logo.svg" width="50" valign="middle" /></a></td>
+   <td align="center" valign="middle"><a href="https://klqc.de" target="_blank"><img src="https://nestjs.com/img/klcqcl-logo.png" width="120" valign="middle" /></a></td>
+   <td align="center" valign="middle"><a href="https://thecasinowizard.com/bonuses/no-deposit-bonuses/" target="_blank"><img src="https://nestjs.com/img/casinowizard-logo.png" width="120" valign="middle" /></a></td></tr><tr>
+     <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>
   </tr></table>
 
 ## Backers

package/helpers/context-utils.js

@@ -19,11 +19,15 @@ class ContextUtils {
         return Reflect.getMetadata(constants_1.RESPONSE_PASSTHROUGH_METADATA, instance.constructor, methodName);
     }
     getArgumentsLength(keys, metadata) {
-        return Math.max(...keys.map(key => metadata[key].index)) + 1;
+        return keys.length
+            ? Math.max(...keys.map(key => metadata[key].index)) + 1
+            : 0;
     }
     createNullArray(length) {
-        // eslint-disable-next-line prefer-spread
-        return Array.apply(null, { length }).fill(undefined);
+        const a = new Array(length);
+        for (let i = 0; i < length; ++i)
+            a[i] = undefined;
+        return a;
     }
     mergeParamsMetatypes(paramsProperties, paramtypes) {
         if (!paramtypes) {

package/injector/injector.d.ts

@@ -1,3 +1,4 @@
+import { InjectionToken } from '@nestjs/common';
 import { Controller } from '@nestjs/common/interfaces/controllers/controller.interface';
 import { Injectable } from '@nestjs/common/interfaces/injectable.interface';
 import { Type } from '@nestjs/common/interfaces/type.interface';
@@ -6,7 +7,7 @@ import { InstanceToken, Module } from './module';
 /**
  * The type of an injectable dependency
  */
-export declare type InjectorDependency = Type<any> | Function | string | symbol;
+export declare type InjectorDependency = InjectionToken;
 /**
  * The property-based dependency
  */
@@ -49,6 +50,8 @@ export declare class Injector {
     loadProvider(wrapper: InstanceWrapper<Injectable>, moduleRef: Module, contextId?: ContextId, inquirer?: InstanceWrapper): Promise<void>;
     applyDoneHook<T>(wrapper: InstancePerContext<T>): () => void;
     resolveConstructorParams<T>(wrapper: InstanceWrapper<T>, moduleRef: Module, inject: InjectorDependency[], callback: (args: unknown[]) => void | Promise<void>, contextId?: ContextId, inquirer?: InstanceWrapper, parentInquirer?: InstanceWrapper): Promise<void>;
+    getClassDependencies<T>(wrapper: InstanceWrapper<T>): [InjectorDependency[], number[]];
+    getFactoryProviderDependencies<T>(wrapper: InstanceWrapper<T>): [InjectorDependency[], number[]];
     reflectConstructorParams<T>(type: Type<T>): any[];
     reflectOptionalParams<T>(type: Type<T>): any[];
     reflectSelfParams<T>(type: Type<T>): any[];

package/injector/injector.js

@@ -89,12 +89,10 @@ class Injector {
             const deps = await this.loadCtorMetadata(metadata, contextId, inquirer, parentInquirer);
             return callback(deps);
         }
-        const dependencies = shared_utils_1.isNil(inject)
-            ? this.reflectConstructorParams(wrapper.metatype)
-            : inject;
-        const optionalDependenciesIds = shared_utils_1.isNil(inject)
-            ? this.reflectOptionalParams(wrapper.metatype)
-            : [];
+        const isFactoryProvider = !shared_utils_1.isNil(inject);
+        const [dependencies, optionalDependenciesIds] = isFactoryProvider
+            ? this.getFactoryProviderDependencies(wrapper)
+            : this.getClassDependencies(wrapper);
         let isResolved = true;
         const resolveParam = async (param, index) => {
             try {
@@ -123,6 +121,35 @@ class Injector {
         const instances = await Promise.all(dependencies.map(resolveParam));
         isResolved && (await callback(instances));
     }
+    getClassDependencies(wrapper) {
+        const ctorRef = wrapper.metatype;
+        return [
+            this.reflectConstructorParams(ctorRef),
+            this.reflectOptionalParams(ctorRef),
+        ];
+    }
+    getFactoryProviderDependencies(wrapper) {
+        var _a, _b;
+        const optionalDependenciesIds = [];
+        const isOptionalFactoryDep = (item) => !shared_utils_1.isUndefined(item.token) &&
+            !shared_utils_1.isUndefined(item.optional);
+        const mapFactoryProviderInjectArray = (item, index) => {
+            if (typeof item !== 'object') {
+                return item;
+            }
+            if (isOptionalFactoryDep(item)) {
+                if (item.optional) {
+                    optionalDependenciesIds.push(index);
+                }
+                return item === null || item === void 0 ? void 0 : item.token;
+            }
+            return item;
+        };
+        return [
+            (_b = (_a = wrapper.inject) === null || _a === void 0 ? void 0 : _a.map) === null || _b === void 0 ? void 0 : _b.call(_a, mapFactoryProviderInjectArray),
+            optionalDependenciesIds,
+        ];
+    }
     reflectConstructorParams(type) {
         const paramtypes = Reflect.getMetadata(constants_1.PARAMTYPES_METADATA, type) || [];
         const selfParams = this.reflectSelfParams(type);
@@ -184,8 +211,9 @@ class Injector {
         return instanceWrapper;
     }
     async lookupComponent(providers, moduleRef, dependencyContext, wrapper, contextId = constants_2.STATIC_CONTEXT, inquirer, keyOrIndex) {
+        const token = wrapper.token || wrapper.name;
         const { name } = dependencyContext;
-        if (wrapper && wrapper.name === name) {
+        if (wrapper && token === name) {
             throw new unknown_dependencies_exception_1.UnknownDependenciesException(wrapper.name, dependencyContext, moduleRef);
         }
         if (providers.has(name)) {

package/injector/instance-wrapper.d.ts

@@ -1,4 +1,5 @@
 import { Provider, Scope, Type } from '@nestjs/common';
+import { FactoryProvider } from '@nestjs/common/interfaces';
 import { InstanceToken, Module } from './module';
 export declare const INSTANCE_METADATA_SYMBOL: unique symbol;
 export declare const INSTANCE_ID_SYMBOL: unique symbol;
@@ -23,7 +24,7 @@ export declare class InstanceWrapper<T = any> {
     readonly isAlias: boolean;
     scope?: Scope;
     metatype: Type<T> | Function;
-    inject?: (string | symbol | Function | Type<any>)[];
+    inject?: FactoryProvider['inject'];
     forwardRef?: boolean;
     private readonly values;
     private readonly [INSTANCE_METADATA_SYMBOL];

package/injector/module.d.ts

@@ -1,9 +1,13 @@
-import { Abstract, ClassProvider, Controller, DynamicModule, ExistingProvider, FactoryProvider, Injectable, NestModule, Provider, ValueProvider } from '@nestjs/common/interfaces';
+import { ClassProvider, Controller, DynamicModule, ExistingProvider, FactoryProvider, Injectable, InjectionToken, NestModule, Provider, ValueProvider } from '@nestjs/common/interfaces';
 import { Type } from '@nestjs/common/interfaces/type.interface';
 import { NestContainer } from './container';
 import { InstanceWrapper } from './instance-wrapper';
 import { ModuleRef } from './module-ref';
-export declare type InstanceToken = string | symbol | Type<any> | Abstract<any> | Function;
+/**
+ * @note
+ * Left for backward compatibility
+ */
+export declare type InstanceToken = InjectionToken;
 export declare class Module {
     private readonly _metatype;
     private readonly container;
@@ -46,10 +50,10 @@ export declare class Module {
     addModuleRef(): void;
     addModuleAsProvider(): void;
     addApplicationConfig(): void;
-    addInjectable<T extends Injectable>(injectable: Provider, host?: Type<T>): string | symbol | Function | Type<any> | Abstract<any>;
-    addProvider(provider: Provider): string | symbol | Function;
+    addInjectable<T extends Injectable>(injectable: Provider, host?: Type<T>): InjectionToken;
+    addProvider(provider: Provider): InjectionToken;
     isCustomProvider(provider: Provider): provider is ClassProvider | FactoryProvider | ValueProvider | ExistingProvider;
-    addCustomProvider(provider: ClassProvider | FactoryProvider | ValueProvider | ExistingProvider, collection: Map<Function | string | symbol, any>): string | symbol | Function | Type<any> | Abstract<any>;
+    addCustomProvider(provider: ClassProvider | FactoryProvider | ValueProvider | ExistingProvider, collection: Map<Function | string | symbol, any>): InjectionToken;
     isCustomClass(provider: any): provider is ClassProvider;
     isCustomValue(provider: any): provider is ValueProvider;
     isCustomFactory(provider: any): provider is FactoryProvider;
@@ -59,9 +63,9 @@ export declare class Module {
     addCustomValue(provider: ValueProvider, collection: Map<Function | string | symbol, InstanceWrapper>): void;
     addCustomFactory(provider: FactoryProvider, collection: Map<Function | string | symbol, InstanceWrapper>): void;
     addCustomUseExisting(provider: ExistingProvider, collection: Map<Function | string | symbol, InstanceWrapper>): void;
-    addExportedProvider(provider: Provider | string | symbol | DynamicModule): Set<InstanceToken>;
-    addCustomExportedProvider(provider: FactoryProvider | ValueProvider | ClassProvider | ExistingProvider): Set<InstanceToken>;
-    validateExportedProvider(token: InstanceToken): InstanceToken;
+    addExportedProvider(provider: Provider | string | symbol | DynamicModule): Set<InjectionToken>;
+    addCustomExportedProvider(provider: FactoryProvider | ValueProvider | ClassProvider | ExistingProvider): Set<InjectionToken>;
+    validateExportedProvider(token: InstanceToken): InjectionToken;
     addController(controller: Type<Controller>): void;
     assignControllerUniqueId(controller: Type<Controller>): void;
     addRelatedModule(module: Module): void;

package/middleware/container.d.ts

@@ -11,5 +11,4 @@ export declare class MiddlewareContainer {
     getConfigurations(): Map<string, Set<MiddlewareConfiguration>>;
     insertConfig(configList: MiddlewareConfiguration[], moduleKey: string): void;
     private getTargetConfig;
-    private getClassScope;
 }

package/middleware/container.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MiddlewareContainer = void 0;
-const constants_1 = require("@nestjs/common/constants");
 const instance_wrapper_1 = require("../injector/instance-wrapper");
+const get_class_scope_1 = require("../helpers/get-class-scope");
 class MiddlewareContainer {
     constructor(container) {
         this.container = container;
@@ -26,7 +26,7 @@ class MiddlewareContainer {
         const insertMiddleware = (metatype) => {
             const token = metatype;
             middleware.set(token, new instance_wrapper_1.InstanceWrapper({
-                scope: this.getClassScope(metatype),
+                scope: get_class_scope_1.getClassScope(metatype),
                 name: token,
                 metatype,
                 token,
@@ -43,9 +43,5 @@ class MiddlewareContainer {
         }
         return this.configurationSets.get(moduleName);
     }
-    getClassScope(type) {
-        const metadata = Reflect.getMetadata(constants_1.SCOPE_OPTIONS_METADATA, type);
-        return metadata && metadata.scope;
-    }
 }
 exports.MiddlewareContainer = MiddlewareContainer;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/core",
-  "version": "8.2.6",
+  "version": "8.4.0",
   "description": "Nest - modern, fast, powerful node.js web framework (@core)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -30,13 +30,13 @@
     "@nuxtjs/opencollective": "0.3.2",
     "fast-safe-stringify": "2.1.1",
     "iterare": "1.2.1",
-    "object-hash": "2.2.0",
+    "object-hash": "3.0.0",
     "path-to-regexp": "3.2.0",
     "tslib": "2.3.1",
     "uuid": "8.3.2"
   },
   "devDependencies": {
-    "@nestjs/common": "8.2.6"
+    "@nestjs/common": "8.4.0"
   },
   "peerDependencies": {
     "@nestjs/common": "^8.0.0",

package/router/router-explorer.js

@@ -178,6 +178,30 @@ class RouterExplorer {
             if (versioningOptions.type === version_type_enum_1.VersioningType.URI) {
                 return handler(req, res, next);
             }
+            // Custom Extractor Versioning Handler
+            if (versioningOptions.type === version_type_enum_1.VersioningType.CUSTOM) {
+                const extractedVersion = versioningOptions.extractor(req);
+                if (Array.isArray(version)) {
+                    if (Array.isArray(extractedVersion) &&
+                        version.filter(extractedVersion.includes).length) {
+                        return handler(req, res, next);
+                    }
+                    else if (shared_utils_1.isString(extractedVersion) &&
+                        version.includes(extractedVersion)) {
+                        return handler(req, res, next);
+                    }
+                }
+                else {
+                    if (Array.isArray(extractedVersion) &&
+                        extractedVersion.includes(version)) {
+                        return handler(req, res, next);
+                    }
+                    else if (shared_utils_1.isString(extractedVersion) &&
+                        version === extractedVersion) {
+                        return handler(req, res, next);
+                    }
+                }
+            }
             // Media Type (Accept Header) Versioning Handler
             if (versioningOptions.type === version_type_enum_1.VersioningType.MEDIA_TYPE) {
                 const MEDIA_TYPE_HEADER = 'Accept';

package/router/routes-resolver.js

@@ -93,7 +93,10 @@ class RoutesResolver {
     }
     mapExternalException(err) {
         switch (true) {
-            case err instanceof SyntaxError:
+            // SyntaxError is thrown by Express body-parser when given invalid JSON (#422, #430)
+            // URIError is thrown by Express when given a path parameter with an invalid percentage
+            // encoding, e.g. '%FF' (#8915)
+            case err instanceof SyntaxError || err instanceof URIError:
                 return new common_1.BadRequestException(err.message);
             default:
                 return err;

package/router/sse-stream.js

@@ -46,7 +46,7 @@ class SseStream extends stream_1.Transform {
                 'X-Accel-Buffering': 'no' }));
             destination.flushHeaders();
         }
-        destination.write(':\n');
+        destination.write('\n');
         return super.pipe(destination, options);
     }
     _transform(message, encoding, callback) {

package/scanner.js

@@ -10,8 +10,8 @@ const iterare_1 = require("iterare");
 const application_config_1 = require("./application-config");
 const constants_2 = require("./constants");
 const circular_dependency_exception_1 = require("./errors/exceptions/circular-dependency.exception");
-const invalid_module_exception_1 = require("./errors/exceptions/invalid-module.exception");
 const invalid_class_module_exception_1 = require("./errors/exceptions/invalid-class-module.exception");
+const invalid_module_exception_1 = require("./errors/exceptions/invalid-module.exception");
 const undefined_module_exception_1 = require("./errors/exceptions/undefined-module.exception");
 const get_class_scope_1 = require("./helpers/get-class-scope");
 const internal_core_module_factory_1 = require("./injector/internal-core-module-factory");

package/CHANGELOG.md

@@ -1,12 +0,0 @@
-# Change Log
-
-All notable changes to this project will be documented in this file.
-See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-<a name="8.2.0"></a>
-# [8.2.0](https://github.com/nestjs/nest/compare/v8.1.2...v8.2.0) (2021-11-08)
-
-
-
-
-**Note:** Version bump only for package @nestjs/core