@midwayjs/decorator 3.1.6 → 3.4.0-beta.10

package/dist/decorator/common/filter.d.ts

@@ -1,4 +1,6 @@
-export declare function Catch(catchTarget?: any | any[]): (target: any) => void;
+export declare function Catch(catchTarget?: any | any[], options?: {
+    matchPrototype?: boolean;
+}): (target: any) => void;
 export declare type MatchPattern<CtxOrReq = any, Res = any> = ((ctxOrReq: CtxOrReq, res: Res) => boolean) | string | string[] | boolean;
 export declare function Match(matchPattern?: MatchPattern): (target: any) => void;
 //# sourceMappingURL=filter.d.ts.map

package/dist/decorator/common/filter.js

@@ -6,11 +6,12 @@ const constant_1 = require("../../constant");
 const objectDef_1 = require("./objectDef");
 const interface_1 = require("../../interface");
 const provide_1 = require("./provide");
-function Catch(catchTarget) {
+function Catch(catchTarget, options = {}) {
     return function (target) {
         const catchTargets = catchTarget ? [].concat(catchTarget) : undefined;
         (0, decoratorManager_1.saveClassMetadata)(constant_1.CATCH_KEY, {
             catchTargets,
+            catchOptions: options,
         }, target);
         (0, objectDef_1.Scope)(interface_1.ScopeEnum.Singleton)(target);
         (0, provide_1.Provide)()(target);

package/dist/decorator/framework/index.d.ts

@@ -1,7 +1,7 @@
 import { FrameworkType } from '../../';
 export declare function Plugin(identifier?: string): PropertyDecorator;
 export declare function Config(identifier?: string): PropertyDecorator;
-export declare function App(type?: FrameworkType): PropertyDecorator;
+export declare function App(typeOrNamespace?: FrameworkType | string): PropertyDecorator;
 export declare function Logger(identifier?: string): PropertyDecorator;
 export declare function ApplicationContext(): PropertyDecorator;
 //# sourceMappingURL=index.d.ts.map

package/dist/decorator/framework/index.js

@@ -14,9 +14,9 @@ function Config(identifier) {
     });
 }
 exports.Config = Config;
-function App(type) {
+function App(typeOrNamespace) {
     return (0, __1.createCustomPropertyDecorator)(__1.APPLICATION_KEY, {
-        type,
+        type: typeOrNamespace,
     });
 }
 exports.App = App;

package/dist/decorator/index.d.ts

@@ -5,6 +5,7 @@ export * from './framework/schedule';
 export * from './microservice/consumer';
 export * from './microservice/provider';
 export * from './microservice/rabbitmqListener';
+export * from './microservice/kafkaListener';
 export * from './rpc/hsf';
 export * from './task/queue';
 export * from './task/task';

package/dist/decorator/index.js

@@ -25,6 +25,7 @@ __exportStar(require("./framework/schedule"), exports);
 __exportStar(require("./microservice/consumer"), exports);
 __exportStar(require("./microservice/provider"), exports);
 __exportStar(require("./microservice/rabbitmqListener"), exports);
+__exportStar(require("./microservice/kafkaListener"), exports);
 // rpc
 __exportStar(require("./rpc/hsf"), exports);
 // task

package/dist/decorator/microservice/consumer.d.ts

@@ -1,4 +1,5 @@
 import { MSListenerType } from '../../';
 export declare function Consumer(type: MSListenerType.MQTT): ClassDecorator;
 export declare function Consumer(type: MSListenerType.RABBITMQ, options?: any): ClassDecorator;
+export declare function Consumer(type: MSListenerType.KAFKA, options?: any): ClassDecorator;
 //# sourceMappingURL=consumer.d.ts.map

package/dist/decorator/microservice/kafkaListener.d.ts

@@ -0,0 +1,6 @@
+export interface KafkaListenerOptions {
+    propertyKey?: string;
+    topic?: string;
+}
+export declare function KafkaListener(topic: string, options?: KafkaListenerOptions): MethodDecorator;
+//# sourceMappingURL=kafkaListener.d.ts.map

package/dist/decorator/microservice/kafkaListener.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KafkaListener = void 0;
+const __1 = require("../..");
+function KafkaListener(topic, options = {}) {
+    return (target, propertyKey) => {
+        options.topic = topic;
+        options.propertyKey = propertyKey;
+        (0, __1.attachPropertyDataToClass)(__1.MS_CONSUMER_KEY, options, target, propertyKey);
+    };
+}
+exports.KafkaListener = KafkaListener;
+//# sourceMappingURL=kafkaListener.js.map

package/dist/decorator/ws/webSocketController.d.ts

@@ -2,10 +2,9 @@ import { MiddlewareParamArray } from '../../interface';
 export interface WSControllerOption {
     namespace: string;
     routerOptions: {
+        connectionMiddleware?: MiddlewareParamArray;
         middleware?: MiddlewareParamArray;
     };
 }
-export declare function WSController(namespace?: string | RegExp, routerOptions?: {
-    middleware?: MiddlewareParamArray;
-}): ClassDecorator;
+export declare function WSController(namespace?: string | RegExp, routerOptions?: WSControllerOption['routerOptions']): ClassDecorator;
 //# sourceMappingURL=webSocketController.d.ts.map

package/dist/decorator/ws/webSocketController.js

@@ -3,7 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WSController = void 0;
 const common_1 = require("../common");
 const __1 = require("../../");
-function WSController(namespace = '/', routerOptions = { middleware: [] }) {
+function WSController(namespace = '/', routerOptions = {
+    middleware: [],
+    connectionMiddleware: [],
+}) {
     return (target) => {
         (0, __1.saveModule)(__1.WS_CONTROLLER_KEY, target);
         (0, __1.saveClassMetadata)(__1.WS_CONTROLLER_KEY, {

package/dist/decorator/ws/webSocketEvent.d.ts

@@ -1,3 +1,4 @@
+import { MiddlewareParamArray } from '../../';
 export declare enum WSEventTypeEnum {
     ON_CONNECTION = "ws:onConnection",
     ON_DISCONNECTION = "ws:onDisconnection",
@@ -24,10 +25,20 @@ export interface WSEventInfo {
      * the room name to emit
      */
     roomName?: string[];
+    /**
+     * event options, like middleware
+     */
+    eventOptions?: {
+        middleware?: MiddlewareParamArray;
+    };
 }
-export declare function OnWSConnection(): MethodDecorator;
+export declare function OnWSConnection(eventOptions?: {
+    middleware?: MiddlewareParamArray;
+}): MethodDecorator;
 export declare function OnWSDisConnection(): MethodDecorator;
-export declare function OnWSMessage(eventName: string): MethodDecorator;
+export declare function OnWSMessage(eventName: string, eventOptions?: {
+    middleware?: MiddlewareParamArray;
+}): MethodDecorator;
 export declare function WSEmit(messageName: string, roomName?: string | string[]): MethodDecorator;
 export declare function WSBroadCast(messageName?: string, roomName?: string | string[]): MethodDecorator;
 /**

package/dist/decorator/ws/webSocketEvent.js

@@ -11,11 +11,12 @@ var WSEventTypeEnum;
     WSEventTypeEnum["EMIT"] = "ws:Emit";
     WSEventTypeEnum["BROADCAST"] = "ws:broadcast";
 })(WSEventTypeEnum = exports.WSEventTypeEnum || (exports.WSEventTypeEnum = {}));
-function OnWSConnection() {
+function OnWSConnection(eventOptions = {}) {
     return (target, propertyKey, descriptor) => {
         (0, __1.attachClassMetadata)(__1.WS_EVENT_KEY, {
             eventType: WSEventTypeEnum.ON_CONNECTION,
             propertyName: propertyKey,
+            eventOptions,
             descriptor,
         }, target.constructor);
     };
@@ -31,12 +32,13 @@ function OnWSDisConnection() {
     };
 }
 exports.OnWSDisConnection = OnWSDisConnection;
-function OnWSMessage(eventName) {
+function OnWSMessage(eventName, eventOptions = {}) {
     return (target, propertyKey, descriptor) => {
         (0, __1.attachClassMetadata)(__1.WS_EVENT_KEY, {
             eventType: WSEventTypeEnum.ON_MESSAGE,
             messageEventName: eventName,
             propertyName: propertyKey,
+            eventOptions,
             descriptor,
         }, target.constructor);
     };

package/dist/interface.d.ts

@@ -115,6 +115,10 @@ export declare namespace FaaSMetadata {
          * deploy or not
          */
         isDeploy?: boolean;
+        /**
+         * function handler name, like 'index.handler'
+         */
+        handlerName?: string;
     }
     interface TriggerCommonOptions {
         /**
@@ -187,7 +191,8 @@ export declare namespace FaaSMetadata {
     export interface TriggerMetadata {
         type: ServerlessTriggerType;
         functionName?: string;
-        methodName: string;
+        handlerName?: string;
+        methodName?: string;
         metadata: EventTriggerUnionOptions;
     }
     export {};
@@ -203,6 +208,7 @@ export declare class MidwayFrameworkType extends FrameworkType {
     static FAAS: MidwayFrameworkType;
     static MS_GRPC: MidwayFrameworkType;
     static MS_RABBITMQ: MidwayFrameworkType;
+    static MS_KAFKA: MidwayFrameworkType;
     static WS_IO: MidwayFrameworkType;
     static WS: MidwayFrameworkType;
     static SERVERLESS_APP: MidwayFrameworkType;
@@ -221,6 +227,7 @@ export declare enum ServerlessTriggerType {
     LOG = "log",
     TIMER = "timer",
     MQ = "mq",
+    KAFKA = "kafka",
     HSF = "hsf",
     MTOP = "mtop"
 }

package/dist/interface.js

@@ -43,6 +43,7 @@ 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.MS_KAFKA = new MidwayFrameworkType('@midwayjs/kafka');
 MidwayFrameworkType.WS_IO = new MidwayFrameworkType('@midwayjs/socketio');
 MidwayFrameworkType.WS = new MidwayFrameworkType('@midwayjs/ws');
 MidwayFrameworkType.SERVERLESS_APP = new MidwayFrameworkType('@midwayjs/serverless-app');
@@ -60,6 +61,7 @@ var ServerlessTriggerType;
     ServerlessTriggerType["LOG"] = "log";
     ServerlessTriggerType["TIMER"] = "timer";
     ServerlessTriggerType["MQ"] = "mq";
+    ServerlessTriggerType["KAFKA"] = "kafka";
     ServerlessTriggerType["HSF"] = "hsf";
     ServerlessTriggerType["MTOP"] = "mtop";
 })(ServerlessTriggerType = exports.ServerlessTriggerType || (exports.ServerlessTriggerType = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/decorator",
-  "version": "3.1.6",
+  "version": "3.4.0-beta.10",
   "description": "definition decorator for midway project",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -36,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8c157a2b1a23ca2360522dc0de58513098952391"
+  "gitHead": "560a5fa311605e4008c55f31c31bc4e12eeff2a5"
 }