@shuvi/router 0.0.1-pre.3 → 0.0.1-pre.4

package/esm/pathParserRanker.js

@@ -4,7 +4,7 @@ const BASE_PATH_PARSER_OPTIONS = {
     sensitive: false,
     strict: false,
     start: true,
-    end: true,
+    end: true
 };
 // Special Regex characters that must be escaped in static tokens
 const REGEX_CHARS_RE = /[.+*?^${}()[\]/\\]/g;
@@ -46,7 +46,7 @@ export function tokensToParser(segments, extraOptions) {
                 keys.push({
                     name: value,
                     repeatable,
-                    optional,
+                    optional
                 });
                 const re = regexp ? regexp : BASE_PARAM_PATTERN;
                 // the user provided a custom regexp /:id(\\d+)
@@ -75,7 +75,7 @@ export function tokensToParser(segments, extraOptions) {
                     subPattern += '?';
                 pattern += subPattern;
                 if (!options.end)
-                    pattern += '(?=\/|$)';
+                    pattern += '(?=/|$)';
                 subSegmentScore += 20 /* Dynamic */;
                 if (optional)
                     subSegmentScore += -8 /* BonusOptional */;
@@ -116,7 +116,7 @@ export function tokensToParser(segments, extraOptions) {
         }
         return {
             match: match[0],
-            params,
+            params
         };
     }
     function stringify(params) {
@@ -139,7 +139,9 @@ export function tokensToParser(segments, extraOptions) {
                     if (param === undefined && !optional) {
                         throw new Error(`Missing required param "${value}"`);
                     }
-                    const text = Array.isArray(param) ? param.join('/') : (param || '');
+                    const text = Array.isArray(param)
+                        ? param.join('/')
+                        : param || '';
                     if (!text && optional) {
                         // if we have more than one optional param like /:a?-static we
                         // don't need to care about the optional param
@@ -163,7 +165,7 @@ export function tokensToParser(segments, extraOptions) {
         score,
         keys,
         parse,
-        stringify,
+        stringify
     };
 }
 /**

package/esm/types/history.js

@@ -0,0 +1 @@
+export {};

package/esm/types/index.js

@@ -1 +1,2 @@
 export * from './history';
+export * from './router';

package/esm/types/router.js

@@ -0,0 +1 @@
+export {};

package/lib/createRoutesFromArray.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRoutesFromArray = void 0;
 function createRoutesFromArray(array) {
     return array.map(partialRoute => {
         let route = Object.assign(Object.assign({}, partialRoute), { caseSensitive: !!partialRoute.caseSensitive, path: partialRoute.path || '/' });

package/lib/getRedirectFromRoutes.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getRedirectFromRoutes = void 0;
 function getRedirectFromRoutes(appRoutes) {
     return appRoutes.reduceRight((redirectPath, { route: { redirect } }) => {
         if (!redirectPath && redirect) {

package/lib/history/base.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ACTION_REPLACE = exports.ACTION_PUSH = exports.ACTION_POP = void 0;
 const utils_1 = require("../utils");
 /**
  * A POP indicates a change to an arbitrary index in the history stack, such
@@ -23,10 +24,10 @@ exports.ACTION_REPLACE = 'REPLACE';
 class BaseHistory {
     constructor() {
         this.action = exports.ACTION_POP;
-        this.location = utils_1.createLocation('/');
+        this.location = (0, utils_1.createLocation)('/');
         this.doTransition = () => void 0;
         this._index = 0;
-        this._blockers = utils_1.createEvents();
+        this._blockers = (0, utils_1.createEvents)();
     }
     back() {
         this.go(-1);
@@ -35,15 +36,15 @@ class BaseHistory {
         this.go(1);
     }
     resolve(to, from) {
-        const toPath = utils_1.resolvePath(to, from);
+        const toPath = (0, utils_1.resolvePath)(to, from);
         return {
             path: toPath,
-            href: utils_1.pathToString(toPath)
+            href: (0, utils_1.pathToString)(toPath)
         };
     }
     transitionTo(to, { onTransition, onAbort, action = exports.ACTION_PUSH, state = null, redirectedFrom }) {
         const { path } = this.resolve(to, this.location.pathname);
-        const nextLocation = utils_1.createLocation(path, { state, redirectedFrom });
+        const nextLocation = (0, utils_1.createLocation)(path, { state, redirectedFrom });
         // check transition
         if (this._blockers.length) {
             this._blockers.call({

package/lib/history/browser.js

@@ -1,9 +1,21 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -24,7 +36,7 @@ class BrowserHistory extends base_1.default {
             state,
             redirectedFrom,
             onTransition({ state, url }) {
-                utils_1.pushState(state, url);
+                (0, utils_1.pushState)(state, url);
             }
         });
     }
@@ -34,7 +46,7 @@ class BrowserHistory extends base_1.default {
             action: base_1.ACTION_REPLACE,
             redirectedFrom,
             onTransition({ state, url }) {
-                utils_1.replaceState(state, url);
+                (0, utils_1.replaceState)(state, url);
             }
         });
     }
@@ -42,7 +54,7 @@ class BrowserHistory extends base_1.default {
         this._history.go(delta);
     }
     block(blocker) {
-        return utils_1.addBlocker(this._blockers, blocker);
+        return (0, utils_1.addBlocker)(this._blockers, blocker);
     }
     setup() {
         let blockedPopTx = null;
@@ -74,7 +86,7 @@ class BrowserHistory extends base_1.default {
                     else {
                         // Trying to POP to a location with no index. We did not create
                         // this location, so we can't effectively block the navigation.
-                        utils_1.warning(false, 
+                        (0, utils_1.warning)(false, 
                         // TODO: Write up a doc that explains our blocking strategy in
                         // detail and link to it here so people can understand better what
                         // is going on and how to avoid it.
@@ -100,7 +112,7 @@ class BrowserHistory extends base_1.default {
         const state = this._history.state || {};
         return [
             state.idx,
-            utils_1.createLocation({
+            (0, utils_1.createLocation)({
                 pathname,
                 search,
                 hash

package/lib/history/hash.js

@@ -1,9 +1,21 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -22,7 +34,7 @@ function getBaseHref() {
 function createHref(to) {
     return (getBaseHref() +
         '#' +
-        (typeof to === 'string' ? to : utils_1.pathToString(utils_1.resolvePath(to))));
+        (typeof to === 'string' ? to : (0, utils_1.pathToString)((0, utils_1.resolvePath)(to))));
 }
 class HashHistory extends base_1.default {
     constructor() {
@@ -39,7 +51,7 @@ class HashHistory extends base_1.default {
             state,
             redirectedFrom,
             onTransition({ state, url }) {
-                utils_1.pushState(state, url);
+                (0, utils_1.pushState)(state, url);
             }
         });
     }
@@ -49,7 +61,7 @@ class HashHistory extends base_1.default {
             action: base_1.ACTION_REPLACE,
             redirectedFrom,
             onTransition({ state, url }) {
-                utils_1.replaceState(state, url);
+                (0, utils_1.replaceState)(state, url);
             }
         });
     }
@@ -57,10 +69,10 @@ class HashHistory extends base_1.default {
         this._history.go(delta);
     }
     block(blocker) {
-        return utils_1.addBlocker(this._blockers, blocker);
+        return (0, utils_1.addBlocker)(this._blockers, blocker);
     }
     resolve(to, from) {
-        const toPath = utils_1.resolvePath(to, from);
+        const toPath = (0, utils_1.resolvePath)(to, from);
         return {
             path: toPath,
             href: createHref(toPath)
@@ -96,7 +108,7 @@ class HashHistory extends base_1.default {
                     else {
                         // Trying to POP to a location with no index. We did not create
                         // this location, so we can't effectively block the navigation.
-                        utils_1.warning(false, 
+                        (0, utils_1.warning)(false, 
                         // TODO: Write up a doc that explains our blocking strategy in
                         // detail and link to it here so people can understand better what
                         // is going on and how to avoid it.
@@ -121,17 +133,17 @@ class HashHistory extends base_1.default {
         window.addEventListener('hashchange', () => {
             const [, nextLocation] = this.getIndexAndLocation();
             // Ignore extraneous hashchange events.
-            if (utils_1.pathToString(nextLocation) !== utils_1.pathToString(this.location)) {
+            if ((0, utils_1.pathToString)(nextLocation) !== (0, utils_1.pathToString)(this.location)) {
                 handlePop();
             }
         });
     }
     getIndexAndLocation() {
-        const { pathname, search, hash } = utils_1.resolvePath(window.location.hash.substr(1));
+        const { pathname, search, hash } = (0, utils_1.resolvePath)(window.location.hash.substr(1));
         const state = this._history.state || {};
         return [
             state.idx,
-            utils_1.createLocation({
+            (0, utils_1.createLocation)({
                 pathname,
                 search,
                 hash

package/lib/history/index.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createMemoryHistory = exports.createHashHistory = exports.createBrowserHistory = exports.MemoryHistory = void 0;
 const memory_1 = __importDefault(require("./memory"));
 exports.MemoryHistory = memory_1.default;
 const browser_1 = __importDefault(require("./browser"));

package/lib/history/memory.js

@@ -1,9 +1,21 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -17,8 +29,8 @@ class MemoryHistory extends base_1.default {
         super();
         this._entries = [];
         this._entries = initialEntries.map(entry => {
-            let location = utils_1.createLocation(Object.assign({ pathname: '/', search: '', hash: '' }, (typeof entry === 'string' ? utils_1.resolvePath(entry) : entry)));
-            utils_1.warning(location.pathname.charAt(0) === '/', `Relative pathnames are not supported in createMemoryHistory({ initialEntries }) (invalid entry: ${JSON.stringify(entry)})`);
+            let location = (0, utils_1.createLocation)(Object.assign({ pathname: '/', search: '', hash: '' }, (typeof entry === 'string' ? (0, utils_1.resolvePath)(entry) : entry)));
+            (0, utils_1.warning)(location.pathname.charAt(0) === '/', `Relative pathnames are not supported in createMemoryHistory({ initialEntries }) (invalid entry: ${JSON.stringify(entry)})`);
             return location;
         });
         this._index = clamp(initialIndex == null ? this._entries.length - 1 : initialIndex, 0, this._entries.length - 1);
@@ -71,10 +83,10 @@ class MemoryHistory extends base_1.default {
         return this._blockers.push(blocker);
     }
     resolve(to, from) {
-        const toPath = utils_1.resolvePath(to, from);
+        const toPath = (0, utils_1.resolvePath)(to, from);
         return {
             path: toPath,
-            href: utils_1.pathToString(toPath)
+            href: (0, utils_1.pathToString)(toPath)
         };
     }
     getIndexAndLocation() {

package/lib/index.js

@@ -1,22 +1,30 @@
 "use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRedirector = exports.createLocation = exports.resolvePath = exports.parseQuery = exports.pathToString = exports.rankRouteBranches = exports.matchRoutes = exports.matchStringify = exports.matchPathname = exports.createRoutesFromArray = void 0;
 var createRoutesFromArray_1 = require("./createRoutesFromArray");
-exports.createRoutesFromArray = createRoutesFromArray_1.createRoutesFromArray;
+Object.defineProperty(exports, "createRoutesFromArray", { enumerable: true, get: function () { return createRoutesFromArray_1.createRoutesFromArray; } });
 var matchPathname_1 = require("./matchPathname");
-exports.matchPathname = matchPathname_1.matchPathname;
-exports.matchStringify = matchPathname_1.matchStringify;
+Object.defineProperty(exports, "matchPathname", { enumerable: true, get: function () { return matchPathname_1.matchPathname; } });
+Object.defineProperty(exports, "matchStringify", { enumerable: true, get: function () { return matchPathname_1.matchStringify; } });
 var matchRoutes_1 = require("./matchRoutes");
-exports.matchRoutes = matchRoutes_1.matchRoutes;
-exports.rankRouteBranches = matchRoutes_1.rankRouteBranches;
+Object.defineProperty(exports, "matchRoutes", { enumerable: true, get: function () { return matchRoutes_1.matchRoutes; } });
+Object.defineProperty(exports, "rankRouteBranches", { enumerable: true, get: function () { return matchRoutes_1.rankRouteBranches; } });
 var utils_1 = require("./utils");
-exports.pathToString = utils_1.pathToString;
-exports.parseQuery = utils_1.parseQuery;
-exports.resolvePath = utils_1.resolvePath;
-exports.createLocation = utils_1.createLocation;
-exports.createRedirector = utils_1.createRedirector;
-__export(require("./types"));
-__export(require("./history"));
-__export(require("./router"));
+Object.defineProperty(exports, "pathToString", { enumerable: true, get: function () { return utils_1.pathToString; } });
+Object.defineProperty(exports, "parseQuery", { enumerable: true, get: function () { return utils_1.parseQuery; } });
+Object.defineProperty(exports, "resolvePath", { enumerable: true, get: function () { return utils_1.resolvePath; } });
+Object.defineProperty(exports, "createLocation", { enumerable: true, get: function () { return utils_1.createLocation; } });
+Object.defineProperty(exports, "createRedirector", { enumerable: true, get: function () { return utils_1.createRedirector; } });
+__exportStar(require("./types"), exports);
+__exportStar(require("./history"), exports);
+__exportStar(require("./router"), exports);

package/lib/matchPathname.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.matchStringify = exports.matchPathname = void 0;
 const pathParserRanker_1 = require("./pathParserRanker");
 const pathTokenizer_1 = require("./pathTokenizer");
 function safelyDecodeURIComponent(value, paramName, optional) {
@@ -30,7 +31,7 @@ function matchPathname(pattern, pathname) {
         pattern = { path: pattern };
     }
     const { path, caseSensitive = false, end = true } = pattern;
-    const pathParser = pathParserRanker_1.tokensToParser(pathTokenizer_1.tokenizePath(path), { end, sensitive: caseSensitive });
+    const pathParser = (0, pathParserRanker_1.tokensToParser)((0, pathTokenizer_1.tokenizePath)(path), { end, sensitive: caseSensitive });
     ;
     const matchResult = pathParser.parse(pathname);
     if (!matchResult)
@@ -52,7 +53,7 @@ exports.matchPathname = matchPathname;
  * @param options
  */
 function matchStringify(path, params, options) {
-    const pathParser = pathParserRanker_1.tokensToParser(pathTokenizer_1.tokenizePath(path), options);
+    const pathParser = (0, pathParserRanker_1.tokensToParser)((0, pathTokenizer_1.tokenizePath)(path), options);
     return pathParser.stringify(params);
 }
 exports.matchStringify = matchStringify;

package/lib/matchRoutes.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.matchRoutes = exports.rankRouteBranches = void 0;
 const matchPathname_1 = require("./matchPathname");
 const utils_1 = require("./utils");
 const pathParserRanker_1 = require("./pathParserRanker");
@@ -14,14 +15,14 @@ function matchRouteBranch(branch, pathname) {
         let remainingPathname = matchedPathname === '/'
             ? pathname
             : pathname.slice(matchedPathname.length) || '/';
-        let routeMatch = matchPathname_1.matchPathname({
+        let routeMatch = (0, matchPathname_1.matchPathname)({
             path: route.path,
             caseSensitive: route.caseSensitive,
             end: i === routes.length - 1
         }, remainingPathname);
         if (!routeMatch)
             return null;
-        matchedPathname = utils_1.joinPaths([matchedPathname, routeMatch.pathname]);
+        matchedPathname = (0, utils_1.joinPaths)([matchedPathname, routeMatch.pathname]);
         matchedParams = Object.assign(Object.assign({}, matchedParams), routeMatch.params);
         matches.push({
             route,
@@ -37,10 +38,10 @@ function rankRouteBranches(branches) {
     }
     const normalizedPaths = branches.map((branch, index) => {
         const [path] = branch;
-        return Object.assign(Object.assign({}, pathParserRanker_1.tokensToParser(pathTokenizer_1.tokenizePath(path))), { path,
+        return Object.assign(Object.assign({}, (0, pathParserRanker_1.tokensToParser)((0, pathTokenizer_1.tokenizePath)(path))), { path,
             index });
     });
-    normalizedPaths.sort((a, b) => pathParserRanker_1.comparePathParserScore(a, b));
+    normalizedPaths.sort((a, b) => (0, pathParserRanker_1.comparePathParserScore)(a, b));
     const newBranches = [];
     // console.log(
     //   normalizedPaths
@@ -56,7 +57,7 @@ function rankRouteBranches(branches) {
 exports.rankRouteBranches = rankRouteBranches;
 function flattenRoutes(routes, branches = [], parentPath = '', parentRoutes = [], parentIndexes = []) {
     routes.forEach((route, index) => {
-        let path = utils_1.joinPaths([parentPath, route.path]);
+        let path = (0, utils_1.joinPaths)([parentPath, route.path]);
         let routes = parentRoutes.concat(route);
         let indexes = parentIndexes.concat(index);
         // Add the children before adding this route to the array so we traverse the
@@ -71,7 +72,7 @@ function flattenRoutes(routes, branches = [], parentPath = '', parentRoutes = []
 }
 function matchRoutes(routes, location, basename = '') {
     if (typeof location === 'string') {
-        location = utils_1.resolvePath(location);
+        location = (0, utils_1.resolvePath)(location);
     }
     let pathname = location.pathname || '/';
     if (basename) {

package/lib/pathParserRanker.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.comparePathParserScore = exports.tokensToParser = void 0;
 // default pattern for a param: non greedy everything but /
 const BASE_PARAM_PATTERN = '[^/]+?';
 const BASE_PATH_PARSER_OPTIONS = {
     sensitive: false,
     strict: false,
     start: true,
-    end: true,
+    end: true
 };
 // Special Regex characters that must be escaped in static tokens
 const REGEX_CHARS_RE = /[.+*?^${}()[\]/\\]/g;
@@ -48,7 +49,7 @@ function tokensToParser(segments, extraOptions) {
                 keys.push({
                     name: value,
                     repeatable,
-                    optional,
+                    optional
                 });
                 const re = regexp ? regexp : BASE_PARAM_PATTERN;
                 // the user provided a custom regexp /:id(\\d+)
@@ -77,7 +78,7 @@ function tokensToParser(segments, extraOptions) {
                     subPattern += '?';
                 pattern += subPattern;
                 if (!options.end)
-                    pattern += '(?=\/|$)';
+                    pattern += '(?=/|$)';
                 subSegmentScore += 20 /* Dynamic */;
                 if (optional)
                     subSegmentScore += -8 /* BonusOptional */;
@@ -118,7 +119,7 @@ function tokensToParser(segments, extraOptions) {
         }
         return {
             match: match[0],
-            params,
+            params
         };
     }
     function stringify(params) {
@@ -141,7 +142,9 @@ function tokensToParser(segments, extraOptions) {
                     if (param === undefined && !optional) {
                         throw new Error(`Missing required param "${value}"`);
                     }
-                    const text = Array.isArray(param) ? param.join('/') : (param || '');
+                    const text = Array.isArray(param)
+                        ? param.join('/')
+                        : param || '';
                     if (!text && optional) {
                         // if we have more than one optional param like /:a?-static we
                         // don't need to care about the optional param
@@ -165,7 +168,7 @@ function tokensToParser(segments, extraOptions) {
         score,
         keys,
         parse,
-        stringify,
+        stringify
     };
 }
 exports.tokensToParser = tokensToParser;

package/lib/pathTokenizer.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.tokenizePath = void 0;
 const ROOT_TOKEN = {
     type: 0 /* Static */,
     value: ''

package/lib/router.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRouter = void 0;
 const defer_1 = require("@shuvi/utils/lib/defer");
 const matchRoutes_1 = require("./matchRoutes");
 const createRoutesFromArray_1 = require("./createRoutesFromArray");
@@ -23,13 +24,13 @@ class Router {
     constructor({ basename = '', history, routes }) {
         this._pending = null;
         this._ready = false;
-        this._readyDefer = defer_1.Defer();
-        this._listeners = utils_1.createEvents();
-        this._beforeEachs = utils_1.createEvents();
-        this._afterEachs = utils_1.createEvents();
-        this._basename = utils_1.normalizeBase(basename);
+        this._readyDefer = (0, defer_1.Defer)();
+        this._listeners = (0, utils_1.createEvents)();
+        this._beforeEachs = (0, utils_1.createEvents)();
+        this._afterEachs = (0, utils_1.createEvents)();
+        this._basename = (0, utils_1.normalizeBase)(basename);
         this._history = history;
-        this._routes = createRoutesFromArray_1.createRoutesFromArray(routes);
+        this._routes = (0, createRoutesFromArray_1.createRoutesFromArray)(routes);
         this._current = START;
         this._history.doTransition = this._doTransition.bind(this);
         const setup = () => this._history.setup();
@@ -75,7 +76,7 @@ class Router {
         return this._afterEachs.push(listener);
     }
     resolve(to, from) {
-        return this._history.resolve(to, from ? utils_1.joinPaths([this._basename, from]) : this._basename);
+        return this._history.resolve(to, from ? (0, utils_1.joinPaths)([this._basename, from]) : this._basename);
     }
     /*
       The Full Navigation Resolution Flow for shuvi/router
@@ -90,14 +91,14 @@ class Router {
         const nextRoute = this._getNextRoute(to);
         const current = this._current;
         const nextMatches = nextRoute.matches || [];
-        const routeRedirect = getRedirectFromRoutes_1.getRedirectFromRoutes(nextMatches);
+        const routeRedirect = (0, getRedirectFromRoutes_1.getRedirectFromRoutes)(nextMatches);
         if (routeRedirect) {
             return this._history.replace(routeRedirect, {
                 redirectedFrom: routeRedirect
             });
         }
         const routeContext = new Map();
-        const queue = [].concat(this._beforeEachs.toArray(), extract_hooks_1.extractHooks(nextMatches, 'resolve', routeContext));
+        const queue = [].concat(this._beforeEachs.toArray(), (0, extract_hooks_1.extractHooks)(nextMatches, 'resolve', routeContext));
         const abort = () => {
             onAbort && onAbort();
             // fire ready cbs once
@@ -116,7 +117,7 @@ class Router {
                     if (to === false) {
                         abort();
                     }
-                    else if (error_1.isError(to)) {
+                    else if ((0, error_1.isError)(to)) {
                         abort();
                     }
                     else if (typeof to === 'string' ||
@@ -144,7 +145,7 @@ class Router {
                 console.error('Uncaught error during navigation:', err);
             }
         };
-        async_1.runQueue(queue, iterator, () => {
+        (0, async_1.runQueue)(queue, iterator, () => {
             if (this._pending !== to) {
                 return abort();
             }
@@ -167,7 +168,7 @@ class Router {
     _getCurrent(routeContext) {
         var _a;
         const { _routes: routes, _basename: basename, _history: { location } } = this;
-        const matches = matchRoutes_1.matchRoutes(routes, location, basename);
+        const matches = (0, matchRoutes_1.matchRoutes)(routes, location, basename);
         let params;
         if (matches) {
             params = matches[matches.length - 1].params;
@@ -197,13 +198,14 @@ class Router {
     }
     _getNextRoute(to) {
         const { _routes: routes, _basename: basename } = this;
-        const matches = matchRoutes_1.matchRoutes(routes, to, basename);
+        const matches = (0, matchRoutes_1.matchRoutes)(routes, to, basename);
         const params = matches ? matches[matches.length - 1].params : {};
-        const parsedPath = utils_1.resolvePath(to);
+        const parsedPath = (0, utils_1.resolvePath)(to);
         return Object.assign(Object.assign({ matches,
             params }, parsedPath), { key: '', state: null });
     }
 }
-exports.createRouter = (options) => {
+const createRouter = (options) => {
     return new Router(options);
 };
+exports.createRouter = createRouter;

package/lib/types/index.js

@@ -1,6 +1,14 @@
 "use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-__export(require("./history"));
+__exportStar(require("./history"), exports);
+__exportStar(require("./router"), exports);

package/lib/utils/async.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.runQueue = void 0;
 function runQueue(queue, fn, cb) {
     const step = (index) => {
         if (index >= queue.length) {

package/lib/utils/createRedirector.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRedirector = void 0;
 function createRedirector() {
     const redirector = {
         redirected: false,

package/lib/utils/dom.js

@@ -1,3 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.inBrowser = void 0;
 exports.inBrowser = typeof window !== 'undefined';

package/lib/utils/error.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isError = void 0;
 function isError(err) {
     return Object.prototype.toString.call(err).indexOf('Error') > -1;
 }

package/lib/utils/extract-hooks.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractHooks = void 0;
 function extractHooks(matched, method, // can add more method later on,
 routeContext) {
     const guards = [];

package/lib/utils/history.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.addBlocker = exports.replaceState = exports.pushState = exports.createLocation = void 0;
 const misc_1 = require("./misc");
 const path_1 = require("./path");
 const BeforeUnloadEventType = 'beforeunload';
@@ -13,7 +14,7 @@ function createKey() {
     return Math.random().toString(36).substr(2, 8);
 }
 function createLocation(to, { state = null, key, redirectedFrom } = {}) {
-    return misc_1.readOnly(Object.assign(Object.assign({}, path_1.resolvePath(to)), { redirectedFrom,
+    return (0, misc_1.readOnly)(Object.assign(Object.assign({}, (0, path_1.resolvePath)(to)), { redirectedFrom,
         state, key: key || createKey() }));
 }
 exports.createLocation = createLocation;

package/lib/utils/index.js

@@ -1,9 +1,16 @@
 "use strict";
-function __export(m) {
-    for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
-}
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-__export(require("./history"));
-__export(require("./misc"));
-__export(require("./path"));
-__export(require("./createRedirector"));
+__exportStar(require("./history"), exports);
+__exportStar(require("./misc"), exports);
+__exportStar(require("./path"), exports);
+__exportStar(require("./createRedirector"), exports);

package/lib/utils/misc.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.warning = exports.readOnly = exports.createEvents = exports.isDev = void 0;
 exports.isDev = process.env.NODE_ENV === 'development';
 function createEvents() {
     let handlers = [];

package/lib/utils/path.js

@@ -3,12 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolvePath = exports.pathToString = exports.parseQuery = exports.normalizeBase = exports.splitPath = exports.joinPaths = exports.normalizeSlashes = exports.trimTrailingSlashes = void 0;
 const query_string_1 = __importDefault(require("query-string"));
 const dom_1 = require("./dom");
-exports.trimTrailingSlashes = (path) => path.replace(/\/+$/, '');
-exports.normalizeSlashes = (path) => path.replace(/\/\/+/g, '/');
-exports.joinPaths = (paths) => exports.normalizeSlashes(paths.join('/'));
-exports.splitPath = (path) => exports.normalizeSlashes(path).split('/');
+const trimTrailingSlashes = (path) => path.replace(/\/+$/, '');
+exports.trimTrailingSlashes = trimTrailingSlashes;
+const normalizeSlashes = (path) => path.replace(/\/\/+/g, '/');
+exports.normalizeSlashes = normalizeSlashes;
+const joinPaths = (paths) => (0, exports.normalizeSlashes)(paths.join('/'));
+exports.joinPaths = joinPaths;
+const splitPath = (path) => (0, exports.normalizeSlashes)(path).split('/');
+exports.splitPath = splitPath;
 function normalizeBase(base) {
     if (!base) {
         if (dom_1.inBrowser) {
@@ -43,8 +48,8 @@ function pathToString({ pathname = '/', search = '', hash = '', query = {} }) {
 }
 exports.pathToString = pathToString;
 function resolvePathname(toPathname, fromPathname) {
-    let segments = exports.splitPath(exports.trimTrailingSlashes(fromPathname));
-    let relativeSegments = exports.splitPath(toPathname);
+    let segments = (0, exports.splitPath)((0, exports.trimTrailingSlashes)(fromPathname));
+    let relativeSegments = (0, exports.splitPath)(toPathname);
     relativeSegments.forEach(segment => {
         if (segment === '..') {
             // Keep the root "" segment so the pathname starts at /
@@ -55,7 +60,7 @@ function resolvePathname(toPathname, fromPathname) {
             segments.push(segment);
         }
     });
-    return segments.length > 1 ? exports.joinPaths(segments) : '/';
+    return segments.length > 1 ? (0, exports.joinPaths)(segments) : '/';
 }
 /**
  * Parses a string URL path into its separate pathname, search, and hash components.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/router",
-  "version": "0.0.1-pre.3",
+  "version": "0.0.1-pre.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -28,8 +28,8 @@
     "node": ">= 12.0.0"
   },
   "dependencies": {
-    "@shuvi/utils": "0.0.1-pre.3",
+    "@shuvi/utils": "0.0.1-pre.4",
     "query-string": "6.13.8"
   },
-  "gitHead": "71af6fe3620aab0a9dd900e6527b4f04a31a8757"
+  "gitHead": "ca02a6733c7dc63e7d69a174bdd116f8f54b98ee"
 }