@solidjs/start 2.0.0-alpha.1 → 2.0.0-alpha.3

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.
Files changed (119) hide show
  1. package/CHANGELOG.md +33 -0
  2. package/dist/config/constants.d.ts +1 -1
  3. package/dist/config/constants.js +1 -1
  4. package/dist/config/dev-server.js +18 -0
  5. package/dist/config/env.d.ts +19 -0
  6. package/dist/config/env.js +81 -0
  7. package/dist/config/fs-routes/fs-watcher.js +14 -20
  8. package/dist/config/fs-routes/index.js +2 -2
  9. package/dist/config/fs-routes/router.js +7 -8
  10. package/dist/config/index.d.ts +16 -1
  11. package/dist/config/index.js +30 -29
  12. package/dist/config/lazy.js +35 -5
  13. package/dist/config/manifest.js +40 -6
  14. package/dist/config/vite-utils.d.ts +6 -1
  15. package/dist/config/vite-utils.js +7 -3
  16. package/dist/directives/bubble-function-declaration.d.ts +3 -0
  17. package/dist/directives/bubble-function-declaration.js +23 -0
  18. package/dist/directives/compile.d.ts +9 -0
  19. package/dist/directives/compile.js +40 -0
  20. package/dist/directives/generate-unique-name.d.ts +3 -0
  21. package/dist/directives/generate-unique-name.js +16 -0
  22. package/dist/directives/get-descriptive-name.d.ts +2 -0
  23. package/dist/directives/get-descriptive-name.js +37 -0
  24. package/dist/directives/get-import-identifier.d.ts +4 -0
  25. package/dist/directives/get-import-identifier.js +19 -0
  26. package/dist/directives/get-root-statement-path.d.ts +2 -0
  27. package/dist/directives/get-root-statement-path.js +12 -0
  28. package/dist/directives/index.d.ts +14 -0
  29. package/dist/directives/index.js +169 -0
  30. package/dist/directives/is-statement-top-level.d.ts +3 -0
  31. package/dist/directives/is-statement-top-level.js +9 -0
  32. package/dist/directives/paths.d.ts +9 -0
  33. package/dist/directives/paths.js +36 -0
  34. package/dist/directives/plugin.d.ts +21 -0
  35. package/dist/directives/plugin.js +302 -0
  36. package/dist/directives/remove-unused-variables.d.ts +3 -0
  37. package/dist/directives/remove-unused-variables.js +53 -0
  38. package/dist/directives/types.d.ts +10 -0
  39. package/dist/directives/xxhash32.d.ts +6 -0
  40. package/dist/directives/xxhash32.js +193 -0
  41. package/dist/{server/server-runtime.d.ts → fns/client.d.ts} +1 -1
  42. package/dist/fns/client.js +106 -0
  43. package/dist/fns/handler.d.ts +5 -0
  44. package/dist/{server/server-functions-handler.js → fns/handler.js} +55 -96
  45. package/dist/fns/registration.d.ts +2 -0
  46. package/dist/fns/registration.js +12 -0
  47. package/dist/fns/serialization.d.ts +6 -0
  48. package/dist/fns/serialization.js +208 -0
  49. package/dist/fns/server.d.ts +7 -0
  50. package/dist/{server/server-fns-runtime.js → fns/server.js} +7 -1
  51. package/dist/fns/shared.d.ts +17 -0
  52. package/dist/fns/shared.js +105 -0
  53. package/dist/http/index.d.ts +1 -1
  54. package/dist/middleware/index.d.ts +20 -0
  55. package/dist/middleware/index.js +21 -1
  56. package/dist/server/StartServer.jsx +2 -0
  57. package/dist/server/assets/PatchVirtualDevStyles.d.ts +4 -0
  58. package/dist/server/assets/PatchVirtualDevStyles.jsx +28 -0
  59. package/dist/server/collect-styles.js +9 -21
  60. package/dist/server/handler.d.ts +61 -3
  61. package/dist/server/handler.js +18 -15
  62. package/dist/server/spa/StartServer.jsx +2 -0
  63. package/dist/server/spa/handler.d.ts +30 -1
  64. package/dist/server/types.d.ts +1 -1
  65. package/dist/shared/dev-overlay/CodeView.jsx +4 -4
  66. package/dist/shared/dev-overlay/DevOverlayDialog.jsx +34 -34
  67. package/dist/shared/dev-overlay/index.jsx +2 -2
  68. package/dist/shared/dev-overlay/styles.css +40 -40
  69. package/package.json +27 -20
  70. package/src/config/constants.ts +1 -1
  71. package/src/config/dev-server.ts +12 -0
  72. package/src/config/env.ts +105 -0
  73. package/src/config/fs-routes/fs-watcher.ts +17 -24
  74. package/src/config/fs-routes/index.ts +2 -2
  75. package/src/config/fs-routes/router.ts +7 -8
  76. package/src/config/index.ts +44 -40
  77. package/src/config/lazy.ts +36 -5
  78. package/src/config/manifest.ts +40 -9
  79. package/src/config/vite-utils.ts +8 -4
  80. package/src/directives/bubble-function-declaration.ts +33 -0
  81. package/src/directives/compile.ts +54 -0
  82. package/src/directives/generate-unique-name.ts +22 -0
  83. package/src/directives/get-descriptive-name.ts +39 -0
  84. package/src/directives/get-import-identifier.ts +34 -0
  85. package/src/directives/get-root-statement-path.ts +14 -0
  86. package/src/directives/index.ts +232 -0
  87. package/src/directives/is-statement-top-level.ts +13 -0
  88. package/src/directives/paths.ts +63 -0
  89. package/src/directives/plugin.ts +389 -0
  90. package/src/directives/remove-unused-variables.ts +55 -0
  91. package/src/directives/types.ts +12 -0
  92. package/src/directives/xxhash32.ts +214 -0
  93. package/src/env.d.ts +1 -1
  94. package/src/fns/client.ts +141 -0
  95. package/src/fns/handler.spec.ts +85 -0
  96. package/src/{server/server-functions-handler.ts → fns/handler.ts} +65 -117
  97. package/src/fns/registration.ts +19 -0
  98. package/src/fns/serialization.ts +250 -0
  99. package/src/{server/server-fns-runtime.ts → fns/server.ts} +17 -2
  100. package/src/fns/shared.ts +116 -0
  101. package/src/middleware/index.ts +21 -1
  102. package/src/server/StartServer.tsx +2 -0
  103. package/src/server/assets/PatchVirtualDevStyles.tsx +31 -0
  104. package/src/server/collect-styles.ts +9 -26
  105. package/src/server/handler.ts +20 -16
  106. package/src/server/spa/StartServer.tsx +2 -0
  107. package/src/server/types.ts +1 -1
  108. package/src/shared/dev-overlay/CodeView.tsx +5 -7
  109. package/src/shared/dev-overlay/DevOverlayDialog.tsx +34 -34
  110. package/src/shared/dev-overlay/get-source-map.ts +1 -1
  111. package/src/shared/dev-overlay/index.tsx +4 -4
  112. package/src/shared/dev-overlay/styles.css +40 -40
  113. package/tsconfig.json +1 -0
  114. package/dist/server/fetchEvent.spec.js +0 -65
  115. package/dist/server/server-fns-runtime.d.ts +0 -1
  116. package/dist/server/server-functions-handler.d.ts +0 -2
  117. package/dist/server/server-runtime.js +0 -194
  118. package/src/server/server-runtime.ts +0 -240
  119. /package/dist/{server/fetchEvent.spec.d.ts → directives/types.js} +0 -0
@@ -1,55 +1,15 @@
1
- import { getServerFnById } from "solidstart:server-fn-manifest";
2
1
  import { parseSetCookie } from "cookie-es";
3
2
  import { parseCookies } from "h3";
4
- import { crossSerializeStream, fromJSON, getCrossReferenceHeader } from "seroval";
5
- import { CustomEventPlugin, DOMExceptionPlugin, EventPlugin, FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLPlugin, URLSearchParamsPlugin, } from "seroval-plugins/web";
6
3
  import { sharedConfig } from "solid-js";
7
4
  import { renderToString } from "solid-js/web";
8
5
  import { provideRequestEvent } from "solid-js/web/storage";
9
- import { getFetchEvent, mergeResponseHeaders } from "./fetchEvent.js";
10
- import { createPageEvent } from "./handler.js";
11
- import { getExpectedRedirectStatus } from "./util.js";
12
- function createChunk(data) {
13
- const encodeData = new TextEncoder().encode(data);
14
- const bytes = encodeData.length;
15
- const baseHex = bytes.toString(16);
16
- const totalHex = "00000000".substring(0, 8 - baseHex.length) + baseHex; // 32-bit
17
- const head = new TextEncoder().encode(`;0x${totalHex};`);
18
- const chunk = new Uint8Array(12 + bytes);
19
- chunk.set(head);
20
- chunk.set(encodeData, 12);
21
- return chunk;
22
- }
23
- function serializeToStream(id, value) {
24
- return new ReadableStream({
25
- start(controller) {
26
- crossSerializeStream(value, {
27
- scopeId: id,
28
- plugins: [
29
- CustomEventPlugin,
30
- DOMExceptionPlugin,
31
- EventPlugin,
32
- FormDataPlugin,
33
- HeadersPlugin,
34
- ReadableStreamPlugin,
35
- RequestPlugin,
36
- ResponsePlugin,
37
- URLSearchParamsPlugin,
38
- URLPlugin,
39
- ],
40
- onSerialize(data, initial) {
41
- controller.enqueue(createChunk(initial ? `(${getCrossReferenceHeader(id)},${data})` : data));
42
- },
43
- onDone() {
44
- controller.close();
45
- },
46
- onError(error) {
47
- controller.error(error);
48
- },
49
- });
50
- },
51
- });
52
- }
6
+ import { getFetchEvent, mergeResponseHeaders } from "../server/fetchEvent.js";
7
+ import { createPageEvent } from "../server/handler.js";
8
+ import { deserializeFromJSONString, serializeToJSONStream, serializeToJSStream, } from "./serialization.js";
9
+ import { BODY_FORMAT_KEY, BodyFormat, extractBody, getHeadersAndBody, } from "./shared.js";
10
+ import "solid-start:server-fn-manifest";
11
+ import { getServerFunction } from "./registration.js";
12
+ import { getExpectedRedirectStatus } from "../server/util.js";
53
13
  export async function handleServerFunction(h3Event) {
54
14
  const event = getFetchEvent(h3Event);
55
15
  const request = event.request;
@@ -70,54 +30,26 @@ export async function handleServerFunction(h3Event) {
70
30
  : new Response(null, { status: 404 });
71
31
  }
72
32
  }
73
- const serverFunction = await getServerFnById(functionId);
33
+ const serverFunction = getServerFunction(functionId);
74
34
  let parsed = [];
75
35
  // grab bound arguments from url when no JS
76
- if (!instance || h3Event.method === "GET") {
36
+ if (!instance || request.method === "GET") {
77
37
  const args = url.searchParams.get("args");
78
38
  if (args) {
79
- const json = JSON.parse(args);
80
- (json.t
81
- ? fromJSON(json, {
82
- plugins: [
83
- CustomEventPlugin,
84
- DOMExceptionPlugin,
85
- EventPlugin,
86
- FormDataPlugin,
87
- HeadersPlugin,
88
- ReadableStreamPlugin,
89
- RequestPlugin,
90
- ResponsePlugin,
91
- URLSearchParamsPlugin,
92
- URLPlugin,
93
- ],
94
- })
95
- : json).forEach((arg) => {
39
+ const result = (await deserializeFromJSONString(args));
40
+ for (const arg of result) {
96
41
  parsed.push(arg);
97
- });
42
+ }
98
43
  }
99
44
  }
100
- if (h3Event.method === "POST") {
101
- const contentType = request.headers.get("content-type");
102
- if (contentType?.startsWith("multipart/form-data") ||
103
- contentType?.startsWith("application/x-www-form-urlencoded")) {
104
- parsed.push(await event.request.formData());
45
+ if (request.method === "POST" && request.body !== null) {
46
+ const bodyFormat = request.headers.get(BODY_FORMAT_KEY);
47
+ const decoded = await extractBody("", false, request.clone());
48
+ if (bodyFormat === BodyFormat.Seroval) {
49
+ parsed = decoded;
105
50
  }
106
- else if (contentType?.startsWith("application/json")) {
107
- parsed = fromJSON(await event.request.json(), {
108
- plugins: [
109
- CustomEventPlugin,
110
- DOMExceptionPlugin,
111
- EventPlugin,
112
- FormDataPlugin,
113
- HeadersPlugin,
114
- ReadableStreamPlugin,
115
- RequestPlugin,
116
- ResponsePlugin,
117
- URLSearchParamsPlugin,
118
- URLPlugin,
119
- ],
120
- });
51
+ else {
52
+ parsed.push(decoded);
121
53
  }
122
54
  }
123
55
  try {
@@ -146,15 +78,26 @@ export async function handleServerFunction(h3Event) {
146
78
  if (result.customBody) {
147
79
  result = await result.customBody();
148
80
  }
149
- else if (result.body == undefined)
81
+ else if (result.body == null)
150
82
  result = null;
151
83
  }
152
84
  }
153
85
  // handle no JS success case
154
86
  if (!instance)
155
87
  return handleNoJS(result, request, parsed);
156
- h3Event.res.headers.set("content-type", "text/javascript");
157
- return serializeToStream(instance, result);
88
+ const body = getHeadersAndBody(result);
89
+ if (body) {
90
+ return new Response(body.body, {
91
+ headers: body.headers,
92
+ });
93
+ }
94
+ h3Event.res.headers.set(BODY_FORMAT_KEY, BodyFormat.Seroval);
95
+ if (import.meta.env.SEROVAL_MODE === "js") {
96
+ h3Event.res.headers.set("content-type", "text/javascript");
97
+ return serializeToJSStream(instance, result);
98
+ }
99
+ h3Event.res.headers.set("content-type", "text/plain");
100
+ return serializeToJSONStream(result);
158
101
  }
159
102
  catch (x) {
160
103
  if (x instanceof Response) {
@@ -168,9 +111,9 @@ export async function handleServerFunction(h3Event) {
168
111
  if (x.status && (!instance || x.status < 300 || x.status >= 400))
169
112
  h3Event.res.status = x.status;
170
113
  if (x.customBody) {
171
- x = x.customBody();
114
+ x = await x.customBody();
172
115
  }
173
- else if (x.body === undefined)
116
+ else if (x.body == null)
174
117
  x = null;
175
118
  h3Event.res.headers.set("X-Error", "true");
176
119
  }
@@ -182,8 +125,24 @@ export async function handleServerFunction(h3Event) {
182
125
  x = handleNoJS(x, request, parsed, true);
183
126
  }
184
127
  if (instance) {
185
- h3Event.res.headers.set("content-type", "text/javascript");
186
- return serializeToStream(instance, x);
128
+ const body = getHeadersAndBody(x);
129
+ if (body) {
130
+ const headers = new Headers(body.headers);
131
+ const errorHeader = h3Event.res.headers.get("X-Error");
132
+ if (errorHeader !== null) {
133
+ headers.set("X-Error", errorHeader);
134
+ }
135
+ return new Response(body.body, {
136
+ headers: body.headers,
137
+ });
138
+ }
139
+ h3Event.res.headers.set(BODY_FORMAT_KEY, BodyFormat.Seroval);
140
+ if (import.meta.env.SEROVAL_MODE === "js") {
141
+ h3Event.res.headers.set("content-type", "text/javascript");
142
+ return serializeToJSStream(instance, x);
143
+ }
144
+ h3Event.res.headers.set("content-type", "text/plain");
145
+ return serializeToJSONStream(x);
187
146
  }
188
147
  return x;
189
148
  }
@@ -219,11 +178,11 @@ function handleNoJS(result, request, parsed, thrown) {
219
178
  });
220
179
  }
221
180
  let App;
222
- function createSingleFlightHeaders(sourceEvent) {
181
+ export function createSingleFlightHeaders(sourceEvent) {
223
182
  // cookie handling logic is pretty simplistic so this might be imperfect
224
183
  // unclear if h3 internals are available on all platforms but we need a way to
225
184
  // update request headers on the underlying H3 event.
226
- const headers = sourceEvent.request.headers;
185
+ const headers = new Headers(sourceEvent.request.headers);
227
186
  const cookies = parseCookies(sourceEvent.nativeEvent);
228
187
  const SetCookies = sourceEvent.response.headers.getSetCookie();
229
188
  headers.delete("cookie");
@@ -0,0 +1,2 @@
1
+ export declare function registerServerFunction<T extends any[], R>(id: string, callback: (...args: T) => Promise<R>): (...args: T) => Promise<R>;
2
+ export declare function getServerFunction<T extends any[], R>(id: string): ((...args: T) => Promise<R>);
@@ -0,0 +1,12 @@
1
+ const REGISTRATIONS = new Map();
2
+ export function registerServerFunction(id, callback) {
3
+ REGISTRATIONS.set(id, callback);
4
+ return callback;
5
+ }
6
+ export function getServerFunction(id) {
7
+ const fn = REGISTRATIONS.get(id);
8
+ if (fn) {
9
+ return fn;
10
+ }
11
+ throw new Error('invalid server function: ' + id);
12
+ }
@@ -0,0 +1,6 @@
1
+ export declare function serializeToJSStream(id: string, value: any): ReadableStream<any>;
2
+ export declare function serializeToJSONStream(value: any): ReadableStream<any>;
3
+ export declare function serializeToJSONString(value: any): Promise<string>;
4
+ export declare function deserializeFromJSONString(json: string): Promise<unknown>;
5
+ export declare function deserializeJSONStream(response: Response | Request): Promise<unknown>;
6
+ export declare function deserializeJSStream(id: string, response: Request | Response): Promise<unknown>;
@@ -0,0 +1,208 @@
1
+ import { crossSerializeStream, deserialize, Feature, fromCrossJSON, getCrossReferenceHeader, toCrossJSONStream, } from "seroval";
2
+ import { AbortSignalPlugin, CustomEventPlugin, DOMExceptionPlugin, EventPlugin, FormDataPlugin, HeadersPlugin, ReadableStreamPlugin, RequestPlugin, ResponsePlugin, URLPlugin, URLSearchParamsPlugin, } from "seroval-plugins/web";
3
+ // TODO(Alexis): if we can, allow providing an option to extend these.
4
+ const DEFAULT_PLUGINS = [
5
+ AbortSignalPlugin,
6
+ CustomEventPlugin,
7
+ DOMExceptionPlugin,
8
+ EventPlugin,
9
+ FormDataPlugin,
10
+ HeadersPlugin,
11
+ ReadableStreamPlugin,
12
+ RequestPlugin,
13
+ ResponsePlugin,
14
+ URLSearchParamsPlugin,
15
+ URLPlugin,
16
+ ];
17
+ const MAX_SERIALIZATION_DEPTH_LIMIT = 64;
18
+ const DISABLED_FEATURES = Feature.RegExp;
19
+ /**
20
+ * Alexis:
21
+ *
22
+ * A "chunk" is a piece of data emitted by the streaming serializer.
23
+ * Each chunk is represented by a 32-bit value (encoded in hexadecimal),
24
+ * followed by the encoded string (8-bit representation). This format
25
+ * is important so we know how much of the chunk being streamed we
26
+ * are expecting before parsing the entire string data.
27
+ *
28
+ * This is sort of a bootleg "multipart/form-data" except it's bad at
29
+ * handling File/Blob LOL
30
+ *
31
+ * The format is as follows:
32
+ * ;0xFFFFFFFF;<string data>
33
+ */
34
+ function createChunk(data) {
35
+ const encodeData = new TextEncoder().encode(data);
36
+ const bytes = encodeData.length;
37
+ const baseHex = bytes.toString(16);
38
+ const totalHex = "00000000".substring(0, 8 - baseHex.length) + baseHex; // 32-bit
39
+ const head = new TextEncoder().encode(`;0x${totalHex};`);
40
+ const chunk = new Uint8Array(12 + bytes);
41
+ chunk.set(head);
42
+ chunk.set(encodeData, 12);
43
+ return chunk;
44
+ }
45
+ export function serializeToJSStream(id, value) {
46
+ return new ReadableStream({
47
+ start(controller) {
48
+ crossSerializeStream(value, {
49
+ scopeId: id,
50
+ plugins: DEFAULT_PLUGINS,
51
+ onSerialize(data, initial) {
52
+ controller.enqueue(createChunk(initial ? `(${getCrossReferenceHeader(id)},${data})` : data));
53
+ },
54
+ onDone() {
55
+ controller.close();
56
+ },
57
+ onError(error) {
58
+ controller.error(error);
59
+ },
60
+ });
61
+ },
62
+ });
63
+ }
64
+ export function serializeToJSONStream(value) {
65
+ return new ReadableStream({
66
+ start(controller) {
67
+ toCrossJSONStream(value, {
68
+ disabledFeatures: DISABLED_FEATURES,
69
+ depthLimit: MAX_SERIALIZATION_DEPTH_LIMIT,
70
+ plugins: DEFAULT_PLUGINS,
71
+ onParse(node) {
72
+ controller.enqueue(createChunk(JSON.stringify(node)));
73
+ },
74
+ onDone() {
75
+ controller.close();
76
+ },
77
+ onError(error) {
78
+ controller.error(error);
79
+ },
80
+ });
81
+ },
82
+ });
83
+ }
84
+ class SerovalChunkReader {
85
+ reader;
86
+ buffer;
87
+ done;
88
+ constructor(stream) {
89
+ this.reader = stream.getReader();
90
+ this.buffer = new Uint8Array(0);
91
+ this.done = false;
92
+ }
93
+ async readChunk() {
94
+ // if there's no chunk, read again
95
+ const chunk = await this.reader.read();
96
+ if (!chunk.done) {
97
+ // repopulate the buffer
98
+ const newBuffer = new Uint8Array(this.buffer.length + chunk.value.length);
99
+ newBuffer.set(this.buffer);
100
+ newBuffer.set(chunk.value, this.buffer.length);
101
+ this.buffer = newBuffer;
102
+ }
103
+ else {
104
+ this.done = true;
105
+ }
106
+ }
107
+ async next() {
108
+ // Check if the buffer is empty
109
+ if (this.buffer.length === 0) {
110
+ // if we are already done...
111
+ if (this.done) {
112
+ return {
113
+ done: true,
114
+ value: undefined,
115
+ };
116
+ }
117
+ // Otherwise, read a new chunk
118
+ await this.readChunk();
119
+ return await this.next();
120
+ }
121
+ // Read the "byte header"
122
+ // The byte header tells us how big the expected data is
123
+ // so we know how much data we should wait before we
124
+ // deserialize the data
125
+ const head = new TextDecoder().decode(this.buffer.subarray(1, 11));
126
+ const bytes = Number.parseInt(head, 16); // ;0x00000000;
127
+ if (Number.isNaN(bytes)) {
128
+ throw new Error("Malformed server function stream.");
129
+ }
130
+ // Check if the buffer has enough bytes to be parsed
131
+ while (bytes > this.buffer.length - 12) {
132
+ // If it's not enough, and the reader is done
133
+ // then the chunk is invalid.
134
+ if (this.done) {
135
+ throw new Error("Malformed server function stream.");
136
+ }
137
+ // Otherwise, we read more chunks
138
+ await this.readChunk();
139
+ }
140
+ // Extract the exact chunk as defined by the byte header
141
+ const partial = new TextDecoder().decode(this.buffer.subarray(12, 12 + bytes));
142
+ // The rest goes to the buffer
143
+ this.buffer = this.buffer.subarray(12 + bytes);
144
+ // Deserialize the chunk
145
+ return {
146
+ done: false,
147
+ value: partial,
148
+ };
149
+ }
150
+ async drain(interpret) {
151
+ while (true) {
152
+ const result = await this.next();
153
+ if (result.done) {
154
+ break;
155
+ }
156
+ else {
157
+ interpret(result.value);
158
+ }
159
+ }
160
+ }
161
+ }
162
+ export async function serializeToJSONString(value) {
163
+ const response = new Response(serializeToJSONStream(value));
164
+ return await response.text();
165
+ }
166
+ export async function deserializeFromJSONString(json) {
167
+ const blob = new Response(json);
168
+ return await deserializeJSONStream(blob);
169
+ }
170
+ export async function deserializeJSONStream(response) {
171
+ if (!response.body) {
172
+ throw new Error("missing body");
173
+ }
174
+ const reader = new SerovalChunkReader(response.body);
175
+ const result = await reader.next();
176
+ if (!result.done) {
177
+ const refs = new Map();
178
+ function interpretChunk(chunk) {
179
+ const value = fromCrossJSON(JSON.parse(chunk), {
180
+ refs,
181
+ disabledFeatures: DISABLED_FEATURES,
182
+ depthLimit: MAX_SERIALIZATION_DEPTH_LIMIT,
183
+ plugins: DEFAULT_PLUGINS,
184
+ });
185
+ return value;
186
+ }
187
+ void reader.drain(interpretChunk);
188
+ return interpretChunk(result.value);
189
+ }
190
+ return undefined;
191
+ }
192
+ export async function deserializeJSStream(id, response) {
193
+ if (!response.body) {
194
+ throw new Error("missing body");
195
+ }
196
+ const reader = new SerovalChunkReader(response.body);
197
+ const result = await reader.next();
198
+ if (!result.done) {
199
+ reader.drain(deserialize).then(() => {
200
+ // @ts-ignore
201
+ delete $R[id];
202
+ }, () => {
203
+ // no-op
204
+ });
205
+ return deserialize(result.value);
206
+ }
207
+ return undefined;
208
+ }
@@ -0,0 +1,7 @@
1
+ interface Registration<T extends any[], R> {
2
+ id: string;
3
+ fn: (...args: T) => Promise<R>;
4
+ }
5
+ export declare function createServerReference<T extends any[], R>(id: string, fn: (...args: T) => Promise<R>): Registration<T, R>;
6
+ export declare function cloneServerReference<T extends any[], R>({ id, fn }: Registration<T, R>): (...args: T) => Promise<R>;
7
+ export {};
@@ -1,6 +1,12 @@
1
1
  import { getRequestEvent } from "solid-js/web";
2
2
  import { provideRequestEvent } from "solid-js/web/storage";
3
- export function createServerReference(fn, id) {
3
+ import { registerServerFunction } from "./registration.js";
4
+ export function createServerReference(id, fn) {
5
+ const registration = { id, fn };
6
+ registerServerFunction(id, fn);
7
+ return registration;
8
+ }
9
+ export function cloneServerReference({ id, fn }) {
4
10
  if (typeof fn !== "function")
5
11
  throw new Error("Export from a 'use server' module must be a function");
6
12
  let baseURL = import.meta.env.BASE_URL ?? "/";
@@ -0,0 +1,17 @@
1
+ export declare const BODY_FORMAT_KEY = "X-Start-Type";
2
+ export declare const BODY_FORMAL_FILE = "__START__";
3
+ export declare const enum BodyFormat {
4
+ Seroval = "0",
5
+ String = "1",
6
+ FormData = "2",
7
+ URLSearchParams = "3",
8
+ Blob = "4",
9
+ File = "5",
10
+ ArrayBuffer = "6",
11
+ Uint8Array = "7"
12
+ }
13
+ export declare function getHeadersAndBody(body: any): {
14
+ headers?: HeadersInit;
15
+ body: BodyInit;
16
+ } | undefined;
17
+ export declare function extractBody(instance: string, client: boolean, source: Request | Response): Promise<unknown>;
@@ -0,0 +1,105 @@
1
+ import { deserializeJSONStream, deserializeJSStream } from "./serialization.js";
2
+ export const BODY_FORMAT_KEY = "X-Start-Type";
3
+ export const BODY_FORMAL_FILE = "__START__";
4
+ export var BodyFormat;
5
+ (function (BodyFormat) {
6
+ BodyFormat["Seroval"] = "0";
7
+ BodyFormat["String"] = "1";
8
+ BodyFormat["FormData"] = "2";
9
+ BodyFormat["URLSearchParams"] = "3";
10
+ BodyFormat["Blob"] = "4";
11
+ BodyFormat["File"] = "5";
12
+ BodyFormat["ArrayBuffer"] = "6";
13
+ BodyFormat["Uint8Array"] = "7";
14
+ })(BodyFormat || (BodyFormat = {}));
15
+ export function getHeadersAndBody(body) {
16
+ switch (true) {
17
+ case typeof body === "string":
18
+ return {
19
+ headers: {
20
+ "Content-Type": "text/plain",
21
+ [BODY_FORMAT_KEY]: BodyFormat.String,
22
+ },
23
+ body,
24
+ };
25
+ case body instanceof FormData:
26
+ return {
27
+ headers: {
28
+ [BODY_FORMAT_KEY]: BodyFormat.FormData,
29
+ },
30
+ body,
31
+ };
32
+ case body instanceof URLSearchParams:
33
+ return {
34
+ headers: {
35
+ "Content-Type": "application/x-www-form-urlencoded",
36
+ [BODY_FORMAT_KEY]: BodyFormat.URLSearchParams,
37
+ },
38
+ body,
39
+ };
40
+ case body instanceof File: {
41
+ const formData = new FormData();
42
+ formData.append(BODY_FORMAL_FILE, body, body.name);
43
+ return {
44
+ headers: {
45
+ [BODY_FORMAT_KEY]: BodyFormat.File,
46
+ },
47
+ body: formData,
48
+ };
49
+ }
50
+ case body instanceof Blob:
51
+ return {
52
+ headers: {
53
+ [BODY_FORMAT_KEY]: BodyFormat.Blob,
54
+ },
55
+ body,
56
+ };
57
+ case body instanceof ArrayBuffer:
58
+ return {
59
+ headers: {
60
+ [BODY_FORMAT_KEY]: BodyFormat.ArrayBuffer,
61
+ },
62
+ body,
63
+ };
64
+ case body instanceof Uint8Array:
65
+ return {
66
+ headers: {
67
+ [BODY_FORMAT_KEY]: BodyFormat.Uint8Array,
68
+ },
69
+ body: new Uint8Array(body),
70
+ };
71
+ default:
72
+ return undefined;
73
+ }
74
+ }
75
+ export async function extractBody(instance, client, source) {
76
+ const contentType = source.headers.get("content-type");
77
+ const startType = source.headers.get(BODY_FORMAT_KEY);
78
+ const clone = source.clone();
79
+ switch (true) {
80
+ case startType === BodyFormat.Seroval:
81
+ if (client && import.meta.env.SEROVAL_MODE === "js") {
82
+ return await deserializeJSStream(instance, clone);
83
+ }
84
+ return await deserializeJSONStream(clone);
85
+ case startType === BodyFormat.String:
86
+ return await clone.text();
87
+ case startType === BodyFormat.File: {
88
+ const formData = await clone.formData();
89
+ return formData.get(BODY_FORMAL_FILE);
90
+ }
91
+ case startType === BodyFormat.FormData:
92
+ case contentType?.startsWith("multipart/form-data"):
93
+ return await clone.formData();
94
+ case startType === BodyFormat.URLSearchParams:
95
+ case contentType?.startsWith("application/x-www-form-urlencoded"):
96
+ return new URLSearchParams(await clone.text());
97
+ case startType === BodyFormat.Blob:
98
+ return await clone.blob();
99
+ case startType === BodyFormat.ArrayBuffer:
100
+ return await clone.arrayBuffer();
101
+ case startType === BodyFormat.Uint8Array:
102
+ return new Uint8Array(await clone.arrayBuffer());
103
+ }
104
+ return undefined;
105
+ }
@@ -70,7 +70,7 @@ export declare const setHeaders: (values: Record<string, string>) => void;
70
70
  export declare const getHeader: WrapFunction<typeof h3.getRequestHeader>;
71
71
  export declare const getHeaders: WrapFunction<typeof h3.getRequestHeaders>;
72
72
  export declare const getRequestFingerprint: WrapFunction<typeof h3.getRequestFingerprint>;
73
- export declare const getRequestWebStream: () => ReadableStream<Uint8Array<ArrayBufferLike>> | null;
73
+ export declare const getRequestWebStream: () => ReadableStream<Uint8Array<ArrayBuffer>> | null;
74
74
  export declare const readFormData: () => Promise<FormData>;
75
75
  type WrappedReadValidatedBody = <T extends HTTPEvent, TEventInput = InferEventInput<"body", H3Event, T>>(...args: Tail<Parameters<typeof h3.readValidatedBody<T, H3Event, TEventInput>>>) => ReturnType<typeof h3.readValidatedBody<T, H3Event, TEventInput>>;
76
76
  export declare const readValidatedBody: PrependOverload<typeof h3.readValidatedBody, WrappedReadValidatedBody>;
@@ -9,6 +9,26 @@ type ResponseMiddlewareResponseParam = {
9
9
  body?: Awaited<EventHandlerResponse>;
10
10
  };
11
11
  export type ResponseMiddleware = (event: FetchEvent, response: ResponseMiddlewareResponseParam) => Response | Promise<Response> | void | Promise<void>;
12
+ /**
13
+ * Creates middleware for handling requests and responses.
14
+ *
15
+ * @see https://docs.solidjs.com/solid-start/reference/server/create-middleware
16
+ /**
17
+ * Creates request/response middlewares via H3.
18
+ *
19
+ * Accepts an array of H3 {@link Middleware}
20
+ *
21
+ * @tip To run your middleware before response, `await next()` in your function block.
22
+ *@example
23
+ * const middleware = createMiddleware([
24
+ * async (event, next) => {
25
+ * const resp = await next();
26
+ * if (resp instanceof Response) return resp;
27
+ * return new Response("Not found", { status: 404 });
28
+ * },
29
+ * ]);
30
+ *
31
+ */
12
32
  export declare function createMiddleware(args: {
13
33
  /** @deprecated Use H3 `Middleware` */
14
34
  onRequest?: RequestMiddleware | RequestMiddleware[] | undefined;
@@ -13,12 +13,32 @@ function wrapResponseMiddleware(onBeforeResponse) {
13
13
  const resp = await next();
14
14
  const fetchEvent = getFetchEvent(h3Event);
15
15
  const mwResponse = await onBeforeResponse(fetchEvent, {
16
- body: resp?.body,
16
+ body: resp,
17
17
  });
18
18
  if (mwResponse)
19
19
  return mwResponse;
20
20
  };
21
21
  }
22
+ /**
23
+ * Creates middleware for handling requests and responses.
24
+ *
25
+ * @see https://docs.solidjs.com/solid-start/reference/server/create-middleware
26
+ /**
27
+ * Creates request/response middlewares via H3.
28
+ *
29
+ * Accepts an array of H3 {@link Middleware}
30
+ *
31
+ * @tip To run your middleware before response, `await next()` in your function block.
32
+ *@example
33
+ * const middleware = createMiddleware([
34
+ * async (event, next) => {
35
+ * const resp = await next();
36
+ * if (resp instanceof Response) return resp;
37
+ * return new Response("Not found", { status: 404 });
38
+ * },
39
+ * ]);
40
+ *
41
+ */
22
42
  export function createMiddleware(args) {
23
43
  if (Array.isArray(args))
24
44
  return args;