@midwayjs/core 3.7.0 → 3.8.0

package/dist/common/dataSourceManager.d.ts

@@ -2,6 +2,7 @@ export declare abstract class DataSourceManager<T> {
     protected dataSource: Map<string, T>;
     protected options: {};
     protected modelMapping: WeakMap<object, any>;
+    private innerDefaultDataSourceName;
     protected initDataSource(options: any, appDir: string): Promise<void>;
     /**
      * get a data source instance

package/dist/common/dataSourceManager.js

@@ -113,7 +113,20 @@ class DataSourceManager {
         this.dataSource.clear();
     }
     getDefaultDataSourceName() {
-        return this.options['defaultDataSourceName'];
+        if (this.innerDefaultDataSourceName === undefined) {
+            if (this.options['defaultDataSourceName']) {
+                this.innerDefaultDataSourceName = this.options['defaultDataSourceName'];
+            }
+            else if (this.dataSource.size === 1) {
+                // Set the default source name when there is only one data source
+                this.innerDefaultDataSourceName = Array.from(this.dataSource.keys())[0];
+            }
+            else {
+                // Set empty string for cache
+                this.innerDefaultDataSourceName = '';
+            }
+        }
+        return this.innerDefaultDataSourceName;
     }
 }
 exports.DataSourceManager = DataSourceManager;
@@ -127,7 +140,6 @@ function globModels(globString, appDir) {
     if (/\*/.test(globString)) {
         cwd = appDir;
         pattern = [...constants_1.DEFAULT_PATTERN.map(p => (0, path_1.join)(globString, p))];
-        pattern.push(globString);
     }
     else {
         pattern = [...constants_1.DEFAULT_PATTERN];

package/dist/common/serviceFactory.d.ts

@@ -12,5 +12,6 @@ export declare abstract class ServiceFactory<T> {
     protected abstract createClient(config: any, clientName: any): Promise<T | void> | (T | void);
     protected destroyClient(client: T): Promise<void>;
     stop(): Promise<void>;
+    getDefaultClientName(): string;
 }
 //# sourceMappingURL=serviceFactory.d.ts.map

package/dist/common/serviceFactory.js

@@ -17,7 +17,6 @@ class ServiceFactory {
             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
         if (options.clients) {
@@ -49,6 +48,9 @@ class ServiceFactory {
             await this.destroyClient(value);
         }
     }
+    getDefaultClientName() {
+        return this.options['defaultClientName'];
+    }
 }
 exports.ServiceFactory = ServiceFactory;
 //# sourceMappingURL=serviceFactory.js.map

package/dist/interface.d.ts

@@ -22,6 +22,7 @@ export declare type ServiceFactoryConfigOption<OPTIONS> = {
     clients?: {
         [key: string]: PowerPartial<OPTIONS>;
     };
+    defaultClientName?: string;
 };
 export declare type DataSourceManagerConfigOption<OPTIONS> = {
     default?: PowerPartial<OPTIONS>;

package/dist/service/webRouterService.d.ts

@@ -114,8 +114,6 @@ export declare class MidwayWebRouterService {
     private isReady;
     protected routes: Map<string, RouterInfo[]>;
     protected routesPriority: RouterPriority[];
-    private cachedFlattenRouteList;
-    private includeCompileUrlPattern;
     constructor(options?: RouterCollectorOptions);
     protected analyze(): Promise<void>;
     protected analyzeController(): void;
@@ -239,7 +237,6 @@ export declare class MidwayWebRouterService {
     getRouterTable(): Promise<Map<string, RouterInfo[]>>;
     getFlattenRouterTable(options?: {
         compileUrlPattern?: boolean;
-        noCache?: boolean;
     }): Promise<RouterInfo[]>;
     getMatchedRouterInfo(routerUrl: string, method: string): Promise<RouterInfo | undefined>;
     protected checkDuplicateAndPush(prefix: any, routerInfo: RouterInfo): void;

package/dist/service/webRouterService.js

@@ -23,7 +23,6 @@ let MidwayWebRouterService = class MidwayWebRouterService {
         this.isReady = false;
         this.routes = new Map();
         this.routesPriority = [];
-        this.includeCompileUrlPattern = false;
     }
     async analyze() {
         this.analyzeController();
@@ -182,6 +181,8 @@ let MidwayWebRouterService = class MidwayWebRouterService {
         this.checkDuplicateAndPush(prefix, Object.assign(routerInfoOption, {
             method: routerFunction,
         }));
+        // sort again
+        this.sortPrefixAndRouter();
     }
     sortRouter(urlMatchList) {
         // 1. 绝对路径规则优先级最高如 /ab/cb/e
@@ -260,18 +261,6 @@ let MidwayWebRouterService = class MidwayWebRouterService {
         return this.routes;
     }
     async getFlattenRouterTable(options = {}) {
-        if (this.cachedFlattenRouteList && !options.noCache) {
-            if (options.compileUrlPattern && !this.includeCompileUrlPattern) {
-                this.includeCompileUrlPattern = true;
-                // attach match pattern function
-                for (const item of this.cachedFlattenRouteList) {
-                    if (item.fullUrlFlattenString) {
-                        item.fullUrlCompiledRegexp = pathToRegexp_1.PathToRegexpUtil.toRegexp(item.fullUrlFlattenString);
-                    }
-                }
-            }
-            return this.cachedFlattenRouteList;
-        }
         if (!this.isReady) {
             await this.analyze();
             this.isReady = true;
@@ -281,7 +270,6 @@ let MidwayWebRouterService = class MidwayWebRouterService {
             routeArr = routeArr.concat(this.routes.get(routerPriority.prefix));
         }
         if (options.compileUrlPattern) {
-            this.includeCompileUrlPattern = true;
             // attach match pattern function
             for (const item of routeArr) {
                 if (item.fullUrlFlattenString) {
@@ -289,7 +277,6 @@ let MidwayWebRouterService = class MidwayWebRouterService {
                 }
             }
         }
-        this.cachedFlattenRouteList = routeArr;
         return routeArr;
     }
     async getMatchedRouterInfo(routerUrl, method) {

package/dist/util/types.js

@@ -5,11 +5,6 @@ const util = require("util");
 const ToString = Function.prototype.toString;
 const hasOwn = Object.prototype.hasOwnProperty;
 const toStr = Object.prototype.toString;
-function fnBody(fn) {
-    return ToString.call(fn)
-        .replace(/^[^{]*{\s*/, '')
-        .replace(/\s*}[^}]*$/, '');
-}
 function isString(value) {
     return typeof value === 'string';
 }
@@ -21,10 +16,6 @@ function isClass(fn) {
     if (/^class[\s{]/.test(ToString.call(fn))) {
         return true;
     }
-    // babel.js classCallCheck() & inlined
-    const body = fnBody(fn);
-    return (/classCallCheck\(/.test(body) ||
-        /TypeError\("Cannot call a class as a function"\)/.test(body));
 }
 exports.isClass = isClass;
 function isAsyncFunction(value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.7.0",
+  "version": "3.8.0",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -26,7 +26,7 @@
     "mm": "3.2.0",
     "pg": "8.8.0",
     "raw-body": "2.5.1",
-    "sinon": "14.0.1"
+    "sinon": "14.0.2"
   },
   "dependencies": {
     "@midwayjs/glob": "^1.0.2",
@@ -38,10 +38,10 @@
   "author": "Harry Chen <czy88840616@gmail.com>",
   "repository": {
     "type": "git",
-    "url": "http://github.com/midwayjs/midway.git"
+    "url": "https://github.com/midwayjs/midway.git"
   },
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "99386083ee26b386fd508b9c892091c914e77535"
+  "gitHead": "5c640c7182923587139f9f9c0aecf50585798e1e"
 }