solid-navigator 0.3.6 → 0.3.8

package/dist/dev.js

@@ -1,5 +1,5 @@
 import { createContext, children, createMemo, createSignal, onCleanup, batch, mergeProps, createEffect, on, useContext } from 'solid-js';
-import { delegateEvents, createComponent, spread, template } from 'solid-js/web';
+import { delegateEvents, createComponent, spread, mergeProps as mergeProps$1, template } from 'solid-js/web';
 import { createStore, reconcile } from 'solid-js/store';
 
 // src/navigator.ts
@@ -74,6 +74,7 @@ var createLocation = (path, query, setQuery) => {
   const search = createMemo(() => url().search);
   const pathname = createMemo(() => url().pathname);
   const hash = createMemo(() => url().hash);
+  const state = createMemo(on([hash, pathname, search], () => history.state));
   return {
     query,
     get search() {
@@ -84,6 +85,9 @@ var createLocation = (path, query, setQuery) => {
     },
     get hash() {
       return hash();
+    },
+    get state() {
+      return state();
     }
   };
 };
@@ -281,9 +285,9 @@ var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
       newPath = currentPathname + "/" + newPath.slice(2);
     }
     if (options?.replace) {
-      history.replaceState({}, "", newPath);
+      history.replaceState(options.data || null, "", newPath);
     } else {
-      history.pushState({}, "", newPath);
+      history.pushState(options?.data || null, "", newPath);
     }
     if (!isValidPath(routes, location.pathname)) {
       console.warn("Invalid path: " + path);
@@ -313,7 +317,10 @@ function useSearchParams() {
     url.search = newSearch.toString();
     navigate(url.pathname + url.search + url.hash, options);
   };
-  return [context.location.query, updateQuery];
+  return [
+    context.location.query,
+    updateQuery
+  ];
 }
 var Fragment = () => [];
 var Outlet = (props) => {
@@ -364,9 +371,27 @@ var matchComponent = (name) => {
 };
 var _tmpl$ = /* @__PURE__ */ template(`<a sn-link>`);
 var A = (props) => {
+  const location2 = useLocation();
+  const resolvedHref = () => {
+    if (!props.href)
+      return props.href;
+    let newPath = props.href;
+    let currentPathname = location2.pathname;
+    if (currentPathname.endsWith("/")) {
+      currentPathname = currentPathname.slice(0, -1);
+    }
+    if (newPath.startsWith("./")) {
+      newPath = currentPathname + "/" + newPath.slice(2);
+    }
+    return newPath;
+  };
   return (() => {
     var _el$ = _tmpl$();
-    spread(_el$, props, false, false);
+    spread(_el$, mergeProps$1(props, {
+      get href() {
+        return resolvedHref();
+      }
+    }), false, false);
     return _el$;
   })();
 };

package/dist/dev.jsx

@@ -88,6 +88,7 @@ var createLocation = (path, query, setQuery) => {
   const search = createMemo(() => url().search);
   const pathname = createMemo(() => url().pathname);
   const hash = createMemo(() => url().hash);
+  const state = createMemo(on([hash, pathname, search], () => history.state));
   return {
     query,
     get search() {
@@ -98,6 +99,9 @@ var createLocation = (path, query, setQuery) => {
     },
     get hash() {
       return hash();
+    },
+    get state() {
+      return state();
     }
   };
 };
@@ -287,9 +291,9 @@ var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
       newPath = currentPathname + "/" + newPath.slice(2);
     }
     if (options?.replace) {
-      history.replaceState({}, "", newPath);
+      history.replaceState(options.data || null, "", newPath);
     } else {
-      history.pushState({}, "", newPath);
+      history.pushState(options?.data || null, "", newPath);
     }
     if (!isValidPath(routes, location.pathname)) {
       console.warn("Invalid path: " + path);
@@ -319,7 +323,10 @@ function useSearchParams() {
     url.search = newSearch.toString();
     navigate(url.pathname + url.search + url.hash, options);
   };
-  return [context.location.query, updateQuery];
+  return [
+    context.location.query,
+    updateQuery
+  ];
 }
 
 // src/Outlet.tsx
@@ -378,7 +385,21 @@ var matchComponent = (name) => {
 // src/Link.tsx
 import { createMemo as createMemo5 } from "solid-js";
 var A = (props) => {
-  return <a sn-link {...props} />;
+  const location2 = useLocation();
+  const resolvedHref = () => {
+    if (!props.href)
+      return props.href;
+    let newPath = props.href;
+    let currentPathname = location2.pathname;
+    if (currentPathname.endsWith("/")) {
+      currentPathname = currentPathname.slice(0, -1);
+    }
+    if (newPath.startsWith("./")) {
+      newPath = currentPathname + "/" + newPath.slice(2);
+    }
+    return newPath;
+  };
+  return <a sn-link {...props} href={resolvedHref()} />;
 };
 var useMatch = (path) => {
   const location2 = useLocation();

package/dist/index.d.ts

@@ -14,6 +14,7 @@ declare const matchComponent: (name: () => string) => () => Component;
 
 interface NavigateOptions {
     replace?: boolean;
+    data?: any;
 }
 declare const useNavigate: () => (path: string, options?: NavigateOptions | undefined) => void;
 declare const Navigate: (props: {
@@ -43,6 +44,7 @@ declare const useLocation: () => {
     readonly search: string;
     readonly pathname: string;
     readonly hash: string;
+    readonly state: any;
 };
 
 type LinkProps = {

package/dist/index.js

@@ -1,5 +1,5 @@
 import { createContext, children, createMemo, createSignal, onCleanup, batch, mergeProps, createEffect, on, useContext } from 'solid-js';
-import { delegateEvents, createComponent, spread, template } from 'solid-js/web';
+import { delegateEvents, createComponent, spread, mergeProps as mergeProps$1, template } from 'solid-js/web';
 import { createStore, reconcile } from 'solid-js/store';
 
 // src/navigator.ts
@@ -74,6 +74,7 @@ var createLocation = (path, query, setQuery) => {
   const search = createMemo(() => url().search);
   const pathname = createMemo(() => url().pathname);
   const hash = createMemo(() => url().hash);
+  const state = createMemo(on([hash, pathname, search], () => history.state));
   return {
     query,
     get search() {
@@ -84,6 +85,9 @@ var createLocation = (path, query, setQuery) => {
     },
     get hash() {
       return hash();
+    },
+    get state() {
+      return state();
     }
   };
 };
@@ -281,9 +285,9 @@ var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
       newPath = currentPathname + "/" + newPath.slice(2);
     }
     if (options?.replace) {
-      history.replaceState({}, "", newPath);
+      history.replaceState(options.data || null, "", newPath);
     } else {
-      history.pushState({}, "", newPath);
+      history.pushState(options?.data || null, "", newPath);
     }
     if (!isValidPath(routes, location.pathname)) ;
     batch(() => {
@@ -311,7 +315,10 @@ function useSearchParams() {
     url.search = newSearch.toString();
     navigate(url.pathname + url.search + url.hash, options);
   };
-  return [context.location.query, updateQuery];
+  return [
+    context.location.query,
+    updateQuery
+  ];
 }
 var Fragment = () => [];
 var Outlet = (props) => {
@@ -360,9 +367,27 @@ var matchComponent = (name) => {
 };
 var _tmpl$ = /* @__PURE__ */ template(`<a sn-link>`);
 var A = (props) => {
+  const location2 = useLocation();
+  const resolvedHref = () => {
+    if (!props.href)
+      return props.href;
+    let newPath = props.href;
+    let currentPathname = location2.pathname;
+    if (currentPathname.endsWith("/")) {
+      currentPathname = currentPathname.slice(0, -1);
+    }
+    if (newPath.startsWith("./")) {
+      newPath = currentPathname + "/" + newPath.slice(2);
+    }
+    return newPath;
+  };
   return (() => {
     var _el$ = _tmpl$();
-    spread(_el$, props, false, false);
+    spread(_el$, mergeProps$1(props, {
+      get href() {
+        return resolvedHref();
+      }
+    }), false, false);
     return _el$;
   })();
 };

package/dist/index.jsx

@@ -88,6 +88,7 @@ var createLocation = (path, query, setQuery) => {
   const search = createMemo(() => url().search);
   const pathname = createMemo(() => url().pathname);
   const hash = createMemo(() => url().hash);
+  const state = createMemo(on([hash, pathname, search], () => history.state));
   return {
     query,
     get search() {
@@ -98,6 +99,9 @@ var createLocation = (path, query, setQuery) => {
     },
     get hash() {
       return hash();
+    },
+    get state() {
+      return state();
     }
   };
 };
@@ -287,9 +291,9 @@ var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
       newPath = currentPathname + "/" + newPath.slice(2);
     }
     if (options?.replace) {
-      history.replaceState({}, "", newPath);
+      history.replaceState(options.data || null, "", newPath);
     } else {
-      history.pushState({}, "", newPath);
+      history.pushState(options?.data || null, "", newPath);
     }
     if (!isValidPath(routes, location.pathname)) {
     }
@@ -318,7 +322,10 @@ function useSearchParams() {
     url.search = newSearch.toString();
     navigate(url.pathname + url.search + url.hash, options);
   };
-  return [context.location.query, updateQuery];
+  return [
+    context.location.query,
+    updateQuery
+  ];
 }
 
 // src/Outlet.tsx
@@ -375,7 +382,21 @@ var matchComponent = (name) => {
 // src/Link.tsx
 import { createMemo as createMemo5 } from "solid-js";
 var A = (props) => {
-  return <a sn-link {...props} />;
+  const location2 = useLocation();
+  const resolvedHref = () => {
+    if (!props.href)
+      return props.href;
+    let newPath = props.href;
+    let currentPathname = location2.pathname;
+    if (currentPathname.endsWith("/")) {
+      currentPathname = currentPathname.slice(0, -1);
+    }
+    if (newPath.startsWith("./")) {
+      newPath = currentPathname + "/" + newPath.slice(2);
+    }
+    return newPath;
+  };
+  return <a sn-link {...props} href={resolvedHref()} />;
 };
 var useMatch = (path) => {
   const location2 = useLocation();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "solid-navigator",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "description": "Solid Navigator is a library that is inspired by vue router and solid router.",
   "license": "MIT",
   "author": "SupertigerDev",