moost 0.2.8 → 0.2.10

package/dist/index.cjs

@@ -203,17 +203,18 @@ const METADATA_WORKSPACE = 'moost';
 const moostMate = new mate.Mate(METADATA_WORKSPACE, {
     readType: true,
     readReturnType: true,
+    collectPropKeys: true,
 });
 function getMoostMate() {
     return moostMate;
 }
 
-function runPipes(pipes, meta, restoreCtx) {
+function runPipes(pipes, initialValue, metas, level, restoreCtx) {
     return __awaiter(this, void 0, void 0, function* () {
-        let v = undefined;
+        let v = initialValue;
         for (const pipe of pipes) {
             restoreCtx && restoreCtx();
-            v = yield pipe.handler(v, meta);
+            v = yield pipe.handler(v, metas, level);
         }
         return v;
     });
@@ -232,9 +233,23 @@ exports.TPipePriority = void 0;
     TPipePriority[TPipePriority["AFTER_VALIDATE"] = 8] = "AFTER_VALIDATE";
 })(exports.TPipePriority || (exports.TPipePriority = {}));
 
-const resolvePipe = (_value, meta) => {
-    if (meta === null || meta === void 0 ? void 0 : meta.resolver) {
-        return meta.resolver();
+const resolvePipe = (_value, metas, level) => {
+    var _a, _b, _c, _d;
+    let resolver;
+    if (level === 'PARAM') {
+        resolver = (_a = metas.paramMeta) === null || _a === void 0 ? void 0 : _a.resolver;
+    }
+    else if (level === 'PROP') {
+        resolver = (_b = metas.propMeta) === null || _b === void 0 ? void 0 : _b.resolver;
+    }
+    else if (level === 'METHOD') {
+        resolver = (_c = metas.methodMeta) === null || _c === void 0 ? void 0 : _c.resolver;
+    }
+    else if (level === 'CLASS') {
+        resolver = (_d = metas.classMeta) === null || _d === void 0 ? void 0 : _d.resolver;
+    }
+    if (resolver) {
+        return resolver(metas, level);
     }
     return undefined;
 };
@@ -260,13 +275,23 @@ function getNewMoostInfact() {
                 global: false,
                 constructorParams: (meta === null || meta === void 0 ? void 0 : meta.params) || [],
                 provide: meta === null || meta === void 0 ? void 0 : meta.provide,
+                properties: (meta === null || meta === void 0 ? void 0 : meta.properties) || [],
                 scopeId: (meta === null || meta === void 0 ? void 0 : meta.injectable) === 'FOR_EVENT' ? eventCore.useEventId().getId() : undefined,
             };
             return infactMeta;
         },
-        resolveParam(paramMeta) {
+        resolveParam(paramMeta, classMeta) {
             if (paramMeta.resolver) {
-                return runPipes(sharedPipes, paramMeta);
+                return runPipes(sharedPipes, undefined, { paramMeta, classMeta: classMeta }, 'PARAM');
+            }
+        },
+        describeProp(classConstructor, key) {
+            const meta = getMoostMate().read(classConstructor, key);
+            return meta;
+        },
+        resolveProp(instance, key, initialValue, propMeta, classMeta) {
+            if (propMeta.resolver) {
+                return runPipes(sharedPipes, initialValue, { instance, key, propMeta, classMeta: classMeta }, 'PROP');
             }
         },
         storeProvideRegByInstance: true,
@@ -425,8 +450,12 @@ function bindControllerMethods(options) {
                 const args = [];
                 const { restoreCtx } = eventCore.useEventContext();
                 for (let i = 0; i < argsPipes.length; i++) {
-                    const { pipes, meta } = argsPipes[i];
-                    args[i] = yield runPipes(pipes, meta, restoreCtx);
+                    const { pipes, meta: paramMeta } = argsPipes[i];
+                    args[i] = yield runPipes(pipes, undefined, {
+                        classMeta: meta,
+                        methodMeta,
+                        paramMeta,
+                    }, 'PARAM', restoreCtx);
                 }
                 return args;
             });
@@ -487,8 +516,9 @@ function Required() {
  */
 function Resolve(resolver, label) {
     return (target, key, index) => {
-        fillLabel(target, key, index, label);
-        getMoostMate().decorate('resolver', resolver)(target, key, index);
+        const i = typeof index === 'number' ? index : undefined;
+        fillLabel(target, key, i, label);
+        getMoostMate().decorate('resolver', resolver)(target, key, i);
     };
 }
 /**
@@ -521,8 +551,15 @@ function Const(value, label) {
 function fillLabel(target, key, index, name) {
     if (name) {
         const meta = getMoostMate().read(target, key);
-        if (!(meta === null || meta === void 0 ? void 0 : meta.params) || !(meta === null || meta === void 0 ? void 0 : meta.params[index]) || !(meta === null || meta === void 0 ? void 0 : meta.params[index].label)) {
-            Label(name)(target, key, index);
+        if (typeof index === 'number') {
+            if (!(meta === null || meta === void 0 ? void 0 : meta.params) || !(meta === null || meta === void 0 ? void 0 : meta.params[index]) || !(meta === null || meta === void 0 ? void 0 : meta.params[index].label)) {
+                Label(name)(target, key, index);
+            }
+        }
+        else {
+            if (!(meta === null || meta === void 0 ? void 0 : meta.label)) {
+                Label(name)(target, key);
+            }
         }
     }
 }
@@ -809,7 +846,7 @@ function useMoostStore() {
 }
 
 const genericTypesCastPipe = (strict) => {
-    const handler = (value, meta) => {
+    const handler = (value, { paramMeta: meta }) => {
         if (meta === null || meta === void 0 ? void 0 : meta.type) {
             if ((value === undefined || value === null || (meta.type !== String && value === '')) && meta.optional) {
                 return undefined;
@@ -881,7 +918,7 @@ const validatePipe = (opts) => {
     const pipe = (_value, meta) => __awaiter(void 0, void 0, void 0, function* () {
         const { restoreCtx } = useHttpContext();
         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);
+        const result = yield valido.validateParam(_value, meta.paramMeta || {}, undefined, undefined, undefined, undefined, 0, 0, (opts === null || opts === void 0 ? void 0 : opts.errorLimit) || DEFAULT_ERROR_LIMIT, restoreCtx);
         if (result !== true) {
             throw new HttpError(400, {
                 statusCode: 400,

package/dist/index.d.ts

@@ -1,7 +1,5 @@
 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';
@@ -21,7 +19,7 @@ export declare function Circular<T = unknown>(resolver: () => TClassConstructor<
  * @param label - label of the field
  * @paramType unknown
  */
-export declare function Const(value: unknown, label?: string): ParameterDecorator;
+export declare function Const(value: unknown, label?: string): ParameterDecorator & PropertyDecorator;
 
 /**
  * Set Class as a Controller
@@ -34,11 +32,11 @@ export declare function Dto(dtoOptions?: TValidoDtoOptions): ClassDecorator;
 
 export declare const genericTypesCastPipe: (strict?: boolean) => TPipeFn;
 
-export declare function getMoostInfact(): Infact<TInfactMoostMeta>;
+export declare function getMoostInfact(): Infact<TMoostMetadata, TMoostMetadata, TMoostParamsMetadata>;
 
 export declare function getMoostMate(): Mate<TMoostMetadata>;
 
-export declare function getNewMoostInfact(): Infact<TInfactMoostMeta>;
+export declare function getNewMoostInfact(): Infact<TMoostMetadata, TMoostMetadata, TMoostParamsMetadata>;
 
 export declare function Id(value: string): MethodDecorator & ClassDecorator & ParameterDecorator & PropertyDecorator;
 
@@ -135,14 +133,14 @@ export declare function Optional(): MethodDecorator & ClassDecorator & Parameter
  * @param name - param name
  * @paramType string
  */
-export declare function Param(name: string): ParameterDecorator;
+export declare function Param(name: string): ParameterDecorator & PropertyDecorator;
 
 /**
  * Get Parsed Params from url parh
  * @decorator
  * @paramType object
  */
-export declare function Params(): ParameterDecorator;
+export declare function Params(): ParameterDecorator & PropertyDecorator;
 
 export declare function Provide(type: string | TClassConstructor, fn: TProvideFn): ClassDecorator;
 
@@ -156,7 +154,7 @@ export { Required_2 as Required }
  * @param label - field label
  * @paramType unknown
  */
-export declare function Resolve(resolver: () => unknown, label?: string): ParameterDecorator;
+export declare function Resolve<T extends TObject = TEmpty>(resolver: (metas: TPipeMetas<T>, level: TDecoratorLevel) => unknown, label?: string): ParameterDecorator & PropertyDecorator;
 
 export declare const resolvePipe: TPipeFn;
 
@@ -187,11 +185,15 @@ declare interface TCommonMetaFields {
 
 declare interface TCommonMoostMeta {
     pipes?: TPipeData[];
+    resolver?: (metas: TPipeMetas, level: TDecoratorLevel) => unknown;
 }
 
-declare type TFunction = Function;
+declare type TDecoratorLevel = 'CLASS' | 'METHOD' | 'PROP' | 'PARAM';
+
+declare interface TEmpty {
+}
 
-declare type TInfactMoostMeta = TInfactClassMeta<TMoostParamsMetadata & TInfactConstructorParamMeta>;
+declare type TFunction = Function;
 
 export declare type TInjectableScope = 'FOR_EVENT' | 'SINGLETON';
 
@@ -256,6 +258,7 @@ export declare interface TMoostMetadata extends TProstoAndCommonMetadata {
         typeResolver?: TClassConstructor | (() => TClassConstructor | TObject | Promise<TClassConstructor | TObject>);
         provide?: TProvideRegistry;
     }[];
+    properties?: (string | symbol)[];
     injectable?: true | TInjectableScope;
     interceptors?: TInterceptorData[];
     handlers?: TMoostHandler<TAny>[];
@@ -274,7 +277,6 @@ export declare interface TMoostParamsMetadata extends TProstoParamsAndCommonMeta
     validators?: TValidoFn[];
     validatorsOfItem?: TValidoFn[];
     arrayType?: true | TValidateArrayOptions;
-    resolver?: TFunction;
     circular?: () => TAny;
     inject?: string | symbol;
 }
@@ -286,11 +288,20 @@ export declare interface TPipeData {
     priority: TPipePriority;
 }
 
-export declare type TPipeFn<T extends TMoostParamsMetadata = TMoostParamsMetadata> = {
-    (value: unknown, meta: T): unknown | Promise<unknown>;
+export declare type TPipeFn<T extends TObject = TEmpty> = {
+    (value: unknown, metas: TPipeMetas<T>, level: TDecoratorLevel): unknown | Promise<unknown>;
     priority?: TPipePriority;
 };
 
+export declare interface TPipeMetas<T extends TObject = TEmpty> {
+    classMeta?: TMoostMetadata & T;
+    methodMeta?: TMoostMetadata & T;
+    propMeta?: TMoostMetadata & T;
+    paramMeta?: TMoostParamsMetadata & T;
+    instance?: TObject;
+    key?: string | symbol;
+}
+
 export declare enum TPipePriority {
     BEFORE_RESOLVE = 0,
     RESOLVE = 1,

package/dist/index.mjs

@@ -201,17 +201,18 @@ const METADATA_WORKSPACE = 'moost';
 const moostMate = new Mate(METADATA_WORKSPACE, {
     readType: true,
     readReturnType: true,
+    collectPropKeys: true,
 });
 function getMoostMate() {
     return moostMate;
 }
 
-function runPipes(pipes, meta, restoreCtx) {
+function runPipes(pipes, initialValue, metas, level, restoreCtx) {
     return __awaiter(this, void 0, void 0, function* () {
-        let v = undefined;
+        let v = initialValue;
         for (const pipe of pipes) {
             restoreCtx && restoreCtx();
-            v = yield pipe.handler(v, meta);
+            v = yield pipe.handler(v, metas, level);
         }
         return v;
     });
@@ -230,9 +231,23 @@ var TPipePriority;
     TPipePriority[TPipePriority["AFTER_VALIDATE"] = 8] = "AFTER_VALIDATE";
 })(TPipePriority || (TPipePriority = {}));
 
-const resolvePipe = (_value, meta) => {
-    if (meta === null || meta === void 0 ? void 0 : meta.resolver) {
-        return meta.resolver();
+const resolvePipe = (_value, metas, level) => {
+    var _a, _b, _c, _d;
+    let resolver;
+    if (level === 'PARAM') {
+        resolver = (_a = metas.paramMeta) === null || _a === void 0 ? void 0 : _a.resolver;
+    }
+    else if (level === 'PROP') {
+        resolver = (_b = metas.propMeta) === null || _b === void 0 ? void 0 : _b.resolver;
+    }
+    else if (level === 'METHOD') {
+        resolver = (_c = metas.methodMeta) === null || _c === void 0 ? void 0 : _c.resolver;
+    }
+    else if (level === 'CLASS') {
+        resolver = (_d = metas.classMeta) === null || _d === void 0 ? void 0 : _d.resolver;
+    }
+    if (resolver) {
+        return resolver(metas, level);
     }
     return undefined;
 };
@@ -258,13 +273,23 @@ function getNewMoostInfact() {
                 global: false,
                 constructorParams: (meta === null || meta === void 0 ? void 0 : meta.params) || [],
                 provide: meta === null || meta === void 0 ? void 0 : meta.provide,
+                properties: (meta === null || meta === void 0 ? void 0 : meta.properties) || [],
                 scopeId: (meta === null || meta === void 0 ? void 0 : meta.injectable) === 'FOR_EVENT' ? useEventId().getId() : undefined,
             };
             return infactMeta;
         },
-        resolveParam(paramMeta) {
+        resolveParam(paramMeta, classMeta) {
             if (paramMeta.resolver) {
-                return runPipes(sharedPipes, paramMeta);
+                return runPipes(sharedPipes, undefined, { paramMeta, classMeta: classMeta }, 'PARAM');
+            }
+        },
+        describeProp(classConstructor, key) {
+            const meta = getMoostMate().read(classConstructor, key);
+            return meta;
+        },
+        resolveProp(instance, key, initialValue, propMeta, classMeta) {
+            if (propMeta.resolver) {
+                return runPipes(sharedPipes, initialValue, { instance, key, propMeta, classMeta: classMeta }, 'PROP');
             }
         },
         storeProvideRegByInstance: true,
@@ -423,8 +448,12 @@ function bindControllerMethods(options) {
                 const args = [];
                 const { restoreCtx } = useEventContext();
                 for (let i = 0; i < argsPipes.length; i++) {
-                    const { pipes, meta } = argsPipes[i];
-                    args[i] = yield runPipes(pipes, meta, restoreCtx);
+                    const { pipes, meta: paramMeta } = argsPipes[i];
+                    args[i] = yield runPipes(pipes, undefined, {
+                        classMeta: meta,
+                        methodMeta,
+                        paramMeta,
+                    }, 'PARAM', restoreCtx);
                 }
                 return args;
             });
@@ -485,8 +514,9 @@ function Required() {
  */
 function Resolve(resolver, label) {
     return (target, key, index) => {
-        fillLabel(target, key, index, label);
-        getMoostMate().decorate('resolver', resolver)(target, key, index);
+        const i = typeof index === 'number' ? index : undefined;
+        fillLabel(target, key, i, label);
+        getMoostMate().decorate('resolver', resolver)(target, key, i);
     };
 }
 /**
@@ -519,8 +549,15 @@ function Const(value, label) {
 function fillLabel(target, key, index, name) {
     if (name) {
         const meta = getMoostMate().read(target, key);
-        if (!(meta === null || meta === void 0 ? void 0 : meta.params) || !(meta === null || meta === void 0 ? void 0 : meta.params[index]) || !(meta === null || meta === void 0 ? void 0 : meta.params[index].label)) {
-            Label(name)(target, key, index);
+        if (typeof index === 'number') {
+            if (!(meta === null || meta === void 0 ? void 0 : meta.params) || !(meta === null || meta === void 0 ? void 0 : meta.params[index]) || !(meta === null || meta === void 0 ? void 0 : meta.params[index].label)) {
+                Label(name)(target, key, index);
+            }
+        }
+        else {
+            if (!(meta === null || meta === void 0 ? void 0 : meta.label)) {
+                Label(name)(target, key);
+            }
         }
     }
 }
@@ -807,7 +844,7 @@ function useMoostStore() {
 }
 
 const genericTypesCastPipe = (strict) => {
-    const handler = (value, meta) => {
+    const handler = (value, { paramMeta: meta }) => {
         if (meta === null || meta === void 0 ? void 0 : meta.type) {
             if ((value === undefined || value === null || (meta.type !== String && value === '')) && meta.optional) {
                 return undefined;
@@ -879,7 +916,7 @@ const validatePipe = (opts) => {
     const pipe = (_value, meta) => __awaiter(void 0, void 0, void 0, function* () {
         const { restoreCtx } = useHttpContext();
         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);
+        const result = yield valido.validateParam(_value, meta.paramMeta || {}, undefined, undefined, undefined, undefined, 0, 0, (opts === null || opts === void 0 ? void 0 : opts.errorLimit) || DEFAULT_ERROR_LIMIT, restoreCtx);
         if (result !== true) {
             throw new HttpError(400, {
                 statusCode: 400,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "moost",
-  "version": "0.2.8",
+  "version": "0.2.10",
   "description": "moost",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -22,11 +22,11 @@
     "prostojs"
   ],
   "dependencies": {
-    "@prostojs/infact": "^0.0.13",
-    "@prostojs/mate": "^0.1.10",
+    "@prostojs/infact": "^0.1.1",
+    "@prostojs/mate": "^0.1.12",
     "@prostojs/valido": "^0.0.2",
-    "@wooksjs/event-core": "^0.2.5",
-    "wooks": "^0.2.5"
+    "@wooksjs/event-core": "^0.2.6",
+    "wooks": "^0.2.6"
   },
   "author": "Artem Maltsev",
   "license": "MIT",