@tanstack/router-core 1.121.33 → 1.121.39
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/index.d.cts +1 -1
- package/dist/cjs/router.cjs +5 -0
- package/dist/cjs/router.cjs.map +1 -1
- package/dist/cjs/router.d.cts +2 -2
- package/dist/cjs/scroll-restoration.cjs +1 -1
- package/dist/cjs/scroll-restoration.cjs.map +1 -1
- package/dist/cjs/serializer.cjs +146 -0
- package/dist/cjs/serializer.cjs.map +1 -0
- package/dist/cjs/serializer.d.cts +7 -1
- package/dist/cjs/ssr/client.cjs +12 -0
- package/dist/cjs/ssr/client.cjs.map +1 -0
- package/dist/cjs/ssr/client.d.cts +6 -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/server.cjs +17 -0
- package/dist/cjs/ssr/server.cjs.map +1 -0
- package/dist/cjs/ssr/server.d.cts +8 -0
- package/dist/cjs/ssr/ssr-client.cjs +131 -0
- package/dist/cjs/ssr/ssr-client.cjs.map +1 -0
- package/dist/cjs/ssr/ssr-client.d.cts +68 -0
- package/dist/cjs/ssr/ssr-server.cjs +248 -0
- package/dist/cjs/ssr/ssr-server.cjs.map +1 -0
- package/dist/cjs/ssr/ssr-server.d.cts +32 -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 +1 -0
- package/dist/esm/index.d.ts +1 -1
- package/dist/esm/router.d.ts +2 -2
- package/dist/esm/router.js +5 -0
- package/dist/esm/router.js.map +1 -1
- package/dist/esm/scroll-restoration.js +1 -1
- package/dist/esm/scroll-restoration.js.map +1 -1
- package/dist/esm/serializer.d.ts +7 -1
- package/dist/esm/serializer.js +146 -0
- package/dist/esm/serializer.js.map +1 -0
- package/dist/esm/ssr/client.d.ts +6 -0
- package/dist/esm/ssr/client.js +12 -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/server.d.ts +8 -0
- package/dist/esm/ssr/server.js +17 -0
- package/dist/esm/ssr/server.js.map +1 -0
- package/dist/esm/ssr/ssr-client.d.ts +68 -0
- package/dist/esm/ssr/ssr-client.js +131 -0
- package/dist/esm/ssr/ssr-client.js.map +1 -0
- package/dist/esm/ssr/ssr-server.d.ts +32 -0
- package/dist/esm/ssr/ssr-server.js +248 -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 +1 -0
- package/dist/esm/ssr/tsrScript.js +5 -0
- package/dist/esm/ssr/tsrScript.js.map +1 -0
- package/package.json +29 -2
- package/src/index.ts +1 -0
- package/src/router.ts +8 -5
- package/src/scroll-restoration.ts +1 -1
- package/src/serializer.ts +174 -1
- package/src/ssr/client.ts +15 -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/server.ts +23 -0
- package/src/ssr/ssr-client.ts +244 -0
- package/src/ssr/ssr-server.ts +345 -0
- package/src/ssr/transformStreamWithRouter.ts +258 -0
- package/src/ssr/tsrScript.ts +91 -0
- package/src/vite-env.d.ts +4 -0
|
@@ -0,0 +1,183 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
|
+
const web = require("node:stream/web");
|
|
4
|
+
const node_stream = require("node:stream");
|
|
5
|
+
const utils = require("../utils.cjs");
|
|
6
|
+
function transformReadableStreamWithRouter(router, routerStream) {
|
|
7
|
+
return transformStreamWithRouter(router, routerStream);
|
|
8
|
+
}
|
|
9
|
+
function transformPipeableStreamWithRouter(router, routerStream) {
|
|
10
|
+
return node_stream.Readable.fromWeb(
|
|
11
|
+
transformStreamWithRouter(router, node_stream.Readable.toWeb(routerStream))
|
|
12
|
+
);
|
|
13
|
+
}
|
|
14
|
+
const patternBodyStart = /(<body)/;
|
|
15
|
+
const patternBodyEnd = /(<\/body>)/;
|
|
16
|
+
const patternHtmlEnd = /(<\/html>)/;
|
|
17
|
+
const patternHeadStart = /(<head.*?>)/;
|
|
18
|
+
const patternClosingTag = /(<\/[a-zA-Z][\w:.-]*?>)/g;
|
|
19
|
+
const textDecoder = new TextDecoder();
|
|
20
|
+
function createPassthrough() {
|
|
21
|
+
let controller;
|
|
22
|
+
const encoder = new TextEncoder();
|
|
23
|
+
const stream = new web.ReadableStream({
|
|
24
|
+
start(c) {
|
|
25
|
+
controller = c;
|
|
26
|
+
}
|
|
27
|
+
});
|
|
28
|
+
const res = {
|
|
29
|
+
stream,
|
|
30
|
+
write: (chunk) => {
|
|
31
|
+
controller.enqueue(encoder.encode(chunk));
|
|
32
|
+
},
|
|
33
|
+
end: (chunk) => {
|
|
34
|
+
if (chunk) {
|
|
35
|
+
controller.enqueue(encoder.encode(chunk));
|
|
36
|
+
}
|
|
37
|
+
controller.close();
|
|
38
|
+
res.destroyed = true;
|
|
39
|
+
},
|
|
40
|
+
destroy: (error) => {
|
|
41
|
+
controller.error(error);
|
|
42
|
+
},
|
|
43
|
+
destroyed: false
|
|
44
|
+
};
|
|
45
|
+
return res;
|
|
46
|
+
}
|
|
47
|
+
async function readStream(stream, opts) {
|
|
48
|
+
var _a, _b, _c;
|
|
49
|
+
try {
|
|
50
|
+
const reader = stream.getReader();
|
|
51
|
+
let chunk;
|
|
52
|
+
while (!(chunk = await reader.read()).done) {
|
|
53
|
+
(_a = opts.onData) == null ? void 0 : _a.call(opts, chunk);
|
|
54
|
+
}
|
|
55
|
+
(_b = opts.onEnd) == null ? void 0 : _b.call(opts);
|
|
56
|
+
} catch (error) {
|
|
57
|
+
(_c = opts.onError) == null ? void 0 : _c.call(opts, error);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
function transformStreamWithRouter(router, appStream) {
|
|
61
|
+
const finalPassThrough = createPassthrough();
|
|
62
|
+
let isAppRendering = true;
|
|
63
|
+
let routerStreamBuffer = "";
|
|
64
|
+
let pendingClosingTags = "";
|
|
65
|
+
let bodyStarted = false;
|
|
66
|
+
let headStarted = false;
|
|
67
|
+
let leftover = "";
|
|
68
|
+
let leftoverHtml = "";
|
|
69
|
+
function getBufferedRouterStream() {
|
|
70
|
+
const html = routerStreamBuffer;
|
|
71
|
+
routerStreamBuffer = "";
|
|
72
|
+
return html;
|
|
73
|
+
}
|
|
74
|
+
function decodeChunk(chunk) {
|
|
75
|
+
if (chunk instanceof Uint8Array) {
|
|
76
|
+
return textDecoder.decode(chunk);
|
|
77
|
+
}
|
|
78
|
+
return String(chunk);
|
|
79
|
+
}
|
|
80
|
+
const injectedHtmlDonePromise = utils.createControlledPromise();
|
|
81
|
+
let processingCount = 0;
|
|
82
|
+
router.serverSsr.injectedHtml.forEach((promise) => {
|
|
83
|
+
handleInjectedHtml(promise);
|
|
84
|
+
});
|
|
85
|
+
const stopListeningToInjectedHtml = router.subscribe(
|
|
86
|
+
"onInjectedHtml",
|
|
87
|
+
(e) => {
|
|
88
|
+
handleInjectedHtml(e.promise);
|
|
89
|
+
}
|
|
90
|
+
);
|
|
91
|
+
function handleInjectedHtml(promise) {
|
|
92
|
+
processingCount++;
|
|
93
|
+
promise.then((html) => {
|
|
94
|
+
if (!bodyStarted) {
|
|
95
|
+
routerStreamBuffer += html;
|
|
96
|
+
} else {
|
|
97
|
+
finalPassThrough.write(html);
|
|
98
|
+
}
|
|
99
|
+
}).catch(injectedHtmlDonePromise.reject).finally(() => {
|
|
100
|
+
processingCount--;
|
|
101
|
+
if (!isAppRendering && processingCount === 0) {
|
|
102
|
+
stopListeningToInjectedHtml();
|
|
103
|
+
injectedHtmlDonePromise.resolve();
|
|
104
|
+
}
|
|
105
|
+
});
|
|
106
|
+
}
|
|
107
|
+
injectedHtmlDonePromise.then(() => {
|
|
108
|
+
const finalHtml = leftoverHtml + getBufferedRouterStream() + pendingClosingTags;
|
|
109
|
+
finalPassThrough.end(finalHtml);
|
|
110
|
+
}).catch((err) => {
|
|
111
|
+
console.error("Error reading routerStream:", err);
|
|
112
|
+
finalPassThrough.destroy(err);
|
|
113
|
+
});
|
|
114
|
+
readStream(appStream, {
|
|
115
|
+
onData: (chunk) => {
|
|
116
|
+
const text = decodeChunk(chunk.value);
|
|
117
|
+
let chunkString = leftover + text;
|
|
118
|
+
const bodyEndMatch = chunkString.match(patternBodyEnd);
|
|
119
|
+
const htmlEndMatch = chunkString.match(patternHtmlEnd);
|
|
120
|
+
if (!bodyStarted) {
|
|
121
|
+
const bodyStartMatch = chunkString.match(patternBodyStart);
|
|
122
|
+
if (bodyStartMatch) {
|
|
123
|
+
bodyStarted = true;
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
if (!headStarted) {
|
|
127
|
+
const headStartMatch = chunkString.match(patternHeadStart);
|
|
128
|
+
if (headStartMatch) {
|
|
129
|
+
headStarted = true;
|
|
130
|
+
const index = headStartMatch.index;
|
|
131
|
+
const headTag = headStartMatch[0];
|
|
132
|
+
const remaining = chunkString.slice(index + headTag.length);
|
|
133
|
+
finalPassThrough.write(
|
|
134
|
+
chunkString.slice(0, index) + headTag + getBufferedRouterStream()
|
|
135
|
+
);
|
|
136
|
+
chunkString = remaining;
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
if (!bodyStarted) {
|
|
140
|
+
finalPassThrough.write(chunkString);
|
|
141
|
+
leftover = "";
|
|
142
|
+
return;
|
|
143
|
+
}
|
|
144
|
+
if (bodyEndMatch && htmlEndMatch && bodyEndMatch.index < htmlEndMatch.index) {
|
|
145
|
+
const bodyEndIndex = bodyEndMatch.index;
|
|
146
|
+
pendingClosingTags = chunkString.slice(bodyEndIndex);
|
|
147
|
+
finalPassThrough.write(
|
|
148
|
+
chunkString.slice(0, bodyEndIndex) + getBufferedRouterStream()
|
|
149
|
+
);
|
|
150
|
+
leftover = "";
|
|
151
|
+
return;
|
|
152
|
+
}
|
|
153
|
+
let result;
|
|
154
|
+
let lastIndex = 0;
|
|
155
|
+
while ((result = patternClosingTag.exec(chunkString)) !== null) {
|
|
156
|
+
lastIndex = result.index + result[0].length;
|
|
157
|
+
}
|
|
158
|
+
if (lastIndex > 0) {
|
|
159
|
+
const processed = chunkString.slice(0, lastIndex) + getBufferedRouterStream() + leftoverHtml;
|
|
160
|
+
finalPassThrough.write(processed);
|
|
161
|
+
leftover = chunkString.slice(lastIndex);
|
|
162
|
+
} else {
|
|
163
|
+
leftover = chunkString;
|
|
164
|
+
leftoverHtml += getBufferedRouterStream();
|
|
165
|
+
}
|
|
166
|
+
},
|
|
167
|
+
onEnd: () => {
|
|
168
|
+
isAppRendering = false;
|
|
169
|
+
if (processingCount === 0) {
|
|
170
|
+
injectedHtmlDonePromise.resolve();
|
|
171
|
+
}
|
|
172
|
+
},
|
|
173
|
+
onError: (error) => {
|
|
174
|
+
console.error("Error reading appStream:", error);
|
|
175
|
+
finalPassThrough.destroy(error);
|
|
176
|
+
}
|
|
177
|
+
});
|
|
178
|
+
return finalPassThrough.stream;
|
|
179
|
+
}
|
|
180
|
+
exports.transformPipeableStreamWithRouter = transformPipeableStreamWithRouter;
|
|
181
|
+
exports.transformReadableStreamWithRouter = transformReadableStreamWithRouter;
|
|
182
|
+
exports.transformStreamWithRouter = transformStreamWithRouter;
|
|
183
|
+
//# sourceMappingURL=transformStreamWithRouter.cjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"transformStreamWithRouter.cjs","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\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":["Readable","ReadableStream","createControlledPromise"],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { ReadableStream } from 'node:stream/web';
|
|
2
|
+
import { Readable } from 'node:stream';
|
|
3
|
+
import { AnyRouter } from '../router.cjs';
|
|
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,4 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
const minifiedTsrBootStrapScript = 'const __TSR_SSR__={matches:[],streamedValues:{},initMatch:o=>(__TSR_SSR__.matches.push(o),o.extracted?.forEach(l=>{if(l.type==="stream"){let r;l.value=new ReadableStream({start(e){r={enqueue:t=>{try{e.enqueue(t)}catch{}},close:()=>{try{e.close()}catch{}}}}}),l.value.controller=r}else{let r,e;l.value=new Promise((t,n)=>{e=n,r=t}),l.value.reject=e,l.value.resolve=r}}),!0),resolvePromise:({matchId:o,id:l,promiseState:r})=>{const e=__TSR_SSR__.matches.find(t=>t.id===o);if(e){const t=e.extracted?.[l];if(t&&t.type==="promise"&&t.value&&r.status==="success")return t.value.resolve(r.data),!0}return!1},injectChunk:({matchId:o,id:l,chunk:r})=>{const e=__TSR_SSR__.matches.find(t=>t.id===o);if(e){const t=e.extracted?.[l];if(t&&t.type==="stream"&&t.value?.controller)return t.value.controller.enqueue(new TextEncoder().encode(r.toString())),!0}return!1},closeStream:({matchId:o,id:l})=>{const r=__TSR_SSR__.matches.find(e=>e.id===o);if(r){const e=r.extracted?.[l];if(e&&e.type==="stream"&&e.value?.controller)return e.value.controller.close(),!0}return!1},cleanScripts:()=>{document.querySelectorAll(".tsr-once").forEach(o=>{o.remove()})}};window.__TSR_SSR__=__TSR_SSR__;\n';
|
|
3
|
+
module.exports = minifiedTsrBootStrapScript;
|
|
4
|
+
//# sourceMappingURL=tsrScript.cjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tsrScript.cjs","sources":["../../../src/ssr/tsrScript.ts?script-string"],"sourcesContent":["import type { ControllablePromise } from '../router'\nimport type { TsrSsrGlobal } from './ssr-client'\n\nconst __TSR_SSR__: TsrSsrGlobal = {\n matches: [],\n streamedValues: {},\n initMatch: (match) => {\n __TSR_SSR__.matches.push(match)\n\n match.extracted?.forEach((ex) => {\n if (ex.type === 'stream') {\n let controller\n ex.value = new ReadableStream({\n start(c) {\n controller = {\n enqueue: (chunk: unknown) => {\n try {\n c.enqueue(chunk)\n } catch {}\n },\n close: () => {\n try {\n c.close()\n } catch {}\n },\n }\n },\n })\n ex.value.controller = controller\n } else {\n let resolve: ControllablePromise['reject'] | undefined\n let reject: ControllablePromise['reject'] | undefined\n\n ex.value = new Promise((_resolve, _reject) => {\n reject = _reject\n resolve = _resolve\n }) as ControllablePromise\n ex.value.reject = reject!\n ex.value.resolve = resolve!\n }\n })\n\n return true\n },\n resolvePromise: ({ matchId, id, promiseState }) => {\n const match = __TSR_SSR__.matches.find((m) => m.id === matchId)\n if (match) {\n const ex = match.extracted?.[id]\n if (\n ex &&\n ex.type === 'promise' &&\n ex.value &&\n promiseState.status === 'success'\n ) {\n ex.value.resolve(promiseState.data)\n return true\n }\n }\n return false\n },\n injectChunk: ({ matchId, id, chunk }) => {\n const match = __TSR_SSR__.matches.find((m) => m.id === matchId)\n\n if (match) {\n const ex = match.extracted?.[id]\n if (ex && ex.type === 'stream' && ex.value?.controller) {\n ex.value.controller.enqueue(new TextEncoder().encode(chunk.toString()))\n return true\n }\n }\n return false\n },\n closeStream: ({ matchId, id }) => {\n const match = __TSR_SSR__.matches.find((m) => m.id === matchId)\n if (match) {\n const ex = match.extracted?.[id]\n if (ex && ex.type === 'stream' && ex.value?.controller) {\n ex.value.controller.close()\n return true\n }\n }\n return false\n },\n cleanScripts: () => {\n document.querySelectorAll('.tsr-once').forEach((el) => {\n el.remove()\n })\n },\n}\n\nwindow.__TSR_SSR__ = __TSR_SSR__\n"],"names":[],"mappings":";AAAA,MAAA,6BAAe;;"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
package/dist/esm/index.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ export { preloadWarning } from './link.js';
|
|
|
4
4
|
export type { IsRequiredParams, AddTrailingSlash, RemoveTrailingSlashes, AddLeadingSlash, RemoveLeadingSlashes, ActiveOptions, LinkOptionsProps, ResolveCurrentPath, ResolveParentPath, ResolveRelativePath, LinkCurrentTargetElement, FindDescendantToPaths, InferDescendantToPaths, RelativeToPath, RelativeToParentPath, RelativeToCurrentPath, AbsoluteToPath, RelativeToPathAutoComplete, NavigateOptions, ToOptions, ToMaskOptions, ToSubOptions, ResolveRoute, SearchParamOptions, PathParamOptions, ToPathOption, LinkOptions, MakeOptionalPathParams, FromPathOption, MakeOptionalSearchParams, MaskOptions, ToSubOptionsProps, RequiredToOptions, } from './link.js';
|
|
5
5
|
export type { RouteToPath, TrailingSlashOptionByRouter, ParseRoute, CodeRouteToPath, RouteIds, FullSearchSchema, FullSearchSchemaInput, AllParams, RouteById, AllContext, RoutePaths, RoutesById, RoutesByPath, AllLoaderData, RouteByPath, } from './routeInfo.js';
|
|
6
6
|
export type { InferFileRouteTypes, FileRouteTypes, FileRoutesByPath, CreateFileRoute, LazyRoute, LazyRouteOptions, CreateLazyFileRoute, } from './fileRoute.js';
|
|
7
|
-
export type { StartSerializer, Serializable, SerializerParse, SerializerParseBy, SerializerStringify, SerializerStringifyBy, SerializerExtensions, } from './serializer.js';
|
|
7
|
+
export type { TsrSerializer, StartSerializer, Serializable, SerializerParse, SerializerParseBy, SerializerStringify, SerializerStringifyBy, SerializerExtensions, } from './serializer.js';
|
|
8
8
|
export type { ParsedLocation } from './location.js';
|
|
9
9
|
export type { Manifest, RouterManagedTag } from './manifest.js';
|
|
10
10
|
export { isMatch } from './Matches.js';
|
package/dist/esm/router.d.ts
CHANGED
|
@@ -10,7 +10,7 @@ import { FullSearchSchema, RouteById, RoutePaths, RoutesById, RoutesByPath } fro
|
|
|
10
10
|
import { AnyRouteMatch, MakeRouteMatch, MakeRouteMatchUnion, MatchRouteOptions } from './Matches.js';
|
|
11
11
|
import { BuildLocationFn, CommitLocationOptions, NavigateFn } from './RouterProvider.js';
|
|
12
12
|
import { Manifest } from './manifest.js';
|
|
13
|
-
import {
|
|
13
|
+
import { TsrSerializer } from './serializer.js';
|
|
14
14
|
import { AnySchema } from './validators.js';
|
|
15
15
|
import { NavigateOptions, ResolveRelativePath, ToOptions } from './link.js';
|
|
16
16
|
import { NotFoundError } from './not-found.js';
|
|
@@ -560,7 +560,7 @@ export declare class RouterCore<in out TRouteTree extends AnyRoute, in out TTrai
|
|
|
560
560
|
matchRoute: MatchRouteFn<TRouteTree, TTrailingSlashOption, TDefaultStructuralSharingOption, TRouterHistory>;
|
|
561
561
|
ssr?: {
|
|
562
562
|
manifest: Manifest | undefined;
|
|
563
|
-
serializer:
|
|
563
|
+
serializer: TsrSerializer;
|
|
564
564
|
};
|
|
565
565
|
serverSsr?: {
|
|
566
566
|
injectedHtml: Array<InjectedHtmlEntry>;
|
package/dist/esm/router.js
CHANGED
|
@@ -167,6 +167,7 @@ class RouterCore {
|
|
|
167
167
|
if (__tempLocation && (!__tempKey || __tempKey === this.tempLocationKey)) {
|
|
168
168
|
const parsedTempLocation = parse(__tempLocation);
|
|
169
169
|
parsedTempLocation.state.key = location.state.key;
|
|
170
|
+
parsedTempLocation.state.__TSR_key = location.state.__TSR_key;
|
|
170
171
|
delete parsedTempLocation.state.__tempLocation;
|
|
171
172
|
return {
|
|
172
173
|
...parsedTempLocation,
|
|
@@ -360,6 +361,8 @@ class RouterCore {
|
|
|
360
361
|
const isSameState = () => {
|
|
361
362
|
const ignoredProps = [
|
|
362
363
|
"key",
|
|
364
|
+
// TODO: Remove in v2 - use __TSR_key instead
|
|
365
|
+
"__TSR_key",
|
|
363
366
|
"__TSR_index",
|
|
364
367
|
"__hashScrollIntoViewOptions"
|
|
365
368
|
];
|
|
@@ -394,7 +397,9 @@ class RouterCore {
|
|
|
394
397
|
...nextHistory.state,
|
|
395
398
|
__tempKey: void 0,
|
|
396
399
|
__tempLocation: void 0,
|
|
400
|
+
__TSR_key: void 0,
|
|
397
401
|
key: void 0
|
|
402
|
+
// TODO: Remove in v2 - use __TSR_key instead
|
|
398
403
|
}
|
|
399
404
|
}
|
|
400
405
|
}
|