@jant/core 0.11.0 → 0.12.0
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/bin/commands/deploy.js +179 -0
- package/bin/lib/cloudflare-setup.js +499 -0
- package/bin/lib/d1-query.js +26 -1
- package/bin/lib/r2-query.js +2 -2
- package/dist/{app-jQI4OPRe.js → app-DSwsDBD0.js} +28623 -635
- package/dist/client/.vite/manifest.json +2 -2
- package/dist/client/_assets/{client-52vQhZAv.js → client-DPByjWoU.js} +1 -1
- package/dist/client/_assets/{client-auth-BDcCR6u1.js → client-auth-CPqPTX1B.js} +1 -1
- package/dist/index.js +1 -1
- package/dist/node.js +2 -2
- package/package.json +31 -31
- package/src/__tests__/bin/deploy.test.ts +163 -0
- package/src/__tests__/export-hugo-build.test.ts +5 -5
- package/src/__tests__/export-import-roundtrip.test.ts +1 -1
- package/src/__tests__/export-service.test.ts +2 -2
- package/src/__tests__/fixtures/releases/0.11.0/site-export/README.md +130 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/297kg/_index.md +14 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/2thjq/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/2u5e5/_index.md +33 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/41q27/0x4nv/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/41q27/_index.md +42 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/41q27/faqyt/index.md +28 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/41q27/the-potting-mix-guide-i-keep-rereading/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/5kayp/_index.md +23 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/5ynfs/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/5ynfs/hu597/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/_index.md +5 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/a-night-heron-field-guide-for-my-walk-folder/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/a-quiet-saturday-after-a-busy-week/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/archive/_index.md +8 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/are-na-is-the-only-bookmark-pile-i-still-revisit/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/bought-too-many-lemons-again/_index.md +35 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/city-walks/_index.md +14 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/cleanshot-for-screenshots-ocr-and-screen-recording-on-the-mac/_index.md +33 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/cleanshotmac-shang-de-jie-tu-ocr-lu-ping-gong-ju/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/co344/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/collections/_index.md +5 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/current-tea-rotation/_index.md +34 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/derek-sivers-still-writes-the-kind-of-internet-i-want-more-of/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/desk-but-better/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/e0kcg/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/egi3c/_index.md +24 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/evf9j/_index.md +129 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/featured/_index.md +8 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/fixture-draft/_index.md +17 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/fixture-quotes/_index.md +13 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/fixture-text-attachment/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-basho/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-epictetus/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-marcus-aurelius/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-seneca/_index.md +26 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-thoreau/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gkbvv/2cl6d/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gkbvv/3zqv7/index.md +28 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gkbvv/5oxsv/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gkbvv/_index.md +37 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gwob9/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/home-cooking/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/hz729/_index.md +24 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/inaturalist-ai-zi-ran-she-qu/_index.md +42 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/j4v0q/_index.md +33 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k278t/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k4eee/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k5vh8/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k5vh8/a-reading-log-idea-i-might-steal/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k5vh8/a83qu/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k5vh8/from-seneca-5hibo/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/kan-qi-lai-bi-jiao-ku-de-gong-si-men/_index.md +41 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/l2m7y/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/lan-ya-yao-kong-qi-chuang-shang-yue-du-de-fan-ye-shen-qi/_index.md +52 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/mynoise-for-rainy-afternoons/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/n09le/_index.md +23 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/ni-fu-jin-de-wei-ji-bai-ke-tiao-mu/_index.md +40 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/nts-archives-are-good-cleaning-music/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/qgfcu/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/qgfcu/c91j0/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/qgfcu/qyucy/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/qgfcu/wsgck/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/rain-makes-my-neighborhood-look-better/_index.md +44 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/reading-notes/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/s4r3e/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/serious-eats-on-tomato-and-egg-soup/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/te812/_index.md +42 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/te812/cxiu6/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/te812/t77ms/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/te812/the-soup-trick-i-always-forget/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/telk3/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/telk3/from-thoreau-pawt2/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/the-five-minute-reset-is-still-the-best-habit-i-have/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/the-hallway-light-took-12-minutes-and-3-months/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/the-recurse-center-manual-is-weirdly-calming/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/tiny-projects/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/tong-wang-xing-fu-zhi-lu/_index.md +68 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/tou-ma-yan-jiang-ju-le-bu-chu-ti-yan/_index.md +62 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/useful-links/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/weekend-notes/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/content/what-i-actually-use-my-notebook-for/_index.md +50 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/data/jant.toml +155 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/hugo.toml +45 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/_redirects +30 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/3c46a9ea6fe0-med_01kn8jtq3penf98tfq4gzmh9g9.png +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jtx8qenf98tm9ahxr48sw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jv0jdenf98tp6qr9zgjjc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jv452enf98trbkwrvhvgd.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jvb16enf98txp7p0pf5ge.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jve5nenf98tzap11gpxzr.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jvq58enf98v538w5vsqp4.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jvsaeenf98v6ct4gjzppc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jw26cenf98vc7k0ppz5k8.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m313q1hme4e8cmby77dn66yy.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m313q2w7e4e8cmc20036yh66.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m313q7d2e4e8cmdeqjmyafby.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m313q887e4e8cmdjssych7yh.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167sm0f6ct88qw5brtsgcw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167tf8f6ct88r169s51j49.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167vaaf6ct88rbx5ztenwb.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167w51f6ct88rp19pybkw1.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167x0nf6ct88rzajb84tw3.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167xxbf6ct88s5t2300bjk.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167yq5f6ct88s9pjwt5fxg.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167zg4f6ct88sge8jp28ja.webp +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m50607a6e8h8gfpa8byqtt7h.md +3 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/themes/jant/static/apple-touch-icon.png +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/themes/jant/static/custom.css +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/themes/jant/static/favicon.ico +0 -0
- package/src/__tests__/fixtures/releases/0.11.0/site-export/wrangler.jsonc +24 -0
- package/src/__tests__/fixtures/releases/0.11.0/snapshot/db.sql +339 -0
- package/src/__tests__/fixtures/releases/0.11.0/snapshot/meta.json +11 -0
- package/src/__tests__/helpers/d1-round-trips.ts +213 -0
- package/src/__tests__/package-dependencies.test.ts +123 -0
- package/src/__tests__/public-page-round-trips.test.ts +203 -0
- package/src/__tests__/template-deploy-workflow.test.ts +33 -77
- package/src/__tests__/vite-config.test.ts +32 -0
- package/src/app.tsx +7 -1
- package/src/client/icons.ts +5 -6
- package/src/db/__tests__/d1-query.test.ts +29 -0
- package/src/db/__tests__/migration-rehearsal.test.ts +2 -2
- package/src/lib/__tests__/icons.test.ts +21 -10
- package/src/lib/api-posts.ts +4 -2
- package/src/lib/api-public-posts.ts +4 -2
- package/src/lib/constants.ts +20 -0
- package/src/lib/icons.ts +96 -34
- package/src/lib/post-display.ts +13 -9
- package/src/lib/timeline.ts +23 -21
- package/src/lib/view.ts +3 -2
- package/src/middleware/__tests__/onboarding.test.ts +5 -3
- package/src/middleware/__tests__/secure-headers.test.ts +40 -42
- package/src/middleware/config.ts +44 -2
- package/src/middleware/onboarding.ts +12 -3
- package/src/middleware/secure-headers.ts +25 -36
- package/src/node/__tests__/cli-deploy-setup.test.ts +373 -0
- package/src/node/__tests__/cli-deploy.test.ts +55 -0
- package/src/routes/feed/feed.ts +4 -2
- package/src/routes/pages/__tests__/post-page-round-trips.test.ts +10 -10
- package/src/routes/pages/archive.tsx +36 -17
- package/src/routes/pages/collection.tsx +72 -35
- package/src/routes/pages/page.tsx +46 -25
- package/src/routes/pages/search.tsx +3 -1
- package/src/services/__tests__/collection.test.ts +2 -4
- package/src/services/collection.ts +95 -71
- package/src/services/export.ts +2 -1
- package/src/services/post.ts +150 -205
- package/src/services/settings.ts +4 -8
- package/src/types/app-context.ts +5 -0
- package/src/ui/pages/ArchivePage.tsx +34 -34
- package/src/ui/pages/CollectionPage.tsx +1 -1
- package/src/ui/pages/SmartCollectionPage.tsx +2 -2
- package/src/ui/pages/SubscribePage.tsx +2 -4
- package/src/ui/shared/CollectionDirectory.tsx +2 -2
- package/src/ui/shared/CollectionsManager.tsx +1 -1
- package/src/ui/shared/CopyField.tsx +1 -1
- package/src/ui/shared/Icon.tsx +5 -5
- package/src/ui/shared/IconSprite.tsx +10 -11
- package/src/ui/shared/custom-icons.ts +38 -7
- package/src/ui/shared/icon-collector.ts +7 -5
|
@@ -0,0 +1,213 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* A D1 binding over better-sqlite3 that counts sequential round trips.
|
|
3
|
+
*
|
|
4
|
+
* On Workers every D1 call waits for the Worker↔D1 distance, so what a page
|
|
5
|
+
* costs is how many of those waits it stacks end to end, not how many
|
|
6
|
+
* statements it runs. This binding answers calls in waves: a call joins the
|
|
7
|
+
* wave that is waiting to go out, and a wave goes out only once the code has
|
|
8
|
+
* nothing left to issue without an answer. Reads started together share a
|
|
9
|
+
* wave; a read that needs an earlier read's rows lands in the next one. The
|
|
10
|
+
* number of waves a request takes is the number of round trips it would wait
|
|
11
|
+
* through on D1, independent of how fast this machine is.
|
|
12
|
+
*
|
|
13
|
+
* `batch()` is one call, as it is on D1, and returns object rows the way D1
|
|
14
|
+
* does, so a joined statement with clashing column names breaks here as it
|
|
15
|
+
* would there.
|
|
16
|
+
*/
|
|
17
|
+
|
|
18
|
+
import type BetterSqlite3 from "better-sqlite3";
|
|
19
|
+
|
|
20
|
+
type SqliteDatabase = BetterSqlite3.Database;
|
|
21
|
+
|
|
22
|
+
interface PendingCall {
|
|
23
|
+
sql: string;
|
|
24
|
+
run(): void;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
/** What one measured request sent to D1, wave by wave. */
|
|
28
|
+
export interface RoundTripTrace {
|
|
29
|
+
/** Statements of each wave, in the order the waves went out. */
|
|
30
|
+
waves: string[][];
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
function bindValue(value: unknown): unknown {
|
|
34
|
+
if (value === undefined) return null;
|
|
35
|
+
if (typeof value === "boolean") return value ? 1 : 0;
|
|
36
|
+
if (value instanceof ArrayBuffer) return Buffer.from(value);
|
|
37
|
+
if (ArrayBuffer.isView(value)) {
|
|
38
|
+
return Buffer.from(value.buffer, value.byteOffset, value.byteLength);
|
|
39
|
+
}
|
|
40
|
+
return value;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
/**
|
|
44
|
+
* Create a D1 binding over `sqlite` that records each round trip.
|
|
45
|
+
*
|
|
46
|
+
* @param sqlite - Database the binding reads and writes
|
|
47
|
+
* @returns The binding, and `measure` to trace the calls one task makes
|
|
48
|
+
* @example
|
|
49
|
+
* ```ts
|
|
50
|
+
* const d1 = createRoundTripD1(sqlite);
|
|
51
|
+
* const { waves } = await d1.measure(() => app.fetch(request, { DB: d1.binding }));
|
|
52
|
+
* ```
|
|
53
|
+
*/
|
|
54
|
+
export function createRoundTripD1(sqlite: SqliteDatabase) {
|
|
55
|
+
let pending: PendingCall[] = [];
|
|
56
|
+
let flushScheduled = false;
|
|
57
|
+
let recording: string[][] | null = null;
|
|
58
|
+
|
|
59
|
+
function flush() {
|
|
60
|
+
flushScheduled = false;
|
|
61
|
+
const wave = pending;
|
|
62
|
+
pending = [];
|
|
63
|
+
recording?.push(wave.map((call) => call.sql.replace(/\s+/g, " ").trim()));
|
|
64
|
+
for (const call of wave) call.run();
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
function roundTrip<T>(sql: string, execute: () => T): Promise<T> {
|
|
68
|
+
return new Promise<T>((resolve, reject) => {
|
|
69
|
+
pending.push({
|
|
70
|
+
sql,
|
|
71
|
+
run() {
|
|
72
|
+
try {
|
|
73
|
+
resolve(execute());
|
|
74
|
+
} catch (error) {
|
|
75
|
+
reject(error);
|
|
76
|
+
}
|
|
77
|
+
},
|
|
78
|
+
});
|
|
79
|
+
if (!flushScheduled) {
|
|
80
|
+
flushScheduled = true;
|
|
81
|
+
// A timer rather than a microtask, so reads a request starts together
|
|
82
|
+
// across `await`s that settle without D1 still share the wave.
|
|
83
|
+
setTimeout(flush, 1);
|
|
84
|
+
}
|
|
85
|
+
});
|
|
86
|
+
}
|
|
87
|
+
|
|
88
|
+
function runAll(sql: string, params: unknown[]) {
|
|
89
|
+
const statement = sqlite.prepare(sql);
|
|
90
|
+
const bound = params.map(bindValue);
|
|
91
|
+
if (statement.reader) {
|
|
92
|
+
return {
|
|
93
|
+
results: statement.all(...bound) as Record<string, unknown>[],
|
|
94
|
+
success: true,
|
|
95
|
+
meta: { changes: 0, last_row_id: 0 },
|
|
96
|
+
};
|
|
97
|
+
}
|
|
98
|
+
const info = statement.run(...bound);
|
|
99
|
+
return {
|
|
100
|
+
results: [] as Record<string, unknown>[],
|
|
101
|
+
success: true,
|
|
102
|
+
meta: {
|
|
103
|
+
changes: info.changes,
|
|
104
|
+
last_row_id: Number(info.lastInsertRowid),
|
|
105
|
+
},
|
|
106
|
+
};
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
class PreparedStatement {
|
|
110
|
+
constructor(
|
|
111
|
+
readonly sql: string,
|
|
112
|
+
readonly params: unknown[] = [],
|
|
113
|
+
) {}
|
|
114
|
+
|
|
115
|
+
bind(...params: unknown[]) {
|
|
116
|
+
return new PreparedStatement(this.sql, params);
|
|
117
|
+
}
|
|
118
|
+
|
|
119
|
+
all() {
|
|
120
|
+
return roundTrip(this.sql, () => runAll(this.sql, this.params));
|
|
121
|
+
}
|
|
122
|
+
|
|
123
|
+
run() {
|
|
124
|
+
return roundTrip(this.sql, () => runAll(this.sql, this.params));
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
first(column?: string) {
|
|
128
|
+
return roundTrip(this.sql, () => {
|
|
129
|
+
const row = runAll(this.sql, this.params).results[0] ?? null;
|
|
130
|
+
return row && column ? row[column] : row;
|
|
131
|
+
});
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
raw(options?: { columnNames?: boolean }) {
|
|
135
|
+
return roundTrip(this.sql, () => {
|
|
136
|
+
const statement = sqlite.prepare(this.sql);
|
|
137
|
+
const bound = this.params.map(bindValue);
|
|
138
|
+
if (!statement.reader) {
|
|
139
|
+
statement.run(...bound);
|
|
140
|
+
return [];
|
|
141
|
+
}
|
|
142
|
+
const rows = statement.raw(true).all(...bound) as unknown[][];
|
|
143
|
+
return options?.columnNames
|
|
144
|
+
? [statement.columns().map((column) => column.name), ...rows]
|
|
145
|
+
: rows;
|
|
146
|
+
});
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
const database = {
|
|
151
|
+
prepare: (sql: string) => new PreparedStatement(sql),
|
|
152
|
+
batch: (statements: PreparedStatement[]) =>
|
|
153
|
+
roundTrip(statements.map((statement) => statement.sql).join("; "), () => {
|
|
154
|
+
sqlite.exec("BEGIN");
|
|
155
|
+
try {
|
|
156
|
+
const results = statements.map((statement) =>
|
|
157
|
+
runAll(statement.sql, statement.params),
|
|
158
|
+
);
|
|
159
|
+
sqlite.exec("COMMIT");
|
|
160
|
+
return results;
|
|
161
|
+
} catch (error) {
|
|
162
|
+
sqlite.exec("ROLLBACK");
|
|
163
|
+
throw error;
|
|
164
|
+
}
|
|
165
|
+
}),
|
|
166
|
+
exec: (sql: string) => roundTrip(sql, () => sqlite.exec(sql)),
|
|
167
|
+
};
|
|
168
|
+
|
|
169
|
+
const binding = {
|
|
170
|
+
...database,
|
|
171
|
+
withSession: () => ({ ...database, getBookmark: () => null }),
|
|
172
|
+
} as unknown as D1Database;
|
|
173
|
+
|
|
174
|
+
return {
|
|
175
|
+
binding,
|
|
176
|
+
/**
|
|
177
|
+
* Run `task` and record every wave of D1 calls it makes.
|
|
178
|
+
*
|
|
179
|
+
* @param task - Work to trace; nothing else should use the binding meanwhile
|
|
180
|
+
* @returns The task's result and its waves
|
|
181
|
+
*/
|
|
182
|
+
async measure<T>(
|
|
183
|
+
task: () => Promise<T>,
|
|
184
|
+
): Promise<{ result: T } & RoundTripTrace> {
|
|
185
|
+
const waves: string[][] = [];
|
|
186
|
+
recording = waves;
|
|
187
|
+
try {
|
|
188
|
+
return { result: await task(), waves };
|
|
189
|
+
} finally {
|
|
190
|
+
recording = null;
|
|
191
|
+
}
|
|
192
|
+
},
|
|
193
|
+
};
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
/**
|
|
197
|
+
* Render a trace as one line per statement, numbered by wave, for a failure
|
|
198
|
+
* message that says where the rounds went.
|
|
199
|
+
*
|
|
200
|
+
* @param trace - Waves recorded by `measure`
|
|
201
|
+
* @returns Readable listing
|
|
202
|
+
*/
|
|
203
|
+
export function formatRoundTripTrace(trace: RoundTripTrace): string {
|
|
204
|
+
return trace.waves
|
|
205
|
+
.map((wave, index) =>
|
|
206
|
+
wave
|
|
207
|
+
.map(
|
|
208
|
+
(sql) => ` ${String(index + 1).padStart(2)} ${sql.slice(0, 200)}`,
|
|
209
|
+
)
|
|
210
|
+
.join("\n"),
|
|
211
|
+
)
|
|
212
|
+
.join("\n");
|
|
213
|
+
}
|
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `dependencies` lists what a site has to install, and nothing else.
|
|
3
|
+
*
|
|
4
|
+
* The library build leaves a package in `dependencies` as an import a site
|
|
5
|
+
* resolves from its own node_modules and bundles everything else into dist
|
|
6
|
+
* (`vite.config.worker.ts`), and `bin/` runs unbundled from the installed
|
|
7
|
+
* package. So a package belongs in `dependencies` exactly when the server or
|
|
8
|
+
* the CLI loads it. Client-only packages used to sit there too, and every new
|
|
9
|
+
* site downloaded TipTap, Lit, the emoji data and the HEIC and video encoders
|
|
10
|
+
* that only the prebuilt browser bundles use. These walk the server and CLI
|
|
11
|
+
* imports from source and fail when the two lists drift apart.
|
|
12
|
+
*/
|
|
13
|
+
|
|
14
|
+
import { readdirSync, readFileSync, statSync } from "node:fs";
|
|
15
|
+
import { builtinModules } from "node:module";
|
|
16
|
+
import { dirname, join, resolve } from "node:path";
|
|
17
|
+
import { describe, expect, it } from "vitest";
|
|
18
|
+
|
|
19
|
+
const CORE_DIR = resolve(import.meta.dirname, "../..");
|
|
20
|
+
|
|
21
|
+
const DEPENDENCIES = Object.keys(
|
|
22
|
+
(
|
|
23
|
+
JSON.parse(readFileSync(join(CORE_DIR, "package.json"), "utf8")) as {
|
|
24
|
+
dependencies: Record<string, string>;
|
|
25
|
+
}
|
|
26
|
+
).dependencies,
|
|
27
|
+
);
|
|
28
|
+
|
|
29
|
+
/** The library build's entries, as `build.lib.entry` names them. */
|
|
30
|
+
const SERVER_ENTRIES = ["src/index.ts", "src/node/index.ts"];
|
|
31
|
+
|
|
32
|
+
/** Specifiers a module loads at runtime; `import type` is erased. */
|
|
33
|
+
function runtimeSpecifiers(file: string): string[] {
|
|
34
|
+
const source = readFileSync(file, "utf8");
|
|
35
|
+
return [
|
|
36
|
+
...source.matchAll(
|
|
37
|
+
/^\s*(?:import|export)\s+(?!type\b)(?:[^"';]*?\s+from\s+)?["']([^"']+)["']/gm,
|
|
38
|
+
),
|
|
39
|
+
...source.matchAll(/\bimport\(\s*["']([^"']+)["']\s*\)/g),
|
|
40
|
+
].map((match) => match[1] ?? "");
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
function resolveModule(from: string, specifier: string): string | null {
|
|
44
|
+
const base = resolve(dirname(from), specifier);
|
|
45
|
+
const candidates = [
|
|
46
|
+
base,
|
|
47
|
+
base.replace(/\.js$/, ".ts"),
|
|
48
|
+
base.replace(/\.js$/, ".tsx"),
|
|
49
|
+
`${base}.ts`,
|
|
50
|
+
`${base}.tsx`,
|
|
51
|
+
join(base, "index.ts"),
|
|
52
|
+
];
|
|
53
|
+
return (
|
|
54
|
+
candidates.find((candidate) =>
|
|
55
|
+
statSync(candidate, { throwIfNoEntry: false })?.isFile(),
|
|
56
|
+
) ?? null
|
|
57
|
+
);
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/** The npm package a bare specifier names, or null for a builtin. */
|
|
61
|
+
function packageName(specifier: string): string | null {
|
|
62
|
+
if (specifier.includes(":") || builtinModules.includes(specifier)) {
|
|
63
|
+
return null;
|
|
64
|
+
}
|
|
65
|
+
const [scope, name] = specifier.split("/");
|
|
66
|
+
return specifier.startsWith("@") ? `${scope}/${name}` : (scope ?? null);
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
/**
|
|
70
|
+
* Packages a set of modules loads, following relative imports from them.
|
|
71
|
+
* Imports into dist are left out: dist is the build of `SERVER_ENTRIES`.
|
|
72
|
+
*/
|
|
73
|
+
function loadedPackages(entries: string[]): Set<string> {
|
|
74
|
+
const seen = new Set(entries);
|
|
75
|
+
const queue = [...entries];
|
|
76
|
+
const packages = new Set<string>();
|
|
77
|
+
while (queue.length > 0) {
|
|
78
|
+
const file = queue.shift() as string;
|
|
79
|
+
for (const specifier of runtimeSpecifiers(file)) {
|
|
80
|
+
if (specifier.startsWith(".")) {
|
|
81
|
+
const next = resolveModule(file, specifier);
|
|
82
|
+
if (next && !next.includes("/dist/") && !seen.has(next)) {
|
|
83
|
+
seen.add(next);
|
|
84
|
+
queue.push(next);
|
|
85
|
+
}
|
|
86
|
+
continue;
|
|
87
|
+
}
|
|
88
|
+
const name = packageName(specifier);
|
|
89
|
+
if (name && name !== "@jant/core") packages.add(name);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
return packages;
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
function jsFiles(dir: string): string[] {
|
|
96
|
+
return readdirSync(dir, { withFileTypes: true }).flatMap((entry) => {
|
|
97
|
+
const path = join(dir, entry.name);
|
|
98
|
+
if (entry.isDirectory()) return jsFiles(path);
|
|
99
|
+
return entry.name.endsWith(".js") ? [path] : [];
|
|
100
|
+
});
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
describe("package dependencies", () => {
|
|
104
|
+
const server = loadedPackages(
|
|
105
|
+
SERVER_ENTRIES.map((entry) => join(CORE_DIR, entry)),
|
|
106
|
+
);
|
|
107
|
+
// Every file, not a walk: commands are loaded by name at run time.
|
|
108
|
+
const cli = loadedPackages(jsFiles(join(CORE_DIR, "bin")));
|
|
109
|
+
|
|
110
|
+
it("list only packages the server or the CLI loads", () => {
|
|
111
|
+
expect(
|
|
112
|
+
DEPENDENCIES.filter((name) => !server.has(name) && !cli.has(name)),
|
|
113
|
+
"only the build or dist/client uses these: move them to devDependencies",
|
|
114
|
+
).toEqual([]);
|
|
115
|
+
});
|
|
116
|
+
|
|
117
|
+
it("list every package the CLI loads", () => {
|
|
118
|
+
expect(
|
|
119
|
+
[...cli].filter((name) => !DEPENDENCIES.includes(name)),
|
|
120
|
+
"bin/ runs unbundled from a site's node_modules",
|
|
121
|
+
).toEqual([]);
|
|
122
|
+
});
|
|
123
|
+
});
|
|
@@ -0,0 +1,203 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Round-trip budget for public pages on Workers + D1.
|
|
3
|
+
*
|
|
4
|
+
* A Worker waits the full Worker↔D1 distance for every read it cannot start
|
|
5
|
+
* alongside another one, and that wait is nearly all a public page costs: the
|
|
6
|
+
* render itself is a few milliseconds. From a Tokyo edge a D1 primary in the
|
|
7
|
+
* US is ~125 ms away, so each round a page adds here is ~125 ms a reader
|
|
8
|
+
* waits there. The budgets below are that cost made visible: a change that
|
|
9
|
+
* makes a page wait on one more read fails here and has to say why.
|
|
10
|
+
*
|
|
11
|
+
* The site is served by the real `createApp()` with a D1 binding, and seeded
|
|
12
|
+
* with what makes a page do its full work: threads with replies past the
|
|
13
|
+
* preview fold, collections, media, custom URLs, and navigation.
|
|
14
|
+
*/
|
|
15
|
+
|
|
16
|
+
import { beforeAll, describe, expect, it } from "vitest";
|
|
17
|
+
import { createApp } from "../app.js";
|
|
18
|
+
import type { Database } from "../db/index.js";
|
|
19
|
+
import { createServices, type Services } from "../services/index.js";
|
|
20
|
+
import type { Bindings } from "../types.js";
|
|
21
|
+
import {
|
|
22
|
+
createRoundTripD1,
|
|
23
|
+
formatRoundTripTrace,
|
|
24
|
+
} from "./helpers/d1-round-trips.js";
|
|
25
|
+
import { createTestDatabase, DEFAULT_TEST_SITE_ID } from "./helpers/db.js";
|
|
26
|
+
|
|
27
|
+
const ORIGIN = "https://blog.example";
|
|
28
|
+
|
|
29
|
+
const executionCtx = {
|
|
30
|
+
waitUntil() {},
|
|
31
|
+
passThroughOnException() {},
|
|
32
|
+
props: {},
|
|
33
|
+
} as unknown as Parameters<ReturnType<typeof createApp>["fetch"]>[2];
|
|
34
|
+
|
|
35
|
+
async function seedSite(services: Services) {
|
|
36
|
+
await services.settings.completeOnboarding();
|
|
37
|
+
|
|
38
|
+
const reading = await services.collections.create({
|
|
39
|
+
slug: "reading",
|
|
40
|
+
title: "Reading",
|
|
41
|
+
});
|
|
42
|
+
const tools = await services.collections.create({
|
|
43
|
+
slug: "tools",
|
|
44
|
+
title: "Tools",
|
|
45
|
+
});
|
|
46
|
+
await services.navItems.create({
|
|
47
|
+
type: "collection",
|
|
48
|
+
collectionId: reading.id,
|
|
49
|
+
});
|
|
50
|
+
await services.navItems.create({
|
|
51
|
+
type: "link",
|
|
52
|
+
label: "Elsewhere",
|
|
53
|
+
url: "https://example.net",
|
|
54
|
+
});
|
|
55
|
+
|
|
56
|
+
const start = 1_760_000_000;
|
|
57
|
+
let root = null;
|
|
58
|
+
for (let index = 0; index < 30; index++) {
|
|
59
|
+
const post = await services.posts.create({
|
|
60
|
+
format: index % 3 === 0 ? "link" : "note",
|
|
61
|
+
language: "en",
|
|
62
|
+
title: `Post ${index}`,
|
|
63
|
+
url: index % 3 === 0 ? `https://example.com/${index}` : undefined,
|
|
64
|
+
bodyMarkdown: `Body of post ${index}.`,
|
|
65
|
+
status: "published",
|
|
66
|
+
publishedAt: start + index * 3600,
|
|
67
|
+
collectionIds:
|
|
68
|
+
index % 2 === 0 ? [reading.id] : index % 5 === 0 ? [tools.id] : [],
|
|
69
|
+
});
|
|
70
|
+
if (index % 4 === 0) {
|
|
71
|
+
await services.media.create({
|
|
72
|
+
postId: post.id,
|
|
73
|
+
filename: `photo-${index}.jpg`,
|
|
74
|
+
originalName: `photo-${index}.jpg`,
|
|
75
|
+
mimeType: "image/jpeg",
|
|
76
|
+
size: 1024,
|
|
77
|
+
storageKey: `media/${DEFAULT_TEST_SITE_ID}/photo-${index}.jpg`,
|
|
78
|
+
width: 800,
|
|
79
|
+
height: 600,
|
|
80
|
+
});
|
|
81
|
+
}
|
|
82
|
+
root = post;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
// The newest post leads a thread long enough to fold, so the home page
|
|
86
|
+
// renders leading and trailing replies with a gap between them.
|
|
87
|
+
if (!root) throw new Error("no posts seeded");
|
|
88
|
+
let parent = root;
|
|
89
|
+
for (let index = 0; index < 8; index++) {
|
|
90
|
+
parent = await services.posts.create({
|
|
91
|
+
format: "note",
|
|
92
|
+
bodyMarkdown: `Reply ${index}.`,
|
|
93
|
+
status: "published",
|
|
94
|
+
replyToId: parent.id,
|
|
95
|
+
publishedAt: start + 40 * 3600 + index * 60,
|
|
96
|
+
});
|
|
97
|
+
if (index === 6) {
|
|
98
|
+
await services.media.create({
|
|
99
|
+
postId: parent.id,
|
|
100
|
+
filename: "reply.jpg",
|
|
101
|
+
originalName: "reply.jpg",
|
|
102
|
+
mimeType: "image/jpeg",
|
|
103
|
+
size: 1024,
|
|
104
|
+
storageKey: `media/${DEFAULT_TEST_SITE_ID}/reply.jpg`,
|
|
105
|
+
width: 800,
|
|
106
|
+
height: 600,
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
await services.customUrls.create({
|
|
111
|
+
path: "thread-start",
|
|
112
|
+
targetType: "post",
|
|
113
|
+
targetId: root.id,
|
|
114
|
+
});
|
|
115
|
+
|
|
116
|
+
// Translated, so the post page also builds its language alternates.
|
|
117
|
+
const translation = await services.posts.create({
|
|
118
|
+
format: "note",
|
|
119
|
+
language: "ja",
|
|
120
|
+
title: "翻訳",
|
|
121
|
+
bodyMarkdown: "本文。",
|
|
122
|
+
status: "published",
|
|
123
|
+
publishedAt: start - 3600,
|
|
124
|
+
});
|
|
125
|
+
await services.posts.linkTranslation(root.id, translation.id);
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
async function createSite() {
|
|
129
|
+
const { db, sqlite } = createTestDatabase();
|
|
130
|
+
const services = createServices(
|
|
131
|
+
db as unknown as Database,
|
|
132
|
+
{ query: async () => [] } as unknown as Parameters<
|
|
133
|
+
typeof createServices
|
|
134
|
+
>[1],
|
|
135
|
+
DEFAULT_TEST_SITE_ID,
|
|
136
|
+
{ slugIdLength: 5 },
|
|
137
|
+
);
|
|
138
|
+
await seedSite(services);
|
|
139
|
+
|
|
140
|
+
const d1 = createRoundTripD1(sqlite);
|
|
141
|
+
const app = createApp();
|
|
142
|
+
const env = {
|
|
143
|
+
DB: d1.binding,
|
|
144
|
+
SITE_ORIGIN: ORIGIN,
|
|
145
|
+
AUTH_SECRET: "x".repeat(40),
|
|
146
|
+
} as unknown as Bindings;
|
|
147
|
+
|
|
148
|
+
async function request(path: string) {
|
|
149
|
+
return d1.measure(async () => {
|
|
150
|
+
const res = await app.fetch(
|
|
151
|
+
new Request(`${ORIGIN}${path}`, { redirect: "manual" }),
|
|
152
|
+
env,
|
|
153
|
+
executionCtx,
|
|
154
|
+
);
|
|
155
|
+
await res.arrayBuffer();
|
|
156
|
+
return res;
|
|
157
|
+
});
|
|
158
|
+
}
|
|
159
|
+
|
|
160
|
+
// The first request in an isolate learns that setup is finished and keeps
|
|
161
|
+
// that answer; every later reader's request is the one worth budgeting.
|
|
162
|
+
await request("/");
|
|
163
|
+
|
|
164
|
+
return { request };
|
|
165
|
+
}
|
|
166
|
+
|
|
167
|
+
describe("public page round trips", () => {
|
|
168
|
+
let site: Awaited<ReturnType<typeof createSite>>;
|
|
169
|
+
|
|
170
|
+
beforeAll(async () => {
|
|
171
|
+
site = await createSite();
|
|
172
|
+
});
|
|
173
|
+
|
|
174
|
+
// [page, path, expected status, budget]. Every page starts with two rounds:
|
|
175
|
+
// the site, then its settings alongside the requested address. Lower a
|
|
176
|
+
// budget when a page gets cheaper, so the saving cannot quietly come undone.
|
|
177
|
+
const cases: Array<[string, string, number, number]> = [
|
|
178
|
+
// + the page of thread roots, its media, collections and reply previews,
|
|
179
|
+
// and the previews' own media.
|
|
180
|
+
["home", "/", 200, 5],
|
|
181
|
+
// Nothing on the second page has replies to preview.
|
|
182
|
+
["home, page 2", "/?page=2", 200, 4],
|
|
183
|
+
// + the post, its thread and translations, their media and addresses.
|
|
184
|
+
["post page", "/thread-start", 200, 5],
|
|
185
|
+
["archive", "/archive", 200, 5],
|
|
186
|
+
["archive, grid", "/archive?layout=grid", 200, 4],
|
|
187
|
+
["collections directory", "/collections", 200, 4],
|
|
188
|
+
// + the collection, the page of thread ids, the threads, their media.
|
|
189
|
+
["collection page", "/reading", 200, 6],
|
|
190
|
+
["not found", "/no-such-page", 404, 2],
|
|
191
|
+
];
|
|
192
|
+
|
|
193
|
+
for (const [name, path, status, budget] of cases) {
|
|
194
|
+
it(`${name} waits on at most ${budget} D1 round trips`, async () => {
|
|
195
|
+
const trace = await site.request(path);
|
|
196
|
+
expect(trace.result.status).toBe(status);
|
|
197
|
+
expect(
|
|
198
|
+
trace.waves.length,
|
|
199
|
+
`${name} took ${trace.waves.length} round trips:\n${formatRoundTripTrace(trace)}`,
|
|
200
|
+
).toBeLessThanOrEqual(budget);
|
|
201
|
+
});
|
|
202
|
+
}
|
|
203
|
+
});
|
|
@@ -1,101 +1,57 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* The deploy workflow a `create-jant` project ships
|
|
3
|
-
* and D1 database are set.
|
|
2
|
+
* The deploy workflow a `create-jant` project ships keeps no logic of its own.
|
|
4
3
|
*
|
|
5
|
-
*
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
4
|
+
* The workflow lives in the author's repo, and no upgrade of `@jant/core`
|
|
5
|
+
* reaches it. Its old preflight step read `database_id` from `wrangler.toml`
|
|
6
|
+
* with a sed pattern escaped twice, so every push skipped the deploy, green,
|
|
7
|
+
* and the only fix was for each author to edit the file. The checks now live
|
|
8
|
+
* in `jant deploy --ci`, which runs the version in the project's lockfile; the
|
|
9
|
+
* workflow only installs and calls it.
|
|
10
10
|
*/
|
|
11
11
|
|
|
12
|
-
import {
|
|
13
|
-
import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
|
|
14
|
-
import { tmpdir } from "node:os";
|
|
12
|
+
import { readFileSync } from "node:fs";
|
|
15
13
|
import { join, resolve } from "node:path";
|
|
16
|
-
import {
|
|
14
|
+
import { describe, expect, it } from "vitest";
|
|
17
15
|
import { parse } from "yaml";
|
|
18
16
|
|
|
19
17
|
const REPO_ROOT = resolve(import.meta.dirname, "../../../..");
|
|
20
18
|
const WORKFLOW = "sites/demo/.github/workflows/deploy.yml";
|
|
21
19
|
|
|
22
20
|
interface WorkflowStep {
|
|
23
|
-
|
|
21
|
+
name?: string;
|
|
22
|
+
uses?: string;
|
|
24
23
|
run?: string;
|
|
24
|
+
env?: Record<string, string>;
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
-
function
|
|
27
|
+
function steps(): WorkflowStep[] {
|
|
28
28
|
const workflow = parse(readFileSync(join(REPO_ROOT, WORKFLOW), "utf8")) as {
|
|
29
29
|
jobs: Record<string, { steps: WorkflowStep[] }>;
|
|
30
30
|
};
|
|
31
|
-
|
|
32
|
-
.flatMap((job) => job.steps)
|
|
33
|
-
.find((candidate) => candidate.id === "preflight");
|
|
34
|
-
if (!step?.run) throw new Error(`No preflight step in ${WORKFLOW}`);
|
|
35
|
-
return step.run;
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
const dirs: string[] = [];
|
|
39
|
-
|
|
40
|
-
afterEach(() => {
|
|
41
|
-
for (const dir of dirs.splice(0)) rmSync(dir, { recursive: true });
|
|
42
|
-
});
|
|
43
|
-
|
|
44
|
-
function runPreflight(
|
|
45
|
-
wranglerToml: string,
|
|
46
|
-
secrets: { CF_API_TOKEN: string; CF_ACCOUNT_ID: string },
|
|
47
|
-
): string {
|
|
48
|
-
const dir = mkdtempSync(join(tmpdir(), "jant-deploy-preflight-"));
|
|
49
|
-
dirs.push(dir);
|
|
50
|
-
writeFileSync(join(dir, "wrangler.toml"), wranglerToml);
|
|
51
|
-
const output = join(dir, "output");
|
|
52
|
-
writeFileSync(output, "");
|
|
53
|
-
execFileSync("bash", ["-c", preflightScript()], {
|
|
54
|
-
cwd: dir,
|
|
55
|
-
env: {
|
|
56
|
-
PATH: process.env.PATH,
|
|
57
|
-
...secrets,
|
|
58
|
-
GITHUB_OUTPUT: output,
|
|
59
|
-
GITHUB_STEP_SUMMARY: join(dir, "summary"),
|
|
60
|
-
},
|
|
61
|
-
});
|
|
62
|
-
return readFileSync(output, "utf8").trim();
|
|
63
|
-
}
|
|
64
|
-
|
|
65
|
-
const secrets = { CF_API_TOKEN: "token", CF_ACCOUNT_ID: "account" };
|
|
66
|
-
|
|
67
|
-
function wranglerToml(databaseId: string): string {
|
|
68
|
-
return [
|
|
69
|
-
'name = "my-blog"',
|
|
70
|
-
"",
|
|
71
|
-
"[[d1_databases]]",
|
|
72
|
-
'binding = "DB"',
|
|
73
|
-
'database_name = "my-blog-db"',
|
|
74
|
-
`database_id = "${databaseId}"`,
|
|
75
|
-
"",
|
|
76
|
-
].join("\n");
|
|
31
|
+
return Object.values(workflow.jobs).flatMap((job) => job.steps);
|
|
77
32
|
}
|
|
78
33
|
|
|
79
34
|
describe("template deploy workflow", () => {
|
|
80
|
-
it("
|
|
81
|
-
expect(
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
)
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
expect(
|
|
35
|
+
it("installs and hands the deploy to jant deploy --ci", () => {
|
|
36
|
+
expect(steps().map((step) => step.name)).toEqual([
|
|
37
|
+
"Checkout",
|
|
38
|
+
"Setup Node.js",
|
|
39
|
+
"Install dependencies",
|
|
40
|
+
"Deploy",
|
|
41
|
+
]);
|
|
42
|
+
|
|
43
|
+
const deploy = steps().find((step) => step.name === "Deploy");
|
|
44
|
+
expect(deploy?.run).toBe("npx jant deploy --ci");
|
|
45
|
+
expect(deploy?.env).toEqual({
|
|
46
|
+
CLOUDFLARE_API_TOKEN: "${{ secrets.CF_API_TOKEN }}",
|
|
47
|
+
CLOUDFLARE_ACCOUNT_ID: "${{ secrets.CF_ACCOUNT_ID }}",
|
|
48
|
+
});
|
|
91
49
|
});
|
|
92
50
|
|
|
93
|
-
it("
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
}),
|
|
99
|
-
).toBe("ready=false");
|
|
51
|
+
it("runs no script of its own", () => {
|
|
52
|
+
for (const step of steps()) {
|
|
53
|
+
expect(step.run ?? "", step.name).not.toContain("\n");
|
|
54
|
+
expect(step, step.name).not.toHaveProperty("if");
|
|
55
|
+
}
|
|
100
56
|
});
|
|
101
57
|
});
|