@midwayjs/core 3.6.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
@@ -30,6 +31,7 @@ export declare abstract class DataSourceManager<T> {
     protected abstract checkConnected(dataSource: T): Promise<boolean>;
     protected abstract destroyDataSource(dataSource: T): Promise<void>;
     stop(): Promise<void>;
+    getDefaultDataSourceName(): string;
 }
 export declare function globModels(globString: string, appDir: string): any[];
 export interface CreateDataSourceInstanceOptions {

package/dist/common/dataSourceManager.js

@@ -112,6 +112,22 @@ class DataSourceManager {
         }));
         this.dataSource.clear();
     }
+    getDefaultDataSourceName() {
+        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;
 function globModels(globString, appDir) {
@@ -124,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/context/container.d.ts

@@ -78,6 +78,7 @@ export declare class MidwayContainer implements IMidwayContainer, IModuleStore {
     listModule(key: string): unknown[];
     transformModule(moduleMap: Map<string, Set<any>>): void;
     hasNamespace(ns: string): boolean;
+    getNamespaceList(): string[];
     hasDefinition(identifier: ObjectIdentifier): boolean;
     hasObject(identifier: ObjectIdentifier): boolean;
 }

package/dist/context/container.js

@@ -490,6 +490,9 @@ class MidwayContainer {
     hasNamespace(ns) {
         return this.namespaceSet.has(ns);
     }
+    getNamespaceList() {
+        return Array.from(this.namespaceSet);
+    }
     hasDefinition(identifier) {
         return this.registry.hasDefinition(identifier);
     }

package/dist/decorator/interface.d.ts

@@ -235,4 +235,8 @@ export interface IModuleStore {
     saveModule(key: string, module: any): any;
     transformModule?(moduleMap: Map<string, Set<any>>): any;
 }
+export interface PipeTransform<T = any, R = any> {
+    transform(value: T): R;
+}
+export declare type PipeTransformFunction<T = any, R = any> = (value: T) => R;
 //# sourceMappingURL=interface.d.ts.map

package/dist/decorator/interface.js

@@ -33,7 +33,6 @@ class MidwayFrameworkType extends FrameworkType {
         super();
         this.name = name;
     }
-    ;
 }
 exports.MidwayFrameworkType = MidwayFrameworkType;
 MidwayFrameworkType.WEB = new MidwayFrameworkType('@midwayjs/web');

package/dist/decorator/web/paramMapping.d.ts

@@ -1,3 +1,4 @@
+import { IMidwayContext } from '../../interface';
 export declare enum RouteParamTypes {
     QUERY = 0,
     BODY = 1,
@@ -10,13 +11,18 @@ export declare enum RouteParamTypes {
     REQUEST_PATH = 8,
     REQUEST_IP = 9,
     QUERIES = 10,
-    FIELDS = 11
+    FIELDS = 11,
+    CUSTOM = 12
 }
 export interface RouterParamValue {
     index: number;
     type: RouteParamTypes;
     propertyData?: any;
 }
+export declare type KoaLikeCustomParamDecorator<T = unknown> = (ctx: IMidwayContext) => T | Promise<T>;
+export declare type ExpressLikeCustomParamDecorator<T = unknown> = (req: any, res: any) => T | Promise<T>;
+export declare type CustomParamDecorator<T = unknown> = KoaLikeCustomParamDecorator<T> | ExpressLikeCustomParamDecorator<T>;
+export declare const createRequestParamDecorator: (transform: CustomParamDecorator) => ParameterDecorator;
 export declare const Session: (property?: string) => ParameterDecorator;
 export declare const Body: (property?: string) => ParameterDecorator;
 export declare const Query: (property?: string) => ParameterDecorator;

package/dist/decorator/web/paramMapping.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Fields = exports.Queries = exports.RequestIP = exports.RequestPath = exports.Files = exports.File = exports.Headers = exports.Param = exports.Query = exports.Body = exports.Session = exports.RouteParamTypes = void 0;
+exports.Fields = exports.Queries = exports.RequestIP = exports.RequestPath = exports.Files = exports.File = exports.Headers = exports.Param = exports.Query = exports.Body = exports.Session = exports.createRequestParamDecorator = exports.RouteParamTypes = void 0;
 const __1 = require("../");
 var RouteParamTypes;
 (function (RouteParamTypes) {
@@ -16,15 +16,21 @@ var RouteParamTypes;
     RouteParamTypes[RouteParamTypes["REQUEST_IP"] = 9] = "REQUEST_IP";
     RouteParamTypes[RouteParamTypes["QUERIES"] = 10] = "QUERIES";
     RouteParamTypes[RouteParamTypes["FIELDS"] = 11] = "FIELDS";
+    RouteParamTypes[RouteParamTypes["CUSTOM"] = 12] = "CUSTOM";
 })(RouteParamTypes = exports.RouteParamTypes || (exports.RouteParamTypes = {}));
 const createParamMapping = function (type) {
-    return (propertyData) => {
+    return (propertyData, pipes) => {
         return (0, __1.createCustomParamDecorator)(__1.WEB_ROUTER_PARAM_KEY, {
             type,
             propertyData,
+            pipes,
         });
     };
 };
+const createRequestParamDecorator = function (transform) {
+    return createParamMapping(RouteParamTypes.CUSTOM)(transform);
+};
+exports.createRequestParamDecorator = createRequestParamDecorator;
 const Session = (property) => createParamMapping(RouteParamTypes.SESSION)(property);
 exports.Session = Session;
 const Body = (property) => createParamMapping(RouteParamTypes.BODY)(property);

package/dist/interface.d.ts

@@ -22,9 +22,11 @@ export declare type ServiceFactoryConfigOption<OPTIONS> = {
     clients?: {
         [key: string]: PowerPartial<OPTIONS>;
     };
+    defaultClientName?: string;
 };
 export declare type DataSourceManagerConfigOption<OPTIONS> = {
     default?: PowerPartial<OPTIONS>;
+    defaultDataSourceName?: string;
     dataSource?: {
         [key: string]: PowerPartial<{
             entities: any[];
@@ -234,6 +236,7 @@ export interface IMidwayContainer extends IObjectFactory, IObjectLifeCycle {
     registerObject(identifier: ObjectIdentifier, target: any): any;
     load(module?: any): any;
     hasNamespace(namespace: string): boolean;
+    getNamespaceList(): string[];
     hasDefinition(identifier: ObjectIdentifier): any;
     hasObject(identifier: ObjectIdentifier): any;
     bind<T>(target: T, options?: Partial<IObjectDefinition>): void;

package/dist/service/frameworkService.js

@@ -94,10 +94,20 @@ let MidwayFrameworkService = class MidwayFrameworkService {
                 this.applicationManager.addFramework((_a = definition === null || definition === void 0 ? void 0 : definition.namespace) !== null && _a !== void 0 ? _a : frameworkInstance.getFrameworkName(), frameworkInstance);
                 this.globalFrameworkList.push(frameworkInstance);
             }
-            const nsSet = this.applicationContext['namespaceSet'];
             let mainNs;
-            if (nsSet.size > 0) {
-                [mainNs] = nsSet;
+            /**
+             * 这里处理引入组件的顺序，在主框架之前是否包含其他的 framework
+             * 1、装饰器的顺序和 import 的写的顺序有关
+             * 2、主框架和 configuration 中的配置加载顺序有关
+             * 3、两者不符合的话，App 装饰器获取的 app 会不一致，导致中间件等无法正常使用
+             */
+            const namespaceList = this.applicationContext.getNamespaceList();
+            for (const namespace of namespaceList) {
+                const framework = this.applicationManager.getApplication(namespace);
+                if (framework) {
+                    mainNs = namespace;
+                    break;
+                }
             }
             global['MIDWAY_MAIN_FRAMEWORK'] = this.mainFramework =
                 (_b = this.applicationManager.getFramework(mainNs)) !== null && _b !== void 0 ? _b : this.globalFrameworkList[0];

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/setup.d.ts

@@ -3,7 +3,7 @@ import { MidwayContainer, IMidwayBootstrapOptions, IMidwayContainer } from './';
  * midway framework main entry, this method bootstrap all service and framework.
  * @param globalOptions
  */
-export declare function initializeGlobalApplicationContext(globalOptions: IMidwayBootstrapOptions): Promise<IMidwayContainer | MidwayContainer>;
+export declare function initializeGlobalApplicationContext(globalOptions: IMidwayBootstrapOptions): Promise<IMidwayContainer>;
 export declare function destroyGlobalApplicationContext(applicationContext: IMidwayContainer): Promise<void>;
 /**
  * prepare applicationContext, it use in egg framework.

package/dist/util/httpclient.js

@@ -19,7 +19,7 @@ async function makeHttpRequest(url, options = {}) {
     const client = whatwgUrl.protocol === 'https:' ? https : http;
     const contentType = options.contentType;
     const dataType = options.dataType;
-    const method = options.method || 'GET';
+    const method = (options.method || 'GET').toUpperCase();
     const timeout = options.timeout || 5000;
     const headers = {
         Accept: mimeMap[dataType] || mimeMap.octet,

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/dist/util/webRouterParam.d.ts

@@ -1,3 +1,5 @@
-export declare const extractKoaLikeValue: (key: any, data: any, paramType?: any) => (ctx: any, next: any) => any;
-export declare const extractExpressLikeValue: (key: any, data: any, paramType?: any) => (req: any, res: any, next: any) => any;
+import { PipeTransform, PipeTransformFunction } from '../decorator';
+export declare function callPipes(pipes: Array<PipeTransform | PipeTransformFunction>, value: any): Promise<any>;
+export declare const extractKoaLikeValue: (key: any, data: any, paramType?: any, pipes?: PipeTransform[]) => (ctx: any, next: any) => Promise<any>;
+export declare const extractExpressLikeValue: (key: any, data: any, paramType?: any, pipes?: PipeTransform[]) => (req: any, res: any, next: any) => Promise<any>;
 //# sourceMappingURL=webRouterParam.d.ts.map

package/dist/util/webRouterParam.js

@@ -1,13 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractExpressLikeValue = exports.extractKoaLikeValue = void 0;
-const index_1 = require("./index");
+exports.extractExpressLikeValue = exports.extractKoaLikeValue = exports.callPipes = void 0;
 const decorator_1 = require("../decorator");
-const extractKoaLikeValue = (key, data, paramType) => {
+const index_1 = require("./index");
+async function callPipes(pipes, value) {
+    if (pipes && pipes.length) {
+        for (const pipe of pipes) {
+            if ('transform' in pipe) {
+                value = await pipe.transform(value);
+            }
+            else {
+                value = await pipe(value);
+            }
+        }
+    }
+    return value;
+}
+exports.callPipes = callPipes;
+const extractKoaLikeValue = (key, data, paramType, pipes) => {
     if (decorator_1.ALL === data) {
         data = undefined;
     }
-    return function (ctx, next) {
+    const value = async function (ctx, next) {
         switch (key) {
             case decorator_1.RouteParamTypes.NEXT:
                 return next;
@@ -54,17 +68,23 @@ const extractKoaLikeValue = (key, data, paramType) => {
                 }
             case decorator_1.RouteParamTypes.FIELDS:
                 return data ? ctx.fields[data] : ctx.fields;
+            case decorator_1.RouteParamTypes.CUSTOM:
+                return data ? data(ctx) : undefined;
             default:
                 return null;
         }
     };
+    return async function (ctx, next) {
+        const result = await value(ctx, next);
+        return await callPipes(pipes || [], result);
+    };
 };
 exports.extractKoaLikeValue = extractKoaLikeValue;
-const extractExpressLikeValue = (key, data, paramType) => {
+const extractExpressLikeValue = (key, data, paramType, pipes) => {
     if (decorator_1.ALL === data) {
         data = undefined;
     }
-    return function (req, res, next) {
+    const value = (req, res, next) => {
         switch (key) {
             case decorator_1.RouteParamTypes.NEXT:
                 return next;
@@ -95,10 +115,16 @@ const extractExpressLikeValue = (key, data, paramType) => {
                 }
             case decorator_1.RouteParamTypes.FIELDS:
                 return data ? req.fields[data] : req.fields;
+            case decorator_1.RouteParamTypes.CUSTOM:
+                return data ? data(req, res) : undefined;
             default:
                 return null;
         }
     };
+    return async function (req, res, next) {
+        const result = await value(req, res, next);
+        return await callPipes(pipes || [], result);
+    };
 };
 exports.extractExpressLikeValue = extractExpressLikeValue;
 //# sourceMappingURL=webRouterParam.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.6.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": "22643b0e8519766bb7c68b975930199fc136336e"
+  "gitHead": "5c640c7182923587139f9f9c0aecf50585798e1e"
 }