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

package/dist/{microservice → decorator/microservice}/provider.js

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HSFMethod = exports.DubboMethod = exports.GrpcMethod = exports.GrpcStreamTypeEnum = exports.Provider = void 0;
-const __1 = require("../");
-const annotation_1 = require("../annotation");
+const __1 = require("../../");
+const common_1 = require("../common");
 function Provider(type, metadata = {}) {
     return (target) => {
-        __1.saveModule(__1.MS_PROVIDER_KEY, target);
-        __1.saveClassMetadata(__1.MS_PROVIDER_KEY, {
+        (0, __1.saveModule)(__1.MS_PROVIDER_KEY, target);
+        (0, __1.saveClassMetadata)(__1.MS_PROVIDER_KEY, {
             type,
             metadata,
         }, target);
-        annotation_1.Scope(__1.ScopeEnum.Request)(target);
+        (0, common_1.Scope)(__1.ScopeEnum.Request)(target);
+        (0, __1.Provide)()(target);
     };
 }
 exports.Provider = Provider;
@@ -26,7 +27,7 @@ function GrpcMethod(methodOptions = {}) {
         if (!methodOptions.type) {
             methodOptions.type = GrpcStreamTypeEnum.BASE;
         }
-        __1.savePropertyMetadata(__1.MS_GRPC_METHOD_KEY, {
+        (0, __1.savePropertyMetadata)(__1.MS_GRPC_METHOD_KEY, {
             methodName: methodOptions.methodName || propertyName,
             type: methodOptions.type,
             onEnd: methodOptions.onEnd,
@@ -37,7 +38,7 @@ function GrpcMethod(methodOptions = {}) {
 exports.GrpcMethod = GrpcMethod;
 function DubboMethod(methodName) {
     return (target, propertyName, descriptor) => {
-        __1.attachClassMetadata(__1.MS_DUBBO_METHOD_KEY, {
+        (0, __1.attachClassMetadata)(__1.MS_DUBBO_METHOD_KEY, {
             methodName: methodName || propertyName,
         }, target);
         return descriptor;
@@ -46,7 +47,7 @@ function DubboMethod(methodName) {
 exports.DubboMethod = DubboMethod;
 function HSFMethod(methodName) {
     return (target, propertyName, descriptor) => {
-        __1.attachClassMetadata(__1.MS_HSF_METHOD_KEY, {
+        (0, __1.attachClassMetadata)(__1.MS_HSF_METHOD_KEY, {
             methodName: methodName || propertyName,
         }, target);
         return descriptor;

package/dist/{microservice → decorator/microservice}/rabbitmqListener.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RabbitMQListener = void 0;
-const __1 = require("../");
+const __1 = require("../../");
 function RabbitMQListener(queueName, options = {}) {
     return (target, propertyKey) => {
         options.queueName = queueName;
         options.propertyKey = propertyKey;
-        __1.attachPropertyDataToClass(__1.MS_CONSUMER_KEY, options, target, propertyKey);
+        (0, __1.attachPropertyDataToClass)(__1.MS_CONSUMER_KEY, options, target, propertyKey);
     };
 }
 exports.RabbitMQListener = RabbitMQListener;

package/dist/decorator/rpc/hsf.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HSF = void 0;
+const __1 = require("../../");
+const __2 = require("../");
+/**
+ * @param hsfOption
+ * @constructor
+ */
+function HSF(hsfOption = {}) {
+    return (target) => {
+        (0, __1.saveModule)(__1.HSF_KEY, target);
+        (0, __1.saveClassMetadata)(__1.HSF_KEY, hsfOption, target);
+        (0, __2.Scope)(__1.ScopeEnum.Request)(target);
+        (0, __1.Provide)()(target);
+    };
+}
+exports.HSF = HSF;
+//# sourceMappingURL=hsf.js.map

package/dist/decorator/task/queue.d.ts

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

package/dist/decorator/task/queue.js

@@ -0,0 +1,17 @@
+"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) {
+        (0, __1.saveModule)(constant_1.MODULE_TASK_QUEUE_KEY, target);
+        (0, __1.saveClassMetadata)(constant_1.MODULE_TASK_QUEUE_OPTIONS, {
+            options,
+            name: target.name,
+        }, target);
+        (0, __1.Provide)()(target);
+    };
+}
+exports.Queue = Queue;
+//# sourceMappingURL=queue.js.map

package/dist/{annotation → decorator/task}/task.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Task = void 0;
-const __1 = require("../");
-const constant_1 = require("../constant");
+const __1 = require("../../");
+const constant_1 = require("../../constant");
 function Task(options) {
     return function (target, propertyKey, descriptor) {
-        __1.saveModule(constant_1.MODULE_TASK_KEY, target.constructor);
-        __1.attachClassMetadata(constant_1.MODULE_TASK_METADATA, {
+        (0, __1.saveModule)(constant_1.MODULE_TASK_KEY, target.constructor);
+        (0, __1.attachClassMetadata)(constant_1.MODULE_TASK_METADATA, {
             options,
             propertyKey,
             value: descriptor.value,

package/dist/{annotation → decorator/task}/taskLocal.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TaskLocal = void 0;
-const __1 = require("../");
-const constant_1 = require("../constant");
+const __1 = require("../../");
+const constant_1 = require("../../constant");
 function TaskLocal(options) {
     return function (target, propertyKey, descriptor) {
-        __1.saveModule(constant_1.MODULE_TASK_TASK_LOCAL_KEY, target.constructor);
-        __1.attachClassMetadata(constant_1.MODULE_TASK_TASK_LOCAL_OPTIONS, {
+        (0, __1.saveModule)(constant_1.MODULE_TASK_TASK_LOCAL_KEY, target.constructor);
+        (0, __1.attachClassMetadata)(constant_1.MODULE_TASK_TASK_LOCAL_OPTIONS, {
             options,
             propertyKey,
             value: descriptor.value,

package/dist/{web → decorator/web}/controller.d.ts

@@ -1,4 +1,4 @@
-import { MiddlewareParamArray } from '../interface';
+import { MiddlewareParamArray } from '../../interface';
 export interface ControllerOption {
     prefix: string;
     routerOptions: {
@@ -7,6 +7,7 @@ export interface ControllerOption {
         alias?: string[];
         description?: string;
         tagName?: string;
+        ignoreGlobalPrefix?: boolean;
     };
 }
 export declare function Controller(prefix?: string, routerOptions?: {
@@ -14,5 +15,6 @@ export declare function Controller(prefix?: string, routerOptions?: {
     middleware?: MiddlewareParamArray;
     description?: string;
     tagName?: string;
+    ignoreGlobalPrefix?: boolean;
 }): ClassDecorator;
 //# sourceMappingURL=controller.d.ts.map

package/dist/{web → decorator/web}/controller.js

@@ -1,17 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Controller = void 0;
-const annotation_1 = require("../annotation");
-const __1 = require("../");
+const common_1 = require("../common");
+const __1 = require("../../");
 function Controller(prefix = '/', routerOptions = { middleware: [], sensitive: true }) {
     return (target) => {
-        __1.saveModule(__1.CONTROLLER_KEY, target);
+        (0, __1.saveModule)(__1.CONTROLLER_KEY, target);
         if (prefix)
-            __1.saveClassMetadata(__1.CONTROLLER_KEY, {
+            (0, __1.saveClassMetadata)(__1.CONTROLLER_KEY, {
                 prefix,
                 routerOptions,
             }, target);
-        annotation_1.Scope(__1.ScopeEnum.Request)(target);
+        (0, common_1.Scope)(__1.ScopeEnum.Request)(target);
+        (0, __1.Provide)()(target);
     };
 }
 exports.Controller = Controller;

package/dist/{web → decorator/web}/paramMapping.d.ts

@@ -33,14 +33,14 @@ export interface RouterParamValue {
     type: RouteParamTypes;
     propertyData?: any;
 }
-export declare const Session: (property?: string) => (target: any, propertyName: any, index: any) => void;
-export declare const Body: (property?: string) => (target: any, propertyName: any, index: any) => void;
-export declare const Query: (property?: string) => (target: any, propertyName: any, index: any) => void;
-export declare const Param: (property?: string) => (target: any, propertyName: any, index: any) => void;
-export declare const Headers: (property?: string) => (target: any, propertyName: any, index: any) => void;
-export declare const File: (property?: GetFileStreamOptions) => (target: any, propertyName: any, index: any) => void;
-export declare const Files: (property?: GetFilesStreamOptions) => (target: any, propertyName: any, index: any) => void;
-export declare const RequestPath: () => (target: any, propertyName: any, index: any) => void;
-export declare const RequestIP: () => (target: any, propertyName: any, index: any) => void;
-export declare const Queries: (property?: string) => (target: any, propertyName: any, index: any) => void;
+export declare const Session: (property?: string) => ParameterDecorator;
+export declare const Body: (property?: string) => ParameterDecorator;
+export declare const Query: (property?: string) => ParameterDecorator;
+export declare const Param: (property?: string) => ParameterDecorator;
+export declare const Headers: (property?: string) => ParameterDecorator;
+export declare const File: (property?: GetFileStreamOptions) => ParameterDecorator;
+export declare const Files: (property?: GetFilesStreamOptions) => ParameterDecorator;
+export declare const RequestPath: () => ParameterDecorator;
+export declare const RequestIP: () => ParameterDecorator;
+export declare const Queries: (property?: string) => ParameterDecorator;
 //# sourceMappingURL=paramMapping.d.ts.map

package/dist/{web → decorator/web}/paramMapping.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Queries = exports.RequestIP = exports.RequestPath = exports.Files = exports.File = exports.Headers = exports.Param = exports.Query = exports.Body = exports.Session = exports.RouteParamTypes = void 0;
-const __1 = require("../");
+const __1 = require("../../");
 var RouteParamTypes;
 (function (RouteParamTypes) {
     RouteParamTypes[RouteParamTypes["QUERY"] = 0] = "QUERY";
@@ -17,15 +17,11 @@ var RouteParamTypes;
     RouteParamTypes[RouteParamTypes["QUERIES"] = 10] = "QUERIES";
 })(RouteParamTypes = exports.RouteParamTypes || (exports.RouteParamTypes = {}));
 const createParamMapping = function (type) {
-    return (propertyData) => (target, propertyName, index) => {
-        if (propertyData === undefined) {
-            propertyData = __1.getParamNames(target[propertyName])[index];
-        }
-        __1.attachPropertyDataToClass(__1.WEB_ROUTER_PARAM_KEY, {
-            index,
+    return (propertyData) => {
+        return (0, __1.createCustomParamDecorator)(__1.WEB_ROUTER_PARAM_KEY, {
             type,
             propertyData,
-        }, target, propertyName);
+        });
     };
 };
 const Session = (property) => createParamMapping(RouteParamTypes.SESSION)(property);

package/dist/{web → decorator/web}/requestMapping.d.ts

@@ -1,12 +1,37 @@
-import { MiddlewareParamArray } from '../interface';
+import { MiddlewareParamArray } from '../../interface';
 export interface RouterOption {
+    /**
+     * router path, like "/api"
+     */
     path?: string | RegExp;
+    /**
+     * http method, like "get", "post"
+     */
     requestMethod: string;
+    /**
+     * router alias name
+     */
     routerName?: string;
+    /**
+     * which method decorator attached
+     */
     method?: string;
+    /**
+     * middleware array in router
+     */
     middleware?: MiddlewareParamArray;
+    /**
+     * router summary, for swagger
+     */
     summary?: string;
+    /**
+     * router description, for swagger
+     */
     description?: string;
+    /**
+     * ignore global prefix
+     */
+    ignoreGlobalPrefix?: boolean;
 }
 export declare const RequestMethod: {
     GET: string;
@@ -27,6 +52,7 @@ export declare const Post: (path?: string | RegExp, routerOptions?: {
     middleware?: MiddlewareParamArray;
     summary?: string;
     description?: string;
+    ignoreGlobalPrefix?: boolean;
 }) => MethodDecorator;
 /**
  * Routes HTTP GET requests to the specified path.
@@ -36,6 +62,7 @@ export declare const Get: (path?: string | RegExp, routerOptions?: {
     middleware?: MiddlewareParamArray;
     summary?: string;
     description?: string;
+    ignoreGlobalPrefix?: boolean;
 }) => MethodDecorator;
 /**
  * Routes HTTP DELETE requests to the specified path.
@@ -45,6 +72,7 @@ export declare const Del: (path?: string | RegExp, routerOptions?: {
     middleware?: MiddlewareParamArray;
     summary?: string;
     description?: string;
+    ignoreGlobalPrefix?: boolean;
 }) => MethodDecorator;
 /**
  * Routes HTTP PUT requests to the specified path.
@@ -54,6 +82,7 @@ export declare const Put: (path?: string | RegExp, routerOptions?: {
     middleware?: MiddlewareParamArray;
     summary?: string;
     description?: string;
+    ignoreGlobalPrefix?: boolean;
 }) => MethodDecorator;
 /**
  * Routes HTTP PATCH requests to the specified path.
@@ -63,6 +92,7 @@ export declare const Patch: (path?: string | RegExp, routerOptions?: {
     middleware?: MiddlewareParamArray;
     summary?: string;
     description?: string;
+    ignoreGlobalPrefix?: boolean;
 }) => MethodDecorator;
 /**
  * Routes HTTP OPTIONS requests to the specified path.
@@ -72,6 +102,7 @@ export declare const Options: (path?: string | RegExp, routerOptions?: {
     middleware?: MiddlewareParamArray;
     summary?: string;
     description?: string;
+    ignoreGlobalPrefix?: boolean;
 }) => MethodDecorator;
 /**
  * Routes HTTP HEAD requests to the specified path.
@@ -81,6 +112,7 @@ export declare const Head: (path?: string | RegExp, routerOptions?: {
     middleware?: MiddlewareParamArray;
     summary?: string;
     description?: string;
+    ignoreGlobalPrefix?: boolean;
 }) => MethodDecorator;
 /**
  * Routes all HTTP requests to the specified path.
@@ -90,5 +122,6 @@ export declare const All: (path?: string | RegExp, routerOptions?: {
     middleware?: MiddlewareParamArray;
     summary?: string;
     description?: string;
+    ignoreGlobalPrefix?: boolean;
 }) => MethodDecorator;
 //# sourceMappingURL=requestMapping.d.ts.map

package/dist/{web → decorator/web}/requestMapping.js

@@ -4,7 +4,7 @@ exports.All = exports.Head = exports.Options = exports.Patch = exports.Put = exp
 /**
  * 'HEAD', 'OPTIONS', 'GET', 'PUT', 'PATCH', 'POST', 'DELETE' 封装
  */
-const __1 = require("../");
+const __1 = require("../../");
 exports.RequestMethod = {
     GET: 'get',
     POST: 'post',
@@ -27,7 +27,8 @@ const RequestMapping = (metadata = defaultMetadata) => {
     const routerName = metadata.routerName;
     const middleware = metadata.middleware;
     return (target, key, descriptor) => {
-        __1.attachClassMetadata(__1.WEB_ROUTER_KEY, {
+        var _a;
+        (0, __1.attachClassMetadata)(__1.WEB_ROUTER_KEY, {
             path,
             requestMethod,
             routerName,
@@ -35,13 +36,14 @@ const RequestMapping = (metadata = defaultMetadata) => {
             middleware,
             summary: (metadata === null || metadata === void 0 ? void 0 : metadata.summary) || '',
             description: (metadata === null || metadata === void 0 ? void 0 : metadata.description) || '',
+            ignoreGlobalPrefix: (_a = metadata === null || metadata === void 0 ? void 0 : metadata.ignoreGlobalPrefix) !== null && _a !== void 0 ? _a : false,
         }, target);
         return descriptor;
     };
 };
 exports.RequestMapping = RequestMapping;
 const createMappingDecorator = (method) => (path, routerOptions = { middleware: [] }) => {
-    return exports.RequestMapping(Object.assign(routerOptions, {
+    return (0, exports.RequestMapping)(Object.assign(routerOptions, {
         requestMethod: method,
         path,
     }));

package/dist/{web → decorator/web}/response.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRender = exports.ContentType = exports.SetHeader = exports.HttpCode = exports.Redirect = void 0;
-const __1 = require("..");
+const __1 = require("../../");
 function Redirect(url, code = 302) {
     return (target, key, descriptor) => {
-        __1.attachPropertyMetadata(__1.WEB_RESPONSE_KEY, {
+        (0, __1.attachPropertyMetadata)(__1.WEB_RESPONSE_KEY, {
             type: __1.WEB_RESPONSE_REDIRECT,
             url,
             code,
@@ -15,7 +15,7 @@ function Redirect(url, code = 302) {
 exports.Redirect = Redirect;
 function HttpCode(code) {
     return (target, key, descriptor) => {
-        __1.attachPropertyMetadata(__1.WEB_RESPONSE_KEY, {
+        (0, __1.attachPropertyMetadata)(__1.WEB_RESPONSE_KEY, {
             type: __1.WEB_RESPONSE_HTTP_CODE,
             code,
         }, target, key);
@@ -32,7 +32,7 @@ function SetHeader(headerKey, value) {
         else {
             headerObject = headerKey;
         }
-        __1.attachPropertyMetadata(__1.WEB_RESPONSE_KEY, {
+        (0, __1.attachPropertyMetadata)(__1.WEB_RESPONSE_KEY, {
             type: __1.WEB_RESPONSE_HEADER,
             setHeaders: headerObject,
         }, target, key);
@@ -42,7 +42,7 @@ function SetHeader(headerKey, value) {
 exports.SetHeader = SetHeader;
 function ContentType(contentType) {
     return (target, key, descriptor) => {
-        __1.attachPropertyMetadata(__1.WEB_RESPONSE_KEY, {
+        (0, __1.attachPropertyMetadata)(__1.WEB_RESPONSE_KEY, {
             type: __1.WEB_RESPONSE_CONTENT_TYPE,
             contentType,
         }, target, key);
@@ -53,7 +53,7 @@ exports.ContentType = ContentType;
 function createRender(RenderEngine) {
     return (templateName) => {
         return (target, key, descriptor) => {
-            __1.attachPropertyMetadata(__1.WEB_RESPONSE_KEY, {
+            (0, __1.attachPropertyMetadata)(__1.WEB_RESPONSE_KEY, {
                 type: __1.WEB_RESPONSE_RENDER,
                 templateName,
             }, target, key);

package/dist/{ws → decorator/ws}/webSocketController.d.ts

@@ -1,4 +1,4 @@
-import { MiddlewareParamArray } from '../interface';
+import { MiddlewareParamArray } from '../../interface';
 export interface WSControllerOption {
     namespace: string;
     routerOptions: {

package/dist/decorator/ws/webSocketController.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.WSController = void 0;
+const common_1 = require("../common");
+const __1 = require("../../");
+function WSController(namespace = '/', routerOptions = { middleware: [] }) {
+    return (target) => {
+        (0, __1.saveModule)(__1.WS_CONTROLLER_KEY, target);
+        (0, __1.saveClassMetadata)(__1.WS_CONTROLLER_KEY, {
+            namespace,
+            routerOptions,
+        }, target);
+        (0, common_1.Scope)(__1.ScopeEnum.Request)(target);
+        (0, __1.Provide)()(target);
+    };
+}
+exports.WSController = WSController;
+//# sourceMappingURL=webSocketController.js.map

package/dist/{ws → decorator/ws}/webSocketEvent.d.ts

@@ -31,7 +31,7 @@ export declare function OnWSMessage(eventName: string): MethodDecorator;
 export declare function WSEmit(messageName: string, roomName?: string | string[]): MethodDecorator;
 export declare function WSBroadCast(messageName?: string, roomName?: string | string[]): MethodDecorator;
 /**
- * @deprecated please use @OnWSDisConnection
+ * @deprecated please use @OnWSMessage
  */
 export declare const OnMessage: typeof OnWSMessage;
 /**

package/dist/{ws → decorator/ws}/webSocketEvent.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OnConnection = exports.OnDisConnection = exports.Emit = exports.OnMessage = exports.WSBroadCast = exports.WSEmit = exports.OnWSMessage = exports.OnWSDisConnection = exports.OnWSConnection = exports.WSEventTypeEnum = void 0;
-const __1 = require("../");
+const __1 = require("../../");
 var WSEventTypeEnum;
 (function (WSEventTypeEnum) {
     WSEventTypeEnum["ON_CONNECTION"] = "ws:onConnection";
@@ -13,7 +13,7 @@ var WSEventTypeEnum;
 })(WSEventTypeEnum = exports.WSEventTypeEnum || (exports.WSEventTypeEnum = {}));
 function OnWSConnection() {
     return (target, propertyKey, descriptor) => {
-        __1.attachClassMetadata(__1.WS_EVENT_KEY, {
+        (0, __1.attachClassMetadata)(__1.WS_EVENT_KEY, {
             eventType: WSEventTypeEnum.ON_CONNECTION,
             propertyName: propertyKey,
             descriptor,
@@ -23,7 +23,7 @@ function OnWSConnection() {
 exports.OnWSConnection = OnWSConnection;
 function OnWSDisConnection() {
     return (target, propertyKey, descriptor) => {
-        __1.attachClassMetadata(__1.WS_EVENT_KEY, {
+        (0, __1.attachClassMetadata)(__1.WS_EVENT_KEY, {
             eventType: WSEventTypeEnum.ON_DISCONNECTION,
             propertyName: propertyKey,
             descriptor,
@@ -33,7 +33,7 @@ function OnWSDisConnection() {
 exports.OnWSDisConnection = OnWSDisConnection;
 function OnWSMessage(eventName) {
     return (target, propertyKey, descriptor) => {
-        __1.attachClassMetadata(__1.WS_EVENT_KEY, {
+        (0, __1.attachClassMetadata)(__1.WS_EVENT_KEY, {
             eventType: WSEventTypeEnum.ON_MESSAGE,
             messageEventName: eventName,
             propertyName: propertyKey,
@@ -44,7 +44,7 @@ function OnWSMessage(eventName) {
 exports.OnWSMessage = OnWSMessage;
 function WSEmit(messageName, roomName = []) {
     return (target, propertyKey, descriptor) => {
-        __1.attachClassMetadata(__1.WS_EVENT_KEY, {
+        (0, __1.attachClassMetadata)(__1.WS_EVENT_KEY, {
             eventType: WSEventTypeEnum.EMIT,
             propertyName: propertyKey,
             messageEventName: messageName,
@@ -56,7 +56,7 @@ function WSEmit(messageName, roomName = []) {
 exports.WSEmit = WSEmit;
 function WSBroadCast(messageName = '', roomName = []) {
     return (target, propertyKey, descriptor) => {
-        __1.attachClassMetadata(__1.WS_EVENT_KEY, {
+        (0, __1.attachClassMetadata)(__1.WS_EVENT_KEY, {
             eventType: WSEventTypeEnum.BROADCAST,
             propertyName: propertyKey,
             messageEventName: messageName,
@@ -67,7 +67,7 @@ function WSBroadCast(messageName = '', roomName = []) {
 }
 exports.WSBroadCast = WSBroadCast;
 /**
- * @deprecated please use @OnWSDisConnection
+ * @deprecated please use @OnWSMessage
  */
 exports.OnMessage = OnWSMessage;
 /**