moost 0.2.12 → 0.2.14

package/dist/index.cjs

@@ -204,6 +204,15 @@ const moostMate = new mate.Mate(METADATA_WORKSPACE, {
     readType: true,
     readReturnType: true,
     collectPropKeys: true,
+    inherit(classMeta, targetMeta, level) {
+        if (level === 'CLASS') {
+            return !!(classMeta === null || classMeta === void 0 ? void 0 : classMeta.inherit);
+        }
+        if (level === 'PROP') {
+            return !!(targetMeta === null || targetMeta === void 0 ? void 0 : targetMeta.inherit) || !!((classMeta === null || classMeta === void 0 ? void 0 : classMeta.inherit) && !targetMeta);
+        }
+        return !!(targetMeta === null || targetMeta === void 0 ? void 0 : targetMeta.inherit);
+    },
 });
 function getMoostMate() {
     return moostMate;
@@ -260,9 +269,18 @@ function getInstanceOwnMethods(instance) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const proto = Object.getPrototypeOf(instance);
     return [
+        ...getParentProps(mate.getConstructor(instance)),
         ...Object.getOwnPropertyNames(proto),
         ...Object.getOwnPropertyNames(instance),
     ].filter(m => typeof instance[m] === 'function');
+}
+const fnProto = Object.getPrototypeOf(Function);
+function getParentProps(constructor) {
+    const parent = Object.getPrototypeOf(constructor);
+    if (typeof parent === 'function' && parent !== fnProto && parent !== constructor && parent.prototype) {
+        return [...getParentProps(parent), ...Object.getOwnPropertyNames(parent.prototype)];
+    }
+    return [];
 }
 
 const banner = () => `[${"moost"}][${new Date().toISOString().replace('T', ' ').replace(/\.\d{3}z$/i, '')}] `;
@@ -280,18 +298,18 @@ function panic(error) {
     return new Error(error);
 }
 
-function getCallableFn(targetInstance, fn, restoreCtx) {
+function getCallableFn(targetInstance, fn, restoreCtx, pipes, silent) {
     return __awaiter(this, void 0, void 0, function* () {
         const mate$1 = getMoostMate();
         const meta = mate$1.read(fn);
         if (meta === null || meta === void 0 ? void 0 : meta.injectable) {
             const infact = getMoostInfact();
-            infact.silent(meta.injectable === 'FOR_EVENT');
+            infact.silent(silent || (meta.injectable === 'FOR_EVENT' ? 'logs' : false));
             const instance = yield infact.getForInstance(targetInstance, fn, {
                 syncContextFn: () => { restoreCtx && restoreCtx(); },
-                customData: { pipes: meta.pipes },
+                customData: { pipes: [...(pipes || []), ...(meta.pipes || [])].sort((a, b) => a.priority - b.priority) },
             });
-            infact.silent(false);
+            infact.silent(!!silent);
             return ((...args) => {
                 return instance.handler(...args);
             });
@@ -378,6 +396,7 @@ function bindControllerMethods(options) {
             const methodMeta = getMoostMate().read(fakeInstance, method) || {};
             if (!methodMeta.handlers || !methodMeta.handlers.length)
                 continue;
+            const pipes = [...(opts.pipes || []), ...(methodMeta.pipes || [])].sort((a, b) => a.priority - b.priority);
             // preparing interceptors
             const interceptors = [...(opts.interceptors || []), ...(meta.interceptors || []), ...(methodMeta.interceptors || [])].sort((a, b) => a.priority - b.priority);
             const getIterceptorHandler = () => {
@@ -389,7 +408,7 @@ function bindControllerMethods(options) {
                             const { restoreCtx } = useHttpContext();
                             const targetInstance = yield getInstance();
                             restoreCtx();
-                            return (yield getCallableFn(targetInstance, handler, restoreCtx))(...args);
+                            return (yield getCallableFn(targetInstance, handler, restoreCtx, pipes, options.silent))(...args);
                         }));
                     }
                     else {
@@ -399,7 +418,6 @@ function bindControllerMethods(options) {
                 return Promise.resolve(new InterceptorHandler(interceptorHandlers));
             };
             // preparing pipes
-            const pipes = [...(opts.pipes || []), ...(methodMeta.pipes || [])];
             const argsPipes = [];
             for (const p of methodMeta.params || []) {
                 argsPipes.push({
@@ -457,7 +475,7 @@ function Required() {
     const mate = getMoostMate();
     return mate.apply(mate.decorate('required', true), 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-    mate.decorateClass((meta, key, index) => {
+    mate.decorateClass((meta, level, key, index) => {
         if (typeof index !== 'number' && meta && ['string', 'symbol'].includes(typeof key)) {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
             meta.requiredProps = meta.requiredProps || [];
@@ -625,6 +643,8 @@ function IsBoolean(...args) {
     return Validate(valido$1.validoIsBoolean(...args));
 }
 
+const Inherit = () => getMoostMate().decorate('inherit', true);
+
 exports.TPipePriority = void 0;
 (function (TPipePriority) {
     TPipePriority[TPipePriority["BEFORE_RESOLVE"] = 0] = "BEFORE_RESOLVE";
@@ -694,7 +714,7 @@ class Moost {
         this.provide = infact.createProvideRegistry([infact.Infact, getMoostInfact], [mate.Mate, getMoostMate], [valido$1.Valido, getMoostValido]);
         this.unregisteredControllers = [];
         if (options === null || options === void 0 ? void 0 : options.silent) {
-            getMoostInfact().silent();
+            getMoostInfact().silent(options === null || options === void 0 ? void 0 : options.silent);
         }
     }
     adapter(a) {
@@ -751,12 +771,12 @@ class Moost {
             }
             // getInstance - instance factory for resolving SINGLETON and FOR_EVENT instance
             const getInstance = instance ? () => Promise.resolve(instance) : () => __awaiter(this, void 0, void 0, function* () {
-                var _c;
+                var _c, _d;
                 // if (!instance) {
-                infact.silent();
+                infact.silent(((_c = this.options) === null || _c === void 0 ? void 0 : _c.silent) || 'logs');
                 const { restoreCtx } = eventCore.useEventContext();
                 const instance = yield infact.get(controller, Object.assign(Object.assign({}, infactOpts), { syncContextFn: restoreCtx }));
-                infact.silent(!!((_c = this.options) === null || _c === void 0 ? void 0 : _c.silent));
+                infact.silent(!!((_d = this.options) === null || _d === void 0 ? void 0 : _d.silent));
                 // }
                 return instance;
             });
@@ -938,7 +958,7 @@ const validatePipe = (opts) => {
         else if (level === 'CLASS') {
             meta = metas.classMeta || {};
         }
-        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);
+        const result = yield valido.validateParam(_value, meta, metas.key, undefined, metas.instance, undefined, 0, 0, (opts === null || opts === void 0 ? void 0 : opts.errorLimit) || DEFAULT_ERROR_LIMIT, restoreCtx);
         if (result !== true) {
             const message = typeof result === 'string' ? result : firstString(result);
             if (opts === null || opts === void 0 ? void 0 : opts.errorCb) {
@@ -960,6 +980,7 @@ exports.Controller = Controller;
 exports.Dto = Dto;
 exports.Id = Id;
 exports.ImportController = ImportController;
+exports.Inherit = Inherit;
 exports.Inject = Inject;
 exports.Injectable = Injectable;
 exports.Intercept = Intercept;

package/dist/index.d.ts

@@ -1,7 +1,5 @@
 import { Infact } from '@prostojs/infact';
 import { Mate } from '@prostojs/mate';
-import { TProstoMetadata } from '@prostojs/mate';
-import { TProstoParamsMetadata } from '@prostojs/mate';
 import { TProvideFn } from '@prostojs/infact';
 import { TProvideRegistry } from '@prostojs/infact';
 import { TValidoDtoOptions } from '@prostojs/valido';
@@ -34,7 +32,7 @@ export declare const genericTypesCastPipe: (strict?: boolean) => TPipeFn;
 
 export declare function getMoostInfact(): Infact<TMoostMetadata, TMoostMetadata, TMoostParamsMetadata, TCustom>;
 
-export declare function getMoostMate(): Mate<TMoostMetadata>;
+export declare function getMoostMate<Class extends TObject = TEmpty, Prop extends TObject = TEmpty, Param extends TObject = TEmpty>(): Mate<TMoostMetadata & Class, TMoostMetadata & Prop, TMoostMetadata & TMoostParamsMetadata & Param>;
 
 export declare function getNewMoostInfact(): Infact<TMoostMetadata, TMoostMetadata, TMoostParamsMetadata, TCustom>;
 
@@ -57,6 +55,8 @@ export declare function ImportController(controller: TFunction | TObject, provid
  */
 export declare function ImportController(prefix: string, controller: TFunction | TObject, provide?: TProvideRegistry): ClassDecorator;
 
+export declare const Inherit: () => MethodDecorator & ClassDecorator & ParameterDecorator & PropertyDecorator;
+
 export declare function Inject(type: string | TClassConstructor): ParameterDecorator;
 
 /**
@@ -184,8 +184,13 @@ declare interface TCommonMetaFields {
 }
 
 declare interface TCommonMoostMeta {
+    inherit?: boolean;
     pipes?: TPipeData[];
-    resolver?: (metas: TPipeMetas, level: TDecoratorLevel) => unknown;
+    resolver?: (metas: TPipeMetas<TAny>, level: TDecoratorLevel) => unknown;
+    type?: TFunction;
+    validators?: TValidoFn<TAny>[];
+    validatorsOfItem?: TValidoFn<TAny>[];
+    arrayType?: true | TValidateArrayOptions<TAny>;
 }
 
 declare interface TCustom {
@@ -250,8 +255,7 @@ export declare type TMoostHandler<T extends object> = T & {
     type: string;
 };
 
-export declare interface TMoostMetadata extends TProstoAndCommonMetadata {
-    inherit?: boolean;
+export declare interface TMoostMetadata extends TCommonMetaFields, TCommonMoostMeta {
     dto?: TValidoDtoOptions;
     requiredProps?: (string | symbol)[];
     controller?: {
@@ -266,9 +270,6 @@ export declare interface TMoostMetadata extends TProstoAndCommonMetadata {
     injectable?: true | TInjectableScope;
     interceptors?: TInterceptorData[];
     handlers?: TMoostHandler<TAny>[];
-    validators?: TValidoFn[];
-    validatorsOfItem?: TValidoFn[];
-    arrayType?: true | TValidateArrayOptions;
     provide?: TProvideRegistry;
 }
 
@@ -277,12 +278,9 @@ export declare interface TMoostOptions {
     silent?: boolean;
 }
 
-export declare interface TMoostParamsMetadata extends TProstoParamsAndCommonMetadata {
-    validators?: TValidoFn[];
-    validatorsOfItem?: TValidoFn[];
-    arrayType?: true | TValidateArrayOptions;
+export declare interface TMoostParamsMetadata extends TCommonMetaFields, TCommonMoostMeta {
     circular?: () => TAny;
-    inject?: string | symbol;
+    inject?: string | symbol | TClassConstructor;
 }
 
 declare type TObject = object;
@@ -318,10 +316,6 @@ export declare enum TPipePriority {
     AFTER_VALIDATE = 8
 }
 
-declare type TProstoAndCommonMetadata<T extends TMoostParamsMetadata = TMoostParamsMetadata> = TProstoMetadata<T> & TCommonMetaFields & TCommonMoostMeta;
-
-declare type TProstoParamsAndCommonMetadata = TProstoParamsMetadata & TCommonMetaFields & TCommonMoostMeta;
-
 export declare interface TValidateArrayOptions<T = unknown> {
     itemType?: (item: T, index: number) => Promise<TFunction> | TFunction;
     itemValidators?: () => (PropertyDecorator | ParameterDecorator)[];

package/dist/index.mjs

@@ -202,6 +202,15 @@ const moostMate = new Mate(METADATA_WORKSPACE, {
     readType: true,
     readReturnType: true,
     collectPropKeys: true,
+    inherit(classMeta, targetMeta, level) {
+        if (level === 'CLASS') {
+            return !!(classMeta === null || classMeta === void 0 ? void 0 : classMeta.inherit);
+        }
+        if (level === 'PROP') {
+            return !!(targetMeta === null || targetMeta === void 0 ? void 0 : targetMeta.inherit) || !!((classMeta === null || classMeta === void 0 ? void 0 : classMeta.inherit) && !targetMeta);
+        }
+        return !!(targetMeta === null || targetMeta === void 0 ? void 0 : targetMeta.inherit);
+    },
 });
 function getMoostMate() {
     return moostMate;
@@ -258,9 +267,18 @@ function getInstanceOwnMethods(instance) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const proto = Object.getPrototypeOf(instance);
     return [
+        ...getParentProps(getConstructor(instance)),
         ...Object.getOwnPropertyNames(proto),
         ...Object.getOwnPropertyNames(instance),
     ].filter(m => typeof instance[m] === 'function');
+}
+const fnProto = Object.getPrototypeOf(Function);
+function getParentProps(constructor) {
+    const parent = Object.getPrototypeOf(constructor);
+    if (typeof parent === 'function' && parent !== fnProto && parent !== constructor && parent.prototype) {
+        return [...getParentProps(parent), ...Object.getOwnPropertyNames(parent.prototype)];
+    }
+    return [];
 }
 
 const banner = () => `[${"moost"}][${new Date().toISOString().replace('T', ' ').replace(/\.\d{3}z$/i, '')}] `;
@@ -278,18 +296,18 @@ function panic(error) {
     return new Error(error);
 }
 
-function getCallableFn(targetInstance, fn, restoreCtx) {
+function getCallableFn(targetInstance, fn, restoreCtx, pipes, silent) {
     return __awaiter(this, void 0, void 0, function* () {
         const mate = getMoostMate();
         const meta = mate.read(fn);
         if (meta === null || meta === void 0 ? void 0 : meta.injectable) {
             const infact = getMoostInfact();
-            infact.silent(meta.injectable === 'FOR_EVENT');
+            infact.silent(silent || (meta.injectable === 'FOR_EVENT' ? 'logs' : false));
             const instance = yield infact.getForInstance(targetInstance, fn, {
                 syncContextFn: () => { restoreCtx && restoreCtx(); },
-                customData: { pipes: meta.pipes },
+                customData: { pipes: [...(pipes || []), ...(meta.pipes || [])].sort((a, b) => a.priority - b.priority) },
             });
-            infact.silent(false);
+            infact.silent(!!silent);
             return ((...args) => {
                 return instance.handler(...args);
             });
@@ -376,6 +394,7 @@ function bindControllerMethods(options) {
             const methodMeta = getMoostMate().read(fakeInstance, method) || {};
             if (!methodMeta.handlers || !methodMeta.handlers.length)
                 continue;
+            const pipes = [...(opts.pipes || []), ...(methodMeta.pipes || [])].sort((a, b) => a.priority - b.priority);
             // preparing interceptors
             const interceptors = [...(opts.interceptors || []), ...(meta.interceptors || []), ...(methodMeta.interceptors || [])].sort((a, b) => a.priority - b.priority);
             const getIterceptorHandler = () => {
@@ -387,7 +406,7 @@ function bindControllerMethods(options) {
                             const { restoreCtx } = useHttpContext();
                             const targetInstance = yield getInstance();
                             restoreCtx();
-                            return (yield getCallableFn(targetInstance, handler, restoreCtx))(...args);
+                            return (yield getCallableFn(targetInstance, handler, restoreCtx, pipes, options.silent))(...args);
                         }));
                     }
                     else {
@@ -397,7 +416,6 @@ function bindControllerMethods(options) {
                 return Promise.resolve(new InterceptorHandler(interceptorHandlers));
             };
             // preparing pipes
-            const pipes = [...(opts.pipes || []), ...(methodMeta.pipes || [])];
             const argsPipes = [];
             for (const p of methodMeta.params || []) {
                 argsPipes.push({
@@ -455,7 +473,7 @@ function Required() {
     const mate = getMoostMate();
     return mate.apply(mate.decorate('required', true), 
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-    mate.decorateClass((meta, key, index) => {
+    mate.decorateClass((meta, level, key, index) => {
         if (typeof index !== 'number' && meta && ['string', 'symbol'].includes(typeof key)) {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
             meta.requiredProps = meta.requiredProps || [];
@@ -623,6 +641,8 @@ function IsBoolean(...args) {
     return Validate(validoIsBoolean(...args));
 }
 
+const Inherit = () => getMoostMate().decorate('inherit', true);
+
 var TPipePriority;
 (function (TPipePriority) {
     TPipePriority[TPipePriority["BEFORE_RESOLVE"] = 0] = "BEFORE_RESOLVE";
@@ -692,7 +712,7 @@ class Moost {
         this.provide = createProvideRegistry([Infact, getMoostInfact], [Mate, getMoostMate], [Valido, getMoostValido]);
         this.unregisteredControllers = [];
         if (options === null || options === void 0 ? void 0 : options.silent) {
-            getMoostInfact().silent();
+            getMoostInfact().silent(options === null || options === void 0 ? void 0 : options.silent);
         }
     }
     adapter(a) {
@@ -749,12 +769,12 @@ class Moost {
             }
             // getInstance - instance factory for resolving SINGLETON and FOR_EVENT instance
             const getInstance = instance ? () => Promise.resolve(instance) : () => __awaiter(this, void 0, void 0, function* () {
-                var _c;
+                var _c, _d;
                 // if (!instance) {
-                infact.silent();
+                infact.silent(((_c = this.options) === null || _c === void 0 ? void 0 : _c.silent) || 'logs');
                 const { restoreCtx } = useEventContext();
                 const instance = yield infact.get(controller, Object.assign(Object.assign({}, infactOpts), { syncContextFn: restoreCtx }));
-                infact.silent(!!((_c = this.options) === null || _c === void 0 ? void 0 : _c.silent));
+                infact.silent(!!((_d = this.options) === null || _d === void 0 ? void 0 : _d.silent));
                 // }
                 return instance;
             });
@@ -936,7 +956,7 @@ const validatePipe = (opts) => {
         else if (level === 'CLASS') {
             meta = metas.classMeta || {};
         }
-        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);
+        const result = yield valido.validateParam(_value, meta, metas.key, undefined, metas.instance, undefined, 0, 0, (opts === null || opts === void 0 ? void 0 : opts.errorLimit) || DEFAULT_ERROR_LIMIT, restoreCtx);
         if (result !== true) {
             const message = typeof result === 'string' ? result : firstString(result);
             if (opts === null || opts === void 0 ? void 0 : opts.errorCb) {
@@ -952,4 +972,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, getMoostInfact, getMoostMate, getNewMoostInfact, resolvePipe, useControllerMeta, validatePipe };
+export { Circular, Const, Controller, Dto, Id, ImportController, Inherit, 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.12",
+  "version": "0.2.14",
   "description": "moost",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -22,11 +22,11 @@
     "prostojs"
   ],
   "dependencies": {
-    "@prostojs/infact": "^0.1.4",
-    "@prostojs/mate": "^0.1.12",
+    "@prostojs/infact": "^0.1.7",
+    "@prostojs/mate": "^0.1.13",
     "@prostojs/valido": "^0.0.2",
-    "@wooksjs/event-core": "^0.2.6",
-    "wooks": "^0.2.6"
+    "@wooksjs/event-core": "^0.2.7",
+    "wooks": "^0.2.7"
   },
   "author": "Artem Maltsev",
   "license": "MIT",