solid-navigator 0.3.12 → 0.3.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/dev.js +11 -11
  2. package/dist/dev.jsx +11 -11
  3. package/dist/index.js +11 -11
  4. package/dist/index.jsx +11 -11
  5. package/package.json +1 -2
package/dist/dev.js CHANGED
@@ -99,7 +99,7 @@ var isValidPath = (routes, pathname) => {
99
99
  return matcher(pathname);
100
100
  });
101
101
  };
102
- var getHashAndSearch = () => location.hash + location.search;
102
+ var getSearchAndHash = () => location.search + location.hash;
103
103
  function expandOptionals(pattern) {
104
104
  let match = /(\/?\:[^\/]+)\?/.exec(pattern);
105
105
  if (!match)
@@ -126,11 +126,11 @@ function Router(props) {
126
126
  const childRoutes = children(() => props.children).toArray;
127
127
  const routes = createMemo(() => expandOptionalRoutes(flattenedRoutes(childRoutes())));
128
128
  const [pathname, setPathname] = createSignal(location.pathname);
129
- const [hashAndSearch, setHashAndSearch] = createSignal(getHashAndSearch());
129
+ const [searchAndHash, setSearchAndHash] = createSignal(getSearchAndHash());
130
130
  const [params, setParams] = createStore({});
131
131
  const [query, setQuery] = createStore({});
132
- const pathnameWithHashAndSearch = createMemo(() => pathname() + hashAndSearch());
133
- const loc = createLocation(pathnameWithHashAndSearch, query, setQuery);
132
+ const pathnameWithSearchAndHash = createMemo(() => pathname() + searchAndHash());
133
+ const loc = createLocation(pathnameWithSearchAndHash, query, setQuery);
134
134
  const matched = createMemo(() => {
135
135
  if (!routes())
136
136
  return;
@@ -154,11 +154,11 @@ function Router(props) {
154
154
  route: matchedRoute
155
155
  };
156
156
  });
157
- const navigate = createNavigate(routes, pathname, setPathname, setHashAndSearch);
157
+ const navigate = createNavigate(routes, pathname, setPathname, setSearchAndHash);
158
158
  const onPopState = (_event) => {
159
159
  batch(() => {
160
160
  setPathname(location.pathname);
161
- setHashAndSearch(getHashAndSearch());
161
+ setSearchAndHash(getSearchAndHash());
162
162
  });
163
163
  };
164
164
  const onClick = (event) => {
@@ -192,7 +192,7 @@ function Router(props) {
192
192
  navigate,
193
193
  params,
194
194
  location: loc,
195
- setHashAndSearch,
195
+ setSearchAndHash,
196
196
  setPathname,
197
197
  setQuery,
198
198
  query
@@ -275,7 +275,7 @@ var expandOptionalRoutes = (routes) => {
275
275
  });
276
276
  return newRoutes;
277
277
  };
278
- var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
278
+ var createNavigate = (routes, pathname, setPathname, setSearchAndHash) => {
279
279
  return (path, options) => {
280
280
  let newPath = path;
281
281
  let currentPathname = pathname();
@@ -286,7 +286,7 @@ var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
286
286
  newPath = currentPathname + "/" + newPath.slice(2);
287
287
  }
288
288
  if (newPath.startsWith("../")) {
289
- newPath = currentPathname + "/" + newPath.slice(3);
289
+ newPath = currentPathname + "/" + newPath;
290
290
  }
291
291
  if (options?.replace) {
292
292
  history.replaceState(options.state || null, "", newPath);
@@ -298,7 +298,7 @@ var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
298
298
  }
299
299
  batch(() => {
300
300
  setPathname(location.pathname);
301
- setHashAndSearch(getHashAndSearch());
301
+ setSearchAndHash(getSearchAndHash());
302
302
  });
303
303
  };
304
304
  };
@@ -389,7 +389,7 @@ var A = (props) => {
389
389
  newPath = currentPathname + "/" + newPath.slice(2);
390
390
  }
391
391
  if (newPath.startsWith("../")) {
392
- newPath = currentPathname + "/" + newPath.slice(3);
392
+ newPath = currentPathname + "/" + newPath;
393
393
  }
394
394
  return newPath;
395
395
  };
package/dist/dev.jsx CHANGED
@@ -113,7 +113,7 @@ var isValidPath = (routes, pathname) => {
113
113
  return matcher(pathname);
114
114
  });
115
115
  };
116
- var getHashAndSearch = () => location.hash + location.search;
116
+ var getSearchAndHash = () => location.search + location.hash;
117
117
  function expandOptionals(pattern) {
118
118
  let match = /(\/?\:[^\/]+)\?/.exec(pattern);
119
119
  if (!match)
@@ -140,11 +140,11 @@ function Router(props) {
140
140
  const childRoutes = children(() => props.children).toArray;
141
141
  const routes = createMemo2(() => expandOptionalRoutes(flattenedRoutes(childRoutes())));
142
142
  const [pathname, setPathname] = createSignal(location.pathname);
143
- const [hashAndSearch, setHashAndSearch] = createSignal(getHashAndSearch());
143
+ const [searchAndHash, setSearchAndHash] = createSignal(getSearchAndHash());
144
144
  const [params, setParams] = createStore2({});
145
145
  const [query, setQuery] = createStore2({});
146
- const pathnameWithHashAndSearch = createMemo2(() => pathname() + hashAndSearch());
147
- const loc = createLocation(pathnameWithHashAndSearch, query, setQuery);
146
+ const pathnameWithSearchAndHash = createMemo2(() => pathname() + searchAndHash());
147
+ const loc = createLocation(pathnameWithSearchAndHash, query, setQuery);
148
148
  const matched = createMemo2(() => {
149
149
  if (!routes())
150
150
  return;
@@ -165,11 +165,11 @@ function Router(props) {
165
165
  }
166
166
  return { match: pathMatch, route: matchedRoute };
167
167
  });
168
- const navigate = createNavigate(routes, pathname, setPathname, setHashAndSearch);
168
+ const navigate = createNavigate(routes, pathname, setPathname, setSearchAndHash);
169
169
  const onPopState = (_event) => {
170
170
  batch(() => {
171
171
  setPathname(location.pathname);
172
- setHashAndSearch(getHashAndSearch());
172
+ setSearchAndHash(getSearchAndHash());
173
173
  });
174
174
  };
175
175
  const onClick = (event) => {
@@ -203,7 +203,7 @@ function Router(props) {
203
203
  navigate,
204
204
  params,
205
205
  location: loc,
206
- setHashAndSearch,
206
+ setSearchAndHash,
207
207
  setPathname,
208
208
  setQuery,
209
209
  query
@@ -281,7 +281,7 @@ var expandOptionalRoutes = (routes) => {
281
281
 
282
282
  // src/navigator.ts
283
283
  import { reconcile as reconcile3 } from "solid-js/store";
284
- var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
284
+ var createNavigate = (routes, pathname, setPathname, setSearchAndHash) => {
285
285
  return (path, options) => {
286
286
  let newPath = path;
287
287
  let currentPathname = pathname();
@@ -292,7 +292,7 @@ var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
292
292
  newPath = currentPathname + "/" + newPath.slice(2);
293
293
  }
294
294
  if (newPath.startsWith("../")) {
295
- newPath = currentPathname + "/" + newPath.slice(3);
295
+ newPath = currentPathname + "/" + newPath;
296
296
  }
297
297
  if (options?.replace) {
298
298
  history.replaceState(options.state || null, "", newPath);
@@ -304,7 +304,7 @@ var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
304
304
  }
305
305
  batch2(() => {
306
306
  setPathname(location.pathname);
307
- setHashAndSearch(getHashAndSearch());
307
+ setSearchAndHash(getSearchAndHash());
308
308
  });
309
309
  };
310
310
  };
@@ -403,7 +403,7 @@ var A = (props) => {
403
403
  newPath = currentPathname + "/" + newPath.slice(2);
404
404
  }
405
405
  if (newPath.startsWith("../")) {
406
- newPath = currentPathname + "/" + newPath.slice(3);
406
+ newPath = currentPathname + "/" + newPath;
407
407
  }
408
408
  return newPath;
409
409
  };
package/dist/index.js CHANGED
@@ -99,7 +99,7 @@ var isValidPath = (routes, pathname) => {
99
99
  return matcher(pathname);
100
100
  });
101
101
  };
102
- var getHashAndSearch = () => location.hash + location.search;
102
+ var getSearchAndHash = () => location.search + location.hash;
103
103
  function expandOptionals(pattern) {
104
104
  let match = /(\/?\:[^\/]+)\?/.exec(pattern);
105
105
  if (!match)
@@ -126,11 +126,11 @@ function Router(props) {
126
126
  const childRoutes = children(() => props.children).toArray;
127
127
  const routes = createMemo(() => expandOptionalRoutes(flattenedRoutes(childRoutes())));
128
128
  const [pathname, setPathname] = createSignal(location.pathname);
129
- const [hashAndSearch, setHashAndSearch] = createSignal(getHashAndSearch());
129
+ const [searchAndHash, setSearchAndHash] = createSignal(getSearchAndHash());
130
130
  const [params, setParams] = createStore({});
131
131
  const [query, setQuery] = createStore({});
132
- const pathnameWithHashAndSearch = createMemo(() => pathname() + hashAndSearch());
133
- const loc = createLocation(pathnameWithHashAndSearch, query, setQuery);
132
+ const pathnameWithSearchAndHash = createMemo(() => pathname() + searchAndHash());
133
+ const loc = createLocation(pathnameWithSearchAndHash, query, setQuery);
134
134
  const matched = createMemo(() => {
135
135
  if (!routes())
136
136
  return;
@@ -154,11 +154,11 @@ function Router(props) {
154
154
  route: matchedRoute
155
155
  };
156
156
  });
157
- const navigate = createNavigate(routes, pathname, setPathname, setHashAndSearch);
157
+ const navigate = createNavigate(routes, pathname, setPathname, setSearchAndHash);
158
158
  const onPopState = (_event) => {
159
159
  batch(() => {
160
160
  setPathname(location.pathname);
161
- setHashAndSearch(getHashAndSearch());
161
+ setSearchAndHash(getSearchAndHash());
162
162
  });
163
163
  };
164
164
  const onClick = (event) => {
@@ -192,7 +192,7 @@ function Router(props) {
192
192
  navigate,
193
193
  params,
194
194
  location: loc,
195
- setHashAndSearch,
195
+ setSearchAndHash,
196
196
  setPathname,
197
197
  setQuery,
198
198
  query
@@ -275,7 +275,7 @@ var expandOptionalRoutes = (routes) => {
275
275
  });
276
276
  return newRoutes;
277
277
  };
278
- var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
278
+ var createNavigate = (routes, pathname, setPathname, setSearchAndHash) => {
279
279
  return (path, options) => {
280
280
  let newPath = path;
281
281
  let currentPathname = pathname();
@@ -286,7 +286,7 @@ var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
286
286
  newPath = currentPathname + "/" + newPath.slice(2);
287
287
  }
288
288
  if (newPath.startsWith("../")) {
289
- newPath = currentPathname + "/" + newPath.slice(3);
289
+ newPath = currentPathname + "/" + newPath;
290
290
  }
291
291
  if (options?.replace) {
292
292
  history.replaceState(options.state || null, "", newPath);
@@ -296,7 +296,7 @@ var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
296
296
  if (!isValidPath(routes, location.pathname)) ;
297
297
  batch(() => {
298
298
  setPathname(location.pathname);
299
- setHashAndSearch(getHashAndSearch());
299
+ setSearchAndHash(getSearchAndHash());
300
300
  });
301
301
  };
302
302
  };
@@ -385,7 +385,7 @@ var A = (props) => {
385
385
  newPath = currentPathname + "/" + newPath.slice(2);
386
386
  }
387
387
  if (newPath.startsWith("../")) {
388
- newPath = currentPathname + "/" + newPath.slice(3);
388
+ newPath = currentPathname + "/" + newPath;
389
389
  }
390
390
  return newPath;
391
391
  };
package/dist/index.jsx CHANGED
@@ -113,7 +113,7 @@ var isValidPath = (routes, pathname) => {
113
113
  return matcher(pathname);
114
114
  });
115
115
  };
116
- var getHashAndSearch = () => location.hash + location.search;
116
+ var getSearchAndHash = () => location.search + location.hash;
117
117
  function expandOptionals(pattern) {
118
118
  let match = /(\/?\:[^\/]+)\?/.exec(pattern);
119
119
  if (!match)
@@ -140,11 +140,11 @@ function Router(props) {
140
140
  const childRoutes = children(() => props.children).toArray;
141
141
  const routes = createMemo2(() => expandOptionalRoutes(flattenedRoutes(childRoutes())));
142
142
  const [pathname, setPathname] = createSignal(location.pathname);
143
- const [hashAndSearch, setHashAndSearch] = createSignal(getHashAndSearch());
143
+ const [searchAndHash, setSearchAndHash] = createSignal(getSearchAndHash());
144
144
  const [params, setParams] = createStore2({});
145
145
  const [query, setQuery] = createStore2({});
146
- const pathnameWithHashAndSearch = createMemo2(() => pathname() + hashAndSearch());
147
- const loc = createLocation(pathnameWithHashAndSearch, query, setQuery);
146
+ const pathnameWithSearchAndHash = createMemo2(() => pathname() + searchAndHash());
147
+ const loc = createLocation(pathnameWithSearchAndHash, query, setQuery);
148
148
  const matched = createMemo2(() => {
149
149
  if (!routes())
150
150
  return;
@@ -165,11 +165,11 @@ function Router(props) {
165
165
  }
166
166
  return { match: pathMatch, route: matchedRoute };
167
167
  });
168
- const navigate = createNavigate(routes, pathname, setPathname, setHashAndSearch);
168
+ const navigate = createNavigate(routes, pathname, setPathname, setSearchAndHash);
169
169
  const onPopState = (_event) => {
170
170
  batch(() => {
171
171
  setPathname(location.pathname);
172
- setHashAndSearch(getHashAndSearch());
172
+ setSearchAndHash(getSearchAndHash());
173
173
  });
174
174
  };
175
175
  const onClick = (event) => {
@@ -203,7 +203,7 @@ function Router(props) {
203
203
  navigate,
204
204
  params,
205
205
  location: loc,
206
- setHashAndSearch,
206
+ setSearchAndHash,
207
207
  setPathname,
208
208
  setQuery,
209
209
  query
@@ -281,7 +281,7 @@ var expandOptionalRoutes = (routes) => {
281
281
 
282
282
  // src/navigator.ts
283
283
  import { reconcile as reconcile3 } from "solid-js/store";
284
- var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
284
+ var createNavigate = (routes, pathname, setPathname, setSearchAndHash) => {
285
285
  return (path, options) => {
286
286
  let newPath = path;
287
287
  let currentPathname = pathname();
@@ -292,7 +292,7 @@ var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
292
292
  newPath = currentPathname + "/" + newPath.slice(2);
293
293
  }
294
294
  if (newPath.startsWith("../")) {
295
- newPath = currentPathname + "/" + newPath.slice(3);
295
+ newPath = currentPathname + "/" + newPath;
296
296
  }
297
297
  if (options?.replace) {
298
298
  history.replaceState(options.state || null, "", newPath);
@@ -303,7 +303,7 @@ var createNavigate = (routes, pathname, setPathname, setHashAndSearch) => {
303
303
  }
304
304
  batch2(() => {
305
305
  setPathname(location.pathname);
306
- setHashAndSearch(getHashAndSearch());
306
+ setSearchAndHash(getSearchAndHash());
307
307
  });
308
308
  };
309
309
  };
@@ -400,7 +400,7 @@ var A = (props) => {
400
400
  newPath = currentPathname + "/" + newPath.slice(2);
401
401
  }
402
402
  if (newPath.startsWith("../")) {
403
- newPath = currentPathname + "/" + newPath.slice(3);
403
+ newPath = currentPathname + "/" + newPath;
404
404
  }
405
405
  return newPath;
406
406
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "solid-navigator",
3
- "version": "0.3.12",
3
+ "version": "0.3.14",
4
4
  "description": "Solid Navigator is a library that is inspired by vue router and solid router.",
5
5
  "license": "MIT",
6
6
  "author": "SupertigerDev",
@@ -65,7 +65,6 @@
65
65
  "keywords": [
66
66
  "solid"
67
67
  ],
68
- "packageManager": "pnpm@8.6.0",
69
68
  "engines": {
70
69
  "node": ">=18",
71
70
  "pnpm": ">=8.6.0"