boring-router - npm Package Compare versions

Comparing version 0.5.2 to 0.5.3

bld/library/route-builder.js

@@ -126,5 +126,6 @@ "use strict";
                 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, (0, _utils_1.buildPath)(segmentDict, paramDict));
+                let queryKeyToIdMap = route._queryKeyToIdMap;
+                let queryKeys = Array.from(queryKeyToIdMap.keys());
+                pathMap.set(group, (0, _utils_1.buildPath)(segmentDict, lodash_1.default.omit(paramDict, queryKeys)));
                 let { queryMap: sourceQueryMap } = route._source;
-                let queryKeyToIdMap = route._queryKeyToIdMap;
                 for (let [key, { id, value }] of sourceQueryMap) {
@@ -139,3 +140,3 @@ let routeQueryId = queryKeyToIdMap.get(key);
                 }
-                let restParamKeys = lodash_1.default.difference(Object.keys(paramDict), Object.keys(segmentDict));
+                let restParamKeys = lodash_1.default.difference(Object.keys(paramDict), lodash_1.default.difference(Object.keys(segmentDict), queryKeys));
                 for (let key of restParamKeys) {
@@ -142,0 +143,0 @@ if (!queryKeyToIdMap.has(key)) {

package.json

 {
   "name": "boring-router",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "A type-safe MobX router with parallel routing support.",
@@ -37,3 +37,3 @@ "license": "MIT",
   },
-  "gitHead": "3224a8cd1dc10ccdc2f489204790dae0ac384cae"
+  "gitHead": "99fbeaaac90007ecb991e15d8476fa7d5b6c5efa"
 }

src/library/route-builder.ts

@@ -184,8 +184,12 @@ import _ from 'lodash';
 
-        pathMap.set(group, buildPath(segmentDict, paramDict));
+        let queryKeyToIdMap = route._queryKeyToIdMap;
+        let queryKeys = Array.from(queryKeyToIdMap.keys());
 
+        pathMap.set(
+          group,
+          buildPath(segmentDict, _.omit(paramDict, queryKeys)),
+        );
+
         let {queryMap: sourceQueryMap} = route._source;
 
-        let queryKeyToIdMap = route._queryKeyToIdMap;
-
         for (let [key, {id, value}] of sourceQueryMap) {
@@ -207,3 +211,3 @@ let routeQueryId = queryKeyToIdMap.get(key);
           Object.keys(paramDict),
-          Object.keys(segmentDict),
+          _.difference(Object.keys(segmentDict), queryKeys),
         );
@@ -210,0 +214,0 @@

No alert changes

Improved metrics

Total package byte prevSize

239572

increased by0.18%

Lines of code

4753

increased by0.11%

No dependency changes