space-router 0.8.4 → 0.9.0

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "space-router",
   "description": "All the routing essentials.",
-  "version": "0.8.4",
+  "version": "0.9.0",
   "main": "dist/cjs",
   "module": "dist/esm",
+  "type": "module",
   "license": "ICS",
   "repository": {
     "type": "git",
@@ -21,27 +22,25 @@
   ],
   "author": "Karolis Narkevicius",
   "scripts": {
-    "test": "healthier && prettier --check '**/*.{js,css,yml}' && nyc ava",
+    "test": "npm run build && healthier && prettier --check '**/*.{js,css,yml}' && c8 ava",
     "format": "prettier --write '**/*.{js,css,yml}'",
-    "coverage": "nyc --reporter=html ava",
+    "coverage": "c8 --reporter=html ava",
     "build": "node ./tasks/build.js",
     "watch": "node ./tasks/build.js -w",
-    "version": "npm run build",
     "release": "np --no-release-draft",
     "release:beta": "np --tag=beta --no-release-draft",
     "release:docs": "hugo -s docs && gh-pages -d docs/public"
   },
   "devDependencies": {
-    "@babel/cli": "^7.16.0",
-    "@babel/preset-env": "^7.16.0",
-    "ava": "^3.15.0",
+    "@swc/cli": "^0.1.62",
+    "@swc/core": "^1.3.49",
+    "ava": "^5.2.0",
+    "c8": "^7.13.0",
     "esm": "^3.2.25",
-    "execa": "^5.1.1",
-    "gh-pages": "^3.2.3",
-    "healthier": "^4.0.0",
-    "np": "^7.5.0",
-    "nyc": "^15.1.0",
-    "prettier": "^2.4.1"
+    "execa": "^7.1.1",
+    "gh-pages": "^5.0.0",
+    "healthier": "^6.3.0",
+    "prettier": "^2.8.7"
   },
   "healthier": {
     "global": [

package/src/history.js

@@ -1,7 +1,8 @@
-export function createHistory(onChange, options) {
+export function createHistory(options) {
   const sync = options.sync
   let mode = options.mode
   let raf
+  let onPop
 
   const memory = []
   let off
@@ -17,19 +18,22 @@ export function createHistory(onChange, options) {
     }
   }
 
-  if (mode !== 'memory') {
-    off = on(window, mode === 'history' ? 'popstate' : 'hashchange', onPop)
-  }
+  function listen(onChange) {
+    onPop = () => onChange(getUrl())
 
-  function onPop() {
-    onChange(getUrl())
-  }
+    if (mode !== 'memory') {
+      off = on(window, mode === 'history' ? 'popstate' : 'hashchange', onPop)
+      raf(onPop)
+    }
 
-  if (mode !== 'memory') {
-    onChange(getUrl())
+    return () => {
+      destroyed = true
+      off && off()
+    }
   }
 
   return {
+    listen,
     getUrl,
     push(url) {
       go(url)
@@ -37,10 +41,6 @@ export function createHistory(onChange, options) {
     replace(url) {
       go(url, true)
     },
-    destroy() {
-      destroyed = true
-      off && off()
-    },
   }
 
   function go(url, replace) {

package/src/index.js

@@ -1,3 +1,3 @@
-export { createRouter, merge } from './router'
-export { createHistory } from './history'
-export { qs } from './qs'
+export { createRouter, merge } from './router.js'
+export { createHistory } from './history.js'
+export { qs } from './qs.js'

package/src/router.js

@@ -1,6 +1,6 @@
-import { match as findMatch } from './match'
-import { createHistory } from './history'
-import { qs as defaultQs } from './qs'
+import { match as findMatch } from './match.js'
+import { createHistory } from './history.js'
+import { qs as defaultQs } from './qs.js'
 
 export function createRouter(options = {}) {
   let history = null
@@ -16,21 +16,21 @@ export function createRouter(options = {}) {
       }
 
       routes = flatten(routeMap)
-      const onHistoryChange = (url) => transition(router, url, cb)
-      history = createHistory(onHistoryChange, { mode, sync })
+      history = createHistory({ mode, sync })
+      const dispose = history.listen((url) => transition(router, url, cb))
 
       return () => {
-        history.destroy()
+        dispose()
         history = null
         routes = []
       }
     },
 
-    navigate(to) {
+    navigate(to, curr) {
       if (typeof to === 'string') {
         to = { url: to }
       }
-      const url = router.href(to)
+      const url = router.href(to, curr)
       if (to.replace) {
         history.replace(url)
       } else {
@@ -38,7 +38,7 @@ export function createRouter(options = {}) {
       }
     },
 
-    href(to) {
+    href(to, curr) {
       // already a url
       if (typeof to === 'string') {
         return to
@@ -50,7 +50,7 @@ export function createRouter(options = {}) {
       }
 
       if (to.merge) {
-        const curr = to.merge === true ? router.match(router.getUrl()) : to.merge
+        curr = curr || router.match(router.getUrl())
         to = merge(curr, to)
       }
 
@@ -139,7 +139,7 @@ function data(routes, matchingRoute) {
 }
 
 export function merge(curr = {}, to) {
-  const pathname = to.pathname || curr.pattern
+  const pathname = to.pathname || curr.pattern || curr.pathname
   const params = Object.assign({}, curr.params, to.params)
   const query = to.query === null ? null : Object.assign({}, curr.query, to.query)
   const hash = to.hash === null ? null : to.hash || curr.hash || ''

package/tasks/build.js

@@ -1,4 +1,10 @@
-const execa = require('execa')
+import fs from 'fs'
+import path from 'path'
+import { fileURLToPath } from 'url'
+import { execa } from 'execa'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
 
 const sh = (...args) => execa(...args, { stdio: 'inherit', shell: true })
 
@@ -6,9 +12,9 @@ const sh = (...args) => execa(...args, { stdio: 'inherit', shell: true })
   await sh('rm -rf dist')
   await sh('mkdir -p dist')
 
-  const pkg = require('../package.json')
+  const pkg = JSON.parse(fs.readFileSync(path.join(__dirname, '../package.json')))
 
-  const babel = './node_modules/.bin/babel'
-  await sh(`${babel} --no-babelrc src -d ${pkg.main} --config-file=./.babelrc-cjs`)
-  await sh(`${babel} --no-babelrc src -d ${pkg.module} --config-file=./.babelrc-esm`)
+  const swc = './node_modules/.bin/swc'
+  await sh(`${swc} --no-swcrc src -d ${pkg.main} --config-file=./.swc-cjs`)
+  await sh(`${swc} --no-swcrc src -d ${pkg.module} --config-file=./.swc-esm`)
 })()

package/test/flatten.test.js

@@ -1,5 +1,5 @@
 import test from 'ava'
-import { flatten } from '../src/router'
+import { flatten } from '../src/router.js'
 
 test('converts array of routes to array of internal route descriptors', (t) => {
   t.deepEqual(

package/test/match.test.js

@@ -1,6 +1,6 @@
 import test from 'ava'
-import { qs } from '../src'
-import { matchOne as match } from '../src/match'
+import { qs } from '../src/index.js'
+import { matchOne as match } from '../src/match.js'
 
 test('match explicit equality', (t) => {
   t.deepEqual(match('/', '/').params, {})

package/test/router.test.js

@@ -1,5 +1,5 @@
 import test from 'ava'
-import { qs, createRouter } from '../src'
+import { qs, createRouter } from '../src/index.js'
 
 test('createRouter, listen, navigate and dispose', (t) => {
   const calls = []
@@ -20,6 +20,7 @@ test('createRouter, listen, navigate and dispose', (t) => {
   router.navigate({ query: { a: 11, b: 22 }, merge: true })
   router.navigate({ query: { b: undefined, c: 'bla' }, hash: 'test', merge: true })
   router.navigate({ params: { id: 3 }, merge: true })
+  router.navigate({ query: { curr: 'test' }, merge: true }, { pathname: '/user/curr' })
 
   t.deepEqual(
     [
@@ -35,6 +36,7 @@ test('createRouter, listen, navigate and dispose', (t) => {
       'user=2?a=11&b=22',
       'user=2?a=11&c=bla#test',
       'user=3?a=11&c=bla#test',
+      'user=curr?curr=test',
     ],
     calls
   )
@@ -42,7 +44,7 @@ test('createRouter, listen, navigate and dispose', (t) => {
   dispose()
 })
 
-test('.href(options)', (t) => {
+test('.href(to)', (t) => {
   const { router, dispose } = createTestRouter()
 
   t.deepEqual('/user/7/friends?a=1&b=2', router.href({ pathname: '/user/7/friends', query: { a: 1, b: 2 } }))

package/.babelrc-cjs

@@ -1,17 +0,0 @@
-{
-  "presets": [
-    [
-      "@babel/preset-env",
-      {
-        "loose": true,
-        "targets": {
-          "browsers": [
-            "last 2 versions",
-            "IE >= 9"
-          ]
-        },
-        "exclude": ["transform-regenerator"]
-      }
-    ]
-  ]
-}