@midwayjs/core 3.4.10 → 3.4.13

package/dist/common/serviceFactory.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServiceFactory = void 0;
-const assert = require("assert");
 const extend_1 = require("../util/extend");
 /**
  * 多客户端工厂实现
@@ -13,13 +12,14 @@ class ServiceFactory {
     }
     async initClients(options = {}) {
         this.options = options;
-        assert(!(options.client && options.clients), `midway:${this.getName()} can not set options.client and options.clients both`);
-        // alias app[name] as client, but still support createInstance method
+        // merge options.client to options.clients['default']
         if (options.client) {
-            await this.createInstance(options.client, 'default');
-            return;
+            options.clients = options.clients || {};
+            options.clients['default'] = options.clients['default'] || {};
+            (0, extend_1.extend)(true, options.clients['default'], options.client);
+            delete options.client;
         }
-        // multi client, use app[name].getInstance(id)
+        // multi client
         if (options.clients) {
             for (const id of Object.keys(options.clients)) {
                 await this.createInstance(options.clients[id], id);

package/dist/interface.d.ts

@@ -307,9 +307,9 @@ export declare type NextFunction = () => Promise<any>;
  * Common middleware definition
  */
 export interface IMiddleware<CTX, R, N = unknown> {
-    resolve: (app?: IMidwayApplication) => FunctionMiddleware<CTX, R, N> | Promise<FunctionMiddleware<CTX, R, N>>;
-    match?: (ctx?: CTX) => boolean;
-    ignore?: (ctx?: CTX) => boolean;
+    resolve: (app: IMidwayApplication) => FunctionMiddleware<CTX, R, N> | Promise<FunctionMiddleware<CTX, R, N>>;
+    match?: (ctx: CTX) => boolean;
+    ignore?: (ctx: CTX) => boolean;
 }
 export declare type FunctionMiddleware<CTX, R, N = unknown> = N extends true ? (req: CTX, res: R, next: N) => any : (context: CTX, next: R, options?: any) => any;
 export declare type ClassMiddleware<CTX, R, N> = new (...args: any[]) => IMiddleware<CTX, R, N>;

package/dist/service/configService.d.ts

@@ -10,7 +10,7 @@ export declare class MidwayConfigService implements IConfigService {
     private envDirMap;
     private aliasMap;
     private configMergeOrder;
-    protected configuration: any;
+    protected configuration: {};
     protected isReady: boolean;
     protected externalObject: Record<string, unknown>[];
     protected appInfo: MidwayAppInfo;

package/dist/service/configService.js

@@ -28,6 +28,7 @@ let MidwayConfigService = class MidwayConfigService {
             unittest: 'test',
         };
         this.configMergeOrder = [];
+        this.configuration = {};
         this.isReady = false;
         this.externalObject = [];
         this.configFilterList = [];
@@ -69,12 +70,10 @@ let MidwayConfigService = class MidwayConfigService {
             else {
                 // object add
                 for (const env in dir) {
+                    this.getEnvSet(env).add(dir[env]);
                     if (this.aliasMap[env]) {
                         this.getEnvSet(this.aliasMap[env]).add(dir[env]);
                     }
-                    else {
-                        this.getEnvSet(env).add(dir[env]);
-                    }
                 }
             }
         }
@@ -161,6 +160,10 @@ let MidwayConfigService = class MidwayConfigService {
             for (let externalObject of this.externalObject) {
                 if (externalObject) {
                     externalObject = this.runWithFilter(externalObject);
+                    if (!externalObject) {
+                        debug('[config]: Filter config and got undefined will be drop it');
+                        continue;
+                    }
                     debug('[config]: Loaded external object %j', externalObject);
                     (0, extend_1.extend)(true, target, externalObject);
                     this.configMergeOrder.push({
@@ -199,7 +202,7 @@ let MidwayConfigService = class MidwayConfigService {
         return exports;
     }
     clearAllConfig() {
-        this.configuration.clear();
+        this.configuration = {};
     }
     clearConfigMergeOrder() {
         this.configMergeOrder.length = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.4.10",
+  "version": "3.4.13",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,7 +21,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.4.4",
+    "@midwayjs/decorator": "^3.4.11",
     "koa": "2.13.4",
     "midway-test-component": "*",
     "mm": "3.2.0",
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "aeb117633ecbc3299002b220f436dc3b5450d361"
+  "gitHead": "bde878f01df0a4b27919eea367d100b5ee5edb04"
 }