Fix bug when named params route starts with /.

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Svelte Router changelog
 
+## 6.0.2
+
+Fix bug with named routes starting with a /.
+
 ## 6.0.1
 
 Update type definitions.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte-router-spa",
-  "version": "6.0.1",
+  "version": "6.0.2",
   "description": "A full featured router component for Svelte and your Single Page Applications.",
   "main": "lib/cjs/index.js",
   "browser": "lib/index.js",

src/lib/utils.js

@@ -159,20 +159,12 @@ const removeExtraPaths = (pathNames, basePathNames) => {
  **/
 
 const removeSlash = (pathName, position = 'lead') => {
-  if (pathName.trim().length < 1) {
-    return '';
-  }
-
   if (position === 'trail' || position === 'both') {
-    if (pathName.slice(-1) === '/') {
-      pathName = pathName.slice(0, -1);
-    }
+    pathName = pathName.replace(/\/$/, '');
   }
 
   if (position === 'lead' || position === 'both') {
-    if (pathName[0] === '/') {
-      pathName = pathName.slice(1);
-    }
+    pathName = pathName.replace(/^\//, '');
   }
 
   return pathName;
@@ -198,6 +190,7 @@ const routeNameLocalised = (route, language = null) => {
  **/
 const startsWithNamedParam = (currentRoute) => {
   const routeName = removeSlash(currentRoute);
+
   return routeName.startsWith(':');
 };
 

src/router/finder.js

@@ -2,7 +2,7 @@ import { UrlParser } from './url_parser';
 import { RouterRedirect } from './redirect';
 import { RouterRoute } from './route';
 import { RouterPath } from './path';
-import { anyEmptyNestedRoutes, pathWithoutQueryParams, startsWithNamedParam } from '../lib/utils';
+import { anyEmptyNestedRoutes, pathWithoutQueryParams, removeSlash, startsWithNamedParam } from '../lib/utils';
 
 const NotFoundPage = '/404.html';
 
@@ -45,6 +45,9 @@ function RouterFinder({ routes, currentUrl, routerOptions, convert }) {
 
     routes.forEach(function (route) {
       routerPath.updatedPath(route);
+      if (route.name !== '/') {
+        route.name = removeSlash(route.name);
+      }
       if (matchRoute(routerPath, route.name)) {
         let routePath = routerPath.routePath();
         redirectTo = RouterRedirect(route, redirectTo).path();

src/router/path.js

@@ -1,4 +1,11 @@
-import { updateRoutePath, getNamedParams, nameToPath, removeExtraPaths, routeNameLocalised } from '../lib/utils';
+import {
+  getNamedParams,
+  nameToPath,
+  updateRoutePath,
+  removeExtraPaths,
+  removeSlash,
+  routeNameLocalised
+} from '../lib/utils';
 
 function RouterPath({ basePath, basePathName, pathNames, convert, currentLanguage }) {
   let updatedPathRoute;

test/spa_router.test.js

@@ -427,7 +427,7 @@ describe('Router', function () {
               nestedRoutes: [
                 { name: 'index', component: 'EmployeesIndex' },
                 {
-                  name: 'show/:id/:full-name',
+                  name: '/show/:id/:full-name',
                   component: 'ShowEmployee',
                 },
               ],
@@ -436,6 +436,7 @@ describe('Router', function () {
         },
       ]
     })
+
     describe('When path is nested with named params', function () {
       let showEmployeeRoute
       let activeRoute