fixed initial context without slash 🔧

cinic · May 31, 2021 · 3eee1f2 · 3eee1f2
1 parent 6aabae9
commit 3eee1f2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/index.test.ts b/src/index.test.ts
@@ -0,0 +1,11 @@
+import {createURLRouter, $context} from './index'
+
+describe('Test router creation', () => {
+  it('context without /', () => {
+    createURLRouter({
+      context: 'dealer',
+      routes: [{path: '/', view: () => console.log('Hello')}],
+    })
+    expect($context.getState()).toBe('/dealer')
+  })
+})
diff --git a/src/index.ts b/src/index.ts
@@ -17,7 +17,7 @@ const pushState = createEffect(
   },
 )
 
-const $context = restore(changeContext, '')
+export const $context = restore(changeContext, '')
 const $routes = restore(addRoutes, [])
 const $currentPathname = createStore('/')
 export const $currentRoute = combine(
@@ -46,15 +46,14 @@ export function createURLRouter({
 }: RouterParams): Router {
   if (!Array.isArray(routes)) throw Error('routes should be an Array of Route!')
 
-  if (context) {
-    context.match(/^[^/]/) ? changeContext(`/${context}`) : changeContext(context)
-  }
+  const ctx = context && context.match(/^[^/]/) ? `/${context}` : context
 
+  changeContext(ctx)
   addRoutes(routes)
-  popState(location.pathname.replace(context, ''))
+  popState(location.pathname.replace(ctx, ''))
 
   window.addEventListener('popstate', (e) =>
-    popState((e.target as Window).location.pathname.replace(context, '')),
+    popState((e.target as Window).location.pathname.replace(ctx, '')),
   )
 
   return () =>