@tanstack/router-core 1.132.0-alpha.8 → 1.132.2
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/Matches.cjs +2 -1
- package/dist/cjs/Matches.cjs.map +1 -1
- package/dist/cjs/fileRoute.d.cts +3 -3
- package/dist/cjs/index.cjs +7 -2
- package/dist/cjs/index.cjs.map +1 -1
- package/dist/cjs/index.d.cts +8 -4
- package/dist/cjs/load-matches.cjs +5 -3
- package/dist/cjs/load-matches.cjs.map +1 -1
- package/dist/cjs/location.d.cts +38 -0
- package/dist/cjs/path.cjs +27 -64
- package/dist/cjs/path.cjs.map +1 -1
- package/dist/cjs/path.d.cts +6 -7
- package/dist/cjs/process-route-tree.cjs +144 -0
- package/dist/cjs/process-route-tree.cjs.map +1 -0
- package/dist/cjs/process-route-tree.d.cts +10 -0
- package/dist/cjs/redirect.cjs +1 -1
- package/dist/cjs/redirect.cjs.map +1 -1
- package/dist/cjs/rewrite.cjs +63 -0
- package/dist/cjs/rewrite.cjs.map +1 -0
- package/dist/cjs/rewrite.d.cts +22 -0
- package/dist/cjs/route.cjs.map +1 -1
- package/dist/cjs/route.d.cts +55 -42
- package/dist/cjs/router.cjs +77 -184
- package/dist/cjs/router.cjs.map +1 -1
- package/dist/cjs/router.d.cts +68 -37
- package/dist/cjs/scroll-restoration.cjs.map +1 -1
- package/dist/cjs/scroll-restoration.d.cts +9 -0
- package/dist/cjs/ssr/createRequestHandler.cjs +4 -1
- package/dist/cjs/ssr/createRequestHandler.cjs.map +1 -1
- package/dist/cjs/ssr/serializer/transformer.cjs.map +1 -1
- package/dist/cjs/ssr/serializer/transformer.d.cts +10 -8
- package/dist/cjs/ssr/server.d.cts +0 -5
- package/dist/cjs/ssr/ssr-server.cjs +5 -2
- package/dist/cjs/ssr/ssr-server.cjs.map +1 -1
- package/dist/cjs/ssr/ssr-server.d.cts +4 -1
- package/dist/cjs/utils.cjs +68 -46
- package/dist/cjs/utils.cjs.map +1 -1
- package/dist/esm/Matches.js +2 -1
- package/dist/esm/Matches.js.map +1 -1
- package/dist/esm/fileRoute.d.ts +3 -3
- package/dist/esm/index.d.ts +8 -4
- package/dist/esm/index.js +8 -3
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/load-matches.js +5 -3
- package/dist/esm/load-matches.js.map +1 -1
- package/dist/esm/location.d.ts +38 -0
- package/dist/esm/path.d.ts +6 -7
- package/dist/esm/path.js +27 -64
- package/dist/esm/path.js.map +1 -1
- package/dist/esm/process-route-tree.d.ts +10 -0
- package/dist/esm/process-route-tree.js +144 -0
- package/dist/esm/process-route-tree.js.map +1 -0
- package/dist/esm/redirect.js +1 -1
- package/dist/esm/redirect.js.map +1 -1
- package/dist/esm/rewrite.d.ts +22 -0
- package/dist/esm/rewrite.js +63 -0
- package/dist/esm/rewrite.js.map +1 -0
- package/dist/esm/route.d.ts +55 -42
- package/dist/esm/route.js.map +1 -1
- package/dist/esm/router.d.ts +68 -37
- package/dist/esm/router.js +79 -186
- package/dist/esm/router.js.map +1 -1
- package/dist/esm/scroll-restoration.d.ts +9 -0
- package/dist/esm/scroll-restoration.js.map +1 -1
- package/dist/esm/ssr/createRequestHandler.js +4 -1
- package/dist/esm/ssr/createRequestHandler.js.map +1 -1
- package/dist/esm/ssr/serializer/transformer.d.ts +10 -8
- package/dist/esm/ssr/serializer/transformer.js.map +1 -1
- package/dist/esm/ssr/server.d.ts +0 -5
- package/dist/esm/ssr/ssr-server.d.ts +4 -1
- package/dist/esm/ssr/ssr-server.js +5 -2
- package/dist/esm/ssr/ssr-server.js.map +1 -1
- package/dist/esm/utils.js +68 -46
- package/dist/esm/utils.js.map +1 -1
- package/package.json +3 -3
- package/src/Matches.ts +2 -1
- package/src/fileRoute.ts +16 -6
- package/src/index.ts +11 -6
- package/src/load-matches.ts +29 -19
- package/src/location.ts +38 -0
- package/src/path.ts +44 -82
- package/src/process-route-tree.ts +233 -0
- package/src/redirect.ts +1 -1
- package/src/rewrite.ts +70 -0
- package/src/route.ts +214 -80
- package/src/router.ts +208 -329
- package/src/scroll-restoration.ts +1 -1
- package/src/ssr/createRequestHandler.ts +4 -1
- package/src/ssr/serializer/transformer.ts +17 -17
- package/src/ssr/server.ts +5 -5
- package/src/ssr/ssr-server.ts +8 -5
- package/src/utils.ts +83 -61
package/src/rewrite.ts
ADDED
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import { joinPaths, trimPath } from './path'
|
|
2
|
+
import type { LocationRewrite } from './router'
|
|
3
|
+
|
|
4
|
+
export function composeRewrites(rewrites: Array<LocationRewrite>) {
|
|
5
|
+
return {
|
|
6
|
+
input: ({ url }) => {
|
|
7
|
+
for (const rewrite of rewrites) {
|
|
8
|
+
url = executeRewriteInput(rewrite, url)
|
|
9
|
+
}
|
|
10
|
+
return url
|
|
11
|
+
},
|
|
12
|
+
output: ({ url }) => {
|
|
13
|
+
for (let i = rewrites.length - 1; i >= 0; i--) {
|
|
14
|
+
url = executeRewriteOutput(rewrites[i], url)
|
|
15
|
+
}
|
|
16
|
+
return url
|
|
17
|
+
},
|
|
18
|
+
} satisfies LocationRewrite
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
export function rewriteBasepath(opts: {
|
|
22
|
+
basepath: string
|
|
23
|
+
caseSensitive?: boolean
|
|
24
|
+
}) {
|
|
25
|
+
const trimmedBasepath = trimPath(opts.basepath)
|
|
26
|
+
const regex = new RegExp(
|
|
27
|
+
`^/${trimmedBasepath}/`,
|
|
28
|
+
opts.caseSensitive ? '' : 'i',
|
|
29
|
+
)
|
|
30
|
+
return {
|
|
31
|
+
input: ({ url }) => {
|
|
32
|
+
url.pathname = url.pathname.replace(regex, '/')
|
|
33
|
+
return url
|
|
34
|
+
},
|
|
35
|
+
output: ({ url }) => {
|
|
36
|
+
url.pathname = joinPaths(['/', trimmedBasepath, url.pathname])
|
|
37
|
+
return url
|
|
38
|
+
},
|
|
39
|
+
} satisfies LocationRewrite
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
export function executeRewriteInput(
|
|
43
|
+
rewrite: LocationRewrite | undefined,
|
|
44
|
+
url: URL,
|
|
45
|
+
): URL {
|
|
46
|
+
const res = rewrite?.input?.({ url })
|
|
47
|
+
if (res) {
|
|
48
|
+
if (typeof res === 'string') {
|
|
49
|
+
return new URL(res)
|
|
50
|
+
} else if (res instanceof URL) {
|
|
51
|
+
return res
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
return url
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
export function executeRewriteOutput(
|
|
58
|
+
rewrite: LocationRewrite | undefined,
|
|
59
|
+
url: URL,
|
|
60
|
+
): URL {
|
|
61
|
+
const res = rewrite?.output?.({ url })
|
|
62
|
+
if (res) {
|
|
63
|
+
if (typeof res === 'string') {
|
|
64
|
+
return new URL(res)
|
|
65
|
+
} else if (res instanceof URL) {
|
|
66
|
+
return res
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return url
|
|
70
|
+
}
|