@midwayjs/core 3.0.0-beta.4 → 3.0.0-beta.5

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [3.0.0-beta.5](https://github.com/midwayjs/midway/compare/v3.0.0-beta.4...v3.0.0-beta.5) (2021-11-25)
+
+
+### Bug Fixes
+
+* [@match](https://github.com/match) empty args ([#1384](https://github.com/midwayjs/midway/issues/1384)) ([6f90fc9](https://github.com/midwayjs/midway/commit/6f90fc993ff01e078288ff664833c61c02dede51))
+* router sort ([#1383](https://github.com/midwayjs/midway/issues/1383)) ([f253887](https://github.com/midwayjs/midway/commit/f2538876d3eaf7dec55173d86b5b9caeeeb7be64))
+
+
+
+
+
 # [3.0.0-beta.4](https://github.com/midwayjs/midway/compare/v3.0.0-beta.3...v3.0.0-beta.4) (2021-11-24)
 
 

package/dist/common/filterManager.js

@@ -71,7 +71,7 @@ class FilterManager {
     async runResultFilter(result, ctx, res, next) {
         let returnValue = result;
         for (const matchData of this.matchFnList) {
-            if (matchData.matchFn(ctx)) {
+            if (matchData.matchFn(ctx, res)) {
                 returnValue = await matchData.target.match(returnValue, ctx, res, next);
             }
         }

package/dist/common/webRouterCollector.js

@@ -229,12 +229,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 {
@@ -265,12 +267,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/dist/interface.d.ts

@@ -14,7 +14,7 @@ export declare type ServiceFactoryConfigOption<OPTIONS> = {
         [key: string]: PowerPartial<OPTIONS>;
     };
 };
-declare type ConfigType<T> = T extends (args: any[]) => any ? PowerPartial<ReturnType<T>> : PowerPartial<T>;
+declare type ConfigType<T> = T extends (...args: any[]) => any ? PowerPartial<ReturnType<T>> : PowerPartial<T>;
 export declare type FileConfigOption<T, K = unknown> = K extends keyof ConfigType<T> ? Pick<ConfigType<T>, K> : ConfigType<T>;
 /**
  * 生命周期定义

package/dist/util/index.js

@@ -211,6 +211,9 @@ const transformRequestObjectByType = (originValue, targetType) => {
 };
 exports.transformRequestObjectByType = transformRequestObjectByType;
 function toPathMatch(pattern) {
+    if (typeof pattern === 'boolean') {
+        return ctx => pattern;
+    }
     if (typeof pattern === 'string') {
         const reg = (0, pathToRegexp_1.pathToRegexp)(pattern, [], { end: false });
         if (reg.global)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/core",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.5",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,7 +21,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^3.0.0-beta.4",
+    "@midwayjs/decorator": "^3.0.0-beta.5",
     "midway-test-component": "*",
     "mm": "3",
     "sinon": "^7.2.2"
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@midwayjs/glob": "^1.0.2",
-    "@midwayjs/logger": "^3.0.0-beta.4",
+    "@midwayjs/logger": "^3.0.0-beta.5",
     "class-transformer": "^0.4.0",
     "extend2": "^1.0.0",
     "picomatch": "^2.2.2",
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=12"
   },
-  "gitHead": "02e2144e302f807770b512b0d89da3145b1cbf2e"
+  "gitHead": "ab0bf05ae6d13f6435db2f7223202be61d585a1b"
 }