@nestjs/core 8.4.6 → 9.0.0-next.2

package/router/router-explorer.js

@@ -4,7 +4,6 @@ exports.RouterExplorer = void 0;
 const constants_1 = require("@nestjs/common/constants");
 const version_type_enum_1 = require("@nestjs/common/enums/version-type.enum");
 const exceptions_1 = require("@nestjs/common/exceptions");
-const version_options_interface_1 = require("@nestjs/common/interfaces/version-options.interface");
 const logger_service_1 = require("@nestjs/common/services/logger.service");
 const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
 const pathToRegexp = require("path-to-regexp");
@@ -160,107 +159,8 @@ class RouterExplorer {
         };
     }
     applyVersionFilter(router, routePathMetadata, handler) {
-        const { versioningOptions } = routePathMetadata;
         const version = this.routePathFactory.getVersion(routePathMetadata);
-        if (router === null || router === void 0 ? void 0 : router.applyVersionFilter) {
-            return router.applyVersionFilter(handler, version, versioningOptions);
-        }
-        /**
-         * TODO(v9): This was left for backward-compatibility and can be removed.
-         */
-        return (req, res, next) => {
-            var _a, _b, _c, _d;
-            if (version === version_options_interface_1.VERSION_NEUTRAL) {
-                return handler(req, res, next);
-            }
-            // URL Versioning is done via the path, so the filter continues forward
-            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 ((0, 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 ((0, 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';
-                const acceptHeaderValue = ((_a = req.headers) === null || _a === void 0 ? void 0 : _a[MEDIA_TYPE_HEADER]) ||
-                    ((_b = req.headers) === null || _b === void 0 ? void 0 : _b[MEDIA_TYPE_HEADER.toLowerCase()]);
-                const acceptHeaderVersionParameter = acceptHeaderValue
-                    ? acceptHeaderValue.split(';')[1]
-                    : undefined;
-                // No version was supplied
-                if ((0, shared_utils_1.isUndefined)(acceptHeaderVersionParameter)) {
-                    if (Array.isArray(version)) {
-                        if (version.includes(version_options_interface_1.VERSION_NEUTRAL)) {
-                            return handler(req, res, next);
-                        }
-                    }
-                }
-                else {
-                    const headerVersion = acceptHeaderVersionParameter.split(versioningOptions.key)[1];
-                    if (Array.isArray(version)) {
-                        if (version.includes(headerVersion)) {
-                            return handler(req, res, next);
-                        }
-                    }
-                    else if ((0, shared_utils_1.isString)(version)) {
-                        if (version === headerVersion) {
-                            return handler(req, res, next);
-                        }
-                    }
-                }
-            }
-            // Header Versioning Handler
-            else if (versioningOptions.type === version_type_enum_1.VersioningType.HEADER) {
-                const customHeaderVersionParameter = ((_c = req.headers) === null || _c === void 0 ? void 0 : _c[versioningOptions.header]) ||
-                    ((_d = req.headers) === null || _d === void 0 ? void 0 : _d[versioningOptions.header.toLowerCase()]);
-                // No version was supplied
-                if ((0, shared_utils_1.isUndefined)(customHeaderVersionParameter)) {
-                    if (Array.isArray(version)) {
-                        if (version.includes(version_options_interface_1.VERSION_NEUTRAL)) {
-                            return handler(req, res, next);
-                        }
-                    }
-                }
-                else {
-                    if (Array.isArray(version)) {
-                        if (version.includes(customHeaderVersionParameter)) {
-                            return handler(req, res, next);
-                        }
-                    }
-                    else if ((0, shared_utils_1.isString)(version)) {
-                        if (version === customHeaderVersionParameter) {
-                            return handler(req, res, next);
-                        }
-                    }
-                }
-            }
-            if (!next) {
-                throw new exceptions_1.InternalServerErrorException('HTTP adapter does not support filtering on version');
-            }
-            return next();
-        };
+        return router.applyVersionFilter(handler, version, routePathMetadata.versioningOptions);
     }
     createCallbackProxy(instance, callback, methodName, moduleRef, requestMethod, contextId = constants_2.STATIC_CONTEXT, inquirerId) {
         const executionContext = this.executionContextCreator.create(instance, callback, methodName, moduleRef, requestMethod, contextId, inquirerId);

package/router/router-response-controller.js

@@ -29,7 +29,7 @@ class RouterResponseController {
         return this.applicationRef.render(response, template, result);
     }
     async transformToResult(resultOrDeferred) {
-        if (resultOrDeferred && (0, shared_utils_1.isFunction)(resultOrDeferred.subscribe)) {
+        if ((0, rxjs_1.isObservable)(resultOrDeferred)) {
             return (0, rxjs_1.lastValueFrom)(resultOrDeferred);
         }
         return resultOrDeferred;
@@ -80,8 +80,8 @@ class RouterResponseController {
             subscription.unsubscribe();
         });
     }
-    assertObservable(result) {
-        if (!(0, shared_utils_1.isFunction)(result.subscribe)) {
+    assertObservable(value) {
+        if (!(0, rxjs_1.isObservable)(value)) {
             throw new ReferenceError('You must return an Observable stream to use Server-Sent Events (SSE).');
         }
     }

package/scanner.d.ts

@@ -11,7 +11,6 @@ export declare class DependenciesScanner {
     private readonly container;
     private readonly metadataScanner;
     private readonly applicationConfig;
-    private readonly logger;
     private readonly applicationProvidersApplyMap;
     constructor(container: NestContainer, metadataScanner: MetadataScanner, applicationConfig?: ApplicationConfig);
     scan(module: Type<any>): Promise<void>;
@@ -33,7 +32,7 @@ export declare class DependenciesScanner {
     insertInjectable(injectable: Type<Injectable>, token: string, host: Type<Injectable>): void;
     insertExportedProvider(exportedProvider: Type<Injectable>, token: string): void;
     insertController(controller: Type<Controller>, token: string): void;
-    reflectMetadata(metatype: Type<any>, metadataKey: string): any;
+    reflectMetadata(metadataKey: string, metatype: Type<any>): any;
     registerCoreModule(): Promise<void>;
     /**
      * Add either request or transient globally scoped enhancers

package/scanner.js

@@ -20,7 +20,6 @@ class DependenciesScanner {
         this.container = container;
         this.metadataScanner = metadataScanner;
         this.applicationConfig = applicationConfig;
-        this.logger = new common_1.Logger(DependenciesScanner.name);
         this.applicationProvidersApplyMap = [];
     }
     async scan(module) {
@@ -42,9 +41,9 @@ class DependenciesScanner {
             moduleDefinition = moduleDefinition.forwardRef();
         }
         const modules = !this.isDynamicModule(moduleDefinition)
-            ? this.reflectMetadata(moduleDefinition, constants_1.MODULE_METADATA.IMPORTS)
+            ? this.reflectMetadata(constants_1.MODULE_METADATA.IMPORTS, moduleDefinition)
             : [
-                ...this.reflectMetadata(moduleDefinition.module, constants_1.MODULE_METADATA.IMPORTS),
+                ...this.reflectMetadata(constants_1.MODULE_METADATA.IMPORTS, moduleDefinition.module),
                 ...(moduleDefinition.imports || []),
             ];
         let registeredModuleRefs = [];
@@ -74,8 +73,7 @@ class DependenciesScanner {
         if (this.isInjectable(moduleToAdd) ||
             this.isController(moduleToAdd) ||
             this.isExceptionFilter(moduleToAdd)) {
-            // TODO(v9): Throw the exception instead of printing a warning
-            this.logger.warn(new invalid_class_module_exception_1.InvalidClassModuleException(moduleDefinition, scope).message);
+            throw new invalid_class_module_exception_1.InvalidClassModuleException(moduleDefinition, scope);
         }
         return this.container.addModule(moduleToAdd, scope);
     }
@@ -89,7 +87,7 @@ class DependenciesScanner {
     }
     async reflectImports(module, token, context) {
         const modules = [
-            ...this.reflectMetadata(module, constants_1.MODULE_METADATA.IMPORTS),
+            ...this.reflectMetadata(constants_1.MODULE_METADATA.IMPORTS, module),
             ...this.container.getDynamicMetadataByToken(token, constants_1.MODULE_METADATA.IMPORTS),
         ];
         for (const related of modules) {
@@ -98,7 +96,7 @@ class DependenciesScanner {
     }
     reflectProviders(module, token) {
         const providers = [
-            ...this.reflectMetadata(module, constants_1.MODULE_METADATA.PROVIDERS),
+            ...this.reflectMetadata(constants_1.MODULE_METADATA.PROVIDERS, module),
             ...this.container.getDynamicMetadataByToken(token, constants_1.MODULE_METADATA.PROVIDERS),
         ];
         providers.forEach(provider => {
@@ -108,7 +106,7 @@ class DependenciesScanner {
     }
     reflectControllers(module, token) {
         const controllers = [
-            ...this.reflectMetadata(module, constants_1.MODULE_METADATA.CONTROLLERS),
+            ...this.reflectMetadata(constants_1.MODULE_METADATA.CONTROLLERS, module),
             ...this.container.getDynamicMetadataByToken(token, constants_1.MODULE_METADATA.CONTROLLERS),
         ];
         controllers.forEach(item => {
@@ -128,13 +126,13 @@ class DependenciesScanner {
     }
     reflectExports(module, token) {
         const exports = [
-            ...this.reflectMetadata(module, constants_1.MODULE_METADATA.EXPORTS),
+            ...this.reflectMetadata(constants_1.MODULE_METADATA.EXPORTS, module),
             ...this.container.getDynamicMetadataByToken(token, constants_1.MODULE_METADATA.EXPORTS),
         ];
         exports.forEach(exportedProvider => this.insertExportedProvider(exportedProvider, token));
     }
     reflectInjectables(component, token, metadataKey) {
-        const controllerInjectables = this.reflectMetadata(component, metadataKey);
+        const controllerInjectables = this.reflectMetadata(metadataKey, component);
         const methodsInjectables = this.metadataScanner.scanFromPrototype(null, component.prototype, this.reflectKeyMetadata.bind(this, component, metadataKey));
         const flattenMethodsInjectables = this.flatten(methodsInjectables);
         const combinedInjectables = [
@@ -233,7 +231,7 @@ class DependenciesScanner {
     insertController(controller, token) {
         this.container.addController(controller, token);
     }
-    reflectMetadata(metatype, metadataKey) {
+    reflectMetadata(metadataKey, metatype) {
         return Reflect.getMetadata(metadataKey, metatype) || [];
     }
     async registerCoreModule() {