solid-navigator 0.3.5 → 0.3.7

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
@@ -306,14 +306,17 @@ var Navigate = (props) => {
 function useSearchParams() {
   const context = useRouterContext();
   const navigate = useNavigate();
-  const updateQuery = (query) => {
+  const updateQuery = (query, options) => {
     context.setQuery(reconcile(query));
     const url = new URL(window.location.href);
     const newSearch = new URLSearchParams(context.query);
     url.search = newSearch.toString();
-    navigate(url.pathname + url.search + url.hash);
+    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 +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/dev.jsx

@@ -312,14 +312,17 @@ var Navigate = (props) => {
 function useSearchParams() {
   const context = useRouterContext();
   const navigate = useNavigate();
-  const updateQuery = (query) => {
+  const updateQuery = (query, options) => {
     context.setQuery(reconcile3(query));
     const url = new URL(window.location.href);
     const newSearch = new URLSearchParams(context.query);
     url.search = newSearch.toString();
-    navigate(url.pathname + url.search + url.hash);
+    navigate(url.pathname + url.search + url.hash, options);
   };
-  return [context.location.query, updateQuery];
+  return [
+    context.location.query,
+    updateQuery
+  ];
 }
 
 // src/Outlet.tsx
@@ -378,7 +381,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

@@ -19,7 +19,7 @@ declare const useNavigate: () => (path: string, options?: NavigateOptions | unde
 declare const Navigate: (props: {
     href: string;
 }) => null;
-declare function useSearchParams<T = Record<string, string>>(): readonly [T, (query: T) => void];
+declare function useSearchParams<T = Record<string, string>>(): readonly [T, (query: T, options?: NavigateOptions) => void];
 
 declare const Outlet: (props: {
     children?: string;

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
@@ -304,14 +304,17 @@ var Navigate = (props) => {
 function useSearchParams() {
   const context = useRouterContext();
   const navigate = useNavigate();
-  const updateQuery = (query) => {
+  const updateQuery = (query, options) => {
     context.setQuery(reconcile(query));
     const url = new URL(window.location.href);
     const newSearch = new URLSearchParams(context.query);
     url.search = newSearch.toString();
-    navigate(url.pathname + url.search + url.hash);
+    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 +363,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

@@ -311,14 +311,17 @@ var Navigate = (props) => {
 function useSearchParams() {
   const context = useRouterContext();
   const navigate = useNavigate();
-  const updateQuery = (query) => {
+  const updateQuery = (query, options) => {
     context.setQuery(reconcile3(query));
     const url = new URL(window.location.href);
     const newSearch = new URLSearchParams(context.query);
     url.search = newSearch.toString();
-    navigate(url.pathname + url.search + url.hash);
+    navigate(url.pathname + url.search + url.hash, options);
   };
-  return [context.location.query, updateQuery];
+  return [
+    context.location.query,
+    updateQuery
+  ];
 }
 
 // src/Outlet.tsx
@@ -375,7 +378,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.5",
+  "version": "0.3.7",
   "description": "Solid Navigator is a library that is inspired by vue router and solid router.",
   "license": "MIT",
   "author": "SupertigerDev",