@tanstack/solid-router 1.112.7 → 1.112.9
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.
- package/dist/cjs/router.cjs +6 -6
- package/dist/cjs/router.cjs.map +1 -1
- package/dist/esm/router.js +6 -6
- package/dist/esm/router.js.map +1 -1
- package/dist/source/router.js +3 -1
- package/dist/source/router.js.map +1 -1
- package/package.json +3 -3
- package/src/router.ts +3 -1
package/dist/cjs/router.cjs
CHANGED
|
@@ -302,7 +302,7 @@ class Router {
|
|
|
302
302
|
};
|
|
303
303
|
this.buildLocation = (opts) => {
|
|
304
304
|
const build = (dest = {}, matchedRoutesResult) => {
|
|
305
|
-
var _a, _b, _c, _d, _e, _f;
|
|
305
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
306
306
|
const fromMatches = dest._fromLocation ? this.matchRoutes(dest._fromLocation, { _buildLocation: true }) : this.state.matches;
|
|
307
307
|
const fromMatch = dest.from != null ? fromMatches.find(
|
|
308
308
|
(d) => routerCore.matchPathname(this.basepath, routerCore.trimPathRight(d.pathname), {
|
|
@@ -322,10 +322,10 @@ class Router {
|
|
|
322
322
|
);
|
|
323
323
|
let pathname;
|
|
324
324
|
if (dest.to) {
|
|
325
|
-
const resolvePathTo = (fromMatch == null ? void 0 : fromMatch.fullPath) || this.latestLocation.pathname;
|
|
325
|
+
const resolvePathTo = (fromMatch == null ? void 0 : fromMatch.fullPath) || ((_d = routerCore.last(fromMatches)) == null ? void 0 : _d.fullPath) || this.latestLocation.pathname;
|
|
326
326
|
pathname = this.resolvePathWithBase(resolvePathTo, `${dest.to}`);
|
|
327
327
|
} else {
|
|
328
|
-
const fromRouteByFromPathRouteId = this.routesById[(
|
|
328
|
+
const fromRouteByFromPathRouteId = this.routesById[(_e = stayingMatches == null ? void 0 : stayingMatches.find((route) => {
|
|
329
329
|
const interpolatedPath = routerCore.interpolatePath({
|
|
330
330
|
path: route.fullPath,
|
|
331
331
|
params: (matchedRoutesResult == null ? void 0 : matchedRoutesResult.routeParams) ?? {},
|
|
@@ -333,13 +333,13 @@ class Router {
|
|
|
333
333
|
}).interpolatedPath;
|
|
334
334
|
const pathname2 = routerCore.joinPaths([this.basepath, interpolatedPath]);
|
|
335
335
|
return pathname2 === fromPath;
|
|
336
|
-
})) == null ? void 0 :
|
|
336
|
+
})) == null ? void 0 : _e.id];
|
|
337
337
|
pathname = this.resolvePathWithBase(
|
|
338
338
|
fromPath,
|
|
339
339
|
(fromRouteByFromPathRouteId == null ? void 0 : fromRouteByFromPathRouteId.to) ?? fromPath
|
|
340
340
|
);
|
|
341
341
|
}
|
|
342
|
-
const prevParams = { ...(
|
|
342
|
+
const prevParams = { ...(_f = routerCore.last(fromMatches)) == null ? void 0 : _f.params };
|
|
343
343
|
let nextParams = (dest.params ?? true) === true ? prevParams : {
|
|
344
344
|
...prevParams,
|
|
345
345
|
...routerCore.functionalUpdate(dest.params, prevParams)
|
|
@@ -360,7 +360,7 @@ class Router {
|
|
|
360
360
|
decodeCharMap: this.pathParamsDecodeCharMap
|
|
361
361
|
}).interpolatedPath;
|
|
362
362
|
let search = fromSearch;
|
|
363
|
-
if (opts._includeValidateSearch && ((
|
|
363
|
+
if (opts._includeValidateSearch && ((_g = this.options.search) == null ? void 0 : _g.strict)) {
|
|
364
364
|
let validatedSearch = {};
|
|
365
365
|
matchedRoutesResult == null ? void 0 : matchedRoutesResult.matchedRoutes.forEach((route) => {
|
|
366
366
|
try {
|