@symbo.ls/router 2.3.10 → 2.8.3

package/index.js

@@ -1,6 +1,7 @@
 'use strict'
 
 import { merge } from '@domql/utils'
+import { setCookie } from '@domql/cookie'
 import { redirectBasedOnAuth } from '@symbo.ls/auth-redirect'
 
 export const getActiveRoute = (
@@ -26,18 +27,26 @@ export const router = (
   options = defaultOptions
 ) => {
   merge(options, defaultOptions)
-  lastLevel = options.lastLevel
-
-  const rootRoute = getActiveRoute(path, 0)
-  path = redirectBasedOnAuth(element, element.state, { route: rootRoute })
+  lastLevel = options.level
 
   const [pathname, hash] = (path).split('#')
+  const routeArray = pathname.split('/')
+  const rootRoute = `/${routeArray[1] || ''}`
+
+  const authRedirect = redirectBasedOnAuth(element, element.state, { route: rootRoute })
 
-  const route = getActiveRoute(pathname, options.level)
-  const content = element.routes[route] || element.routes['/*']
+  if (authRedirect && rootRoute !== authRedirect) {
+    // if (!element.state.__root.userToken)
+    routeArray[1] = authRedirect.slice(1)
+    console.log(authRedirect, routeArray)
+  }
+
+  const route = routeArray.join('/')
+  const routeInContent = `/${routeArray[lastLevel + 1] || ''}`
+  const content = element.routes[routeInContent] || element.routes['/*']
 
   if (content) {
-    if (options.pushState) window.history.pushState(state, null, pathname + (hash ? `#${hash}` : ''))
+    if (options.pushState) window.history.pushState(state, null, route + (hash ? `#${hash}` : ''))
 
     element.set({ tag: options.useFragment && 'fragment', extend: content })
     if (options.updateState) element.state.update({ route, hash })
@@ -53,7 +62,7 @@ export const router = (
         rootNode.scrollTo({ behavior: 'smooth', top, left: 0 })
       }
     }
-    
-    setCookie('route', path)
+
+    if (route !== '/*') setCookie('route', route)
   }
 }

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "@symbo.ls/router",
-  "version": "2.3.10",
+  "version": "2.8.3",
   "main": "index.js",
   "license": "MIT",
   "scripts": {
     "vpatch": "npm version patch && npm publish --access public"
   },
   "dependencies": {
+    "@domql/cookie": "latest",
     "@domql/utils": "latest",
     "@symbo.ls/auth-redirect": "latest"
   },
-  "gitHead": "66641a0ee9c94ecbe631b7b92e2018ad18af387b",
+  "gitHead": "14dff7d74c523437405b3e770acd7d60b3e92b69",
   "source": "index.js"
 }