preact-hashish-router 0.1.11 → 0.1.12

package/dist/Router.d.ts

@@ -15,13 +15,13 @@ export type RouterProps = PropsWithChildren<{
      */
     redirect_path_to_hash?: boolean;
     /**
-     * Trigger hook before the next route calcultation begin
+     * Trigger hook before push new route entry
      */
-    onBeforeRouteChange?: () => Promise<void> | void;
+    onBeforeRouteChange?: (path: string) => Promise<void> | void;
     /**
-     * Trigger hook when the next route calcultation finish
+     * Trigger hook after push new route entry
      */
-    onRouteDidChange?: () => Promise<void> | void;
+    onRouteDidChange?: (path: string) => Promise<void> | void;
     /**
      * If true don't trigger hooks on first render
      * @default false

package/dist/createDataRouter.d.ts

@@ -0,0 +1,5 @@
+import type { RouteProps } from "./Route";
+export type RouteData = RouteProps & {
+    children?: RouteData[] | undefined;
+};
+export declare function createDataRouter(data: RouteData[]): ({ type: router_type, ignoreInitial, ...props }: import("./Router").RouterProps) => import("preact").JSX.Element;

package/dist/index.d.ts

@@ -4,3 +4,4 @@ export { NotFound } from "./NotFound";
 export { Route } from "./Route";
 export { Router } from "./Router";
 export { RouterErrorBoundary } from "./RouterErrorBoundary";
+export { createDataRouter, type RouteData } from "./createDataRouter";

package/dist/index.js

@@ -1 +1 @@
-import{forwardRef as A}from"preact/compat";import{createContext as k}from"preact";import{useContext as c}from"preact/hooks";var s=k({active_path:"",active_route_data:null,params:void 0,searchParams:new URLSearchParams,async go(){}}),p=()=>{let e=c(s);if(!e)throw new Error("useHashisherContext should be inside a HashisherContext provider");return e};function E(){let e=c(s);if(!e)throw new Error("useParams should be inside a HashisherContext provider");return e.params}function D(){let e=c(s);if(!e)throw new Error("useSearchParams should be inside a HashisherContext provider");return e.searchParams}var U=()=>{let e=c(s);if(!e)throw new Error("useRouter should be inside a HashisherContext provider");return{path:e.active_path,params:e.params,searchParams:e.searchParams,go:e.go}};import{jsx as B}from"preact/jsx-runtime";var z=A(({href:e,...t},r)=>{let{go:n}=p();if(!e)throw new Error("A: href must be defined");return B("a",{ref:r,href:e,onClick:o=>{o&&o.type==="click"&&(o.ctrlKey||o.metaKey||o.altKey||o.shiftKey||o.button!==0)||(o.preventDefault(),n(e))},...t})});import{Fragment as K,jsx as _}from"preact/jsx-runtime";var W=e=>(F(e.element),_(K,{})),R=_("div",{children:"404 Not Found"}),F=e=>{R=e},l=()=>R;import{addRoute as T,createRouter as O}from"rou3";var f=O(),P=(e,t)=>{T(f,void 0,e,{component:t.element,fallback:t.fallback||null,lazy:!!t.lazy})};import{Fragment as G,jsx as J}from"preact/jsx-runtime";function q(e){return P(e.path,e),J(G,{})}import{useCallback as Y,useLayoutEffect as w,useRef as Z,useState as u}from"preact/hooks";import{findRoute as $}from"rou3";import{parseURL as C}from"ufo";import{Suspense as Q}from"preact/compat";import{jsx as X}from"preact/jsx-runtime";var y=()=>{let{active_route_data:e}=p();return e?e.component===null?l():e.lazy?X(Q,{fallback:e.fallback,children:e.component}):e.component:l()};import{jsx as ee,jsxs as te}from"preact/jsx-runtime";var I=({type:e="browser",ignoreInitial:t=!1,...r})=>{let[n,o]=u("/"),[g,v]=u(void 0),[b,H]=u(new URLSearchParams),[V,M]=u(null),h=Z(0),i=Y(async a=>{console.log({ignoreInitial:t,renderCount:h}),t===!0?h.current!==0&&await r.onBeforeRouteChange?.():await r.onBeforeRouteChange?.();let{params:m,path:d,route_data:S,search_params:L}=await j(a,e);e==="browser"&&window.history.pushState(null,"",d),e==="hash"&&(window.location.hash=d),o(d),v(m),H(L),M(S),t===!0?h.current!==0&&await r.onRouteDidChange?.():await r.onRouteDidChange?.(),h.current+=1},[e,r.onBeforeRouteChange,r.onRouteDidChange]);w(()=>{if(e!=="browser")return;let a=()=>{i(null)};return window.addEventListener("popstate",a),a(),()=>{window.removeEventListener("popstate",a)}},[i,e]),w(()=>{if(e!=="hash")return;let a=()=>{i(null)};return window.addEventListener("hashchange",a),a(),()=>{window.removeEventListener("hashchange",a)}},[i,e]);let N=async a=>{let m=C(a).pathname;i(m)};return te(s.Provider,{value:{active_path:n,searchParams:b,params:g,active_route_data:V,go:N},children:[r.children,ee(y,{})]})},j=async(e,t="browser")=>{let r=C(window.location.href),n=e||"";e===null&&(t==="hash"?n=r.hash:n=r.pathname);let o=$(f,void 0,n);return o?{path:n,search_params:new URLSearchParams(r.search),route_data:{...o.data},params:{...o.params}}:{path:n,search_params:new URLSearchParams(r.search),route_data:null,params:void 0}};import{Component as re}from"preact";import{jsxs as oe}from"preact/jsx-runtime";var x=class extends re{state={error:null};static getDerivedStateFromError(t){return{error:t.message}}componentDidCatch(t){this.setState({error:t.message})}render(){return this.state.error?this.props.fallback?this.props.fallback:oe("p",{children:["Oh no! We ran into an error: ",this.state.error]}):this.props.children}};export{z as A,W as NotFound,q as Route,I as Router,x as RouterErrorBoundary,E as useParams,U as useRouter,D as useSearchParams};
+import{forwardRef as A}from"preact/compat";import{createContext as L}from"preact";import{useContext as c}from"preact/hooks";var i=L({active_path:"",active_route_data:null,params:void 0,searchParams:new URLSearchParams,async go(){}}),p=()=>{let e=c(i);if(!e)throw new Error("useHashisherContext should be inside a HashisherContext provider");return e};function z(){let e=c(i);if(!e)throw new Error("useParams should be inside a HashisherContext provider");return e.params}function B(){let e=c(i);if(!e)throw new Error("useSearchParams should be inside a HashisherContext provider");return e.searchParams}var U=()=>{let e=c(i);if(!e)throw new Error("useRouter should be inside a HashisherContext provider");return{path:e.active_path,params:e.params,searchParams:e.searchParams,go:e.go}};import{jsx as F}from"preact/jsx-runtime";var W=A(({href:e,...r},t)=>{let{go:a}=p();if(!e)throw new Error("A: href must be defined");return F("a",{ref:t,href:e,onClick:o=>{o&&o.type==="click"&&(o.ctrlKey||o.metaKey||o.altKey||o.shiftKey||o.button!==0)||(o.preventDefault(),a(e))},...r})});import{Fragment as O,jsx as y}from"preact/jsx-runtime";var K=e=>(T(e.element),y(O,{})),_=y("div",{children:"404 Not Found"}),T=e=>{_=e},f=()=>_;import{addRoute as $,createRouter as q}from"rou3";var R=q(),u=(e,r)=>{$(R,void 0,e,{component:r.element,fallback:r.fallback||null,lazy:!!r.lazy})};import{Fragment as I,jsx as J}from"preact/jsx-runtime";function G(e){return u(e.path,e),J(I,{})}import{useCallback as Y,useLayoutEffect as w,useRef as Z,useState as l}from"preact/hooks";import{findRoute as j}from"rou3";import{parseURL as C}from"ufo";import{Suspense as Q}from"preact/compat";import{jsx as X}from"preact/jsx-runtime";var g=()=>{let{active_route_data:e}=p();return e?e.component===null?f():e.lazy?X(Q,{fallback:e.fallback,children:e.component}):e.component:f()};import{jsx as te,jsxs as re}from"preact/jsx-runtime";var P=({type:e="browser",ignoreInitial:r=!1,...t})=>{let[a,o]=l("/"),[b,H]=l(void 0),[V,k]=l(new URLSearchParams),[M,N]=l(null),m=Z(0),h=Y(async n=>{let{params:d,path:s,route_data:D,search_params:E}=await ee(n,e);r===!0?m.current!==0&&await t.onBeforeRouteChange?.(s):await t.onBeforeRouteChange?.(s),e==="browser"&&window.history.pushState(null,"",s),e==="hash"&&(window.location.hash=s),o(s),H(d),k(E),N(D),r===!0?m.current!==0&&await t.onRouteDidChange?.(s):await t.onRouteDidChange?.(s),m.current+=1},[e,t.onBeforeRouteChange,t.onRouteDidChange]);w(()=>{if(e!=="browser")return;let n=()=>{h(null)};return window.addEventListener("popstate",n),n(),()=>{window.removeEventListener("popstate",n)}},[h,e]),w(()=>{if(e!=="hash")return;let n=()=>{h(null)};return window.addEventListener("hashchange",n),n(),()=>{window.removeEventListener("hashchange",n)}},[h,e]);let S=async n=>{let d=C(n).pathname;h(d)};return re(i.Provider,{value:{active_path:a,searchParams:V,params:b,active_route_data:M,go:S},children:[t.children,te(g,{})]})},ee=async(e,r="browser")=>{let t=C(window.location.href),a=e||"";e===null&&(r==="hash"?a=t.hash:a=t.pathname);let o=j(R,void 0,a);return o?{path:a,search_params:new URLSearchParams(t.search),route_data:{...o.data},params:{...o.params}}:{path:a,search_params:new URLSearchParams(t.search),route_data:null,params:void 0}};import{Component as oe}from"preact";import{jsxs as ae}from"preact/jsx-runtime";var x=class extends oe{state={error:null};static getDerivedStateFromError(r){return{error:r.message}}componentDidCatch(r){this.setState({error:r.message})}render(){return this.state.error?this.props.fallback?this.props.fallback:ae("p",{children:["Oh no! We ran into an error: ",this.state.error]}):this.props.children}};function ne(e){return v(e),P}function v(e,r=""){for(let t of e){let a=se(r,t.path);console.log(a),u(a,{element:t.element,fallback:t.fallback,lazy:t.lazy}),t.children&&t.children.length>0&&v(t.children,a)}}var se=(e,r)=>{let t=e.split("/").filter(Boolean);return r.split("/").filter(Boolean).forEach(o=>{t.push(o)}),`/${t.join("/")}`};export{W as A,K as NotFound,G as Route,P as Router,x as RouterErrorBoundary,ne as createDataRouter,z as useParams,U as useRouter,B as useSearchParams};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "preact-hashish-router",
-  "version": "0.1.11",
+  "version": "0.1.12",
   "type": "module",
   "description": "A simple router for preact",
   "scripts": {