@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
@@ -121,4 +121,59 @@ SITE_PATH_PREFIX = "/blog"
121
121
  ]);
122
122
  expect(spawnOptions).toEqual(expect.objectContaining({ stdio: "inherit" }));
123
123
  });
124
+
125
+ async function deployNewProject(status: number) {
126
+ const root = await mkdtemp(join(tmpdir(), "jant-deploy-first-"));
127
+ tempDirs.push(root);
128
+ await writeFile(join(root, "wrangler.toml"), "");
129
+ process.chdir(root);
130
+
131
+ const setup = {
132
+ secretsFile: join(root, "secrets.json"),
133
+ restore: vi.fn(),
134
+ cleanup: vi.fn(),
135
+ };
136
+ const spawnSync = vi.fn(() => ({ status }));
137
+
138
+ vi.doMock("../../../bin/lib/cloudflare-setup.js", () => ({
139
+ BEFORE_GOING_LIVE_URL:
140
+ "https://jant.me/docs/deployment#before-going-live",
141
+ needsFirstDeploySetup: vi.fn(() => true),
142
+ runFirstDeploySetup: vi.fn(async () => setup),
143
+ }));
144
+ vi.doMock("../../../bin/commands/migrate.js", () => ({
145
+ run: vi.fn(async () => {}),
146
+ }));
147
+ vi.doMock("../../../bin/lib/public-assets.js", () => ({
148
+ DEFAULT_PUBLISH_DIR: "dist/public",
149
+ preparePublicAssets: vi.fn(),
150
+ resolvePackageClientRoot: vi.fn(() => join(root, "client")),
151
+ }));
152
+ vi.doMock("node:child_process", () => ({ spawnSync }));
153
+ vi.spyOn(console, "log").mockImplementation(() => {});
154
+ vi.spyOn(console, "error").mockImplementation(() => {});
155
+
156
+ const { run } = await import("../../../bin/commands/deploy.js");
157
+ return { run: () => run([]), setup, spawnSync };
158
+ }
159
+
160
+ it("hands a new project's first deploy its generated secrets", async () => {
161
+ const { run, setup, spawnSync } = await deployNewProject(0);
162
+ await run();
163
+
164
+ const [, wranglerArgs] = spawnSync.mock.calls[0];
165
+ expect(wranglerArgs).toEqual(
166
+ expect.arrayContaining(["--secrets-file", setup.secretsFile]),
167
+ );
168
+ expect(setup.restore).not.toHaveBeenCalled();
169
+ expect(setup.cleanup).toHaveBeenCalledOnce();
170
+ });
171
+
172
+ it("puts wrangler.toml back when a first deploy fails", async () => {
173
+ const { run, setup } = await deployNewProject(1);
174
+ await expect(run()).rejects.toThrow("wrangler deploy failed");
175
+
176
+ expect(setup.restore).toHaveBeenCalledOnce();
177
+ expect(setup.cleanup).toHaveBeenCalledOnce();
178
+ });
124
179
  });
@@ -135,7 +135,9 @@ export async function buildFeedPostViews(
135
135
  const [mediaMap, aliasesMap, collectionsMap] = await Promise.all([
136
136
  loadMediaMap(c, [...ids], mediaCtx),
137
137
  c.var.services.paths.getPostAliases([...ids]),
138
- c.var.services.collections.getCollectionsByPostIds(posts.map((p) => p.id)),
138
+ c.var.services.collections.getCollectionsByThreadIds(
139
+ posts.map((p) => p.threadId),
140
+ ),
139
141
  ]);
140
142
  const aliasMap = new Map<string, string>();
141
143
  for (const [id, aliases] of aliasesMap) {
@@ -155,7 +157,7 @@ export async function buildFeedPostViews(
155
157
  ),
156
158
  ]);
157
159
  const collectionTags = (post: Post): CollectionTagView[] =>
158
- (collectionsMap.get(post.id) ?? []).map((collection) => ({
160
+ (collectionsMap.get(post.threadId) ?? []).map((collection) => ({
159
161
  slug: collection.slug,
160
162
  title: collection.title,
161
163
  url: toPublicPath(
@@ -86,7 +86,7 @@ function countPostReads(statements: string[]): number {
86
86
  }
87
87
 
88
88
  describe("post page round trips", () => {
89
- it("resolves the requested address once, and keeps its post reads to three", async () => {
89
+ it("resolves the requested address once, and keeps its post reads to two", async () => {
90
90
  const { app, services, sqlite } = createPostPageApp();
91
91
  const post = await services.posts.create({
92
92
  format: "note",
@@ -103,11 +103,11 @@ describe("post page round trips", () => {
103
103
  // The middleware's lookup is the route's lookup.
104
104
  expect(countAddressLookups(statements)).toBe(1);
105
105
 
106
- // Three reads, and each is for something different: the post with its
107
- // canonical alias, its thread, and the thread ids that collection
108
- // membership is keyed by. A root post's visibility rides along in its own
109
- // row, so nothing goes back for that.
110
- expect(countPostReads(statements)).toBe(3);
106
+ // Two reads, and each is for something different: the post with its
107
+ // slug and canonical alias, and its thread. Collection membership is
108
+ // keyed by the thread id the post already carries, and a post's
109
+ // visibility rides along in its own row, so nothing goes back for either.
110
+ expect(countPostReads(statements)).toBe(2);
111
111
  });
112
112
 
113
113
  it("redirects a slug to its custom URL without a separate alias lookup", async () => {
@@ -214,7 +214,7 @@ describe("post list round trips", () => {
214
214
  expect(countPostReads(statements)).toBe(1);
215
215
  });
216
216
 
217
- it("still looks up the root for a reply loaded on its own", async () => {
217
+ it("takes a reply's visibility from its root in the same read", async () => {
218
218
  const { services, sqlite } = createTestApp();
219
219
  const root = await services.posts.create({
220
220
  format: "note",
@@ -235,9 +235,9 @@ describe("post list round trips", () => {
235
235
  );
236
236
 
237
237
  // A reply's own visibility column is null — it inherits the root's — and
238
- // the root is not among the rows loaded here, so the second read is what
239
- // makes the reply private too.
240
- expect(countPostReads(statements)).toBe(2);
238
+ // the read carries the root's alongside the row, so the reply is private
239
+ // without a second trip for it.
240
+ expect(countPostReads(statements)).toBe(1);
241
241
  expect(loaded?.visibility).toBe("private");
242
242
  });
243
243
  });
@@ -473,12 +473,39 @@ export async function renderArchivePage(
473
473
  })
474
474
  : undefined;
475
475
 
476
+ const postsPromise = services.posts.list({
477
+ ...filters,
478
+ limit: pageSize,
479
+ offset: (params.currentPage - 1) * pageSize,
480
+ });
481
+ // What each layout reads per post needs only this page of posts, so it
482
+ // follows the list directly rather than waiting for everything beside it:
483
+ // the year picker takes a round longer than the list does.
484
+ const flatItemsPromise = isListView
485
+ ? postsPromise.then((listed) => assembleTimelineItems(c, listed))
486
+ : Promise.resolve(undefined);
487
+ const gridPostDataPromise = isListView
488
+ ? Promise.resolve(undefined)
489
+ : postsPromise.then(async (listed) => {
490
+ const postIds = listed.map((p) => p.id);
491
+ // Only the grid renders permalinks from this map. The list view goes
492
+ // through `assembleTimelineItems`, which loads the same aliases itself.
493
+ const [mediaByPost, replyCounts, aliasesByPost] = await Promise.all([
494
+ services.media.getByPostIds(postIds),
495
+ services.posts.getReplyCounts(postIds),
496
+ services.paths.getPostAliases(postIds),
497
+ ]);
498
+ return { mediaByPost, replyCounts, aliasesByPost };
499
+ });
500
+
476
501
  const [
477
502
  navData,
478
503
  totalCount,
479
504
  baselineCount,
480
505
  monthlyCounts,
481
506
  posts,
507
+ flatItems,
508
+ gridPostData,
482
509
  availableYears,
483
510
  listedCollections,
484
511
  ] = await Promise.all([
@@ -490,11 +517,9 @@ export async function renderArchivePage(
490
517
  isListView
491
518
  ? Promise.resolve([] as { yearMonth: string; count: number }[])
492
519
  : services.posts.countByYearMonth(filters, appConfig.timeZone),
493
- services.posts.list({
494
- ...filters,
495
- limit: pageSize,
496
- offset: (params.currentPage - 1) * pageSize,
497
- }),
520
+ postsPromise,
521
+ flatItemsPromise,
522
+ gridPostDataPromise,
498
523
  // The year picker is part of the page, so a signed-out reader mustn't
499
524
  // learn from it that private posts exist in a given year.
500
525
  services.posts.getDistinctYears(
@@ -525,11 +550,8 @@ export async function renderArchivePage(
525
550
  // --- List view: flat timeline items (no month grouping) ------------------
526
551
 
527
552
  let groups: Awaited<ReturnType<typeof toArchiveGroupsWithMedia>> = [];
528
- let flatItems: Awaited<ReturnType<typeof assembleTimelineItems>> | undefined;
529
553
 
530
- if (isListView) {
531
- flatItems = await assembleTimelineItems(c, posts);
532
- } else {
554
+ if (gridPostData) {
533
555
  // --- Grid view: group posts by year-month --------------------------------
534
556
 
535
557
  const grouped = new Map<string, PostWithMedia[]>();
@@ -554,14 +576,11 @@ export async function renderArchivePage(
554
576
  monthlyCounts.map((row) => [row.yearMonth, row.count] as const),
555
577
  );
556
578
 
557
- const postIds = posts.map((p) => p.id);
558
- // Only the grid renders permalinks from this map. The list view goes
559
- // through `assembleTimelineItems`, which loads the same aliases itself.
560
- const [rawMediaMap, replyCounts, archiveAliasesMap] = await Promise.all([
561
- services.media.getByPostIds(postIds),
562
- services.posts.getReplyCounts(postIds),
563
- services.paths.getPostAliases(postIds),
564
- ]);
579
+ const {
580
+ mediaByPost: rawMediaMap,
581
+ replyCounts,
582
+ aliasesByPost: archiveAliasesMap,
583
+ } = gridPostData;
565
584
  const archiveAliasMap = new Map<string, string>();
566
585
  for (const [id, aliases] of archiveAliasesMap) {
567
586
  if (aliases[0]) archiveAliasMap.set(id, aliases[0]);
@@ -7,17 +7,19 @@ import { buildFeedPostViews } from "../feed/feed.js";
7
7
  import type { Bindings } from "../../types.js";
8
8
  import type { AppVariables } from "../../types/app-context.js";
9
9
  import { CollectionPage } from "../../ui/pages/CollectionPage.js";
10
- import type { CollectionPageProps } from "../../types.js";
10
+ import type { CollectionPageProps, CollectionSortOrder } from "../../types.js";
11
11
  import { getNavigationData } from "../../lib/navigation.js";
12
12
  import { formatPageLabel, parsePageNumber } from "../../lib/pagination.js";
13
13
  import { buildPageTitle } from "../../lib/page-title.js";
14
14
  import { renderPublicPage } from "../../lib/render.js";
15
15
  import {
16
16
  collectionSortParam,
17
+ isRatingSortOrder,
17
18
  parseCollectionSortParam,
18
19
  resolveCollectionSortOrder,
19
20
  supportsCollectionRatingSort,
20
21
  } from "../../lib/collection-sort.js";
22
+ import type { ResolvedCollectionSelection } from "../../services/collection.js";
21
23
  import { assembleCollectionTimeline } from "../../lib/timeline.js";
22
24
  import { defaultFeedRenderer } from "../../lib/feed.js";
23
25
  import {
@@ -74,28 +76,41 @@ function buildCollectionSelectionTitle(
74
76
  * routes under `/collections/{slug1}+{slug2}`.
75
77
  *
76
78
  * @param c - Hono context
77
- * @param slugExpression - Collection slug (or `a+b` aggregate expression)
79
+ * @param slugExpressionOrSelection - Collection slug (or `a+b` aggregate
80
+ * expression) to resolve, or a selection the caller already loaded
78
81
  * @param pagePathOverride - When set, used as the public page path instead of the derived canonical path
79
82
  */
80
83
  export async function renderCollectionPage(
81
84
  c: Context<Env>,
82
- slugExpression: string,
85
+ slugExpressionOrSelection: string | ResolvedCollectionSelection,
83
86
  pagePathOverride?: string,
84
87
  ): Promise<Response | null> {
85
88
  const page = parsePageNumber(c.req.query("page"));
86
89
  const paginatedPageTitle = formatPageLabel(page);
90
+ const isAuthenticated = c.var.isAuthenticated;
87
91
 
88
- const [selection, navData] = await Promise.all([
89
- c.var.services.collections.resolveSelection(slugExpression),
90
- getNavigationData(c),
91
- ]);
92
+ // The chrome needs nothing from the selection, so it loads beside it. A
93
+ // page that ends early never awaits it, and must not leave its failure
94
+ // unhandled.
95
+ const navDataPromise = getNavigationData(c);
96
+ navDataPromise.catch(() => {});
97
+ const selection =
98
+ typeof slugExpressionOrSelection === "string"
99
+ ? await c.var.services.collections.resolveSelection(
100
+ slugExpressionOrSelection,
101
+ )
102
+ : slugExpressionOrSelection;
92
103
  if (!selection) return null;
93
104
 
94
105
  const canonicalPagePath =
95
106
  pagePathOverride ?? getCollectionSelectionPath(selection.slugExpression);
96
107
 
97
108
  // Only redirect for slug normalization when using the derived canonical path
98
- if (!pagePathOverride && slugExpression !== selection.slugExpression) {
109
+ if (
110
+ !pagePathOverride &&
111
+ typeof slugExpressionOrSelection === "string" &&
112
+ slugExpressionOrSelection !== selection.slugExpression
113
+ ) {
99
114
  const search = new URL(c.req.url).search;
100
115
  return c.redirect(`${toViewPath(c, canonicalPagePath)}${search}`, 301);
101
116
  }
@@ -107,42 +122,64 @@ export async function renderCollectionPage(
107
122
  (collection) => collection.id,
108
123
  );
109
124
  const isAggregate = selection.collections.length > 1;
125
+ const requestedDefaultSort = isAggregate
126
+ ? "newest"
127
+ : primaryCollection.sortOrder;
128
+ const sortsFor = (showRatingSort: boolean) => {
129
+ const defaultSort = resolveCollectionSortOrder(
130
+ undefined,
131
+ requestedDefaultSort,
132
+ showRatingSort,
133
+ );
134
+ return {
135
+ defaultSort,
136
+ currentSort: resolveCollectionSortOrder(
137
+ requestedSort,
138
+ defaultSort,
139
+ showRatingSort,
140
+ ),
141
+ };
142
+ };
143
+ const timelineFor = (sortOrder: CollectionSortOrder) =>
144
+ assembleCollectionTimeline(c, {
145
+ collectionIds,
146
+ page,
147
+ isAuthenticated,
148
+ sortOrder,
149
+ });
110
150
 
111
- const ratedThreadCount =
112
- await c.var.services.posts.countCollectionThreadRootsUpToForCollections(
151
+ // Whether the rating sort is on offer depends on how many threads are
152
+ // rated, but the sort this page renders depends on that only when a rating
153
+ // sort is what was asked for. Any other sort starts the timeline beside the
154
+ // count instead of after it.
155
+ const ratedThreadCountPromise =
156
+ c.var.services.posts.countCollectionThreadRootsUpToForCollections(
113
157
  collectionIds,
114
158
  {
115
159
  status: "published",
116
- excludePrivate: !navData.isAuthenticated,
160
+ excludePrivate: !isAuthenticated,
117
161
  hasRating: true,
118
162
  },
119
163
  2,
120
164
  );
165
+ const timelinePromise = isRatingSortOrder(
166
+ requestedSort ?? requestedDefaultSort,
167
+ )
168
+ ? ratedThreadCountPromise.then((count) =>
169
+ timelineFor(sortsFor(supportsCollectionRatingSort(count)).currentSort),
170
+ )
171
+ : timelineFor(sortsFor(false).currentSort);
172
+ const [
173
+ navData,
174
+ ratedThreadCount,
175
+ { items, totalCount: totalThreadCount, totalPages },
176
+ ] = await Promise.all([
177
+ navDataPromise,
178
+ ratedThreadCountPromise,
179
+ timelinePromise,
180
+ ]);
121
181
  const showRatingSort = supportsCollectionRatingSort(ratedThreadCount);
122
- const requestedDefaultSort = isAggregate
123
- ? "newest"
124
- : primaryCollection.sortOrder;
125
- const defaultSort = resolveCollectionSortOrder(
126
- undefined,
127
- requestedDefaultSort,
128
- showRatingSort,
129
- );
130
- const currentSort = resolveCollectionSortOrder(
131
- requestedSort,
132
- defaultSort,
133
- showRatingSort,
134
- );
135
-
136
- const {
137
- items,
138
- totalCount: totalThreadCount,
139
- totalPages,
140
- } = await assembleCollectionTimeline(c, {
141
- collectionIds,
142
- page,
143
- isAuthenticated: navData.isAuthenticated,
144
- sortOrder: currentSort,
145
- });
182
+ const { defaultSort, currentSort } = sortsFor(showRatingSort);
146
183
  const i18n = getI18n(c);
147
184
  const selectionTitle = buildCollectionSelectionTitle(
148
185
  selection.collections,
@@ -246,6 +246,7 @@ function canRenderDraftAboutEditor(
246
246
  async function buildTranslationLinks(
247
247
  c: Context<Env>,
248
248
  post: Post,
249
+ canonicalAlias?: string | null,
249
250
  ): Promise<{
250
251
  alternates: LanguageAlternate[];
251
252
  pathByLanguage: Map<string, string>;
@@ -269,11 +270,17 @@ async function buildTranslationLinks(
269
270
  );
270
271
 
271
272
  // Prefer each post's custom URL when it has one, the same way permalinks do,
272
- // so a link never points at a URL that immediately redirects.
273
- const aliasesMap = await c.var.services.paths.getPostAliases([
274
- post.id,
273
+ // so a link never points at a URL that immediately redirects. The post's
274
+ // own is known when the caller loaded it with the post.
275
+ const aliasIds = [
276
+ ...(canonicalAlias === undefined ? [post.id] : []),
275
277
  ...siblings.map((other) => other.id),
276
- ]);
278
+ ];
279
+ const aliasesMap =
280
+ aliasIds.length > 0
281
+ ? await c.var.services.paths.getPostAliases(aliasIds)
282
+ : new Map<string, string[]>();
283
+ if (canonicalAlias) aliasesMap.set(post.id, [canonicalAlias]);
277
284
  const pathFor = (target: Post) =>
278
285
  getPostPath(target.slug, aliasesMap.get(target.id)?.[0]);
279
286
 
@@ -296,18 +303,28 @@ async function buildTranslationLinks(
296
303
  async function renderPost(
297
304
  c: Context<Env>,
298
305
  post: Post,
299
- options: { allowDraft?: boolean; isPreview?: boolean } = {},
306
+ options: {
307
+ allowDraft?: boolean;
308
+ isPreview?: boolean;
309
+ /** The post's canonical alias, when the caller loaded it with the post. */
310
+ canonicalAlias?: string | null;
311
+ } = {},
300
312
  ) {
301
- // Start navData fetch immediately — it's independent of thread/media queries.
302
- // The chrome is scoped to the post's language: a Japanese post's logo and
303
- // nav lead into /ja, since the post URL itself carries no language.
313
+ // The chrome, the thread, and the translation links each need only the
314
+ // post, so they load together. The chrome is scoped to the post's
315
+ // language: a Japanese post's logo and nav lead into /ja, since the post
316
+ // URL itself carries no language.
304
317
  const navDataPromise = getNavigationData(c, { languageScope: post.language });
305
- const display = await assemblePostPageDisplay(c, post, {
306
- // Private-post access is validated before renderPost() is called.
307
- isAuthenticated: true,
308
- allowDraft: options.allowDraft,
309
- includeDraftThread: options.isPreview,
310
- });
318
+ navDataPromise.catch(() => {});
319
+ const [display, { alternates, pathByLanguage }] = await Promise.all([
320
+ assemblePostPageDisplay(c, post, {
321
+ // Private-post access is validated before renderPost() is called.
322
+ isAuthenticated: true,
323
+ allowDraft: options.allowDraft,
324
+ includeDraftThread: options.isPreview,
325
+ }),
326
+ buildTranslationLinks(c, post, options.canonicalAlias),
327
+ ]);
311
328
  if (!display) {
312
329
  return c.notFound();
313
330
  }
@@ -320,7 +337,6 @@ async function renderPost(
320
337
  // profile (Simplified, Traditional, Japanese and Korean share code points
321
338
  // but not glyphs).
322
339
  if (post.language) c.set("lang", post.language);
323
- const { alternates, pathByLanguage } = await buildTranslationLinks(c, post);
324
340
  // The reader-facing half of the same data: a line under the post, so someone
325
341
  // who cannot read this language does not have to find the switcher.
326
342
  const translationLinks = [...pathByLanguage]
@@ -660,7 +676,10 @@ export async function renderRegisteredPath(c: Context<Env>): Promise<Response> {
660
676
  );
661
677
  }
662
678
 
663
- return renderPost(c, post, { allowDraft });
679
+ return renderPost(c, post, {
680
+ allowDraft,
681
+ canonicalAlias: loaded.canonicalAlias,
682
+ });
664
683
  }
665
684
 
666
685
  if (resolved.smartCollectionId) {
@@ -680,18 +699,15 @@ export async function renderRegisteredPath(c: Context<Env>): Promise<Response> {
680
699
  }
681
700
 
682
701
  if (resolved.collectionId) {
683
- const collection = await c.var.services.collections.getById(
702
+ const loaded = await c.var.services.collections.getWithCanonicalAlias(
684
703
  resolved.collectionId,
685
704
  );
686
- if (!collection) return c.notFound();
705
+ if (!loaded) return c.notFound();
706
+ const { collection, canonicalAlias } = loaded;
687
707
 
688
708
  // One address per collection, as for a post: its first custom URL, or
689
709
  // its slug. Any other way in redirects there, within the language view.
690
- const alias = await c.var.services.customUrls.getByTarget(
691
- "collection",
692
- collection.id,
693
- );
694
- const canonicalPath = alias ? alias.path : collection.slug;
710
+ const canonicalPath = canonicalAlias ?? collection.slug;
695
711
  if (fullPath !== canonicalPath) {
696
712
  return c.redirect(
697
713
  withRequestQuery(toViewPath(c, `/${canonicalPath}`), c.req.url),
@@ -699,10 +715,15 @@ export async function renderRegisteredPath(c: Context<Env>): Promise<Response> {
699
715
  );
700
716
  }
701
717
 
718
+ // Loaded and checked here, so the page does not look the slug up again.
702
719
  const result = await renderCollectionPage(
703
720
  c,
704
- collection.slug,
705
- alias ? `/${alias.path}` : undefined,
721
+ {
722
+ collections: [collection],
723
+ slugs: [collection.slug],
724
+ slugExpression: collection.slug,
725
+ },
726
+ canonicalAlias ? `/${canonicalAlias}` : undefined,
706
727
  );
707
728
  return result ?? c.notFound();
708
729
  }
@@ -87,7 +87,9 @@ export async function renderSearchPage(c: Context<Env>): Promise<Response> {
87
87
  const [navData, aliasesMap, collectionsMap] = await Promise.all([
88
88
  navDataPromise,
89
89
  c.var.services.paths.getPostAliases(postIds),
90
- c.var.services.collections.getCollectionsByPostIds(postIds),
90
+ c.var.services.collections.getCollectionsByThreadIds(
91
+ results.map((r) => r.post.threadId),
92
+ ),
91
93
  ]);
92
94
  const aliasMap = new Map<string, string>();
93
95
  for (const [id, aliases] of aliasesMap) {
@@ -1136,17 +1136,15 @@ describe("CollectionService", () => {
1136
1136
  const [rootCollections, childCollections, batch] = await Promise.all([
1137
1137
  collectionService.getCollectionsByPostId(root.id),
1138
1138
  collectionService.getCollectionsByPostId(child.id),
1139
- collectionService.getCollectionsByPostIds([root.id, child.id]),
1139
+ collectionService.getCollectionsByThreadIds([child.threadId]),
1140
1140
  ]);
1141
1141
 
1142
1142
  expect(rootCollections.map((item) => item.id)).toEqual([collection.id]);
1143
1143
  expect(childCollections.map((item) => item.id)).toEqual([collection.id]);
1144
+ expect(child.threadId).toBe(root.id);
1144
1145
  expect(batch.get(root.id)?.map((item) => item.id)).toEqual([
1145
1146
  collection.id,
1146
1147
  ]);
1147
- expect(batch.get(child.id)?.map((item) => item.id)).toEqual([
1148
- collection.id,
1149
- ]);
1150
1148
  });
1151
1149
 
1152
1150
  it("keeps shared membership when a Child is deleted and removes it with the Root", async () => {