@sigil-dev/grimoire 0.7.4 → 0.7.6
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/.grimoire/_routes.dom.js +8 -0
- package/.grimoire/_routes.hydrate.js +8 -0
- package/.grimoire/tsconfig.generated.json +11 -0
- package/.grimoire/types/ambient.d.ts +59 -0
- package/.grimoire/types/api/hello/$types.d.ts +50 -0
- package/.grimoire/types/api/items/$types.d.ts +50 -0
- package/.grimoire/types/echo/$types.d.ts +50 -0
- package/.grimoire/types/env-private.d.ts +5 -0
- package/.grimoire/types/env-public.d.ts +5 -0
- package/.grimoire/types/mixed/$types.d.ts +50 -0
- package/.grimoire/types/params/[docId]/$types.d.ts +52 -0
- package/.grimoire/types/reject/$types.d.ts +50 -0
- package/index.ts +34 -34
- package/package.json +8 -4
- package/preload.js +2 -0
- package/public/__grimoire__/hydrate.js +585 -0
- package/public/__grimoire__/index.js +490 -0
- package/src/client/head.ts +29 -0
- package/src/client/router.ts +224 -76
- package/src/env/index.ts +25 -0
- package/src/env/plugin.ts +13 -0
- package/src/env/private.ts +5 -0
- package/src/env/public.ts +7 -0
- package/src/env/typegen.ts +51 -0
- package/src/integrations/vite.ts +72 -72
- package/src/rendering/head.ts +22 -2
- package/src/rendering/hydrate.ts +81 -26
- package/src/rendering/index.ts +199 -186
- package/src/rendering/ssrPlugin.ts +53 -42
- package/src/routing/manifest-gen.ts +39 -26
- package/src/routing/router.ts +106 -98
- package/src/routing/scanner.ts +135 -129
- package/src/routing/transform-routes.ts +101 -96
- package/src/server/build.ts +147 -90
- package/src/server/coordinator.ts +306 -297
- package/src/server/hooks.ts +24 -3
- package/src/server/index.ts +148 -71
- package/src/server/worker.ts +59 -59
- package/src/typegen/index.ts +353 -340
- package/src/types.ts +269 -260
- package/test/context.test.ts +52 -52
- package/test/hydration.test.ts +119 -119
- package/test/middleware.test.ts +223 -221
- package/test/rendering.test.ts +425 -425
- package/test/routing.test.ts +83 -45
- package/test/scanning.test.ts +181 -169
- package/test/server.test.ts +229 -229
- package/test/streaming.test.ts +106 -106
- package/test/transform-routes.test.ts +84 -84
- package/test/typegen.test.ts +19 -1
package/test/middleware.test.ts
CHANGED
|
@@ -1,221 +1,223 @@
|
|
|
1
|
-
import { describe, expect, test } from "bun:test";
|
|
2
|
-
import { createCookies } from "../src/server/cookie-utils";
|
|
3
|
-
import type { Handle, RequestEvent } from "../src/server/hooks";
|
|
4
|
-
import { createHooks, sequence } from "../src/server/hooks";
|
|
5
|
-
|
|
6
|
-
function fakeEvent(overrides?: Partial<RequestEvent>): RequestEvent {
|
|
7
|
-
return {
|
|
8
|
-
request: new Request("http://localhost/"),
|
|
9
|
-
url: new URL("http://localhost/"),
|
|
10
|
-
params: {},
|
|
11
|
-
locals: {},
|
|
12
|
-
cookies: {
|
|
13
|
-
get: () => undefined,
|
|
14
|
-
set: () => {},
|
|
15
|
-
delete: () => {},
|
|
16
|
-
},
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
const
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
order.push("a-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
order.push("b-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
}
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
const
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
expect(
|
|
200
|
-
|
|
201
|
-
expect(cookieUtils.toHeaders()
|
|
202
|
-
expect(cookieUtils.toHeaders()[0]).toContain("
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
const
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
1
|
+
import { describe, expect, test } from "bun:test";
|
|
2
|
+
import { createCookies } from "../src/server/cookie-utils";
|
|
3
|
+
import type { Handle, RequestEvent } from "../src/server/hooks";
|
|
4
|
+
import { createHooks, sequence } from "../src/server/hooks";
|
|
5
|
+
|
|
6
|
+
function fakeEvent(overrides?: Partial<RequestEvent>): RequestEvent {
|
|
7
|
+
return {
|
|
8
|
+
request: new Request("http://localhost/"),
|
|
9
|
+
url: new URL("http://localhost/"),
|
|
10
|
+
params: {},
|
|
11
|
+
locals: {},
|
|
12
|
+
cookies: {
|
|
13
|
+
get: () => undefined,
|
|
14
|
+
set: () => {},
|
|
15
|
+
delete: () => {},
|
|
16
|
+
},
|
|
17
|
+
route: { id: "/" },
|
|
18
|
+
fetch: globalThis.fetch,
|
|
19
|
+
setHeaders: () => {},
|
|
20
|
+
...overrides,
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
describe("sequence()", () => {
|
|
25
|
+
test("chains two handlers in order", async () => {
|
|
26
|
+
const order: string[] = [];
|
|
27
|
+
|
|
28
|
+
const a: Handle = async ({ event, resolve }) => {
|
|
29
|
+
order.push("a-before");
|
|
30
|
+
const res = await resolve(event);
|
|
31
|
+
order.push("a-after");
|
|
32
|
+
return res;
|
|
33
|
+
};
|
|
34
|
+
|
|
35
|
+
const b: Handle = async ({ event, resolve }) => {
|
|
36
|
+
order.push("b-before");
|
|
37
|
+
const res = await resolve(event);
|
|
38
|
+
order.push("b-after");
|
|
39
|
+
return res;
|
|
40
|
+
};
|
|
41
|
+
|
|
42
|
+
const handler = sequence(a, b);
|
|
43
|
+
const res = await handler({
|
|
44
|
+
event: fakeEvent(),
|
|
45
|
+
resolve: async (evt) => new Response("OK"),
|
|
46
|
+
});
|
|
47
|
+
|
|
48
|
+
expect(order).toEqual(["a-before", "b-before", "b-after", "a-after"]);
|
|
49
|
+
expect(await res.text()).toBe("OK");
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
test("can short-circuit", async () => {
|
|
53
|
+
let reached = false;
|
|
54
|
+
|
|
55
|
+
const a: Handle = async () => {
|
|
56
|
+
return new Response("Blocked", { status: 403 });
|
|
57
|
+
};
|
|
58
|
+
|
|
59
|
+
const b: Handle = async ({ resolve, event }) => {
|
|
60
|
+
reached = true;
|
|
61
|
+
return resolve(event);
|
|
62
|
+
};
|
|
63
|
+
|
|
64
|
+
const handler = sequence(a, b);
|
|
65
|
+
const res = await handler({
|
|
66
|
+
event: fakeEvent(),
|
|
67
|
+
resolve: async () => new Response("OK"),
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
expect(reached).toBe(false);
|
|
71
|
+
expect(res.status).toBe(403);
|
|
72
|
+
});
|
|
73
|
+
|
|
74
|
+
test("can modify event.locals", async () => {
|
|
75
|
+
const a: Handle = async ({ event, resolve }) => {
|
|
76
|
+
(event.locals as any).user = "alice";
|
|
77
|
+
return resolve(event);
|
|
78
|
+
};
|
|
79
|
+
|
|
80
|
+
const b: Handle = async ({ event, resolve }) => {
|
|
81
|
+
(event.locals as any).greet = `hello ${(event.locals as any).user}`;
|
|
82
|
+
return resolve(event);
|
|
83
|
+
};
|
|
84
|
+
|
|
85
|
+
const handler = sequence(a, b);
|
|
86
|
+
const event = fakeEvent();
|
|
87
|
+
await handler({
|
|
88
|
+
event,
|
|
89
|
+
resolve: async (evt) => {
|
|
90
|
+
return new Response(JSON.stringify(evt.locals));
|
|
91
|
+
},
|
|
92
|
+
});
|
|
93
|
+
|
|
94
|
+
expect((event.locals as any).user).toBe("alice");
|
|
95
|
+
expect((event.locals as any).greet).toBe("hello alice");
|
|
96
|
+
});
|
|
97
|
+
|
|
98
|
+
test("can modify response", async () => {
|
|
99
|
+
const a: Handle = async ({ event, resolve }) => {
|
|
100
|
+
const res = await resolve(event);
|
|
101
|
+
const headers = new Headers(res.headers);
|
|
102
|
+
headers.set("X-First", "1");
|
|
103
|
+
return new Response(res.body, { status: res.status, headers });
|
|
104
|
+
};
|
|
105
|
+
|
|
106
|
+
const b: Handle = async ({ event, resolve }) => {
|
|
107
|
+
const res = await resolve(event);
|
|
108
|
+
const headers = new Headers(res.headers);
|
|
109
|
+
headers.set("X-Second", "2");
|
|
110
|
+
return new Response(res.body, { status: res.status, headers });
|
|
111
|
+
};
|
|
112
|
+
|
|
113
|
+
const handler = sequence(a, b);
|
|
114
|
+
const res = await handler({
|
|
115
|
+
event: fakeEvent(),
|
|
116
|
+
resolve: async () => new Response("OK"),
|
|
117
|
+
});
|
|
118
|
+
|
|
119
|
+
expect(res.headers.get("X-First")).toBe("1");
|
|
120
|
+
expect(res.headers.get("X-Second")).toBe("2");
|
|
121
|
+
});
|
|
122
|
+
|
|
123
|
+
test("single handler works", async () => {
|
|
124
|
+
const handler: Handle = async ({ event, resolve }) => {
|
|
125
|
+
return resolve(event);
|
|
126
|
+
};
|
|
127
|
+
|
|
128
|
+
const res = await sequence(handler)({
|
|
129
|
+
event: fakeEvent(),
|
|
130
|
+
resolve: async () => new Response("Single"),
|
|
131
|
+
});
|
|
132
|
+
|
|
133
|
+
expect(await res.text()).toBe("Single");
|
|
134
|
+
});
|
|
135
|
+
|
|
136
|
+
test("three handlers chain correctly", async () => {
|
|
137
|
+
const order: string[] = [];
|
|
138
|
+
|
|
139
|
+
const a: Handle = async ({ event, resolve }) => {
|
|
140
|
+
order.push("a");
|
|
141
|
+
return resolve(event);
|
|
142
|
+
};
|
|
143
|
+
const b: Handle = async ({ event, resolve }) => {
|
|
144
|
+
order.push("b");
|
|
145
|
+
return resolve(event);
|
|
146
|
+
};
|
|
147
|
+
const c: Handle = async ({ event, resolve }) => {
|
|
148
|
+
order.push("c");
|
|
149
|
+
return resolve(event);
|
|
150
|
+
};
|
|
151
|
+
|
|
152
|
+
await sequence(
|
|
153
|
+
a,
|
|
154
|
+
b,
|
|
155
|
+
c,
|
|
156
|
+
)({
|
|
157
|
+
event: fakeEvent(),
|
|
158
|
+
resolve: async () => new Response("OK"),
|
|
159
|
+
});
|
|
160
|
+
|
|
161
|
+
expect(order).toEqual(["a", "b", "c"]);
|
|
162
|
+
});
|
|
163
|
+
});
|
|
164
|
+
|
|
165
|
+
describe("Cookies", () => {
|
|
166
|
+
function makeEvent(cookieHeader = ""): RequestEvent {
|
|
167
|
+
return fakeEvent({
|
|
168
|
+
cookies: createCookies(cookieHeader),
|
|
169
|
+
});
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
test("cookies.get reads from header", async () => {
|
|
173
|
+
let value: string | undefined;
|
|
174
|
+
const handler: Handle = async ({ event, resolve }) => {
|
|
175
|
+
value = event.cookies.get("session");
|
|
176
|
+
return resolve(event);
|
|
177
|
+
};
|
|
178
|
+
|
|
179
|
+
await handler({
|
|
180
|
+
event: makeEvent("session=abc123; theme=dark"),
|
|
181
|
+
resolve: async () => new Response("OK"),
|
|
182
|
+
});
|
|
183
|
+
|
|
184
|
+
expect(value).toBe("abc123");
|
|
185
|
+
});
|
|
186
|
+
|
|
187
|
+
test("cookies.set adds Set-Cookie header", async () => {
|
|
188
|
+
const event = makeEvent();
|
|
189
|
+
const handler: Handle = async ({ event: evt, resolve }) => {
|
|
190
|
+
evt.cookies.set("token", "xyz", { httpOnly: true, path: "/" });
|
|
191
|
+
return resolve(evt);
|
|
192
|
+
};
|
|
193
|
+
|
|
194
|
+
await handler({
|
|
195
|
+
event,
|
|
196
|
+
resolve: async () => new Response("OK"),
|
|
197
|
+
});
|
|
198
|
+
|
|
199
|
+
expect(event.cookies.get("token")).toBe("xyz");
|
|
200
|
+
const cookieUtils = event.cookies as ReturnType<typeof createCookies>;
|
|
201
|
+
expect(cookieUtils.toHeaders().length).toBe(1);
|
|
202
|
+
expect(cookieUtils.toHeaders()[0]).toContain("token=xyz");
|
|
203
|
+
expect(cookieUtils.toHeaders()[0]).toContain("HttpOnly");
|
|
204
|
+
expect(cookieUtils.toHeaders()[0]).toContain("Path=/");
|
|
205
|
+
});
|
|
206
|
+
});
|
|
207
|
+
|
|
208
|
+
describe("createHooks()", () => {
|
|
209
|
+
test("returns handle and init", async () => {
|
|
210
|
+
const handle: Handle = async ({ resolve, event }) => resolve(event);
|
|
211
|
+
const init = () => {};
|
|
212
|
+
const hooks = createHooks(handle, init);
|
|
213
|
+
expect(hooks.handle).toBe(handle);
|
|
214
|
+
expect(hooks.init).toBe(init);
|
|
215
|
+
});
|
|
216
|
+
|
|
217
|
+
test("returns handle without init", () => {
|
|
218
|
+
const handle: Handle = async ({ resolve, event }) => resolve(event);
|
|
219
|
+
const hooks = createHooks(handle);
|
|
220
|
+
expect(hooks.handle).toBe(handle);
|
|
221
|
+
expect(hooks.init).toBeUndefined();
|
|
222
|
+
});
|
|
223
|
+
});
|