boring-router - npm Package Compare versions

Comparing version 0.4.5 to 0.4.6

bld/library/route-builder.js

@@ -38,3 +38,3 @@ "use strict";
     $ref() {
-        var _a;
+        var _a, _b;
         let router = this.router;
@@ -103,3 +103,6 @@ let sourceType = this.sourceType;
                 let { route, params: paramDict = {} } = buildingPart;
-                let segmentDict = route._pathSegments;
+                let nextSegmentDict = route._pathSegments;
+                let nextSegmentNames = lodash_1.default.keys(nextSegmentDict);
+                let restSegmentDict = lodash_1.default.pick(((_b = router._groupToRouteMatchMap.get(group)) === null || _b === void 0 ? void 0 : _b.$rest._pathSegments) || {}, nextSegmentNames);
+                let segmentDict = lodash_1.default.fromPairs(lodash_1.default.sortBy(lodash_1.default.entries(lodash_1.default.merge(restSegmentDict, nextSegmentDict)), ([key]) => nextSegmentNames.indexOf(key)));
                 pathMap.set(group, _utils_1.buildPath(segmentDict, paramDict));
@@ -106,0 +109,0 @@ let { queryMap: sourceQueryMap } = route._source;

package.json

 {
   "name": "boring-router",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "A type-safe MobX router with parallel routing support.",
@@ -36,3 +36,3 @@ "repository": {
   },
-  "gitHead": "cfa20c0a9c489001eb11aa1c5a07f49d8ec4a30a"
+  "gitHead": "a2b9326ce8f5771d61713e3da97d4cdd4f3dfac5"
 }

src/library/route-builder.ts

@@ -170,4 +170,17 @@ import _ from 'lodash';
 
-        let segmentDict = route._pathSegments;
+        let nextSegmentDict = route._pathSegments;
+        let nextSegmentNames = _.keys(nextSegmentDict);
 
+        let restSegmentDict = _.pick(
+          router._groupToRouteMatchMap.get(group)?.$rest._pathSegments || {},
+          nextSegmentNames,
+        );
+
+        let segmentDict = _.fromPairs(
+          _.sortBy(
+            _.entries(_.merge(restSegmentDict, nextSegmentDict)),
+            ([key]) => nextSegmentNames.indexOf(key),
+          ),
+        );
+
         pathMap.set(group, buildPath(segmentDict, paramDict));
@@ -174,0 +187,0 @@

No alert changes

Improved metrics

Total package byte prevSize

206556

increased by0.65%

Lines of code

4451

increased by0.32%

No dependency changes