@midwayjs/core 3.4.9 → 3.4.12

package/dist/common/dataSourceManager.js

@@ -18,38 +18,36 @@ class DataSourceManager {
     }
     async initDataSource(options, appDir) {
         this.options = options;
-        if (options.dataSource) {
-            for (const dataSourceName in options.dataSource) {
-                const dataSourceOptions = options.dataSource[dataSourceName];
-                if (dataSourceOptions['entities']) {
-                    const entities = new Set();
-                    // loop entities and glob files to model
-                    for (const entity of dataSourceOptions['entities']) {
-                        if (typeof entity === 'string') {
-                            // string will be glob file
-                            const models = globModels(entity, appDir);
-                            for (const model of models) {
-                                entities.add(model);
-                                this.modelMapping.set(model, dataSourceName);
-                            }
-                        }
-                        else {
-                            // model will be add to array
-                            entities.add(entity);
-                            this.modelMapping.set(entity, dataSourceName);
+        if (!options.dataSource) {
+            throw new error_1.MidwayParameterError('DataSourceManager must set options.dataSource.');
+        }
+        for (const dataSourceName in options.dataSource) {
+            const dataSourceOptions = options.dataSource[dataSourceName];
+            if (dataSourceOptions['entities']) {
+                const entities = new Set();
+                // loop entities and glob files to model
+                for (const entity of dataSourceOptions['entities']) {
+                    if (typeof entity === 'string') {
+                        // string will be glob file
+                        const models = globModels(entity, appDir);
+                        for (const model of models) {
+                            entities.add(model);
+                            this.modelMapping.set(model, dataSourceName);
                         }
                     }
-                    dataSourceOptions['entities'] = Array.from(entities);
+                    else {
+                        // model will be add to array
+                        entities.add(entity);
+                        this.modelMapping.set(entity, dataSourceName);
+                    }
                 }
-                // create data source
-                const opts = {
-                    cacheInstance: options.cacheInstance, // will default true
-                };
-                await this.createInstance(dataSourceOptions, dataSourceName, opts);
+                dataSourceOptions['entities'] = Array.from(entities);
             }
-        }
-        else {
-            throw new error_1.MidwayParameterError('DataSourceManager must set options.dataSource.');
+            // create data source
+            const opts = {
+                cacheInstance: options.cacheInstance, // will default true
+            };
+            await this.createInstance(dataSourceOptions, dataSourceName, opts);
         }
     }
     /**

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 = [];
@@ -161,6 +162,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 +204,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.9",
+  "version": "3.4.12",
   "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": "bc8113cff70d88a31e44bde69c395f61a7de2045"
+  "gitHead": "96425bbb3a39dbe8f66069facc5b7440886f9cfe"
 }