@midwayjs/core 3.4.9 → 3.4.10

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.4.9",
+  "version": "3.4.10",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "bc8113cff70d88a31e44bde69c395f61a7de2045"
+  "gitHead": "aeb117633ecbc3299002b220f436dc3b5450d361"
 }