@midwayjs/core 3.9.0 → 3.10.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (90) hide show
  1. package/dist/baseFramework.d.ts +3 -0
  2. package/dist/baseFramework.js +17 -0
  3. package/dist/common/applicationManager.d.ts +1 -2
  4. package/dist/common/applicationManager.js +2 -1
  5. package/dist/common/webGenerator.js +2 -1
  6. package/dist/config/config.default.js +2 -1
  7. package/dist/context/container.d.ts +1 -2
  8. package/dist/context/container.js +3 -3
  9. package/dist/context/definitionRegistry.d.ts +1 -5
  10. package/dist/context/managedResolverFactory.d.ts +1 -2
  11. package/dist/context/managedResolverFactory.js +2 -3
  12. package/dist/context/providerWrapper.d.ts +1 -2
  13. package/dist/decorator/common/aspect.d.ts +0 -18
  14. package/dist/decorator/common/aspect.js +2 -1
  15. package/dist/decorator/common/filter.d.ts +1 -1
  16. package/dist/decorator/common/filter.js +1 -1
  17. package/dist/decorator/common/framework.d.ts +1 -1
  18. package/dist/decorator/common/framework.js +2 -1
  19. package/dist/decorator/common/guard.js +1 -1
  20. package/dist/decorator/common/inject.d.ts +1 -2
  21. package/dist/decorator/common/middleware.js +2 -1
  22. package/dist/decorator/common/mock.d.ts +2 -0
  23. package/dist/decorator/common/mock.js +14 -0
  24. package/dist/decorator/common/objectDef.d.ts +2 -1
  25. package/dist/decorator/common/objectDef.js +10 -1
  26. package/dist/decorator/common/pipe.d.ts +2 -0
  27. package/dist/decorator/common/pipe.js +13 -0
  28. package/dist/decorator/common/pipeline.d.ts +1 -1
  29. package/dist/decorator/common/provide.d.ts +1 -1
  30. package/dist/decorator/constant.d.ts +1 -0
  31. package/dist/decorator/constant.js +3 -2
  32. package/dist/decorator/decoratorManager.d.ts +6 -10
  33. package/dist/decorator/decoratorManager.js +20 -8
  34. package/dist/decorator/faas/serverlessTrigger.d.ts +3 -1
  35. package/dist/decorator/faas/serverlessTrigger.js +3 -2
  36. package/dist/decorator/index.d.ts +2 -1
  37. package/dist/decorator/index.js +2 -1
  38. package/dist/decorator/microservice/consumer.d.ts +1 -1
  39. package/dist/decorator/microservice/consumer.js +2 -1
  40. package/dist/decorator/microservice/kafkaListener.d.ts +3 -3
  41. package/dist/decorator/microservice/provider.d.ts +1 -1
  42. package/dist/decorator/microservice/provider.js +2 -1
  43. package/dist/decorator/rpc/hsf.d.ts +1 -0
  44. package/dist/decorator/rpc/hsf.js +3 -1
  45. package/dist/decorator/task/schedule.js +2 -1
  46. package/dist/decorator/web/controller.d.ts +1 -1
  47. package/dist/decorator/web/controller.js +2 -1
  48. package/dist/decorator/web/requestMapping.d.ts +1 -4
  49. package/dist/decorator/ws/webSocketController.d.ts +1 -1
  50. package/dist/decorator/ws/webSocketController.js +2 -1
  51. package/dist/decorator/ws/webSocketEvent.d.ts +1 -1
  52. package/dist/definitions/functionDefinition.d.ts +1 -2
  53. package/dist/definitions/functionDefinition.js +4 -4
  54. package/dist/definitions/objectDefinition.d.ts +1 -2
  55. package/dist/definitions/objectDefinition.js +4 -4
  56. package/dist/definitions/properties.d.ts +1 -2
  57. package/dist/error/base.d.ts +2 -2
  58. package/dist/error/framework.d.ts +1 -1
  59. package/dist/error/framework.js +5 -5
  60. package/dist/interface.d.ts +327 -24
  61. package/dist/interface.js +64 -1
  62. package/dist/service/aspectService.d.ts +1 -2
  63. package/dist/service/aspectService.js +2 -1
  64. package/dist/service/configService.js +2 -1
  65. package/dist/service/decoratorService.d.ts +3 -1
  66. package/dist/service/decoratorService.js +63 -11
  67. package/dist/service/environmentService.js +2 -1
  68. package/dist/service/frameworkService.d.ts +1 -2
  69. package/dist/service/frameworkService.js +6 -1
  70. package/dist/service/informationService.js +2 -1
  71. package/dist/service/lifeCycleService.d.ts +2 -0
  72. package/dist/service/lifeCycleService.js +14 -4
  73. package/dist/service/loggerService.d.ts +2 -1
  74. package/dist/service/loggerService.js +22 -5
  75. package/dist/service/middlewareService.js +2 -1
  76. package/dist/service/mockService.d.ts +9 -1
  77. package/dist/service/mockService.js +43 -1
  78. package/dist/service/pipelineService.d.ts +2 -3
  79. package/dist/service/slsFunctionService.d.ts +1 -1
  80. package/dist/service/slsFunctionService.js +3 -2
  81. package/dist/service/webRouterService.d.ts +1 -1
  82. package/dist/service/webRouterService.js +3 -2
  83. package/dist/setup.js +2 -0
  84. package/dist/util/httpclient.d.ts +2 -2
  85. package/dist/util/pathToRegexp.d.ts +5 -5
  86. package/dist/util/webRouterParam.d.ts +2 -4
  87. package/dist/util/webRouterParam.js +5 -27
  88. package/package.json +4 -5
  89. package/dist/decorator/interface.d.ts +0 -242
  90. package/dist/decorator/interface.js +0 -66
@@ -1,27 +1,13 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.extractExpressLikeValue = exports.extractKoaLikeValue = exports.callPipes = void 0;
3
+ exports.extractExpressLikeValue = exports.extractKoaLikeValue = void 0;
4
4
  const decorator_1 = require("../decorator");
5
5
  const index_1 = require("./index");
6
- async function callPipes(pipes, value) {
7
- if (pipes && pipes.length) {
8
- for (const pipe of pipes) {
9
- if ('transform' in pipe) {
10
- value = await pipe.transform(value);
11
- }
12
- else {
13
- value = await pipe(value);
14
- }
15
- }
16
- }
17
- return value;
18
- }
19
- exports.callPipes = callPipes;
20
- const extractKoaLikeValue = (key, data, paramType, pipes) => {
6
+ const extractKoaLikeValue = (key, data, paramType) => {
21
7
  if (decorator_1.ALL === data) {
22
8
  data = undefined;
23
9
  }
24
- const value = async function (ctx, next) {
10
+ return function (ctx, next) {
25
11
  switch (key) {
26
12
  case decorator_1.RouteParamTypes.NEXT:
27
13
  return next;
@@ -74,17 +60,13 @@ const extractKoaLikeValue = (key, data, paramType, pipes) => {
74
60
  return null;
75
61
  }
76
62
  };
77
- return async function (ctx, next) {
78
- const result = await value(ctx, next);
79
- return await callPipes(pipes || [], result);
80
- };
81
63
  };
82
64
  exports.extractKoaLikeValue = extractKoaLikeValue;
83
- const extractExpressLikeValue = (key, data, paramType, pipes) => {
65
+ const extractExpressLikeValue = (key, data, paramType) => {
84
66
  if (decorator_1.ALL === data) {
85
67
  data = undefined;
86
68
  }
87
- const value = (req, res, next) => {
69
+ return function (req, res, next) {
88
70
  switch (key) {
89
71
  case decorator_1.RouteParamTypes.NEXT:
90
72
  return next;
@@ -121,10 +103,6 @@ const extractExpressLikeValue = (key, data, paramType, pipes) => {
121
103
  return null;
122
104
  }
123
105
  };
124
- return async function (req, res, next) {
125
- const result = await value(req, res, next);
126
- return await callPipes(pipes || [], result);
127
- };
128
106
  };
129
107
  exports.extractExpressLikeValue = extractExpressLikeValue;
130
108
  //# sourceMappingURL=webRouterParam.js.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@midwayjs/core",
3
- "version": "3.9.0",
3
+ "version": "3.10.0",
4
4
  "description": "midway core",
5
5
  "main": "dist/index",
6
6
  "typings": "dist/index.d.ts",
@@ -22,11 +22,10 @@
22
22
  ],
23
23
  "license": "MIT",
24
24
  "devDependencies": {
25
- "koa": "2.13.4",
25
+ "koa": "2.14.1",
26
26
  "mm": "3.2.1",
27
- "pg": "8.8.0",
28
27
  "raw-body": "2.5.1",
29
- "sinon": "14.0.2"
28
+ "sinon": "15.0.1"
30
29
  },
31
30
  "dependencies": {
32
31
  "@midwayjs/glob": "^1.0.2",
@@ -43,5 +42,5 @@
43
42
  "engines": {
44
43
  "node": ">=12"
45
44
  },
46
- "gitHead": "5f6603d2c9606fc6fc7ece71f956e89e394efeee"
45
+ "gitHead": "33d28f1a020963404488e866432916fd15c0952c"
47
46
  }
@@ -1,242 +0,0 @@
1
- export declare type MiddlewareParamArray = Array<string | any>;
2
- export declare type ObjectIdentifier = string | Symbol;
3
- export declare type GroupModeType = 'one' | 'multi';
4
- export declare enum ScopeEnum {
5
- Singleton = "Singleton",
6
- Request = "Request",
7
- Prototype = "Prototype"
8
- }
9
- export declare enum InjectModeEnum {
10
- Identifier = "Identifier",
11
- Class = "Class",
12
- PropertyName = "PropertyName"
13
- }
14
- /**
15
- * 内部管理的属性、json、ref等解析实例存储
16
- */
17
- export interface IManagedInstance {
18
- type: string;
19
- value?: any;
20
- args?: any;
21
- }
22
- export interface ObjectDefinitionOptions {
23
- isAsync?: boolean;
24
- initMethod?: string;
25
- destroyMethod?: string;
26
- scope?: ScopeEnum;
27
- constructorArgs?: any[];
28
- namespace?: string;
29
- srcPath?: string;
30
- allowDowngrade?: boolean;
31
- }
32
- export interface TagPropsMetadata {
33
- key: string | number | symbol;
34
- value: any;
35
- args?: any;
36
- }
37
- export interface TagClsMetadata {
38
- id: string;
39
- originName: string;
40
- uuid: string;
41
- name: string;
42
- }
43
- export interface ReflectResult {
44
- [key: string]: any[];
45
- }
46
- export declare enum MSProviderType {
47
- DUBBO = "dubbo",
48
- GRPC = "gRPC"
49
- }
50
- export declare enum MSListenerType {
51
- RABBITMQ = "rabbitmq",
52
- MQTT = "mqtt",
53
- KAFKA = "kafka",
54
- REDIS = "redis"
55
- }
56
- export declare namespace ConsumerMetadata {
57
- interface ConsumerMetadata {
58
- type: MSListenerType;
59
- metadata: any;
60
- }
61
- }
62
- /**
63
- * grpc decorator metadata format
64
- */
65
- export declare namespace GRPCMetadata {
66
- interface ProviderOptions {
67
- serviceName?: string;
68
- package?: string;
69
- }
70
- interface ProviderMetadata {
71
- type: MSProviderType;
72
- metadata: ProviderOptions;
73
- }
74
- }
75
- export declare namespace FaaSMetadata {
76
- export interface ServerlessFunctionOptions {
77
- /**
78
- * function name
79
- */
80
- functionName?: string;
81
- /**
82
- * function description
83
- */
84
- description?: string;
85
- /**
86
- * function memory size, unit: M
87
- */
88
- memorySize?: number;
89
- /**
90
- * function timeout value, unit: seconds
91
- */
92
- timeout?: number;
93
- /**
94
- * function init timeout, just for aliyun
95
- */
96
- initTimeout?: number;
97
- /**
98
- * function runtime, nodejs10, nodejs12, nodejs14
99
- */
100
- runtime?: string;
101
- /**
102
- * invoke concurrency, just for aliyun
103
- */
104
- concurrency?: number;
105
- /**
106
- * function invoke stage, like env, just for tencent
107
- */
108
- stage?: string;
109
- /**
110
- * environment variable, key-value
111
- */
112
- environment?: any;
113
- /**
114
- * deploy or not
115
- */
116
- isDeploy?: boolean;
117
- /**
118
- * function handler name, like 'index.handler'
119
- */
120
- handlerName?: string;
121
- }
122
- interface TriggerCommonOptions {
123
- /**
124
- * function name
125
- */
126
- functionName?: string;
127
- /**
128
- * serverless event name
129
- */
130
- name?: string;
131
- /**
132
- * function invoke role, just for aliyun
133
- */
134
- role?: string;
135
- /**
136
- * function publish version, just for aliyun
137
- */
138
- version?: string;
139
- /**
140
- * deploy or not
141
- */
142
- isDeploy?: boolean;
143
- /**
144
- * function middleware
145
- */
146
- middleware?: any[];
147
- }
148
- export interface EventTriggerOptions extends TriggerCommonOptions {
149
- }
150
- export interface HTTPTriggerOptions extends TriggerCommonOptions {
151
- path: string;
152
- method?: 'get' | 'post' | 'delete' | 'put' | 'head' | 'patch' | 'all';
153
- }
154
- export interface APIGatewayTriggerOptions extends HTTPTriggerOptions {
155
- }
156
- export interface OSTriggerOptions extends TriggerCommonOptions {
157
- bucket: string;
158
- events: string | string[];
159
- filter?: {
160
- prefix: string;
161
- suffix: string;
162
- };
163
- }
164
- export interface LogTriggerOptions extends TriggerCommonOptions {
165
- source: string;
166
- project: string;
167
- log: string;
168
- retryTime?: number;
169
- interval?: number;
170
- }
171
- export interface TimerTriggerOptions extends TriggerCommonOptions {
172
- type: 'cron' | 'every' | 'interval';
173
- value: string;
174
- payload?: string;
175
- enable?: boolean;
176
- }
177
- export interface MQTriggerOptions extends TriggerCommonOptions {
178
- topic: string;
179
- tags?: string;
180
- region?: string;
181
- strategy?: 'BACKOFF_RETRY' | 'EXPONENTIAL_DECAY_RETRY';
182
- }
183
- export interface HSFTriggerOptions extends TriggerCommonOptions {
184
- }
185
- export interface MTopTriggerOptions extends TriggerCommonOptions {
186
- }
187
- export interface CDNTriggerOptions extends TriggerCommonOptions {
188
- }
189
- export type EventTriggerUnionOptions = EventTriggerOptions | HTTPTriggerOptions | APIGatewayTriggerOptions | OSTriggerOptions | CDNTriggerOptions | LogTriggerOptions | TimerTriggerOptions | MQTriggerOptions | HSFTriggerOptions | MTopTriggerOptions;
190
- export interface TriggerMetadata {
191
- type: ServerlessTriggerType;
192
- functionName?: string;
193
- handlerName?: string;
194
- methodName?: string;
195
- metadata: EventTriggerUnionOptions;
196
- }
197
- export {};
198
- }
199
- export declare abstract class FrameworkType {
200
- abstract name: string;
201
- }
202
- export declare class MidwayFrameworkType extends FrameworkType {
203
- name: string;
204
- static WEB: MidwayFrameworkType;
205
- static WEB_KOA: MidwayFrameworkType;
206
- static WEB_EXPRESS: MidwayFrameworkType;
207
- static FAAS: MidwayFrameworkType;
208
- static MS_GRPC: MidwayFrameworkType;
209
- static MS_RABBITMQ: MidwayFrameworkType;
210
- static MS_KAFKA: MidwayFrameworkType;
211
- static WS_IO: MidwayFrameworkType;
212
- static WS: MidwayFrameworkType;
213
- static SERVERLESS_APP: MidwayFrameworkType;
214
- static CUSTOM: MidwayFrameworkType;
215
- static EMPTY: MidwayFrameworkType;
216
- static LIGHT: MidwayFrameworkType;
217
- static TASK: MidwayFrameworkType;
218
- constructor(name: string);
219
- }
220
- export declare enum ServerlessTriggerType {
221
- EVENT = "event",
222
- HTTP = "http",
223
- API_GATEWAY = "apigw",
224
- OS = "os",
225
- CDN = "cdn",
226
- LOG = "log",
227
- TIMER = "timer",
228
- MQ = "mq",
229
- KAFKA = "kafka",
230
- HSF = "hsf",
231
- MTOP = "mtop"
232
- }
233
- export interface IModuleStore {
234
- listModule(key: string): any;
235
- saveModule(key: string, module: any): any;
236
- transformModule?(moduleMap: Map<string, Set<any>>): any;
237
- }
238
- export interface PipeTransform<T = any, R = any> {
239
- transform(value: T): R;
240
- }
241
- export declare type PipeTransformFunction<T = any, R = any> = (value: T) => R;
242
- //# sourceMappingURL=interface.d.ts.map
@@ -1,66 +0,0 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.ServerlessTriggerType = exports.MidwayFrameworkType = exports.FrameworkType = exports.MSListenerType = exports.MSProviderType = exports.InjectModeEnum = exports.ScopeEnum = void 0;
4
- var ScopeEnum;
5
- (function (ScopeEnum) {
6
- ScopeEnum["Singleton"] = "Singleton";
7
- ScopeEnum["Request"] = "Request";
8
- ScopeEnum["Prototype"] = "Prototype";
9
- })(ScopeEnum = exports.ScopeEnum || (exports.ScopeEnum = {}));
10
- var InjectModeEnum;
11
- (function (InjectModeEnum) {
12
- InjectModeEnum["Identifier"] = "Identifier";
13
- InjectModeEnum["Class"] = "Class";
14
- InjectModeEnum["PropertyName"] = "PropertyName";
15
- })(InjectModeEnum = exports.InjectModeEnum || (exports.InjectModeEnum = {}));
16
- var MSProviderType;
17
- (function (MSProviderType) {
18
- MSProviderType["DUBBO"] = "dubbo";
19
- MSProviderType["GRPC"] = "gRPC";
20
- })(MSProviderType = exports.MSProviderType || (exports.MSProviderType = {}));
21
- var MSListenerType;
22
- (function (MSListenerType) {
23
- MSListenerType["RABBITMQ"] = "rabbitmq";
24
- MSListenerType["MQTT"] = "mqtt";
25
- MSListenerType["KAFKA"] = "kafka";
26
- MSListenerType["REDIS"] = "redis";
27
- })(MSListenerType = exports.MSListenerType || (exports.MSListenerType = {}));
28
- class FrameworkType {
29
- }
30
- exports.FrameworkType = FrameworkType;
31
- class MidwayFrameworkType extends FrameworkType {
32
- constructor(name) {
33
- super();
34
- this.name = name;
35
- }
36
- }
37
- exports.MidwayFrameworkType = MidwayFrameworkType;
38
- MidwayFrameworkType.WEB = new MidwayFrameworkType('@midwayjs/web');
39
- MidwayFrameworkType.WEB_KOA = new MidwayFrameworkType('@midwayjs/web-koa');
40
- MidwayFrameworkType.WEB_EXPRESS = new MidwayFrameworkType('@midwayjs/express');
41
- MidwayFrameworkType.FAAS = new MidwayFrameworkType('@midwayjs/faas');
42
- MidwayFrameworkType.MS_GRPC = new MidwayFrameworkType('@midwayjs/grpc');
43
- MidwayFrameworkType.MS_RABBITMQ = new MidwayFrameworkType('@midwayjs/rabbitmq');
44
- MidwayFrameworkType.MS_KAFKA = new MidwayFrameworkType('@midwayjs/kafka');
45
- MidwayFrameworkType.WS_IO = new MidwayFrameworkType('@midwayjs/socketio');
46
- MidwayFrameworkType.WS = new MidwayFrameworkType('@midwayjs/ws');
47
- MidwayFrameworkType.SERVERLESS_APP = new MidwayFrameworkType('@midwayjs/serverless-app');
48
- MidwayFrameworkType.CUSTOM = new MidwayFrameworkType('');
49
- MidwayFrameworkType.EMPTY = new MidwayFrameworkType('empty');
50
- MidwayFrameworkType.LIGHT = new MidwayFrameworkType('light');
51
- MidwayFrameworkType.TASK = new MidwayFrameworkType('@midwayjs/task');
52
- var ServerlessTriggerType;
53
- (function (ServerlessTriggerType) {
54
- ServerlessTriggerType["EVENT"] = "event";
55
- ServerlessTriggerType["HTTP"] = "http";
56
- ServerlessTriggerType["API_GATEWAY"] = "apigw";
57
- ServerlessTriggerType["OS"] = "os";
58
- ServerlessTriggerType["CDN"] = "cdn";
59
- ServerlessTriggerType["LOG"] = "log";
60
- ServerlessTriggerType["TIMER"] = "timer";
61
- ServerlessTriggerType["MQ"] = "mq";
62
- ServerlessTriggerType["KAFKA"] = "kafka";
63
- ServerlessTriggerType["HSF"] = "hsf";
64
- ServerlessTriggerType["MTOP"] = "mtop";
65
- })(ServerlessTriggerType = exports.ServerlessTriggerType || (exports.ServerlessTriggerType = {}));
66
- //# sourceMappingURL=interface.js.map