@midwayjs/core 2.13.4 → 2.14.0

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.
 
+# [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)
 
 

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/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.4",
+  "version": "2.14.0",
   "description": "midway core",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -21,7 +21,7 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@midwayjs/decorator": "^2.13.2",
+    "@midwayjs/decorator": "^2.14.0",
     "chai": "^4.2.0",
     "midway-test-component": "*",
     "mm": "3",
@@ -51,5 +51,5 @@
   "engines": {
     "node": ">= 10.0.0"
   },
-  "gitHead": "9e61ff6e854b5641201e7d3df8aa19a7d6287f3d"
+  "gitHead": "5fd716b0e731162d8e9f0931790fde7402fb83de"
 }