moost 0.2.2 → 0.2.4

package/dist/index.cjs

@@ -178,7 +178,7 @@ var EHttpStatusCode;
     DELETE: EHttpStatusCode.Accepted,
 });
 
-class WooksError extends Error {
+class HttpError extends Error {
     constructor(code = 500, _body = '') {
         super(typeof _body === 'string' ? _body : _body.message);
         this.code = code;
@@ -660,6 +660,15 @@ class Moost {
     init() {
         return __awaiter(this, void 0, void 0, function* () {
             this.setProvideRegistry(infact.createProvideRegistry([Moost, () => this]));
+            for (const a of this.adapters) {
+                const constructor = mate.getConstructor(a);
+                if (constructor) {
+                    this.setProvideRegistry(infact.createProvideRegistry([constructor, () => a]));
+                }
+                if (typeof a.getProvideRegistry === 'function') {
+                    this.setProvideRegistry(a.getProvideRegistry());
+                }
+            }
             this.unregisteredControllers.unshift(this);
             yield this.bindControllers();
             for (const a of this.adapters) {
@@ -687,7 +696,7 @@ class Moost {
             const infact = getMoostInfact();
             const isControllerConsructor = mate.isConstructor(controller);
             let instance;
-            if (isControllerConsructor && (classMeta === null || classMeta === void 0 ? void 0 : classMeta.injectable) === 'SINGLETON') {
+            if (isControllerConsructor && ((classMeta === null || classMeta === void 0 ? void 0 : classMeta.injectable) === 'SINGLETON' || (classMeta === null || classMeta === void 0 ? void 0 : classMeta.injectable) === true)) {
                 instance = (yield infact.get(controller, provide));
             }
             else if (!isControllerConsructor) {
@@ -850,7 +859,7 @@ const genericTypesCastPipe = (strict) => {
 };
 function typeError(value, targetType, label) {
     const prefix = label ? `Argument "${label}" with value ` : '';
-    throw new WooksError(400, `${prefix}${JSON.stringify(value)} is not a ${targetType} type`);
+    throw new HttpError(400, `${prefix}${JSON.stringify(value)} is not a ${targetType} type`);
 }
 
 const DEFAULT_ERROR_LIMIT = 10;
@@ -869,7 +878,7 @@ const validatePipe = (opts) => {
         const valido = getMoostValido();
         const result = yield valido.validateParam(_value, meta, undefined, undefined, undefined, undefined, 0, 0, (opts === null || opts === void 0 ? void 0 : opts.errorLimit) || DEFAULT_ERROR_LIMIT, restoreCtx);
         if (result !== true) {
-            throw new WooksError(400, {
+            throw new HttpError(400, {
                 statusCode: 400,
                 message: typeof result === 'string' ? result : firstString(result),
                 error: 'Validation Error',

package/dist/index.d.ts

@@ -215,6 +215,7 @@ export declare enum TInterceptorPriority {
 export declare interface TMoostAdapter<H extends object> {
     bindHandler<T extends TObject = TObject>(options: TMoostAdapterOptions<H, T>): void | Promise<void>;
     onInit?: () => void | Promise<void>;
+    getProvideRegistry?: () => TProvideRegistry;
 }
 
 export declare interface TMoostAdapterOptions<H extends object, T extends object> {

package/dist/index.mjs

@@ -176,7 +176,7 @@ var EHttpStatusCode;
     DELETE: EHttpStatusCode.Accepted,
 });
 
-class WooksError extends Error {
+class HttpError extends Error {
     constructor(code = 500, _body = '') {
         super(typeof _body === 'string' ? _body : _body.message);
         this.code = code;
@@ -658,6 +658,15 @@ class Moost {
     init() {
         return __awaiter(this, void 0, void 0, function* () {
             this.setProvideRegistry(createProvideRegistry([Moost, () => this]));
+            for (const a of this.adapters) {
+                const constructor = getConstructor(a);
+                if (constructor) {
+                    this.setProvideRegistry(createProvideRegistry([constructor, () => a]));
+                }
+                if (typeof a.getProvideRegistry === 'function') {
+                    this.setProvideRegistry(a.getProvideRegistry());
+                }
+            }
             this.unregisteredControllers.unshift(this);
             yield this.bindControllers();
             for (const a of this.adapters) {
@@ -685,7 +694,7 @@ class Moost {
             const infact = getMoostInfact();
             const isControllerConsructor = isConstructor(controller);
             let instance;
-            if (isControllerConsructor && (classMeta === null || classMeta === void 0 ? void 0 : classMeta.injectable) === 'SINGLETON') {
+            if (isControllerConsructor && ((classMeta === null || classMeta === void 0 ? void 0 : classMeta.injectable) === 'SINGLETON' || (classMeta === null || classMeta === void 0 ? void 0 : classMeta.injectable) === true)) {
                 instance = (yield infact.get(controller, provide));
             }
             else if (!isControllerConsructor) {
@@ -848,7 +857,7 @@ const genericTypesCastPipe = (strict) => {
 };
 function typeError(value, targetType, label) {
     const prefix = label ? `Argument "${label}" with value ` : '';
-    throw new WooksError(400, `${prefix}${JSON.stringify(value)} is not a ${targetType} type`);
+    throw new HttpError(400, `${prefix}${JSON.stringify(value)} is not a ${targetType} type`);
 }
 
 const DEFAULT_ERROR_LIMIT = 10;
@@ -867,7 +876,7 @@ const validatePipe = (opts) => {
         const valido = getMoostValido();
         const result = yield valido.validateParam(_value, meta, undefined, undefined, undefined, undefined, 0, 0, (opts === null || opts === void 0 ? void 0 : opts.errorLimit) || DEFAULT_ERROR_LIMIT, restoreCtx);
         if (result !== true) {
-            throw new WooksError(400, {
+            throw new HttpError(400, {
                 statusCode: 400,
                 message: typeof result === 'string' ? result : firstString(result),
                 error: 'Validation Error',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moost",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "moost",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -25,8 +25,8 @@
     "@prostojs/infact": "^0.0.13",
     "@prostojs/mate": "^0.1.10",
     "@prostojs/valido": "^0.0.2",
-    "@wooksjs/event-core": "^0.2.4",
-    "wooks": "^0.2.4"
+    "@wooksjs/event-core": "^0.2.5",
+    "wooks": "^0.2.5"
   },
   "author": "Artem Maltsev",
   "license": "MIT",