@tanstack/router-core 1.121.0-alpha.27 → 1.121.0-alpha.28
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.map +1 -1
- package/dist/cjs/Matches.d.cts +31 -1
- package/dist/cjs/RouterProvider.d.cts +2 -1
- package/dist/cjs/defer.cjs +1 -1
- package/dist/cjs/defer.cjs.map +1 -1
- package/dist/cjs/global.d.cts +7 -0
- package/dist/cjs/index.cjs +1 -2
- package/dist/cjs/index.cjs.map +1 -1
- package/dist/cjs/index.d.cts +6 -6
- package/dist/cjs/link.cjs.map +1 -1
- package/dist/cjs/link.d.cts +12 -0
- package/dist/cjs/lru-cache.cjs +62 -0
- package/dist/cjs/lru-cache.cjs.map +1 -0
- package/dist/cjs/lru-cache.d.cts +5 -0
- package/dist/cjs/not-found.cjs +1 -1
- package/dist/cjs/not-found.cjs.map +1 -1
- package/dist/cjs/path.cjs +316 -148
- package/dist/cjs/path.cjs.map +1 -1
- package/dist/cjs/path.d.cts +18 -24
- package/dist/cjs/qss.cjs.map +1 -1
- package/dist/cjs/redirect.cjs +3 -0
- package/dist/cjs/redirect.cjs.map +1 -1
- package/dist/cjs/route.cjs +6 -12
- package/dist/cjs/route.cjs.map +1 -1
- package/dist/cjs/route.d.cts +29 -9
- package/dist/cjs/router.cjs +453 -272
- package/dist/cjs/router.cjs.map +1 -1
- package/dist/cjs/router.d.cts +55 -85
- package/dist/cjs/scroll-restoration.cjs +20 -13
- package/dist/cjs/scroll-restoration.cjs.map +1 -1
- package/dist/cjs/scroll-restoration.d.cts +9 -1
- package/dist/cjs/searchMiddleware.cjs.map +1 -1
- package/dist/cjs/searchParams.cjs.map +1 -1
- package/dist/cjs/ssr/client.cjs +10 -0
- package/dist/cjs/ssr/client.cjs.map +1 -0
- package/dist/cjs/ssr/client.d.cts +5 -0
- package/dist/cjs/ssr/createRequestHandler.cjs +50 -0
- package/dist/cjs/ssr/createRequestHandler.cjs.map +1 -0
- package/dist/cjs/ssr/createRequestHandler.d.cts +9 -0
- package/dist/cjs/ssr/handlerCallback.cjs +7 -0
- package/dist/cjs/ssr/handlerCallback.cjs.map +1 -0
- package/dist/cjs/ssr/handlerCallback.d.cts +9 -0
- package/dist/cjs/ssr/headers.cjs +39 -0
- package/dist/cjs/ssr/headers.cjs.map +1 -0
- package/dist/cjs/ssr/headers.d.cts +5 -0
- package/dist/cjs/ssr/json.cjs +14 -0
- package/dist/cjs/ssr/json.cjs.map +1 -0
- package/dist/cjs/ssr/json.d.cts +4 -0
- package/dist/cjs/ssr/seroval-plugins.cjs +34 -0
- package/dist/cjs/ssr/seroval-plugins.cjs.map +1 -0
- package/dist/cjs/ssr/seroval-plugins.d.cts +10 -0
- package/dist/cjs/ssr/server.cjs +13 -0
- package/dist/cjs/ssr/server.cjs.map +1 -0
- package/dist/cjs/ssr/server.d.cts +6 -0
- package/dist/cjs/ssr/ssr-client.cjs +159 -0
- package/dist/cjs/ssr/ssr-client.cjs.map +1 -0
- package/dist/cjs/ssr/ssr-client.d.cts +29 -0
- package/dist/cjs/ssr/ssr-server.cjs +107 -0
- package/dist/cjs/ssr/ssr-server.cjs.map +1 -0
- package/dist/cjs/ssr/ssr-server.d.cts +18 -0
- package/dist/cjs/ssr/transformStreamWithRouter.cjs +183 -0
- package/dist/cjs/ssr/transformStreamWithRouter.cjs.map +1 -0
- package/dist/cjs/ssr/transformStreamWithRouter.d.cts +6 -0
- package/dist/cjs/ssr/tsrScript.cjs +4 -0
- package/dist/cjs/ssr/tsrScript.cjs.map +1 -0
- package/dist/cjs/ssr/tsrScript.d.cts +0 -0
- package/dist/cjs/utils.cjs +7 -25
- package/dist/cjs/utils.cjs.map +1 -1
- package/dist/cjs/utils.d.cts +1 -6
- package/dist/esm/Matches.d.ts +31 -1
- package/dist/esm/Matches.js.map +1 -1
- package/dist/esm/RouterProvider.d.ts +2 -1
- package/dist/esm/defer.js +1 -1
- package/dist/esm/defer.js.map +1 -1
- package/dist/esm/global.d.ts +7 -0
- package/dist/esm/index.d.ts +6 -6
- package/dist/esm/index.js +2 -3
- package/dist/esm/link.d.ts +12 -0
- package/dist/esm/link.js.map +1 -1
- package/dist/esm/lru-cache.d.ts +5 -0
- package/dist/esm/lru-cache.js +62 -0
- package/dist/esm/lru-cache.js.map +1 -0
- package/dist/esm/not-found.js +1 -1
- package/dist/esm/not-found.js.map +1 -1
- package/dist/esm/path.d.ts +18 -24
- package/dist/esm/path.js +316 -148
- package/dist/esm/path.js.map +1 -1
- package/dist/esm/qss.js.map +1 -1
- package/dist/esm/redirect.js +3 -0
- package/dist/esm/redirect.js.map +1 -1
- package/dist/esm/route.d.ts +29 -9
- package/dist/esm/route.js +6 -12
- package/dist/esm/route.js.map +1 -1
- package/dist/esm/router.d.ts +55 -85
- package/dist/esm/router.js +462 -281
- package/dist/esm/router.js.map +1 -1
- package/dist/esm/scroll-restoration.d.ts +9 -1
- package/dist/esm/scroll-restoration.js +20 -13
- package/dist/esm/scroll-restoration.js.map +1 -1
- package/dist/esm/searchMiddleware.js.map +1 -1
- package/dist/esm/searchParams.js.map +1 -1
- package/dist/esm/ssr/client.d.ts +5 -0
- package/dist/esm/ssr/client.js +10 -0
- package/dist/esm/ssr/client.js.map +1 -0
- package/dist/esm/ssr/createRequestHandler.d.ts +9 -0
- package/dist/esm/ssr/createRequestHandler.js +50 -0
- package/dist/esm/ssr/createRequestHandler.js.map +1 -0
- package/dist/esm/ssr/handlerCallback.d.ts +9 -0
- package/dist/esm/ssr/handlerCallback.js +7 -0
- package/dist/esm/ssr/handlerCallback.js.map +1 -0
- package/dist/esm/ssr/headers.d.ts +5 -0
- package/dist/esm/ssr/headers.js +39 -0
- package/dist/esm/ssr/headers.js.map +1 -0
- package/dist/esm/ssr/json.d.ts +4 -0
- package/dist/esm/ssr/json.js +14 -0
- package/dist/esm/ssr/json.js.map +1 -0
- package/dist/esm/ssr/seroval-plugins.d.ts +10 -0
- package/dist/esm/ssr/seroval-plugins.js +34 -0
- package/dist/esm/ssr/seroval-plugins.js.map +1 -0
- package/dist/esm/ssr/server.d.ts +6 -0
- package/dist/esm/ssr/server.js +13 -0
- package/dist/esm/ssr/server.js.map +1 -0
- package/dist/esm/ssr/ssr-client.d.ts +29 -0
- package/dist/esm/ssr/ssr-client.js +159 -0
- package/dist/esm/ssr/ssr-client.js.map +1 -0
- package/dist/esm/ssr/ssr-server.d.ts +18 -0
- package/dist/esm/ssr/ssr-server.js +107 -0
- package/dist/esm/ssr/ssr-server.js.map +1 -0
- package/dist/esm/ssr/transformStreamWithRouter.d.ts +6 -0
- package/dist/esm/ssr/transformStreamWithRouter.js +183 -0
- package/dist/esm/ssr/transformStreamWithRouter.js.map +1 -0
- package/dist/esm/ssr/tsrScript.d.ts +0 -0
- package/dist/esm/ssr/tsrScript.js +5 -0
- package/dist/esm/ssr/tsrScript.js.map +1 -0
- package/dist/esm/utils.d.ts +1 -6
- package/dist/esm/utils.js +8 -26
- package/dist/esm/utils.js.map +1 -1
- package/package.json +29 -2
- package/src/Matches.ts +40 -1
- package/src/RouterProvider.ts +2 -1
- package/src/global.ts +9 -0
- package/src/index.ts +12 -20
- package/src/link.ts +12 -0
- package/src/lru-cache.ts +68 -0
- package/src/path.ts +424 -174
- package/src/redirect.ts +3 -0
- package/src/route.ts +44 -13
- package/src/router.ts +580 -312
- package/src/scroll-restoration.ts +30 -18
- package/src/ssr/client.ts +5 -0
- package/src/ssr/createRequestHandler.ts +74 -0
- package/src/ssr/handlerCallback.ts +15 -0
- package/src/ssr/headers.ts +51 -0
- package/src/ssr/json.ts +18 -0
- package/src/ssr/seroval-plugins.ts +43 -0
- package/src/ssr/server.ts +10 -0
- package/src/ssr/ssr-client.ts +242 -0
- package/src/ssr/ssr-server.ts +132 -0
- package/src/ssr/transformStreamWithRouter.ts +259 -0
- package/src/ssr/tsrScript.ts +7 -0
- package/src/utils.ts +10 -39
- package/src/vite-env.d.ts +4 -0
- package/dist/cjs/serializer.d.cts +0 -22
- package/dist/esm/serializer.d.ts +0 -22
- package/src/serializer.ts +0 -32
|
@@ -0,0 +1,159 @@
|
|
|
1
|
+
import invariant from "tiny-invariant";
|
|
2
|
+
import { batch } from "@tanstack/store";
|
|
3
|
+
import { createControlledPromise } from "../utils.js";
|
|
4
|
+
function hydrateMatch(deyhydratedMatch) {
|
|
5
|
+
return {
|
|
6
|
+
id: deyhydratedMatch.i,
|
|
7
|
+
__beforeLoadContext: deyhydratedMatch.b,
|
|
8
|
+
loaderData: deyhydratedMatch.l,
|
|
9
|
+
status: deyhydratedMatch.s,
|
|
10
|
+
ssr: deyhydratedMatch.ssr,
|
|
11
|
+
updatedAt: deyhydratedMatch.u,
|
|
12
|
+
error: deyhydratedMatch.e
|
|
13
|
+
};
|
|
14
|
+
}
|
|
15
|
+
async function hydrate(router) {
|
|
16
|
+
invariant(
|
|
17
|
+
window.$_TSR?.router,
|
|
18
|
+
"Expected to find a dehydrated data on window.$_TSR.router, but we did not. Please file an issue!"
|
|
19
|
+
);
|
|
20
|
+
const { manifest, dehydratedData, lastMatchId } = window.$_TSR.router;
|
|
21
|
+
router.ssr = {
|
|
22
|
+
manifest
|
|
23
|
+
};
|
|
24
|
+
const matches = router.matchRoutes(router.state.location);
|
|
25
|
+
const routeChunkPromise = Promise.all(
|
|
26
|
+
matches.map((match) => {
|
|
27
|
+
const route = router.looseRoutesById[match.routeId];
|
|
28
|
+
return router.loadRouteChunk(route);
|
|
29
|
+
})
|
|
30
|
+
);
|
|
31
|
+
function setMatchForcePending(match) {
|
|
32
|
+
const route = router.looseRoutesById[match.routeId];
|
|
33
|
+
const pendingMinMs = route.options.pendingMinMs ?? router.options.defaultPendingMinMs;
|
|
34
|
+
if (pendingMinMs) {
|
|
35
|
+
const minPendingPromise = createControlledPromise();
|
|
36
|
+
match.minPendingPromise = minPendingPromise;
|
|
37
|
+
match._forcePending = true;
|
|
38
|
+
setTimeout(() => {
|
|
39
|
+
minPendingPromise.resolve();
|
|
40
|
+
router.updateMatch(match.id, (prev) => ({
|
|
41
|
+
...prev,
|
|
42
|
+
minPendingPromise: void 0,
|
|
43
|
+
_forcePending: void 0
|
|
44
|
+
}));
|
|
45
|
+
}, pendingMinMs);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
let firstNonSsrMatchIndex = void 0;
|
|
49
|
+
matches.forEach((match) => {
|
|
50
|
+
const dehydratedMatch = window.$_TSR.router.matches.find(
|
|
51
|
+
(d) => d.i === match.id
|
|
52
|
+
);
|
|
53
|
+
if (!dehydratedMatch) {
|
|
54
|
+
Object.assign(match, { dehydrated: false, ssr: false });
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
Object.assign(match, hydrateMatch(dehydratedMatch));
|
|
58
|
+
if (match.ssr === false) {
|
|
59
|
+
match._dehydrated = false;
|
|
60
|
+
} else {
|
|
61
|
+
match._dehydrated = true;
|
|
62
|
+
}
|
|
63
|
+
if (match.ssr === "data-only" || match.ssr === false) {
|
|
64
|
+
if (firstNonSsrMatchIndex === void 0) {
|
|
65
|
+
firstNonSsrMatchIndex = match.index;
|
|
66
|
+
setMatchForcePending(match);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
});
|
|
70
|
+
router.__store.setState((s) => {
|
|
71
|
+
return {
|
|
72
|
+
...s,
|
|
73
|
+
matches
|
|
74
|
+
};
|
|
75
|
+
});
|
|
76
|
+
await router.options.hydrate?.(dehydratedData);
|
|
77
|
+
await Promise.all(
|
|
78
|
+
router.state.matches.map(async (match) => {
|
|
79
|
+
const route = router.looseRoutesById[match.routeId];
|
|
80
|
+
const parentMatch = router.state.matches[match.index - 1];
|
|
81
|
+
const parentContext = parentMatch?.context ?? router.options.context ?? {};
|
|
82
|
+
const contextFnContext = {
|
|
83
|
+
deps: match.loaderDeps,
|
|
84
|
+
params: match.params,
|
|
85
|
+
context: parentContext,
|
|
86
|
+
location: router.state.location,
|
|
87
|
+
navigate: (opts) => router.navigate({ ...opts, _fromLocation: router.state.location }),
|
|
88
|
+
buildLocation: router.buildLocation,
|
|
89
|
+
cause: match.cause,
|
|
90
|
+
abortController: match.abortController,
|
|
91
|
+
preload: false,
|
|
92
|
+
matches
|
|
93
|
+
};
|
|
94
|
+
match.__routeContext = route.options.context?.(contextFnContext) ?? {};
|
|
95
|
+
match.context = {
|
|
96
|
+
...parentContext,
|
|
97
|
+
...match.__routeContext,
|
|
98
|
+
...match.__beforeLoadContext
|
|
99
|
+
};
|
|
100
|
+
const assetContext = {
|
|
101
|
+
matches: router.state.matches,
|
|
102
|
+
match,
|
|
103
|
+
params: match.params,
|
|
104
|
+
loaderData: match.loaderData
|
|
105
|
+
};
|
|
106
|
+
const headFnContent = await route.options.head?.(assetContext);
|
|
107
|
+
const scripts = await route.options.scripts?.(assetContext);
|
|
108
|
+
match.meta = headFnContent?.meta;
|
|
109
|
+
match.links = headFnContent?.links;
|
|
110
|
+
match.headScripts = headFnContent?.scripts;
|
|
111
|
+
match.styles = headFnContent?.styles;
|
|
112
|
+
match.scripts = scripts;
|
|
113
|
+
})
|
|
114
|
+
);
|
|
115
|
+
const isSpaMode = matches[matches.length - 1].id !== lastMatchId;
|
|
116
|
+
const hasSsrFalseMatches = matches.some((m) => m.ssr === false);
|
|
117
|
+
if (!hasSsrFalseMatches && !isSpaMode) {
|
|
118
|
+
matches.forEach((match) => {
|
|
119
|
+
match._dehydrated = void 0;
|
|
120
|
+
});
|
|
121
|
+
return routeChunkPromise;
|
|
122
|
+
}
|
|
123
|
+
const loadPromise = Promise.resolve().then(() => router.load()).catch((err) => {
|
|
124
|
+
console.error("Error during router hydration:", err);
|
|
125
|
+
});
|
|
126
|
+
if (isSpaMode) {
|
|
127
|
+
const match = matches[1];
|
|
128
|
+
invariant(
|
|
129
|
+
match,
|
|
130
|
+
"Expected to find a match below the root match in SPA mode."
|
|
131
|
+
);
|
|
132
|
+
setMatchForcePending(match);
|
|
133
|
+
match._displayPending = true;
|
|
134
|
+
match.displayPendingPromise = loadPromise;
|
|
135
|
+
loadPromise.then(() => {
|
|
136
|
+
batch(() => {
|
|
137
|
+
if (router.__store.state.status === "pending") {
|
|
138
|
+
router.__store.setState((s) => ({
|
|
139
|
+
...s,
|
|
140
|
+
status: "idle",
|
|
141
|
+
resolvedLocation: s.location
|
|
142
|
+
}));
|
|
143
|
+
}
|
|
144
|
+
router.updateMatch(match.id, (prev) => {
|
|
145
|
+
return {
|
|
146
|
+
...prev,
|
|
147
|
+
_displayPending: void 0,
|
|
148
|
+
displayPendingPromise: void 0
|
|
149
|
+
};
|
|
150
|
+
});
|
|
151
|
+
});
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
return routeChunkPromise;
|
|
155
|
+
}
|
|
156
|
+
export {
|
|
157
|
+
hydrate
|
|
158
|
+
};
|
|
159
|
+
//# sourceMappingURL=ssr-client.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ssr-client.js","sources":["../../../src/ssr/ssr-client.ts"],"sourcesContent":["import invariant from 'tiny-invariant'\nimport { batch } from '@tanstack/store'\nimport { createControlledPromise } from '../utils'\nimport type { AnyRouteMatch, MakeRouteMatch } from '../Matches'\nimport type { AnyRouter } from '../router'\nimport type { Manifest } from '../manifest'\nimport type { RouteContextOptions } from '../route'\nimport type { GLOBAL_TSR } from './ssr-server'\n\ndeclare global {\n interface Window {\n [GLOBAL_TSR]?: TsrSsrGlobal\n }\n}\n\nexport interface TsrSsrGlobal {\n router?: DehydratedRouter\n // clean scripts, shortened since this is sent for each streamed script\n c: () => void\n}\n\nfunction hydrateMatch(\n deyhydratedMatch: DehydratedMatch,\n): Partial<MakeRouteMatch> {\n return {\n id: deyhydratedMatch.i,\n __beforeLoadContext: deyhydratedMatch.b,\n loaderData: deyhydratedMatch.l,\n status: deyhydratedMatch.s,\n ssr: deyhydratedMatch.ssr,\n updatedAt: deyhydratedMatch.u,\n error: deyhydratedMatch.e,\n }\n}\nexport interface DehydratedMatch {\n i: MakeRouteMatch['id']\n b?: MakeRouteMatch['__beforeLoadContext']\n l?: MakeRouteMatch['loaderData']\n e?: MakeRouteMatch['error']\n u: MakeRouteMatch['updatedAt']\n s: MakeRouteMatch['status']\n ssr?: MakeRouteMatch['ssr']\n}\n\nexport interface DehydratedRouter {\n manifest: Manifest | undefined\n dehydratedData?: any\n lastMatchId?: string\n matches: Array<DehydratedMatch>\n}\n\nexport async function hydrate(router: AnyRouter): Promise<any> {\n invariant(\n window.$_TSR?.router,\n 'Expected to find a dehydrated data on window.$_TSR.router, but we did not. Please file an issue!',\n )\n\n const { manifest, dehydratedData, lastMatchId } = window.$_TSR.router\n\n router.ssr = {\n manifest,\n }\n\n // Hydrate the router state\n const matches = router.matchRoutes(router.state.location)\n\n // kick off loading the route chunks\n const routeChunkPromise = Promise.all(\n matches.map((match) => {\n const route = router.looseRoutesById[match.routeId]!\n return router.loadRouteChunk(route)\n }),\n )\n\n function setMatchForcePending(match: AnyRouteMatch) {\n // usually the minPendingPromise is created in the Match component if a pending match is rendered\n // however, this might be too late if the match synchronously resolves\n const route = router.looseRoutesById[match.routeId]!\n const pendingMinMs =\n route.options.pendingMinMs ?? router.options.defaultPendingMinMs\n if (pendingMinMs) {\n const minPendingPromise = createControlledPromise<void>()\n match.minPendingPromise = minPendingPromise\n match._forcePending = true\n\n setTimeout(() => {\n minPendingPromise.resolve()\n // We've handled the minPendingPromise, so we can delete it\n router.updateMatch(match.id, (prev) => ({\n ...prev,\n minPendingPromise: undefined,\n _forcePending: undefined,\n }))\n }, pendingMinMs)\n }\n }\n\n // Right after hydration and before the first render, we need to rehydrate each match\n // First step is to reyhdrate loaderData and __beforeLoadContext\n let firstNonSsrMatchIndex: number | undefined = undefined\n matches.forEach((match) => {\n const dehydratedMatch = window.$_TSR!.router!.matches.find(\n (d) => d.i === match.id,\n )\n if (!dehydratedMatch) {\n Object.assign(match, { dehydrated: false, ssr: false })\n return\n }\n\n Object.assign(match, hydrateMatch(dehydratedMatch))\n\n if (match.ssr === false) {\n match._dehydrated = false\n } else {\n match._dehydrated = true\n }\n\n if (match.ssr === 'data-only' || match.ssr === false) {\n if (firstNonSsrMatchIndex === undefined) {\n firstNonSsrMatchIndex = match.index\n setMatchForcePending(match)\n }\n }\n })\n\n router.__store.setState((s) => {\n return {\n ...s,\n matches,\n }\n })\n\n // Allow the user to handle custom hydration data\n await router.options.hydrate?.(dehydratedData)\n\n // now that all necessary data is hydrated:\n // 1) fully reconstruct the route context\n // 2) execute `head()` and `scripts()` for each match\n await Promise.all(\n router.state.matches.map(async (match) => {\n const route = router.looseRoutesById[match.routeId]!\n\n const parentMatch = router.state.matches[match.index - 1]\n const parentContext = parentMatch?.context ?? router.options.context ?? {}\n\n // `context()` was already executed by `matchRoutes`, however route context was not yet fully reconstructed\n // so run it again and merge route context\n const contextFnContext: RouteContextOptions<any, any, any, any> = {\n deps: match.loaderDeps,\n params: match.params,\n context: parentContext,\n location: router.state.location,\n navigate: (opts: any) =>\n router.navigate({ ...opts, _fromLocation: router.state.location }),\n buildLocation: router.buildLocation,\n cause: match.cause,\n abortController: match.abortController,\n preload: false,\n matches,\n }\n match.__routeContext = route.options.context?.(contextFnContext) ?? {}\n\n match.context = {\n ...parentContext,\n ...match.__routeContext,\n ...match.__beforeLoadContext,\n }\n\n const assetContext = {\n matches: router.state.matches,\n match,\n params: match.params,\n loaderData: match.loaderData,\n }\n const headFnContent = await route.options.head?.(assetContext)\n\n const scripts = await route.options.scripts?.(assetContext)\n\n match.meta = headFnContent?.meta\n match.links = headFnContent?.links\n match.headScripts = headFnContent?.scripts\n match.styles = headFnContent?.styles\n match.scripts = scripts\n }),\n )\n\n const isSpaMode = matches[matches.length - 1]!.id !== lastMatchId\n const hasSsrFalseMatches = matches.some((m) => m.ssr === false)\n // all matches have data from the server and we are not in SPA mode so we don't need to kick of router.load()\n if (!hasSsrFalseMatches && !isSpaMode) {\n matches.forEach((match) => {\n // remove the _dehydrate flag since we won't run router.load() which would remove it\n match._dehydrated = undefined\n })\n return routeChunkPromise\n }\n\n // schedule router.load() to run after the next tick so we can store the promise in the match before loading starts\n const loadPromise = Promise.resolve()\n .then(() => router.load())\n .catch((err) => {\n console.error('Error during router hydration:', err)\n })\n\n // in SPA mode we need to keep the first match below the root route pending until router.load() is finished\n // this will prevent that other pending components are rendered but hydration is not blocked\n if (isSpaMode) {\n const match = matches[1]\n invariant(\n match,\n 'Expected to find a match below the root match in SPA mode.',\n )\n setMatchForcePending(match)\n\n match._displayPending = true\n match.displayPendingPromise = loadPromise\n\n loadPromise.then(() => {\n batch(() => {\n // ensure router is not in status 'pending' anymore\n // this usually happens in Transitioner but if loading synchronously resolves,\n // Transitioner won't be rendered while loading so it cannot track the change from loading:true to loading:false\n if (router.__store.state.status === 'pending') {\n router.__store.setState((s) => ({\n ...s,\n status: 'idle',\n resolvedLocation: s.location,\n }))\n }\n // hide the pending component once the load is finished\n router.updateMatch(match.id, (prev) => {\n return {\n ...prev,\n _displayPending: undefined,\n displayPendingPromise: undefined,\n }\n })\n })\n })\n }\n return routeChunkPromise\n}\n"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { AnyRouter } from '../router.js';
|
|
2
|
+
import { DehydratedMatch } from './ssr-client.js';
|
|
3
|
+
import { AnyRouteMatch } from '../Matches.js';
|
|
4
|
+
import { Manifest } from '../manifest.js';
|
|
5
|
+
declare module '../router' {
|
|
6
|
+
interface ServerSsr {
|
|
7
|
+
setRenderFinished: () => void;
|
|
8
|
+
}
|
|
9
|
+
interface RouterEvents {
|
|
10
|
+
onInjectedHtml: {
|
|
11
|
+
type: 'onInjectedHtml';
|
|
12
|
+
promise: Promise<string>;
|
|
13
|
+
};
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
export declare const GLOBAL_TSR = "$_TSR";
|
|
17
|
+
export declare function dehydrateMatch(match: AnyRouteMatch): DehydratedMatch;
|
|
18
|
+
export declare function attachRouterServerSsrUtils(router: AnyRouter, manifest: Manifest | undefined): void;
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
import { crossSerializeStream, getCrossReferenceHeader } from "seroval";
|
|
2
|
+
import { ReadableStreamPlugin } from "seroval-plugins/web";
|
|
3
|
+
import invariant from "tiny-invariant";
|
|
4
|
+
import { createControlledPromise } from "../utils.js";
|
|
5
|
+
import minifiedTsrBootStrapScript from "./tsrScript.js";
|
|
6
|
+
import { ShallowErrorPlugin } from "./seroval-plugins.js";
|
|
7
|
+
const GLOBAL_TSR = "$_TSR";
|
|
8
|
+
const SCOPE_ID = "tsr";
|
|
9
|
+
function dehydrateMatch(match) {
|
|
10
|
+
const dehydratedMatch = {
|
|
11
|
+
i: match.id,
|
|
12
|
+
u: match.updatedAt,
|
|
13
|
+
s: match.status
|
|
14
|
+
};
|
|
15
|
+
const properties = [
|
|
16
|
+
["__beforeLoadContext", "b"],
|
|
17
|
+
["loaderData", "l"],
|
|
18
|
+
["error", "e"],
|
|
19
|
+
["ssr", "ssr"]
|
|
20
|
+
];
|
|
21
|
+
for (const [key, shorthand] of properties) {
|
|
22
|
+
if (match[key] !== void 0) {
|
|
23
|
+
dehydratedMatch[shorthand] = match[key];
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
return dehydratedMatch;
|
|
27
|
+
}
|
|
28
|
+
function attachRouterServerSsrUtils(router, manifest) {
|
|
29
|
+
router.ssr = {
|
|
30
|
+
manifest
|
|
31
|
+
};
|
|
32
|
+
const serializationRefs = /* @__PURE__ */ new Map();
|
|
33
|
+
let initialScriptSent = false;
|
|
34
|
+
const getInitialScript = () => {
|
|
35
|
+
if (initialScriptSent) {
|
|
36
|
+
return "";
|
|
37
|
+
}
|
|
38
|
+
initialScriptSent = true;
|
|
39
|
+
return `${getCrossReferenceHeader(SCOPE_ID)};${minifiedTsrBootStrapScript};`;
|
|
40
|
+
};
|
|
41
|
+
let _dehydrated = false;
|
|
42
|
+
const listeners = [];
|
|
43
|
+
router.serverSsr = {
|
|
44
|
+
injectedHtml: [],
|
|
45
|
+
injectHtml: (getHtml) => {
|
|
46
|
+
const promise = Promise.resolve().then(getHtml);
|
|
47
|
+
router.serverSsr.injectedHtml.push(promise);
|
|
48
|
+
router.emit({
|
|
49
|
+
type: "onInjectedHtml",
|
|
50
|
+
promise
|
|
51
|
+
});
|
|
52
|
+
return promise.then(() => {
|
|
53
|
+
});
|
|
54
|
+
},
|
|
55
|
+
injectScript: (getScript) => {
|
|
56
|
+
return router.serverSsr.injectHtml(async () => {
|
|
57
|
+
const script = await getScript();
|
|
58
|
+
return `<script class='$tsr'>${getInitialScript()}${script};if (typeof $_TSR !== 'undefined') $_TSR.c()<\/script>`;
|
|
59
|
+
});
|
|
60
|
+
},
|
|
61
|
+
dehydrate: async () => {
|
|
62
|
+
invariant(!_dehydrated, "router is already dehydrated!");
|
|
63
|
+
let matchesToDehydrate = router.state.matches;
|
|
64
|
+
if (router.isShell()) {
|
|
65
|
+
matchesToDehydrate = matchesToDehydrate.slice(0, 1);
|
|
66
|
+
}
|
|
67
|
+
const matches = matchesToDehydrate.map(dehydrateMatch);
|
|
68
|
+
const dehydratedRouter = {
|
|
69
|
+
manifest: router.ssr.manifest,
|
|
70
|
+
matches
|
|
71
|
+
};
|
|
72
|
+
const lastMatchId = matchesToDehydrate[matchesToDehydrate.length - 1]?.id;
|
|
73
|
+
if (lastMatchId) {
|
|
74
|
+
dehydratedRouter.lastMatchId = lastMatchId;
|
|
75
|
+
}
|
|
76
|
+
dehydratedRouter.dehydratedData = await router.options.dehydrate?.();
|
|
77
|
+
_dehydrated = true;
|
|
78
|
+
const p = createControlledPromise();
|
|
79
|
+
crossSerializeStream(dehydratedRouter, {
|
|
80
|
+
refs: serializationRefs,
|
|
81
|
+
// TODO make plugins configurable
|
|
82
|
+
plugins: [ReadableStreamPlugin, ShallowErrorPlugin],
|
|
83
|
+
onSerialize: (data, initial) => {
|
|
84
|
+
const serialized = initial ? `${GLOBAL_TSR}["router"]=` + data : data;
|
|
85
|
+
router.serverSsr.injectScript(() => serialized);
|
|
86
|
+
},
|
|
87
|
+
scopeId: SCOPE_ID,
|
|
88
|
+
onDone: () => p.resolve(""),
|
|
89
|
+
onError: (err) => p.reject(err)
|
|
90
|
+
});
|
|
91
|
+
router.serverSsr.injectHtml(() => p);
|
|
92
|
+
},
|
|
93
|
+
isDehydrated() {
|
|
94
|
+
return _dehydrated;
|
|
95
|
+
},
|
|
96
|
+
onRenderFinished: (listener) => listeners.push(listener),
|
|
97
|
+
setRenderFinished: () => {
|
|
98
|
+
listeners.forEach((l) => l());
|
|
99
|
+
}
|
|
100
|
+
};
|
|
101
|
+
}
|
|
102
|
+
export {
|
|
103
|
+
GLOBAL_TSR,
|
|
104
|
+
attachRouterServerSsrUtils,
|
|
105
|
+
dehydrateMatch
|
|
106
|
+
};
|
|
107
|
+
//# sourceMappingURL=ssr-server.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ssr-server.js","sources":["../../../src/ssr/ssr-server.ts"],"sourcesContent":["import { crossSerializeStream, getCrossReferenceHeader } from 'seroval'\nimport { ReadableStreamPlugin } from 'seroval-plugins/web'\nimport invariant from 'tiny-invariant'\nimport { createControlledPromise } from '../utils'\nimport minifiedTsrBootStrapScript from './tsrScript?script-string'\nimport { ShallowErrorPlugin } from './seroval-plugins'\nimport type { AnyRouter } from '../router'\nimport type { DehydratedMatch } from './ssr-client'\nimport type { DehydratedRouter } from './client'\nimport type { AnyRouteMatch } from '../Matches'\nimport type { Manifest } from '../manifest'\n\ndeclare module '../router' {\n interface ServerSsr {\n setRenderFinished: () => void\n }\n interface RouterEvents {\n onInjectedHtml: {\n type: 'onInjectedHtml'\n promise: Promise<string>\n }\n }\n}\n\nexport const GLOBAL_TSR = '$_TSR'\nconst SCOPE_ID = 'tsr'\n\nexport function dehydrateMatch(match: AnyRouteMatch): DehydratedMatch {\n const dehydratedMatch: DehydratedMatch = {\n i: match.id,\n u: match.updatedAt,\n s: match.status,\n }\n\n const properties = [\n ['__beforeLoadContext', 'b'],\n ['loaderData', 'l'],\n ['error', 'e'],\n ['ssr', 'ssr'],\n ] as const\n\n for (const [key, shorthand] of properties) {\n if (match[key] !== undefined) {\n dehydratedMatch[shorthand] = match[key]\n }\n }\n return dehydratedMatch\n}\n\nexport function attachRouterServerSsrUtils(\n router: AnyRouter,\n manifest: Manifest | undefined,\n) {\n router.ssr = {\n manifest,\n }\n const serializationRefs = new Map<unknown, number>()\n\n let initialScriptSent = false\n const getInitialScript = () => {\n if (initialScriptSent) {\n return ''\n }\n initialScriptSent = true\n return `${getCrossReferenceHeader(SCOPE_ID)};${minifiedTsrBootStrapScript};`\n }\n let _dehydrated = false\n const listeners: Array<() => void> = []\n\n router.serverSsr = {\n injectedHtml: [],\n injectHtml: (getHtml) => {\n const promise = Promise.resolve().then(getHtml)\n router.serverSsr!.injectedHtml.push(promise)\n router.emit({\n type: 'onInjectedHtml',\n promise,\n })\n\n return promise.then(() => {})\n },\n injectScript: (getScript) => {\n return router.serverSsr!.injectHtml(async () => {\n const script = await getScript()\n return `<script class='$tsr'>${getInitialScript()}${script};if (typeof $_TSR !== 'undefined') $_TSR.c()</script>`\n })\n },\n dehydrate: async () => {\n invariant(!_dehydrated, 'router is already dehydrated!')\n let matchesToDehydrate = router.state.matches\n if (router.isShell()) {\n // In SPA mode we only want to dehydrate the root match\n matchesToDehydrate = matchesToDehydrate.slice(0, 1)\n }\n const matches = matchesToDehydrate.map(dehydrateMatch)\n\n const dehydratedRouter: DehydratedRouter = {\n manifest: router.ssr!.manifest,\n matches,\n }\n const lastMatchId = matchesToDehydrate[matchesToDehydrate.length - 1]?.id\n if (lastMatchId) {\n dehydratedRouter.lastMatchId = lastMatchId\n }\n dehydratedRouter.dehydratedData = await router.options.dehydrate?.()\n _dehydrated = true\n\n const p = createControlledPromise<string>()\n crossSerializeStream(dehydratedRouter, {\n refs: serializationRefs,\n // TODO make plugins configurable\n plugins: [ReadableStreamPlugin, ShallowErrorPlugin],\n onSerialize: (data, initial) => {\n const serialized = initial ? `${GLOBAL_TSR}[\"router\"]=` + data : data\n router.serverSsr!.injectScript(() => serialized)\n },\n scopeId: SCOPE_ID,\n onDone: () => p.resolve(''),\n onError: (err) => p.reject(err),\n })\n // make sure the stream is kept open until the promise is resolved\n router.serverSsr!.injectHtml(() => p)\n },\n isDehydrated() {\n return _dehydrated\n },\n onRenderFinished: (listener) => listeners.push(listener),\n setRenderFinished: () => {\n listeners.forEach((l) => l())\n },\n }\n}\n"],"names":[],"mappings":";;;;;;AAwBO,MAAM,aAAa;AAC1B,MAAM,WAAW;AAEV,SAAS,eAAe,OAAuC;AACpE,QAAM,kBAAmC;AAAA,IACvC,GAAG,MAAM;AAAA,IACT,GAAG,MAAM;AAAA,IACT,GAAG,MAAM;AAAA,EAAA;AAGX,QAAM,aAAa;AAAA,IACjB,CAAC,uBAAuB,GAAG;AAAA,IAC3B,CAAC,cAAc,GAAG;AAAA,IAClB,CAAC,SAAS,GAAG;AAAA,IACb,CAAC,OAAO,KAAK;AAAA,EAAA;AAGf,aAAW,CAAC,KAAK,SAAS,KAAK,YAAY;AACzC,QAAI,MAAM,GAAG,MAAM,QAAW;AAC5B,sBAAgB,SAAS,IAAI,MAAM,GAAG;AAAA,IACxC;AAAA,EACF;AACA,SAAO;AACT;AAEO,SAAS,2BACd,QACA,UACA;AACA,SAAO,MAAM;AAAA,IACX;AAAA,EAAA;AAEF,QAAM,wCAAwB,IAAA;AAE9B,MAAI,oBAAoB;AACxB,QAAM,mBAAmB,MAAM;AAC7B,QAAI,mBAAmB;AACrB,aAAO;AAAA,IACT;AACA,wBAAoB;AACpB,WAAO,GAAG,wBAAwB,QAAQ,CAAC,IAAI,0BAA0B;AAAA,EAC3E;AACA,MAAI,cAAc;AAClB,QAAM,YAA+B,CAAA;AAErC,SAAO,YAAY;AAAA,IACjB,cAAc,CAAA;AAAA,IACd,YAAY,CAAC,YAAY;AACvB,YAAM,UAAU,QAAQ,QAAA,EAAU,KAAK,OAAO;AAC9C,aAAO,UAAW,aAAa,KAAK,OAAO;AAC3C,aAAO,KAAK;AAAA,QACV,MAAM;AAAA,QACN;AAAA,MAAA,CACD;AAED,aAAO,QAAQ,KAAK,MAAM;AAAA,MAAC,CAAC;AAAA,IAC9B;AAAA,IACA,cAAc,CAAC,cAAc;AAC3B,aAAO,OAAO,UAAW,WAAW,YAAY;AAC9C,cAAM,SAAS,MAAM,UAAA;AACrB,eAAO,wBAAwB,iBAAA,CAAkB,GAAG,MAAM;AAAA,MAC5D,CAAC;AAAA,IACH;AAAA,IACA,WAAW,YAAY;AACrB,gBAAU,CAAC,aAAa,+BAA+B;AACvD,UAAI,qBAAqB,OAAO,MAAM;AACtC,UAAI,OAAO,WAAW;AAEpB,6BAAqB,mBAAmB,MAAM,GAAG,CAAC;AAAA,MACpD;AACA,YAAM,UAAU,mBAAmB,IAAI,cAAc;AAErD,YAAM,mBAAqC;AAAA,QACzC,UAAU,OAAO,IAAK;AAAA,QACtB;AAAA,MAAA;AAEF,YAAM,cAAc,mBAAmB,mBAAmB,SAAS,CAAC,GAAG;AACvE,UAAI,aAAa;AACf,yBAAiB,cAAc;AAAA,MACjC;AACA,uBAAiB,iBAAiB,MAAM,OAAO,QAAQ,YAAA;AACvD,oBAAc;AAEd,YAAM,IAAI,wBAAA;AACV,2BAAqB,kBAAkB;AAAA,QACrC,MAAM;AAAA;AAAA,QAEN,SAAS,CAAC,sBAAsB,kBAAkB;AAAA,QAClD,aAAa,CAAC,MAAM,YAAY;AAC9B,gBAAM,aAAa,UAAU,GAAG,UAAU,gBAAgB,OAAO;AACjE,iBAAO,UAAW,aAAa,MAAM,UAAU;AAAA,QACjD;AAAA,QACA,SAAS;AAAA,QACT,QAAQ,MAAM,EAAE,QAAQ,EAAE;AAAA,QAC1B,SAAS,CAAC,QAAQ,EAAE,OAAO,GAAG;AAAA,MAAA,CAC/B;AAED,aAAO,UAAW,WAAW,MAAM,CAAC;AAAA,IACtC;AAAA,IACA,eAAe;AACb,aAAO;AAAA,IACT;AAAA,IACA,kBAAkB,CAAC,aAAa,UAAU,KAAK,QAAQ;AAAA,IACvD,mBAAmB,MAAM;AACvB,gBAAU,QAAQ,CAAC,MAAM,EAAA,CAAG;AAAA,IAC9B;AAAA,EAAA;AAEJ;"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { ReadableStream } from 'node:stream/web';
|
|
2
|
+
import { Readable } from 'node:stream';
|
|
3
|
+
import { AnyRouter } from '../router.js';
|
|
4
|
+
export declare function transformReadableStreamWithRouter(router: AnyRouter, routerStream: ReadableStream): ReadableStream<any>;
|
|
5
|
+
export declare function transformPipeableStreamWithRouter(router: AnyRouter, routerStream: Readable): Readable;
|
|
6
|
+
export declare function transformStreamWithRouter(router: AnyRouter, appStream: ReadableStream): ReadableStream<any>;
|
|
@@ -0,0 +1,183 @@
|
|
|
1
|
+
import { ReadableStream } from "node:stream/web";
|
|
2
|
+
import { Readable } from "node:stream";
|
|
3
|
+
import { createControlledPromise } from "../utils.js";
|
|
4
|
+
function transformReadableStreamWithRouter(router, routerStream) {
|
|
5
|
+
return transformStreamWithRouter(router, routerStream);
|
|
6
|
+
}
|
|
7
|
+
function transformPipeableStreamWithRouter(router, routerStream) {
|
|
8
|
+
return Readable.fromWeb(
|
|
9
|
+
transformStreamWithRouter(router, Readable.toWeb(routerStream))
|
|
10
|
+
);
|
|
11
|
+
}
|
|
12
|
+
const patternBodyStart = /(<body)/;
|
|
13
|
+
const patternBodyEnd = /(<\/body>)/;
|
|
14
|
+
const patternHtmlEnd = /(<\/html>)/;
|
|
15
|
+
const patternHeadStart = /(<head.*?>)/;
|
|
16
|
+
const patternClosingTag = /(<\/[a-zA-Z][\w:.-]*?>)/g;
|
|
17
|
+
const textDecoder = new TextDecoder();
|
|
18
|
+
function createPassthrough() {
|
|
19
|
+
let controller;
|
|
20
|
+
const encoder = new TextEncoder();
|
|
21
|
+
const stream = new ReadableStream({
|
|
22
|
+
start(c) {
|
|
23
|
+
controller = c;
|
|
24
|
+
}
|
|
25
|
+
});
|
|
26
|
+
const res = {
|
|
27
|
+
stream,
|
|
28
|
+
write: (chunk) => {
|
|
29
|
+
controller.enqueue(encoder.encode(chunk));
|
|
30
|
+
},
|
|
31
|
+
end: (chunk) => {
|
|
32
|
+
if (chunk) {
|
|
33
|
+
controller.enqueue(encoder.encode(chunk));
|
|
34
|
+
}
|
|
35
|
+
controller.close();
|
|
36
|
+
res.destroyed = true;
|
|
37
|
+
},
|
|
38
|
+
destroy: (error) => {
|
|
39
|
+
controller.error(error);
|
|
40
|
+
},
|
|
41
|
+
destroyed: false
|
|
42
|
+
};
|
|
43
|
+
return res;
|
|
44
|
+
}
|
|
45
|
+
async function readStream(stream, opts) {
|
|
46
|
+
try {
|
|
47
|
+
const reader = stream.getReader();
|
|
48
|
+
let chunk;
|
|
49
|
+
while (!(chunk = await reader.read()).done) {
|
|
50
|
+
opts.onData?.(chunk);
|
|
51
|
+
}
|
|
52
|
+
opts.onEnd?.();
|
|
53
|
+
} catch (error) {
|
|
54
|
+
opts.onError?.(error);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
function transformStreamWithRouter(router, appStream) {
|
|
58
|
+
const finalPassThrough = createPassthrough();
|
|
59
|
+
let isAppRendering = true;
|
|
60
|
+
let routerStreamBuffer = "";
|
|
61
|
+
let pendingClosingTags = "";
|
|
62
|
+
let bodyStarted = false;
|
|
63
|
+
let headStarted = false;
|
|
64
|
+
let leftover = "";
|
|
65
|
+
let leftoverHtml = "";
|
|
66
|
+
function getBufferedRouterStream() {
|
|
67
|
+
const html = routerStreamBuffer;
|
|
68
|
+
routerStreamBuffer = "";
|
|
69
|
+
return html;
|
|
70
|
+
}
|
|
71
|
+
function decodeChunk(chunk) {
|
|
72
|
+
if (chunk instanceof Uint8Array) {
|
|
73
|
+
return textDecoder.decode(chunk);
|
|
74
|
+
}
|
|
75
|
+
return String(chunk);
|
|
76
|
+
}
|
|
77
|
+
const injectedHtmlDonePromise = createControlledPromise();
|
|
78
|
+
let processingCount = 0;
|
|
79
|
+
router.serverSsr.injectedHtml.forEach((promise) => {
|
|
80
|
+
handleInjectedHtml(promise);
|
|
81
|
+
});
|
|
82
|
+
const stopListeningToInjectedHtml = router.subscribe(
|
|
83
|
+
"onInjectedHtml",
|
|
84
|
+
(e) => {
|
|
85
|
+
handleInjectedHtml(e.promise);
|
|
86
|
+
}
|
|
87
|
+
);
|
|
88
|
+
function handleInjectedHtml(promise) {
|
|
89
|
+
processingCount++;
|
|
90
|
+
promise.then((html) => {
|
|
91
|
+
if (!bodyStarted) {
|
|
92
|
+
routerStreamBuffer += html;
|
|
93
|
+
} else {
|
|
94
|
+
finalPassThrough.write(html);
|
|
95
|
+
}
|
|
96
|
+
}).catch(injectedHtmlDonePromise.reject).finally(() => {
|
|
97
|
+
processingCount--;
|
|
98
|
+
if (!isAppRendering && processingCount === 0) {
|
|
99
|
+
stopListeningToInjectedHtml();
|
|
100
|
+
injectedHtmlDonePromise.resolve();
|
|
101
|
+
}
|
|
102
|
+
});
|
|
103
|
+
}
|
|
104
|
+
injectedHtmlDonePromise.then(() => {
|
|
105
|
+
const finalHtml = leftoverHtml + getBufferedRouterStream() + pendingClosingTags;
|
|
106
|
+
finalPassThrough.end(finalHtml);
|
|
107
|
+
}).catch((err) => {
|
|
108
|
+
console.error("Error reading routerStream:", err);
|
|
109
|
+
finalPassThrough.destroy(err);
|
|
110
|
+
});
|
|
111
|
+
readStream(appStream, {
|
|
112
|
+
onData: (chunk) => {
|
|
113
|
+
const text = decodeChunk(chunk.value);
|
|
114
|
+
let chunkString = leftover + text;
|
|
115
|
+
const bodyEndMatch = chunkString.match(patternBodyEnd);
|
|
116
|
+
const htmlEndMatch = chunkString.match(patternHtmlEnd);
|
|
117
|
+
if (!bodyStarted) {
|
|
118
|
+
const bodyStartMatch = chunkString.match(patternBodyStart);
|
|
119
|
+
if (bodyStartMatch) {
|
|
120
|
+
bodyStarted = true;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
if (!headStarted) {
|
|
124
|
+
const headStartMatch = chunkString.match(patternHeadStart);
|
|
125
|
+
if (headStartMatch) {
|
|
126
|
+
headStarted = true;
|
|
127
|
+
const index = headStartMatch.index;
|
|
128
|
+
const headTag = headStartMatch[0];
|
|
129
|
+
const remaining = chunkString.slice(index + headTag.length);
|
|
130
|
+
finalPassThrough.write(
|
|
131
|
+
chunkString.slice(0, index) + headTag + getBufferedRouterStream()
|
|
132
|
+
);
|
|
133
|
+
chunkString = remaining;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
if (!bodyStarted) {
|
|
137
|
+
finalPassThrough.write(chunkString);
|
|
138
|
+
leftover = "";
|
|
139
|
+
return;
|
|
140
|
+
}
|
|
141
|
+
if (bodyEndMatch && htmlEndMatch && bodyEndMatch.index < htmlEndMatch.index) {
|
|
142
|
+
const bodyEndIndex = bodyEndMatch.index;
|
|
143
|
+
pendingClosingTags = chunkString.slice(bodyEndIndex);
|
|
144
|
+
finalPassThrough.write(
|
|
145
|
+
chunkString.slice(0, bodyEndIndex) + getBufferedRouterStream()
|
|
146
|
+
);
|
|
147
|
+
leftover = "";
|
|
148
|
+
return;
|
|
149
|
+
}
|
|
150
|
+
let result;
|
|
151
|
+
let lastIndex = 0;
|
|
152
|
+
while ((result = patternClosingTag.exec(chunkString)) !== null) {
|
|
153
|
+
lastIndex = result.index + result[0].length;
|
|
154
|
+
}
|
|
155
|
+
if (lastIndex > 0) {
|
|
156
|
+
const processed = chunkString.slice(0, lastIndex) + getBufferedRouterStream() + leftoverHtml;
|
|
157
|
+
finalPassThrough.write(processed);
|
|
158
|
+
leftover = chunkString.slice(lastIndex);
|
|
159
|
+
} else {
|
|
160
|
+
leftover = chunkString;
|
|
161
|
+
leftoverHtml += getBufferedRouterStream();
|
|
162
|
+
}
|
|
163
|
+
},
|
|
164
|
+
onEnd: () => {
|
|
165
|
+
isAppRendering = false;
|
|
166
|
+
router.serverSsr.setRenderFinished();
|
|
167
|
+
if (processingCount === 0) {
|
|
168
|
+
injectedHtmlDonePromise.resolve();
|
|
169
|
+
}
|
|
170
|
+
},
|
|
171
|
+
onError: (error) => {
|
|
172
|
+
console.error("Error reading appStream:", error);
|
|
173
|
+
finalPassThrough.destroy(error);
|
|
174
|
+
}
|
|
175
|
+
});
|
|
176
|
+
return finalPassThrough.stream;
|
|
177
|
+
}
|
|
178
|
+
export {
|
|
179
|
+
transformPipeableStreamWithRouter,
|
|
180
|
+
transformReadableStreamWithRouter,
|
|
181
|
+
transformStreamWithRouter
|
|
182
|
+
};
|
|
183
|
+
//# sourceMappingURL=transformStreamWithRouter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"transformStreamWithRouter.js","sources":["../../../src/ssr/transformStreamWithRouter.ts"],"sourcesContent":["import { ReadableStream } from 'node:stream/web'\nimport { Readable } from 'node:stream'\nimport { createControlledPromise } from '../utils'\nimport type { AnyRouter } from '../router'\n\nexport function transformReadableStreamWithRouter(\n router: AnyRouter,\n routerStream: ReadableStream,\n) {\n return transformStreamWithRouter(router, routerStream)\n}\n\nexport function transformPipeableStreamWithRouter(\n router: AnyRouter,\n routerStream: Readable,\n) {\n return Readable.fromWeb(\n transformStreamWithRouter(router, Readable.toWeb(routerStream)),\n )\n}\n\n// regex pattern for matching closing body and html tags\nconst patternBodyStart = /(<body)/\nconst patternBodyEnd = /(<\\/body>)/\nconst patternHtmlEnd = /(<\\/html>)/\nconst patternHeadStart = /(<head.*?>)/\n// regex pattern for matching closing tags\nconst patternClosingTag = /(<\\/[a-zA-Z][\\w:.-]*?>)/g\n\nconst textDecoder = new TextDecoder()\n\ntype ReadablePassthrough = {\n stream: ReadableStream\n write: (chunk: string) => void\n end: (chunk?: string) => void\n destroy: (error: unknown) => void\n destroyed: boolean\n}\n\nfunction createPassthrough() {\n let controller: ReadableStreamDefaultController<any>\n const encoder = new TextEncoder()\n const stream = new ReadableStream({\n start(c) {\n controller = c\n },\n })\n\n const res: ReadablePassthrough = {\n stream,\n write: (chunk) => {\n controller.enqueue(encoder.encode(chunk))\n },\n end: (chunk) => {\n if (chunk) {\n controller.enqueue(encoder.encode(chunk))\n }\n controller.close()\n res.destroyed = true\n },\n destroy: (error) => {\n controller.error(error)\n },\n destroyed: false,\n }\n\n return res\n}\n\nasync function readStream(\n stream: ReadableStream,\n opts: {\n onData?: (chunk: ReadableStreamReadValueResult<any>) => void\n onEnd?: () => void\n onError?: (error: unknown) => void\n },\n) {\n try {\n const reader = stream.getReader()\n let chunk\n while (!(chunk = await reader.read()).done) {\n opts.onData?.(chunk)\n }\n opts.onEnd?.()\n } catch (error) {\n opts.onError?.(error)\n }\n}\n\nexport function transformStreamWithRouter(\n router: AnyRouter,\n appStream: ReadableStream,\n) {\n const finalPassThrough = createPassthrough()\n\n let isAppRendering = true as boolean\n let routerStreamBuffer = ''\n let pendingClosingTags = ''\n let bodyStarted = false as boolean\n let headStarted = false as boolean\n let leftover = ''\n let leftoverHtml = ''\n\n function getBufferedRouterStream() {\n const html = routerStreamBuffer\n routerStreamBuffer = ''\n return html\n }\n\n function decodeChunk(chunk: unknown): string {\n if (chunk instanceof Uint8Array) {\n return textDecoder.decode(chunk)\n }\n return String(chunk)\n }\n\n const injectedHtmlDonePromise = createControlledPromise<void>()\n\n let processingCount = 0\n\n // Process any already-injected HTML\n router.serverSsr!.injectedHtml.forEach((promise) => {\n handleInjectedHtml(promise)\n })\n\n // Listen for any new injected HTML\n const stopListeningToInjectedHtml = router.subscribe(\n 'onInjectedHtml',\n (e) => {\n handleInjectedHtml(e.promise)\n },\n )\n\n function handleInjectedHtml(promise: Promise<string>) {\n processingCount++\n\n promise\n .then((html) => {\n if (!bodyStarted) {\n routerStreamBuffer += html\n } else {\n finalPassThrough.write(html)\n }\n })\n .catch(injectedHtmlDonePromise.reject)\n .finally(() => {\n processingCount--\n\n if (!isAppRendering && processingCount === 0) {\n stopListeningToInjectedHtml()\n injectedHtmlDonePromise.resolve()\n }\n })\n }\n\n injectedHtmlDonePromise\n .then(() => {\n const finalHtml =\n leftoverHtml + getBufferedRouterStream() + pendingClosingTags\n\n finalPassThrough.end(finalHtml)\n })\n .catch((err) => {\n console.error('Error reading routerStream:', err)\n finalPassThrough.destroy(err)\n })\n\n // Transform the appStream\n readStream(appStream, {\n onData: (chunk) => {\n const text = decodeChunk(chunk.value)\n\n let chunkString = leftover + text\n const bodyEndMatch = chunkString.match(patternBodyEnd)\n const htmlEndMatch = chunkString.match(patternHtmlEnd)\n\n if (!bodyStarted) {\n const bodyStartMatch = chunkString.match(patternBodyStart)\n if (bodyStartMatch) {\n bodyStarted = true\n }\n }\n\n if (!headStarted) {\n const headStartMatch = chunkString.match(patternHeadStart)\n if (headStartMatch) {\n headStarted = true\n const index = headStartMatch.index!\n const headTag = headStartMatch[0]\n const remaining = chunkString.slice(index + headTag.length)\n finalPassThrough.write(\n chunkString.slice(0, index) + headTag + getBufferedRouterStream(),\n )\n // make sure to only write `remaining` until the next closing tag\n chunkString = remaining\n }\n }\n\n if (!bodyStarted) {\n finalPassThrough.write(chunkString)\n leftover = ''\n return\n }\n\n // If either the body end or html end is in the chunk,\n // We need to get all of our data in asap\n if (\n bodyEndMatch &&\n htmlEndMatch &&\n bodyEndMatch.index! < htmlEndMatch.index!\n ) {\n const bodyEndIndex = bodyEndMatch.index!\n pendingClosingTags = chunkString.slice(bodyEndIndex)\n\n finalPassThrough.write(\n chunkString.slice(0, bodyEndIndex) + getBufferedRouterStream(),\n )\n\n leftover = ''\n return\n }\n\n let result: RegExpExecArray | null\n let lastIndex = 0\n while ((result = patternClosingTag.exec(chunkString)) !== null) {\n lastIndex = result.index + result[0].length\n }\n\n if (lastIndex > 0) {\n const processed =\n chunkString.slice(0, lastIndex) +\n getBufferedRouterStream() +\n leftoverHtml\n\n finalPassThrough.write(processed)\n leftover = chunkString.slice(lastIndex)\n } else {\n leftover = chunkString\n leftoverHtml += getBufferedRouterStream()\n }\n },\n onEnd: () => {\n // Mark the app as done rendering\n isAppRendering = false\n router.serverSsr!.setRenderFinished()\n\n // If there are no pending promises, resolve the injectedHtmlDonePromise\n if (processingCount === 0) {\n injectedHtmlDonePromise.resolve()\n }\n },\n onError: (error) => {\n console.error('Error reading appStream:', error)\n finalPassThrough.destroy(error)\n },\n })\n\n return finalPassThrough.stream\n}\n"],"names":[],"mappings":"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"}
|
|
File without changes
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tsrScript.js","sources":["../../../src/ssr/tsrScript.ts?script-string"],"sourcesContent":["self.$_TSR = {\n c: () => {\n document.querySelectorAll('.\\\\$tsr').forEach((o) => {\n o.remove()\n })\n },\n}\n"],"names":[],"mappings":"AAAA,MAAA,6BAAe;"}
|
package/dist/esm/utils.d.ts
CHANGED
|
@@ -86,9 +86,4 @@ export type ControlledPromise<T> = Promise<T> & {
|
|
|
86
86
|
value?: T;
|
|
87
87
|
};
|
|
88
88
|
export declare function createControlledPromise<T>(onResolve?: (value: T) => void): ControlledPromise<T>;
|
|
89
|
-
|
|
90
|
-
*
|
|
91
|
-
* @deprecated use `jsesc` instead
|
|
92
|
-
*/
|
|
93
|
-
export declare function escapeJSON(jsonString: string): string;
|
|
94
|
-
export declare function shallow<T>(objA: T, objB: T): boolean;
|
|
89
|
+
export declare function isModuleNotFoundError(error: any): boolean;
|
package/dist/esm/utils.js
CHANGED
|
@@ -93,10 +93,10 @@ function deepEqual(a, b, opts) {
|
|
|
93
93
|
return false;
|
|
94
94
|
}
|
|
95
95
|
if (isPlainObject(a) && isPlainObject(b)) {
|
|
96
|
-
const ignoreUndefined =
|
|
96
|
+
const ignoreUndefined = opts?.ignoreUndefined ?? true;
|
|
97
97
|
const aKeys = getObjectKeys(a, ignoreUndefined);
|
|
98
98
|
const bKeys = getObjectKeys(b, ignoreUndefined);
|
|
99
|
-
if (!
|
|
99
|
+
if (!opts?.partial && aKeys.length !== bKeys.length) {
|
|
100
100
|
return false;
|
|
101
101
|
}
|
|
102
102
|
return bKeys.every((key) => deepEqual(a[key], b[key], opts));
|
|
@@ -121,7 +121,7 @@ function createControlledPromise(onResolve) {
|
|
|
121
121
|
controlledPromise.status = "resolved";
|
|
122
122
|
controlledPromise.value = value;
|
|
123
123
|
resolveLoadPromise(value);
|
|
124
|
-
onResolve
|
|
124
|
+
onResolve?.(value);
|
|
125
125
|
};
|
|
126
126
|
controlledPromise.reject = (e) => {
|
|
127
127
|
controlledPromise.status = "rejected";
|
|
@@ -129,37 +129,19 @@ function createControlledPromise(onResolve) {
|
|
|
129
129
|
};
|
|
130
130
|
return controlledPromise;
|
|
131
131
|
}
|
|
132
|
-
function
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
function shallow(objA, objB) {
|
|
136
|
-
if (Object.is(objA, objB)) {
|
|
137
|
-
return true;
|
|
138
|
-
}
|
|
139
|
-
if (typeof objA !== "object" || objA === null || typeof objB !== "object" || objB === null) {
|
|
140
|
-
return false;
|
|
141
|
-
}
|
|
142
|
-
const keysA = Object.keys(objA);
|
|
143
|
-
if (keysA.length !== Object.keys(objB).length) {
|
|
144
|
-
return false;
|
|
145
|
-
}
|
|
146
|
-
for (const item of keysA) {
|
|
147
|
-
if (!Object.prototype.hasOwnProperty.call(objB, item) || !Object.is(objA[item], objB[item])) {
|
|
148
|
-
return false;
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
return true;
|
|
132
|
+
function isModuleNotFoundError(error) {
|
|
133
|
+
if (typeof error?.message !== "string") return false;
|
|
134
|
+
return error.message.startsWith("Failed to fetch dynamically imported module") || error.message.startsWith("error loading dynamically imported module") || error.message.startsWith("Importing a module script failed");
|
|
152
135
|
}
|
|
153
136
|
export {
|
|
154
137
|
createControlledPromise,
|
|
155
138
|
deepEqual,
|
|
156
|
-
escapeJSON,
|
|
157
139
|
functionalUpdate,
|
|
140
|
+
isModuleNotFoundError,
|
|
158
141
|
isPlainArray,
|
|
159
142
|
isPlainObject,
|
|
160
143
|
last,
|
|
161
144
|
pick,
|
|
162
|
-
replaceEqualDeep
|
|
163
|
-
shallow
|
|
145
|
+
replaceEqualDeep
|
|
164
146
|
};
|
|
165
147
|
//# sourceMappingURL=utils.js.map
|