spinning-router 0.0.2 → 0.0.3

package/dist/Location.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export type LocationType = {
     path: string;
     match: string;

package/dist/Routes.d.ts

@@ -1,5 +1,4 @@
-/// <reference types="react" />
-export type AsyncComponent = (arg: any) => Promise<JSX.Element>;
+export type AsyncComponent = (parameters: any) => Promise<JSX.Element>;
 export type Route = {
     path: string;
     routes?: Routes;
@@ -15,3 +14,10 @@ export interface Register {
 export type Path = AllPaths<Register extends {
     routes: infer Routes;
 } ? Routes : never>;
+type SplitPathSegments<S extends string, Delimiter extends string = "/", Parts extends string[] = []> = S extends `${infer Head}${Delimiter}${infer Tail}` ? SplitPathSegments<Tail, Delimiter, [...Parts, Head]> : [...Parts, S];
+type FilterColonParams<T> = T extends `:${infer Param}` ? Param : never;
+type PathParameterName<P extends Path> = FilterColonParams<SplitPathSegments<P>[number]>;
+export type PathParameters<P extends Path> = {
+    [key in PathParameterName<P>]?: string | number;
+};
+export {};

package/dist/SpinningRouter.js

@@ -60,6 +60,6 @@ const SpinningRouter = ({ routes, errorPage = DefaultErrorPage_1.DefaultErrorPag
             window.removeEventListener("softRefresh", updateHash);
         };
     }, []);
-    return ((0, jsx_runtime_1.jsxs)(Location_1.Location.Provider, Object.assign({ value: { path: hash, match: "", parameters } }, { children: [element, overlay] })));
+    return ((0, jsx_runtime_1.jsxs)(Location_1.Location.Provider, { value: { path: hash, match: "", parameters }, children: [element, overlay] }));
 };
 exports.SpinningRouter = SpinningRouter;

package/dist/components/DefaultErrorPage.js

@@ -2,5 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultErrorPage = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
-const DefaultErrorPage = ({ error }) => (0, jsx_runtime_1.jsxs)("p", { children: ["Unhandled error: ", "" + error] });
+const DefaultErrorPage = ({ error }) => {
+    if (error && error.stack && error.message) {
+        return ((0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)("h4", { children: error.message }), (0, jsx_runtime_1.jsx)("pre", { children: error.stack })] }));
+    }
+    else {
+        return ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)("h4", { children: "" + error }) }));
+    }
+};
 exports.DefaultErrorPage = DefaultErrorPage;

package/dist/components/DefaultLoadingIndicator.js

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultLoadingIndicator = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
-const DefaultLoadingIndicator = () => ((0, jsx_runtime_1.jsx)("div", Object.assign({ style: {
+const DefaultLoadingIndicator = () => ((0, jsx_runtime_1.jsx)("div", { style: {
         position: "fixed",
         top: "40%",
         left: "50%",
         transform: "translate(-50%, -50%)",
         opacity: 1
-    } }, { children: (0, jsx_runtime_1.jsx)("svg", Object.assign({ width: "200", height: "200", viewBox: "0 0 50 50" }, { children: (0, jsx_runtime_1.jsxs)("path", Object.assign({ fill: "#000000", d: "M25.251,6.461c-10.318,0-18.683,8.365-18.683,18.683h4.068c0-8.071,6.543-14.615,14.615-14.615V6.461z" }, { children: [(0, jsx_runtime_1.jsx)("animate", { attributeName: "opacity", values: "0; 0.1; 1.0", dur: "0.5s" }), (0, jsx_runtime_1.jsx)("animateTransform", { attributeType: "xml", attributeName: "transform", type: "rotate", from: "0 25 25", to: "360 25 25", dur: "1s", repeatCount: "indefinite" })] })) })) })));
+    }, children: (0, jsx_runtime_1.jsx)("svg", { width: "200", height: "200", viewBox: "0 0 50 50", children: (0, jsx_runtime_1.jsxs)("path", { fill: "#000000", d: "M25.251,6.461c-10.318,0-18.683,8.365-18.683,18.683h4.068c0-8.071,6.543-14.615,14.615-14.615V6.461z", children: [(0, jsx_runtime_1.jsx)("animate", { attributeName: "opacity", values: "0; 0.1; 0.5", dur: "2s" }), (0, jsx_runtime_1.jsx)("animateTransform", { attributeType: "xml", attributeName: "transform", type: "rotate", from: "0 25 25", to: "360 25 25", dur: "1s", repeatCount: "indefinite" })] }) }) }));
 exports.DefaultLoadingIndicator = DefaultLoadingIndicator;

package/dist/components/DefaultNotFoundPage.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefaultNotFoundPage = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
-const DefaultNotFoundPage = () => (0, jsx_runtime_1.jsx)("p", { children: "Not found" });
+const DefaultNotFoundPage = () => (0, jsx_runtime_1.jsx)("h4", { children: "Not found" });
 exports.DefaultNotFoundPage = DefaultNotFoundPage;

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export { link } from "./link";
+export { unsafeLink } from "./link";
 export { navigate } from "./navigate";
 export { AsyncComponent, Route, Routes, Path, Register } from "./Routes";
 export { softRefresh } from "./softRefresh";

package/dist/index.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Location = exports.SpinningRouter = exports.softRefresh = exports.navigate = exports.link = void 0;
+exports.Location = exports.SpinningRouter = exports.softRefresh = exports.navigate = exports.unsafeLink = exports.link = void 0;
 var link_1 = require("./link");
 Object.defineProperty(exports, "link", { enumerable: true, get: function () { return link_1.link; } });
+var link_2 = require("./link");
+Object.defineProperty(exports, "unsafeLink", { enumerable: true, get: function () { return link_2.unsafeLink; } });
 var navigate_1 = require("./navigate");
 Object.defineProperty(exports, "navigate", { enumerable: true, get: function () { return navigate_1.navigate; } });
 var softRefresh_1 = require("./softRefresh");

package/dist/link.d.ts

@@ -1,4 +1,3 @@
-import { Path } from "./Routes";
-export declare const link: (path: Path, values?: {
-    [key: string]: string | number;
-}) => string;
+import { Path, PathParameters } from "./Routes";
+export declare const unsafeLink: (path: string, values?: any) => string;
+export declare const link: <P extends Path>(path: P, values?: PathParameters<P>) => string;

package/dist/link.js

@@ -1,11 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.link = void 0;
-const link = (path, values = {}) => {
+exports.link = exports.unsafeLink = void 0;
+const Location_1 = require("./Location");
+const react_1 = require("react");
+const unsafeLink = (path, values) => {
     let result = [];
     for (let part of path.split("/")) {
         if (part.startsWith(":")) {
-            result.push(encodeURIComponent(values[part.substring(1)]));
+            const key = part.substring(1);
+            let value = values && values[key] !== undefined ? values[key] : (0, react_1.useContext)(Location_1.Location).parameters[key];
+            result.push(encodeURIComponent(value));
         }
         else {
             result.push(part);
@@ -13,4 +17,5 @@ const link = (path, values = {}) => {
     }
     return "#" + result.join("/");
 };
-exports.link = link;
+exports.unsafeLink = unsafeLink;
+exports.link = exports.unsafeLink;

package/dist/matchRoute.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { Routes } from "./Routes";
 type Match = {
     path: string;

package/dist/matchRoute.js

@@ -15,7 +15,10 @@ const doMatchRoute = (routes, querySplitted, parameters) => __awaiter(void 0, vo
         const pathSplitted = r.path.split("/").filter(e => e != "");
         if ((r.routes && pathSplitted.length <= querySplitted.length) || pathSplitted.length == querySplitted.length) {
             if (pathSplitted.every((e, i) => e.startsWith(":") || e == querySplitted[i])) {
-                parameters = Object.assign(Object.assign({}, parameters), Object.fromEntries(pathSplitted.filter(e => e.startsWith(":")).map((e, i) => [e.substring(1), decodeURIComponent(querySplitted[i])])));
+                parameters = Object.assign(Object.assign({}, parameters), Object.fromEntries(pathSplitted
+                    .map((pathPart, i) => ({ pathPart, queryPath: querySplitted[i] }))
+                    .filter(({ pathPart }) => pathPart.startsWith(":"))
+                    .map(({ pathPart, queryPath }) => [pathPart.substring(1), decodeURIComponent(queryPath)])));
                 if (r.routes) {
                     let subRoute = yield doMatchRoute(r.routes, querySplitted.slice(pathSplitted.length), parameters);
                     return {

package/dist/navigate.d.ts

@@ -1,4 +1,2 @@
-import { Path } from "./Routes";
-export declare const navigate: (path: Path, values?: {
-    [key: string]: string | number;
-}) => void;
+import { Path, PathParameters } from "./Routes";
+export declare const navigate: <P extends Path>(path: P, values?: PathParameters<P>) => void;

package/dist/navigate.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.navigate = void 0;
 const link_1 = require("./link");
-const navigate = (path, values = {}) => {
+const navigate = (path, values) => {
     window.location.hash = (0, link_1.link)(path, values);
 };
 exports.navigate = navigate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "spinning-router",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "n/a",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",