@midwayjs/core 3.9.0 → 3.10.0

package/dist/decorator/index.js

@@ -14,7 +14,6 @@ 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("./interface"), exports);
 // common
 __exportStar(require("./common/provide"), exports);
 __exportStar(require("./common/inject"), exports);
@@ -27,6 +26,8 @@ __exportStar(require("./common/framework"), exports);
 __exportStar(require("./common/filter"), exports);
 __exportStar(require("./common/middleware"), exports);
 __exportStar(require("./common/guard"), exports);
+__exportStar(require("./common/pipe"), exports);
+__exportStar(require("./common/mock"), exports);
 // faas
 __exportStar(require("./faas/serverlessTrigger"), exports);
 // web

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

@@ -1,4 +1,4 @@
-import { MSListenerType } from '../';
+import { MSListenerType } from '../../interface';
 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;

package/dist/decorator/microservice/consumer.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Consumer = void 0;
 const __1 = require("../");
+const interface_1 = require("../../interface");
 function Consumer(type, options = {}) {
     return (target) => {
         (0, __1.saveModule)(__1.MS_CONSUMER_KEY, target);
@@ -9,7 +10,7 @@ function Consumer(type, options = {}) {
             type,
             metadata: options,
         }, target);
-        (0, __1.Scope)(__1.ScopeEnum.Request)(target);
+        (0, __1.Scope)(interface_1.ScopeEnum.Request)(target);
         (0, __1.Provide)()(target);
     };
 }

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

@@ -1,13 +1,13 @@
 /**
  * @deprecated Replaced by ConsumerSubscribeTopics
  */
-export declare type ConsumerSubscribeTopic = {
+export type ConsumerSubscribeTopic = {
     fromBeginning?: boolean;
 };
-export declare type ConsumerSubscribeTopics = {
+export type ConsumerSubscribeTopics = {
     fromBeginning?: boolean;
 };
-export declare type ConsumerRunConfig = {
+export type ConsumerRunConfig = {
     autoCommit?: boolean;
     autoCommitInterval?: number | null;
     autoCommitThreshold?: number | null;

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

@@ -1,4 +1,4 @@
-import { MSProviderType, GRPCMetadata } from '../';
+import { GRPCMetadata, MSProviderType } from '../../interface';
 export declare function Provider(type: MSProviderType.GRPC, metadata?: GRPCMetadata.ProviderOptions): ClassDecorator;
 export declare function Provider(type: MSProviderType.DUBBO, metadata?: any): ClassDecorator;
 export declare enum GrpcStreamTypeEnum {

package/dist/decorator/microservice/provider.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DubboMethod = exports.GrpcMethod = exports.GrpcStreamTypeEnum = exports.Provider = void 0;
 const __1 = require("../");
+const interface_1 = require("../../interface");
 function Provider(type, metadata = {}) {
     return (target) => {
         (0, __1.saveModule)(__1.MS_PROVIDER_KEY, target);
@@ -9,7 +10,7 @@ function Provider(type, metadata = {}) {
             type,
             metadata,
         }, target);
-        (0, __1.Scope)(__1.ScopeEnum.Request)(target);
+        (0, __1.Scope)(interface_1.ScopeEnum.Request)(target);
         (0, __1.Provide)()(target);
     };
 }

package/dist/decorator/rpc/hsf.d.ts

@@ -5,6 +5,7 @@ export interface HSFOpts {
     namespace?: string;
 }
 /**
+ * @Deprecated
  * @param hsfOption
  * @constructor
  */

package/dist/decorator/rpc/hsf.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HSF = void 0;
 const __1 = require("../");
+const interface_1 = require("../../interface");
 /**
+ * @Deprecated
  * @param hsfOption
  * @constructor
  */
@@ -10,7 +12,7 @@ function HSF(hsfOption = {}) {
     return (target) => {
         (0, __1.saveModule)(__1.HSF_KEY, target);
         (0, __1.saveClassMetadata)(__1.HSF_KEY, hsfOption, target);
-        (0, __1.Scope)(__1.ScopeEnum.Request)(target);
+        (0, __1.Scope)(interface_1.ScopeEnum.Request)(target);
         (0, __1.Provide)()(target);
     };
 }

package/dist/decorator/task/schedule.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Schedule = void 0;
 const __1 = require("../");
+const interface_1 = require("../../interface");
 function Schedule(scheduleOpts) {
     return function (target) {
         (0, __1.saveModule)(__1.SCHEDULE_KEY, target);
         (0, __1.saveClassMetadata)(__1.SCHEDULE_KEY, scheduleOpts, target);
-        (0, __1.Scope)(__1.ScopeEnum.Request)(target);
+        (0, __1.Scope)(interface_1.ScopeEnum.Request)(target);
         (0, __1.Provide)()(target);
     };
 }

package/dist/decorator/web/controller.d.ts

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

package/dist/decorator/web/controller.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Controller = void 0;
 const __1 = require("../");
+const interface_1 = require("../../interface");
 function Controller(prefix = '/', routerOptions = { middleware: [], sensitive: true }) {
     return (target) => {
         (0, __1.saveModule)(__1.CONTROLLER_KEY, target);
@@ -10,7 +11,7 @@ function Controller(prefix = '/', routerOptions = { middleware: [], sensitive: t
                 prefix,
                 routerOptions,
             }, target);
-        (0, __1.Scope)(__1.ScopeEnum.Request)(target);
+        (0, __1.Scope)(interface_1.ScopeEnum.Request)(target);
         (0, __1.Provide)()(target);
     };
 }

package/dist/decorator/web/requestMapping.d.ts

@@ -1,7 +1,4 @@
-/**
- * 'HEAD', 'OPTIONS', 'GET', 'PUT', 'PATCH', 'POST', 'DELETE' 封装
- */
-import { MiddlewareParamArray } from '../';
+import { MiddlewareParamArray } from '../../interface';
 export interface RouterOption {
     /**
      * router path, like "/api"

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

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

package/dist/decorator/ws/webSocketController.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WSController = void 0;
 const __1 = require("../");
+const interface_1 = require("../../interface");
 function WSController(namespace = '/', routerOptions = {
     middleware: [],
     connectionMiddleware: [],
@@ -12,7 +13,7 @@ function WSController(namespace = '/', routerOptions = {
             namespace,
             routerOptions,
         }, target);
-        (0, __1.Scope)(__1.ScopeEnum.Request)(target);
+        (0, __1.Scope)(interface_1.ScopeEnum.Request)(target);
         (0, __1.Provide)()(target);
     };
 }

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

@@ -1,4 +1,4 @@
-import { MiddlewareParamArray } from '../';
+import { MiddlewareParamArray } from '../../interface';
 export declare enum WSEventTypeEnum {
     ON_CONNECTION = "ws:onConnection",
     ON_DISCONNECTION = "ws:onDisconnection",

package/dist/definitions/functionDefinition.d.ts

@@ -1,5 +1,4 @@
-import { IProperties, IObjectCreator, IObjectDefinition } from '../interface';
-import { IManagedInstance, ObjectIdentifier, ScopeEnum } from '../decorator';
+import { IProperties, IObjectCreator, IObjectDefinition, IManagedInstance, ObjectIdentifier, ScopeEnum } from '../interface';
 export declare class FunctionDefinition implements IObjectDefinition {
     constructor();
     constructMethod: string;

package/dist/definitions/functionDefinition.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FunctionDefinition = void 0;
-const decorator_1 = require("../decorator");
+const interface_1 = require("../interface");
 const objectCreator_1 = require("./objectCreator");
 class FunctionWrapperCreator extends objectCreator_1.ObjectCreator {
     doConstruct(Clzz, args, context) {
@@ -26,7 +26,7 @@ class FunctionDefinition {
         this.allowDowngrade = false;
         // 函数工厂创建的对象默认不需要自动装配
         this.innerAutowire = false;
-        this.innerScope = decorator_1.ScopeEnum.Singleton;
+        this.innerScope = interface_1.ScopeEnum.Singleton;
         this.creator = new FunctionWrapperCreator(this);
     }
     getAttr(key) { }
@@ -52,10 +52,10 @@ class FunctionDefinition {
         this.innerScope = scope;
     }
     isSingletonScope() {
-        return this.innerScope === decorator_1.ScopeEnum.Singleton;
+        return this.innerScope === interface_1.ScopeEnum.Singleton;
     }
     isRequestScope() {
-        return this.innerScope === decorator_1.ScopeEnum.Request;
+        return this.innerScope === interface_1.ScopeEnum.Request;
     }
     setAttr(key, value) { }
 }

package/dist/definitions/objectDefinition.d.ts

@@ -1,6 +1,5 @@
-import { IObjectCreator, IObjectDefinition } from '../interface';
+import { IObjectCreator, IObjectDefinition, ObjectIdentifier, ScopeEnum } from '../interface';
 import { ObjectProperties } from './properties';
-import { ObjectIdentifier, ScopeEnum } from '../decorator';
 export declare class ObjectDefinition implements IObjectDefinition {
     protected _attrs: Map<ObjectIdentifier, any>;
     protected _asynchronous: boolean;

package/dist/definitions/objectDefinition.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObjectDefinition = void 0;
+const interface_1 = require("../interface");
 const properties_1 = require("./properties");
 const objectCreator_1 = require("./objectCreator");
-const decorator_1 = require("../decorator");
 /* tslint:disable:variable-name */
 class ObjectDefinition {
     constructor() {
         this._attrs = new Map();
         this._asynchronous = false;
-        this.scope = decorator_1.ScopeEnum.Singleton;
+        this.scope = interface_1.ScopeEnum.Singleton;
         this.creator = null;
         this.id = null;
         this.name = null;
@@ -33,10 +33,10 @@ class ObjectDefinition {
         return this._asynchronous;
     }
     isSingletonScope() {
-        return this.scope === decorator_1.ScopeEnum.Singleton;
+        return this.scope === interface_1.ScopeEnum.Singleton;
     }
     isRequestScope() {
-        return this.scope === decorator_1.ScopeEnum.Request;
+        return this.scope === interface_1.ScopeEnum.Request;
     }
     hasDependsOn() {
         return this.dependsOn.length > 0;

package/dist/definitions/properties.d.ts

@@ -1,5 +1,4 @@
-import { IProperties } from '../interface';
-import { ObjectIdentifier } from '../decorator';
+import { IProperties, ObjectIdentifier } from '../interface';
 export declare class ObjectProperties extends Map<ObjectIdentifier, any> implements IProperties {
     propertyKeys(): ObjectIdentifier[];
     getProperty(key: ObjectIdentifier, defaultValue?: any): any;

package/dist/error/base.d.ts

@@ -5,7 +5,7 @@ interface ErrorOption {
 interface Convertable {
     [key: string]: string | number;
 }
-declare type ConvertString<T extends Convertable, Group extends string> = {
+type ConvertString<T extends Convertable, Group extends string> = {
     [P in keyof T]: P extends string ? T[P] extends number ? `${Uppercase<Group>}_${T[P]}` : never : never;
 };
 /**
@@ -20,7 +20,7 @@ export declare class MidwayError extends Error {
     constructor(message: string, options?: ErrorOption);
     constructor(message: string, code: string, options?: ErrorOption);
 }
-export declare type ResOrMessage = string | {
+export type ResOrMessage = string | {
     message: string;
 } | undefined;
 export declare class MidwayHttpError extends MidwayError {

package/dist/error/framework.d.ts

@@ -1,5 +1,5 @@
 import { MidwayError } from './base';
-import { ObjectIdentifier } from '../decorator';
+import { ObjectIdentifier } from '../interface';
 export declare const FrameworkErrorEnum: {
     readonly UNKNOWN: "MIDWAY_10000";
     readonly COMMON: "MIDWAY_10001";

package/dist/error/framework.js

@@ -36,17 +36,17 @@ class MidwayParameterError extends base_1.MidwayError {
 }
 exports.MidwayParameterError = MidwayParameterError;
 class MidwayDefinitionNotFoundError extends base_1.MidwayError {
-    constructor(identifier) {
-        super(`${identifier} is not valid in current context`, exports.FrameworkErrorEnum.DEFINITION_NOT_FOUND);
-        this[MidwayDefinitionNotFoundError.type] =
-            MidwayDefinitionNotFoundError.type;
-    }
     static isClosePrototypeOf(ins) {
         return ins
             ? ins[MidwayDefinitionNotFoundError.type] ===
                 MidwayDefinitionNotFoundError.type
             : false;
     }
+    constructor(identifier) {
+        super(`${identifier} is not valid in current context`, exports.FrameworkErrorEnum.DEFINITION_NOT_FOUND);
+        this[MidwayDefinitionNotFoundError.type] =
+            MidwayDefinitionNotFoundError.type;
+    }
     updateErrorMsg(className) {
         const identifier = this.message.split(' is not valid in current context')[0];
         this.message = `${identifier} in class ${className} is not valid in current context`;