@midwayjs/core 2.13.1 → 2.14.0

package/CHANGELOG.md

@@ -3,6 +3,55 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.14.0](https://github.com/midwayjs/midway/compare/v2.13.5...v2.14.0) (2021-12-06)
+
+
+### Bug Fixes
+
+* express routing middleware takes effect at the controller level ([#1364](https://github.com/midwayjs/midway/issues/1364)) ([5d5f299](https://github.com/midwayjs/midway/commit/5d5f2992be116ca71b21f01fd782e3a2ac072496))
+* router sort ([#1383](https://github.com/midwayjs/midway/issues/1383)) ([6b3ab56](https://github.com/midwayjs/midway/commit/6b3ab56a0525435c67f9730742aa1573d61ea0fc))
+
+
+
+
+
+## [2.13.4](https://github.com/midwayjs/midway/compare/v2.13.3...v2.13.4) (2021-10-21)
+
+
+### Bug Fixes
+
+* load component with enabledEnvironment ([#1329](https://github.com/midwayjs/midway/issues/1329)) ([803cd46](https://github.com/midwayjs/midway/commit/803cd4617502973daf06072f252767309554e272))
+* static prefix ([#1321](https://github.com/midwayjs/midway/issues/1321)) ([e6b4e46](https://github.com/midwayjs/midway/commit/e6b4e4673c1d2480da23d6bd664b613c813ee131))
+
+
+### Features
+
+* add mongoose component and support multi-instance for typegoose ([#1334](https://github.com/midwayjs/midway/issues/1334)) ([ec54224](https://github.com/midwayjs/midway/commit/ec54224d775a3cfde3ff280538c8db79bcff4610))
+
+
+
+
+
+## [2.13.3](https://github.com/midwayjs/midway/compare/v2.13.2...v2.13.3) (2021-09-28)
+
+
+### Bug Fixes
+
+* circular inject for provide uuid ([#1285](https://github.com/midwayjs/midway/issues/1285)) ([29a7ab7](https://github.com/midwayjs/midway/commit/29a7ab742359f7803f5dc562329e887b191a2d63))
+* functional configuration load async code ([#1300](https://github.com/midwayjs/midway/issues/1300)) ([8cb4bd6](https://github.com/midwayjs/midway/commit/8cb4bd679e7e731f8649466cfb7f6a4b35ba2683))
+
+
+
+
+
+## [2.13.2](https://github.com/midwayjs/midway/compare/v2.13.1...v2.13.2) (2021-09-09)
+
+**Note:** Version bump only for package @midwayjs/core
+
+
+
+
+
 ## [2.13.1](https://github.com/midwayjs/midway/compare/v2.13.0...v2.13.1) (2021-09-08)
 
 

package/README.md

@@ -5,7 +5,7 @@
 
 this is a sub package for midway.
 
-Document: [https://midwayjs.org/midway](https://midwayjs.org/midway)
+Document: [https://midwayjs.org](https://midwayjs.org)
 
 ## License
 

package/dist/context/configuration.js

@@ -21,7 +21,7 @@ class ContainerConfiguration {
         this.loadDirs.push(dir);
     }
     addImports(imports = [], baseDir) {
-        var _a, _b;
+        var _a, _b, _c;
         // 处理 imports
         for (const importPackage of imports) {
             if (!importPackage)
@@ -44,7 +44,12 @@ class ContainerConfiguration {
             }
             else if ('component' in importPackage) {
                 subContainerConfiguration.newVersion = true;
-                if ((_b = (_a = importPackage) === null || _a === void 0 ? void 0 : _a.enabledEnvironment) === null || _b === void 0 ? void 0 : _b.includes(this.container.getCurrentEnv())) {
+                if ((_a = importPackage) === null || _a === void 0 ? void 0 : _a.enabledEnvironment) {
+                    if ((_c = (_b = importPackage) === null || _b === void 0 ? void 0 : _b.enabledEnvironment) === null || _c === void 0 ? void 0 : _c.includes(this.container.getCurrentEnv())) {
+                        subContainerConfiguration.loadComponentObject(importPackage.component);
+                    }
+                }
+                else {
                     subContainerConfiguration.loadComponentObject(importPackage.component);
                 }
             }

package/dist/context/managedResolverFactory.js

@@ -574,6 +574,21 @@ class ManagedResolverFactory {
                     if (ref && ref.name) {
                         iden = ref.name;
                     }
+                    let subDefinition = this.context.registry.getDefinition(iden);
+                    if (!subDefinition && this.context.parent) {
+                        subDefinition = this.context.parent.registry.getDefinition(iden);
+                    }
+                    // find uuid
+                    if (!subDefinition && /:/.test(iden)) {
+                        iden = iden.replace(/^.*?:/, '');
+                        subDefinition = this.context.registry.getDefinition(iden);
+                        if (!subDefinition && this.context.parent) {
+                            subDefinition = this.context.parent.registry.getDefinition(iden);
+                        }
+                    }
+                    if (subDefinition) {
+                        iden = subDefinition.id;
+                    }
                     if (iden === identifier) {
                         debug('dfs exist in properties key %s == %s.', identifier, definition.id);
                         return true;
@@ -586,10 +601,6 @@ class ManagedResolverFactory {
                         depth.push(iden);
                         debug('dfs depth push %s == %s, %j.', identifier, iden, depth);
                     }
-                    let subDefinition = this.context.registry.getDefinition(iden);
-                    if (!subDefinition && this.context.parent) {
-                        subDefinition = this.context.parent.registry.getDefinition(iden);
-                    }
                     if (this.depthFirstSearch(identifier, subDefinition, depth)) {
                         debug('dfs exist in sub tree %s == %s subId = %s.', identifier, definition.id, subDefinition.id);
                         return true;

package/dist/functional/configuration.d.ts

@@ -6,9 +6,9 @@ export declare class FunctionalConfiguration {
     private configLoadHandler;
     private options;
     constructor(options: InjectionConfigurationOptions);
-    onConfigLoad(configLoadHandler: ((container: IMidwayContainer, app: IMidwayApplication) => any) | IMidwayContainer, app?: IMidwayApplication): this;
-    onReady(readyHandler: ((container: IMidwayContainer, app: IMidwayApplication) => void) | IMidwayContainer, app?: IMidwayApplication): this;
-    onStop(stopHandler: ((container: IMidwayContainer, app: IMidwayApplication) => void) | IMidwayContainer, app?: IMidwayApplication): this;
+    onConfigLoad(configLoadHandler: ((container: IMidwayContainer, app: IMidwayApplication) => any) | IMidwayContainer, app?: IMidwayApplication): any;
+    onReady(readyHandler: ((container: IMidwayContainer, app: IMidwayApplication) => void) | IMidwayContainer, app?: IMidwayApplication): any;
+    onStop(stopHandler: ((container: IMidwayContainer, app: IMidwayApplication) => void) | IMidwayContainer, app?: IMidwayApplication): any;
     getConfigurationOptions(): InjectionConfigurationOptions;
 }
 export declare const createConfiguration: (options: InjectionConfigurationOptions) => FunctionalConfiguration;

package/dist/functional/configuration.js

@@ -13,7 +13,7 @@ class FunctionalConfiguration {
             this.configLoadHandler = configLoadHandler;
         }
         else {
-            this.configLoadHandler(configLoadHandler, app);
+            return this.configLoadHandler(configLoadHandler, app);
         }
         return this;
     }
@@ -22,7 +22,7 @@ class FunctionalConfiguration {
             this.readyHandler = readyHandler;
         }
         else {
-            this.readyHandler(readyHandler, app);
+            return this.readyHandler(readyHandler, app);
         }
         return this;
     }
@@ -31,7 +31,7 @@ class FunctionalConfiguration {
             this.stopHandler = stopHandler;
         }
         else {
-            this.stopHandler(stopHandler, app);
+            return this.stopHandler(stopHandler, app);
         }
         return this;
     }

package/dist/index.d.ts

@@ -6,7 +6,7 @@ export { MidwayRequestContainer } from './context/requestContainer';
 export { BaseFramework } from './baseFramework';
 export * from './context/providerWrapper';
 export * from './common/constants';
-export { safelyGet, safeRequire, delegateTargetPrototypeMethod } from './util/';
+export { safelyGet, safeRequire, delegateTargetPrototypeMethod, delegateTargetMethod, delegateTargetProperties, } from './util/';
 export * from './util/pathFileUtil';
 export * from './features';
 export * from './util/webRouterParam';

package/dist/index.js

@@ -10,7 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MidwayContextLogger = exports.MidwayInformationService = exports.MidwayEnvironmentService = exports.MidwayConfigService = exports.createConfiguration = exports.classToPlain = exports.plainToClass = exports.delegateTargetPrototypeMethod = exports.safeRequire = exports.safelyGet = exports.BaseFramework = exports.MidwayRequestContainer = exports.clearContainerCache = exports.MidwayContainer = exports.ContainerLoader = exports.generateProvideId = exports.classNamed = exports.getObjectDefinition = exports.getProviderId = exports.getParamNames = exports.clearAllModule = exports.resetModule = exports.listModule = exports.saveModule = exports.listPreloadModule = exports.savePreloadModule = exports.getPropertyMetadata = exports.attachPropertyMetadata = exports.savePropertyMetadata = exports.listPropertyDataFromClass = exports.getPropertyDataFromClass = exports.attachPropertyDataToClass = exports.savePropertyDataToClass = exports.getMethodMetadata = exports.attachMethodMetadata = exports.saveMethodMetadata = exports.listMethodDataFromClass = exports.getMethodDataFromClass = exports.attachMethodDataToClass = exports.saveMethodDataToClass = exports.getClassMetadata = exports.attachClassMetadata = exports.saveClassMetadata = exports.MidwayFrameworkType = exports.ScopeEnum = void 0;
+exports.MidwayContextLogger = exports.MidwayInformationService = exports.MidwayEnvironmentService = exports.MidwayConfigService = exports.createConfiguration = exports.classToPlain = exports.plainToClass = exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.safeRequire = exports.safelyGet = exports.BaseFramework = exports.MidwayRequestContainer = exports.clearContainerCache = exports.MidwayContainer = exports.ContainerLoader = exports.generateProvideId = exports.classNamed = exports.getObjectDefinition = exports.getProviderId = exports.getParamNames = exports.clearAllModule = exports.resetModule = exports.listModule = exports.saveModule = exports.listPreloadModule = exports.savePreloadModule = exports.getPropertyMetadata = exports.attachPropertyMetadata = exports.savePropertyMetadata = exports.listPropertyDataFromClass = exports.getPropertyDataFromClass = exports.attachPropertyDataToClass = exports.savePropertyDataToClass = exports.getMethodMetadata = exports.attachMethodMetadata = exports.saveMethodMetadata = exports.listMethodDataFromClass = exports.getMethodDataFromClass = exports.attachMethodDataToClass = exports.saveMethodDataToClass = exports.getClassMetadata = exports.attachClassMetadata = exports.saveClassMetadata = exports.MidwayFrameworkType = exports.ScopeEnum = void 0;
 var decorator_1 = require("@midwayjs/decorator");
 Object.defineProperty(exports, "ScopeEnum", { enumerable: true, get: function () { return decorator_1.ScopeEnum; } });
 Object.defineProperty(exports, "MidwayFrameworkType", { enumerable: true, get: function () { return decorator_1.MidwayFrameworkType; } });
@@ -58,6 +58,8 @@ var util_1 = require("./util/");
 Object.defineProperty(exports, "safelyGet", { enumerable: true, get: function () { return util_1.safelyGet; } });
 Object.defineProperty(exports, "safeRequire", { enumerable: true, get: function () { return util_1.safeRequire; } });
 Object.defineProperty(exports, "delegateTargetPrototypeMethod", { enumerable: true, get: function () { return util_1.delegateTargetPrototypeMethod; } });
+Object.defineProperty(exports, "delegateTargetMethod", { enumerable: true, get: function () { return util_1.delegateTargetMethod; } });
+Object.defineProperty(exports, "delegateTargetProperties", { enumerable: true, get: function () { return util_1.delegateTargetProperties; } });
 __exportStar(require("./util/pathFileUtil"), exports);
 __exportStar(require("./features"), exports);
 __exportStar(require("./util/webRouterParam"), exports);

package/dist/util/index.d.ts

@@ -17,5 +17,22 @@ export declare function safelyGet(list: string | string[], obj?: Record<string,
 export declare function parsePrefix(provideId: string): string;
 export declare function getUserHome(): string;
 export declare function joinURLPath(...strArray: any[]): string;
+/**
+ * 代理目标所有的原型方法，不包括构造器和内部隐藏方法
+ * @param derivedCtor
+ * @param constructors
+ */
 export declare function delegateTargetPrototypeMethod(derivedCtor: any, constructors: any[]): void;
+/**
+ * 代理目标原型上的特定方法
+ * @param derivedCtor
+ * @param methods
+ */
+export declare function delegateTargetMethod(derivedCtor: any, methods: string[]): void;
+/**
+ * 代理目标原型属性
+ * @param derivedCtor
+ * @param properties
+ */
+export declare function delegateTargetProperties(derivedCtor: any, properties: string[]): void;
 //# sourceMappingURL=index.d.ts.map

package/dist/util/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.delegateTargetPrototypeMethod = exports.joinURLPath = exports.getUserHome = exports.parsePrefix = exports.safelyGet = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
+exports.delegateTargetProperties = exports.delegateTargetMethod = exports.delegateTargetPrototypeMethod = exports.joinURLPath = exports.getUserHome = exports.parsePrefix = exports.safelyGet = exports.safeRequire = exports.getCurrentEnvironment = exports.isDevelopmentEnvironment = void 0;
 const path_1 = require("path");
 const fs_1 = require("fs");
 const util_1 = require("util");
@@ -29,8 +29,7 @@ const safeRequire = (p, enabledCache = true) => {
         }
     }
     catch (err) {
-        debug('SafeRequire Warning');
-        debug(err);
+        debug('SafeRequire Warning', err.message);
         return undefined;
     }
 };
@@ -91,11 +90,16 @@ function joinURLPath(...strArray) {
     return p;
 }
 exports.joinURLPath = joinURLPath;
+/**
+ * 代理目标所有的原型方法，不包括构造器和内部隐藏方法
+ * @param derivedCtor
+ * @param constructors
+ */
 function delegateTargetPrototypeMethod(derivedCtor, constructors) {
     constructors.forEach(baseCtor => {
         Object.getOwnPropertyNames(baseCtor.prototype).forEach(name => {
             if (name !== 'constructor' && !/^_/.test(name)) {
-                derivedCtor.prototype[name] = async function (...args) {
+                derivedCtor.prototype[name] = function (...args) {
                     return this.instance[name](...args);
                 };
             }
@@ -103,4 +107,32 @@ function delegateTargetPrototypeMethod(derivedCtor, constructors) {
     });
 }
 exports.delegateTargetPrototypeMethod = delegateTargetPrototypeMethod;
+/**
+ * 代理目标原型上的特定方法
+ * @param derivedCtor
+ * @param methods
+ */
+function delegateTargetMethod(derivedCtor, methods) {
+    methods.forEach(name => {
+        derivedCtor.prototype[name] = function (...args) {
+            return this.instance[name](...args);
+        };
+    });
+}
+exports.delegateTargetMethod = delegateTargetMethod;
+/**
+ * 代理目标原型属性
+ * @param derivedCtor
+ * @param properties
+ */
+function delegateTargetProperties(derivedCtor, properties) {
+    properties.forEach(name => {
+        Object.defineProperty(derivedCtor.prototype, name, {
+            get() {
+                return this.instance[name];
+            },
+        });
+    });
+}
+exports.delegateTargetProperties = delegateTargetProperties;
 //# sourceMappingURL=index.js.map

package/dist/util/serviceFactory.d.ts

@@ -1,14 +1,14 @@
 /**
  * 多客户端工厂实现
  */
-export declare abstract class ServiceFactory<T> {
-    private clients;
-    private options;
+export declare abstract class ServiceFactory<T, U = T> {
+    protected clients: Map<string, T>;
+    protected options: {};
     protected initClients(options: any): Promise<void>;
     get<U = T>(id?: string): U;
-    createInstance(config: any, clientName?: any): Promise<any>;
-    abstract getName(): any;
-    protected abstract createClient(config: any): any;
+    createInstance(config: any, clientName?: any): Promise<T>;
+    abstract getName(): string;
+    protected abstract createClient(config: any, clientName: any): Promise<T>;
     protected destroyClient(client: T): Promise<void>;
     stop(): Promise<void>;
 }

package/dist/util/serviceFactory.js

@@ -31,7 +31,7 @@ class ServiceFactory {
     async createInstance(config, clientName) {
         // options.default will be merge in to options.clients[id]
         config = Object.assign({}, this.options['default'], config);
-        const client = await this.createClient(config);
+        const client = await this.createClient(config, clientName);
         if (clientName) {
             this.clients.set(clientName, client);
         }

package/dist/util/webRouterCollector.js

@@ -261,12 +261,14 @@ class WebRouterCollector {
             .map(item => {
             const urlString = item.url.toString();
             const weightArr = (0, decorator_1.isRegExp)(item.url)
-                ? urlString.split('/')
+                ? urlString.split('\\/')
                 : urlString.split('/');
             let weight = 0;
             // 权重，比如通配的不加权，非通配加权，防止通配出现在最前面
             for (const fragment of weightArr) {
-                if (fragment.includes(':') || fragment.includes('*')) {
+                if (fragment === '' ||
+                    fragment.includes(':') ||
+                    fragment.includes('*')) {
                     weight += 0;
                 }
                 else {
@@ -297,12 +299,12 @@ class WebRouterCollector {
             if (handlerA._category !== handlerB._category) {
                 return handlerB._category - handlerA._category;
             }
+            // 不同权重
+            if (handlerA._weight !== handlerB._weight) {
+                return handlerB._weight - handlerA._weight;
+            }
             // 不同长度
             if (handlerA._level === handlerB._level) {
-                // 不同权重
-                if (handlerA._weight !== handlerB._weight) {
-                    return handlerB._weight - handlerA._weight;
-                }
                 if (handlerB._pureRouter === handlerA._pureRouter) {
                     return (handlerA.url.toString().length - handlerB.url.toString().length);
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "2.13.1",
+  "version": "2.14.0",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,8 +21,9 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^2.13.0",
+    "@midwayjs/decorator": "^2.14.0",
     "chai": "^4.2.0",
+    "midway-test-component": "*",
     "mm": "3",
     "sinon": "^7.2.2"
   },
@@ -39,7 +40,6 @@
     "lodash.get": "^4.4.2",
     "lodash.set": "^4.3.2",
     "lodash.template": "^4.4.0",
-    "midway-test-component": "*",
     "picomatch": "^2.2.2",
     "reflect-metadata": "^0.1.13"
   },
@@ -51,5 +51,5 @@
   "engines": {
     "node": ">= 10.0.0"
   },
-  "gitHead": "d50576713e723aef47f1f7464eeecae82e605874"
+  "gitHead": "5fd716b0e731162d8e9f0931790fde7402fb83de"
 }