@uxf/router 1.6.1 → 2.0.1

package/README.md

@@ -1,16 +1,20 @@
 # @uxf/router
 
-## How to use
-
-Install:
+## Installation
 
 ```
 yarn add @uxf/router
 ```
+or
+```
+npm install @uxf/router --save
+```
 
-Create `routes.ts` inside your project:
+- Create `routes` directory
+- Create `routes.ts` and `index.ts` inside `routes` directory:
 
 ```ts
+// routes/routes.ts
 import { Router as UxfRouter } from "@uxf/router";
 
 export interface RouteList {
@@ -19,60 +23,46 @@ export interface RouteList {
     "blog-article": { articleId: string };
 }
 
-const router = new UxfRouter<RouteList>({
+export const router = new UxfRouter<RouteList>({
     index: "/",
     "blog": "/blog",
-    "blog-article": "/blog/:articleId",
+    "blog-article": "/blog/[articleId]",
 });
+```
+
+```ts
+import { router } from "./routes"
 
 export const Link = router.getLink();
 export const useRouter = router.getUseRouter();
 export const Router = router.getSingletonRouter();
-export const getRequestHandler = router.getRequestHandler;
 export type RouteName = keyof RouteList;
 ```
 
-## On the server
-
-```ts
-import next from "next";
-import { getRequestHandler } from "./routes";
-const app = next({ dev: process.env.NODE_ENV !== "production" });
-const handler = getRequestHandler(app);
-
-const { createServer } = require("http");
-app.prepare().then(() => {
-    createServer(handler).listen(3000);
-});
-
+Add configuration to `tsconfig.json`
+
+```json
+{
+  "compilerOptions": {
+    "baseUrl": "./src",
+    "paths": {
+      "@app-routes": [
+        "routes"
+      ]
+    }
+  }
+}
 ```
 
-## On the client
+## How to use Link?
 
 ```tsx
 // pages/index.js
-import { Link } from '../routes'
+import { Link } from '@app-routes'
 
 export default () => (
     <Link route='blog-article' params={{ articleId: 12 }}>
       <a>Hello world</a>
     </Link>
 )
-```
-
-## Anchor
-
-```tsx
-// pages/index.js
-import { Link, Router } from '../routes'
-
-export default () => (
-    <Link route='blog-article' anchor="...">
-      <a>Hello world</a>
-    </Link>
-)
-
-// or
-
-Router.push('blog-article', null, { anchor: "..." });
 ```

package/Router.d.ts

@@ -1,21 +1,13 @@
 import React from "react";
-import { LinkProps, UxfRouter, UxfSingletonRouter, Config } from "./types";
+import { LinkProps, UxfRouter, UxfSingletonRouter } from "./types";
 export declare class Router<T> {
     private routes;
-    private readonly config;
     constructor(routes: {
         [key in keyof T]: string;
-    }, config?: Config<T>);
-    private handleDefaultParams;
-    private matchRoute;
-    getRequestHandler: (app: any) => (req: any, res: any) => any;
-    getRouteByUrl: (url: string) => [keyof T, any];
-    private getRoute;
-    getUrls: (routeName: keyof T, params?: object | undefined, anchor?: string | undefined) => {
-        as: string;
-        href: string;
-    };
+    });
+    private getRouteByPathname;
     getLink: () => React.FC<LinkProps<T>>;
     getUseRouter: () => () => UxfRouter<T>;
     getSingletonRouter: () => UxfSingletonRouter<T>;
+    getUrlByRoute: (route: keyof T, params?: T[keyof T] | undefined) => { [key in keyof T]: string; }[keyof T];
 }

package/Router.js

@@ -25,7 +25,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    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;
 };
@@ -40,165 +40,68 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-var __values = (this && this.__values) || function(o) {
-    var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
-    if (m) return m.call(o);
-    if (o && typeof o.length === "number") return {
-        next: function () {
-            if (o && i >= o.length) o = void 0;
-            return { value: o && o[i++], done: !o };
-        }
-    };
-    throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
-};
-var __read = (this && this.__read) || function (o, n) {
-    var m = typeof Symbol === "function" && o[Symbol.iterator];
-    if (!m) return o;
-    var i = m.call(o), r, ar = [], e;
-    try {
-        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
-    }
-    catch (error) { e = { error: error }; }
-    finally {
-        try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
-        }
-        finally { if (e) throw e.error; }
-    }
-    return ar;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Router = void 0;
-var router_1 = __importStar(require("next/router"));
 var link_1 = __importDefault(require("next/link"));
+var router_1 = __importStar(require("next/router"));
 var react_1 = __importDefault(require("react"));
-var url_1 = require("url");
-var MatchedRoute_1 = require("./MatchedRoute");
-var Route_1 = require("./Route");
+var qs_1 = __importDefault(require("qs"));
 var Router = /** @class */ (function () {
-    function Router(routes, config) {
-        var e_1, _a;
+    function Router(routes) {
         var _this = this;
-        if (config === void 0) { config = {}; }
-        this.routes = [];
-        this.getRequestHandler = function (app) {
-            var nextHandler = app.getRequestHandler();
-            return function (req, res) {
-                var _a;
-                var url = req.url;
-                var parsedUrl = url_1.parse(url, true);
-                if (url.indexOf("/_next") === 0 || url.indexOf("/__nextjs") === 0) {
-                    return nextHandler(req, res, parsedUrl);
-                }
-                var matchedRoute = _this.matchRoute((_a = parsedUrl.pathname) !== null && _a !== void 0 ? _a : "");
-                if (matchedRoute) {
-                    var matchResult = matchedRoute.matchResult, route = matchedRoute.route;
-                    return app.render(req, res, route.page, __assign(__assign({}, parsedUrl.query), matchResult.params));
-                }
-                return nextHandler(req, res, parsedUrl);
-            };
-        };
-        this.getRouteByUrl = function (url) {
-            var _a;
-            // TODO @vejvis - sjednotit s metodou getRequestHandler
-            var parsedUrl = url_1.parse(url, true);
-            var matchedRoute = _this.matchRoute((_a = parsedUrl.pathname) !== null && _a !== void 0 ? _a : "");
-            if (matchedRoute) {
-                return [matchedRoute.route.name, __assign(__assign({}, parsedUrl.query), matchedRoute.matchResult.params)];
-            }
-            throw new Error("Route for url '" + url + "' not found.");
-        };
-        this.getUrls = function (routeName, params, anchor) {
-            var route = _this.getRoute(routeName);
-            return {
-                as: route.getAs(_this.handleDefaultParams(routeName, params)) + (anchor ? "#" + anchor : ""),
-                href: route.getHref(_this.handleDefaultParams(routeName, params)),
-            };
+        this.getRouteByPathname = function (pathname) {
+            return Object.keys(_this.routes).find(function (route) { return _this.routes[route] === pathname; });
         };
         this.getLink = function () { return function (props) {
             var route = props.route, params = props.params, anchor = props.anchor, linkProps = __rest(props, ["route", "params", "anchor"]);
-            var _a = _this.getUrls(route, params || {}, anchor), as = _a.as, href = _a.href;
-            return react_1.default.createElement(link_1.default, __assign({ as: as, href: href }, linkProps));
+            return react_1.default.createElement(link_1.default, __assign({ href: { pathname: _this.routes[route], query: params } }, linkProps));
         }; };
         this.getUseRouter = function () { return function () {
-            var _a, _b, _c;
-            var router = router_1.useRouter();
-            var parsedUrl = url_1.parse(router.asPath, true);
-            return __assign(__assign({}, router), { route: ((_c = (_b = _this.matchRoute((_a = parsedUrl.pathname) !== null && _a !== void 0 ? _a : "")) === null || _b === void 0 ? void 0 : _b.route.name) !== null && _c !== void 0 ? _c : null), push: function (route, params, options) {
+            var router = (0, router_1.useRouter)();
+            return __assign(__assign({}, router), { route: _this.getRouteByPathname(router.pathname), push: function (route, params, options) {
                     if (options === void 0) { options = {}; }
                     var anchor = options.anchor, nextJsOptions = __rest(options, ["anchor"]);
-                    var _a = _this.getUrls(route, params || {}, anchor), as = _a.as, href = _a.href;
-                    return router.push(href, as, nextJsOptions);
+                    return router.push({ pathname: _this.routes[route], query: params }, undefined, nextJsOptions);
                 }, replace: function (route, params, options) {
                     if (options === void 0) { options = {}; }
                     var anchor = options.anchor, nextJsOptions = __rest(options, ["anchor"]);
-                    var _a = _this.getUrls(route, params || {}), as = _a.as, href = _a.href;
-                    return router.replace(href, as, nextJsOptions);
+                    return router.replace({ pathname: _this.routes[route], query: params }, undefined, nextJsOptions);
                 } });
         }; };
         this.getSingletonRouter = function () {
             return __assign(__assign({}, router_1.default), { push: function (route, params, options) {
                     if (options === void 0) { options = {}; }
                     var anchor = options.anchor, nextJsOptions = __rest(options, ["anchor"]);
-                    var _a = _this.getUrls(route, params || {}, anchor), as = _a.as, href = _a.href;
-                    return router_1.default.push(href, as, nextJsOptions);
+                    return router_1.default.push({ pathname: _this.routes[route], query: params }, undefined, nextJsOptions);
                 }, replace: function (route, params, options) {
                     if (options === void 0) { options = {}; }
                     var anchor = options.anchor, nextJsOptions = __rest(options, ["anchor"]);
-                    var _a = _this.getUrls(route, params || {}, anchor), as = _a.as, href = _a.href;
-                    return router_1.default.replace(href, as, nextJsOptions);
+                    return router_1.default.replace({ pathname: _this.routes[route], query: params }, undefined, nextJsOptions);
                 } });
         };
-        try {
-            for (var _b = __values(Object.entries(routes)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var _d = __read(_c.value, 2), routeName = _d[0], pattern = _d[1];
-                this.routes.push(new Route_1.Route(routeName, pattern)); // TODO
-            }
-        }
-        catch (e_1_1) { e_1 = { error: e_1_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_1) throw e_1.error; }
-        }
-        this.config = config;
-    }
-    Router.prototype.handleDefaultParams = function (route, params) {
-        var _a = this.config.defaultParams, defaultParams = _a === void 0 ? function (_, params) { return params; } : _a;
-        return defaultParams(route, params);
-    };
-    Router.prototype.matchRoute = function (url) {
-        var e_2, _a;
-        try {
-            for (var _b = __values(this.routes), _c = _b.next(); !_c.done; _c = _b.next()) {
-                var route = _c.value;
-                var matchResult = route.match(url);
-                if (matchResult) {
-                    return new MatchedRoute_1.MatchedRoute(route, matchResult);
+        this.getUrlByRoute = function (route, params) {
+            var pathname = _this.routes[route];
+            var restParams = {};
+            Object.keys(params !== null && params !== void 0 ? params : {}).forEach(function (key) {
+                var value = params[key];
+                if (pathname.includes("[".concat(key, "]"))) {
+                    pathname = pathname.replace("[".concat(key, "]"), value);
                 }
+                else {
+                    restParams[key] = value;
+                }
+            });
+            if (Object.keys(restParams).length > 0) {
+                pathname = "".concat(pathname, "?").concat(qs_1.default.stringify(restParams));
             }
-        }
-        catch (e_2_1) { e_2 = { error: e_2_1 }; }
-        finally {
-            try {
-                if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-            }
-            finally { if (e_2) throw e_2.error; }
-        }
-        return null;
-    };
-    Router.prototype.getRoute = function (routeName) {
-        var route = this.routes.find(function (r) { return r.name === routeName; });
-        if (!route) {
-            throw new Error("Route '" + routeName + "' not found.");
-        }
-        return route;
-    };
+            return pathname;
+        };
+        this.routes = routes;
+    }
     return Router;
 }());
 exports.Router = Router;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUm91dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL1JvdXRlci50c3giXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxvREFBOEU7QUFDOUUsbURBQWlDO0FBQ2pDLGdEQUEwQjtBQUMxQiwyQkFBNEI7QUFDNUIsK0NBQThDO0FBQzlDLGlDQUFnQztBQUdoQztJQUlJLGdCQUFZLE1BQW9DLEVBQUUsTUFBc0I7O1FBQXhFLGlCQUtDO1FBTGlELHVCQUFBLEVBQUEsV0FBc0I7UUFIaEUsV0FBTSxHQUFZLEVBQUUsQ0FBQztRQTJCdEIsc0JBQWlCLEdBQUcsVUFBQyxHQUFRO1lBQ2hDLElBQU0sV0FBVyxHQUFHLEdBQUcsQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO1lBRTVDLE9BQU8sVUFBQyxHQUFRLEVBQUUsR0FBUTs7Z0JBQ3RCLElBQU0sR0FBRyxHQUFXLEdBQUcsQ0FBQyxHQUFHLENBQUM7Z0JBRTVCLElBQU0sU0FBUyxHQUFHLFdBQUssQ0FBQyxHQUFHLEVBQUUsSUFBSSxDQUFDLENBQUM7Z0JBRW5DLElBQUksR0FBRyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLElBQUksR0FBRyxDQUFDLE9BQU8sQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLEVBQUU7b0JBQy9ELE9BQU8sV0FBVyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsU0FBUyxDQUFDLENBQUM7aUJBQzNDO2dCQUVELElBQU0sWUFBWSxHQUFHLEtBQUksQ0FBQyxVQUFVLE9BQUMsU0FBUyxDQUFDLFFBQVEsbUNBQUksRUFBRSxDQUFDLENBQUM7Z0JBQy9ELElBQUksWUFBWSxFQUFFO29CQUNOLElBQUEsV0FBVyxHQUFZLFlBQVksWUFBeEIsRUFBRSxLQUFLLEdBQUssWUFBWSxNQUFqQixDQUFrQjtvQkFFNUMsT0FBTyxHQUFHLENBQUMsTUFBTSxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsS0FBSyxDQUFDLElBQUksd0JBQU8sU0FBUyxDQUFDLEtBQUssR0FBSyxXQUFXLENBQUMsTUFBTSxFQUFHLENBQUM7aUJBQzFGO2dCQUVELE9BQU8sV0FBVyxDQUFDLEdBQUcsRUFBRSxHQUFHLEVBQUUsU0FBUyxDQUFDLENBQUM7WUFDNUMsQ0FBQyxDQUFDO1FBQ04sQ0FBQyxDQUFDO1FBRUssa0JBQWEsR0FBRyxVQUFDLEdBQVc7O1lBQy9CLHVEQUF1RDtZQUN2RCxJQUFNLFNBQVMsR0FBRyxXQUFLLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxDQUFDO1lBQ25DLElBQU0sWUFBWSxHQUFHLEtBQUksQ0FBQyxVQUFVLE9BQUMsU0FBUyxDQUFDLFFBQVEsbUNBQUksRUFBRSxDQUFDLENBQUM7WUFFL0QsSUFBSSxZQUFZLEVBQUU7Z0JBQ2QsT0FBTyxDQUFDLFlBQVksQ0FBQyxLQUFLLENBQUMsSUFBVyx3QkFBTyxTQUFTLENBQUMsS0FBSyxHQUFLLFlBQVksQ0FBQyxXQUFXLENBQUMsTUFBTSxFQUFHLENBQUM7YUFDdkc7WUFFRCxNQUFNLElBQUksS0FBSyxDQUFDLG9CQUFrQixHQUFHLGlCQUFjLENBQUMsQ0FBQztRQUN6RCxDQUFDLENBQUM7UUFZSyxZQUFPLEdBQUcsVUFBQyxTQUFrQixFQUFFLE1BQWUsRUFBRSxNQUFlO1lBQ2xFLElBQU0sS0FBSyxHQUFHLEtBQUksQ0FBQyxRQUFRLENBQUMsU0FBUyxDQUFDLENBQUM7WUFDdkMsT0FBTztnQkFDSCxFQUFFLEVBQUUsS0FBSyxDQUFDLEtBQUssQ0FBQyxLQUFJLENBQUMsbUJBQW1CLENBQUMsU0FBUyxFQUFFLE1BQU0sQ0FBQyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLE1BQUksTUFBUSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7Z0JBQzNGLElBQUksRUFBRSxLQUFLLENBQUMsT0FBTyxDQUFDLEtBQUksQ0FBQyxtQkFBbUIsQ0FBQyxTQUFTLEVBQUUsTUFBTSxDQUFDLENBQUM7YUFDbkUsQ0FBQztRQUNOLENBQUMsQ0FBQztRQUVLLFlBQU8sR0FBRyxjQUE4QixPQUFBLFVBQUMsS0FBSztZQUN6QyxJQUFBLEtBQUssR0FBbUMsS0FBSyxNQUF4QyxFQUFFLE1BQU0sR0FBMkIsS0FBSyxPQUFoQyxFQUFFLE1BQU0sR0FBbUIsS0FBSyxPQUF4QixFQUFLLFNBQVMsVUFBSyxLQUFLLEVBQS9DLDZCQUF1QyxDQUFGLENBQVc7WUFDaEQsSUFBQSxLQUFlLEtBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLE1BQU0sSUFBSSxFQUFFLEVBQUUsTUFBTSxDQUFDLEVBQXRELEVBQUUsUUFBQSxFQUFFLElBQUksVUFBOEMsQ0FBQztZQUMvRCxPQUFPLDhCQUFDLGNBQVEsYUFBQyxFQUFFLEVBQUUsRUFBRSxFQUFFLElBQUksRUFBRSxJQUFJLElBQU0sU0FBUyxFQUFJLENBQUM7UUFDM0QsQ0FBQyxFQUo4QyxDQUk5QyxDQUFDO1FBRUssaUJBQVksR0FBRyxjQUFNLE9BQUE7O1lBQ3hCLElBQU0sTUFBTSxHQUFHLGtCQUFhLEVBQUUsQ0FBQztZQUUvQixJQUFNLFNBQVMsR0FBRyxXQUFLLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSxJQUFJLENBQUMsQ0FBQztZQUU3Qyw2QkFDTyxNQUFNLEtBQ1QsS0FBSyxFQUFFLGFBQUMsS0FBSSxDQUFDLFVBQVUsT0FBQyxTQUFTLENBQUMsUUFBUSxtQ0FBSSxFQUFFLENBQUMsMENBQUUsS0FBSyxDQUFDLElBQUksbUNBQUksSUFBSSxDQUFRLEVBQzdFLElBQUksRUFBRSxVQUFDLEtBQUssRUFBRSxNQUFNLEVBQUUsT0FBWTtvQkFBWix3QkFBQSxFQUFBLFlBQVk7b0JBQ3RCLElBQUEsTUFBTSxHQUF1QixPQUFPLE9BQTlCLEVBQUssYUFBYSxVQUFLLE9BQU8sRUFBdEMsVUFBNEIsQ0FBRixDQUFhO29CQUN2QyxJQUFBLEtBQWUsS0FBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsTUFBTSxJQUFJLEVBQUUsRUFBRSxNQUFNLENBQUMsRUFBdEQsRUFBRSxRQUFBLEVBQUUsSUFBSSxVQUE4QyxDQUFDO29CQUMvRCxPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLEVBQUUsRUFBRSxhQUFhLENBQUMsQ0FBQztnQkFDaEQsQ0FBQyxFQUNELE9BQU8sRUFBRSxVQUFDLEtBQUssRUFBRSxNQUFNLEVBQUUsT0FBWTtvQkFBWix3QkFBQSxFQUFBLFlBQVk7b0JBQ3pCLElBQUEsTUFBTSxHQUF1QixPQUFPLE9BQTlCLEVBQUssYUFBYSxVQUFLLE9BQU8sRUFBdEMsVUFBNEIsQ0FBRixDQUFhO29CQUN2QyxJQUFBLEtBQWUsS0FBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsTUFBTSxJQUFJLEVBQUUsQ0FBQyxFQUE5QyxFQUFFLFFBQUEsRUFBRSxJQUFJLFVBQXNDLENBQUM7b0JBQ3ZELE9BQU8sTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsRUFBRSxFQUFFLGFBQWEsQ0FBQyxDQUFDO2dCQUNuRCxDQUFDLElBQ0g7UUFDTixDQUFDLEVBbkIyQixDQW1CM0IsQ0FBQztRQUVLLHVCQUFrQixHQUFHO1lBQ3hCLDZCQUNPLGdCQUFtQixLQUN0QixJQUFJLEVBQUUsVUFBQyxLQUFLLEVBQUUsTUFBTSxFQUFFLE9BQVk7b0JBQVosd0JBQUEsRUFBQSxZQUFZO29CQUN0QixJQUFBLE1BQU0sR0FBdUIsT0FBTyxPQUE5QixFQUFLLGFBQWEsVUFBSyxPQUFPLEVBQXRDLFVBQTRCLENBQUYsQ0FBYTtvQkFDdkMsSUFBQSxLQUFlLEtBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxFQUFFLE1BQU0sSUFBSSxFQUFFLEVBQUUsTUFBTSxDQUFDLEVBQXRELEVBQUUsUUFBQSxFQUFFLElBQUksVUFBOEMsQ0FBQztvQkFDL0QsT0FBTyxnQkFBbUIsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLEVBQUUsRUFBRSxhQUFhLENBQUMsQ0FBQztnQkFDN0QsQ0FBQyxFQUNELE9BQU8sRUFBRSxVQUFDLEtBQUssRUFBRSxNQUFNLEVBQUUsT0FBWTtvQkFBWix3QkFBQSxFQUFBLFlBQVk7b0JBQ3pCLElBQUEsTUFBTSxHQUF1QixPQUFPLE9BQTlCLEVBQUssYUFBYSxVQUFLLE9BQU8sRUFBdEMsVUFBNEIsQ0FBRixDQUFhO29CQUN2QyxJQUFBLEtBQWUsS0FBSSxDQUFDLE9BQU8sQ0FBQyxLQUFLLEVBQUUsTUFBTSxJQUFJLEVBQUUsRUFBRSxNQUFNLENBQUMsRUFBdEQsRUFBRSxRQUFBLEVBQUUsSUFBSSxVQUE4QyxDQUFDO29CQUMvRCxPQUFPLGdCQUFtQixDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsRUFBRSxFQUFFLGFBQWEsQ0FBQyxDQUFDO2dCQUNoRSxDQUFDLElBQ0g7UUFDTixDQUFDLENBQUM7O1lBckhFLEtBQW1DLElBQUEsS0FBQSxTQUFBLE1BQU0sQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUEsZ0JBQUEsNEJBQUU7Z0JBQWhELElBQUEsS0FBQSxtQkFBb0IsRUFBbkIsU0FBUyxRQUFBLEVBQUUsT0FBTyxRQUFBO2dCQUMxQixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxJQUFJLGFBQUssQ0FBQyxTQUFTLEVBQUUsT0FBaUIsQ0FBQyxDQUFDLENBQUMsQ0FBQyxPQUFPO2FBQ3JFOzs7Ozs7Ozs7UUFDRCxJQUFJLENBQUMsTUFBTSxHQUFHLE1BQU0sQ0FBQztJQUN6QixDQUFDO0lBRU8sb0NBQW1CLEdBQTNCLFVBQTRCLEtBQWMsRUFBRSxNQUFXO1FBQzNDLElBQUEsS0FBMEMsSUFBSSxDQUFDLE1BQU0sY0FBaEIsRUFBckMsYUFBYSxtQkFBRyxVQUFDLENBQUMsRUFBRSxNQUFNLElBQUssT0FBQSxNQUFNLEVBQU4sQ0FBTSxLQUFBLENBQWlCO1FBRTlELE9BQU8sYUFBYSxDQUFDLEtBQUssRUFBRSxNQUFNLENBQUMsQ0FBQztJQUN4QyxDQUFDO0lBRU8sMkJBQVUsR0FBbEIsVUFBbUIsR0FBVzs7O1lBQzFCLEtBQW9CLElBQUEsS0FBQSxTQUFBLElBQUksQ0FBQyxNQUFNLENBQUEsZ0JBQUEsNEJBQUU7Z0JBQTVCLElBQU0sS0FBSyxXQUFBO2dCQUNaLElBQU0sV0FBVyxHQUFHLEtBQUssQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQ3JDLElBQUksV0FBVyxFQUFFO29CQUNiLE9BQU8sSUFBSSwyQkFBWSxDQUFDLEtBQUssRUFBRSxXQUFXLENBQUMsQ0FBQztpQkFDL0M7YUFDSjs7Ozs7Ozs7O1FBRUQsT0FBTyxJQUFJLENBQUM7SUFDaEIsQ0FBQztJQXFDTyx5QkFBUSxHQUFoQixVQUFpQixTQUFrQjtRQUMvQixJQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxVQUFDLENBQUMsSUFBSyxPQUFBLENBQUMsQ0FBQyxJQUFJLEtBQUssU0FBUyxFQUFwQixDQUFvQixDQUFDLENBQUM7UUFFNUQsSUFBSSxDQUFDLEtBQUssRUFBRTtZQUNSLE1BQU0sSUFBSSxLQUFLLENBQUMsWUFBVSxTQUFTLGlCQUFjLENBQUMsQ0FBQztTQUN0RDtRQUVELE9BQU8sS0FBSyxDQUFDO0lBQ2pCLENBQUM7SUFvREwsYUFBQztBQUFELENBQUMsQUEzSEQsSUEySEM7QUEzSFksd0JBQU0ifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUm91dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL1JvdXRlci50c3giXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSxtREFBaUM7QUFDakMsb0RBQThFO0FBQzlFLGdEQUEwQjtBQUUxQiwwQ0FBb0I7QUFFcEI7SUFHSSxnQkFBWSxNQUFvQztRQUFoRCxpQkFFQztRQUVPLHVCQUFrQixHQUFHLFVBQUMsUUFBZ0I7WUFDMUMsT0FBTyxNQUFNLENBQUMsSUFBSSxDQUFDLEtBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQyxJQUFJLENBQUMsVUFBQyxLQUFLLElBQUssT0FBQyxLQUFJLENBQUMsTUFBYyxDQUFDLEtBQUssQ0FBQyxLQUFLLFFBQVEsRUFBeEMsQ0FBd0MsQ0FBUSxDQUFDO1FBQ3JHLENBQUMsQ0FBQztRQUVLLFlBQU8sR0FBRyxjQUE4QixPQUFBLFVBQUMsS0FBSztZQUN6QyxJQUFBLEtBQUssR0FBbUMsS0FBSyxNQUF4QyxFQUFFLE1BQU0sR0FBMkIsS0FBSyxPQUFoQyxFQUFFLE1BQU0sR0FBbUIsS0FBSyxPQUF4QixFQUFLLFNBQVMsVUFBSyxLQUFLLEVBQS9DLDZCQUF1QyxDQUFGLENBQVc7WUFDdEQsT0FBTyw4QkFBQyxjQUFRLGFBQUMsSUFBSSxFQUFFLEVBQUUsUUFBUSxFQUFFLEtBQUksQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLEVBQUUsS0FBSyxFQUFFLE1BQWEsRUFBRSxJQUFNLFNBQVMsRUFBSSxDQUFDO1FBQ3JHLENBQUMsRUFIOEMsQ0FHOUMsQ0FBQztRQUVLLGlCQUFZLEdBQUcsY0FBTSxPQUFBO1lBQ3hCLElBQU0sTUFBTSxHQUFHLElBQUEsa0JBQWEsR0FBRSxDQUFDO1lBRS9CLDZCQUNPLE1BQU0sS0FDVCxLQUFLLEVBQUUsS0FBSSxDQUFDLGtCQUFrQixDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsRUFDL0MsSUFB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

package/Router.test.js

@@ -1,34 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var Route_1 = require("./Route");
 var Router_1 = require("./Router");
-var route = function (pattern) { return new Route_1.Route("", pattern); };
 var router = new Router_1.Router({
     index: "/",
-    form: "/form/:id",
-    "form-field": "/form/:formId/field/:fieldId",
+    form: "/form/[id]",
+    "form-field": "/form/[formId]/field/[fieldId]",
 });
-test("Route::match", function () {
-    expect(route("/test/:param").match("/test/nejaky-parametr")).toEqual({
-        path: "/test/nejaky-parametr",
-        index: 0,
-        params: { param: "nejaky-parametr" },
-    });
-    expect(route("/test").match("/test")).toEqual({ path: "/test", index: 0, params: {} });
-    expect(route("/").match("/")).toEqual({ path: "/", index: 0, params: {} });
+test("getUrlByRoute", function () {
+    expect(router.getUrlByRoute("form", { id: 12, attr: "abc" })).toBe("/form/12?attr=abc");
+    expect(router.getUrlByRoute("form-field", { formId: 33, fieldId: "aaa", param1: "ano" })).toBe("/form/33/field/aaa?param1=ano");
 });
-test("Route::urls", function () {
-    expect(router.getUrls("index", { param1: "test-param" })).toEqual({
-        as: "/?param1=test-param",
-        href: "/?param1=test-param",
-    });
-    expect(router.getUrls("form", { id: 1, param1: "test-param" })).toEqual({
-        as: "/form/1?param1=test-param",
-        href: "/form?id=1&param1=test-param",
-    });
-    expect(router.getUrls("form-field", { formId: 1, fieldId: 2, param1: "test-param" })).toEqual({
-        as: "/form/1/field/2?param1=test-param",
-        href: "/form-field?formId=1&fieldId=2&param1=test-param",
-    });
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUm91dGVyLnRlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvUm91dGVyLnRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxpQ0FBZ0M7QUFDaEMsbUNBQWtDO0FBRWxDLElBQU0sS0FBSyxHQUFHLFVBQUMsT0FBZSxJQUFLLE9BQUEsSUFBSSxhQUFLLENBQUMsRUFBRSxFQUFFLE9BQU8sQ0FBQyxFQUF0QixDQUFzQixDQUFDO0FBRTFELElBQU0sTUFBTSxHQUFHLElBQUksZUFBTSxDQUFDO0lBQ3RCLEtBQUssRUFBRSxHQUFHO0lBQ1YsSUFBSSxFQUFFLFdBQVc7SUFDakIsWUFBWSxFQUFFLDhCQUE4QjtDQUMvQyxDQUFDLENBQUM7QUFFSCxJQUFJLENBQUMsY0FBYyxFQUFFO0lBQ2pCLE1BQU0sQ0FBQyxLQUFLLENBQUMsY0FBYyxDQUFDLENBQUMsS0FBSyxDQUFDLHVCQUF1QixDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUM7UUFDakUsSUFBSSxFQUFFLHVCQUF1QjtRQUM3QixLQUFLLEVBQUUsQ0FBQztRQUNSLE1BQU0sRUFBRSxFQUFFLEtBQUssRUFBRSxpQkFBaUIsRUFBRTtLQUN2QyxDQUFDLENBQUM7SUFFSCxNQUFNLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxFQUFFLElBQUksRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLENBQUMsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQztJQUV2RixNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxFQUFFLElBQUksRUFBRSxHQUFHLEVBQUUsS0FBSyxFQUFFLENBQUMsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQztBQUMvRSxDQUFDLENBQUMsQ0FBQztBQUVILElBQUksQ0FBQyxhQUFhLEVBQUU7SUFDaEIsTUFBTSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUM7UUFDOUQsRUFBRSxFQUFFLHFCQUFxQjtRQUN6QixJQUFJLEVBQUUscUJBQXFCO0tBQzlCLENBQUMsQ0FBQztJQUVILE1BQU0sQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxFQUFFLEVBQUUsRUFBRSxDQUFDLEVBQUUsTUFBTSxFQUFFLFlBQVksRUFBRSxDQUFDLENBQUMsQ0FBQyxPQUFPLENBQUM7UUFDcEUsRUFBRSxFQUFFLDJCQUEyQjtRQUMvQixJQUFJLEVBQUUsOEJBQThCO0tBQ3ZDLENBQUMsQ0FBQztJQUVILE1BQU0sQ0FBQyxNQUFNLENBQUMsT0FBTyxDQUFDLFlBQVksRUFBRSxFQUFFLE1BQU0sRUFBRSxDQUFDLEVBQUUsT0FBTyxFQUFFLENBQUMsRUFBRSxNQUFNLEVBQUUsWUFBWSxFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQztRQUMxRixFQUFFLEVBQUUsbUNBQW1DO1FBQ3ZDLElBQUksRUFBRSxrREFBa0Q7S0FDM0QsQ0FBQyxDQUFDO0FBQ1AsQ0FBQyxDQUFDLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUm91dGVyLnRlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvUm91dGVyLnRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxtQ0FBa0M7QUFFbEMsSUFBTSxNQUFNLEdBQUcsSUFBSSxlQUFNLENBQUM7SUFDdEIsS0FBSyxFQUFFLEdBQUc7SUFDVixJQUFJLEVBQUUsWUFBWTtJQUNsQixZQUFZLEVBQUUsZ0NBQWdDO0NBQ2pELENBQUMsQ0FBQztBQUVILElBQUksQ0FBQyxlQUFlLEVBQUU7SUFDbEIsTUFBTSxDQUFDLE1BQU0sQ0FBQyxhQUFhLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxFQUFFLEVBQUUsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDO0lBQ3hGLE1BQU0sQ0FBQyxNQUFNLENBQUMsYUFBYSxDQUFDLFlBQVksRUFBRSxFQUFFLE1BQU0sRUFBRSxFQUFFLEVBQUUsT0FBTyxFQUFFLEtBQUssRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FDMUYsK0JBQStCLENBQ2xDLENBQUM7QUFDTixDQUFDLENBQUMsQ0FBQyJ9

package/helper.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.queryParamToNumber = exports.queryParamToString = void 0;
-exports.queryParamToString = function (param) { return (typeof param === "string" ? param : ""); };
-exports.queryParamToNumber = function (param) {
+var queryParamToString = function (param) { return (typeof param === "string" ? param : ""); };
+exports.queryParamToString = queryParamToString;
+var queryParamToNumber = function (param) {
     return typeof param === "string" ? parseInt(param, 10) : 0;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2hlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBYSxRQUFBLGtCQUFrQixHQUFHLFVBQUMsS0FBeUIsSUFBYSxPQUFBLENBQUMsT0FBTyxLQUFLLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUF4QyxDQUF3QyxDQUFDO0FBRXJHLFFBQUEsa0JBQWtCLEdBQUcsVUFBQyxLQUF5QjtJQUN4RCxPQUFBLE9BQU8sS0FBSyxLQUFLLFFBQVEsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLEtBQUssRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUFuRCxDQUFtRCxDQUFDIn0=
+exports.queryParamToNumber = queryParamToNumber;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaGVscGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2hlbHBlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBTyxJQUFNLGtCQUFrQixHQUFHLFVBQUMsS0FBeUIsSUFBYSxPQUFBLENBQUMsT0FBTyxLQUFLLEtBQUssUUFBUSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUF4QyxDQUF3QyxDQUFDO0FBQXJHLFFBQUEsa0JBQWtCLHNCQUFtRjtBQUUzRyxJQUFNLGtCQUFrQixHQUFHLFVBQUMsS0FBeUI7SUFDeEQsT0FBQSxPQUFPLEtBQUssS0FBSyxRQUFRLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7QUFBbkQsQ0FBbUQsQ0FBQztBQUQzQyxRQUFBLGtCQUFrQixzQkFDeUIifQ==

package/index.js

@@ -7,7 +7,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Router"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/router",
-  "version": "1.6.1",
+  "version": "2.0.1",
   "description": "UXF Router",
   "author": "UXFans <dev@uxf.cz>",
   "homepage": "https://gitlab.com/uxf-npm/router#readme",
@@ -19,7 +19,7 @@
     "build": "tsc -P tsconfig.build.json",
     "build:next": "next build",
     "clean": "rm -rf ./dist",
-    "dev": "ts-node -P tsconfig.server.json server.ts",
+    "dev": "next dev",
     "prepublish": "npm run-script build",
     "test": "npm run-script typecheck",
     "typecheck": "tsc --noEmit --skipLibCheck"
@@ -28,43 +28,24 @@
     "url": "https://gitlab.com/uxf-npm/cms/issues"
   },
   "dependencies": {
-    "path-to-regexp": "^6.1.0"
+    "qs": "^6.10.1"
   },
   "devDependencies": {
-    "@types/jest": "^25.2.1",
-    "@types/node": "^13.13.4",
-    "@types/react": "^16.9.0",
-    "@types/react-dom": "^16.9.0",
-    "jest": "^25.5.4",
-    "next": "^9.5.1",
-    "path": "^0.12.7",
-    "prettier": "^2.1.2",
-    "react": "^16.9.0",
-    "react-dom": "^16.9.0",
-    "ts-jest": "^25.5.1",
-    "ts-node": "^9.0.0",
-    "typescript": "^3.8.3"
+    "@types/jest": "^27.4.0",
+    "@types/node": "^17.0.10",
+    "@types/qs": "^6.9.7",
+    "@types/react": "^17.0.38",
+    "@types/react-dom": "^17.0.11",
+    "jest": "^27.4.7",
+    "next": "^12.0.8",
+    "prettier": "^2.5.1",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "ts-jest": "^27.1.3",
+    "typescript": "^4.5.4"
   },
   "peerDependencies": {
     "react": "^16 || ^17",
     "react-dom": "^16 || ^17"
-  },
-  "release": {
-    "plugins": [
-      "@semantic-release/commit-analyzer",
-      "@semantic-release/release-notes-generator",
-      [
-        "@semantic-release/gitlab",
-        {
-          "gitlabUrl": "https://gitlab.com/"
-        }
-      ],
-      [
-        "@semantic-release/npm",
-        {
-          "pkgRoot": "dist"
-        }
-      ]
-    ]
   }
 }

package/types.d.ts

@@ -1,5 +1,7 @@
+/// <reference types="node" />
 import { LinkProps as NextLinkProps } from "next/link";
 import { NextRouter, SingletonRouter } from "next/router";
+import { ParsedUrlQuery } from "querystring";
 export interface Options {
     anchor?: string;
     shallow?: boolean;
@@ -22,3 +24,4 @@ export interface UxfSingletonRouter<T> extends Omit<SingletonRouter, "push" | "r
 export interface Config<T> {
     defaultParams?: (route: keyof T, params: any) => any;
 }
+export declare type RequestHandler = (req: any, res: any, pathname: string, query: ParsedUrlQuery) => Promise<void>;

package/MatchedRoute.d.ts

@@ -1,9 +0,0 @@
-import { MatchResult } from "path-to-regexp";
-import { Route } from "./Route";
-export declare class MatchedRoute {
-    private _route;
-    private _matchResult;
-    constructor(route: Route, match: MatchResult);
-    get route(): Route;
-    get matchResult(): MatchResult;
-}

package/MatchedRoute.js

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MatchedRoute = void 0;
-var MatchedRoute = /** @class */ (function () {
-    function MatchedRoute(route, match) {
-        this._route = route;
-        this._matchResult = match;
-    }
-    Object.defineProperty(MatchedRoute.prototype, "route", {
-        get: function () {
-            return this._route;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(MatchedRoute.prototype, "matchResult", {
-        get: function () {
-            return this._matchResult;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    return MatchedRoute;
-}());
-exports.MatchedRoute = MatchedRoute;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTWF0Y2hlZFJvdXRlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL01hdGNoZWRSb3V0ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFHQTtJQUlJLHNCQUFZLEtBQVksRUFBRSxLQUFrQjtRQUN4QyxJQUFJLENBQUMsTUFBTSxHQUFHLEtBQUssQ0FBQztRQUNwQixJQUFJLENBQUMsWUFBWSxHQUFHLEtBQUssQ0FBQztJQUM5QixDQUFDO0lBRUQsc0JBQUksK0JBQUs7YUFBVDtZQUNJLE9BQU8sSUFBSSxDQUFDLE1BQU0sQ0FBQztRQUN2QixDQUFDOzs7T0FBQTtJQUVELHNCQUFJLHFDQUFXO2FBQWY7WUFDSSxPQUFPLElBQUksQ0FBQyxZQUFZLENBQUM7UUFDN0IsQ0FBQzs7O09BQUE7SUFDTCxtQkFBQztBQUFELENBQUMsQUFoQkQsSUFnQkM7QUFoQlksb0NBQVkifQ==

package/Route.d.ts

@@ -1,17 +0,0 @@
-import { Match } from "path-to-regexp";
-export declare class Route {
-    private readonly _name;
-    private readonly _pattern;
-    private readonly _page;
-    private _keys;
-    private _keyNames;
-    private matchFunction;
-    private compileFunction;
-    constructor(name: string, pattern: string);
-    match(url: string): Match;
-    getHref(params?: {}): string;
-    getAs(params?: {}): string;
-    get name(): string;
-    get pattern(): string;
-    get page(): string;
-}

package/Route.js

@@ -1,86 +0,0 @@
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Route = void 0;
-var path_to_regexp_1 = require("path-to-regexp");
-function toQuerystring(obj) {
-    return Object.keys(obj)
-        .filter(function (key) { return obj[key] !== null && obj[key] !== undefined; })
-        .map(function (key) {
-        var value = obj[key];
-        if (Array.isArray(value)) {
-            value = value.join("/");
-        }
-        return [encodeURIComponent(key), encodeURIComponent(value)].join("=");
-    })
-        .join("&");
-}
-var Route = /** @class */ (function () {
-    function Route(name, pattern) {
-        this._keys = [];
-        this._name = name;
-        this._page = name.replace(/(^|\/)index$/, "").replace(/^\/?/, "/");
-        this._pattern = pattern;
-        path_to_regexp_1.pathToRegexp(pattern, this._keys);
-        this._keyNames = this._keys.map(function (k) { return k.name.toString(); });
-        this.matchFunction = path_to_regexp_1.match(pattern, { encode: encodeURI, decode: decodeURIComponent });
-        this.compileFunction = path_to_regexp_1.compile(pattern, { encode: encodeURI });
-    }
-    Route.prototype.match = function (url) {
-        var _a;
-        return (_a = this.matchFunction(url)) !== null && _a !== void 0 ? _a : null;
-    };
-    Route.prototype.getHref = function (params) {
-        if (params === void 0) { params = {}; }
-        return this.page + "?" + toQuerystring(params);
-    };
-    Route.prototype.getAs = function (params) {
-        var _this = this;
-        if (params === void 0) { params = {}; }
-        var as = this.compileFunction(params) || "/";
-        var keys = Object.keys(params);
-        var qsKeys = keys.filter(function (key) { return _this._keyNames.indexOf(key) === -1; });
-        if (qsKeys.length === 0) {
-            return as;
-        }
-        var qsParams = qsKeys.reduce(function (qs, key) {
-            var _a;
-            return (__assign(__assign({}, qs), (_a = {}, _a[key] = params[key], _a)));
-        }, {});
-        return as + "?" + toQuerystring(qsParams);
-    };
-    Object.defineProperty(Route.prototype, "name", {
-        get: function () {
-            return this._name;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(Route.prototype, "pattern", {
-        get: function () {
-            return this._pattern;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    Object.defineProperty(Route.prototype, "page", {
-        get: function () {
-            return this._page;
-        },
-        enumerable: false,
-        configurable: true
-    });
-    return Route;
-}());
-exports.Route = Route;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvUm91dGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7QUFBQSxpREFBMEU7QUFFMUUsU0FBUyxhQUFhLENBQUMsR0FBUTtJQUMzQixPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDO1NBQ2xCLE1BQU0sQ0FBQyxVQUFDLEdBQUcsSUFBSyxPQUFBLEdBQUcsQ0FBQyxHQUFHLENBQUMsS0FBSyxJQUFJLElBQUksR0FBRyxDQUFDLEdBQUcsQ0FBQyxLQUFLLFNBQVMsRUFBM0MsQ0FBMkMsQ0FBQztTQUM1RCxHQUFHLENBQUMsVUFBQyxHQUFHO1FBQ0wsSUFBSSxLQUFLLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDO1FBRXJCLElBQUksS0FBSyxDQUFDLE9BQU8sQ0FBQyxLQUFLLENBQUMsRUFBRTtZQUN0QixLQUFLLEdBQUcsS0FBSyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztTQUMzQjtRQUNELE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxHQUFHLENBQUMsRUFBRSxrQkFBa0IsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQztJQUMxRSxDQUFDLENBQUM7U0FDRCxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7QUFDbkIsQ0FBQztBQUVEO0lBVUksZUFBWSxJQUFZLEVBQUUsT0FBZTtRQU5qQyxVQUFLLEdBQVUsRUFBRSxDQUFDO1FBT3RCLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDO1FBQ2xCLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxjQUFjLEVBQUUsRUFBRSxDQUFDLENBQUMsT0FBTyxDQUFDLE1BQU0sRUFBRSxHQUFHLENBQUMsQ0FBQztRQUNuRSxJQUFJLENBQUMsUUFBUSxHQUFHLE9BQU8sQ0FBQztRQUN4Qiw2QkFBWSxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7UUFDbEMsSUFBSSxDQUFDLFNBQVMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxVQUFDLENBQUMsSUFBSyxPQUFBLENBQUMsQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFLEVBQWpCLENBQWlCLENBQUMsQ0FBQztRQUUxRCxJQUFJLENBQUMsYUFBYSxHQUFHLHNCQUFLLENBQUMsT0FBTyxFQUFFLEVBQUUsTUFBTSxFQUFFLFNBQVMsRUFBRSxNQUFNLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQyxDQUFDO1FBQ3ZGLElBQUksQ0FBQyxlQUFlLEdBQUcsd0JBQU8sQ0FBQyxPQUFPLEVBQUUsRUFBRSxNQUFNLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQztJQUNuRSxDQUFDO0lBRU0scUJBQUssR0FBWixVQUFhLEdBQVc7O1FBQ3BCLGFBQU8sSUFBSSxDQUFDLGFBQWEsQ0FBQyxHQUFHLENBQUMsbUNBQUksSUFBSSxDQUFDO0lBQzNDLENBQUM7SUFFTSx1QkFBTyxHQUFkLFVBQWUsTUFBVztRQUFYLHVCQUFBLEVBQUEsV0FBVztRQUN0QixPQUFVLElBQUksQ0FBQyxJQUFJLFNBQUksYUFBYSxDQUFDLE1BQU0sQ0FBRyxDQUFDO0lBQ25ELENBQUM7SUFFTSxxQkFBSyxHQUFaLFVBQWEsTUFBVztRQUF4QixpQkFrQkM7UUFsQlksdUJBQUEsRUFBQSxXQUFXO1FBQ3BCLElBQU0sRUFBRSxHQUFHLElBQUksQ0FBQyxlQUFlLENBQUMsTUFBTSxDQUFDLElBQUksR0FBRyxDQUFDO1FBQy9DLElBQU0sSUFBSSxHQUFHLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7UUFDakMsSUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxVQUFDLEdBQUcsSUFBSyxPQUFBLEtBQUksQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFsQyxDQUFrQyxDQUFDLENBQUM7UUFFeEUsSUFBSSxNQUFNLENBQUMsTUFBTSxLQUFLLENBQUMsRUFBRTtZQUNyQixPQUFPLEVBQUUsQ0FBQztTQUNiO1FBRUQsSUFBTSxRQUFRLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FDMUIsVUFBQyxFQUFFLEVBQUUsR0FBRzs7WUFBSyxPQUFBLHVCQUNOLEVBQUUsZ0JBQ0osR0FBRyxJQUFJLE1BQWMsQ0FBQyxHQUFHLENBQUMsT0FDN0I7UUFIVyxDQUdYLEVBQ0YsRUFBRSxDQUNMLENBQUM7UUFFRixPQUFVLEVBQUUsU0FBSSxhQUFhLENBQUMsUUFBUSxDQUFHLENBQUM7SUFDOUMsQ0FBQztJQUVELHNCQUFJLHVCQUFJO2FBQVI7WUFDSSxPQUFPLElBQUksQ0FBQyxLQUFLLENBQUM7UUFDdEIsQ0FBQzs7O09BQUE7SUFFRCxzQkFBSSwwQkFBTzthQUFYO1lBQ0ksT0FBTyxJQUFJLENBQUMsUUFBUSxDQUFDO1FBQ3pCLENBQUM7OztPQUFBO0lBRUQsc0JBQUksdUJBQUk7YUFBUjtZQUNJLE9BQU8sSUFBSSxDQUFDLEtBQUssQ0FBQztRQUN0QixDQUFDOzs7T0FBQTtJQUNMLFlBQUM7QUFBRCxDQUFDLEFBNURELElBNERDO0FBNURZLHNCQUFLIn0=