@jant/core 0.7.0 → 0.8.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/assets/prepare.js +3 -3
- package/bin/commands/db/export.js +115 -2
- package/bin/commands/deploy.js +11 -3
- package/bin/commands/{search-reindex.js → search/reindex.js} +5 -5
- package/bin/commands/setup.js +136 -0
- package/bin/commands/site/export.js +117 -68
- package/bin/commands/site/import.js +3074 -2
- package/bin/commands/site/pull-media.js +2 -6
- package/bin/commands/site/snapshot/export.js +18 -60
- package/bin/commands/site/snapshot/import.js +24 -23
- package/bin/commands/telegram/register-webhooks.js +48 -23
- package/bin/jant.js +16 -11
- package/bin/lib/command-registry.js +120 -0
- package/bin/lib/d1-query.js +87 -2
- package/bin/lib/hugo-markdown.js +4 -0
- package/bin/lib/migration-artifacts.js +19 -0
- package/bin/lib/renamed-arguments.js +56 -0
- package/bin/lib/site-pull-media.js +21 -28
- package/bin/lib/site-selection.js +10 -1
- package/bin/lib/site-snapshot.js +421 -4
- package/bin/lib/sql-export.js +68 -5
- package/bin/lib/wrangler-cli.js +9 -0
- package/bin/lib/zip-archive.js +187 -0
- package/dist/{app-K_Aa1MMn.js → app-CFsmRVJN.js} +8629 -697
- package/dist/client/.vite/manifest.json +20 -20
- package/dist/client/_assets/chunks/{create-editor-CD3FhrOB.js → create-editor-B-m7X7S5.js} +50 -46
- package/dist/client/_assets/chunks/{sortable-list-CgaL2jCs.js → sortable-list-BJyd-LXE.js} +1 -1
- package/dist/client/_assets/chunks/{unsafe-svg-0QCkP0vZ.js → unsafe-svg-BkscJx69.js} +2 -2
- package/dist/client/_assets/{client-GiYENVw8.css → client-BCumu1-D.css} +1 -1
- package/dist/client/_assets/{client-VnFxJN7G.js → client-DTLBOHqD.js} +1 -1
- package/dist/client/_assets/{client-auth-k8gJ6QJj.js → client-auth-D6Ix6SmE.js} +1 -1
- package/dist/client/_assets/{client-compose-B_kDtWkW.js → client-compose-D6rExKVK.js} +1 -1
- package/dist/client/_assets/{client-manage-M90aSTOk.js → client-manage-sVOkqVbH.js} +1 -1
- package/dist/client/_assets/{client-settings-DfYs9n1F.js → client-settings-CGR_nZ78.js} +7 -7
- package/dist/index.js +2 -3
- package/dist/node.js +8 -5
- package/dist/url-CKlGzvdN.js +428 -0
- package/package.json +13 -7
- package/src/__tests__/cli-commands.test.ts +144 -0
- package/src/__tests__/config-docs.test.ts +148 -0
- package/src/__tests__/dev-scripts.test.ts +203 -0
- package/src/__tests__/export-collection-order.test.ts +276 -0
- package/src/__tests__/export-feed-ids.test.ts +184 -0
- package/src/__tests__/export-feed-order.test.ts +294 -0
- package/src/__tests__/export-hugo-build.test.ts +130 -0
- package/src/__tests__/export-import-roundtrip.test.ts +95 -1
- package/src/__tests__/export-service.test.ts +611 -28
- package/src/__tests__/export-smart-collection.test.ts +329 -0
- package/src/__tests__/feed-docs.test.ts +36 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/README.md +89 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/41q27/0x4nv/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/41q27/_index.md +41 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/41q27/faqyt/index.md +28 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/41q27/the-potting-mix-guide-i-keep-rereading/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/_index.md +4 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/a-night-heron-field-guide-for-my-walk-folder/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/a-quiet-saturday-after-a-busy-week/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/archive/_index.md +7 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/are-na-is-the-only-bookmark-pile-i-still-revisit/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/bought-too-many-lemons-again/_index.md +34 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/city-walks/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/collections/_index.md +4 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/current-tea-rotation/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/derek-sivers-still-writes-the-kind-of-internet-i-want-more-of/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/desk-but-better/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/e0kcg/_index.md +19 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/featured/_index.md +7 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/from-basho/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/from-epictetus/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/from-marcus-aurelius/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/from-seneca/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/from-thoreau/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/gkbvv/2cl6d/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/gkbvv/3zqv7/index.md +28 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/gkbvv/5oxsv/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/gkbvv/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/home-cooking/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/k5vh8/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/k5vh8/a-reading-log-idea-i-might-steal/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/k5vh8/a83qu/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/k5vh8/from-seneca-5hibo/index.md +19 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/mynoise-for-rainy-afternoons/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/nts-archives-are-good-cleaning-music/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/qgfcu/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/qgfcu/c91j0/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/qgfcu/qyucy/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/qgfcu/wsgck/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/rain-makes-my-neighborhood-look-better/_index.md +43 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/reading-notes/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/serious-eats-on-tomato-and-egg-soup/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/te812/_index.md +41 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/te812/cxiu6/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/te812/t77ms/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/te812/the-soup-trick-i-always-forget/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/telk3/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/telk3/from-thoreau-pawt2/index.md +17 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/the-five-minute-reset-is-still-the-best-habit-i-have/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/the-hallway-light-took-12-minutes-and-3-months/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/the-recurse-center-manual-is-weirdly-calming/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/tiny-projects/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/useful-links/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/weekend-notes/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/content/what-i-actually-use-my-notebook-for/_index.md +49 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/data/jant.toml +119 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/hugo.toml +43 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/021801c20ab3-med_01kn8jw26cenf98vc7k0ppz5k8.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/0f868ce9ac84-med_01kn8jtx8qenf98tm9ahxr48sw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/50c2ad911bad-med_01kn8jvb16enf98txp7p0pf5ge.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/7a91f0960491-med_01kn8jvq58enf98v538w5vsqp4.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/8714116d3c8e-med_01kn8jve5nenf98tzap11gpxzr.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/8a0b4277443f-med_01kn8jv0jdenf98tp6qr9zgjjc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/a7d1c8a1afd9-med_01kn8jv452enf98trbkwrvhvgd.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/e25570b405f5-med_01kn8jvsaeenf98v6ct4gjzppc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/static/media/e89ea4eabf01-med_01kn8jtq3penf98tfq4gzmh9g9.png +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/themes/jant/static/apple-touch-icon.png +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/themes/jant/static/custom.css +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/site-export/themes/jant/static/favicon.ico +0 -0
- package/src/__tests__/fixtures/releases/0.7.0/snapshot/db.sql +218 -0
- package/src/__tests__/fixtures/releases/0.7.0/snapshot/meta.json +9 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/README.md +89 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/41q27/0x4nv/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/41q27/_index.md +41 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/41q27/faqyt/index.md +28 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/41q27/the-potting-mix-guide-i-keep-rereading/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/_index.md +4 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/a-night-heron-field-guide-for-my-walk-folder/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/a-quiet-saturday-after-a-busy-week/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/archive/_index.md +7 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/are-na-is-the-only-bookmark-pile-i-still-revisit/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/bought-too-many-lemons-again/_index.md +34 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/city-walks/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/collections/_index.md +4 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/current-tea-rotation/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/derek-sivers-still-writes-the-kind-of-internet-i-want-more-of/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/desk-but-better/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/e0kcg/_index.md +19 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/featured/_index.md +7 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/from-basho/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/from-epictetus/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/from-marcus-aurelius/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/from-seneca/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/from-thoreau/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/gkbvv/2cl6d/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/gkbvv/3zqv7/index.md +28 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/gkbvv/5oxsv/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/gkbvv/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/home-cooking/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/k5vh8/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/k5vh8/a-reading-log-idea-i-might-steal/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/k5vh8/a83qu/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/k5vh8/from-seneca-5hibo/index.md +19 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/mynoise-for-rainy-afternoons/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/nts-archives-are-good-cleaning-music/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/qgfcu/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/qgfcu/c91j0/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/qgfcu/qyucy/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/qgfcu/wsgck/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/rain-makes-my-neighborhood-look-better/_index.md +43 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/reading-notes/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/serious-eats-on-tomato-and-egg-soup/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/te812/_index.md +41 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/te812/cxiu6/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/te812/t77ms/index.md +16 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/te812/the-soup-trick-i-always-forget/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/telk3/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/telk3/from-thoreau-pawt2/index.md +17 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/the-five-minute-reset-is-still-the-best-habit-i-have/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/the-hallway-light-took-12-minutes-and-3-months/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/the-recurse-center-manual-is-weirdly-calming/_index.md +27 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/tiny-projects/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/useful-links/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/weekend-notes/_index.md +11 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/content/what-i-actually-use-my-notebook-for/_index.md +49 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/data/jant.toml +119 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/hugo.toml +43 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/021801c20ab3-med_01kn8jw26cenf98vc7k0ppz5k8.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/0f868ce9ac84-med_01kn8jtx8qenf98tm9ahxr48sw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/50c2ad911bad-med_01kn8jvb16enf98txp7p0pf5ge.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/7a91f0960491-med_01kn8jvq58enf98v538w5vsqp4.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/8714116d3c8e-med_01kn8jve5nenf98tzap11gpxzr.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/8a0b4277443f-med_01kn8jv0jdenf98tp6qr9zgjjc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/a7d1c8a1afd9-med_01kn8jv452enf98trbkwrvhvgd.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/e25570b405f5-med_01kn8jvsaeenf98v6ct4gjzppc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/static/media/e89ea4eabf01-med_01kn8jtq3penf98tfq4gzmh9g9.png +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/themes/jant/static/apple-touch-icon.png +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/themes/jant/static/custom.css +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/site-export/themes/jant/static/favicon.ico +0 -0
- package/src/__tests__/fixtures/releases/0.7.1/snapshot/db.sql +322 -0
- package/src/__tests__/fixtures/releases/0.7.1/snapshot/meta.json +9 -0
- package/src/__tests__/helpers/hugo-site.ts +146 -0
- package/src/__tests__/helpers/site-export-import.ts +97 -0
- package/src/__tests__/import-site-command.test.ts +514 -2
- package/src/__tests__/mise-config.test.ts +75 -4
- package/src/__tests__/node-dev-tasks.test.ts +264 -0
- package/src/__tests__/release-fixtures.test.ts +132 -0
- package/src/__tests__/site-export-canonical-import.test.ts +113 -0
- package/src/__tests__/snapshot-canonical-replay.test.ts +179 -0
- package/src/__tests__/snapshot-settings.test.ts +97 -0
- package/src/__tests__/snapshot-tables.test.ts +219 -0
- package/src/__tests__/sql-export.test.ts +173 -0
- package/src/__tests__/theme-docs.test.ts +109 -0
- package/src/__tests__/zip-archive.test.ts +106 -0
- package/src/app.tsx +16 -11
- package/src/client/components/__tests__/jant-settings-avatar.test.ts +1 -1
- package/src/client/components/__tests__/jant-settings-general.test.ts +21 -1
- package/src/client/components/jant-repo-picker-types.ts +6 -1
- package/src/client/components/jant-repo-picker.ts +4 -7
- package/src/client/components/jant-settings-general.ts +17 -12
- package/src/client/tiptap/__tests__/list-editing.test.ts +224 -86
- package/src/client/tiptap/__tests__/mark-exit.test.ts +1 -2
- package/src/client/tiptap/__tests__/markdown-clipboard.test.ts +26 -0
- package/src/client/tiptap/extensions.ts +0 -3
- package/src/client/tiptap/structural-keymap.ts +158 -47
- package/src/db/__tests__/d1-query.test.ts +56 -1
- package/src/db/rehearsal-fixtures/pg-demo-current.json +55 -0
- package/src/db/rehearsal-fixtures/pg-demo-current.sql +431 -0
- package/src/i18n/locales/public/en.po +0 -2
- package/src/i18n/locales/public/zh-Hans.po +0 -2
- package/src/i18n/locales/public/zh-Hant.po +0 -2
- package/src/i18n/locales/settings/en.po +8 -8
- package/src/i18n/locales/settings/en.ts +1 -1
- package/src/i18n/locales/settings/zh-Hans.po +8 -8
- package/src/i18n/locales/settings/zh-Hans.ts +1 -1
- package/src/i18n/locales/settings/zh-Hant.po +8 -8
- package/src/i18n/locales/settings/zh-Hant.ts +1 -1
- package/src/index.ts +6 -77
- package/src/lib/__tests__/github-sync-repo-name.test.ts +40 -0
- package/src/lib/__tests__/image.test.ts +27 -1
- package/src/lib/__tests__/markdown-to-tiptap.test.ts +105 -0
- package/src/lib/__tests__/markdown.test.ts +10 -0
- package/src/lib/__tests__/resolve-config.test.ts +67 -0
- package/src/lib/__tests__/schemas.test.ts +27 -1
- package/src/lib/__tests__/timeline.test.ts +87 -0
- package/src/lib/__tests__/tiptap-to-markdown.test.ts +172 -4
- package/src/lib/__tests__/view.test.ts +0 -46
- package/src/lib/discover.ts +3 -1
- package/src/lib/feed.ts +0 -6
- package/src/lib/github-sync-repo-name.ts +45 -0
- package/src/lib/hugo-markdown.ts +46 -0
- package/src/lib/image.ts +17 -4
- package/src/lib/markdown-manager.ts +392 -2
- package/src/lib/post-body-html.ts +11 -4
- package/src/lib/resolve-config.ts +58 -1
- package/src/lib/schemas.ts +50 -5
- package/src/lib/thread-fold.ts +3 -3
- package/src/lib/timeline.ts +1 -1
- package/src/lib/tiptap-to-markdown.ts +13 -7
- package/src/lib/url.ts +20 -0
- package/src/lib/view.ts +2 -29
- package/src/node/__tests__/cli-export.test.ts +2 -2
- package/src/node/__tests__/cli-setup.test.ts +163 -0
- package/src/node/__tests__/cli-site-snapshot.test.ts +73 -0
- package/src/node/__tests__/cli-site-token-env.test.ts +4 -1
- package/src/node/__tests__/cli-snapshot-meta.test.ts +84 -0
- package/src/node/__tests__/runtime.test.ts +38 -0
- package/src/node/index.ts +2 -0
- package/src/node/request-handler.ts +3 -1
- package/src/routes/api/__tests__/posts.test.ts +24 -0
- package/src/routes/api/__tests__/upload.test.ts +34 -0
- package/src/routes/api/export.ts +3 -3
- package/src/routes/api/internal/search-reindex.ts +1 -1
- package/src/routes/api/internal/sites.ts +0 -1
- package/src/routes/api/posts.ts +2 -0
- package/src/routes/api/public/posts.ts +21 -1
- package/src/routes/api/upload.ts +10 -3
- package/src/routes/compose.tsx +4 -0
- package/src/routes/dash/__tests__/github-sync-app.test.ts +365 -0
- package/src/routes/dash/settings.tsx +212 -70
- package/src/routes/pages/__tests__/post-page-round-trips.test.ts +211 -0
- package/src/routes/pages/__tests__/thread-order.test.ts +179 -0
- package/src/routes/pages/archive.tsx +17 -11
- package/src/routes/pages/featured.tsx +11 -5
- package/src/routes/pages/page.tsx +53 -31
- package/src/routes/pages/search.tsx +4 -2
- package/src/runtime/__tests__/readiness.test.ts +23 -0
- package/src/runtime/node.ts +49 -0
- package/src/runtime/readiness.ts +15 -0
- package/src/services/__tests__/bootstrap-setup-instance.test.ts +230 -0
- package/src/services/__tests__/custom-url.test.ts +34 -0
- package/src/services/__tests__/github-app-installations.test.ts +153 -0
- package/src/services/__tests__/github-sync-push.test.ts +46 -0
- package/src/services/__tests__/media.test.ts +31 -271
- package/src/services/__tests__/path.test.ts +56 -0
- package/src/services/__tests__/post-timeline.test.ts +127 -0
- package/src/services/__tests__/post.test.ts +74 -0
- package/src/services/bootstrap.ts +263 -44
- package/src/services/custom-url.ts +2 -2
- package/src/services/export-theme/layouts/_default/alias.html +27 -1
- package/src/services/export-theme/layouts/_default/list.html +2 -63
- package/src/services/export-theme/layouts/_default/rss.xml +27 -38
- package/src/services/export-theme/layouts/collections/list.html +3 -3
- package/src/services/export-theme/layouts/featured/list.html +1 -4
- package/src/services/export-theme/layouts/index.html +40 -26
- package/src/services/export-theme/layouts/partials/collection-members.html +100 -0
- package/src/services/export-theme/layouts/partials/collection-threads.html +33 -0
- package/src/services/export-theme/layouts/partials/featured-members.html +35 -0
- package/src/services/export-theme/layouts/partials/featured-thread.html +1 -1
- package/src/services/export-theme/layouts/partials/footer.html +1 -1
- package/src/services/export-theme/layouts/partials/head.html +1 -1
- package/src/services/export-theme/layouts/partials/header.html +5 -3
- package/src/services/export-theme/layouts/partials/jant-data.html +23 -0
- package/src/services/export-theme/layouts/partials/latest-members.html +48 -0
- package/src/services/export-theme/layouts/partials/smart-collection-members.html +129 -0
- package/src/services/export-theme/layouts/partials/thread-preview.html +1 -1
- package/src/services/export-theme/layouts/post/list.html +1 -1
- package/src/services/export-theme/layouts/smart_collection/list.html +24 -0
- package/src/services/export-theme/styles/main.css +0 -1
- package/src/services/export-theme/theme.toml +1 -1
- package/src/services/export.ts +630 -73
- package/src/services/github-app-installations.ts +171 -4
- package/src/services/github-sync.ts +69 -15
- package/src/services/mcp.ts +19 -1
- package/src/services/media.ts +9 -220
- package/src/services/path.ts +34 -1
- package/src/services/post.ts +214 -39
- package/src/services/site-admin.ts +3 -7
- package/src/services/site.ts +83 -31
- package/src/styles/ui.css +7 -119
- package/src/types/app-context.ts +16 -0
- package/src/types/bindings.ts +5 -0
- package/src/types/operations.ts +10 -0
- package/src/ui/dash/settings/GeneralContent.tsx +10 -8
- package/bin/commands/export.js +0 -118
- package/bin/commands/import-site.js +0 -2561
- package/bin/commands/migrate-text-attachments.js +0 -181
- package/dist/github-sync-BPAvT999.js +0 -7709
- package/src/client/multipart-upload.ts +0 -206
- package/src/client/tiptap/exitable-marks.ts +0 -73
- package/src/routes/api/__tests__/upload-multipart.test.ts +0 -739
- package/src/routes/api/internal/text-attachments.ts +0 -60
- package/src/routes/api/upload-multipart.ts +0 -366
|
@@ -13,14 +13,22 @@
|
|
|
13
13
|
* the second act runs, against the site the request resolved — the same site
|
|
14
14
|
* the route's membership check reads. On a hosted install the database holds
|
|
15
15
|
* every tenant, so "the only site" is not a question with an answer there.
|
|
16
|
+
*
|
|
17
|
+
* A self-hosted install that is deployed rather than clicked through runs both
|
|
18
|
+
* acts back to back without a browser — see `setUpInstance`.
|
|
16
19
|
*/
|
|
17
20
|
|
|
21
|
+
import { and, eq } from "drizzle-orm";
|
|
18
22
|
import type { DatabaseDialect } from "../db/dialect.js";
|
|
19
23
|
import type { Database } from "../db/index.js";
|
|
20
24
|
import {
|
|
21
25
|
sqliteSchemaBundle,
|
|
22
26
|
type DatabaseSchema,
|
|
23
27
|
} from "../db/schema-bundle.js";
|
|
28
|
+
import { AUTH_ID_PREFIX, createTypeId } from "../lib/ids.js";
|
|
29
|
+
import { hashPassword, verifyPassword } from "../lib/password.js";
|
|
30
|
+
import { deriveAccountName } from "../lib/schemas.js";
|
|
31
|
+
import { now } from "../lib/time.js";
|
|
24
32
|
import { createNavItemService } from "./navigation.js";
|
|
25
33
|
import { createSettingsService } from "./settings.js";
|
|
26
34
|
import { createSiteMemberService } from "./site-member.js";
|
|
@@ -73,6 +81,38 @@ export interface CompleteSiteSetupDeps {
|
|
|
73
81
|
updateCurrentUserName?: ((displayName: string) => Promise<void>) | null;
|
|
74
82
|
}
|
|
75
83
|
|
|
84
|
+
export interface SetUpInstanceData {
|
|
85
|
+
/** The owner's sign-in address, normalized the way sign-in normalizes it. */
|
|
86
|
+
email: string;
|
|
87
|
+
/** The owner's password in plain text. Only its hash is stored. */
|
|
88
|
+
password: string;
|
|
89
|
+
/** The id to create the site with. See `EnsureSingleSiteOptions.id`. */
|
|
90
|
+
siteId?: string;
|
|
91
|
+
/** The site's name. Omitted leaves the built-in fallback name in place. */
|
|
92
|
+
siteName?: string;
|
|
93
|
+
/**
|
|
94
|
+
* Language the site publishes in. Omitted means the base locale, the same
|
|
95
|
+
* as an empty answer on the screen.
|
|
96
|
+
*/
|
|
97
|
+
siteLanguage?: string;
|
|
98
|
+
/** The site's time zone. Omitted means UTC, as on the screen. */
|
|
99
|
+
timeZone?: string;
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
/**
|
|
103
|
+
* What `setUpInstance` found:
|
|
104
|
+
* - `created`: nothing existed, and now the account, the site and its answers do
|
|
105
|
+
* - `resumed`: an earlier run stopped after creating the account; this one
|
|
106
|
+
* finished the rest
|
|
107
|
+
* - `already-set-up`: setup had finished before, and nothing was changed
|
|
108
|
+
*/
|
|
109
|
+
export type SetUpInstanceOutcome = "created" | "resumed" | "already-set-up";
|
|
110
|
+
|
|
111
|
+
export interface SetUpInstanceResult {
|
|
112
|
+
outcome: SetUpInstanceOutcome;
|
|
113
|
+
siteId: string;
|
|
114
|
+
}
|
|
115
|
+
|
|
76
116
|
export interface BootstrapService {
|
|
77
117
|
/**
|
|
78
118
|
* Stand the site up around a newly created owner account.
|
|
@@ -110,6 +150,41 @@ export interface BootstrapService {
|
|
|
110
150
|
opts: { oldLanguage: string },
|
|
111
151
|
deps?: CompleteSiteSetupDeps,
|
|
112
152
|
): Promise<void>;
|
|
153
|
+
|
|
154
|
+
/**
|
|
155
|
+
* Set a self-hosted install up without a browser: the owner account, the
|
|
156
|
+
* site around it, and the answers the second screen would have collected,
|
|
157
|
+
* ending with onboarding complete.
|
|
158
|
+
*
|
|
159
|
+
* The site half is the screens' own code. The account half differs in one
|
|
160
|
+
* way: the first screen opens the account through better-auth so the
|
|
161
|
+
* browser leaves with a session, and there is no browser here to hand one
|
|
162
|
+
* to. The rows are written directly instead, with the same password hash
|
|
163
|
+
* better-auth is configured with, and named the way the first screen names
|
|
164
|
+
* them until the site's name replaces it.
|
|
165
|
+
*
|
|
166
|
+
* Safe to run on every start. An install that finished setup is left as it
|
|
167
|
+
* is, whatever this call was given — the owner may have changed their
|
|
168
|
+
* address or password since, and a restart must not undo that. A run that
|
|
169
|
+
* stopped after creating the account resumes, but only with that account's
|
|
170
|
+
* address and password, which is what the first screen asks for too.
|
|
171
|
+
*
|
|
172
|
+
* @param data - The owner's credentials and the site's answers, already
|
|
173
|
+
* validated
|
|
174
|
+
* @returns What was found, and the site
|
|
175
|
+
* @throws {Error} On a host-based install; when the site exists under an id
|
|
176
|
+
* other than `siteId`; when an account for another address exists; when
|
|
177
|
+
* the password does not match the account an earlier run left
|
|
178
|
+
* @example
|
|
179
|
+
* ```ts
|
|
180
|
+
* await bootstrap.setUpInstance({
|
|
181
|
+
* email: "owner@example.com",
|
|
182
|
+
* password: "correct horse battery",
|
|
183
|
+
* siteName: "Field Notes",
|
|
184
|
+
* });
|
|
185
|
+
* ```
|
|
186
|
+
*/
|
|
187
|
+
setUpInstance(data: SetUpInstanceData): Promise<SetUpInstanceResult>;
|
|
113
188
|
}
|
|
114
189
|
|
|
115
190
|
/**
|
|
@@ -151,11 +226,11 @@ export function createBootstrapService(
|
|
|
151
226
|
return siteId;
|
|
152
227
|
}
|
|
153
228
|
|
|
229
|
+
function settingsFor(targetSiteId: string) {
|
|
230
|
+
return createSettingsService(db, targetSiteId, databaseSchema, dialect);
|
|
231
|
+
}
|
|
232
|
+
|
|
154
233
|
/**
|
|
155
|
-
* The site the account step stands up. A self-hosted install has no row
|
|
156
|
-
* until now, so this is the step that creates it — along with its domain,
|
|
157
|
-
* when one is configured.
|
|
158
|
-
*
|
|
159
234
|
* A host-based install refuses before anything is written. The control
|
|
160
235
|
* plane creates each hosted site already provisioned, and its owner arrives
|
|
161
236
|
* through the hosted handoff, the only way anyone becomes a member of one.
|
|
@@ -163,71 +238,215 @@ export function createBootstrapService(
|
|
|
163
238
|
* any account in a database every tenant shares take a site that had lost
|
|
164
239
|
* its onboarding status.
|
|
165
240
|
*/
|
|
166
|
-
|
|
241
|
+
function assertSelfHosted(step: string): void {
|
|
167
242
|
if (siteResolutionMode === "host-based") {
|
|
168
243
|
throw new Error(
|
|
169
|
-
|
|
244
|
+
`${step} runs on self-hosted installs only. A hosted site's owner arrives through the control plane's handoff.`,
|
|
170
245
|
);
|
|
171
246
|
}
|
|
247
|
+
}
|
|
248
|
+
|
|
249
|
+
/**
|
|
250
|
+
* Stand the site up around its owner. A self-hosted install has no row until
|
|
251
|
+
* now, so this is the step that creates it — along with its domain, when one
|
|
252
|
+
* is configured.
|
|
253
|
+
*
|
|
254
|
+
* @returns The site's id
|
|
255
|
+
*/
|
|
256
|
+
async function provisionSite(
|
|
257
|
+
step: string,
|
|
258
|
+
ownerUserId: string,
|
|
259
|
+
siteOptions: EnsureSingleSiteOptions | undefined,
|
|
260
|
+
): Promise<string> {
|
|
261
|
+
assertSelfHosted(step);
|
|
172
262
|
const { site } = await createSiteService(
|
|
173
263
|
db,
|
|
174
264
|
databaseSchema,
|
|
175
|
-
).ensureSingleSite(
|
|
265
|
+
).ensureSingleSite(siteOptions);
|
|
266
|
+
const navItems = createNavItemService(db, site.id, databaseSchema);
|
|
267
|
+
const siteMembers = createSiteMemberService(db, databaseSchema);
|
|
268
|
+
|
|
269
|
+
await siteMembers.ensure(site.id, ownerUserId, "owner");
|
|
270
|
+
await navItems.materializeDefaultNavigation();
|
|
271
|
+
await settingsFor(site.id).markSiteProvisioned();
|
|
176
272
|
return site.id;
|
|
177
273
|
}
|
|
178
274
|
|
|
275
|
+
async function recordSiteAnswers(
|
|
276
|
+
targetSiteId: string,
|
|
277
|
+
data: CompleteSiteSetupData,
|
|
278
|
+
opts: { oldLanguage: string },
|
|
279
|
+
deps: CompleteSiteSetupDeps | undefined,
|
|
280
|
+
): Promise<void> {
|
|
281
|
+
const settings = settingsFor(targetSiteId);
|
|
282
|
+
|
|
283
|
+
const siteName = data.siteName?.trim();
|
|
284
|
+
if (siteName) {
|
|
285
|
+
await settings.set("SITE_NAME", siteName);
|
|
286
|
+
// Before onboarding closes, deliberately: if the rename fails the site
|
|
287
|
+
// is still provisioned, and the author retries the screen they were
|
|
288
|
+
// already on rather than landing in a finished site under a stale name.
|
|
289
|
+
await deps?.updateCurrentUserName?.(siteName);
|
|
290
|
+
}
|
|
291
|
+
|
|
292
|
+
// `undefined` means the shell already has one. `null` is a browser that
|
|
293
|
+
// reported nothing, which is the same UTC default the site would fall
|
|
294
|
+
// back to anyway — written so a later reader sees a chosen value.
|
|
295
|
+
if (data.timeZone !== undefined) {
|
|
296
|
+
await settings.set("TIME_ZONE", data.timeZone ?? "UTC");
|
|
297
|
+
}
|
|
298
|
+
|
|
299
|
+
await settings.confirmFirstRunLanguage(
|
|
300
|
+
{
|
|
301
|
+
siteLanguage: data.siteLanguage ?? "",
|
|
302
|
+
browserLanguage: data.browserLanguage,
|
|
303
|
+
},
|
|
304
|
+
opts,
|
|
305
|
+
);
|
|
306
|
+
}
|
|
307
|
+
|
|
308
|
+
/**
|
|
309
|
+
* The account a browserless setup stands the site up around: a new one when
|
|
310
|
+
* the install has none, or the one an interrupted run left, claimed with its
|
|
311
|
+
* own password — the way the first screen resumes by signing in.
|
|
312
|
+
*/
|
|
313
|
+
async function claimOwnerAccount(
|
|
314
|
+
email: string,
|
|
315
|
+
password: string,
|
|
316
|
+
): Promise<{ userId: string; created: boolean }> {
|
|
317
|
+
const { account, user } = databaseSchema;
|
|
318
|
+
const [existing] = await db
|
|
319
|
+
.select({ id: user.id, passwordHash: account.password })
|
|
320
|
+
.from(user)
|
|
321
|
+
.leftJoin(
|
|
322
|
+
account,
|
|
323
|
+
and(eq(account.userId, user.id), eq(account.providerId, "credential")),
|
|
324
|
+
)
|
|
325
|
+
.where(eq(user.email, email))
|
|
326
|
+
.limit(1);
|
|
327
|
+
|
|
328
|
+
if (existing) {
|
|
329
|
+
const matches =
|
|
330
|
+
!!existing.passwordHash &&
|
|
331
|
+
(await verifyPassword({ hash: existing.passwordHash, password }));
|
|
332
|
+
if (!matches) {
|
|
333
|
+
throw new Error(
|
|
334
|
+
`An earlier setup created the account for ${email}, and the password given does not match it.`,
|
|
335
|
+
);
|
|
336
|
+
}
|
|
337
|
+
return { userId: existing.id, created: false };
|
|
338
|
+
}
|
|
339
|
+
|
|
340
|
+
const [other] = await db.select({ id: user.id }).from(user).limit(1);
|
|
341
|
+
if (other) {
|
|
342
|
+
throw new Error(
|
|
343
|
+
`This install already has an account under another address. Pass that account's address and password to finish setup.`,
|
|
344
|
+
);
|
|
345
|
+
}
|
|
346
|
+
|
|
347
|
+
const userId = createTypeId(AUTH_ID_PREFIX.user);
|
|
348
|
+
const timestamp = new Date(now() * 1000);
|
|
349
|
+
await db.insert(user).values({
|
|
350
|
+
id: userId,
|
|
351
|
+
email,
|
|
352
|
+
emailVerified: false,
|
|
353
|
+
image: null,
|
|
354
|
+
// The first screen's stand-in, replaced when the site is named.
|
|
355
|
+
name: deriveAccountName(email),
|
|
356
|
+
role: "admin",
|
|
357
|
+
createdAt: timestamp,
|
|
358
|
+
updatedAt: timestamp,
|
|
359
|
+
});
|
|
360
|
+
await db.insert(account).values({
|
|
361
|
+
id: createTypeId(AUTH_ID_PREFIX.account),
|
|
362
|
+
accountId: userId,
|
|
363
|
+
userId,
|
|
364
|
+
providerId: "credential",
|
|
365
|
+
password: await hashPassword(password),
|
|
366
|
+
accessToken: null,
|
|
367
|
+
accessTokenExpiresAt: null,
|
|
368
|
+
idToken: null,
|
|
369
|
+
refreshToken: null,
|
|
370
|
+
refreshTokenExpiresAt: null,
|
|
371
|
+
scope: null,
|
|
372
|
+
createdAt: timestamp,
|
|
373
|
+
updatedAt: timestamp,
|
|
374
|
+
});
|
|
375
|
+
return { userId, created: true };
|
|
376
|
+
}
|
|
377
|
+
|
|
179
378
|
return {
|
|
180
379
|
async provisionOwnerAccount(data) {
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
databaseSchema,
|
|
186
|
-
dialect,
|
|
380
|
+
await provisionSite(
|
|
381
|
+
"provisionOwnerAccount",
|
|
382
|
+
data.ownerUserId,
|
|
383
|
+
options?.bootstrapSite,
|
|
187
384
|
);
|
|
188
|
-
const navItems = createNavItemService(
|
|
189
|
-
db,
|
|
190
|
-
provisionedSiteId,
|
|
191
|
-
databaseSchema,
|
|
192
|
-
);
|
|
193
|
-
const siteMembers = createSiteMemberService(db, databaseSchema);
|
|
194
|
-
|
|
195
|
-
await siteMembers.ensure(provisionedSiteId, data.ownerUserId, "owner");
|
|
196
|
-
await navItems.materializeDefaultNavigation();
|
|
197
|
-
await settings.markSiteProvisioned();
|
|
198
385
|
},
|
|
199
386
|
|
|
200
387
|
async completeSiteSetup(data, opts, deps) {
|
|
201
|
-
|
|
202
|
-
db,
|
|
388
|
+
await recordSiteAnswers(
|
|
203
389
|
existingSiteId("completeSiteSetup"),
|
|
204
|
-
|
|
205
|
-
|
|
390
|
+
data,
|
|
391
|
+
opts,
|
|
392
|
+
deps,
|
|
206
393
|
);
|
|
394
|
+
},
|
|
207
395
|
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
await settings.set("SITE_NAME", siteName);
|
|
211
|
-
// Before onboarding closes, deliberately: if the rename fails the site
|
|
212
|
-
// is still provisioned, and the author retries the screen they were
|
|
213
|
-
// already on rather than landing in a finished site under a stale name.
|
|
214
|
-
await deps?.updateCurrentUserName?.(siteName);
|
|
215
|
-
}
|
|
396
|
+
async setUpInstance(data) {
|
|
397
|
+
assertSelfHosted("setUpInstance");
|
|
216
398
|
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
399
|
+
const existingSite = await createSiteService(
|
|
400
|
+
db,
|
|
401
|
+
databaseSchema,
|
|
402
|
+
).getOnlySite();
|
|
403
|
+
if (
|
|
404
|
+
existingSite &&
|
|
405
|
+
data.siteId !== undefined &&
|
|
406
|
+
existingSite.id !== data.siteId
|
|
407
|
+
) {
|
|
408
|
+
throw new Error(
|
|
409
|
+
`This install's site is ${existingSite.id}, not ${data.siteId}. Check that the database is the one you meant.`,
|
|
410
|
+
);
|
|
411
|
+
}
|
|
412
|
+
if (
|
|
413
|
+
existingSite &&
|
|
414
|
+
(await settingsFor(existingSite.id).isOnboardingComplete())
|
|
415
|
+
) {
|
|
416
|
+
return { outcome: "already-set-up", siteId: existingSite.id };
|
|
222
417
|
}
|
|
223
418
|
|
|
224
|
-
await
|
|
419
|
+
const owner = await claimOwnerAccount(data.email, data.password);
|
|
420
|
+
const setUpSiteId = await provisionSite("setUpInstance", owner.userId, {
|
|
421
|
+
...options?.bootstrapSite,
|
|
422
|
+
id: data.siteId,
|
|
423
|
+
});
|
|
424
|
+
const { user } = databaseSchema;
|
|
425
|
+
await recordSiteAnswers(
|
|
426
|
+
setUpSiteId,
|
|
225
427
|
{
|
|
226
|
-
|
|
227
|
-
|
|
428
|
+
siteName: data.siteName,
|
|
429
|
+
siteLanguage: data.siteLanguage,
|
|
430
|
+
timeZone: data.timeZone ?? null,
|
|
431
|
+
},
|
|
432
|
+
{
|
|
433
|
+
oldLanguage:
|
|
434
|
+
(await settingsFor(setUpSiteId).get("SITE_LANGUAGE")) ?? "",
|
|
435
|
+
},
|
|
436
|
+
{
|
|
437
|
+
async updateCurrentUserName(displayName) {
|
|
438
|
+
await db
|
|
439
|
+
.update(user)
|
|
440
|
+
.set({ name: displayName, updatedAt: new Date(now() * 1000) })
|
|
441
|
+
.where(eq(user.id, owner.userId));
|
|
442
|
+
},
|
|
228
443
|
},
|
|
229
|
-
opts,
|
|
230
444
|
);
|
|
445
|
+
|
|
446
|
+
return {
|
|
447
|
+
outcome: owner.created ? "created" : "resumed",
|
|
448
|
+
siteId: setUpSiteId,
|
|
449
|
+
};
|
|
231
450
|
},
|
|
232
451
|
};
|
|
233
452
|
}
|
|
@@ -108,7 +108,7 @@ export function createCustomUrlService(
|
|
|
108
108
|
: eq(pathRegistry.collectionId, targetId),
|
|
109
109
|
),
|
|
110
110
|
)
|
|
111
|
-
.orderBy(desc(pathRegistry.createdAt))
|
|
111
|
+
.orderBy(desc(pathRegistry.createdAt), desc(pathRegistry.id))
|
|
112
112
|
.limit(1);
|
|
113
113
|
return result[0] ? toCustomUrl(result[0]) : null;
|
|
114
114
|
},
|
|
@@ -228,7 +228,7 @@ export function createCustomUrlService(
|
|
|
228
228
|
.where(
|
|
229
229
|
and(eq(pathRegistry.siteId, siteId), ne(pathRegistry.kind, "slug")),
|
|
230
230
|
)
|
|
231
|
-
.orderBy(desc(pathRegistry.createdAt))
|
|
231
|
+
.orderBy(desc(pathRegistry.createdAt), desc(pathRegistry.id))
|
|
232
232
|
.$dynamic();
|
|
233
233
|
if (opts?.limit !== undefined) q = q.limit(opts.limit);
|
|
234
234
|
if (opts?.offset !== undefined) q = q.offset(opts.offset);
|
|
@@ -1,3 +1,13 @@
|
|
|
1
|
+
{{- /*
|
|
2
|
+
Alias page. Hugo renders one of these for every entry in a post's
|
|
3
|
+
`aliases:` front matter.
|
|
4
|
+
|
|
5
|
+
`.Permalink` is the alias target. It is empty whenever the page the alias
|
|
6
|
+
points at was not built — an empty `content=0; url=` is read by browsers as
|
|
7
|
+
"reload this page", which turns the alias into an infinite refresh loop. So
|
|
8
|
+
the redirect markup is only emitted when there is somewhere to redirect to.
|
|
9
|
+
*/ -}}
|
|
10
|
+
{{- if .Permalink -}}
|
|
1
11
|
<!doctype html>
|
|
2
12
|
<html lang="{{ .Site.LanguageCode | default "en" }}">
|
|
3
13
|
<head>
|
|
@@ -9,7 +19,10 @@
|
|
|
9
19
|
<script>
|
|
10
20
|
(function () {
|
|
11
21
|
var target = {{ .Permalink }};
|
|
12
|
-
|
|
22
|
+
// `safeJS` keeps this an array literal. Without it Hugo's contextual
|
|
23
|
+
// escaping emits a quoted JSON string, and the loop below compares
|
|
24
|
+
// single characters instead of paths.
|
|
25
|
+
var rootAliases = {{ with .Params.root_aliases }}{{ . | jsonify | safeJS }}{{ else }}[]{{ end }};
|
|
13
26
|
try {
|
|
14
27
|
var path = window.location.pathname || "";
|
|
15
28
|
var normalized = "/" + path.replace(/^\/+|\/+$/g, "") + "/";
|
|
@@ -47,3 +60,16 @@
|
|
|
47
60
|
<p>Redirecting to <a href="{{ .Permalink }}">{{ .Permalink }}</a>…</p>
|
|
48
61
|
</body>
|
|
49
62
|
</html>
|
|
63
|
+
{{- else -}}
|
|
64
|
+
<!doctype html>
|
|
65
|
+
<html lang="{{ .Site.LanguageCode | default "en" }}">
|
|
66
|
+
<head>
|
|
67
|
+
<meta charset="utf-8">
|
|
68
|
+
<title>{{ .Site.Title }}</title>
|
|
69
|
+
<meta name="robots" content="noindex,nofollow">
|
|
70
|
+
</head>
|
|
71
|
+
<body>
|
|
72
|
+
<p>This page is not available.</p>
|
|
73
|
+
</body>
|
|
74
|
+
</html>
|
|
75
|
+
{{- end -}}
|
|
@@ -8,45 +8,7 @@
|
|
|
8
8
|
fallback for unknown section types.
|
|
9
9
|
*/ -}}
|
|
10
10
|
{{- if eq .Type "collection" -}}
|
|
11
|
-
{{- $
|
|
12
|
-
{{- /* Thread collection membership is stored only on root bundles. */ -}}
|
|
13
|
-
{{- $allPosts := where (where .Site.Pages "Type" "post") "Kind" "section" -}}
|
|
14
|
-
{{- $members := slice -}}
|
|
15
|
-
{{- range $allPosts -}}
|
|
16
|
-
{{- $post := . -}}
|
|
17
|
-
{{- with $post.Params.collections -}}
|
|
18
|
-
{{- range . -}}
|
|
19
|
-
{{- if eq .slug $collectionSlug -}}
|
|
20
|
-
{{- $members = $members | append (dict "post" $post "entry" .) -}}
|
|
21
|
-
{{- end -}}
|
|
22
|
-
{{- end -}}
|
|
23
|
-
{{- end -}}
|
|
24
|
-
{{- end -}}
|
|
25
|
-
|
|
26
|
-
{{- /* Split into pinned + unpinned, sort each, then concat. */ -}}
|
|
27
|
-
{{- $pinned := slice -}}
|
|
28
|
-
{{- $unpinned := slice -}}
|
|
29
|
-
{{- range $members -}}
|
|
30
|
-
{{- if .entry.pinned_at -}}
|
|
31
|
-
{{- $pinned = $pinned | append . -}}
|
|
32
|
-
{{- else -}}
|
|
33
|
-
{{- $unpinned = $unpinned | append . -}}
|
|
34
|
-
{{- end -}}
|
|
35
|
-
{{- end -}}
|
|
36
|
-
{{- if $pinned -}}
|
|
37
|
-
{{- $pinned = sort $pinned "entry.pinned_at" "desc" -}}
|
|
38
|
-
{{- end -}}
|
|
39
|
-
{{- $sortOrder := .Params.sort_order | default "position" -}}
|
|
40
|
-
{{- if $unpinned -}}
|
|
41
|
-
{{- if eq $sortOrder "collected_at_desc" -}}
|
|
42
|
-
{{- $unpinned = sort $unpinned "entry.collected_at" "desc" -}}
|
|
43
|
-
{{- else -}}
|
|
44
|
-
{{- $unpinned = sort $unpinned "entry.position" "asc" -}}
|
|
45
|
-
{{- end -}}
|
|
46
|
-
{{- end -}}
|
|
47
|
-
{{- $ordered := $pinned | append $unpinned -}}
|
|
48
|
-
{{- $posts := slice -}}
|
|
49
|
-
{{- range $ordered -}}{{- $posts = $posts | append .post -}}{{- end -}}
|
|
11
|
+
{{- $posts := partial "collection-members.html" (dict "page" . "feed" false) -}}
|
|
50
12
|
|
|
51
13
|
{{- $pageSize := .Site.Params.page_size | default 10 -}}
|
|
52
14
|
{{- $paginator := .Paginate $posts $pageSize -}}
|
|
@@ -62,30 +24,7 @@
|
|
|
62
24
|
{{- end -}}
|
|
63
25
|
{{ .Content }}
|
|
64
26
|
</header>
|
|
65
|
-
{{-
|
|
66
|
-
<div class="post-list">
|
|
67
|
-
{{- range $i, $p := $paginator.Pages -}}
|
|
68
|
-
{{- if gt $i 0 -}}<hr class="feed-divider" aria-hidden="true" />{{- end -}}
|
|
69
|
-
{{- $replies := $p.Pages.ByDate -}}
|
|
70
|
-
{{- $hasReplies := gt (len $replies) 0 -}}
|
|
71
|
-
<div class="thread thread-full{{ if $hasReplies }} thread-has-replies{{ end }}" data-slug="{{ $p.Params.slug | default $p.Slug }}">
|
|
72
|
-
<div class="thread-item thread-item-root">
|
|
73
|
-
{{ partial "post-card.html" $p }}
|
|
74
|
-
</div>
|
|
75
|
-
{{- if $hasReplies -}}
|
|
76
|
-
<section class="thread-replies" aria-label="Replies">
|
|
77
|
-
{{- range $replies -}}
|
|
78
|
-
{{ partial "reply.html" . }}
|
|
79
|
-
{{- end -}}
|
|
80
|
-
</section>
|
|
81
|
-
{{- end -}}
|
|
82
|
-
</div>
|
|
83
|
-
{{- end -}}
|
|
84
|
-
</div>
|
|
85
|
-
{{ partial "pagination.html" $paginator }}
|
|
86
|
-
{{- else -}}
|
|
87
|
-
<p class="empty-state">This collection doesn't contain any threads.</p>
|
|
88
|
-
{{- end -}}
|
|
27
|
+
{{ partial "collection-threads.html" (dict "paginator" $paginator "empty" "This collection doesn't contain any threads.") }}
|
|
89
28
|
</section>
|
|
90
29
|
{{- else -}}
|
|
91
30
|
<section class="section">
|
|
@@ -2,18 +2,23 @@
|
|
|
2
2
|
Atom 2005 feed template — mirrors the main site's `lib/feed.ts`.
|
|
3
3
|
|
|
4
4
|
One template covers every page that opts into the custom `RSS` output
|
|
5
|
-
format (home, featured, archive, and each collection
|
|
6
|
-
sections do NOT opt in, so no `/{slug}/index.xml` gets
|
|
5
|
+
format (home, featured, archive, and each collection and smart collection
|
|
6
|
+
section). Root-post sections do NOT opt in, so no `/{slug}/index.xml` gets
|
|
7
|
+
emitted.
|
|
7
8
|
|
|
8
|
-
|
|
9
|
-
- home
|
|
10
|
-
|
|
11
|
-
|
|
9
|
+
Each feed carries what the matching Jant feed carries, in its order:
|
|
10
|
+
- home (`.Kind == "home"`): `/latest/feed`, public roots by Thread
|
|
11
|
+
activity, pins ignored (`latest-members`)
|
|
12
|
+
- featured (`.Type == "featured"`): one root per Thread with a featured
|
|
13
|
+
post, by that post's publication (`featured-members`)
|
|
12
14
|
- archive (`.Type == "archive"`): all published (includes latest_hidden)
|
|
13
|
-
- collection (`.Type == "collection"`):
|
|
14
|
-
|
|
15
|
+
- collection (`.Type == "collection"`): its Threads by activity, newest
|
|
16
|
+
first, pins and `sort_order` ignored (`collection-members`)
|
|
17
|
+
- smart collection (`.Type == "smart_collection"`): the roots its
|
|
18
|
+
conditions select, in its stored order (`smart-collection-members`)
|
|
15
19
|
|
|
16
20
|
Per-entry payload mirrors `buildSinglePostContent` + `buildFeedContent`:
|
|
21
|
+
- Id: `feed_id` from front matter, the id Jant's feed used; see below
|
|
17
22
|
- Title: empty for quote posts, else .Title
|
|
18
23
|
- Link rel=alternate: external URL for `link` format, else permalink;
|
|
19
24
|
link-format posts also get a <link rel="related"> back to the
|
|
@@ -33,7 +38,6 @@
|
|
|
33
38
|
{{- $page := . -}}
|
|
34
39
|
{{- $limit := int (.Site.Params.rss_feed_limit | default 50) -}}
|
|
35
40
|
{{- $allPosts := where .Site.Pages "Type" "post" -}}
|
|
36
|
-
{{- $rootPosts := where $allPosts "Kind" "section" -}}
|
|
37
41
|
|
|
38
42
|
{{- /* ------------------------------------------------------------------
|
|
39
43
|
Post selection per feed kind
|
|
@@ -42,36 +46,15 @@
|
|
|
42
46
|
{{- $isFeatured := eq $page.Type "featured" -}}
|
|
43
47
|
|
|
44
48
|
{{- if eq $page.Kind "home" -}}
|
|
45
|
-
{{- $
|
|
46
|
-
{{- $posts = $public.ByDate.Reverse -}}
|
|
49
|
+
{{- $posts = partial "latest-members.html" (dict "feed" true) -}}
|
|
47
50
|
{{- else if $isFeatured -}}
|
|
48
|
-
{{- $
|
|
49
|
-
{{- $posts = sort $featured "Params.featured_sort_at" "desc" -}}
|
|
51
|
+
{{- $posts = partial "featured-members.html" . -}}
|
|
50
52
|
{{- else if eq $page.Type "archive" -}}
|
|
51
53
|
{{- $posts = $allPosts.ByDate.Reverse -}}
|
|
52
54
|
{{- else if eq $page.Type "collection" -}}
|
|
53
|
-
{{- $
|
|
54
|
-
|
|
55
|
-
{{-
|
|
56
|
-
{{- $post := . -}}
|
|
57
|
-
{{- with $post.Params.collections -}}
|
|
58
|
-
{{- range . -}}
|
|
59
|
-
{{- if eq .slug $collectionSlug -}}
|
|
60
|
-
{{- $members = $members | append (dict "post" $post "entry" .) -}}
|
|
61
|
-
{{- end -}}
|
|
62
|
-
{{- end -}}
|
|
63
|
-
{{- end -}}
|
|
64
|
-
{{- end -}}
|
|
65
|
-
{{- $sortOrder := $page.Params.sort_order | default "position" -}}
|
|
66
|
-
{{- $ordered := $members -}}
|
|
67
|
-
{{- if $ordered -}}
|
|
68
|
-
{{- if eq $sortOrder "collected_at_desc" -}}
|
|
69
|
-
{{- $ordered = sort $ordered "entry.collected_at" "desc" -}}
|
|
70
|
-
{{- else -}}
|
|
71
|
-
{{- $ordered = sort $ordered "entry.position" "asc" -}}
|
|
72
|
-
{{- end -}}
|
|
73
|
-
{{- end -}}
|
|
74
|
-
{{- range $ordered -}}{{- $posts = $posts | append .post -}}{{- end -}}
|
|
55
|
+
{{- $posts = partial "collection-members.html" (dict "page" $page "feed" true) -}}
|
|
56
|
+
{{- else if eq $page.Type "smart_collection" -}}
|
|
57
|
+
{{- $posts = partial "smart-collection-members.html" (dict "page" $page "feed" true) -}}
|
|
75
58
|
{{- end -}}
|
|
76
59
|
|
|
77
60
|
{{- if gt (len $posts) $limit -}}
|
|
@@ -88,7 +71,7 @@
|
|
|
88
71
|
{{- $feedTitle = printf "%s - Featured posts" .Site.Title -}}
|
|
89
72
|
{{- else if eq $page.Type "archive" -}}
|
|
90
73
|
{{- $feedTitle = printf "%s - Archive" .Site.Title -}}
|
|
91
|
-
{{- else if
|
|
74
|
+
{{- else if in (slice "collection" "smart_collection") $page.Type -}}
|
|
92
75
|
{{- $feedTitle = printf "%s - %s" .Site.Title $page.Title -}}
|
|
93
76
|
{{- end -}}
|
|
94
77
|
|
|
@@ -117,6 +100,12 @@
|
|
|
117
100
|
{{- $post := . -}}
|
|
118
101
|
{{- $format := .Params.format | default "note" -}}
|
|
119
102
|
{{- $permalink := .Permalink -}}
|
|
103
|
+
{{- /* <id>: the string Jant's feeds gave this entry, which the exporter
|
|
104
|
+
writes as `feed_id`. Readers recognise an entry by it alone, and
|
|
105
|
+
`.Permalink` differs from it (trailing slash; slug in place of a custom
|
|
106
|
+
path), so using the page URL would show every post again after a move.
|
|
107
|
+
A post written in Hugo has no `feed_id` and takes its page URL. */ -}}
|
|
108
|
+
{{- $entryId := string (.Params.feed_id | default $permalink) -}}
|
|
120
109
|
{{- $isLink := and (eq $format "link") .Params.link_url -}}
|
|
121
110
|
{{- $alternate := cond $isLink (string .Params.link_url) $permalink -}}
|
|
122
111
|
{{- /* Atom <title>: empty for quotes (matches main site's getAtomTitle). */ -}}
|
|
@@ -148,7 +137,7 @@
|
|
|
148
137
|
newest included — as `lib/thread-fold.ts` defines it. A thread of five
|
|
149
138
|
replies or fewer is shown whole; `first` and `last` clamp to the slice,
|
|
150
139
|
so the two windows simply overlap there. */ -}}
|
|
151
|
-
{{- $replies := (where $post.Pages "Params.visibility" "public").
|
|
140
|
+
{{- $replies := (where $post.Pages "Params.visibility" "public").ByWeight -}}
|
|
152
141
|
{{- $truncated := $post.Params.truncated | default false -}}
|
|
153
142
|
{{- range first 2 $replies -}}
|
|
154
143
|
{{- if .Params.truncated -}}{{- $truncated = true -}}{{- end -}}
|
|
@@ -184,7 +173,7 @@
|
|
|
184
173
|
<link rel="enclosure" type="{{ (string ($m.mime_type | default "application/octet-stream")) | transform.XMLEscape }}" href="{{ (string $m.src) | absURL | transform.XMLEscape }}"{{ with $m.size }} length="{{ . }}"{{ end }}{{ with $m.original_name }} title="{{ . | transform.XMLEscape }}"{{ end }}/>
|
|
185
174
|
{{- end }}
|
|
186
175
|
{{- end }}
|
|
187
|
-
<id>{{ $
|
|
176
|
+
<id>{{ $entryId | transform.XMLEscape }}</id>
|
|
188
177
|
<published>{{ $published }}</published>
|
|
189
178
|
<updated>{{ $updated }}</updated>
|
|
190
179
|
<jant:format>{{ $format | transform.XMLEscape }}</jant:format>
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
{{ define "main" }}
|
|
2
2
|
{{- $items := slice -}}
|
|
3
|
-
{{- with
|
|
3
|
+
{{- with partial "jant-data.html" . -}}{{- with .directory -}}{{- $items = . -}}{{- end -}}{{- end -}}
|
|
4
4
|
{{- $collectionCount := 0 -}}
|
|
5
5
|
{{- range $items -}}
|
|
6
|
-
{{- if
|
|
6
|
+
{{- if in (slice "collection" "smart_collection") .type -}}{{- $collectionCount = add $collectionCount 1 -}}{{- end -}}
|
|
7
7
|
{{- end -}}
|
|
8
8
|
|
|
9
9
|
<div class="section section-collections" data-page="collections">
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
{{- end -}}
|
|
69
69
|
</div>
|
|
70
70
|
</div>
|
|
71
|
-
{{- else if
|
|
71
|
+
{{- else if in (slice "collection" "smart_collection") .type -}}
|
|
72
72
|
{{- $entryCount := .entry_count -}}
|
|
73
73
|
{{- $activityLabel := .recent_activity_label -}}
|
|
74
74
|
{{- $activityIso := .recent_activity_iso -}}
|
|
@@ -1,9 +1,6 @@
|
|
|
1
1
|
{{ define "main" }}
|
|
2
2
|
{{- /* Root bundles carry a derived projection of every Featured Post in the Thread. */ -}}
|
|
3
|
-
{{- $
|
|
4
|
-
{{- $roots := where $posts "Kind" "section" -}}
|
|
5
|
-
{{- $featured := where $roots "Params.featured_sort_at" "ne" nil -}}
|
|
6
|
-
{{- $featured = sort $featured "Params.featured_sort_at" "desc" -}}
|
|
3
|
+
{{- $featured := partial "featured-members.html" . -}}
|
|
7
4
|
{{- $pageSize := .Site.Params.page_size | default 10 -}}
|
|
8
5
|
{{- $paginator := .Paginate $featured $pageSize -}}
|
|
9
6
|
|