@midwayjs/core 3.10.7 → 3.10.9

package/dist/service/slsFunctionService.js

@@ -52,7 +52,7 @@ let MidwayServerlessFunctionService = class MidwayServerlessFunctionService exte
         }
     }
     collectFunctionRoute(module) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         // serverlessTrigger metadata
         const webRouterInfo = (0, decorator_1.getClassMetadata)(decorator_1.FUNC_KEY, module);
         const controllerId = (0, decorator_1.getProviderName)(module);
@@ -93,19 +93,19 @@ let MidwayServerlessFunctionService = class MidwayServerlessFunctionService exte
                     responseMetadata: routerResponseData,
                 };
                 const functionMeta = (0, decorator_1.getPropertyMetadata)(decorator_1.SERVERLESS_FUNC_KEY, module, webRouter['methodName']) || {};
-                const functionName = (_f = (_e = functionMeta['functionName']) !== null && _e !== void 0 ? _e : webRouter['functionName']) !== null && _f !== void 0 ? _f : createFunctionName(module, webRouter['methodName']);
+                const functionName = (_g = (_e = functionMeta['functionName']) !== null && _e !== void 0 ? _e : (_f = webRouter === null || webRouter === void 0 ? void 0 : webRouter['metadata']) === null || _f === void 0 ? void 0 : _f['functionName']) !== null && _g !== void 0 ? _g : createFunctionName(module, webRouter['methodName']);
                 data.functionName = functionName;
                 data.functionTriggerName = webRouter['type'];
                 data.functionTriggerMetadata = webRouter['metadata'];
                 data.functionMetadata = {
-                    ...functionMeta,
                     functionName,
+                    ...functionMeta,
                 };
                 this.checkDuplicateAndPush(prefix, data);
             }
             else {
                 const functionMeta = (0, decorator_1.getPropertyMetadata)(decorator_1.SERVERLESS_FUNC_KEY, module, webRouter['methodName']) || {};
-                const functionName = (_h = (_g = functionMeta['functionName']) !== null && _g !== void 0 ? _g : webRouter['functionName']) !== null && _h !== void 0 ? _h : createFunctionName(module, webRouter['methodName']);
+                const functionName = (_j = (_h = functionMeta['functionName']) !== null && _h !== void 0 ? _h : webRouter['functionName']) !== null && _j !== void 0 ? _j : createFunctionName(module, webRouter['methodName']);
                 // 其他类型的函数
                 this.checkDuplicateAndPush(prefix, {
                     id,
@@ -119,7 +119,7 @@ let MidwayServerlessFunctionService = class MidwayServerlessFunctionService exte
                     handlerName: `${controllerId}.${webRouter['methodName']}`,
                     funcHandlerName: `${controllerId}.${webRouter['methodName']}`,
                     controllerId,
-                    middleware: ((_j = webRouter['metadata']) === null || _j === void 0 ? void 0 : _j['middleware']) || [],
+                    middleware: ((_k = webRouter['metadata']) === null || _k === void 0 ? void 0 : _k['middleware']) || [],
                     controllerMiddleware: [],
                     requestMetadata: [],
                     responseMetadata: [],

package/dist/util/httpclient.d.ts

@@ -11,11 +11,11 @@ interface IOptions {
     data?: any;
     timeout?: number;
 }
-export interface IResponse extends http.IncomingMessage {
+export interface IResponse<ResType = any> extends http.IncomingMessage {
     status: number;
-    data: Buffer | string | any;
+    data: Buffer | string | ResType;
 }
-export declare function makeHttpRequest(url: string, options?: IOptions): Promise<IResponse>;
+export declare function makeHttpRequest<ResType>(url: string, options?: IOptions): Promise<IResponse<ResType>>;
 /**
  * A simple http client
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.10.7",
+  "version": "3.10.9",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -42,5 +42,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "63bb5a11574dc6cae158c5de51fa5c5d5d482545"
+  "gitHead": "4c8368283bd5ff3c14c23080838e2567c3e9a749"
 }