space-router 0.9.3 → 0.9.5

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 0.9.5
+
+- Upgrade all depedencies.
+
+## 0.9.4
+
+- Upgrade all depedencies.
+
 ## 0.9.3
 
 - Upgrade all depedencies.

package/dist/cjs/history.js

@@ -30,7 +30,7 @@ function createHistory(options) {
         }
     }
     function listen(onChange) {
-        onPop = function() {
+        onPop = function onPop() {
             return onChange(getUrl());
         };
         if (mode !== 'memory') {
@@ -39,16 +39,16 @@ function createHistory(options) {
         }
         return function() {
             destroyed = true;
-            off && off();
+            if (off) off();
         };
     }
     return {
         listen: listen,
         getUrl: getUrl,
-        push: function(url) {
+        push: function push(url) {
             go(url);
         },
-        replace: function(url) {
+        replace: function replace(url) {
             go(url, true);
         }
     };
@@ -61,7 +61,11 @@ function createHistory(options) {
         } else if (mode === 'hash') {
             location[replace ? 'replace' : 'assign']('#' + url);
         } else if (mode === 'memory') {
-            replace ? memory[memory.length - 1] = url : memory.push(url);
+            if (replace) {
+                memory[memory.length - 1] = url;
+            } else {
+                memory.push(url);
+            }
             raf(onPop);
         }
     }

package/dist/cjs/index.js

@@ -5,20 +5,20 @@ Object.defineProperty(exports, "__esModule", {
 function _export(target, all) {
     for(var name in all)Object.defineProperty(target, name, {
         enumerable: true,
-        get: all[name]
+        get: Object.getOwnPropertyDescriptor(all, name).get
     });
 }
 _export(exports, {
-    createHistory: function() {
+    get createHistory () {
         return _history.createHistory;
     },
-    createRouter: function() {
+    get createRouter () {
         return _router.createRouter;
     },
-    merge: function() {
+    get merge () {
         return _router.merge;
     },
-    qs: function() {
+    get qs () {
         return _qs.qs;
     }
 });

package/dist/cjs/match.js

@@ -5,14 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 function _export(target, all) {
     for(var name in all)Object.defineProperty(target, name, {
         enumerable: true,
-        get: all[name]
+        get: Object.getOwnPropertyDescriptor(all, name).get
     });
 }
 _export(exports, {
-    match: function() {
+    get match () {
         return match;
     },
-    matchOne: function() {
+    get matchOne () {
         return matchOne;
     }
 });

package/dist/cjs/qs.js

@@ -9,14 +9,14 @@ Object.defineProperty(exports, "qs", {
     }
 });
 var qs = {
-    parse: function(queryString) {
+    parse: function parse(queryString) {
         return queryString.split('&').reduce(function(acc, pair) {
             var parts = pair.split('=');
             acc[parts[0]] = decodeURIComponent(parts[1]);
             return acc;
         }, {});
     },
-    stringify: function(query) {
+    stringify: function stringify(query) {
         return Object.keys(query).reduce(function(acc, key) {
             if (query[key] !== undefined) {
                 acc.push(key + '=' + encodeURIComponent(query[key]));

package/dist/cjs/router.js

@@ -5,17 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 function _export(target, all) {
     for(var name in all)Object.defineProperty(target, name, {
         enumerable: true,
-        get: all[name]
+        get: Object.getOwnPropertyDescriptor(all, name).get
     });
 }
 _export(exports, {
-    createRouter: function() {
+    get createRouter () {
         return createRouter;
     },
-    flatten: function() {
+    get flatten () {
         return flatten;
     },
-    merge: function() {
+    get merge () {
         return merge;
     }
 });
@@ -76,12 +76,22 @@ function _object_spread_props(target, source) {
 }
 function _object_without_properties(source, excluded) {
     if (source == null) return {};
-    var target = _object_without_properties_loose(source, excluded);
-    var key, i;
+    var target = {}, sourceKeys, key, i;
+    if (typeof Reflect !== "undefined" && Reflect.ownKeys) {
+        sourceKeys = Reflect.ownKeys(Object(source));
+        for(i = 0; i < sourceKeys.length; i++){
+            key = sourceKeys[i];
+            if (excluded.indexOf(key) >= 0) continue;
+            if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
+            target[key] = source[key];
+        }
+        return target;
+    }
+    target = _object_without_properties_loose(source, excluded);
     if (Object.getOwnPropertySymbols) {
-        var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-        for(i = 0; i < sourceSymbolKeys.length; i++){
-            key = sourceSymbolKeys[i];
+        sourceKeys = Object.getOwnPropertySymbols(source);
+        for(i = 0; i < sourceKeys.length; i++){
+            key = sourceKeys[i];
             if (excluded.indexOf(key) >= 0) continue;
             if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
             target[key] = source[key];
@@ -91,12 +101,11 @@ function _object_without_properties(source, excluded) {
 }
 function _object_without_properties_loose(source, excluded) {
     if (source == null) return {};
-    var target = {};
-    var sourceKeys = Object.keys(source);
-    var key, i;
+    var target = {}, sourceKeys = Object.getOwnPropertyNames(source), key, i;
     for(i = 0; i < sourceKeys.length; i++){
         key = sourceKeys[i];
         if (excluded.indexOf(key) >= 0) continue;
+        if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
         target[key] = source[key];
     }
     return target;
@@ -109,7 +118,7 @@ function createRouter() {
     var qs = options.qs || _qs.qs;
     var sync = options.sync || false;
     var router = {
-        listen: function(routeMap, cb) {
+        listen: function listen(routeMap, cb) {
             if (history) {
                 throw new Error('Already listening');
             }
@@ -127,7 +136,7 @@ function createRouter() {
                 routes = [];
             };
         },
-        navigate: function(to, curr) {
+        navigate: function navigate(to, curr) {
             if (typeof to === 'string') {
                 to = {
                     url: to
@@ -140,7 +149,7 @@ function createRouter() {
                 history.push(url);
             }
         },
-        href: function(to, curr) {
+        href: function href(to, curr) {
             // already a url
             if (typeof to === 'string') {
                 return to;
@@ -171,7 +180,7 @@ function createRouter() {
             }
             return url;
         },
-        match: function(url) {
+        match: function match(url) {
             var route = (0, _match.match)(routes, url, qs);
             if (route) {
                 return _object_spread_props(_object_spread({}, route), {
@@ -179,7 +188,7 @@ function createRouter() {
                 });
             }
         },
-        getUrl: function() {
+        getUrl: function getUrl() {
             return history.getUrl();
         }
     };
@@ -239,7 +248,7 @@ function transition(router, url, onNavigated) {
                 }
             }
         }
-        onNavigated && onNavigated(route);
+        if (onNavigated) onNavigated(route);
     }
 }
 function redirectUrl(router, redirect, matchingRoute) {

package/dist/esm/history.js

@@ -20,7 +20,7 @@ export function createHistory(options) {
         }
     }
     function listen(onChange) {
-        onPop = function() {
+        onPop = function onPop() {
             return onChange(getUrl());
         };
         if (mode !== 'memory') {
@@ -29,7 +29,7 @@ export function createHistory(options) {
         }
         return function() {
             destroyed = true;
-            off && off();
+            if (off) off();
         };
     }
     return {
@@ -51,7 +51,11 @@ export function createHistory(options) {
         } else if (mode === 'hash') {
             location[replace ? 'replace' : 'assign']('#' + url);
         } else if (mode === 'memory') {
-            replace ? memory[memory.length - 1] = url : memory.push(url);
+            if (replace) {
+                memory[memory.length - 1] = url;
+            } else {
+                memory.push(url);
+            }
             raf(onPop);
         }
     }

package/dist/esm/router.js

@@ -52,12 +52,22 @@ function _object_spread_props(target, source) {
 }
 function _object_without_properties(source, excluded) {
     if (source == null) return {};
-    var target = _object_without_properties_loose(source, excluded);
-    var key, i;
+    var target = {}, sourceKeys, key, i;
+    if (typeof Reflect !== "undefined" && Reflect.ownKeys) {
+        sourceKeys = Reflect.ownKeys(Object(source));
+        for(i = 0; i < sourceKeys.length; i++){
+            key = sourceKeys[i];
+            if (excluded.indexOf(key) >= 0) continue;
+            if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
+            target[key] = source[key];
+        }
+        return target;
+    }
+    target = _object_without_properties_loose(source, excluded);
     if (Object.getOwnPropertySymbols) {
-        var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
-        for(i = 0; i < sourceSymbolKeys.length; i++){
-            key = sourceSymbolKeys[i];
+        sourceKeys = Object.getOwnPropertySymbols(source);
+        for(i = 0; i < sourceKeys.length; i++){
+            key = sourceKeys[i];
             if (excluded.indexOf(key) >= 0) continue;
             if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
             target[key] = source[key];
@@ -67,12 +77,11 @@ function _object_without_properties(source, excluded) {
 }
 function _object_without_properties_loose(source, excluded) {
     if (source == null) return {};
-    var target = {};
-    var sourceKeys = Object.keys(source);
-    var key, i;
+    var target = {}, sourceKeys = Object.getOwnPropertyNames(source), key, i;
     for(i = 0; i < sourceKeys.length; i++){
         key = sourceKeys[i];
         if (excluded.indexOf(key) >= 0) continue;
+        if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
         target[key] = source[key];
     }
     return target;
@@ -218,7 +227,7 @@ function transition(router, url, onNavigated) {
                 }
             }
         }
-        onNavigated && onNavigated(route);
+        if (onNavigated) onNavigated(route);
     }
 }
 function redirectUrl(router, redirect, matchingRoute) {

package/oxlintrc.json

@@ -0,0 +1,6 @@
+{
+  "env": {
+    "browser": true
+  },
+  "ignorePatterns": ["dist", "docs/static/js", "docs/assets/js"]
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "space-router",
   "description": "All the routing essentials.",
-  "version": "0.9.3",
+  "version": "0.9.5",
   "main": "dist/cjs",
   "module": "dist/esm",
   "license": "ICS",
@@ -24,7 +24,7 @@
   },
   "author": "Karolis Narkevicius",
   "scripts": {
-    "test": "npm run build && healthier && prettier --check '**/*.{js,css,yml}' && c8 ava",
+    "test": "npm run build && oxlint -c oxlintrc.json && prettier --check '**/*.{js,css,yml}' && c8 ava",
     "format": "prettier --write '**/*.{js,css,yml}'",
     "coverage": "c8 --reporter=html ava",
     "build": "node ./tasks/build.js",
@@ -34,30 +34,22 @@
     "release:docs": "hugo -s docs && gh-pages -d docs/public"
   },
   "devDependencies": {
-    "@swc-node/register": "^1.9.1",
-    "@swc/cli": "^0.3.12",
-    "@swc/core": "^1.4.17",
-    "ava": "^6.1.2",
-    "c8": "^9.1.0",
-    "execa": "^8.0.1",
-    "gh-pages": "^6.1.1",
-    "healthier": "^7.0.0",
-    "prettier": "^3.2.5"
-  },
-  "healthier": {
-    "global": [
-      "location",
-      "history",
-      "requestAnimationFrame"
-    ],
-    "ignore": [
-      "docs/static/js",
-      "docs/assets/js"
-    ]
+    "@swc-node/register": "^1.11.1",
+    "@swc/cli": "^0.8.0",
+    "@swc/core": "^1.15.13",
+    "ava": "^6.4.1",
+    "c8": "^11.0.0",
+    "execa": "^9.6.1",
+    "gh-pages": "^6.3.0",
+    "oxlint": "^1.50.0",
+    "prettier": "^3.8.1"
   },
   "ava": {
     "require": [
       "@swc-node/register"
     ]
+  },
+  "overrides": {
+    "minimatch": ">=10.2.1"
   }
 }

package/src/history.js

@@ -28,7 +28,7 @@ export function createHistory(options) {
 
     return () => {
       destroyed = true
-      off && off()
+      if (off) off()
     }
   }
 
@@ -52,7 +52,11 @@ export function createHistory(options) {
     } else if (mode === 'hash') {
       location[replace ? 'replace' : 'assign']('#' + url)
     } else if (mode === 'memory') {
-      replace ? (memory[memory.length - 1] = url) : memory.push(url)
+      if (replace) {
+        memory[memory.length - 1] = url
+      } else {
+        memory.push(url)
+      }
       raf(onPop)
     }
   }

package/src/router.js

@@ -119,7 +119,7 @@ function transition(router, url, onNavigated) {
         return router.navigate({ url, replace: true })
       }
     }
-    onNavigated && onNavigated(route)
+    if (onNavigated) onNavigated(route)
   }
 }
 

package/test/router.test.js

@@ -139,7 +139,7 @@ function createTestRouter(cb, { withoutCatchAll = false } = {}) {
       { path: '/redirect-via-obj-1', redirect: 'bar' },
       { path: '/redirect-via-obj-2', redirect: { pathname: '/user/:id', params: { id: 1 } } },
       { path: '/redirect-via-fn-1/:id', redirect: ({ params }) => ({ pathname: '/user/:id', params }) },
-      { path: '/redirect-via-fn-2/:id', redirect: ({ params }) => ({ url: '/foo' }) },
+      { path: '/redirect-via-fn-2/:id', redirect: () => ({ url: '/foo' }) },
       {
         path: '/user/:id',
         render: (params, query, hash = '') => {