moost 0.2.3 → 0.2.5

package/dist/index.cjs

@@ -208,30 +208,6 @@ function getMoostMate() {
     return moostMate;
 }
 
-function getInstanceOwnMethods(instance) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const proto = Object.getPrototypeOf(instance);
-    return [
-        ...Object.getOwnPropertyNames(proto),
-        ...Object.getOwnPropertyNames(instance),
-    ].filter(m => typeof instance[m] === 'function');
-}
-
-const banner = () => `[${"moost"}][${new Date().toISOString().replace('T', ' ').replace(/\.\d{3}z$/i, '')}] `;
-
-/* istanbul ignore file */
-function log(text) {
-    console.log('' + '' + banner() + text + '');
-}
-function logError(error) {
-    console.error('' + '' + banner() + error + '');
-}
-
-function panic(error) {
-    logError(error);
-    return new Error(error);
-}
-
 function runPipes(pipes, meta, restoreCtx) {
     return __awaiter(this, void 0, void 0, function* () {
         let v = undefined;
@@ -297,6 +273,30 @@ function getNewMoostInfact() {
     });
 }
 
+function getInstanceOwnMethods(instance) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const proto = Object.getPrototypeOf(instance);
+    return [
+        ...Object.getOwnPropertyNames(proto),
+        ...Object.getOwnPropertyNames(instance),
+    ].filter(m => typeof instance[m] === 'function');
+}
+
+const banner = () => `[${"moost"}][${new Date().toISOString().replace('T', ' ').replace(/\.\d{3}z$/i, '')}] `;
+
+/* istanbul ignore file */
+function log(text) {
+    console.log('' + '' + banner() + text + '');
+}
+function logError(error) {
+    console.error('' + '' + banner() + error + '');
+}
+
+function panic(error) {
+    logError(error);
+    return new Error(error);
+}
+
 function getCallableFn(targetInstance, fn, restoreCtx) {
     return __awaiter(this, void 0, void 0, function* () {
         const mate$1 = getMoostMate();
@@ -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) {
@@ -907,7 +916,9 @@ exports.Required = Required;
 exports.Resolve = Resolve;
 exports.Validate = Validate;
 exports.genericTypesCastPipe = genericTypesCastPipe;
+exports.getMoostInfact = getMoostInfact;
 exports.getMoostMate = getMoostMate;
+exports.getNewMoostInfact = getNewMoostInfact;
 exports.resolvePipe = resolvePipe;
 exports.useControllerMeta = useControllerMeta;
 exports.validatePipe = validatePipe;

package/dist/index.d.ts

@@ -1,4 +1,7 @@
+import { Infact } from '@prostojs/infact';
 import { Mate } from '@prostojs/mate';
+import { TInfactClassMeta } from '@prostojs/infact';
+import { TInfactConstructorParamMeta } from '@prostojs/infact';
 import { TProstoMetadata } from '@prostojs/mate';
 import { TProstoParamsMetadata } from '@prostojs/mate';
 import { TProvideFn } from '@prostojs/infact';
@@ -31,8 +34,12 @@ export declare function Dto(dtoOptions?: TValidoDtoOptions): ClassDecorator;
 
 export declare const genericTypesCastPipe: (strict?: boolean) => TPipeFn;
 
+export declare function getMoostInfact(): Infact<TInfactMoostMeta>;
+
 export declare function getMoostMate(): Mate<TMoostMetadata>;
 
+export declare function getNewMoostInfact(): Infact<TInfactMoostMeta>;
+
 export declare function Id(value: string): MethodDecorator & ClassDecorator & ParameterDecorator & PropertyDecorator;
 
 /**
@@ -184,6 +191,8 @@ declare interface TCommonMoostMeta {
 
 declare type TFunction = Function;
 
+declare type TInfactMoostMeta = TInfactClassMeta<TMoostParamsMetadata & TInfactConstructorParamMeta>;
+
 export declare type TInjectableScope = 'FOR_EVENT' | 'SINGLETON';
 
 export declare type TInterceptorAfter = (response: TAny, reply: (response: TAny) => void) => void | Promise<void>;
@@ -215,6 +224,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

@@ -206,30 +206,6 @@ function getMoostMate() {
     return moostMate;
 }
 
-function getInstanceOwnMethods(instance) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const proto = Object.getPrototypeOf(instance);
-    return [
-        ...Object.getOwnPropertyNames(proto),
-        ...Object.getOwnPropertyNames(instance),
-    ].filter(m => typeof instance[m] === 'function');
-}
-
-const banner = () => `[${"moost"}][${new Date().toISOString().replace('T', ' ').replace(/\.\d{3}z$/i, '')}] `;
-
-/* istanbul ignore file */
-function log(text) {
-    console.log('' + '' + banner() + text + '');
-}
-function logError(error) {
-    console.error('' + '' + banner() + error + '');
-}
-
-function panic(error) {
-    logError(error);
-    return new Error(error);
-}
-
 function runPipes(pipes, meta, restoreCtx) {
     return __awaiter(this, void 0, void 0, function* () {
         let v = undefined;
@@ -295,6 +271,30 @@ function getNewMoostInfact() {
     });
 }
 
+function getInstanceOwnMethods(instance) {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    const proto = Object.getPrototypeOf(instance);
+    return [
+        ...Object.getOwnPropertyNames(proto),
+        ...Object.getOwnPropertyNames(instance),
+    ].filter(m => typeof instance[m] === 'function');
+}
+
+const banner = () => `[${"moost"}][${new Date().toISOString().replace('T', ' ').replace(/\.\d{3}z$/i, '')}] `;
+
+/* istanbul ignore file */
+function log(text) {
+    console.log('' + '' + banner() + text + '');
+}
+function logError(error) {
+    console.error('' + '' + banner() + error + '');
+}
+
+function panic(error) {
+    logError(error);
+    return new Error(error);
+}
+
 function getCallableFn(targetInstance, fn, restoreCtx) {
     return __awaiter(this, void 0, void 0, function* () {
         const mate = getMoostMate();
@@ -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) {
@@ -880,4 +889,4 @@ const validatePipe = (opts) => {
     return pipe;
 };
 
-export { Circular, Const, Controller, Dto, Id, ImportController, Inject, Injectable, Intercept, InterceptorHandler, IsArray, IsBoolean, IsNumber, IsString, IsTypeOf, Label, Moost, Optional, Param, Params, Provide, Required, Resolve, TInterceptorPriority, TPipePriority, Validate, genericTypesCastPipe, getMoostMate, resolvePipe, useControllerMeta, validatePipe };
+export { Circular, Const, Controller, Dto, Id, ImportController, Inject, Injectable, Intercept, InterceptorHandler, IsArray, IsBoolean, IsNumber, IsString, IsTypeOf, Label, Moost, Optional, Param, Params, Provide, Required, Resolve, TInterceptorPriority, TPipePriority, Validate, genericTypesCastPipe, getMoostInfact, getMoostMate, getNewMoostInfact, resolvePipe, useControllerMeta, validatePipe };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moost",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "moost",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",