@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.
Files changed (183) hide show
  1. package/bin/commands/deploy.js +179 -0
  2. package/bin/lib/cloudflare-setup.js +499 -0
  3. package/bin/lib/d1-query.js +26 -1
  4. package/bin/lib/r2-query.js +2 -2
  5. package/dist/{app-jQI4OPRe.js → app-DSwsDBD0.js} +28623 -635
  6. package/dist/client/.vite/manifest.json +2 -2
  7. package/dist/client/_assets/{client-52vQhZAv.js → client-DPByjWoU.js} +1 -1
  8. package/dist/client/_assets/{client-auth-BDcCR6u1.js → client-auth-CPqPTX1B.js} +1 -1
  9. package/dist/index.js +1 -1
  10. package/dist/node.js +2 -2
  11. package/package.json +31 -31
  12. package/src/__tests__/bin/deploy.test.ts +163 -0
  13. package/src/__tests__/export-hugo-build.test.ts +5 -5
  14. package/src/__tests__/export-import-roundtrip.test.ts +1 -1
  15. package/src/__tests__/export-service.test.ts +2 -2
  16. package/src/__tests__/fixtures/releases/0.11.0/site-export/README.md +130 -0
  17. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/297kg/_index.md +14 -0
  18. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/2thjq/_index.md +25 -0
  19. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/2u5e5/_index.md +33 -0
  20. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/41q27/0x4nv/index.md +18 -0
  21. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/41q27/_index.md +42 -0
  22. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/41q27/faqyt/index.md +28 -0
  23. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/41q27/the-potting-mix-guide-i-keep-rereading/index.md +20 -0
  24. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/5kayp/_index.md +23 -0
  25. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/5ynfs/_index.md +31 -0
  26. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/5ynfs/hu597/index.md +21 -0
  27. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/_index.md +5 -0
  28. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/a-night-heron-field-guide-for-my-walk-folder/_index.md +31 -0
  29. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/a-quiet-saturday-after-a-busy-week/_index.md +36 -0
  30. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/archive/_index.md +8 -0
  31. 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
  32. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/bought-too-many-lemons-again/_index.md +35 -0
  33. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/city-walks/_index.md +14 -0
  34. 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
  35. 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
  36. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/co344/_index.md +25 -0
  37. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/collections/_index.md +5 -0
  38. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/current-tea-rotation/_index.md +34 -0
  39. 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
  40. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/desk-but-better/_index.md +25 -0
  41. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/e0kcg/_index.md +22 -0
  42. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/egi3c/_index.md +24 -0
  43. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/evf9j/_index.md +129 -0
  44. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/featured/_index.md +8 -0
  45. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/fixture-draft/_index.md +17 -0
  46. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/fixture-quotes/_index.md +13 -0
  47. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/fixture-text-attachment/_index.md +29 -0
  48. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-basho/_index.md +25 -0
  49. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-epictetus/_index.md +25 -0
  50. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-marcus-aurelius/_index.md +25 -0
  51. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-seneca/_index.md +26 -0
  52. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/from-thoreau/_index.md +25 -0
  53. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gkbvv/2cl6d/index.md +18 -0
  54. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gkbvv/3zqv7/index.md +28 -0
  55. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gkbvv/5oxsv/index.md +18 -0
  56. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gkbvv/_index.md +37 -0
  57. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/gwob9/_index.md +25 -0
  58. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/home-cooking/_index.md +12 -0
  59. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/hz729/_index.md +24 -0
  60. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/inaturalist-ai-zi-ran-she-qu/_index.md +42 -0
  61. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/j4v0q/_index.md +33 -0
  62. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k278t/_index.md +25 -0
  63. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k4eee/_index.md +22 -0
  64. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k5vh8/_index.md +32 -0
  65. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k5vh8/a-reading-log-idea-i-might-steal/index.md +20 -0
  66. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k5vh8/a83qu/index.md +18 -0
  67. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/k5vh8/from-seneca-5hibo/index.md +21 -0
  68. 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
  69. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/l2m7y/_index.md +29 -0
  70. 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
  71. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/mynoise-for-rainy-afternoons/_index.md +30 -0
  72. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/n09le/_index.md +23 -0
  73. 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
  74. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/nts-archives-are-good-cleaning-music/_index.md +30 -0
  75. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/qgfcu/_index.md +32 -0
  76. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/qgfcu/c91j0/index.md +18 -0
  77. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/qgfcu/qyucy/index.md +18 -0
  78. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/qgfcu/wsgck/index.md +18 -0
  79. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/rain-makes-my-neighborhood-look-better/_index.md +44 -0
  80. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/reading-notes/_index.md +12 -0
  81. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/s4r3e/_index.md +25 -0
  82. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/serious-eats-on-tomato-and-egg-soup/_index.md +30 -0
  83. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/te812/_index.md +42 -0
  84. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/te812/cxiu6/index.md +18 -0
  85. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/te812/t77ms/index.md +18 -0
  86. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/te812/the-soup-trick-i-always-forget/index.md +20 -0
  87. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/telk3/_index.md +30 -0
  88. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/telk3/from-thoreau-pawt2/index.md +21 -0
  89. 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
  90. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/the-hallway-light-took-12-minutes-and-3-months/_index.md +32 -0
  91. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/the-recurse-center-manual-is-weirdly-calming/_index.md +30 -0
  92. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/tiny-projects/_index.md +12 -0
  93. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/tong-wang-xing-fu-zhi-lu/_index.md +68 -0
  94. 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
  95. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/useful-links/_index.md +12 -0
  96. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/weekend-notes/_index.md +12 -0
  97. package/src/__tests__/fixtures/releases/0.11.0/site-export/content/what-i-actually-use-my-notebook-for/_index.md +50 -0
  98. package/src/__tests__/fixtures/releases/0.11.0/site-export/data/jant.toml +155 -0
  99. package/src/__tests__/fixtures/releases/0.11.0/site-export/hugo.toml +45 -0
  100. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/_redirects +30 -0
  101. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/3c46a9ea6fe0-med_01kn8jtq3penf98tfq4gzmh9g9.png +0 -0
  102. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jtx8qenf98tm9ahxr48sw.webp +0 -0
  103. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jv0jdenf98tp6qr9zgjjc.webp +0 -0
  104. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jv452enf98trbkwrvhvgd.webp +0 -0
  105. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jvb16enf98txp7p0pf5ge.webp +0 -0
  106. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jve5nenf98tzap11gpxzr.webp +0 -0
  107. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jvq58enf98v538w5vsqp4.webp +0 -0
  108. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jvsaeenf98v6ct4gjzppc.webp +0 -0
  109. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01kn8jw26cenf98vc7k0ppz5k8.webp +0 -0
  110. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m313q1hme4e8cmby77dn66yy.webp +0 -0
  111. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m313q2w7e4e8cmc20036yh66.webp +0 -0
  112. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m313q7d2e4e8cmdeqjmyafby.webp +0 -0
  113. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m313q887e4e8cmdjssych7yh.webp +0 -0
  114. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp-poster.webp +0 -0
  115. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp.mp4 +0 -0
  116. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf-poster.webp +0 -0
  117. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf.mp4 +0 -0
  118. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb-poster.webp +0 -0
  119. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb.mp4 +0 -0
  120. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83-poster.webp +0 -0
  121. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83.mp4 +0 -0
  122. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167sm0f6ct88qw5brtsgcw.webp +0 -0
  123. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167tf8f6ct88r169s51j49.webp +0 -0
  124. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167vaaf6ct88rbx5ztenwb.webp +0 -0
  125. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167w51f6ct88rp19pybkw1.webp +0 -0
  126. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167x0nf6ct88rzajb84tw3.webp +0 -0
  127. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167xxbf6ct88s5t2300bjk.webp +0 -0
  128. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167yq5f6ct88s9pjwt5fxg.webp +0 -0
  129. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m3167zg4f6ct88sge8jp28ja.webp +0 -0
  130. package/src/__tests__/fixtures/releases/0.11.0/site-export/static/media/med_01m50607a6e8h8gfpa8byqtt7h.md +3 -0
  131. package/src/__tests__/fixtures/releases/0.11.0/site-export/themes/jant/static/apple-touch-icon.png +0 -0
  132. package/src/__tests__/fixtures/releases/0.11.0/site-export/themes/jant/static/custom.css +0 -0
  133. package/src/__tests__/fixtures/releases/0.11.0/site-export/themes/jant/static/favicon.ico +0 -0
  134. package/src/__tests__/fixtures/releases/0.11.0/site-export/wrangler.jsonc +24 -0
  135. package/src/__tests__/fixtures/releases/0.11.0/snapshot/db.sql +339 -0
  136. package/src/__tests__/fixtures/releases/0.11.0/snapshot/meta.json +11 -0
  137. package/src/__tests__/helpers/d1-round-trips.ts +213 -0
  138. package/src/__tests__/package-dependencies.test.ts +123 -0
  139. package/src/__tests__/public-page-round-trips.test.ts +203 -0
  140. package/src/__tests__/template-deploy-workflow.test.ts +33 -77
  141. package/src/__tests__/vite-config.test.ts +32 -0
  142. package/src/app.tsx +7 -1
  143. package/src/client/icons.ts +5 -6
  144. package/src/db/__tests__/d1-query.test.ts +29 -0
  145. package/src/db/__tests__/migration-rehearsal.test.ts +2 -2
  146. package/src/lib/__tests__/icons.test.ts +21 -10
  147. package/src/lib/api-posts.ts +4 -2
  148. package/src/lib/api-public-posts.ts +4 -2
  149. package/src/lib/constants.ts +20 -0
  150. package/src/lib/icons.ts +96 -34
  151. package/src/lib/post-display.ts +13 -9
  152. package/src/lib/timeline.ts +23 -21
  153. package/src/lib/view.ts +3 -2
  154. package/src/middleware/__tests__/onboarding.test.ts +5 -3
  155. package/src/middleware/__tests__/secure-headers.test.ts +40 -42
  156. package/src/middleware/config.ts +44 -2
  157. package/src/middleware/onboarding.ts +12 -3
  158. package/src/middleware/secure-headers.ts +25 -36
  159. package/src/node/__tests__/cli-deploy-setup.test.ts +373 -0
  160. package/src/node/__tests__/cli-deploy.test.ts +55 -0
  161. package/src/routes/feed/feed.ts +4 -2
  162. package/src/routes/pages/__tests__/post-page-round-trips.test.ts +10 -10
  163. package/src/routes/pages/archive.tsx +36 -17
  164. package/src/routes/pages/collection.tsx +72 -35
  165. package/src/routes/pages/page.tsx +46 -25
  166. package/src/routes/pages/search.tsx +3 -1
  167. package/src/services/__tests__/collection.test.ts +2 -4
  168. package/src/services/collection.ts +95 -71
  169. package/src/services/export.ts +2 -1
  170. package/src/services/post.ts +150 -205
  171. package/src/services/settings.ts +4 -8
  172. package/src/types/app-context.ts +5 -0
  173. package/src/ui/pages/ArchivePage.tsx +34 -34
  174. package/src/ui/pages/CollectionPage.tsx +1 -1
  175. package/src/ui/pages/SmartCollectionPage.tsx +2 -2
  176. package/src/ui/pages/SubscribePage.tsx +2 -4
  177. package/src/ui/shared/CollectionDirectory.tsx +2 -2
  178. package/src/ui/shared/CollectionsManager.tsx +1 -1
  179. package/src/ui/shared/CopyField.tsx +1 -1
  180. package/src/ui/shared/Icon.tsx +5 -5
  181. package/src/ui/shared/IconSprite.tsx +10 -11
  182. package/src/ui/shared/custom-icons.ts +38 -7
  183. package/src/ui/shared/icon-collector.ts +7 -5
@@ -0,0 +1,499 @@
1
+ /**
2
+ * First-deploy setup for a Cloudflare project.
3
+ *
4
+ * `create-jant` writes `database_id = "local"` into `wrangler.toml`: enough for
5
+ * `npm run dev`, which only touches the local D1, and a placeholder no remote
6
+ * command can use. `jant deploy` sees it and creates what the site needs on
7
+ * Cloudflare before the first deploy — the D1 database, the R2 buckets, and a
8
+ * production `AUTH_SECRET` — so a new project deploys with one command.
9
+ *
10
+ * Every step looks before it creates. A database or bucket with the configured
11
+ * name is reused, and an `AUTH_SECRET` the Worker already has is never
12
+ * replaced, so a rerun after a failure, or a project scaffolded again under the
13
+ * same name, picks up where the last run stopped.
14
+ */
15
+
16
+ import { randomBytes } from "node:crypto";
17
+ import { mkdtempSync, readFileSync, rmSync, writeFileSync } from "node:fs";
18
+ import { tmpdir } from "node:os";
19
+ import { join } from "node:path";
20
+ import { createInterface } from "node:readline/promises";
21
+ import { parse as parseToml } from "smol-toml";
22
+ import {
23
+ readWranglerDatabaseConfig,
24
+ resolveWranglerConfigPath,
25
+ } from "./migration-artifacts.js";
26
+ import { runLocalWrangler } from "./wrangler-cli.js";
27
+ import { extractWranglerJson } from "./wrangler-json.js";
28
+
29
+ /** The `database_id` create-jant writes for local development. */
30
+ export const PLACEHOLDER_DATABASE_ID = "local";
31
+
32
+ /**
33
+ * Where the first deploy sends the author next. Written out here rather than
34
+ * through `getJantDocsUrl()`, which lives in the TypeScript runtime the CLI
35
+ * doesn't load; the CLI always links the released docs.
36
+ */
37
+ export const BEFORE_GOING_LIVE_URL =
38
+ "https://jant.me/docs/deployment#before-going-live";
39
+
40
+ const R2_DASHBOARD_URL = "https://dash.cloudflare.com/?to=/:account/r2";
41
+
42
+ /**
43
+ * Whether the D1 binding still has no real database behind it.
44
+ *
45
+ * A config with no such binding needs no setup: whatever needs the database
46
+ * later reports the missing binding itself.
47
+ *
48
+ * @param {{ configPath?: string, env?: string, database?: string }} options
49
+ * @returns {boolean} True when `database_id` is missing or create-jant's placeholder
50
+ * @example
51
+ * needsFirstDeploySetup({ configPath: "wrangler.toml" }); // true right after `npm create jant`
52
+ */
53
+ export function needsFirstDeploySetup(options = {}) {
54
+ let databaseId;
55
+ try {
56
+ ({ databaseId } = readWranglerDatabaseConfig(options));
57
+ } catch {
58
+ return false;
59
+ }
60
+ return !databaseId || databaseId === PLACEHOLDER_DATABASE_ID;
61
+ }
62
+
63
+ function wranglerOutput(error) {
64
+ return `${error?.stdout ?? ""}\n${error?.stderr ?? ""}\n${error?.message ?? ""}`;
65
+ }
66
+
67
+ /**
68
+ * The first error line Wrangler printed, without its color codes and banner.
69
+ *
70
+ * @param {unknown} error - What `runLocalWrangler` threw
71
+ * @returns {string} One line to show the author
72
+ */
73
+ function wranglerErrorLine(error) {
74
+ const lines = wranglerOutput(error)
75
+ .replace(/\u001b\[[0-9;]*m/g, "")
76
+ .split("\n")
77
+ .map((line) => line.trim())
78
+ .filter(Boolean);
79
+ const errorLine = lines.find((line) => line.startsWith("✘"));
80
+ const detail = errorLine
81
+ ? lines[lines.indexOf(errorLine) + 1]
82
+ : lines.find((line) => !line.startsWith("🪵"));
83
+ const head = errorLine?.replace(/^✘\s*\[ERROR\]\s*/, "");
84
+ return [head, detail].filter(Boolean).join(" ") || "unknown error";
85
+ }
86
+
87
+ function isInteractive(io) {
88
+ return Boolean(io.stdin.isTTY && io.stdout.isTTY) && !process.env.CI;
89
+ }
90
+
91
+ function contextArgs(context) {
92
+ const args = ["--config", context.configPath];
93
+ if (context.env) args.push("--env", context.env);
94
+ return args;
95
+ }
96
+
97
+ function readJson(output) {
98
+ return JSON.parse(extractWranglerJson(output).trim());
99
+ }
100
+
101
+ /**
102
+ * Make sure Wrangler is signed in, running `wrangler login` when a person is
103
+ * at the terminal. A script or coding agent gets an error that says what to
104
+ * run instead, since the sign-in happens in a browser.
105
+ */
106
+ function ensureSignedIn(context) {
107
+ const whoami = () => {
108
+ try {
109
+ return readJson(context.wrangler(["whoami", "--json"]));
110
+ } catch (error) {
111
+ try {
112
+ return readJson(String(error?.stdout ?? ""));
113
+ } catch {
114
+ throw new Error(
115
+ `Could not check the Cloudflare sign-in: ${wranglerErrorLine(error)}`,
116
+ );
117
+ }
118
+ }
119
+ };
120
+
121
+ let user = whoami();
122
+ if (user.loggedIn) return user;
123
+
124
+ if (!isInteractive(context.io)) {
125
+ throw new Error(
126
+ "Not signed in to Cloudflare. Run `npx wrangler login` and finish the sign-in in the browser, or set CLOUDFLARE_API_TOKEN. Then deploy again.",
127
+ );
128
+ }
129
+
130
+ context.log("Not signed in to Cloudflare. Opening the browser to sign in...");
131
+ context.wrangler(["login"], { stdio: "inherit" });
132
+ user = whoami();
133
+ if (!user.loggedIn) {
134
+ throw new Error(
135
+ "Cloudflare sign-in didn't finish. Run `npx wrangler login`, then deploy again.",
136
+ );
137
+ }
138
+ return user;
139
+ }
140
+
141
+ function configuredAccountId(context) {
142
+ if (process.env.CLOUDFLARE_ACCOUNT_ID)
143
+ return process.env.CLOUDFLARE_ACCOUNT_ID;
144
+ const config = parseToml(readFileSync(context.absoluteConfigPath, "utf-8"));
145
+ const scoped = context.env ? config.env?.[context.env] : undefined;
146
+ return scoped?.account_id ?? config.account_id ?? null;
147
+ }
148
+
149
+ /**
150
+ * Pick the account to create resources in when the sign-in reaches more than
151
+ * one, and remember it in `wrangler.toml` so later deploys don't ask again.
152
+ */
153
+ async function ensureAccount(user, context) {
154
+ const accounts = Array.isArray(user.accounts) ? user.accounts : [];
155
+ if (accounts.length < 2 || configuredAccountId(context)) return;
156
+
157
+ const listing = accounts
158
+ .map((account, index) => ` ${index + 1}. ${account.name} (${account.id})`)
159
+ .join("\n");
160
+
161
+ if (!isInteractive(context.io)) {
162
+ throw new Error(
163
+ `This Cloudflare sign-in can use more than one account:\n${listing}\nAdd account_id = "<id>" to wrangler.toml, or set CLOUDFLARE_ACCOUNT_ID, then deploy again.`,
164
+ );
165
+ }
166
+
167
+ context.log("This Cloudflare sign-in can use more than one account:");
168
+ context.log(listing);
169
+ const answer = await context.ask(
170
+ `Deploy to which account? [1-${accounts.length}] `,
171
+ );
172
+ const account = accounts[Number.parseInt(answer, 10) - 1];
173
+ if (!account) {
174
+ throw new Error(`"${answer}" isn't one of the listed accounts.`);
175
+ }
176
+
177
+ const raw = readFileSync(context.absoluteConfigPath, "utf-8");
178
+ writeFileSync(context.absoluteConfigPath, setAccountId(raw, account.id));
179
+ context.log(`Using ${account.name}. Saved its account_id in wrangler.toml.`);
180
+ }
181
+
182
+ function findD1Database(name, context) {
183
+ const databases = readJson(
184
+ context.wrangler(["d1", "list", "--json", ...contextArgs(context)]),
185
+ );
186
+ return databases.find((database) => database.name === name) ?? null;
187
+ }
188
+
189
+ function ensureD1Database(databaseName, context) {
190
+ const existing = findD1Database(databaseName, context);
191
+ if (existing) {
192
+ context.log(`D1 database ${databaseName}: found, reusing it.`);
193
+ return existing.uuid;
194
+ }
195
+
196
+ try {
197
+ context.wrangler(["d1", "create", databaseName, ...contextArgs(context)]);
198
+ } catch (error) {
199
+ throw new Error(
200
+ `Could not create the D1 database ${databaseName}: ${wranglerErrorLine(error)}`,
201
+ );
202
+ }
203
+ const created = findD1Database(databaseName, context);
204
+ if (!created) {
205
+ throw new Error(
206
+ `Created the D1 database ${databaseName}, but it isn't in \`wrangler d1 list\` yet. Deploy again in a minute.`,
207
+ );
208
+ }
209
+ context.log(`D1 database ${databaseName}: created.`);
210
+ return created.uuid;
211
+ }
212
+
213
+ function r2NotEnabled(error) {
214
+ return /code: 10042|enable R2/i.test(wranglerOutput(error));
215
+ }
216
+
217
+ function r2NotEnabledError() {
218
+ return new Error(
219
+ `R2 isn't enabled on this Cloudflare account. Open ${R2_DASHBOARD_URL}, click Enable R2, then deploy again.`,
220
+ );
221
+ }
222
+
223
+ function ensureR2Bucket(bucket, context) {
224
+ const name = String(bucket.bucket_name);
225
+ const jurisdiction = bucket.jurisdiction
226
+ ? ["--jurisdiction", String(bucket.jurisdiction)]
227
+ : [];
228
+
229
+ try {
230
+ context.wrangler([
231
+ "r2",
232
+ "bucket",
233
+ "info",
234
+ name,
235
+ "--json",
236
+ ...jurisdiction,
237
+ ...contextArgs(context),
238
+ ]);
239
+ context.log(`R2 bucket ${name}: found, reusing it.`);
240
+ return;
241
+ } catch (error) {
242
+ if (r2NotEnabled(error)) throw r2NotEnabledError();
243
+ if (!/code: 10006|does not exist/i.test(wranglerOutput(error))) {
244
+ throw new Error(
245
+ `Could not check the R2 bucket ${name}: ${wranglerErrorLine(error)}`,
246
+ );
247
+ }
248
+ }
249
+
250
+ try {
251
+ context.wrangler([
252
+ "r2",
253
+ "bucket",
254
+ "create",
255
+ name,
256
+ ...jurisdiction,
257
+ ...contextArgs(context),
258
+ ]);
259
+ } catch (error) {
260
+ if (r2NotEnabled(error)) throw r2NotEnabledError();
261
+ throw new Error(
262
+ `Could not create the R2 bucket ${name}: ${wranglerErrorLine(error)}`,
263
+ );
264
+ }
265
+ context.log(`R2 bucket ${name}: created.`);
266
+ }
267
+
268
+ function workerHasSecret(secretName, context) {
269
+ try {
270
+ const secrets = readJson(
271
+ context.wrangler([
272
+ "secret",
273
+ "list",
274
+ "--format",
275
+ "json",
276
+ ...contextArgs(context),
277
+ ]),
278
+ );
279
+ return secrets.some((secret) => secret.name === secretName);
280
+ } catch (error) {
281
+ // A Worker that was never deployed has no secrets yet.
282
+ if (/Worker ".*" not found|code: 10007/i.test(wranglerOutput(error))) {
283
+ return false;
284
+ }
285
+ throw new Error(
286
+ `Could not read the Worker's secrets: ${wranglerErrorLine(error)}`,
287
+ );
288
+ }
289
+ }
290
+
291
+ /**
292
+ * Write a generated `AUTH_SECRET` to a file `wrangler deploy --secrets-file`
293
+ * reads, so the Worker's first version starts with it. The file is readable by
294
+ * the current user only and removed once the deploy is over.
295
+ */
296
+ function writeAuthSecretFile() {
297
+ const dir = mkdtempSync(join(tmpdir(), "jant-deploy-"));
298
+ const path = join(dir, "secrets.json");
299
+ writeFileSync(
300
+ path,
301
+ JSON.stringify({ AUTH_SECRET: randomBytes(32).toString("base64") }),
302
+ { mode: 0o600 },
303
+ );
304
+ return { path, remove: () => rmSync(dir, { recursive: true, force: true }) };
305
+ }
306
+
307
+ function findTableHeader(line) {
308
+ const match = line.match(/^\s*\[\[?\s*([^\]]+?)\s*\]\]?\s*(?:#.*)?$/);
309
+ return match ? match[1] : null;
310
+ }
311
+
312
+ /**
313
+ * Put a D1 database ID into `wrangler.toml` text, keeping its comments and
314
+ * layout: the `database_id` line of the binding's `[[d1_databases]]` entry is
315
+ * replaced, or added after `database_name` when the entry has none.
316
+ *
317
+ * @param {string} raw - The file's text
318
+ * @param {{ binding: string, databaseId: string, env?: string }} target
319
+ * @returns {string} The updated text
320
+ * @example
321
+ * setD1DatabaseId(raw, { binding: "DB", databaseId: "7c1e…" });
322
+ */
323
+ export function setD1DatabaseId(raw, { binding, databaseId, env }) {
324
+ const tableName = env ? `env.${env}.d1_databases` : "d1_databases";
325
+ const lines = raw.split("\n");
326
+ const headers = lines
327
+ .map((line, index) => ({ index, name: findTableHeader(line) }))
328
+ .filter((header) => header.name !== null);
329
+ const blocks = headers.map((header, position) => ({
330
+ name: header.name,
331
+ start: header.index,
332
+ end: headers[position + 1]?.index ?? lines.length,
333
+ }));
334
+ const block = blocks.find(
335
+ ({ name, start, end }) =>
336
+ name === tableName &&
337
+ entryHasBinding(lines.slice(start + 1, end), binding),
338
+ );
339
+
340
+ if (!block) {
341
+ throw new Error(`No [[${tableName}]] entry for binding "${binding}".`);
342
+ }
343
+
344
+ const { start, end } = block;
345
+ const entry = lines.slice(start + 1, end);
346
+ const idLine = entry.findIndex((line) => /^\s*database_id\s*=/.test(line));
347
+ if (idLine !== -1) {
348
+ lines[start + 1 + idLine] = lines[start + 1 + idLine].replace(
349
+ /^(\s*database_id\s*=\s*)(["'])[^"']*\2/,
350
+ `$1"${databaseId}"`,
351
+ );
352
+ } else {
353
+ const nameLine = entry.findIndex((line) =>
354
+ /^\s*database_name\s*=/.test(line),
355
+ );
356
+ const bindingLine = entry.findIndex((line) => /^\s*binding\s*=/.test(line));
357
+ const after = start + 1 + (nameLine !== -1 ? nameLine : bindingLine);
358
+ lines.splice(after + 1, 0, `database_id = "${databaseId}"`);
359
+ }
360
+
361
+ return lines.join("\n");
362
+ }
363
+
364
+ function entryHasBinding(entryLines, binding) {
365
+ return entryLines.some((line) => {
366
+ const match = line.match(/^\s*binding\s*=\s*(["'])([^"']*)\1/);
367
+ return match?.[2] === binding;
368
+ });
369
+ }
370
+
371
+ /**
372
+ * Add a top-level `account_id` to `wrangler.toml` text, after `name` or
373
+ * before the first table. Environments inherit it.
374
+ *
375
+ * @param {string} raw - The file's text
376
+ * @param {string} accountId - The Cloudflare account ID
377
+ * @returns {string} The updated text
378
+ * @example
379
+ * setAccountId('name = "blog"\n[vars]\n', "abc"); // 'name = "blog"\naccount_id = "abc"\n[vars]\n'
380
+ */
381
+ export function setAccountId(raw, accountId) {
382
+ const lines = raw.split("\n");
383
+ const firstTable = lines.findIndex((line) => findTableHeader(line) !== null);
384
+ const topLevel = firstTable === -1 ? lines.length : firstTable;
385
+ const nameLine = lines
386
+ .slice(0, topLevel)
387
+ .findIndex((line) => /^\s*name\s*=/.test(line));
388
+ const insertAt = nameLine !== -1 ? nameLine + 1 : topLevel;
389
+ lines.splice(insertAt, 0, `account_id = "${accountId}"`);
390
+ return lines.join("\n");
391
+ }
392
+
393
+ function readR2Buckets(context) {
394
+ const config = parseToml(readFileSync(context.absoluteConfigPath, "utf-8"));
395
+ const scoped = context.env ? config.env?.[context.env] : config;
396
+ const buckets = scoped?.r2_buckets;
397
+ return Array.isArray(buckets)
398
+ ? buckets.filter((bucket) => bucket?.bucket_name)
399
+ : [];
400
+ }
401
+
402
+ /**
403
+ * Create what a first deploy needs on Cloudflare and point `wrangler.toml` at
404
+ * the D1 database.
405
+ *
406
+ * Call it only when {@link needsFirstDeploySetup} says so. The returned
407
+ * `restore` puts the placeholder back, for a deploy that fails: the next run
408
+ * then sets up again, reusing what this one created, and still hands the
409
+ * Worker its `AUTH_SECRET`.
410
+ *
411
+ * @param {{ configPath: string, env?: string, database: string }} options
412
+ * @param {object} [deps] - Injected for tests
413
+ * @returns {Promise<{ secretsFile: string | null, restore: () => void, cleanup: () => void }>}
414
+ * @example
415
+ * const setup = await runFirstDeploySetup({ configPath: "wrangler.toml", database: "DB" });
416
+ */
417
+ export async function runFirstDeploySetup(options, deps = {}) {
418
+ const io = deps.io ?? { stdin: process.stdin, stdout: process.stdout };
419
+ const context = {
420
+ configPath: options.configPath,
421
+ absoluteConfigPath: resolveWranglerConfigPath(options.configPath),
422
+ env: options.env,
423
+ io,
424
+ log: deps.log ?? ((message) => console.log(message)),
425
+ wrangler:
426
+ deps.wrangler ??
427
+ ((args, runOptions = {}) => runLocalWrangler(args, runOptions)),
428
+ ask:
429
+ deps.ask ??
430
+ (async (question) => {
431
+ const readline = createInterface({
432
+ input: io.stdin,
433
+ output: io.stdout,
434
+ });
435
+ try {
436
+ return (await readline.question(question)).trim();
437
+ } finally {
438
+ readline.close();
439
+ }
440
+ }),
441
+ };
442
+
443
+ const { databaseName } = readWranglerDatabaseConfig({
444
+ configPath: options.configPath,
445
+ env: options.env,
446
+ database: options.database,
447
+ });
448
+ if (!databaseName) {
449
+ throw new Error(
450
+ `Add database_name to the [[d1_databases]] entry for "${options.database}" in ${options.configPath}, then deploy again.`,
451
+ );
452
+ }
453
+
454
+ context.log("First deploy: setting up Cloudflare resources...");
455
+ const user = ensureSignedIn(context);
456
+ await ensureAccount(user, context);
457
+
458
+ const databaseId = ensureD1Database(databaseName, context);
459
+ for (const bucket of readR2Buckets(context)) {
460
+ ensureR2Bucket(bucket, context);
461
+ }
462
+
463
+ let secrets = null;
464
+ if (workerHasSecret("AUTH_SECRET", context)) {
465
+ context.log("AUTH_SECRET: already set on the Worker, keeping it.");
466
+ } else {
467
+ secrets = writeAuthSecretFile();
468
+ context.log("AUTH_SECRET: generated. It goes to the Worker as a secret.");
469
+ }
470
+
471
+ const configured = readFileSync(context.absoluteConfigPath, "utf-8");
472
+ const updated = setD1DatabaseId(configured, {
473
+ binding: options.database,
474
+ databaseId,
475
+ env: options.env,
476
+ });
477
+ writeFileSync(context.absoluteConfigPath, updated);
478
+ if (
479
+ readWranglerDatabaseConfig({
480
+ configPath: options.configPath,
481
+ env: options.env,
482
+ database: options.database,
483
+ }).databaseId !== databaseId
484
+ ) {
485
+ writeFileSync(context.absoluteConfigPath, configured);
486
+ secrets?.remove();
487
+ throw new Error(
488
+ `Could not write the database ID to ${options.configPath}. Set database_id = "${databaseId}" in the [[d1_databases]] entry for "${options.database}", then deploy again.`,
489
+ );
490
+ }
491
+ context.log(`Wrote database_id to ${options.configPath}.`);
492
+
493
+ return {
494
+ secretsFile: secrets?.path ?? null,
495
+ // Back to the placeholder, keeping an account_id chosen above.
496
+ restore: () => writeFileSync(context.absoluteConfigPath, configured),
497
+ cleanup: () => secrets?.remove(),
498
+ };
499
+ }
@@ -68,6 +68,31 @@ export function parseWranglerError(output) {
68
68
  }
69
69
  }
70
70
 
71
+ /**
72
+ * Read the `--json` error out of a failed Wrangler call.
73
+ *
74
+ * Wrangler writes that error to stdout and its warnings to stderr, and a
75
+ * warning such as "Proxy environment variables detected" comes with any
76
+ * failure on a machine behind a proxy. Read together, the warning trails the
77
+ * JSON and breaks the parse, so the message fell back to the warning alone and
78
+ * the cause went unseen. Each stream is read on its own.
79
+ *
80
+ * @param {{ stdout?: string, stderr?: string } | undefined} error - The error a failed Wrangler call threw
81
+ * @returns {string | undefined} The error text and its notes, when Wrangler printed one
82
+ * @example
83
+ * parseWranglerFailure({
84
+ * stdout: '{"error":{"text":"Couldn\'t find a D1 DB with name or binding \'DB\'"}}',
85
+ * stderr: "▲ [WARNING] Proxy environment variables detected.",
86
+ * });
87
+ * // => "Couldn't find a D1 DB with name or binding 'DB'"
88
+ */
89
+ export function parseWranglerFailure(error) {
90
+ return (
91
+ parseWranglerError(error?.stdout?.trim()) ??
92
+ parseWranglerError(error?.stderr?.trim())
93
+ );
94
+ }
95
+
71
96
  function sleepSync(ms) {
72
97
  if (!Number.isFinite(ms) || ms <= 0) {
73
98
  return;
@@ -162,7 +187,7 @@ function runWrangler(args, options = {}) {
162
187
  return runLocalWrangler(args, getWranglerExecutionOptions(options));
163
188
  } catch (error) {
164
189
  const output = `${error.stdout ?? ""}${error.stderr ?? ""}`.trim();
165
- const wranglerError = parseWranglerError(output);
190
+ const wranglerError = parseWranglerFailure(error);
166
191
  const retryable = isRetryableWranglerD1Failure(output, error);
167
192
 
168
193
  if (retryable && attempt < retryAttempts) {
@@ -3,7 +3,7 @@ import { mkdir } from "node:fs/promises";
3
3
  import { dirname } from "node:path";
4
4
  import { Readable } from "node:stream";
5
5
  import { pipeline } from "node:stream/promises";
6
- import { parseWranglerError } from "./d1-query.js";
6
+ import { parseWranglerFailure } from "./d1-query.js";
7
7
  import { resolveWranglerR2BucketName } from "./wrangler-config.js";
8
8
  import { runLocalWrangler } from "./wrangler-cli.js";
9
9
 
@@ -67,7 +67,7 @@ function runWrangler(args, options = {}) {
67
67
  return runLocalWrangler(args, options);
68
68
  } catch (error) {
69
69
  const output = `${error.stdout ?? ""}${error.stderr ?? ""}`.trim();
70
- const wranglerError = parseWranglerError(output);
70
+ const wranglerError = parseWranglerFailure(error);
71
71
  const retryable = isRetryableWranglerR2Failure(output, error);
72
72
 
73
73
  if (retryable && attempt < retryAttempts) {