spinning-router 0.0.1 → 0.0.2

package/dist/Location.d.ts

@@ -1,2 +1,9 @@
 /// <reference types="react" />
-export declare const Location: import("react").Context<string>;
+export type LocationType = {
+    path: string;
+    match: string;
+    parameters: {
+        [key: string]: string;
+    };
+};
+export declare const Location: import("react").Context<LocationType>;

package/dist/Location.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Location = void 0;
 const react_1 = require("react");
-exports.Location = (0, react_1.createContext)("");
+exports.Location = (0, react_1.createContext)({ path: "", match: "", parameters: {} });

package/dist/Routes.d.ts

@@ -5,4 +5,13 @@ export type Route = {
     routes?: Routes;
     component?: AsyncComponent;
 };
-export type Routes = Route[];
+export type Routes = readonly Route[];
+export type AllPaths<R extends Routes, Prefix extends string = ""> = R extends readonly [infer First extends Route, ...infer Rest extends readonly Route[]] ? (First extends {
+    path: infer P extends string;
+    routes?: infer S;
+} ? `${Prefix}${P}` | (S extends Routes ? AllPaths<S, `${Prefix}${P}`> : never) : never) | AllPaths<Rest, Prefix> : never;
+export interface Register {
+}
+export type Path = AllPaths<Register extends {
+    routes: infer Routes;
+} ? Routes : never>;

package/dist/SpinningRouter.d.ts

@@ -1,10 +1,5 @@
 import React from "react";
 import { Routes } from "./Routes";
-type Parameters = {
-    [key: string]: any;
-};
-export declare const doMatchRoute: (routes: Routes, path: string[], parentParameters: Parameters) => Promise<JSX.Element>;
-export declare const matchRoute: (routes: Routes, path: string) => Promise<JSX.Element | undefined>;
 export declare const SpinningRouter: React.FC<{
     routes: Routes;
     errorPage?: React.FC<{
@@ -13,4 +8,3 @@ export declare const SpinningRouter: React.FC<{
     notFoundPage?: React.ComponentType;
     loadingIndicator?: React.ComponentType;
 }>;
-export {};

package/dist/SpinningRouter.js

@@ -9,82 +9,37 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SpinningRouter = exports.matchRoute = exports.doMatchRoute = void 0;
+exports.SpinningRouter = void 0;
 const jsx_runtime_1 = require("react/jsx-runtime");
 const react_1 = require("react");
 const Location_1 = require("./Location");
 const DefaultLoadingIndicator_1 = require("./components/DefaultLoadingIndicator");
 const DefaultErrorPage_1 = require("./components/DefaultErrorPage");
 const DefaultNotFoundPage_1 = require("./components/DefaultNotFoundPage");
-const doMatchRoute = (routes, path, parentParameters) => __awaiter(void 0, void 0, void 0, function* () {
-    for (let r of routes) {
-        const rPath = r.path.split("/").filter(e => e != "");
-        if ((r.routes && rPath.length <= path.length) || rPath.length == path.length) {
-            let parameters = Object.assign({}, parentParameters);
-            let match = true;
-            for (let i in rPath) {
-                if (rPath[i].startsWith(":")) {
-                    parameters[rPath[i].substring(1)] = path[i];
-                }
-                else {
-                    if (rPath[i] != path[i]) {
-                        match = false;
-                    }
-                }
-            }
-            if (match) {
-                let children = undefined;
-                if (r.routes) {
-                    children = yield (0, exports.doMatchRoute)(r.routes, path.slice(rPath.length), parameters);
-                }
-                if (r.component) {
-                    parameters["children"] = children;
-                    return r.component(parameters);
-                }
-                else {
-                    if (children) {
-                        return children;
-                    }
-                }
-            }
-        }
-    }
-    throw "Not Found";
-});
-exports.doMatchRoute = doMatchRoute;
-const matchRoute = (routes, path) => __awaiter(void 0, void 0, void 0, function* () {
-    try {
-        return (0, exports.doMatchRoute)(routes, path.split("/").filter(e => e != ""), {});
-    }
-    catch (error) {
-        if (error == "Not Found") {
-            return undefined;
-        }
-        else {
-            throw error;
-        }
-    }
-});
-exports.matchRoute = matchRoute;
+const matchRoute_1 = require("./matchRoute");
 const SpinningRouter = ({ routes, errorPage = DefaultErrorPage_1.DefaultErrorPage, notFoundPage = DefaultNotFoundPage_1.DefaultNotFoundPage, loadingIndicator = DefaultLoadingIndicator_1.DefaultLoadingIndicator }) => {
     const [hash, setHash] = (0, react_1.useState)(() => location.hash.substring(1));
     const [element, setElement] = (0, react_1.useState)(undefined);
     const [overlay, setOverlay] = (0, react_1.useState)(undefined);
+    const [parameters, setParameters] = (0, react_1.useState)({});
     const invokeRoute = (path) => __awaiter(void 0, void 0, void 0, function* () {
         setOverlay(loadingIndicator);
         try {
-            const element = yield (0, exports.matchRoute)(routes, path);
-            setElement(element);
-            if (element) {
-                setElement(element);
+            const match = yield (0, matchRoute_1.matchRoute)(routes, path);
+            if (match) {
+                setElement(match.element);
+                setParameters(match.parameters);
             }
             else {
                 setElement(notFoundPage);
+                setParameters({});
             }
+            window.scrollTo(0, 0);
         }
         catch (error) {
-            console.log(error);
+            window.scrollTo(0, 0);
             setElement(errorPage({ error }));
+            setParameters({});
         }
         finally {
             setOverlay(undefined);
@@ -105,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: hash }, { children: [element, overlay] })));
+    return ((0, jsx_runtime_1.jsxs)(Location_1.Location.Provider, Object.assign({ value: { path: hash, match: "", parameters } }, { children: [element, overlay] })));
 };
 exports.SpinningRouter = SpinningRouter;

package/dist/index.d.ts

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

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SpinningRouter = exports.softRefresh = exports.navigate = exports.link = void 0;
+exports.Location = exports.SpinningRouter = exports.softRefresh = exports.navigate = exports.link = void 0;
 var link_1 = require("./link");
 Object.defineProperty(exports, "link", { enumerable: true, get: function () { return link_1.link; } });
 var navigate_1 = require("./navigate");
@@ -9,3 +9,5 @@ var softRefresh_1 = require("./softRefresh");
 Object.defineProperty(exports, "softRefresh", { enumerable: true, get: function () { return softRefresh_1.softRefresh; } });
 var SpinningRouter_1 = require("./SpinningRouter");
 Object.defineProperty(exports, "SpinningRouter", { enumerable: true, get: function () { return SpinningRouter_1.SpinningRouter; } });
+var Location_1 = require("./Location");
+Object.defineProperty(exports, "Location", { enumerable: true, get: function () { return Location_1.Location; } });

package/dist/link.d.ts

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

package/dist/link.js

@@ -1,22 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.link = void 0;
-const link = (strings, ...values) => {
-    const s = String.raw({ raw: strings }, ...values);
-    if (s.startsWith("~")) {
-        const id = document.location.hash.split("/")[1];
-        if (id) {
-            return `#/${id}${s.substring(1)}`;
+const link = (path, values = {}) => {
+    let result = [];
+    for (let part of path.split("/")) {
+        if (part.startsWith(":")) {
+            result.push(encodeURIComponent(values[part.substring(1)]));
         }
         else {
-            return `#${s.substring(1)}`;
+            result.push(part);
         }
     }
-    if (s.startsWith("/")) {
-        return "#" + s;
-    }
-    else {
-        return "#/" + s;
-    }
+    return "#" + result.join("/");
 };
 exports.link = link;

package/dist/matchRoute.d.ts

@@ -0,0 +1,11 @@
+/// <reference types="react" />
+import { Routes } from "./Routes";
+type Match = {
+    path: string;
+    parameters: {
+        [key: string]: string;
+    };
+    element: JSX.Element;
+};
+export declare const matchRoute: (routes: Routes, query: string) => Promise<Match | undefined>;
+export {};

package/dist/matchRoute.js

@@ -0,0 +1,42 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.matchRoute = void 0;
+const doMatchRoute = (routes, querySplitted, parameters) => __awaiter(void 0, void 0, void 0, function* () {
+    for (let r of routes) {
+        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])])));
+                if (r.routes) {
+                    let subRoute = yield doMatchRoute(r.routes, querySplitted.slice(pathSplitted.length), parameters);
+                    return {
+                        element: r.component ? yield r.component(Object.assign(Object.assign({}, parameters), { children: subRoute.element })) : subRoute.element,
+                        path: r.path + "/" + subRoute.path,
+                        parameters: subRoute.parameters
+                    };
+                }
+                else {
+                    return {
+                        element: r.component ? yield r.component(Object.assign({}, parameters)) : undefined,
+                        path: r.path,
+                        parameters
+                    };
+                }
+            }
+        }
+    }
+    return undefined;
+});
+const matchRoute = (routes, query) => __awaiter(void 0, void 0, void 0, function* () {
+    return yield doMatchRoute(routes, query.split("/").filter(e => e != ""), {});
+});
+exports.matchRoute = matchRoute;

package/dist/navigate.d.ts

@@ -1 +1,4 @@
-export declare const navigate: (strings: TemplateStringsArray, ...values: any[]) => void;
+import { Path } from "./Routes";
+export declare const navigate: (path: Path, values?: {
+    [key: string]: string | number;
+}) => 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 = (strings, ...values) => {
-    window.location.hash = (0, link_1.link)(strings, ...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.1",
+  "version": "0.0.2",
   "description": "n/a",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,4 +13,4 @@
   "peerDependencies": {
     "react": "^18.2.0 || >19"
   }
-}
+}