@midwayjs/decorator 3.0.0-alpha.6 → 3.0.0-beta.4

package/dist/index.d.ts

@@ -1,25 +1,6 @@
+export * from './decorator';
 export * from './interface';
-export * from './annotation';
 export * from './constant';
-export * from './common/decoratorManager';
-export * from './common/errMsg';
-export * from './common/metadata';
-export * from './common/scopeEnum';
-export * from './faas/fun';
-export * from './faas/handler';
-export * from './web/requestMapping';
-export * from './web/paramMapping';
-export * from './web/controller';
-export * from './web/response';
-export * from './rpc/hsf';
-export * from './framework/config';
-export * from './framework/logger';
-export * from './framework/plugin';
-export * from './framework/app';
-export * from './ws/webSocketController';
-export * from './ws/webSocketEvent';
-export * from './microservice/provider';
-export * from './microservice/consumer';
-export * from './microservice/rabbitmqListener';
+export * from './decoratorManager';
 export * from './util/index';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -10,28 +10,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./decorator"), exports);
 __exportStar(require("./interface"), exports);
-__exportStar(require("./annotation"), exports);
 __exportStar(require("./constant"), exports);
-__exportStar(require("./common/decoratorManager"), exports);
-__exportStar(require("./common/errMsg"), exports);
-__exportStar(require("./common/metadata"), exports);
-__exportStar(require("./common/scopeEnum"), exports);
-__exportStar(require("./faas/fun"), exports);
-__exportStar(require("./faas/handler"), exports);
-__exportStar(require("./web/requestMapping"), exports);
-__exportStar(require("./web/paramMapping"), exports);
-__exportStar(require("./web/controller"), exports);
-__exportStar(require("./web/response"), exports);
-__exportStar(require("./rpc/hsf"), exports);
-__exportStar(require("./framework/config"), exports);
-__exportStar(require("./framework/logger"), exports);
-__exportStar(require("./framework/plugin"), exports);
-__exportStar(require("./framework/app"), exports);
-__exportStar(require("./ws/webSocketController"), exports);
-__exportStar(require("./ws/webSocketEvent"), exports);
-__exportStar(require("./microservice/provider"), exports);
-__exportStar(require("./microservice/consumer"), exports);
-__exportStar(require("./microservice/rabbitmqListener"), exports);
+__exportStar(require("./decoratorManager"), exports);
 __exportStar(require("./util/index"), exports);
 //# sourceMappingURL=index.js.map

package/dist/interface.d.ts

@@ -1,8 +1,11 @@
-import { ScopeEnum } from './common/scopeEnum';
-import { Middleware } from 'koa';
-import { RequestHandler } from 'express';
-export declare type MiddlewareParamArray = Array<Middleware | RequestHandler | string>;
-export declare type ObjectIdentifier = string;
+export declare type MiddlewareParamArray = Array<string | any>;
+export declare type ObjectIdentifier = string | Symbol;
+export declare type GroupModeType = 'one' | 'multi';
+export declare enum ScopeEnum {
+    Singleton = "Singleton",
+    Request = "Request",
+    Prototype = "Prototype"
+}
 /**
  * 内部管理的属性、json、ref等解析实例存储
  */
@@ -16,8 +19,7 @@ export interface ObjectDefinitionOptions {
     initMethod?: string;
     destroyMethod?: string;
     scope?: ScopeEnum;
-    constructorArgs?: IManagedInstance[];
-    isAutowire?: boolean;
+    constructorArgs?: any[];
     namespace?: string;
     srcPath?: string;
 }
@@ -29,9 +31,11 @@ export interface TagPropsMetadata {
 export interface TagClsMetadata {
     id: string;
     originName: string;
+    uuid: string;
+    name: string;
 }
 export interface ReflectResult {
-    [key: string]: TagPropsMetadata[];
+    [key: string]: any[];
 }
 export declare enum MSProviderType {
     DUBBO = "dubbo",
@@ -127,13 +131,16 @@ export declare namespace FaaSMetadata {
          * deploy or not
          */
         isDeploy?: boolean;
+        /**
+         * function middleware
+         */
+        middleware?: any[];
     }
     export interface EventTriggerOptions extends TriggerCommonOptions {
     }
     export interface HTTPTriggerOptions extends TriggerCommonOptions {
         path: string;
         method?: 'get' | 'post' | 'delete' | 'put' | 'head' | 'patch' | 'all';
-        middleware?: any[];
     }
     export interface APIGatewayTriggerOptions extends HTTPTriggerOptions {
     }
@@ -178,20 +185,25 @@ export declare namespace FaaSMetadata {
     }
     export {};
 }
-export declare enum MidwayFrameworkType {
-    WEB = "@midwayjs/web",
-    WEB_KOA = "@midwayjs/koa",
-    WEB_EXPRESS = "@midwayjs/express",
-    FAAS = "@midwayjs/faas",
-    MS_HSF = "",
-    MS_GRPC = "@midwayjs/grpc",
-    MS_RABBITMQ = "@midwayjs/rabbitmq",
-    WS_IO = "@midwayjs/socketio",
-    WS = "@midwayjs/ws",
-    SERVERLESS_APP = "@midwayjs/serverless-app",
-    CUSTOM = "",
-    EMPTY = "empty",
-    LIGHT = "light"
+export declare abstract class FrameworkType {
+    abstract name: string;
+}
+export declare class MidwayFrameworkType extends FrameworkType {
+    name: string;
+    static WEB: MidwayFrameworkType;
+    static WEB_KOA: MidwayFrameworkType;
+    static WEB_EXPRESS: MidwayFrameworkType;
+    static FAAS: MidwayFrameworkType;
+    static MS_GRPC: MidwayFrameworkType;
+    static MS_RABBITMQ: MidwayFrameworkType;
+    static WS_IO: MidwayFrameworkType;
+    static WS: MidwayFrameworkType;
+    static SERVERLESS_APP: MidwayFrameworkType;
+    static CUSTOM: MidwayFrameworkType;
+    static EMPTY: MidwayFrameworkType;
+    static LIGHT: MidwayFrameworkType;
+    static TASK: MidwayFrameworkType;
+    constructor(name: string);
 }
 export declare enum ServerlessTriggerType {
     EVENT = "event",
@@ -205,4 +217,9 @@ export declare enum ServerlessTriggerType {
     HSF = "hsf",
     MTOP = "mtop"
 }
+export interface IModuleStore {
+    listModule(key: string): any;
+    saveModule(key: string, module: any): any;
+    transformModule?(moduleMap: Map<string, Set<any>>): any;
+}
 //# sourceMappingURL=interface.d.ts.map

package/dist/interface.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ServerlessTriggerType = exports.MidwayFrameworkType = exports.MSListenerType = exports.MSProviderType = void 0;
+exports.ServerlessTriggerType = exports.MidwayFrameworkType = exports.FrameworkType = exports.MSListenerType = exports.MSProviderType = exports.ScopeEnum = void 0;
+var ScopeEnum;
+(function (ScopeEnum) {
+    ScopeEnum["Singleton"] = "Singleton";
+    ScopeEnum["Request"] = "Request";
+    ScopeEnum["Prototype"] = "Prototype";
+})(ScopeEnum = exports.ScopeEnum || (exports.ScopeEnum = {}));
 var MSProviderType;
 (function (MSProviderType) {
     MSProviderType["DUBBO"] = "dubbo";
@@ -14,22 +20,30 @@ var MSListenerType;
     MSListenerType["KAFKA"] = "kafka";
     MSListenerType["REDIS"] = "redis";
 })(MSListenerType = exports.MSListenerType || (exports.MSListenerType = {}));
-var MidwayFrameworkType;
-(function (MidwayFrameworkType) {
-    MidwayFrameworkType["WEB"] = "@midwayjs/web";
-    MidwayFrameworkType["WEB_KOA"] = "@midwayjs/koa";
-    MidwayFrameworkType["WEB_EXPRESS"] = "@midwayjs/express";
-    MidwayFrameworkType["FAAS"] = "@midwayjs/faas";
-    MidwayFrameworkType["MS_HSF"] = "";
-    MidwayFrameworkType["MS_GRPC"] = "@midwayjs/grpc";
-    MidwayFrameworkType["MS_RABBITMQ"] = "@midwayjs/rabbitmq";
-    MidwayFrameworkType["WS_IO"] = "@midwayjs/socketio";
-    MidwayFrameworkType["WS"] = "@midwayjs/ws";
-    MidwayFrameworkType["SERVERLESS_APP"] = "@midwayjs/serverless-app";
-    MidwayFrameworkType["CUSTOM"] = "";
-    MidwayFrameworkType["EMPTY"] = "empty";
-    MidwayFrameworkType["LIGHT"] = "light";
-})(MidwayFrameworkType = exports.MidwayFrameworkType || (exports.MidwayFrameworkType = {}));
+class FrameworkType {
+}
+exports.FrameworkType = FrameworkType;
+class MidwayFrameworkType extends FrameworkType {
+    constructor(name) {
+        super();
+        this.name = name;
+    }
+    ;
+}
+exports.MidwayFrameworkType = MidwayFrameworkType;
+MidwayFrameworkType.WEB = new MidwayFrameworkType('@midwayjs/web');
+MidwayFrameworkType.WEB_KOA = new MidwayFrameworkType('@midwayjs/web-koa');
+MidwayFrameworkType.WEB_EXPRESS = new MidwayFrameworkType('@midwayjs/express');
+MidwayFrameworkType.FAAS = new MidwayFrameworkType('@midwayjs/faas');
+MidwayFrameworkType.MS_GRPC = new MidwayFrameworkType('@midwayjs/grpc');
+MidwayFrameworkType.MS_RABBITMQ = new MidwayFrameworkType('@midwayjs/rabbitmq');
+MidwayFrameworkType.WS_IO = new MidwayFrameworkType('@midwayjs/socketio');
+MidwayFrameworkType.WS = new MidwayFrameworkType('@midwayjs/ws');
+MidwayFrameworkType.SERVERLESS_APP = new MidwayFrameworkType('@midwayjs/serverless-app');
+MidwayFrameworkType.CUSTOM = new MidwayFrameworkType('');
+MidwayFrameworkType.EMPTY = new MidwayFrameworkType('empty');
+MidwayFrameworkType.LIGHT = new MidwayFrameworkType('light');
+MidwayFrameworkType.TASK = new MidwayFrameworkType('@midwayjs/task');
 var ServerlessTriggerType;
 (function (ServerlessTriggerType) {
     ServerlessTriggerType["EVENT"] = "event";

package/dist/util/index.d.ts

@@ -23,4 +23,9 @@ export declare function getParamNames(func: any): string[];
  * @param name 类名称
  */
 export declare function classNamed(name: string): string;
+/**
+ * generate a lightweight random id, enough for ioc container
+ */
+export declare function generateRandomId(): string;
+export declare function merge(target: any, src: any): any;
 //# sourceMappingURL=index.d.ts.map

package/dist/util/index.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.classNamed = exports.getParamNames = exports.sleep = exports.isNullOrUndefined = exports.isNull = exports.isUndefined = exports.isRegExp = exports.isSet = exports.isMap = exports.isProxy = exports.isNumber = exports.isObject = exports.isFunction = exports.isPromise = exports.isGeneratorFunction = exports.isAsyncFunction = exports.isClass = void 0;
+exports.merge = exports.generateRandomId = exports.classNamed = exports.getParamNames = exports.sleep = exports.isNullOrUndefined = exports.isNull = exports.isUndefined = exports.isRegExp = exports.isSet = exports.isMap = exports.isProxy = exports.isNumber = exports.isObject = exports.isFunction = exports.isPromise = exports.isGeneratorFunction = exports.isAsyncFunction = exports.isClass = void 0;
 const util = require("util");
 const camelcase = require("camelcase");
+const crypto = require("crypto");
 const ToString = Function.prototype.toString;
 function fnBody(fn) {
     return ToString.call(fn)
@@ -109,4 +110,29 @@ function classNamed(name) {
     return camelcase(name);
 }
 exports.classNamed = classNamed;
+/**
+ * generate a lightweight random id, enough for ioc container
+ */
+function generateRandomId() {
+    // => f9b327e70bbcf42494ccb28b2d98e00e
+    return crypto.randomBytes(16).toString('hex');
+}
+exports.generateRandomId = generateRandomId;
+function merge(target, src) {
+    if (!target) {
+        target = src;
+        src = null;
+    }
+    if (!target) {
+        return null;
+    }
+    if (Array.isArray(target)) {
+        return target.concat(src || []);
+    }
+    if (typeof target === 'object') {
+        return Object.assign({}, target, src);
+    }
+    throw new Error('can not merge meta that type of ' + typeof target);
+}
+exports.merge = merge;
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/decorator",
-  "version": "3.0.0-alpha.6+6c8b724b",
+  "version": "3.0.0-beta.4",
   "description": "definition decorator for midway project",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -12,10 +12,7 @@
     "link": "npm link"
   },
   "dependencies": {
-    "@types/express": "^4.17.8",
-    "@types/koa": "^2.11.4",
     "camelcase": "^6.2.0",
-    "class-transformer": "^0.3.1",
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
@@ -30,7 +27,7 @@
     "dist/**/*.d.ts"
   ],
   "engines": {
-    "node": ">= 10.0.0"
+    "node": ">=12"
   },
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {
@@ -40,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6c8b724b08cf395287636b80387653f9540768e5"
+  "gitHead": "02e2144e302f807770b512b0d89da3145b1cbf2e"
 }

package/dist/annotation/autoload.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Autoload = void 0;
-const decoratorManager_1 = require("../common/decoratorManager");
-function Autoload() {
-    return function (target) {
-        decoratorManager_1.savePreloadModule(target);
-    };
-}
-exports.Autoload = Autoload;
-//# sourceMappingURL=autoload.js.map

package/dist/annotation/inject.d.ts

@@ -1,3 +0,0 @@
-import { ObjectIdentifier } from '../interface';
-export declare function Inject(identifier?: ObjectIdentifier): (target: any, targetKey: string, index?: number) => void;
-//# sourceMappingURL=inject.d.ts.map

package/dist/annotation/inject.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Inject = void 0;
-const __1 = require("../");
-function Inject(identifier) {
-    return function (target, targetKey, index) {
-        if (typeof index === 'number') {
-            __1.saveConstructorInject({ target, targetKey, identifier, index });
-        }
-        else {
-            __1.savePropertyInject({ target, targetKey, identifier });
-        }
-    };
-}
-exports.Inject = Inject;
-//# sourceMappingURL=inject.js.map

package/dist/annotation/objectDef.d.ts

@@ -1,7 +0,0 @@
-import { ScopeEnum } from '../';
-export declare function Async(): (target: any) => void;
-export declare function Init(): (target: any, propertyKey: string) => void;
-export declare function Destroy(): (target: any, propertyKey: string) => void;
-export declare function Scope(scope?: ScopeEnum): (target: any) => void;
-export declare function Autowire(isAutowire?: boolean): (target: any) => void;
-//# sourceMappingURL=objectDef.d.ts.map

package/dist/annotation/objectDef.js

@@ -1,43 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Autowire = exports.Scope = exports.Destroy = exports.Init = exports.Async = void 0;
-const __1 = require("../");
-const debug = require('util').debuglog('decorator:context:obj_def');
-function Async() {
-    return function (target) {
-        debug(`set [async] property in [${target.name}]`);
-        return __1.saveObjectDefProps(target, { isAsync: true });
-    };
-}
-exports.Async = Async;
-function Init() {
-    return function (target, propertyKey) {
-        debug(`set [init] property in [${target.constructor.name}]`);
-        return __1.saveObjectDefProps(target.constructor, { initMethod: propertyKey });
-    };
-}
-exports.Init = Init;
-function Destroy() {
-    return function (target, propertyKey) {
-        debug(`set [destroy] property in [${target.constructor.name}]`);
-        return __1.saveObjectDefProps(target.constructor, {
-            destroyMethod: propertyKey,
-        });
-    };
-}
-exports.Destroy = Destroy;
-function Scope(scope = __1.ScopeEnum.Singleton) {
-    return function (target) {
-        debug(`set [scope] property in [${target.name}]`);
-        return __1.saveObjectDefProps(target, { scope });
-    };
-}
-exports.Scope = Scope;
-function Autowire(isAutowire = true) {
-    return function (target) {
-        debug(`set [autowire] property in [${target.name}]`);
-        return __1.saveObjectDefProps(target, { isAutowire });
-    };
-}
-exports.Autowire = Autowire;
-//# sourceMappingURL=objectDef.js.map

package/dist/annotation/pipeline.d.ts

@@ -1,3 +0,0 @@
-import { ObjectIdentifier } from '../interface';
-export declare function Pipeline(valves?: ObjectIdentifier[]): (target: any, targetKey: string, index?: number) => void;
-//# sourceMappingURL=pipeline.d.ts.map

package/dist/annotation/pipeline.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Pipeline = void 0;
-const __1 = require("../");
-function Pipeline(valves) {
-    return function (target, targetKey, index) {
-        if (typeof index === 'number') {
-            __1.saveConstructorInject({
-                target,
-                targetKey,
-                identifier: __1.PIPELINE_IDENTIFIER,
-                index,
-                args: valves,
-            });
-        }
-        else {
-            __1.savePropertyInject({
-                target,
-                targetKey,
-                identifier: __1.PIPELINE_IDENTIFIER,
-                args: valves,
-            });
-        }
-    };
-}
-exports.Pipeline = Pipeline;
-//# sourceMappingURL=pipeline.js.map

package/dist/annotation/priority.d.ts

@@ -1,2 +0,0 @@
-export declare function Priority(priority: number): ClassDecorator;
-//# sourceMappingURL=priority.d.ts.map

package/dist/annotation/priority.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Priority = void 0;
-const __1 = require("../");
-function Priority(priority) {
-    return (target) => {
-        __1.saveClassMetadata(__1.PRIORITY_KEY, priority, target);
-    };
-}
-exports.Priority = Priority;
-//# sourceMappingURL=priority.js.map

package/dist/annotation/provide.d.ts

@@ -1,3 +0,0 @@
-import { ObjectIdentifier } from '../interface';
-export declare function Provide(identifier?: ObjectIdentifier): (target: any) => any;
-//# sourceMappingURL=provide.d.ts.map

package/dist/annotation/queue.d.ts

@@ -1,2 +0,0 @@
-export declare function Queue(options?: any): (target: any) => void;
-//# sourceMappingURL=queue.d.ts.map

package/dist/annotation/queue.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Queue = void 0;
-const __1 = require("../");
-const constant_1 = require("../constant");
-function Queue(options) {
-    return function (target) {
-        __1.saveModule(constant_1.MODULE_TASK_QUEUE_KEY, target);
-        __1.saveClassMetadata(constant_1.MODULE_TASK_QUEUE_OPTIONS, {
-            options,
-            name: target.name,
-        }, target);
-    };
-}
-exports.Queue = Queue;
-//# sourceMappingURL=queue.js.map

package/dist/annotation/rule.d.ts

@@ -1 +0,0 @@
-//# sourceMappingURL=rule.d.ts.map

package/dist/annotation/rule.js

@@ -1,50 +0,0 @@
-// import * as joi from 'joi';
-// import {
-//   attachClassMetadata,
-//   getClassMetadata,
-//   getPropertyType,
-//   saveClassMetadata,
-//   RULES_KEY,
-// } from '..';
-//
-// export interface RuleOptions {
-//   required?: boolean;
-// }
-//
-// export function Rule(rule, options: RuleOptions = { required: true }) {
-//   return function (...args) {
-//     if (args[1]) {
-//       // 函数装饰器
-//       const [target, propertyKey] = args;
-//       if (!joi.isSchema(rule)) {
-//         rule = getClassMetadata(RULES_KEY, rule);
-//         if (getPropertyType(target, propertyKey).name === 'Array') {
-//           rule = joi.array().items(rule);
-//         } else {
-//           rule = joi.object(rule);
-//         }
-//         if (options.required) {
-//           rule = rule.required();
-//         }
-//       }
-//
-//       attachClassMetadata(RULES_KEY, rule, target, propertyKey);
-//     } else {
-//       //类的装饰器
-//       const rules = getClassMetadata(RULES_KEY, rule);
-//       if (rules) {
-//         let currentRule = getClassMetadata(RULES_KEY, args[0]);
-//         currentRule = currentRule ?? {};
-//         Object.keys(rules).map(item => {
-//           if (!currentRule[item]) {
-//             currentRule[item] = rules[item];
-//           }
-//         });
-//         saveClassMetadata(RULES_KEY, currentRule, args[0]);
-//       }
-//     }
-//   };
-// }
-//
-// export { joi as RuleType };
-//# sourceMappingURL=rule.js.map

package/dist/annotation/schedule.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Schedule = void 0;
-const __1 = require("../");
-const objectDef_1 = require("./objectDef");
-function Schedule(scheduleOpts) {
-    return function (target) {
-        __1.saveModule(__1.SCHEDULE_KEY, target);
-        __1.saveClassMetadata(__1.SCHEDULE_KEY, scheduleOpts, target);
-        objectDef_1.Scope(__1.ScopeEnum.Request)(target);
-    };
-}
-exports.Schedule = Schedule;
-//# sourceMappingURL=schedule.js.map

package/dist/annotation/validate.d.ts

@@ -1 +0,0 @@
-//# sourceMappingURL=validate.d.ts.map

package/dist/annotation/validate.js

@@ -1,36 +0,0 @@
-// import { getClassMetadata, getMethodParamTypes, RULES_KEY } from '..';
-// import { plainToClass } from 'class-transformer';
-// import * as Joi from 'joi';
-//
-// export function Validate(isTransform = true) {
-//   return function (
-//     target,
-//     propertyKey: string | symbol,
-//     descriptor: PropertyDescriptor
-//   ) {
-//     const origin = descriptor.value;
-//     const paramTypes = getMethodParamTypes(target, propertyKey);
-//
-//     descriptor.value = function (...args: any[]) {
-//       for (let i = 0; i < paramTypes.length; i++) {
-//         const item = paramTypes[i];
-//         const rules = getClassMetadata(RULES_KEY, item);
-//         if (rules) {
-//           const schema = Joi.object(rules);
-//           const result = schema.validate(args[i]);
-//           if (result.error) {
-//             throw result.error;
-//           } else {
-//             args[i] = result.value;
-//           }
-//           // passed
-//           if (isTransform) {
-//             args[i] = plainToClass(item, args[i]);
-//           }
-//         }
-//       }
-//       return origin.call(this, ...args);
-//     };
-//   };
-// }
-//# sourceMappingURL=validate.js.map