kdu-router 3.4.0-beta.0 → 3.6.0

package/src/util/dom.js

@@ -1,3 +1,3 @@
-/* @flow */
-
-export const inBrowser = typeof window !== 'undefined'
+/* @flow */
+
+export const inBrowser = typeof window !== 'undefined'

package/src/util/errors.js

@@ -1,85 +1,86 @@
-export const NavigationFailureType = {
-  redirected: 2,
-  aborted: 4,
-  cancelled: 8,
-  duplicated: 16
-}
-
-export function createNavigationRedirectedError (from, to) {
-  return createRouterError(
-    from,
-    to,
-    NavigationFailureType.redirected,
-    `Redirected when going from "${from.fullPath}" to "${stringifyRoute(
-      to
-    )}" via a navigation guard.`
-  )
-}
-
-export function createNavigationDuplicatedError (from, to) {
-  const error = createRouterError(
-    from,
-    to,
-    NavigationFailureType.duplicated,
-    `Avoided redundant navigation to current location: "${from.fullPath}".`
-  )
-  // backwards compatible with the first introduction of Errors
-  error.name = 'NavigationDuplicated'
-  return error
-}
-
-export function createNavigationCancelledError (from, to) {
-  return createRouterError(
-    from,
-    to,
-    NavigationFailureType.cancelled,
-    `Navigation cancelled from "${from.fullPath}" to "${
-      to.fullPath
-    }" with a new navigation.`
-  )
-}
-
-export function createNavigationAbortedError (from, to) {
-  return createRouterError(
-    from,
-    to,
-    NavigationFailureType.aborted,
-    `Navigation aborted from "${from.fullPath}" to "${
-      to.fullPath
-    }" via a navigation guard.`
-  )
-}
-
-function createRouterError (from, to, type, message) {
-  const error = new Error(message)
-  error._isRouter = true
-  error.from = from
-  error.to = to
-  error.type = type
-
-  return error
-}
-
-const propertiesToLog = ['params', 'query', 'hash']
-
-function stringifyRoute (to) {
-  if (typeof to === 'string') return to
-  if ('path' in to) return to.path
-  const location = {}
-  propertiesToLog.forEach(key => {
-    if (key in to) location[key] = to[key]
-  })
-  return JSON.stringify(location, null, 2)
-}
-
-export function isError (err) {
-  return Object.prototype.toString.call(err).indexOf('Error') > -1
-}
-
-export function isNavigationFailure (err, errorType) {
-  return (
-    isError(err) &&
-    err._isRouter &&
-    (errorType == null || err.type === errorType)
-  )
-}
+// When changing thing, also edit router.d.ts
+export const NavigationFailureType = {
+  redirected: 2,
+  aborted: 4,
+  cancelled: 8,
+  duplicated: 16
+}
+
+export function createNavigationRedirectedError (from, to) {
+  return createRouterError(
+    from,
+    to,
+    NavigationFailureType.redirected,
+    `Redirected when going from "${from.fullPath}" to "${stringifyRoute(
+      to
+    )}" via a navigation guard.`
+  )
+}
+
+export function createNavigationDuplicatedError (from, to) {
+  const error = createRouterError(
+    from,
+    to,
+    NavigationFailureType.duplicated,
+    `Avoided redundant navigation to current location: "${from.fullPath}".`
+  )
+  // backwards compatible with the first introduction of Errors
+  error.name = 'NavigationDuplicated'
+  return error
+}
+
+export function createNavigationCancelledError (from, to) {
+  return createRouterError(
+    from,
+    to,
+    NavigationFailureType.cancelled,
+    `Navigation cancelled from "${from.fullPath}" to "${
+      to.fullPath
+    }" with a new navigation.`
+  )
+}
+
+export function createNavigationAbortedError (from, to) {
+  return createRouterError(
+    from,
+    to,
+    NavigationFailureType.aborted,
+    `Navigation aborted from "${from.fullPath}" to "${
+      to.fullPath
+    }" via a navigation guard.`
+  )
+}
+
+function createRouterError (from, to, type, message) {
+  const error = new Error(message)
+  error._isRouter = true
+  error.from = from
+  error.to = to
+  error.type = type
+
+  return error
+}
+
+const propertiesToLog = ['params', 'query', 'hash']
+
+function stringifyRoute (to) {
+  if (typeof to === 'string') return to
+  if ('path' in to) return to.path
+  const location = {}
+  propertiesToLog.forEach(key => {
+    if (key in to) location[key] = to[key]
+  })
+  return JSON.stringify(location, null, 2)
+}
+
+export function isError (err) {
+  return Object.prototype.toString.call(err).indexOf('Error') > -1
+}
+
+export function isNavigationFailure (err, errorType) {
+  return (
+    isError(err) &&
+    err._isRouter &&
+    (errorType == null || err.type === errorType)
+  )
+}

package/src/util/location.js

@@ -1,69 +1,69 @@
-/* @flow */
-
-import type KduRouter from '../index'
-import { parsePath, resolvePath } from './path'
-import { resolveQuery } from './query'
-import { fillParams } from './params'
-import { warn } from './warn'
-import { extend } from './misc'
-
-export function normalizeLocation (
-  raw: RawLocation,
-  current: ?Route,
-  append: ?boolean,
-  router: ?KduRouter
-): Location {
-  let next: Location = typeof raw === 'string' ? { path: raw } : raw
-  // named target
-  if (next._normalized) {
-    return next
-  } else if (next.name) {
-    next = extend({}, raw)
-    const params = next.params
-    if (params && typeof params === 'object') {
-      next.params = extend({}, params)
-    }
-    return next
-  }
-
-  // relative params
-  if (!next.path && next.params && current) {
-    next = extend({}, next)
-    next._normalized = true
-    const params: any = extend(extend({}, current.params), next.params)
-    if (current.name) {
-      next.name = current.name
-      next.params = params
-    } else if (current.matched.length) {
-      const rawPath = current.matched[current.matched.length - 1].path
-      next.path = fillParams(rawPath, params, `path ${current.path}`)
-    } else if (process.env.NODE_ENV !== 'production') {
-      warn(false, `relative params navigation requires a current route.`)
-    }
-    return next
-  }
-
-  const parsedPath = parsePath(next.path || '')
-  const basePath = (current && current.path) || '/'
-  const path = parsedPath.path
-    ? resolvePath(parsedPath.path, basePath, append || next.append)
-    : basePath
-
-  const query = resolveQuery(
-    parsedPath.query,
-    next.query,
-    router && router.options.parseQuery
-  )
-
-  let hash = next.hash || parsedPath.hash
-  if (hash && hash.charAt(0) !== '#') {
-    hash = `#${hash}`
-  }
-
-  return {
-    _normalized: true,
-    path,
-    query,
-    hash
-  }
-}
+/* @flow */
+
+import type KduRouter from '../index'
+import { parsePath, resolvePath } from './path'
+import { resolveQuery } from './query'
+import { fillParams } from './params'
+import { warn } from './warn'
+import { extend } from './misc'
+
+export function normalizeLocation (
+  raw: RawLocation,
+  current: ?Route,
+  append: ?boolean,
+  router: ?KduRouter
+): Location {
+  let next: Location = typeof raw === 'string' ? { path: raw } : raw
+  // named target
+  if (next._normalized) {
+    return next
+  } else if (next.name) {
+    next = extend({}, raw)
+    const params = next.params
+    if (params && typeof params === 'object') {
+      next.params = extend({}, params)
+    }
+    return next
+  }
+
+  // relative params
+  if (!next.path && next.params && current) {
+    next = extend({}, next)
+    next._normalized = true
+    const params: any = extend(extend({}, current.params), next.params)
+    if (current.name) {
+      next.name = current.name
+      next.params = params
+    } else if (current.matched.length) {
+      const rawPath = current.matched[current.matched.length - 1].path
+      next.path = fillParams(rawPath, params, `path ${current.path}`)
+    } else if (process.env.NODE_ENV !== 'production') {
+      warn(false, `relative params navigation requires a current route.`)
+    }
+    return next
+  }
+
+  const parsedPath = parsePath(next.path || '')
+  const basePath = (current && current.path) || '/'
+  const path = parsedPath.path
+    ? resolvePath(parsedPath.path, basePath, append || next.append)
+    : basePath
+
+  const query = resolveQuery(
+    parsedPath.query,
+    next.query,
+    router && router.options.parseQuery
+  )
+
+  let hash = next.hash || parsedPath.hash
+  if (hash && hash.charAt(0) !== '#') {
+    hash = `#${hash}`
+  }
+
+  return {
+    _normalized: true,
+    path,
+    query,
+    hash
+  }
+}

package/src/util/misc.js

@@ -1,6 +1,6 @@
-export function extend (a, b) {
-  for (const key in b) {
-    a[key] = b[key]
-  }
-  return a
-}
+export function extend (a, b) {
+  for (const key in b) {
+    a[key] = b[key]
+  }
+  return a
+}

package/src/util/params.js

@@ -1,37 +1,37 @@
-/* @flow */
-
-import { warn } from './warn'
-import Regexp from 'path-to-regexp'
-
-// $flow-disable-line
-const regexpCompileCache: {
-  [key: string]: Function
-} = Object.create(null)
-
-export function fillParams (
-  path: string,
-  params: ?Object,
-  routeMsg: string
-): string {
-  params = params || {}
-  try {
-    const filler =
-      regexpCompileCache[path] ||
-      (regexpCompileCache[path] = Regexp.compile(path))
-
-    // Fix #2505 resolving asterisk routes { name: 'not-found', params: { pathMatch: '/not-found' }}
-    // and fix #3106 so that you can work with location descriptor object having params.pathMatch equal to empty string
-    if (typeof params.pathMatch === 'string') params[0] = params.pathMatch
-
-    return filler(params, { pretty: true })
-  } catch (e) {
-    if (process.env.NODE_ENV !== 'production') {
-      // Fix #3072 no warn if `pathMatch` is string
-      warn(typeof params.pathMatch === 'string', `missing param for ${routeMsg}: ${e.message}`)
-    }
-    return ''
-  } finally {
-    // delete the 0 if it was added
-    delete params[0]
-  }
-}
+/* @flow */
+
+import { warn } from './warn'
+import Regexp from 'path-to-regexp'
+
+// $flow-disable-line
+const regexpCompileCache: {
+  [key: string]: Function
+} = Object.create(null)
+
+export function fillParams (
+  path: string,
+  params: ?Object,
+  routeMsg: string
+): string {
+  params = params || {}
+  try {
+    const filler =
+      regexpCompileCache[path] ||
+      (regexpCompileCache[path] = Regexp.compile(path))
+
+    // Fix #2505 resolving asterisk routes { name: 'not-found', params: { pathMatch: '/not-found' }}
+    // and fix #3106 so that you can work with location descriptor object having params.pathMatch equal to empty string
+    if (typeof params.pathMatch === 'string') params[0] = params.pathMatch
+
+    return filler(params, { pretty: true })
+  } catch (e) {
+    if (process.env.NODE_ENV !== 'production') {
+      // Fix #3072 no warn if `pathMatch` is string
+      warn(typeof params.pathMatch === 'string', `missing param for ${routeMsg}: ${e.message}`)
+    }
+    return ''
+  } finally {
+    // delete the 0 if it was added
+    delete params[0]
+  }
+}

package/src/util/path.js

@@ -1,74 +1,74 @@
-/* @flow */
-
-export function resolvePath (
-  relative: string,
-  base: string,
-  append?: boolean
-): string {
-  const firstChar = relative.charAt(0)
-  if (firstChar === '/') {
-    return relative
-  }
-
-  if (firstChar === '?' || firstChar === '#') {
-    return base + relative
-  }
-
-  const stack = base.split('/')
-
-  // remove trailing segment if:
-  // - not appending
-  // - appending to trailing slash (last segment is empty)
-  if (!append || !stack[stack.length - 1]) {
-    stack.pop()
-  }
-
-  // resolve relative path
-  const segments = relative.replace(/^\//, '').split('/')
-  for (let i = 0; i < segments.length; i++) {
-    const segment = segments[i]
-    if (segment === '..') {
-      stack.pop()
-    } else if (segment !== '.') {
-      stack.push(segment)
-    }
-  }
-
-  // ensure leading slash
-  if (stack[0] !== '') {
-    stack.unshift('')
-  }
-
-  return stack.join('/')
-}
-
-export function parsePath (path: string): {
-  path: string;
-  query: string;
-  hash: string;
-} {
-  let hash = ''
-  let query = ''
-
-  const hashIndex = path.indexOf('#')
-  if (hashIndex >= 0) {
-    hash = path.slice(hashIndex)
-    path = path.slice(0, hashIndex)
-  }
-
-  const queryIndex = path.indexOf('?')
-  if (queryIndex >= 0) {
-    query = path.slice(queryIndex + 1)
-    path = path.slice(0, queryIndex)
-  }
-
-  return {
-    path,
-    query,
-    hash
-  }
-}
-
-export function cleanPath (path: string): string {
-  return path.replace(/\/\//g, '/')
-}
+/* @flow */
+
+export function resolvePath (
+  relative: string,
+  base: string,
+  append?: boolean
+): string {
+  const firstChar = relative.charAt(0)
+  if (firstChar === '/') {
+    return relative
+  }
+
+  if (firstChar === '?' || firstChar === '#') {
+    return base + relative
+  }
+
+  const stack = base.split('/')
+
+  // remove trailing segment if:
+  // - not appending
+  // - appending to trailing slash (last segment is empty)
+  if (!append || !stack[stack.length - 1]) {
+    stack.pop()
+  }
+
+  // resolve relative path
+  const segments = relative.replace(/^\//, '').split('/')
+  for (let i = 0; i < segments.length; i++) {
+    const segment = segments[i]
+    if (segment === '..') {
+      stack.pop()
+    } else if (segment !== '.') {
+      stack.push(segment)
+    }
+  }
+
+  // ensure leading slash
+  if (stack[0] !== '') {
+    stack.unshift('')
+  }
+
+  return stack.join('/')
+}
+
+export function parsePath (path: string): {
+  path: string;
+  query: string;
+  hash: string;
+} {
+  let hash = ''
+  let query = ''
+
+  const hashIndex = path.indexOf('#')
+  if (hashIndex >= 0) {
+    hash = path.slice(hashIndex)
+    path = path.slice(0, hashIndex)
+  }
+
+  const queryIndex = path.indexOf('?')
+  if (queryIndex >= 0) {
+    query = path.slice(queryIndex + 1)
+    path = path.slice(0, queryIndex)
+  }
+
+  return {
+    path,
+    query,
+    hash
+  }
+}
+
+export function cleanPath (path: string): string {
+  return path.replace(/\/(?:\s*\/)+/g, '/')
+}

package/src/util/push-state.js

@@ -1,46 +1,46 @@
-/* @flow */
-
-import { inBrowser } from './dom'
-import { saveScrollPosition } from './scroll'
-import { genStateKey, setStateKey, getStateKey } from './state-key'
-import { extend } from './misc'
-
-export const supportsPushState =
-  inBrowser &&
-  (function () {
-    const ua = window.navigator.userAgent
-
-    if (
-      (ua.indexOf('Android 2.') !== -1 || ua.indexOf('Android 4.0') !== -1) &&
-      ua.indexOf('Mobile Safari') !== -1 &&
-      ua.indexOf('Chrome') === -1 &&
-      ua.indexOf('Windows Phone') === -1
-    ) {
-      return false
-    }
-
-    return window.history && typeof window.history.pushState === 'function'
-  })()
-
-export function pushState (url?: string, replace?: boolean) {
-  saveScrollPosition()
-  // try...catch the pushState call to get around Safari
-  // DOM Exception 18 where it limits to 100 pushState calls
-  const history = window.history
-  try {
-    if (replace) {
-      // preserve existing history state as it could be overriden by the user
-      const stateCopy = extend({}, history.state)
-      stateCopy.key = getStateKey()
-      history.replaceState(stateCopy, '', url)
-    } else {
-      history.pushState({ key: setStateKey(genStateKey()) }, '', url)
-    }
-  } catch (e) {
-    window.location[replace ? 'replace' : 'assign'](url)
-  }
-}
-
-export function replaceState (url?: string) {
-  pushState(url, true)
-}
+/* @flow */
+
+import { inBrowser } from './dom'
+import { saveScrollPosition } from './scroll'
+import { genStateKey, setStateKey, getStateKey } from './state-key'
+import { extend } from './misc'
+
+export const supportsPushState =
+  inBrowser &&
+  (function () {
+    const ua = window.navigator.userAgent
+
+    if (
+      (ua.indexOf('Android 2.') !== -1 || ua.indexOf('Android 4.0') !== -1) &&
+      ua.indexOf('Mobile Safari') !== -1 &&
+      ua.indexOf('Chrome') === -1 &&
+      ua.indexOf('Windows Phone') === -1
+    ) {
+      return false
+    }
+
+    return window.history && typeof window.history.pushState === 'function'
+  })()
+
+export function pushState (url?: string, replace?: boolean) {
+  saveScrollPosition()
+  // try...catch the pushState call to get around Safari
+  // DOM Exception 18 where it limits to 100 pushState calls
+  const history = window.history
+  try {
+    if (replace) {
+      // preserve existing history state as it could be overriden by the user
+      const stateCopy = extend({}, history.state)
+      stateCopy.key = getStateKey()
+      history.replaceState(stateCopy, '', url)
+    } else {
+      history.pushState({ key: setStateKey(genStateKey()) }, '', url)
+    }
+  } catch (e) {
+    window.location[replace ? 'replace' : 'assign'](url)
+  }
+}
+
+export function replaceState (url?: string) {
+  pushState(url, true)
+}