@symbo.ls/router 2.12.111 → 2.12.115

package/index.js

@@ -1,21 +1,31 @@
-'use strict'
-
 import * as utils from '@domql/utils'
-const { setCookie, merge } = (utils.default || utils)
+const { setCookie, merge } = utils.default || utils
+
+export * from './location.js'
 
-export const getLocationPath = (index = 0, route = window.location.pathname) => {
+export const getLocationPath = (
+  index = 0,
+  route = window.location.pathname
+) => {
   const routeArray = route.split('/')
   const activeRoute = routeArray[index + 1]
-  if (activeRoute) return `/${activeRoute}`
+  if (activeRoute) {
+    return `/${activeRoute}`
+  }
 }
 
-export const getLastLocationPath = (level = 0, route = window.location.pathname) => {
+export const getLastLocationPath = (
+  level = 0,
+  route = window.location.pathname
+) => {
   const routeArray = route.split('/')
   const activeRoute = routeArray[routeArray.length - level - 1]
-  if (activeRoute) return `/${activeRoute}`
+  if (activeRoute) {
+    return `/${activeRoute}`
+  }
 }
 
-export let lastPathname
+export let lastPathname = null
 export let lastLevel = 0
 
 const defaultOptions = {
@@ -41,12 +51,9 @@ const defaultOptions = {
   scrollToOptions: { behavior: 'smooth' }
 }
 
-export function router (
-  path = '/',
-  el,
-  state = {},
-  passedOptions = {}
-) {
+// eslint-disable-next-line func-style, complexity, default-param-last
+export function router (path = '/', el, state = {}, passedOptions = {}) {
+  // eslint-disable-next-line no-invalid-this
   const element = el || (this && this.getRoot())
   const options = merge(passedOptions, defaultOptions)
   lastLevel = options.level
@@ -71,76 +78,113 @@ export function router (
 
   const content = element.routes[routeInContent] || element.routes['/*']
 
-  const wasModal = element.call('isModalRoute', options.window.location.pathname.split('#')[0])
+  const wasModal = element.call(
+    'isModalRoute',
+    options.window.location.pathname.split('#')[0]
+  )
   const isInitial = options.initialRender
   const hashChanged = hash && hash !== options.window.location.hash
   const pathChanged = pathname !== lastPathname
   lastPathname = pathname
 
-  if (!content || (element.state.root.debugging && !options.allowRouterWhileInspect)) return
+  if (
+    !content ||
+    (element.state.root.debugging && !options.allowRouterWhileInspect)
+  ) {
+    return
+  }
   if (options.pushState) {
-    options.window.history.pushState({
-      prevUrl: options.window.location.href, ...state
-    }, null, route + (search ? `${search}` : '') + (hash ? `${hash}` : ''))
+    options.window.history.pushState(
+      {
+        prevUrl: options.window.location.href,
+        ...state
+      },
+      null,
+      route + (search ? `${search}` : '') + (hash ? `${hash}` : '')
+    )
   }
 
-  const isModal = !!element.call('isModalRoute', pathname)
+  const isModal = Boolean(element.call('isModalRoute', pathname))
 
   if (pathChanged || !hashChanged) {
     // const rootRouteHasChanged = rootRoute !== element.state.rootRoute
     //  || (!rootRouteHasChanged && { preventUpdateTriggerStateUpdate: true, preventContentUpdate: true })
 
     if (options.updateState) {
-      element.state.update({ route, hash, routeInContent, debugging: false }, {
-        preventUpdate: options.preventUpdate,
-        updateByRouter: true,
-        onlyUpdate: isModal && 'Modal',
-        ...options.updateStateOptions
-      })
+      element.state.update(
+        { route, hash, routeInContent, debugging: false },
+        {
+          preventUpdate: options.preventUpdate,
+          updateByRouter: true,
+          onlyUpdate: isModal && 'Modal',
+          ...options.updateStateOptions
+        }
+      )
     }
 
     const hasSet = isInitial || (!isInitial && !isModal)
     if (hasSet) {
       if (options.forceContentUpdate || (!isInitial && wasModal)) {
-        element.content.update({}, {
-          preventUpdate: options.preventUpdate
-        })
+        element.content.update(
+          {},
+          {
+            preventUpdate: options.preventUpdate
+          }
+        )
       } else {
-        element.set({
-          tag: options.useFragment && 'fragment',
-          extend: content
-        }, {
-        // ...(!isInitial && wasModal && !options.forceContentUpdate && { preventContentUpdate: true }),
-          preventUpdate: options.preventUpdate,
-          ...options.setOptions
-        })
+        element.set(
+          {
+            tag: options.useFragment && 'fragment',
+            extend: content
+          },
+          {
+            // ...(!isInitial && wasModal && !options.forceContentUpdate && { preventContentUpdate: true }),
+            preventUpdate: options.preventUpdate,
+            ...options.setOptions
+          }
+        )
+      }
+      if (element.content) {
+        element.content.__ref.__componentKey = route
       }
-      element.content.__ref.__componentKey = route
     }
   }
 
   const rootNode = element.node
-  const scrollNode = options.scrollDocument ? options.window.document.documentElement : rootNode
+  const scrollNode = options.scrollDocument
+    ? options.window.document.documentElement
+    : rootNode
   if (options.scrollToTop) {
     scrollNode.scrollTo({
-      ...(options.scrollToOptions || {}), top: 0, left: 0
+      ...(options.scrollToOptions || {}),
+      top: 0,
+      left: 0
     })
   }
   if (options.scrollToNode) {
     content.content.node.scrollTo({
-      ...(options.scrollToOptions || {}), top: 0, left: 0
+      ...(options.scrollToOptions || {}),
+      top: 0,
+      left: 0
     })
   }
 
   if (hash) {
     const activeNode = options.window.document.getElementById(hash.slice(1))
     if (activeNode) {
-      const top = activeNode.getBoundingClientRect().top + rootNode.scrollTop - options.scrollToOffset || 0
+      const top =
+        activeNode.getBoundingClientRect().top +
+          rootNode.scrollTop -
+          options.scrollToOffset || 0
       scrollNode.scrollTo({
-        ...(options.scrollToOptions || {}), top, left: 0
+        ...(options.scrollToOptions || {}),
+        top,
+        left: 0
       })
     }
   }
 
-  if (route !== '/*') setCookie('route', route)
+  if (route !== '/*') {
+    setCookie('route', route)
+  }
 }

package/location.js

@@ -0,0 +1,3 @@
+export const onLeave = msg => {
+  window.onbeforeunload = () => msg || 'Are you sure you want to leave?'
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/router",
-  "version": "2.12.111",
+  "version": "2.12.115",
   "main": "index.js",
   "license": "MIT",
   "type": "module",
@@ -12,6 +12,6 @@
     "@domql/utils": "latest",
     "@symbo.ls/auth-redirect": "latest"
   },
-  "gitHead": "ead7b40e059bcf0f3f8afacdf108e90c57ea6a2f",
+  "gitHead": "f777ffc758150302112fa1fd4b7b852a15bc939e",
   "source": "index.js"
 }