space-router 0.8.5 → 0.9.0

package/dist/cjs/router.js

@@ -1,206 +1,270 @@
 "use strict";
-
-exports.__esModule = true;
-exports.createRouter = createRouter;
-exports.flatten = flatten;
-exports.merge = merge;
-
-var _match = require("./match");
-
-var _history = require("./history");
-
-var _qs = require("./qs");
-
-var _excluded = ["path", "routes"];
-
-function _createForOfIteratorHelperLoose(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
-
-function createRouter(options) {
-  if (options === void 0) {
-    options = {};
-  }
-
-  var history = null;
-  var routes = [];
-  var mode = options.mode || 'history';
-  var qs = options.qs || _qs.qs;
-  var sync = options.sync || false;
-  var router = {
-    listen: function listen(routeMap, cb) {
-      if (history) {
-        throw new Error('Already listening');
-      }
-
-      routes = flatten(routeMap);
-      history = (0, _history.createHistory)({
-        mode: mode,
-        sync: sync
-      });
-      var dispose = history.listen(function (url) {
-        return transition(router, url, cb);
-      });
-      return function () {
-        dispose();
-        history = null;
-        routes = [];
-      };
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+function _export(target, all) {
+    for(var name in all)Object.defineProperty(target, name, {
+        enumerable: true,
+        get: all[name]
+    });
+}
+_export(exports, {
+    createRouter: function() {
+        return createRouter;
     },
-    navigate: function navigate(to, curr) {
-      if (typeof to === 'string') {
-        to = {
-          url: to
-        };
-      }
-
-      var url = router.href(to, curr);
-
-      if (to.replace) {
-        history.replace(url);
-      } else {
-        history.push(url);
-      }
+    flatten: function() {
+        return flatten;
     },
-    href: function href(to, curr) {
-      // already a url
-      if (typeof to === 'string') {
-        return to;
-      } // align with navigate API
-
-
-      if (to.url) {
-        return to.url;
-      }
-
-      if (to.merge) {
-        curr = curr || router.match(router.getUrl());
-        to = merge(curr, to);
-      }
-
-      var url = to.pathname || '/';
-
-      if (to.params) {
-        Object.keys(to.params).forEach(function (param) {
-          url = url.replace(':' + param, to.params[param]);
+    merge: function() {
+        return merge;
+    }
+});
+var _match = require("./match.js");
+var _history = require("./history.js");
+var _qs = require("./qs.js");
+function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
         });
-      }
-
-      if (to.query && Object.keys(to.query).length) {
-        var query = qs.stringify(to.query);
-
-        if (query) {
-          url = url + '?' + query;
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _object_spread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
         }
-      }
-
-      if (to.hash) {
-        var prefix = to.hash.startsWith('#') ? '' : '#';
-        url = url + prefix + to.hash;
-      }
-
-      return url;
-    },
-    match: function match(url) {
-      var route = (0, _match.match)(routes, url, qs);
-
-      if (route) {
-        return _extends({}, route, {
-          data: data(routes, route)
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
         });
-      }
-    },
-    getUrl: function getUrl() {
-      return history.getUrl();
     }
-  };
-  return router;
+    return target;
+}
+function ownKeys(object, enumerableOnly) {
+    var keys = Object.keys(object);
+    if (Object.getOwnPropertySymbols) {
+        var symbols = Object.getOwnPropertySymbols(object);
+        if (enumerableOnly) {
+            symbols = symbols.filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+            });
+        }
+        keys.push.apply(keys, symbols);
+    }
+    return keys;
+}
+function _object_spread_props(target, source) {
+    source = source != null ? source : {};
+    if (Object.getOwnPropertyDescriptors) {
+        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+        ownKeys(Object(source)).forEach(function(key) {
+            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+        });
+    }
+    return target;
+}
+function _object_without_properties(source, excluded) {
+    if (source == null) return {};
+    var target = _object_without_properties_loose(source, excluded);
+    var key, i;
+    if (Object.getOwnPropertySymbols) {
+        var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
+        for(i = 0; i < sourceSymbolKeys.length; i++){
+            key = sourceSymbolKeys[i];
+            if (excluded.indexOf(key) >= 0) continue;
+            if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
+            target[key] = source[key];
+        }
+    }
+    return target;
+}
+function _object_without_properties_loose(source, excluded) {
+    if (source == null) return {};
+    var target = {};
+    var sourceKeys = Object.keys(source);
+    var key, i;
+    for(i = 0; i < sourceKeys.length; i++){
+        key = sourceKeys[i];
+        if (excluded.indexOf(key) >= 0) continue;
+        target[key] = source[key];
+    }
+    return target;
+}
+function createRouter() {
+    var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
+    var history = null;
+    var routes = [];
+    var mode = options.mode || "history";
+    var qs = options.qs || _qs.qs;
+    var sync = options.sync || false;
+    var router = {
+        listen: function(routeMap, cb) {
+            if (history) {
+                throw new Error("Already listening");
+            }
+            routes = flatten(routeMap);
+            history = (0, _history.createHistory)({
+                mode: mode,
+                sync: sync
+            });
+            var dispose = history.listen(function(url) {
+                return transition(router, url, cb);
+            });
+            return function() {
+                dispose();
+                history = null;
+                routes = [];
+            };
+        },
+        navigate: function(to, curr) {
+            if (typeof to === "string") {
+                to = {
+                    url: to
+                };
+            }
+            var url = router.href(to, curr);
+            if (to.replace) {
+                history.replace(url);
+            } else {
+                history.push(url);
+            }
+        },
+        href: function(to, curr) {
+            // already a url
+            if (typeof to === "string") {
+                return to;
+            }
+            // align with navigate API
+            if (to.url) {
+                return to.url;
+            }
+            if (to.merge) {
+                curr = curr || router.match(router.getUrl());
+                to = merge(curr, to);
+            }
+            var url = to.pathname || "/";
+            if (to.params) {
+                Object.keys(to.params).forEach(function(param) {
+                    url = url.replace(":" + param, to.params[param]);
+                });
+            }
+            if (to.query && Object.keys(to.query).length) {
+                var query = qs.stringify(to.query);
+                if (query) {
+                    url = url + "?" + query;
+                }
+            }
+            if (to.hash) {
+                var prefix = to.hash.startsWith("#") ? "" : "#";
+                url = url + prefix + to.hash;
+            }
+            return url;
+        },
+        match: function(url) {
+            var route = (0, _match.match)(routes, url, qs);
+            if (route) {
+                return _object_spread_props(_object_spread({}, route), {
+                    data: data(routes, route)
+                });
+            }
+        },
+        getUrl: function() {
+            return history.getUrl();
+        }
+    };
+    return router;
 }
-
 function flatten(routeMap) {
-  var routes = [];
-  var parentData = [];
-
-  function addLevel(level) {
-    level.forEach(function (route) {
-      var _route$path = route.path,
-          path = _route$path === void 0 ? '' : _route$path,
-          children = route.routes,
-          routeData = _objectWithoutPropertiesLoose(route, _excluded);
-
-      routes.push({
-        pattern: path,
-        data: parentData.concat([routeData])
-      });
-
-      if (children) {
-        parentData.push(routeData);
-        addLevel(children);
-        parentData.pop();
-      }
-    });
-  }
-
-  addLevel(routeMap);
-  return routes;
+    var routes = [];
+    var parentData = [];
+    function addLevel(level) {
+        level.forEach(function(route) {
+            var _route_path = route.path, path = _route_path === void 0 ? "" : _route_path, children = route.routes, routeData = _object_without_properties(route, [
+                "path",
+                "routes"
+            ]);
+            routes.push({
+                pattern: path,
+                data: parentData.concat([
+                    routeData
+                ])
+            });
+            if (children) {
+                parentData.push(routeData);
+                addLevel(children);
+                parentData.pop();
+            }
+        });
+    }
+    addLevel(routeMap);
+    return routes;
 }
-
 function transition(router, url, onNavigated) {
-  var route = router.match(url);
-
-  if (route) {
-    for (var _iterator = _createForOfIteratorHelperLoose(route.data), _step; !(_step = _iterator()).done;) {
-      var r = _step.value;
-
-      if (r.redirect) {
-        var _url = redirectUrl(router, r.redirect, route);
-
-        return router.navigate({
-          url: _url,
-          replace: true
-        });
-      }
+    var route = router.match(url);
+    if (route) {
+        var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+        try {
+            for(var _iterator = route.data[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                var r = _step.value;
+                if (r.redirect) {
+                    var _$url = redirectUrl(router, r.redirect, route);
+                    return router.navigate({
+                        url: _$url,
+                        replace: true
+                    });
+                }
+            }
+        } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+        } finally{
+            try {
+                if (!_iteratorNormalCompletion && _iterator.return != null) {
+                    _iterator.return();
+                }
+            } finally{
+                if (_didIteratorError) {
+                    throw _iteratorError;
+                }
+            }
+        }
+        onNavigated && onNavigated(route);
     }
-
-    onNavigated && onNavigated(route);
-  }
 }
-
 function redirectUrl(router, redirect, matchingRoute) {
-  if (typeof redirect === 'function') {
-    redirect = redirect(matchingRoute);
-  }
-
-  return router.href(redirect);
+    if (typeof redirect === "function") {
+        redirect = redirect(matchingRoute);
+    }
+    return router.href(redirect);
 }
-
 function data(routes, matchingRoute) {
-  for (var i = 0; i < routes.length; i++) {
-    if (routes[i].pattern === matchingRoute.pattern) {
-      return routes[i].data;
+    for(var i = 0; i < routes.length; i++){
+        if (routes[i].pattern === matchingRoute.pattern) {
+            return routes[i].data;
+        }
     }
-  }
 }
-
-function merge(curr, to) {
-  if (curr === void 0) {
-    curr = {};
-  }
-
-  var pathname = to.pathname || curr.pattern || curr.pathname;
-  var params = Object.assign({}, curr.params, to.params);
-  var query = to.query === null ? null : Object.assign({}, curr.query, to.query);
-  var hash = to.hash === null ? null : to.hash || curr.hash || '';
-  return {
-    pathname: pathname,
-    params: params,
-    query: query,
-    hash: hash
-  };
-}
+function merge() {
+    var curr = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, to = arguments.length > 1 ? arguments[1] : void 0;
+    var pathname = to.pathname || curr.pattern || curr.pathname;
+    var params = Object.assign({}, curr.params, to.params);
+    var query = to.query === null ? null : Object.assign({}, curr.query, to.query);
+    var hash = to.hash === null ? null : to.hash || curr.hash || "";
+    return {
+        pathname: pathname,
+        params: params,
+        query: query,
+        hash: hash
+    };
+}

package/dist/esm/history.js

@@ -1,99 +1,86 @@
 export function createHistory(options) {
-  const sync = options.sync;
-  let mode = options.mode;
-  let raf;
-  let onPop;
-  const memory = [];
-  let off;
-  let destroyed = false;
-
-  if (typeof window === 'undefined') {
-    mode = 'memory';
-    raf = sync ? cb => cb() : global.setImmediate;
-  } else {
-    raf = sync ? cb => cb() : requestAnimationFrame;
-
-    if (mode === 'history' && !history.pushState) {
-      mode = 'hash';
-    }
-  }
-
-  function listen(onChange) {
-    onPop = () => onChange(getUrl());
-
-    if (mode !== 'memory') {
-      off = on(window, mode === 'history' ? 'popstate' : 'hashchange', onPop);
-      raf(onPop);
-    }
-
-    return () => {
-      destroyed = true;
-      off && off();
+    var listen = function listen(onChange) {
+        onPop = function() {
+            return onChange(getUrl());
+        };
+        if (mode !== "memory") {
+            off = on(window, mode === "history" ? "popstate" : "hashchange", onPop);
+            raf(onPop);
+        }
+        return function() {
+            destroyed = true;
+            off && off();
+        };
     };
-  }
-
-  return {
-    listen,
-    getUrl,
-
-    push(url) {
-      go(url);
-    },
-
-    replace(url) {
-      go(url, true);
-    }
-
-  };
-
-  function go(url, replace) {
-    if (destroyed) return;
-    url = url.replace(/^\/?#?\/?/, '/').replace(/\/$/, '') || '/';
-
-    if (mode === 'history') {
-      history[replace ? 'replaceState' : 'pushState']({}, '', url);
-      raf(onPop);
-    } else if (mode === 'hash') {
-      location[replace ? 'replace' : 'assign']('#' + url);
-    } else if (mode === 'memory') {
-      replace ? memory[memory.length - 1] = url : memory.push(url);
-      raf(onPop);
-    }
-  }
-
-  function getUrl() {
-    if (mode === 'memory') {
-      return memory[memory.length - 1];
-    }
-
-    const hash = getHash();
-
-    if (mode === 'hash') {
-      return hash === '' ? '/' : hash;
-    }
-
-    if (mode === 'history') {
-      let url = location.pathname + location.search;
-
-      if (hash !== '') {
-        url += '#' + hash;
-      }
-
-      return url;
+    var go = function go(url, replace) {
+        if (destroyed) return;
+        url = url.replace(/^\/?#?\/?/, "/").replace(/\/$/, "") || "/";
+        if (mode === "history") {
+            history[replace ? "replaceState" : "pushState"]({}, "", url);
+            raf(onPop);
+        } else if (mode === "hash") {
+            location[replace ? "replace" : "assign"]("#" + url);
+        } else if (mode === "memory") {
+            replace ? memory[memory.length - 1] = url : memory.push(url);
+            raf(onPop);
+        }
+    };
+    var getUrl = function getUrl() {
+        if (mode === "memory") {
+            return memory[memory.length - 1];
+        }
+        var hash = getHash();
+        if (mode === "hash") {
+            return hash === "" ? "/" : hash;
+        }
+        if (mode === "history") {
+            var url = location.pathname + location.search;
+            if (hash !== "") {
+                url += "#" + hash;
+            }
+            return url;
+        }
+    };
+    var getHash = // Gets the true hash value. Cannot use location.hash directly due to bug
+    // in Firefox where location.hash will always be decoded.
+    function getHash() {
+        var match = location.href.match(/#(.*)$/);
+        return match ? match[1].replace("#", "") : "";
+    };
+    var sync = options.sync;
+    var mode = options.mode;
+    var raf;
+    var onPop;
+    var memory = [];
+    var off;
+    var destroyed = false;
+    if (typeof window === "undefined") {
+        mode = "memory";
+        raf = sync ? function(cb) {
+            return cb();
+        } : global.setImmediate;
+    } else {
+        raf = sync ? function(cb) {
+            return cb();
+        } : requestAnimationFrame;
+        if (mode === "history" && !history.pushState) {
+            mode = "hash";
+        }
     }
-  } // Gets the true hash value. Cannot use location.hash directly due to bug
-  // in Firefox where location.hash will always be decoded.
-
-
-  function getHash() {
-    const match = location.href.match(/#(.*)$/);
-    return match ? match[1].replace('#', '') : '';
-  }
+    return {
+        listen: listen,
+        getUrl: getUrl,
+        push: function push(url) {
+            go(url);
+        },
+        replace: function replace(url) {
+            go(url, true);
+        }
+    };
 }
-
 function on(el, type, fn) {
-  el.addEventListener(type, fn, false);
-  return function off() {
-    el.removeEventListener(type, fn, false);
-  };
-}
+    el.addEventListener(type, fn, false);
+    return function off() {
+        el.removeEventListener(type, fn, false);
+    };
+}

package/dist/esm/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";