@tanstack/start-client-core 1.121.34 → 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/createServerFn.cjs +6 -7
- package/dist/cjs/createServerFn.cjs.map +1 -1
- package/dist/cjs/createServerFn.d.cts +1 -3
- package/dist/cjs/index.cjs +17 -8
- package/dist/cjs/index.cjs.map +1 -1
- package/dist/cjs/index.d.cts +3 -5
- package/dist/esm/createServerFn.d.ts +1 -3
- package/dist/esm/createServerFn.js +5 -6
- package/dist/esm/createServerFn.js.map +1 -1
- package/dist/esm/index.d.ts +3 -5
- package/dist/esm/index.js +2 -5
- package/dist/esm/index.js.map +1 -1
- package/package.json +2 -2
- package/src/createServerFn.ts +7 -10
- package/src/index.tsx +18 -13
- package/dist/cjs/headers.cjs +0 -30
- package/dist/cjs/headers.cjs.map +0 -1
- package/dist/cjs/headers.d.cts +0 -5
- package/dist/cjs/json.cjs +0 -14
- package/dist/cjs/json.cjs.map +0 -1
- package/dist/cjs/json.d.cts +0 -2
- package/dist/cjs/serializer.cjs +0 -152
- package/dist/cjs/serializer.cjs.map +0 -1
- package/dist/cjs/serializer.d.cts +0 -2
- package/dist/cjs/ssr-client.cjs +0 -131
- package/dist/cjs/ssr-client.cjs.map +0 -1
- package/dist/cjs/ssr-client.d.cts +0 -65
- package/dist/cjs/tests/json.test.d.cts +0 -1
- package/dist/cjs/tests/transformer.test.d.cts +0 -1
- package/dist/esm/headers.d.ts +0 -5
- package/dist/esm/headers.js +0 -30
- package/dist/esm/headers.js.map +0 -1
- package/dist/esm/json.d.ts +0 -2
- package/dist/esm/json.js +0 -14
- package/dist/esm/json.js.map +0 -1
- package/dist/esm/serializer.d.ts +0 -2
- package/dist/esm/serializer.js +0 -152
- package/dist/esm/serializer.js.map +0 -1
- package/dist/esm/ssr-client.d.ts +0 -65
- package/dist/esm/ssr-client.js +0 -131
- package/dist/esm/ssr-client.js.map +0 -1
- package/dist/esm/tests/json.test.d.ts +0 -1
- package/dist/esm/tests/transformer.test.d.ts +0 -1
- package/src/headers.ts +0 -50
- package/src/json.ts +0 -15
- package/src/serializer.ts +0 -177
- package/src/ssr-client.tsx +0 -249
- package/src/tests/json.test.ts +0 -37
- package/src/tests/transformer.test.tsx +0 -147
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tanstack/start-client-core",
|
|
3
|
-
"version": "1.121.
|
|
3
|
+
"version": "1.121.39",
|
|
4
4
|
"description": "Modern and scalable routing for React applications",
|
|
5
5
|
"author": "Tanner Linsley",
|
|
6
6
|
"license": "MIT",
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
"cookie-es": "^1.2.2",
|
|
51
51
|
"tiny-invariant": "^1.3.3",
|
|
52
52
|
"tiny-warning": "^1.0.3",
|
|
53
|
-
"@tanstack/router-core": "1.121.
|
|
53
|
+
"@tanstack/router-core": "1.121.39"
|
|
54
54
|
},
|
|
55
55
|
"scripts": {}
|
|
56
56
|
}
|
package/src/createServerFn.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { default as invariant } from 'tiny-invariant'
|
|
2
2
|
import { default as warning } from 'tiny-warning'
|
|
3
3
|
import { isNotFound, isRedirect } from '@tanstack/router-core'
|
|
4
|
-
import {
|
|
5
|
-
import { mergeHeaders } from './headers'
|
|
4
|
+
import { mergeHeaders, tsrSerializer } from '@tanstack/router-core/ssr/client'
|
|
6
5
|
import { globalMiddleware } from './registerGlobalMiddleware'
|
|
6
|
+
|
|
7
7
|
import type {
|
|
8
8
|
AnyValidator,
|
|
9
9
|
Constrain,
|
|
@@ -14,6 +14,7 @@ import type {
|
|
|
14
14
|
SerializerStringifyBy,
|
|
15
15
|
Validator,
|
|
16
16
|
} from '@tanstack/router-core'
|
|
17
|
+
import type { JsonResponse } from '@tanstack/router-core/ssr/client'
|
|
17
18
|
import type { Readable } from 'node:stream'
|
|
18
19
|
import type {
|
|
19
20
|
AnyFunctionMiddleware,
|
|
@@ -278,10 +279,6 @@ export async function executeMiddleware(
|
|
|
278
279
|
})
|
|
279
280
|
}
|
|
280
281
|
|
|
281
|
-
export interface JsonResponse<TData> extends Response {
|
|
282
|
-
json: () => Promise<TData>
|
|
283
|
-
}
|
|
284
|
-
|
|
285
282
|
export type CompiledFetcherFnOptions = {
|
|
286
283
|
method: Method
|
|
287
284
|
data: unknown
|
|
@@ -740,7 +737,7 @@ setServerFnStaticCache(() => {
|
|
|
740
737
|
const [cachedResult, readError] = await fs
|
|
741
738
|
.readFile(filePath, 'utf-8')
|
|
742
739
|
.then((c) => [
|
|
743
|
-
|
|
740
|
+
tsrSerializer.parse(c) as {
|
|
744
741
|
ctx: unknown
|
|
745
742
|
error: any
|
|
746
743
|
},
|
|
@@ -770,7 +767,7 @@ setServerFnStaticCache(() => {
|
|
|
770
767
|
await fs.mkdir(path.dirname(filePath), { recursive: true })
|
|
771
768
|
|
|
772
769
|
// Store the result with fs
|
|
773
|
-
await fs.writeFile(filePath,
|
|
770
|
+
await fs.writeFile(filePath, tsrSerializer.stringify(response))
|
|
774
771
|
},
|
|
775
772
|
fetchItem: async (ctx) => {
|
|
776
773
|
const hash = jsonToFilenameSafeString(ctx.data)
|
|
@@ -783,7 +780,7 @@ setServerFnStaticCache(() => {
|
|
|
783
780
|
method: 'GET',
|
|
784
781
|
})
|
|
785
782
|
.then((r) => r.text())
|
|
786
|
-
.then((d) =>
|
|
783
|
+
.then((d) => tsrSerializer.parse(d))
|
|
787
784
|
|
|
788
785
|
staticClientCache?.set(url, result)
|
|
789
786
|
}
|
|
@@ -805,7 +802,7 @@ export function extractFormDataContext(formData: FormData) {
|
|
|
805
802
|
}
|
|
806
803
|
|
|
807
804
|
try {
|
|
808
|
-
const context =
|
|
805
|
+
const context = tsrSerializer.parse(serializedContext)
|
|
809
806
|
return {
|
|
810
807
|
context,
|
|
811
808
|
data: formData,
|
package/src/index.tsx
CHANGED
|
@@ -1,16 +1,22 @@
|
|
|
1
|
-
export {
|
|
2
|
-
|
|
1
|
+
export type {
|
|
2
|
+
DehydratedRouter,
|
|
3
|
+
ClientExtractedBaseEntry,
|
|
4
|
+
TsrSsrGlobal as StartSsrGlobal,
|
|
5
|
+
ClientExtractedEntry,
|
|
6
|
+
JsonResponse,
|
|
7
|
+
SsrMatch,
|
|
8
|
+
ClientExtractedPromise,
|
|
9
|
+
ClientExtractedStream,
|
|
10
|
+
ResolvePromiseState,
|
|
11
|
+
} from '@tanstack/router-core/ssr/client'
|
|
12
|
+
|
|
3
13
|
export {
|
|
4
|
-
type DehydratedRouter,
|
|
5
|
-
type ClientExtractedBaseEntry,
|
|
6
|
-
type StartSsrGlobal,
|
|
7
|
-
type ClientExtractedEntry,
|
|
8
|
-
type SsrMatch,
|
|
9
|
-
type ClientExtractedPromise,
|
|
10
|
-
type ClientExtractedStream,
|
|
11
|
-
type ResolvePromiseState,
|
|
12
14
|
hydrate,
|
|
13
|
-
|
|
15
|
+
json,
|
|
16
|
+
mergeHeaders,
|
|
17
|
+
tsrSerializer as startSerializer,
|
|
18
|
+
} from '@tanstack/router-core/ssr/client'
|
|
19
|
+
|
|
14
20
|
export {
|
|
15
21
|
createIsomorphicFn,
|
|
16
22
|
type IsomorphicFn,
|
|
@@ -19,8 +25,7 @@ export {
|
|
|
19
25
|
type IsomorphicFnBase,
|
|
20
26
|
} from './createIsomorphicFn'
|
|
21
27
|
export { serverOnly, clientOnly } from './envOnly'
|
|
22
|
-
export {
|
|
23
|
-
export { json } from './json'
|
|
28
|
+
export { createServerFn } from './createServerFn'
|
|
24
29
|
export {
|
|
25
30
|
createMiddleware,
|
|
26
31
|
type IntersectAllValidatorInputs,
|
package/dist/cjs/headers.cjs
DELETED
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
|
-
const cookieEs = require("cookie-es");
|
|
4
|
-
function toHeadersInstance(init) {
|
|
5
|
-
if (init instanceof Headers) {
|
|
6
|
-
return new Headers(init);
|
|
7
|
-
} else if (Array.isArray(init)) {
|
|
8
|
-
return new Headers(init);
|
|
9
|
-
} else if (typeof init === "object") {
|
|
10
|
-
return new Headers(init);
|
|
11
|
-
} else {
|
|
12
|
-
return new Headers();
|
|
13
|
-
}
|
|
14
|
-
}
|
|
15
|
-
function mergeHeaders(...headers) {
|
|
16
|
-
return headers.reduce((acc, header) => {
|
|
17
|
-
const headersInstance = toHeadersInstance(header);
|
|
18
|
-
for (const [key, value] of headersInstance.entries()) {
|
|
19
|
-
if (key === "set-cookie") {
|
|
20
|
-
const splitCookies = cookieEs.splitSetCookieString(value);
|
|
21
|
-
splitCookies.forEach((cookie) => acc.append("set-cookie", cookie));
|
|
22
|
-
} else {
|
|
23
|
-
acc.set(key, value);
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
return acc;
|
|
27
|
-
}, new Headers());
|
|
28
|
-
}
|
|
29
|
-
exports.mergeHeaders = mergeHeaders;
|
|
30
|
-
//# sourceMappingURL=headers.cjs.map
|
package/dist/cjs/headers.cjs.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"headers.cjs","sources":["../../src/headers.ts"],"sourcesContent":["import { splitSetCookieString } from 'cookie-es'\nimport type { OutgoingHttpHeaders } from 'node:http2'\n// A utility function to turn HeadersInit into an object\nexport function headersInitToObject(\n headers: HeadersInit,\n): Record<keyof OutgoingHttpHeaders, string> {\n const obj: Record<keyof OutgoingHttpHeaders, string> = {}\n const headersInstance = new Headers(headers)\n for (const [key, value] of headersInstance.entries()) {\n obj[key] = value\n }\n return obj\n}\n\ntype AnyHeaders =\n | Headers\n | HeadersInit\n | Record<string, string>\n | Array<[string, string]>\n | OutgoingHttpHeaders\n | undefined\n\n// Helper function to convert various HeaderInit types to a Headers instance\nfunction toHeadersInstance(init: AnyHeaders) {\n if (init instanceof Headers) {\n return new Headers(init)\n } else if (Array.isArray(init)) {\n return new Headers(init)\n } else if (typeof init === 'object') {\n return new Headers(init as HeadersInit)\n } else {\n return new Headers()\n }\n}\n\n// Function to merge headers with proper overrides\nexport function mergeHeaders(...headers: Array<AnyHeaders>) {\n return headers.reduce((acc: Headers, header) => {\n const headersInstance = toHeadersInstance(header)\n for (const [key, value] of headersInstance.entries()) {\n if (key === 'set-cookie') {\n const splitCookies = splitSetCookieString(value)\n splitCookies.forEach((cookie) => acc.append('set-cookie', cookie))\n } else {\n acc.set(key, value)\n }\n }\n return acc\n }, new Headers())\n}\n"],"names":["splitSetCookieString"],"mappings":";;;AAuBA,SAAS,kBAAkB,MAAkB;AAC3C,MAAI,gBAAgB,SAAS;AACpB,WAAA,IAAI,QAAQ,IAAI;AAAA,EACd,WAAA,MAAM,QAAQ,IAAI,GAAG;AACvB,WAAA,IAAI,QAAQ,IAAI;AAAA,EAAA,WACd,OAAO,SAAS,UAAU;AAC5B,WAAA,IAAI,QAAQ,IAAmB;AAAA,EAAA,OACjC;AACL,WAAO,IAAI,QAAQ;AAAA,EAAA;AAEvB;AAGO,SAAS,gBAAgB,SAA4B;AAC1D,SAAO,QAAQ,OAAO,CAAC,KAAc,WAAW;AACxC,UAAA,kBAAkB,kBAAkB,MAAM;AAChD,eAAW,CAAC,KAAK,KAAK,KAAK,gBAAgB,WAAW;AACpD,UAAI,QAAQ,cAAc;AAClB,cAAA,eAAeA,8BAAqB,KAAK;AAC/C,qBAAa,QAAQ,CAAC,WAAW,IAAI,OAAO,cAAc,MAAM,CAAC;AAAA,MAAA,OAC5D;AACD,YAAA,IAAI,KAAK,KAAK;AAAA,MAAA;AAAA,IACpB;AAEK,WAAA;AAAA,EAAA,GACN,IAAI,QAAA,CAAS;AAClB;;"}
|
package/dist/cjs/headers.d.cts
DELETED
|
@@ -1,5 +0,0 @@
|
|
|
1
|
-
import { OutgoingHttpHeaders } from 'node:http2';
|
|
2
|
-
export declare function headersInitToObject(headers: HeadersInit): Record<keyof OutgoingHttpHeaders, string>;
|
|
3
|
-
type AnyHeaders = Headers | HeadersInit | Record<string, string> | Array<[string, string]> | OutgoingHttpHeaders | undefined;
|
|
4
|
-
export declare function mergeHeaders(...headers: Array<AnyHeaders>): Headers;
|
|
5
|
-
export {};
|
package/dist/cjs/json.cjs
DELETED
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
|
-
const headers = require("./headers.cjs");
|
|
4
|
-
function json(payload, init) {
|
|
5
|
-
return new Response(JSON.stringify(payload), {
|
|
6
|
-
...init,
|
|
7
|
-
headers: headers.mergeHeaders(
|
|
8
|
-
{ "content-type": "application/json" },
|
|
9
|
-
init == null ? void 0 : init.headers
|
|
10
|
-
)
|
|
11
|
-
});
|
|
12
|
-
}
|
|
13
|
-
exports.json = json;
|
|
14
|
-
//# sourceMappingURL=json.cjs.map
|
package/dist/cjs/json.cjs.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"json.cjs","sources":["../../src/json.ts"],"sourcesContent":["import { mergeHeaders } from './headers'\nimport type { JsonResponse } from './createServerFn'\n\nexport function json<TData>(\n payload: TData,\n init?: ResponseInit,\n): JsonResponse<TData> {\n return new Response(JSON.stringify(payload), {\n ...init,\n headers: mergeHeaders(\n { 'content-type': 'application/json' },\n init?.headers,\n ),\n })\n}\n"],"names":["mergeHeaders"],"mappings":";;;AAGgB,SAAA,KACd,SACA,MACqB;AACrB,SAAO,IAAI,SAAS,KAAK,UAAU,OAAO,GAAG;AAAA,IAC3C,GAAG;AAAA,IACH,SAASA,QAAA;AAAA,MACP,EAAE,gBAAgB,mBAAmB;AAAA,MACrC,6BAAM;AAAA,IAAA;AAAA,EACR,CACD;AACH;;"}
|
package/dist/cjs/json.d.cts
DELETED
package/dist/cjs/serializer.cjs
DELETED
|
@@ -1,152 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
|
-
const routerCore = require("@tanstack/router-core");
|
|
4
|
-
const startSerializer = {
|
|
5
|
-
stringify: (value) => JSON.stringify(value, function replacer(key, val) {
|
|
6
|
-
const ogVal = this[key];
|
|
7
|
-
const serializer = serializers.find((t) => t.stringifyCondition(ogVal));
|
|
8
|
-
if (serializer) {
|
|
9
|
-
return serializer.stringify(ogVal);
|
|
10
|
-
}
|
|
11
|
-
return val;
|
|
12
|
-
}),
|
|
13
|
-
parse: (value) => JSON.parse(value, function parser(key, val) {
|
|
14
|
-
const ogVal = this[key];
|
|
15
|
-
if (routerCore.isPlainObject(ogVal)) {
|
|
16
|
-
const serializer = serializers.find((t) => t.parseCondition(ogVal));
|
|
17
|
-
if (serializer) {
|
|
18
|
-
return serializer.parse(ogVal);
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
return val;
|
|
22
|
-
}),
|
|
23
|
-
encode: (value) => {
|
|
24
|
-
if (Array.isArray(value)) {
|
|
25
|
-
return value.map((v) => startSerializer.encode(v));
|
|
26
|
-
}
|
|
27
|
-
if (routerCore.isPlainObject(value)) {
|
|
28
|
-
return Object.fromEntries(
|
|
29
|
-
Object.entries(value).map(([key, v]) => [
|
|
30
|
-
key,
|
|
31
|
-
startSerializer.encode(v)
|
|
32
|
-
])
|
|
33
|
-
);
|
|
34
|
-
}
|
|
35
|
-
const serializer = serializers.find((t) => t.stringifyCondition(value));
|
|
36
|
-
if (serializer) {
|
|
37
|
-
return serializer.stringify(value);
|
|
38
|
-
}
|
|
39
|
-
return value;
|
|
40
|
-
},
|
|
41
|
-
decode: (value) => {
|
|
42
|
-
if (routerCore.isPlainObject(value)) {
|
|
43
|
-
const serializer = serializers.find((t) => t.parseCondition(value));
|
|
44
|
-
if (serializer) {
|
|
45
|
-
return serializer.parse(value);
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
if (Array.isArray(value)) {
|
|
49
|
-
return value.map((v) => startSerializer.decode(v));
|
|
50
|
-
}
|
|
51
|
-
if (routerCore.isPlainObject(value)) {
|
|
52
|
-
return Object.fromEntries(
|
|
53
|
-
Object.entries(value).map(([key, v]) => [
|
|
54
|
-
key,
|
|
55
|
-
startSerializer.decode(v)
|
|
56
|
-
])
|
|
57
|
-
);
|
|
58
|
-
}
|
|
59
|
-
return value;
|
|
60
|
-
}
|
|
61
|
-
};
|
|
62
|
-
const createSerializer = (key, check, toValue, fromValue) => ({
|
|
63
|
-
key,
|
|
64
|
-
stringifyCondition: check,
|
|
65
|
-
stringify: (value) => ({ [`$${key}`]: toValue(value) }),
|
|
66
|
-
parseCondition: (value) => Object.hasOwn(value, `$${key}`),
|
|
67
|
-
parse: (value) => fromValue(value[`$${key}`])
|
|
68
|
-
});
|
|
69
|
-
const serializers = [
|
|
70
|
-
createSerializer(
|
|
71
|
-
// Key
|
|
72
|
-
"undefined",
|
|
73
|
-
// Check
|
|
74
|
-
(v) => v === void 0,
|
|
75
|
-
// To
|
|
76
|
-
() => 0,
|
|
77
|
-
// From
|
|
78
|
-
() => void 0
|
|
79
|
-
),
|
|
80
|
-
createSerializer(
|
|
81
|
-
// Key
|
|
82
|
-
"date",
|
|
83
|
-
// Check
|
|
84
|
-
(v) => v instanceof Date,
|
|
85
|
-
// To
|
|
86
|
-
(v) => v.toISOString(),
|
|
87
|
-
// From
|
|
88
|
-
(v) => new Date(v)
|
|
89
|
-
),
|
|
90
|
-
createSerializer(
|
|
91
|
-
// Key
|
|
92
|
-
"error",
|
|
93
|
-
// Check
|
|
94
|
-
(v) => v instanceof Error,
|
|
95
|
-
// To
|
|
96
|
-
(v) => ({
|
|
97
|
-
...v,
|
|
98
|
-
message: v.message,
|
|
99
|
-
stack: process.env.NODE_ENV === "development" ? v.stack : void 0,
|
|
100
|
-
cause: v.cause
|
|
101
|
-
}),
|
|
102
|
-
// From
|
|
103
|
-
(v) => Object.assign(new Error(v.message), v)
|
|
104
|
-
),
|
|
105
|
-
createSerializer(
|
|
106
|
-
// Key
|
|
107
|
-
"formData",
|
|
108
|
-
// Check
|
|
109
|
-
(v) => v instanceof FormData,
|
|
110
|
-
// To
|
|
111
|
-
(v) => {
|
|
112
|
-
const entries = {};
|
|
113
|
-
v.forEach((value, key) => {
|
|
114
|
-
const entry = entries[key];
|
|
115
|
-
if (entry !== void 0) {
|
|
116
|
-
if (Array.isArray(entry)) {
|
|
117
|
-
entry.push(value);
|
|
118
|
-
} else {
|
|
119
|
-
entries[key] = [entry, value];
|
|
120
|
-
}
|
|
121
|
-
} else {
|
|
122
|
-
entries[key] = value;
|
|
123
|
-
}
|
|
124
|
-
});
|
|
125
|
-
return entries;
|
|
126
|
-
},
|
|
127
|
-
// From
|
|
128
|
-
(v) => {
|
|
129
|
-
const formData = new FormData();
|
|
130
|
-
Object.entries(v).forEach(([key, value]) => {
|
|
131
|
-
if (Array.isArray(value)) {
|
|
132
|
-
value.forEach((val) => formData.append(key, val));
|
|
133
|
-
} else {
|
|
134
|
-
formData.append(key, value);
|
|
135
|
-
}
|
|
136
|
-
});
|
|
137
|
-
return formData;
|
|
138
|
-
}
|
|
139
|
-
),
|
|
140
|
-
createSerializer(
|
|
141
|
-
// Key
|
|
142
|
-
"bigint",
|
|
143
|
-
// Check
|
|
144
|
-
(v) => typeof v === "bigint",
|
|
145
|
-
// To
|
|
146
|
-
(v) => v.toString(),
|
|
147
|
-
// From
|
|
148
|
-
(v) => BigInt(v)
|
|
149
|
-
)
|
|
150
|
-
];
|
|
151
|
-
exports.startSerializer = startSerializer;
|
|
152
|
-
//# sourceMappingURL=serializer.cjs.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"serializer.cjs","sources":["../../src/serializer.ts"],"sourcesContent":["import { isPlainObject } from '@tanstack/router-core'\nimport type { StartSerializer } from '@tanstack/router-core'\n\nexport const startSerializer: StartSerializer = {\n stringify: (value: any) =>\n JSON.stringify(value, function replacer(key, val) {\n const ogVal = this[key]\n const serializer = serializers.find((t) => t.stringifyCondition(ogVal))\n\n if (serializer) {\n return serializer.stringify(ogVal)\n }\n\n return val\n }),\n parse: (value: string) =>\n JSON.parse(value, function parser(key, val) {\n const ogVal = this[key]\n if (isPlainObject(ogVal)) {\n const serializer = serializers.find((t) => t.parseCondition(ogVal))\n\n if (serializer) {\n return serializer.parse(ogVal)\n }\n }\n\n return val\n }),\n encode: (value: any) => {\n // When encoding, dive first\n if (Array.isArray(value)) {\n return value.map((v) => startSerializer.encode(v))\n }\n\n if (isPlainObject(value)) {\n return Object.fromEntries(\n Object.entries(value).map(([key, v]) => [\n key,\n startSerializer.encode(v),\n ]),\n )\n }\n\n const serializer = serializers.find((t) => t.stringifyCondition(value))\n if (serializer) {\n return serializer.stringify(value)\n }\n\n return value\n },\n decode: (value: any) => {\n // Attempt transform first\n if (isPlainObject(value)) {\n const serializer = serializers.find((t) => t.parseCondition(value))\n if (serializer) {\n return serializer.parse(value)\n }\n }\n\n if (Array.isArray(value)) {\n return value.map((v) => startSerializer.decode(v))\n }\n\n if (isPlainObject(value)) {\n return Object.fromEntries(\n Object.entries(value).map(([key, v]) => [\n key,\n startSerializer.decode(v),\n ]),\n )\n }\n\n return value\n },\n}\n\nconst createSerializer = <TKey extends string, TInput, TSerialized>(\n key: TKey,\n check: (value: any) => value is TInput,\n toValue: (value: TInput) => TSerialized,\n fromValue: (value: TSerialized) => TInput,\n) => ({\n key,\n stringifyCondition: check,\n stringify: (value: any) => ({ [`$${key}`]: toValue(value) }),\n parseCondition: (value: any) => Object.hasOwn(value, `$${key}`),\n parse: (value: any) => fromValue(value[`$${key}`]),\n})\n\n// Keep these ordered by predicted frequency\n// Make sure to keep DefaultSerializable in sync with these serializers\n// Also, make sure that they are unit tested in serializer.test.tsx\nconst serializers = [\n createSerializer(\n // Key\n 'undefined',\n // Check\n (v): v is undefined => v === undefined,\n // To\n () => 0,\n // From\n () => undefined,\n ),\n createSerializer(\n // Key\n 'date',\n // Check\n (v): v is Date => v instanceof Date,\n // To\n (v) => v.toISOString(),\n // From\n (v) => new Date(v),\n ),\n createSerializer(\n // Key\n 'error',\n // Check\n (v): v is Error => v instanceof Error,\n // To\n (v) => ({\n ...v,\n message: v.message,\n stack: process.env.NODE_ENV === 'development' ? v.stack : undefined,\n cause: v.cause,\n }),\n // From\n (v) => Object.assign(new Error(v.message), v),\n ),\n createSerializer(\n // Key\n 'formData',\n // Check\n (v): v is FormData => v instanceof FormData,\n // To\n (v) => {\n const entries: Record<\n string,\n Array<FormDataEntryValue> | FormDataEntryValue\n > = {}\n v.forEach((value, key) => {\n const entry = entries[key]\n if (entry !== undefined) {\n if (Array.isArray(entry)) {\n entry.push(value)\n } else {\n entries[key] = [entry, value]\n }\n } else {\n entries[key] = value\n }\n })\n return entries\n },\n // From\n (v) => {\n const formData = new FormData()\n Object.entries(v).forEach(([key, value]) => {\n if (Array.isArray(value)) {\n value.forEach((val) => formData.append(key, val))\n } else {\n formData.append(key, value)\n }\n })\n return formData\n },\n ),\n createSerializer(\n // Key\n 'bigint',\n // Check\n (v): v is bigint => typeof v === 'bigint',\n // To\n (v) => v.toString(),\n // From\n (v) => BigInt(v),\n ),\n] as const\n"],"names":["isPlainObject"],"mappings":"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"}
|
package/dist/cjs/ssr-client.cjs
DELETED
|
@@ -1,131 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
|
|
3
|
-
const routerCore = require("@tanstack/router-core");
|
|
4
|
-
const invariant = require("tiny-invariant");
|
|
5
|
-
const serializer = require("./serializer.cjs");
|
|
6
|
-
async function hydrate(router) {
|
|
7
|
-
var _a, _b, _c;
|
|
8
|
-
invariant(
|
|
9
|
-
(_a = window.__TSR_SSR__) == null ? void 0 : _a.dehydrated,
|
|
10
|
-
"Expected to find a dehydrated data on window.__TSR_SSR__.dehydrated... but we did not. Please file an issue!"
|
|
11
|
-
);
|
|
12
|
-
const { manifest, dehydratedData, lastMatchId } = serializer.startSerializer.parse(
|
|
13
|
-
window.__TSR_SSR__.dehydrated
|
|
14
|
-
);
|
|
15
|
-
router.ssr = {
|
|
16
|
-
manifest,
|
|
17
|
-
serializer: serializer.startSerializer
|
|
18
|
-
};
|
|
19
|
-
router.clientSsr = {
|
|
20
|
-
getStreamedValue: (key) => {
|
|
21
|
-
var _a2;
|
|
22
|
-
if (router.isServer) {
|
|
23
|
-
return void 0;
|
|
24
|
-
}
|
|
25
|
-
const streamedValue = (_a2 = window.__TSR_SSR__) == null ? void 0 : _a2.streamedValues[key];
|
|
26
|
-
if (!streamedValue) {
|
|
27
|
-
return;
|
|
28
|
-
}
|
|
29
|
-
if (!streamedValue.parsed) {
|
|
30
|
-
streamedValue.parsed = router.ssr.serializer.parse(streamedValue.value);
|
|
31
|
-
}
|
|
32
|
-
return streamedValue.parsed;
|
|
33
|
-
}
|
|
34
|
-
};
|
|
35
|
-
const matches = router.matchRoutes(router.state.location);
|
|
36
|
-
const routeChunkPromise = Promise.all(
|
|
37
|
-
matches.map((match) => {
|
|
38
|
-
const route = router.looseRoutesById[match.routeId];
|
|
39
|
-
return router.loadRouteChunk(route);
|
|
40
|
-
})
|
|
41
|
-
);
|
|
42
|
-
matches.forEach((match) => {
|
|
43
|
-
var _a2;
|
|
44
|
-
const dehydratedMatch = window.__TSR_SSR__.matches.find(
|
|
45
|
-
(d) => d.id === match.id
|
|
46
|
-
);
|
|
47
|
-
if (!dehydratedMatch) {
|
|
48
|
-
return;
|
|
49
|
-
}
|
|
50
|
-
Object.assign(match, dehydratedMatch);
|
|
51
|
-
if (dehydratedMatch.__beforeLoadContext) {
|
|
52
|
-
match.__beforeLoadContext = router.ssr.serializer.parse(
|
|
53
|
-
dehydratedMatch.__beforeLoadContext
|
|
54
|
-
);
|
|
55
|
-
}
|
|
56
|
-
if (dehydratedMatch.loaderData) {
|
|
57
|
-
match.loaderData = router.ssr.serializer.parse(
|
|
58
|
-
dehydratedMatch.loaderData
|
|
59
|
-
);
|
|
60
|
-
}
|
|
61
|
-
if (dehydratedMatch.error) {
|
|
62
|
-
match.error = router.ssr.serializer.parse(dehydratedMatch.error);
|
|
63
|
-
}
|
|
64
|
-
(_a2 = match.extracted) == null ? void 0 : _a2.forEach((ex) => {
|
|
65
|
-
deepMutableSetByPath(match, ["loaderData", ...ex.path], ex.value);
|
|
66
|
-
});
|
|
67
|
-
return match;
|
|
68
|
-
});
|
|
69
|
-
router.__store.setState((s) => {
|
|
70
|
-
return {
|
|
71
|
-
...s,
|
|
72
|
-
matches
|
|
73
|
-
};
|
|
74
|
-
});
|
|
75
|
-
await ((_c = (_b = router.options).hydrate) == null ? void 0 : _c.call(_b, dehydratedData));
|
|
76
|
-
await Promise.all(
|
|
77
|
-
router.state.matches.map(async (match) => {
|
|
78
|
-
var _a2, _b2, _c2, _d, _e, _f;
|
|
79
|
-
const route = router.looseRoutesById[match.routeId];
|
|
80
|
-
const parentMatch = router.state.matches[match.index - 1];
|
|
81
|
-
const parentContext = (parentMatch == null ? void 0 : 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 = ((_b2 = (_a2 = route.options).context) == null ? void 0 : _b2.call(_a2, 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 ((_d = (_c2 = route.options).head) == null ? void 0 : _d.call(_c2, assetContext));
|
|
107
|
-
const scripts = await ((_f = (_e = route.options).scripts) == null ? void 0 : _f.call(_e, assetContext));
|
|
108
|
-
match.meta = headFnContent == null ? void 0 : headFnContent.meta;
|
|
109
|
-
match.links = headFnContent == null ? void 0 : headFnContent.links;
|
|
110
|
-
match.headScripts = headFnContent == null ? void 0 : headFnContent.scripts;
|
|
111
|
-
match.scripts = scripts;
|
|
112
|
-
})
|
|
113
|
-
);
|
|
114
|
-
if (matches[matches.length - 1].id !== lastMatchId) {
|
|
115
|
-
return await Promise.all([routeChunkPromise, router.load()]);
|
|
116
|
-
}
|
|
117
|
-
return routeChunkPromise;
|
|
118
|
-
}
|
|
119
|
-
function deepMutableSetByPath(obj, path, value) {
|
|
120
|
-
if (path.length === 1) {
|
|
121
|
-
obj[path[0]] = value;
|
|
122
|
-
}
|
|
123
|
-
const [key, ...rest] = path;
|
|
124
|
-
if (Array.isArray(obj)) {
|
|
125
|
-
deepMutableSetByPath(obj[Number(key)], rest, value);
|
|
126
|
-
} else if (routerCore.isPlainObject(obj)) {
|
|
127
|
-
deepMutableSetByPath(obj[key], rest, value);
|
|
128
|
-
}
|
|
129
|
-
}
|
|
130
|
-
exports.hydrate = hydrate;
|
|
131
|
-
//# sourceMappingURL=ssr-client.cjs.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ssr-client.cjs","sources":["../../src/ssr-client.tsx"],"sourcesContent":["import { isPlainObject } from '@tanstack/router-core'\n\nimport invariant from 'tiny-invariant'\n\nimport { startSerializer } from './serializer'\nimport type {\n AnyRouter,\n ControllablePromise,\n DeferredPromiseState,\n MakeRouteMatch,\n Manifest,\n RouteContextOptions,\n} from '@tanstack/router-core'\n\ndeclare global {\n interface Window {\n __TSR_SSR__?: StartSsrGlobal\n }\n}\n\nexport interface StartSsrGlobal {\n matches: Array<SsrMatch>\n streamedValues: Record<\n string,\n {\n value: any\n parsed: any\n }\n >\n cleanScripts: () => void\n dehydrated?: any\n initMatch: (match: SsrMatch) => void\n resolvePromise: (opts: {\n matchId: string\n id: number\n promiseState: DeferredPromiseState<any>\n }) => void\n injectChunk: (opts: { matchId: string; id: number; chunk: string }) => void\n closeStream: (opts: { matchId: string; id: number }) => void\n}\n\nexport interface SsrMatch {\n id: string\n __beforeLoadContext: string\n loaderData?: string\n error?: string\n extracted?: Array<ClientExtractedEntry>\n updatedAt: MakeRouteMatch['updatedAt']\n status: MakeRouteMatch['status']\n}\n\nexport type ClientExtractedEntry =\n | ClientExtractedStream\n | ClientExtractedPromise\n\nexport interface ClientExtractedPromise extends ClientExtractedBaseEntry {\n type: 'promise'\n value?: ControllablePromise<any>\n}\n\nexport interface ClientExtractedStream extends ClientExtractedBaseEntry {\n type: 'stream'\n value?: ReadableStream & { controller?: ReadableStreamDefaultController }\n}\n\nexport interface ClientExtractedBaseEntry {\n type: string\n path: Array<string>\n}\n\nexport interface ResolvePromiseState {\n matchId: string\n id: number\n promiseState: DeferredPromiseState<any>\n}\n\nexport interface DehydratedRouter {\n manifest: Manifest | undefined\n dehydratedData: any\n lastMatchId: string\n}\n\nexport async function hydrate(router: AnyRouter): Promise<any> {\n invariant(\n window.__TSR_SSR__?.dehydrated,\n 'Expected to find a dehydrated data on window.__TSR_SSR__.dehydrated... but we did not. Please file an issue!',\n )\n\n const { manifest, dehydratedData, lastMatchId } = startSerializer.parse(\n window.__TSR_SSR__.dehydrated,\n ) as DehydratedRouter\n\n router.ssr = {\n manifest,\n serializer: startSerializer,\n }\n\n router.clientSsr = {\n getStreamedValue: <T,>(key: string): T | undefined => {\n if (router.isServer) {\n return undefined\n }\n\n const streamedValue = window.__TSR_SSR__?.streamedValues[key]\n\n if (!streamedValue) {\n return\n }\n\n if (!streamedValue.parsed) {\n streamedValue.parsed = router.ssr!.serializer.parse(streamedValue.value)\n }\n\n return streamedValue.parsed\n },\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 // Right after hydration and before the first render, we need to rehydrate each match\n // First step is to reyhdrate loaderData and __beforeLoadContext\n matches.forEach((match) => {\n const dehydratedMatch = window.__TSR_SSR__!.matches.find(\n (d) => d.id === match.id,\n )\n\n if (!dehydratedMatch) {\n return\n }\n\n Object.assign(match, dehydratedMatch)\n\n // Handle beforeLoadContext\n if (dehydratedMatch.__beforeLoadContext) {\n match.__beforeLoadContext = router.ssr!.serializer.parse(\n dehydratedMatch.__beforeLoadContext,\n ) as any\n }\n\n // Handle loaderData\n if (dehydratedMatch.loaderData) {\n match.loaderData = router.ssr!.serializer.parse(\n dehydratedMatch.loaderData,\n )\n }\n\n // Handle error\n if (dehydratedMatch.error) {\n match.error = router.ssr!.serializer.parse(dehydratedMatch.error)\n }\n\n // Handle extracted\n ;(match as unknown as SsrMatch).extracted?.forEach((ex) => {\n deepMutableSetByPath(match, ['loaderData', ...ex.path], ex.value)\n })\n\n return match\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.scripts = scripts\n }),\n )\n\n if (matches[matches.length - 1]!.id !== lastMatchId) {\n return await Promise.all([routeChunkPromise, router.load()])\n }\n\n return routeChunkPromise\n}\n\nfunction deepMutableSetByPath<T>(obj: T, path: Array<string>, value: any) {\n // mutable set by path retaining array and object references\n if (path.length === 1) {\n ;(obj as any)[path[0]!] = value\n }\n\n const [key, ...rest] = path\n\n if (Array.isArray(obj)) {\n deepMutableSetByPath(obj[Number(key)], rest, value)\n } else if (isPlainObject(obj)) {\n deepMutableSetByPath((obj as any)[key!], rest, value)\n }\n}\n"],"names":["startSerializer","_a","_b","_c","isPlainObject"],"mappings":"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"}
|
|
@@ -1,65 +0,0 @@
|
|
|
1
|
-
import { AnyRouter, ControllablePromise, DeferredPromiseState, MakeRouteMatch, Manifest } from '@tanstack/router-core';
|
|
2
|
-
declare global {
|
|
3
|
-
interface Window {
|
|
4
|
-
__TSR_SSR__?: StartSsrGlobal;
|
|
5
|
-
}
|
|
6
|
-
}
|
|
7
|
-
export interface StartSsrGlobal {
|
|
8
|
-
matches: Array<SsrMatch>;
|
|
9
|
-
streamedValues: Record<string, {
|
|
10
|
-
value: any;
|
|
11
|
-
parsed: any;
|
|
12
|
-
}>;
|
|
13
|
-
cleanScripts: () => void;
|
|
14
|
-
dehydrated?: any;
|
|
15
|
-
initMatch: (match: SsrMatch) => void;
|
|
16
|
-
resolvePromise: (opts: {
|
|
17
|
-
matchId: string;
|
|
18
|
-
id: number;
|
|
19
|
-
promiseState: DeferredPromiseState<any>;
|
|
20
|
-
}) => void;
|
|
21
|
-
injectChunk: (opts: {
|
|
22
|
-
matchId: string;
|
|
23
|
-
id: number;
|
|
24
|
-
chunk: string;
|
|
25
|
-
}) => void;
|
|
26
|
-
closeStream: (opts: {
|
|
27
|
-
matchId: string;
|
|
28
|
-
id: number;
|
|
29
|
-
}) => void;
|
|
30
|
-
}
|
|
31
|
-
export interface SsrMatch {
|
|
32
|
-
id: string;
|
|
33
|
-
__beforeLoadContext: string;
|
|
34
|
-
loaderData?: string;
|
|
35
|
-
error?: string;
|
|
36
|
-
extracted?: Array<ClientExtractedEntry>;
|
|
37
|
-
updatedAt: MakeRouteMatch['updatedAt'];
|
|
38
|
-
status: MakeRouteMatch['status'];
|
|
39
|
-
}
|
|
40
|
-
export type ClientExtractedEntry = ClientExtractedStream | ClientExtractedPromise;
|
|
41
|
-
export interface ClientExtractedPromise extends ClientExtractedBaseEntry {
|
|
42
|
-
type: 'promise';
|
|
43
|
-
value?: ControllablePromise<any>;
|
|
44
|
-
}
|
|
45
|
-
export interface ClientExtractedStream extends ClientExtractedBaseEntry {
|
|
46
|
-
type: 'stream';
|
|
47
|
-
value?: ReadableStream & {
|
|
48
|
-
controller?: ReadableStreamDefaultController;
|
|
49
|
-
};
|
|
50
|
-
}
|
|
51
|
-
export interface ClientExtractedBaseEntry {
|
|
52
|
-
type: string;
|
|
53
|
-
path: Array<string>;
|
|
54
|
-
}
|
|
55
|
-
export interface ResolvePromiseState {
|
|
56
|
-
matchId: string;
|
|
57
|
-
id: number;
|
|
58
|
-
promiseState: DeferredPromiseState<any>;
|
|
59
|
-
}
|
|
60
|
-
export interface DehydratedRouter {
|
|
61
|
-
manifest: Manifest | undefined;
|
|
62
|
-
dehydratedData: any;
|
|
63
|
-
lastMatchId: string;
|
|
64
|
-
}
|
|
65
|
-
export declare function hydrate(router: AnyRouter): Promise<any>;
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
package/dist/esm/headers.d.ts
DELETED
|
@@ -1,5 +0,0 @@
|
|
|
1
|
-
import { OutgoingHttpHeaders } from 'node:http2';
|
|
2
|
-
export declare function headersInitToObject(headers: HeadersInit): Record<keyof OutgoingHttpHeaders, string>;
|
|
3
|
-
type AnyHeaders = Headers | HeadersInit | Record<string, string> | Array<[string, string]> | OutgoingHttpHeaders | undefined;
|
|
4
|
-
export declare function mergeHeaders(...headers: Array<AnyHeaders>): Headers;
|
|
5
|
-
export {};
|
package/dist/esm/headers.js
DELETED
|
@@ -1,30 +0,0 @@
|
|
|
1
|
-
import { splitSetCookieString } from "cookie-es";
|
|
2
|
-
function toHeadersInstance(init) {
|
|
3
|
-
if (init instanceof Headers) {
|
|
4
|
-
return new Headers(init);
|
|
5
|
-
} else if (Array.isArray(init)) {
|
|
6
|
-
return new Headers(init);
|
|
7
|
-
} else if (typeof init === "object") {
|
|
8
|
-
return new Headers(init);
|
|
9
|
-
} else {
|
|
10
|
-
return new Headers();
|
|
11
|
-
}
|
|
12
|
-
}
|
|
13
|
-
function mergeHeaders(...headers) {
|
|
14
|
-
return headers.reduce((acc, header) => {
|
|
15
|
-
const headersInstance = toHeadersInstance(header);
|
|
16
|
-
for (const [key, value] of headersInstance.entries()) {
|
|
17
|
-
if (key === "set-cookie") {
|
|
18
|
-
const splitCookies = splitSetCookieString(value);
|
|
19
|
-
splitCookies.forEach((cookie) => acc.append("set-cookie", cookie));
|
|
20
|
-
} else {
|
|
21
|
-
acc.set(key, value);
|
|
22
|
-
}
|
|
23
|
-
}
|
|
24
|
-
return acc;
|
|
25
|
-
}, new Headers());
|
|
26
|
-
}
|
|
27
|
-
export {
|
|
28
|
-
mergeHeaders
|
|
29
|
-
};
|
|
30
|
-
//# sourceMappingURL=headers.js.map
|
package/dist/esm/headers.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"headers.js","sources":["../../src/headers.ts"],"sourcesContent":["import { splitSetCookieString } from 'cookie-es'\nimport type { OutgoingHttpHeaders } from 'node:http2'\n// A utility function to turn HeadersInit into an object\nexport function headersInitToObject(\n headers: HeadersInit,\n): Record<keyof OutgoingHttpHeaders, string> {\n const obj: Record<keyof OutgoingHttpHeaders, string> = {}\n const headersInstance = new Headers(headers)\n for (const [key, value] of headersInstance.entries()) {\n obj[key] = value\n }\n return obj\n}\n\ntype AnyHeaders =\n | Headers\n | HeadersInit\n | Record<string, string>\n | Array<[string, string]>\n | OutgoingHttpHeaders\n | undefined\n\n// Helper function to convert various HeaderInit types to a Headers instance\nfunction toHeadersInstance(init: AnyHeaders) {\n if (init instanceof Headers) {\n return new Headers(init)\n } else if (Array.isArray(init)) {\n return new Headers(init)\n } else if (typeof init === 'object') {\n return new Headers(init as HeadersInit)\n } else {\n return new Headers()\n }\n}\n\n// Function to merge headers with proper overrides\nexport function mergeHeaders(...headers: Array<AnyHeaders>) {\n return headers.reduce((acc: Headers, header) => {\n const headersInstance = toHeadersInstance(header)\n for (const [key, value] of headersInstance.entries()) {\n if (key === 'set-cookie') {\n const splitCookies = splitSetCookieString(value)\n splitCookies.forEach((cookie) => acc.append('set-cookie', cookie))\n } else {\n acc.set(key, value)\n }\n }\n return acc\n }, new Headers())\n}\n"],"names":[],"mappings":";AAuBA,SAAS,kBAAkB,MAAkB;AAC3C,MAAI,gBAAgB,SAAS;AACpB,WAAA,IAAI,QAAQ,IAAI;AAAA,EACd,WAAA,MAAM,QAAQ,IAAI,GAAG;AACvB,WAAA,IAAI,QAAQ,IAAI;AAAA,EAAA,WACd,OAAO,SAAS,UAAU;AAC5B,WAAA,IAAI,QAAQ,IAAmB;AAAA,EAAA,OACjC;AACL,WAAO,IAAI,QAAQ;AAAA,EAAA;AAEvB;AAGO,SAAS,gBAAgB,SAA4B;AAC1D,SAAO,QAAQ,OAAO,CAAC,KAAc,WAAW;AACxC,UAAA,kBAAkB,kBAAkB,MAAM;AAChD,eAAW,CAAC,KAAK,KAAK,KAAK,gBAAgB,WAAW;AACpD,UAAI,QAAQ,cAAc;AAClB,cAAA,eAAe,qBAAqB,KAAK;AAC/C,qBAAa,QAAQ,CAAC,WAAW,IAAI,OAAO,cAAc,MAAM,CAAC;AAAA,MAAA,OAC5D;AACD,YAAA,IAAI,KAAK,KAAK;AAAA,MAAA;AAAA,IACpB;AAEK,WAAA;AAAA,EAAA,GACN,IAAI,QAAA,CAAS;AAClB;"}
|
package/dist/esm/json.d.ts
DELETED
package/dist/esm/json.js
DELETED
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
import { mergeHeaders } from "./headers.js";
|
|
2
|
-
function json(payload, init) {
|
|
3
|
-
return new Response(JSON.stringify(payload), {
|
|
4
|
-
...init,
|
|
5
|
-
headers: mergeHeaders(
|
|
6
|
-
{ "content-type": "application/json" },
|
|
7
|
-
init == null ? void 0 : init.headers
|
|
8
|
-
)
|
|
9
|
-
});
|
|
10
|
-
}
|
|
11
|
-
export {
|
|
12
|
-
json
|
|
13
|
-
};
|
|
14
|
-
//# sourceMappingURL=json.js.map
|
package/dist/esm/json.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"json.js","sources":["../../src/json.ts"],"sourcesContent":["import { mergeHeaders } from './headers'\nimport type { JsonResponse } from './createServerFn'\n\nexport function json<TData>(\n payload: TData,\n init?: ResponseInit,\n): JsonResponse<TData> {\n return new Response(JSON.stringify(payload), {\n ...init,\n headers: mergeHeaders(\n { 'content-type': 'application/json' },\n init?.headers,\n ),\n })\n}\n"],"names":[],"mappings":";AAGgB,SAAA,KACd,SACA,MACqB;AACrB,SAAO,IAAI,SAAS,KAAK,UAAU,OAAO,GAAG;AAAA,IAC3C,GAAG;AAAA,IACH,SAAS;AAAA,MACP,EAAE,gBAAgB,mBAAmB;AAAA,MACrC,6BAAM;AAAA,IAAA;AAAA,EACR,CACD;AACH;"}
|