solid-navigator 0.3.13 → 0.4.0

package/dist/dev.js

@@ -1,5 +1,5 @@
-import { createContext, children, createMemo, createSignal, onCleanup, batch, mergeProps, splitProps, createEffect, on, useContext } from 'solid-js';
-import { delegateEvents, createComponent, spread, mergeProps as mergeProps$1, template } from 'solid-js/web';
+import { createContext, children, createMemo, createSignal, onCleanup, useContext, batch, mergeProps, splitProps, createEffect, on } from 'solid-js';
+import { delegateEvents, createComponent, template, spread, mergeProps as mergeProps$1 } from 'solid-js/web';
 import { createStore, reconcile } from 'solid-js/store';
 
 // src/navigator.ts
@@ -12,20 +12,20 @@ function createMatcher(path, partial, matchFilters) {
   return (location2) => {
     const locSegments = location2.split("/").filter(Boolean);
     const lenDiff = locSegments.length - len;
-    if (lenDiff < 0 || lenDiff > 0 && splat === void 0 && !partial) {
+    if (lenDiff < 0 || lenDiff > 0 && splat === void 0 && true) {
       return null;
     }
     const match = {
       path: len ? "" : "/",
       params: {}
     };
-    const matchFilter = (s) => matchFilters === void 0 ? void 0 : matchFilters[s];
+    const matchFilter = (s) => void 0 ;
     for (let i = 0; i < len; i++) {
       const segment = segments[i];
       const locSegment = locSegments[i];
       const dynamic = segment[0] === ":";
       const key = dynamic ? segment.slice(1) : segment;
-      if (dynamic && matchSegment(locSegment, matchFilter(key))) {
+      if (dynamic && matchSegment(locSegment, matchFilter())) {
         match.params[key] = locSegment;
       } else if (dynamic || !matchSegment(locSegment, segment)) {
         return null;
@@ -34,7 +34,7 @@ function createMatcher(path, partial, matchFilters) {
     }
     if (splat) {
       const remainder = lenDiff ? locSegments.slice(-lenDiff).join("/") : "";
-      if (matchSegment(remainder, matchFilter(splat))) {
+      if (matchSegment(remainder, matchFilter())) {
         match.params[splat] = remainder;
       } else {
         return null;
@@ -99,7 +99,7 @@ var isValidPath = (routes, pathname) => {
     return matcher(pathname);
   });
 };
-var getHashAndSearch = () => location.hash + location.search;
+var getSearchAndHash = () => location.search + location.hash;
 function expandOptionals(pattern) {
   let match = /(\/?\:[^\/]+)\?/.exec(pattern);
   if (!match)
@@ -126,11 +126,11 @@ function Router(props) {
   const childRoutes = children(() => props.children).toArray;
   const routes = createMemo(() => expandOptionalRoutes(flattenedRoutes(childRoutes())));
   const [pathname, setPathname] = createSignal(location.pathname);
-  const [hashAndSearch, setHashAndSearch] = createSignal(getHashAndSearch());
+  const [searchAndHash, setSearchAndHash] = createSignal(getSearchAndHash());
   const [params, setParams] = createStore({});
   const [query, setQuery] = createStore({});
-  const pathnameWithHashAndSearch = createMemo(() => pathname() + hashAndSearch());
-  const loc = createLocation(pathnameWithHashAndSearch, query, setQuery);
+  const pathnameWithSearchAndHash = createMemo(() => pathname() + searchAndHash());
+  const loc = createLocation(pathnameWithSearchAndHash, query, setQuery);
   const matched = createMemo(() => {
     if (!routes())
       return;
@@ -154,11 +154,11 @@ function Router(props) {
       route: matchedRoute
     };
   });
-  const navigate = createNavigate(routes, pathname, setPathname, setHashAndSearch);
+  const navigate = createNavigate(routes, pathname, setPathname, setSearchAndHash);
   const onPopState = (_event) => {
     batch(() => {
       setPathname(location.pathname);
-      setHashAndSearch(getHashAndSearch());
+      setSearchAndHash(getSearchAndHash());
     });
   };
   const onClick = (event) => {
@@ -192,7 +192,7 @@ function Router(props) {
       navigate,
       params,
       location: loc,
-      setHashAndSearch,
+      setSearchAndHash,
       setPathname,
       setQuery,
       query
@@ -219,7 +219,9 @@ var flattenedRoutes = (routes) => {
 };
 var flattenedRoute = (route) => {
   const routes = [];
-  const components = route.components || {};
+  let components = {
+    ...route.components || {}
+  };
   let lastComponent = void 0;
   if (route.component) {
     lastComponent = route.component;
@@ -229,7 +231,9 @@ var flattenedRoute = (route) => {
     components: {
       ...components
     },
-    mergedComponents: components,
+    mergedComponents: {
+      ...components
+    },
     component: route.component || lastComponent
   });
   if (!route.children)
@@ -238,8 +242,11 @@ var flattenedRoute = (route) => {
     const child = route.children[i];
     if (!child)
       continue;
+    let childComponents = {
+      ...components
+    };
     if (child.components) {
-      Object.assign(components, child.components);
+      Object.assign(childComponents, child.components);
     }
     if (child.component) {
       lastComponent = child.component;
@@ -248,16 +255,21 @@ var flattenedRoute = (route) => {
       if (!child.component) {
         throw new Error("Route: No component for " + child.path);
       }
-      components[child.path] = child.component;
+      childComponents[child.path] = child.component;
+      components = {
+        ...childComponents
+      };
       continue;
     }
     routes.push(...flattenedRoute({
       ...child,
       path: route.path + child.path,
       components: {
-        ...components
+        ...childComponents
+      },
+      mergedComponents: {
+        ...childComponents
       },
-      mergedComponents: components,
       component: child.component || lastComponent
     }));
   }
@@ -275,7 +287,7 @@ var expandOptionalRoutes = (routes) => {
   });
   return newRoutes;
 };
-var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
+var createNavigate = (routes, pathname, setPathname, setSearchAndHash) => {
   return (path, options) => {
     let newPath = path;
     let currentPathname = pathname();
@@ -298,7 +310,7 @@ var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
     }
     batch(() => {
       setPathname(location.pathname);
-      setHashAndSearch(getHashAndSearch());
+      setSearchAndHash(getSearchAndHash());
     });
   };
 };

package/dist/dev.jsx

@@ -113,7 +113,7 @@ var isValidPath = (routes, pathname) => {
     return matcher(pathname);
   });
 };
-var getHashAndSearch = () => location.hash + location.search;
+var getSearchAndHash = () => location.search + location.hash;
 function expandOptionals(pattern) {
   let match = /(\/?\:[^\/]+)\?/.exec(pattern);
   if (!match)
@@ -140,11 +140,11 @@ function Router(props) {
   const childRoutes = children(() => props.children).toArray;
   const routes = createMemo2(() => expandOptionalRoutes(flattenedRoutes(childRoutes())));
   const [pathname, setPathname] = createSignal(location.pathname);
-  const [hashAndSearch, setHashAndSearch] = createSignal(getHashAndSearch());
+  const [searchAndHash, setSearchAndHash] = createSignal(getSearchAndHash());
   const [params, setParams] = createStore2({});
   const [query, setQuery] = createStore2({});
-  const pathnameWithHashAndSearch = createMemo2(() => pathname() + hashAndSearch());
-  const loc = createLocation(pathnameWithHashAndSearch, query, setQuery);
+  const pathnameWithSearchAndHash = createMemo2(() => pathname() + searchAndHash());
+  const loc = createLocation(pathnameWithSearchAndHash, query, setQuery);
   const matched = createMemo2(() => {
     if (!routes())
       return;
@@ -165,11 +165,11 @@ function Router(props) {
     }
     return { match: pathMatch, route: matchedRoute };
   });
-  const navigate = createNavigate(routes, pathname, setPathname, setHashAndSearch);
+  const navigate = createNavigate(routes, pathname, setPathname, setSearchAndHash);
   const onPopState = (_event) => {
     batch(() => {
       setPathname(location.pathname);
-      setHashAndSearch(getHashAndSearch());
+      setSearchAndHash(getSearchAndHash());
     });
   };
   const onClick = (event) => {
@@ -203,7 +203,7 @@ function Router(props) {
       navigate,
       params,
       location: loc,
-      setHashAndSearch,
+      setSearchAndHash,
       setPathname,
       setQuery,
       query
@@ -227,7 +227,9 @@ var flattenedRoutes = (routes) => {
 };
 var flattenedRoute = (route) => {
   const routes = [];
-  const components = route.components || {};
+  let components = {
+    ...route.components || {}
+  };
   let lastComponent = void 0;
   if (route.component) {
     lastComponent = route.component;
@@ -235,7 +237,7 @@ var flattenedRoute = (route) => {
   routes.push({
     ...route,
     components: { ...components },
-    mergedComponents: components,
+    mergedComponents: { ...components },
     component: route.component || lastComponent
   });
   if (!route.children)
@@ -244,8 +246,9 @@ var flattenedRoute = (route) => {
     const child = route.children[i];
     if (!child)
       continue;
+    let childComponents = { ...components };
     if (child.components) {
-      Object.assign(components, child.components);
+      Object.assign(childComponents, child.components);
     }
     if (child.component) {
       lastComponent = child.component;
@@ -254,15 +257,16 @@ var flattenedRoute = (route) => {
       if (!child.component) {
         throw new Error("Route: No component for " + child.path);
       }
-      components[child.path] = child.component;
+      childComponents[child.path] = child.component;
+      components = { ...childComponents };
       continue;
     }
     routes.push(
       ...flattenedRoute({
         ...child,
         path: route.path + child.path,
-        components: { ...components },
-        mergedComponents: components,
+        components: { ...childComponents },
+        mergedComponents: { ...childComponents },
         component: child.component || lastComponent
       })
     );
@@ -281,7 +285,7 @@ var expandOptionalRoutes = (routes) => {
 
 // src/navigator.ts
 import { reconcile as reconcile3 } from "solid-js/store";
-var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
+var createNavigate = (routes, pathname, setPathname, setSearchAndHash) => {
   return (path, options) => {
     let newPath = path;
     let currentPathname = pathname();
@@ -304,7 +308,7 @@ var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
     }
     batch2(() => {
       setPathname(location.pathname);
-      setHashAndSearch(getHashAndSearch());
+      setSearchAndHash(getSearchAndHash());
     });
   };
 };

package/dist/index.js

@@ -1,5 +1,5 @@
-import { createContext, children, createMemo, createSignal, onCleanup, batch, mergeProps, splitProps, createEffect, on, useContext } from 'solid-js';
-import { delegateEvents, createComponent, spread, mergeProps as mergeProps$1, template } from 'solid-js/web';
+import { createContext, children, createMemo, createSignal, onCleanup, useContext, batch, mergeProps, splitProps, createEffect, on } from 'solid-js';
+import { delegateEvents, createComponent, template, spread, mergeProps as mergeProps$1 } from 'solid-js/web';
 import { createStore, reconcile } from 'solid-js/store';
 
 // src/navigator.ts
@@ -12,20 +12,20 @@ function createMatcher(path, partial, matchFilters) {
   return (location2) => {
     const locSegments = location2.split("/").filter(Boolean);
     const lenDiff = locSegments.length - len;
-    if (lenDiff < 0 || lenDiff > 0 && splat === void 0 && !partial) {
+    if (lenDiff < 0 || lenDiff > 0 && splat === void 0 && true) {
       return null;
     }
     const match = {
       path: len ? "" : "/",
       params: {}
     };
-    const matchFilter = (s) => matchFilters === void 0 ? void 0 : matchFilters[s];
+    const matchFilter = (s) => void 0 ;
     for (let i = 0; i < len; i++) {
       const segment = segments[i];
       const locSegment = locSegments[i];
       const dynamic = segment[0] === ":";
       const key = dynamic ? segment.slice(1) : segment;
-      if (dynamic && matchSegment(locSegment, matchFilter(key))) {
+      if (dynamic && matchSegment(locSegment, matchFilter())) {
         match.params[key] = locSegment;
       } else if (dynamic || !matchSegment(locSegment, segment)) {
         return null;
@@ -34,7 +34,7 @@ function createMatcher(path, partial, matchFilters) {
     }
     if (splat) {
       const remainder = lenDiff ? locSegments.slice(-lenDiff).join("/") : "";
-      if (matchSegment(remainder, matchFilter(splat))) {
+      if (matchSegment(remainder, matchFilter())) {
         match.params[splat] = remainder;
       } else {
         return null;
@@ -99,7 +99,7 @@ var isValidPath = (routes, pathname) => {
     return matcher(pathname);
   });
 };
-var getHashAndSearch = () => location.hash + location.search;
+var getSearchAndHash = () => location.search + location.hash;
 function expandOptionals(pattern) {
   let match = /(\/?\:[^\/]+)\?/.exec(pattern);
   if (!match)
@@ -126,11 +126,11 @@ function Router(props) {
   const childRoutes = children(() => props.children).toArray;
   const routes = createMemo(() => expandOptionalRoutes(flattenedRoutes(childRoutes())));
   const [pathname, setPathname] = createSignal(location.pathname);
-  const [hashAndSearch, setHashAndSearch] = createSignal(getHashAndSearch());
+  const [searchAndHash, setSearchAndHash] = createSignal(getSearchAndHash());
   const [params, setParams] = createStore({});
   const [query, setQuery] = createStore({});
-  const pathnameWithHashAndSearch = createMemo(() => pathname() + hashAndSearch());
-  const loc = createLocation(pathnameWithHashAndSearch, query, setQuery);
+  const pathnameWithSearchAndHash = createMemo(() => pathname() + searchAndHash());
+  const loc = createLocation(pathnameWithSearchAndHash, query, setQuery);
   const matched = createMemo(() => {
     if (!routes())
       return;
@@ -154,11 +154,11 @@ function Router(props) {
       route: matchedRoute
     };
   });
-  const navigate = createNavigate(routes, pathname, setPathname, setHashAndSearch);
+  const navigate = createNavigate(routes, pathname, setPathname, setSearchAndHash);
   const onPopState = (_event) => {
     batch(() => {
       setPathname(location.pathname);
-      setHashAndSearch(getHashAndSearch());
+      setSearchAndHash(getSearchAndHash());
     });
   };
   const onClick = (event) => {
@@ -192,7 +192,7 @@ function Router(props) {
       navigate,
       params,
       location: loc,
-      setHashAndSearch,
+      setSearchAndHash,
       setPathname,
       setQuery,
       query
@@ -219,7 +219,9 @@ var flattenedRoutes = (routes) => {
 };
 var flattenedRoute = (route) => {
   const routes = [];
-  const components = route.components || {};
+  let components = {
+    ...route.components || {}
+  };
   let lastComponent = void 0;
   if (route.component) {
     lastComponent = route.component;
@@ -229,7 +231,9 @@ var flattenedRoute = (route) => {
     components: {
       ...components
     },
-    mergedComponents: components,
+    mergedComponents: {
+      ...components
+    },
     component: route.component || lastComponent
   });
   if (!route.children)
@@ -238,8 +242,11 @@ var flattenedRoute = (route) => {
     const child = route.children[i];
     if (!child)
       continue;
+    let childComponents = {
+      ...components
+    };
     if (child.components) {
-      Object.assign(components, child.components);
+      Object.assign(childComponents, child.components);
     }
     if (child.component) {
       lastComponent = child.component;
@@ -248,16 +255,21 @@ var flattenedRoute = (route) => {
       if (!child.component) {
         throw new Error("Route: No component for " + child.path);
       }
-      components[child.path] = child.component;
+      childComponents[child.path] = child.component;
+      components = {
+        ...childComponents
+      };
       continue;
     }
     routes.push(...flattenedRoute({
       ...child,
       path: route.path + child.path,
       components: {
-        ...components
+        ...childComponents
+      },
+      mergedComponents: {
+        ...childComponents
       },
-      mergedComponents: components,
       component: child.component || lastComponent
     }));
   }
@@ -275,7 +287,7 @@ var expandOptionalRoutes = (routes) => {
   });
   return newRoutes;
 };
-var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
+var createNavigate = (routes, pathname, setPathname, setSearchAndHash) => {
   return (path, options) => {
     let newPath = path;
     let currentPathname = pathname();
@@ -296,7 +308,7 @@ var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
     if (!isValidPath(routes, location.pathname)) ;
     batch(() => {
       setPathname(location.pathname);
-      setHashAndSearch(getHashAndSearch());
+      setSearchAndHash(getSearchAndHash());
     });
   };
 };

package/dist/index.jsx

@@ -113,7 +113,7 @@ var isValidPath = (routes, pathname) => {
     return matcher(pathname);
   });
 };
-var getHashAndSearch = () => location.hash + location.search;
+var getSearchAndHash = () => location.search + location.hash;
 function expandOptionals(pattern) {
   let match = /(\/?\:[^\/]+)\?/.exec(pattern);
   if (!match)
@@ -140,11 +140,11 @@ function Router(props) {
   const childRoutes = children(() => props.children).toArray;
   const routes = createMemo2(() => expandOptionalRoutes(flattenedRoutes(childRoutes())));
   const [pathname, setPathname] = createSignal(location.pathname);
-  const [hashAndSearch, setHashAndSearch] = createSignal(getHashAndSearch());
+  const [searchAndHash, setSearchAndHash] = createSignal(getSearchAndHash());
   const [params, setParams] = createStore2({});
   const [query, setQuery] = createStore2({});
-  const pathnameWithHashAndSearch = createMemo2(() => pathname() + hashAndSearch());
-  const loc = createLocation(pathnameWithHashAndSearch, query, setQuery);
+  const pathnameWithSearchAndHash = createMemo2(() => pathname() + searchAndHash());
+  const loc = createLocation(pathnameWithSearchAndHash, query, setQuery);
   const matched = createMemo2(() => {
     if (!routes())
       return;
@@ -165,11 +165,11 @@ function Router(props) {
     }
     return { match: pathMatch, route: matchedRoute };
   });
-  const navigate = createNavigate(routes, pathname, setPathname, setHashAndSearch);
+  const navigate = createNavigate(routes, pathname, setPathname, setSearchAndHash);
   const onPopState = (_event) => {
     batch(() => {
       setPathname(location.pathname);
-      setHashAndSearch(getHashAndSearch());
+      setSearchAndHash(getSearchAndHash());
     });
   };
   const onClick = (event) => {
@@ -203,7 +203,7 @@ function Router(props) {
       navigate,
       params,
       location: loc,
-      setHashAndSearch,
+      setSearchAndHash,
       setPathname,
       setQuery,
       query
@@ -227,7 +227,9 @@ var flattenedRoutes = (routes) => {
 };
 var flattenedRoute = (route) => {
   const routes = [];
-  const components = route.components || {};
+  let components = {
+    ...route.components || {}
+  };
   let lastComponent = void 0;
   if (route.component) {
     lastComponent = route.component;
@@ -235,7 +237,7 @@ var flattenedRoute = (route) => {
   routes.push({
     ...route,
     components: { ...components },
-    mergedComponents: components,
+    mergedComponents: { ...components },
     component: route.component || lastComponent
   });
   if (!route.children)
@@ -244,8 +246,9 @@ var flattenedRoute = (route) => {
     const child = route.children[i];
     if (!child)
       continue;
+    let childComponents = { ...components };
     if (child.components) {
-      Object.assign(components, child.components);
+      Object.assign(childComponents, child.components);
     }
     if (child.component) {
       lastComponent = child.component;
@@ -254,15 +257,16 @@ var flattenedRoute = (route) => {
       if (!child.component) {
         throw new Error("Route: No component for " + child.path);
       }
-      components[child.path] = child.component;
+      childComponents[child.path] = child.component;
+      components = { ...childComponents };
       continue;
     }
     routes.push(
       ...flattenedRoute({
         ...child,
         path: route.path + child.path,
-        components: { ...components },
-        mergedComponents: components,
+        components: { ...childComponents },
+        mergedComponents: { ...childComponents },
         component: child.component || lastComponent
       })
     );
@@ -281,7 +285,7 @@ var expandOptionalRoutes = (routes) => {
 
 // src/navigator.ts
 import { reconcile as reconcile3 } from "solid-js/store";
-var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
+var createNavigate = (routes, pathname, setPathname, setSearchAndHash) => {
   return (path, options) => {
     let newPath = path;
     let currentPathname = pathname();
@@ -303,7 +307,7 @@ var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
     }
     batch2(() => {
       setPathname(location.pathname);
-      setHashAndSearch(getHashAndSearch());
+      setSearchAndHash(getSearchAndHash());
     });
   };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "solid-navigator",
-  "version": "0.3.13",
+  "version": "0.4.0",
   "description": "Solid Navigator is a library that is inspired by vue router and solid router.",
   "license": "MIT",
   "author": "SupertigerDev",
@@ -40,6 +40,16 @@
     }
   },
   "typesVersions": {},
+  "scripts": {
+    "dev": "vite serve dev",
+    "build": "tsup",
+    "prepublishOnly": "pnpm build",
+    "format": "prettier --ignore-path .gitignore -w \"src/**/*.{js,ts,json,css,tsx,jsx}\" \"dev/**/*.{js,ts,json,css,tsx,jsx}\"",
+    "lint": "concurrently pnpm:lint:*",
+    "lint:code": "eslint --ignore-path .gitignore --max-warnings 0 src/**/*.{js,ts,tsx,jsx}",
+    "lint:types": "tsc --noEmit",
+    "update-deps": "pnpm up -Li"
+  },
   "peerDependencies": {
     "solid-js": "^1.6.0"
   },
@@ -69,14 +79,5 @@
   "engines": {
     "node": ">=18",
     "pnpm": ">=8.6.0"
-  },
-  "scripts": {
-    "dev": "vite serve dev",
-    "build": "tsup",
-    "format": "prettier --ignore-path .gitignore -w \"src/**/*.{js,ts,json,css,tsx,jsx}\" \"dev/**/*.{js,ts,json,css,tsx,jsx}\"",
-    "lint": "concurrently pnpm:lint:*",
-    "lint:code": "eslint --ignore-path .gitignore --max-warnings 0 src/**/*.{js,ts,tsx,jsx}",
-    "lint:types": "tsc --noEmit",
-    "update-deps": "pnpm up -Li"
   }
-}
+}