mock-config-server 3.6.0 → 3.6.1

package/dist/src/core/rest/createRestRoutes/helpers/prepareRestRequestConfigs/prepareRestRequestConfigs.js

@@ -34,7 +34,31 @@ const calculateRouteConfigWeight = (restRouteConfig)=>{
     return routeConfigWeight;
 };
 const prepareRestRequestConfigs = (requestConfigs)=>{
-    requestConfigs.forEach((requestConfig)=>{
+    const sortedByPathRequestConfigs = requestConfigs.sort(({ path: firstPath }, { path: secondPath })=>{
+        // ✅ important:
+        // do not compare RegExp paths and non-parameterized paths
+        if (firstPath instanceof RegExp || secondPath instanceof RegExp) return 0;
+        if (!firstPath.includes('/:') && !secondPath.includes('/:')) return 0;
+        const firstPathParts = firstPath.split('/');
+        const secondPathParts = secondPath.split('/');
+        const minimalPathPartsLength = Math.min(firstPathParts.length, secondPathParts.length);
+        // ✅ important:
+        // need to find the leftmost parameter/non-parameter pair and give priority to non-parameter one
+        for(let i = 0; i < minimalPathPartsLength; i += 1){
+            const firstPathPart = firstPathParts[i];
+            const secondPathPart = secondPathParts[i];
+            const isFirstPathPartParameter = firstPathPart.startsWith(':');
+            const isSecondPathPartParameter = secondPathPart.startsWith(':');
+            if (!isFirstPathPartParameter && !isSecondPathPartParameter) {
+                if (firstPathPart === secondPathPart) continue;
+                return 0;
+            }
+            if (isFirstPathPartParameter && isSecondPathPartParameter) continue;
+            return +isFirstPathPartParameter - +isSecondPathPartParameter;
+        }
+        return 0;
+    });
+    sortedByPathRequestConfigs.forEach((requestConfig)=>{
         requestConfig.routes.sort((first, second)=>// ✅ important:
             // Lift more specific configs for correct working of routes
             calculateRouteConfigWeight(second) - calculateRouteConfigWeight(first));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mock-config-server",
-  "version": "3.6.0",
+  "version": "3.6.1",
   "description": "Tool that easily and quickly imitates server operation, create full fake api in few steps",
   "author": {
     "name": "SIBERIA CAN CODE 🧊",