@jant/core 0.10.0 → 0.11.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/db/execute-file.js +1 -1
- package/bin/commands/db/export.js +1 -1
- package/bin/commands/migrate.js +4 -4
- package/bin/commands/posts/rebuild-html.js +1 -1
- package/bin/commands/reset-password.js +1 -1
- package/bin/commands/search/reindex.js +1 -1
- package/bin/commands/setup.js +4 -2
- package/bin/commands/site/export.js +3 -0
- package/bin/commands/site/import.js +178 -91
- package/bin/commands/site/pull-media.js +3 -2
- package/bin/commands/site/snapshot/export.js +3 -1
- package/bin/commands/site/snapshot/import.js +3 -2
- package/bin/commands/start.js +44 -0
- package/bin/commands/telegram/register-webhooks.js +1 -1
- package/bin/commands/uploads/cleanup.js +48 -9
- package/bin/jant.js +39 -4
- package/bin/lib/import-sources.js +151 -0
- package/bin/lib/node-env.js +14 -9
- package/bin/lib/runtime-target.js +1 -1
- package/bin/lib/site-pull-media.js +56 -4
- package/bin/lib/site-snapshot.js +39 -2
- package/bin/lib/sql-export.js +66 -10
- package/dist/{app-DIVtyB4m.js → app-jQI4OPRe.js} +5055 -4448
- package/dist/client/.vite/manifest.json +38 -38
- package/dist/client/_assets/chunks/{create-editor-B-m7X7S5.js → create-editor-5Y49x7h5.js} +2 -2
- package/dist/client/_assets/chunks/{footnote-rail-CmeoVtnU.js → footnote-rail-BJwswtVQ.js} +1 -1
- package/dist/client/_assets/chunks/{settings-paths-C-ZZBTau.js → settings-paths-h6RjIe3C.js} +2 -2
- package/dist/client/_assets/chunks/{slug-format-BcIsNKz-.js → slug-format-Dsi0e9Xn.js} +1 -1
- package/dist/client/_assets/chunks/{slugify-373citbs.js → slugify-DlHLyUHS.js} +1 -1
- package/dist/client/_assets/chunks/sortable-list-DYMcJrlS.js +2 -0
- package/dist/client/_assets/chunks/unsafe-svg-DxrzM_Gb.js +2 -0
- package/dist/client/_assets/client-52vQhZAv.js +296 -0
- package/dist/client/_assets/client-BaqmpPQ-.css +2 -0
- package/dist/client/_assets/{client-auth-BpkkKTsV.js → client-auth-BDcCR6u1.js} +2 -2
- package/dist/client/_assets/client-author-CGVvrNZ8.css +2 -0
- package/dist/client/_assets/{client-compose-C-DXzcFR.js → client-compose-CzEwT5qX.js} +4 -4
- package/dist/client/_assets/{client-manage-BfT7ht4M.js → client-manage-CF7x21L4.js} +37 -37
- package/dist/client/_assets/{client-settings-CGR_nZ78.js → client-settings-DIM44Zqh.js} +2 -2
- package/dist/{url-CKlGzvdN.js → constants-DEgyqWDl.js} +340 -1
- package/dist/index.d.ts +44 -0
- package/dist/index.js +33 -1
- package/dist/node.js +57 -13
- package/package.json +13 -18
- package/src/__tests__/api-docs.test.ts +168 -1
- package/src/__tests__/bin/import-sources.test.ts +85 -0
- package/src/__tests__/bin/uploads-cleanup.test.ts +66 -26
- package/src/__tests__/cli-commands.test.ts +40 -0
- package/src/__tests__/config-docs.test.ts +119 -16
- package/src/__tests__/custom-url-redirects.test.ts +108 -0
- package/src/__tests__/export-collection-custom-urls.test.ts +69 -0
- package/src/__tests__/export-docs.test.ts +113 -41
- package/src/__tests__/export-feed-ids.test.ts +1 -0
- package/src/__tests__/export-format-version.test.ts +88 -0
- package/src/__tests__/export-hugo-build.test.ts +139 -4
- package/src/__tests__/export-import-roundtrip.test.ts +2 -1
- package/src/__tests__/export-service.test.ts +42 -13
- package/src/__tests__/export-smart-collection.test.ts +1 -1
- package/src/__tests__/feed-docs.test.ts +287 -21
- package/src/__tests__/feed-reply-addresses.test.ts +100 -0
- package/src/__tests__/feeds-disabled.test.ts +98 -0
- package/src/__tests__/fixtures/export-format/1.json +76 -0
- package/src/__tests__/fixtures/export-format/2.json +80 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/README.md +130 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/2thjq/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/2u5e5/_index.md +35 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/0x4nv/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/_index.md +44 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/faqyt/index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/the-potting-mix-guide-i-keep-rereading/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/5kayp/_index.md +23 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/5ynfs/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/5ynfs/hu597/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/_index.md +5 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/a-night-heron-field-guide-for-my-walk-folder/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/a-quiet-saturday-after-a-busy-week/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/archive/_index.md +8 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/are-na-is-the-only-bookmark-pile-i-still-revisit/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/bought-too-many-lemons-again/_index.md +37 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/city-walks/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/cleanshot-for-screenshots-ocr-and-screen-recording-on-the-mac/_index.md +33 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/cleanshotmac-shang-de-jie-tu-ocr-lu-ping-gong-ju/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/co344/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/collections/_index.md +5 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/current-tea-rotation/_index.md +34 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/derek-sivers-still-writes-the-kind-of-internet-i-want-more-of/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/desk-but-better/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/e0kcg/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/egi3c/_index.md +24 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/evf9j/_index.md +152 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/featured/_index.md +8 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-basho/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-epictetus/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-marcus-aurelius/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-seneca/_index.md +26 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-thoreau/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/2cl6d/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/3zqv7/index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/5oxsv/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/_index.md +39 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gwob9/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/home-cooking/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/hz729/_index.md +24 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/inaturalist-ai-zi-ran-she-qu/_index.md +44 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/j4v0q/_index.md +35 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k278t/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k4eee/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/a-reading-log-idea-i-might-steal/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/a83qu/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/from-seneca-5hibo/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/kan-qi-lai-bi-jiao-ku-de-gong-si-men/_index.md +41 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/l2m7y/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/lan-ya-yao-kong-qi-chuang-shang-yue-du-de-fan-ye-shen-qi/_index.md +57 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/mynoise-for-rainy-afternoons/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/n09le/_index.md +23 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/ni-fu-jin-de-wei-ji-bai-ke-tiao-mu/_index.md +42 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/nts-archives-are-good-cleaning-music/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/c91j0/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/qyucy/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/wsgck/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/rain-makes-my-neighborhood-look-better/_index.md +46 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/reading-notes/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/s4r3e/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/serious-eats-on-tomato-and-egg-soup/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/_index.md +44 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/cxiu6/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/t77ms/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/the-soup-trick-i-always-forget/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/telk3/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/telk3/from-thoreau-pawt2/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/the-five-minute-reset-is-still-the-best-habit-i-have/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/the-hallway-light-took-12-minutes-and-3-months/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/the-recurse-center-manual-is-weirdly-calming/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/tiny-projects/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/tong-wang-xing-fu-zhi-lu/_index.md +68 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/tou-ma-yan-jiang-ju-le-bu-chu-ti-yan/_index.md +62 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/useful-links/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/weekend-notes/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/what-i-actually-use-my-notebook-for/_index.md +52 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/data/jant.toml +124 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/hugo.toml +45 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/_redirects +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/40bc6cd1f12e-med_01kn8jtq3penf98tfq4gzmh9g9.png +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jtx8qenf98tm9ahxr48sw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jv0jdenf98tp6qr9zgjjc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jv452enf98trbkwrvhvgd.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jvb16enf98txp7p0pf5ge.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jve5nenf98tzap11gpxzr.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jvq58enf98v538w5vsqp4.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jvsaeenf98v6ct4gjzppc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jw26cenf98vc7k0ppz5k8.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q1hme4e8cmby77dn66yy.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q2w7e4e8cmc20036yh66.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q7d2e4e8cmdeqjmyafby.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q887e4e8cmdjssych7yh.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167sm0f6ct88qw5brtsgcw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167tf8f6ct88r169s51j49.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167vaaf6ct88rbx5ztenwb.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167w51f6ct88rp19pybkw1.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167x0nf6ct88rzajb84tw3.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167xxbf6ct88s5t2300bjk.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167yq5f6ct88s9pjwt5fxg.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167zg4f6ct88sge8jp28ja.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/themes/jant/static/apple-touch-icon.png +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/themes/jant/static/custom.css +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/themes/jant/static/favicon.ico +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/wrangler.jsonc +24 -0
- package/src/__tests__/fixtures/releases/0.10.0/snapshot/db.sql +322 -0
- package/src/__tests__/fixtures/releases/0.10.0/snapshot/meta.json +11 -0
- package/src/__tests__/helpers/app.ts +6 -1
- package/src/__tests__/helpers/export-fixtures.ts +1 -0
- package/src/__tests__/import-refused-aliases.test.ts +98 -0
- package/src/__tests__/import-site-command.test.ts +73 -8
- package/src/__tests__/public-types.test.ts +64 -0
- package/src/__tests__/release-fixtures.test.ts +79 -24
- package/src/__tests__/release-version.test.ts +84 -0
- package/src/__tests__/site-pull-media.test.ts +48 -0
- package/src/__tests__/snapshot-tables.test.ts +37 -0
- package/src/__tests__/sql-export.test.ts +21 -1
- package/src/__tests__/stored-file-headers.test.ts +94 -0
- package/src/__tests__/template-deploy-workflow.test.ts +101 -0
- package/src/__tests__/theme-docs.test.ts +113 -24
- package/src/__tests__/toolchain-versions.test.ts +54 -0
- package/src/__tests__/trailing-slash-redirect.test.ts +61 -0
- package/src/__tests__/vite-config-graph.test.ts +98 -0
- package/src/app.tsx +89 -66
- package/src/client/__tests__/compose-bridge-image-upload.test.ts +1 -0
- package/src/client/__tests__/compose-bridge.test.ts +87 -0
- package/src/client/__tests__/compose-shortcuts.test.ts +4 -4
- package/src/client/__tests__/footnote-rail.test.ts +1 -1
- package/src/client/__tests__/lazy-entries.test.ts +1 -1
- package/src/client/__tests__/media-scroll-hint.test.ts +2 -2
- package/src/client/avatar-upload.ts +10 -10
- package/src/client/components/__tests__/jant-compose-dialog.test.ts +295 -4
- package/src/client/components/__tests__/jant-compose-editor.test.ts +34 -0
- package/src/client/components/__tests__/jant-settings-general.test.ts +0 -32
- package/src/client/components/compose-types.ts +14 -0
- package/src/client/components/jant-compose-dialog.ts +96 -41
- package/src/client/components/jant-compose-editor.ts +21 -4
- package/src/client/components/jant-config-editor.ts +4 -6
- package/src/client/components/jant-media-lightbox.ts +4 -4
- package/src/client/components/jant-settings-general.ts +0 -4
- package/src/client/components/nav-manager-types.ts +6 -5
- package/src/client/compose-bridge.ts +15 -4
- package/src/client/compose-launch.ts +4 -6
- package/src/client/compose-shortcuts.ts +1 -1
- package/src/client/footnote-rail.ts +1 -1
- package/src/client/lazy-entries.ts +1 -1
- package/src/client/media-scroll-hint.ts +2 -2
- package/src/client/tiptap/__tests__/markdown-clipboard.test.ts +55 -0
- package/src/client/tiptap/markdown-clipboard.ts +50 -2
- package/src/client/upload-session.ts +7 -6
- package/src/db/__tests__/backfill-external-redirects.test.ts +59 -0
- package/src/db/__tests__/backfill-featured-discover.test.ts +56 -0
- package/src/db/backfills/0007_restore_external_redirect_scheme.sql +20 -0
- package/src/db/backfills/0008_turn_off_featured_only_discover.sql +11 -0
- package/src/i18n/locales/public/en.po +46 -48
- package/src/i18n/locales/public/en.ts +1 -1
- package/src/i18n/locales/public/zh-Hans.po +45 -46
- package/src/i18n/locales/public/zh-Hans.ts +1 -1
- package/src/i18n/locales/public/zh-Hant.po +45 -46
- package/src/i18n/locales/public/zh-Hant.ts +1 -1
- package/src/i18n/locales/settings/en.po +15 -29
- package/src/i18n/locales/settings/en.ts +1 -1
- package/src/i18n/locales/settings/zh-Hans.po +15 -29
- package/src/i18n/locales/settings/zh-Hans.ts +1 -1
- package/src/i18n/locales/settings/zh-Hant.po +15 -29
- package/src/i18n/locales/settings/zh-Hant.ts +1 -1
- package/src/index.ts +43 -2
- package/src/lib/__tests__/api-settings.test.ts +3 -3
- package/src/lib/__tests__/constants.test.ts +10 -0
- package/src/lib/__tests__/discover.test.ts +8 -9
- package/src/lib/__tests__/env-values.test.ts +125 -0
- package/src/lib/__tests__/feed-path.test.ts +29 -0
- package/src/lib/__tests__/feed.test.ts +50 -22
- package/src/lib/__tests__/filter-dimensions.test.ts +22 -8
- package/src/lib/__tests__/post-list-cursor.test.ts +0 -10
- package/src/lib/__tests__/rate-limit.test.ts +22 -7
- package/src/lib/__tests__/resolve-config.test.ts +5 -3
- package/src/lib/__tests__/schemas.test.ts +72 -23
- package/src/lib/__tests__/slugify.test.ts +9 -0
- package/src/lib/__tests__/startup-config.test.ts +12 -0
- package/src/lib/__tests__/storage-s3.test.ts +214 -0
- package/src/lib/__tests__/theme.test.ts +20 -1
- package/src/lib/__tests__/time.test.ts +56 -0
- package/src/lib/__tests__/timeline.test.ts +46 -0
- package/src/lib/__tests__/url-fetch.test.ts +65 -1
- package/src/lib/__tests__/url.test.ts +60 -1
- package/src/lib/api-nav-items.ts +16 -20
- package/src/lib/api-post-input.ts +34 -1
- package/src/lib/api-posts.ts +125 -23
- package/src/lib/api-public-posts.ts +28 -37
- package/src/lib/api-search.ts +49 -2
- package/src/lib/api-settings.ts +159 -54
- package/src/lib/api-threads.ts +34 -11
- package/src/lib/constants.ts +6 -0
- package/src/lib/discover.ts +7 -23
- package/src/lib/env-values.ts +140 -0
- package/src/lib/env.ts +203 -12
- package/src/lib/feed-path.ts +8 -2
- package/src/lib/feed-policy.ts +110 -7
- package/src/lib/feed.ts +69 -25
- package/src/lib/filter-dimensions.ts +17 -10
- package/src/lib/github-sync-site-config.ts +1 -0
- package/src/lib/hugo-markdown.ts +5 -6
- package/src/lib/navigation.ts +4 -1
- package/src/lib/post-list-cursor.ts +33 -29
- package/src/lib/public-storage.ts +43 -0
- package/src/lib/rate-limit.ts +31 -16
- package/src/lib/render.tsx +5 -0
- package/src/lib/resolve-config.ts +16 -19
- package/src/lib/schemas.ts +248 -180
- package/src/lib/slugify.ts +6 -1
- package/src/lib/sse.ts +1 -1
- package/src/lib/startup-config.ts +20 -1
- package/src/lib/theme.ts +8 -5
- package/src/lib/thread-fold.ts +6 -0
- package/src/lib/thread-query.ts +19 -24
- package/src/lib/time.ts +137 -17
- package/src/lib/timeline.ts +56 -13
- package/src/lib/url-fetch.ts +141 -40
- package/src/lib/url.ts +86 -1
- package/src/middleware/__tests__/auth.test.ts +27 -0
- package/src/middleware/__tests__/cors.test.ts +54 -0
- package/src/middleware/__tests__/cross-origin.test.ts +149 -0
- package/src/middleware/__tests__/public-content-access.test.ts +2 -42
- package/src/middleware/auth.ts +34 -3
- package/src/middleware/cors.ts +4 -4
- package/src/middleware/cross-origin.ts +124 -0
- package/src/middleware/error-handler.ts +7 -0
- package/src/middleware/public-content-access.ts +3 -26
- package/src/middleware/secure-headers.ts +8 -2
- package/src/node/__tests__/cli-migrate.test.ts +2 -2
- package/src/node/__tests__/cli-runtime-target.test.ts +13 -2
- package/src/node/__tests__/cli-site-snapshot.test.ts +57 -0
- package/src/node/__tests__/cli-snapshot-meta.test.ts +11 -1
- package/src/node/__tests__/cli-sql-export.test.ts +25 -1
- package/src/node/__tests__/cli-start.test.ts +66 -0
- package/src/node/__tests__/request-handler.test.ts +37 -0
- package/src/node/__tests__/runtime.test.ts +56 -1
- package/src/node/request-handler.ts +58 -5
- package/src/node/runtime.ts +37 -11
- package/src/preset.css +3 -3
- package/src/routes/__tests__/compose.test.ts +84 -0
- package/src/routes/api/__tests__/collections.test.ts +68 -0
- package/src/routes/api/__tests__/mcp.test.ts +164 -9
- package/src/routes/api/__tests__/media.test.ts +9 -1
- package/src/routes/api/__tests__/nav-items.test.ts +27 -1
- package/src/routes/api/__tests__/posts.test.ts +269 -78
- package/src/routes/api/__tests__/search.test.ts +17 -4
- package/src/routes/api/__tests__/settings.test.ts +119 -85
- package/src/routes/api/__tests__/telegram.test.ts +11 -6
- package/src/routes/api/__tests__/threads.test.ts +11 -0
- package/src/routes/api/__tests__/upload-response.test.ts +48 -0
- package/src/routes/api/__tests__/uploads.test.ts +35 -2
- package/src/routes/api/collections.ts +3 -3
- package/src/routes/api/custom-urls.ts +2 -1
- package/src/routes/api/export.ts +1 -0
- package/src/routes/api/internal/__tests__/post-body-html.test.ts +19 -0
- package/src/routes/api/internal/__tests__/uploads.test.ts +2 -0
- package/src/routes/api/internal/sites.ts +16 -4
- package/src/routes/api/mcp.ts +1 -0
- package/src/routes/api/media.ts +7 -8
- package/src/routes/api/nav-items.ts +2 -1
- package/src/routes/api/posts.ts +18 -24
- package/src/routes/api/public/__tests__/posts.test.ts +15 -0
- package/src/routes/api/public/__tests__/threads-collections.test.ts +12 -45
- package/src/routes/api/public/__tests__/threads.test.ts +41 -9
- package/src/routes/api/public/posts.ts +2 -2
- package/src/routes/api/public/threads.ts +16 -26
- package/src/routes/api/search.ts +7 -41
- package/src/routes/api/settings.ts +32 -28
- package/src/routes/api/smart-collections.ts +6 -1
- package/src/routes/api/threads.ts +25 -26
- package/src/routes/api/upload.ts +6 -21
- package/src/routes/api/uploads.ts +14 -20
- package/src/routes/auth/__tests__/dev.test.ts +16 -13
- package/src/routes/auth/__tests__/hosted-sso.test.ts +51 -0
- package/src/routes/auth/__tests__/setup-auth.test.ts +2 -0
- package/src/routes/auth/__tests__/setup-discover.test.ts +2 -0
- package/src/routes/auth/__tests__/setup-flow.test.ts +32 -0
- package/src/routes/auth/__tests__/setup-rate-limit.test.ts +72 -0
- package/src/routes/auth/__tests__/setup-steps.test.ts +2 -0
- package/src/routes/auth/__tests__/signin.test.ts +167 -2
- package/src/routes/auth/dev.ts +4 -6
- package/src/routes/auth/hosted-sso.ts +9 -6
- package/src/routes/auth/setup.tsx +35 -5
- package/src/routes/auth/signin.tsx +96 -1
- package/src/routes/compose.tsx +47 -47
- package/src/routes/dash/__tests__/settings-avatar.test.ts +59 -4
- package/src/routes/dash/__tests__/settings-demo-locks.test.ts +147 -0
- package/src/routes/dash/custom-urls.tsx +2 -0
- package/src/routes/dash/settings.tsx +79 -32
- package/src/routes/feed/__tests__/feed.test.ts +93 -3
- package/src/routes/feed/__tests__/sitemap.test.ts +42 -0
- package/src/routes/feed/feed.ts +128 -175
- package/src/routes/feed/sitemap.ts +9 -7
- package/src/routes/pages/__tests__/archive-years.test.ts +45 -0
- package/src/routes/pages/__tests__/collection-routing.test.ts +40 -0
- package/src/routes/pages/__tests__/collections.test.ts +3 -0
- package/src/routes/pages/__tests__/language-routing.test.ts +31 -0
- package/src/routes/pages/__tests__/post-page-round-trips.test.ts +34 -2
- package/src/routes/pages/__tests__/search.test.ts +5 -2
- package/src/routes/pages/__tests__/thread-gap.test.ts +207 -0
- package/src/routes/pages/archive.tsx +33 -94
- package/src/routes/pages/brand.tsx +1 -0
- package/src/routes/pages/collection.tsx +13 -84
- package/src/routes/pages/collections.tsx +2 -0
- package/src/routes/pages/featured.tsx +7 -2
- package/src/routes/pages/home.tsx +1 -0
- package/src/routes/pages/latest.tsx +6 -2
- package/src/routes/pages/new.tsx +1 -0
- package/src/routes/pages/page.tsx +73 -47
- package/src/routes/pages/search.tsx +5 -3
- package/src/routes/pages/smart-collection.tsx +11 -70
- package/src/routes/pages/subscribe.tsx +1 -0
- package/src/routes/pages/theme-sample.tsx +1 -0
- package/src/runtime/__tests__/readiness.test.ts +16 -0
- package/src/runtime/cloudflare.ts +2 -3
- package/src/runtime/index.ts +3 -1
- package/src/runtime/node.ts +3 -5
- package/src/runtime/readiness.ts +5 -0
- package/src/services/__tests__/auth.test.ts +115 -0
- package/src/services/__tests__/collection.test.ts +9 -0
- package/src/services/__tests__/github-sync-webhook.test.ts +78 -0
- package/src/services/__tests__/hosted-handoff.test.ts +208 -1
- package/src/services/__tests__/media.test.ts +47 -27
- package/src/services/__tests__/navigation.test.ts +67 -15
- package/src/services/__tests__/post.test.ts +103 -56
- package/src/services/__tests__/search.test.ts +38 -0
- package/src/services/__tests__/settings.test.ts +2 -14
- package/src/services/__tests__/smart-collection.test.ts +2 -2
- package/src/services/__tests__/telegram-ingest.test.ts +113 -0
- package/src/services/__tests__/thread.test.ts +26 -11
- package/src/services/auth.ts +36 -4
- package/src/services/collection.ts +46 -5
- package/src/services/custom-url.ts +11 -4
- package/src/services/export-theme/assets/client-site.css +1 -1
- package/src/services/export-theme/assets/client-site.js +2 -2
- package/src/services/export-theme/layouts/_default/baseof.html +1 -1
- package/src/services/export-theme/layouts/collection/single.html +1 -1
- package/src/services/export-theme/layouts/partials/featured-thread.html +8 -1
- package/src/services/export-theme/layouts/partials/head.html +1 -1
- package/src/services/export-theme/layouts/partials/media-gallery.html +6 -3
- package/src/services/export-theme/layouts/smart_collection/list.html +1 -1
- package/src/services/export-theme/styles/main.css +3 -3
- package/src/services/export.ts +68 -19
- package/src/services/github-sync.ts +10 -10
- package/src/services/hosted-handoff.ts +106 -6
- package/src/services/index.ts +3 -1
- package/src/services/language.ts +33 -0
- package/src/services/mcp.ts +176 -438
- package/src/services/media.ts +69 -21
- package/src/services/navigation.ts +19 -4
- package/src/services/path.ts +45 -3
- package/src/services/post.ts +329 -214
- package/src/services/search.ts +22 -3
- package/src/services/settings.ts +36 -3
- package/src/services/site-admin.ts +1 -0
- package/src/services/smart-collection.ts +10 -3
- package/src/services/telegram.ts +23 -6
- package/src/services/thread.ts +11 -3
- package/src/services/upload-session.ts +14 -15
- package/src/styles/components.css +2 -2
- package/src/styles/site-media.css +2 -2
- package/src/styles/tokens.css +19 -22
- package/src/styles/ui-author.css +73 -94
- package/src/styles/ui.css +62 -62
- package/src/types/app-context.ts +5 -1
- package/src/types/bindings.ts +11 -0
- package/src/types/config.ts +4 -4
- package/src/types/constants.ts +20 -0
- package/src/types/props.ts +34 -8
- package/src/types/views.ts +28 -13
- package/src/ui/color-themes.ts +6 -5
- package/src/ui/dash/settings/GeneralContent.tsx +0 -22
- package/src/ui/dash/settings/__tests__/GeneralContent.test.tsx +0 -21
- package/src/ui/feed/CuratedThreadPreview.tsx +7 -2
- package/src/ui/feed/LinkCard.tsx +1 -2
- package/src/ui/feed/NoteCard.tsx +1 -2
- package/src/ui/feed/QuoteCard.tsx +2 -2
- package/src/ui/feed/ThreadPreview.tsx +6 -6
- package/src/ui/feed/TimelineFeed.tsx +1 -7
- package/src/ui/feed/__tests__/thread-preview.test.ts +123 -10
- package/src/ui/feed/__tests__/timeline-cards.test.ts +18 -1
- package/src/ui/layouts/BaseLayout.tsx +5 -0
- package/src/ui/pages/ArchivePage.tsx +1 -1
- package/src/ui/pages/BrandPage.tsx +1 -1
- package/src/ui/pages/CollectionPage.tsx +0 -1
- package/src/ui/pages/CollectionsPage.tsx +2 -2
- package/src/ui/pages/ComposePage.tsx +1 -1
- package/src/ui/pages/FeaturedPage.tsx +1 -1
- package/src/ui/pages/HomePage.tsx +1 -1
- package/src/ui/pages/PostPage.tsx +1 -1
- package/src/ui/pages/SearchPage.tsx +1 -1
- package/src/ui/pages/SmartCollectionPage.tsx +2 -3
- package/src/ui/pages/SubscribePage.tsx +1 -1
- package/src/ui/pages/ThemeSamplePage.tsx +1 -1
- package/src/ui/shared/MediaGallery.tsx +1 -1
- package/src/vendor/datastar.js +9 -1956
- package/src/vendor/datastar.js.map +4 -4
- package/dist/client/_assets/chunks/sortable-list-BJyd-LXE.js +0 -2
- package/dist/client/_assets/chunks/unsafe-svg-DU_DNMy5.js +0 -2
- package/dist/client/_assets/client-D4AT9Iqr.js +0 -295
- package/dist/client/_assets/client-DRuw7XCt.css +0 -2
- package/dist/client/_assets/client-author-DQ8R-8KR.css +0 -2
package/src/lib/api-settings.ts
CHANGED
|
@@ -11,10 +11,22 @@ import {
|
|
|
11
11
|
import { getSupportedLocaleEntries } from "../i18n/supported-locales.js";
|
|
12
12
|
import { SETTINGS_KEYS } from "./constants.js";
|
|
13
13
|
import { getEnvString } from "./env.js";
|
|
14
|
+
import { readConfigEnvValue } from "./env-values.js";
|
|
14
15
|
import { normalizeEditableSettingValue } from "./schemas.js";
|
|
15
16
|
import { getTimeZoneOptions } from "./timezones.js";
|
|
17
|
+
import { getAvailableThemes } from "./theme.js";
|
|
18
|
+
import { BUILTIN_FONT_THEMES } from "../ui/font-themes.js";
|
|
19
|
+
import { THEME_MODES } from "../types/config.js";
|
|
20
|
+
import { ValidationError } from "./errors.js";
|
|
16
21
|
|
|
17
|
-
|
|
22
|
+
/**
|
|
23
|
+
* Settings a demo site's shared visitors can't change: indexing stays off, and
|
|
24
|
+
* custom CSS would restyle the site for everyone until the nightly reset.
|
|
25
|
+
*/
|
|
26
|
+
export const demoLockedSettingKeys = new Set<ConfigKey>([
|
|
27
|
+
"NOINDEX",
|
|
28
|
+
"CUSTOM_CSS",
|
|
29
|
+
]);
|
|
18
30
|
|
|
19
31
|
/** Config keys explicitly approved for runtime editing. */
|
|
20
32
|
export const editableSettingKeys = Object.entries(CONFIG_FIELDS)
|
|
@@ -64,12 +76,8 @@ export function getEditableSettingFallbackValue(
|
|
|
64
76
|
allSettings: Record<string, string> = {},
|
|
65
77
|
): string {
|
|
66
78
|
const field = CONFIG_FIELDS[key];
|
|
67
|
-
const
|
|
68
|
-
|
|
69
|
-
if (envValue) {
|
|
70
|
-
const normalizedEnv = tryNormalizeResolvedSettingValue(key, envValue);
|
|
71
|
-
if (normalizedEnv !== undefined) return normalizedEnv;
|
|
72
|
-
}
|
|
79
|
+
const envValue = env ? readConfigEnvValue(env, key) : undefined;
|
|
80
|
+
if (envValue) return envValue;
|
|
73
81
|
|
|
74
82
|
const normalizedDefault = tryNormalizeResolvedSettingValue(
|
|
75
83
|
key,
|
|
@@ -245,7 +253,126 @@ export function buildConfigEditorFields(
|
|
|
245
253
|
});
|
|
246
254
|
}
|
|
247
255
|
|
|
248
|
-
|
|
256
|
+
/**
|
|
257
|
+
* Appearance settings, each edited on its own settings screen rather than as
|
|
258
|
+
* a Config Editor row. The API reads and writes them next to the editable
|
|
259
|
+
* ones.
|
|
260
|
+
*/
|
|
261
|
+
export const appearanceSettingKeys = [
|
|
262
|
+
"THEME",
|
|
263
|
+
"FONT_THEME",
|
|
264
|
+
"THEME_MODE",
|
|
265
|
+
"CUSTOM_CSS",
|
|
266
|
+
"SHOW_HEADER_AVATAR",
|
|
267
|
+
] as const satisfies readonly ConfigKey[];
|
|
268
|
+
type AppearanceSettingKey = (typeof appearanceSettingKeys)[number];
|
|
269
|
+
|
|
270
|
+
/**
|
|
271
|
+
* The site's languages. `GET /api/settings` reports them; only the language
|
|
272
|
+
* rules write them: Settings → Languages, or a site import restoring what an
|
|
273
|
+
* export recorded (`PUT /api/settings/import`).
|
|
274
|
+
*/
|
|
275
|
+
export const languageSettingKeys = [
|
|
276
|
+
"MULTILINGUAL_ENABLED",
|
|
277
|
+
"ADDITIONAL_LANGUAGES",
|
|
278
|
+
] as const satisfies readonly ConfigKey[];
|
|
279
|
+
|
|
280
|
+
function isAppearanceSettingKey(key: string): key is AppearanceSettingKey {
|
|
281
|
+
return (appearanceSettingKeys as readonly string[]).includes(key);
|
|
282
|
+
}
|
|
283
|
+
|
|
284
|
+
/** The value an appearance or language setting has in effect. */
|
|
285
|
+
function readScreenSetting(
|
|
286
|
+
allSettings: Record<string, string>,
|
|
287
|
+
key: AppearanceSettingKey | (typeof languageSettingKeys)[number],
|
|
288
|
+
env?: Bindings,
|
|
289
|
+
): string {
|
|
290
|
+
const stored = allSettings[key] ?? "";
|
|
291
|
+
switch (key) {
|
|
292
|
+
case "THEME":
|
|
293
|
+
return (
|
|
294
|
+
stored ||
|
|
295
|
+
(env && getEnvString(env, "DEFAULT_THEME")) ||
|
|
296
|
+
CONFIG_FIELDS.DEFAULT_THEME.defaultValue
|
|
297
|
+
);
|
|
298
|
+
case "FONT_THEME":
|
|
299
|
+
return (
|
|
300
|
+
stored ||
|
|
301
|
+
(env && getEnvString(env, "DEFAULT_FONT_THEME")) ||
|
|
302
|
+
CONFIG_FIELDS.DEFAULT_FONT_THEME.defaultValue
|
|
303
|
+
);
|
|
304
|
+
case "THEME_MODE":
|
|
305
|
+
return (THEME_MODES as readonly string[]).includes(stored)
|
|
306
|
+
? stored
|
|
307
|
+
: "auto";
|
|
308
|
+
case "SHOW_HEADER_AVATAR":
|
|
309
|
+
case "MULTILINGUAL_ENABLED":
|
|
310
|
+
return String(stored === "true");
|
|
311
|
+
case "CUSTOM_CSS":
|
|
312
|
+
case "ADDITIONAL_LANGUAGES":
|
|
313
|
+
return stored;
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
|
|
317
|
+
/**
|
|
318
|
+
* Check an appearance setting's value the way its settings screen would.
|
|
319
|
+
*
|
|
320
|
+
* @param key - The appearance setting
|
|
321
|
+
* @param value - The value a client sent
|
|
322
|
+
* @returns The value to store
|
|
323
|
+
* @throws {ValidationError} When the screen would not offer that value
|
|
324
|
+
* @example
|
|
325
|
+
* normalizeAppearanceSettingValue("THEME_MODE", "dark"); // "dark"
|
|
326
|
+
*/
|
|
327
|
+
export function normalizeAppearanceSettingValue(
|
|
328
|
+
key: AppearanceSettingKey,
|
|
329
|
+
value: string,
|
|
330
|
+
): string {
|
|
331
|
+
const trimmed = value.trim();
|
|
332
|
+
switch (key) {
|
|
333
|
+
case "THEME": {
|
|
334
|
+
const ids = getAvailableThemes().map((theme) => theme.id);
|
|
335
|
+
if (trimmed && !ids.includes(trimmed)) {
|
|
336
|
+
throw new ValidationError(
|
|
337
|
+
`THEME must be a theme ID: ${ids.join(", ")}.`,
|
|
338
|
+
);
|
|
339
|
+
}
|
|
340
|
+
return trimmed;
|
|
341
|
+
}
|
|
342
|
+
case "FONT_THEME": {
|
|
343
|
+
const ids = BUILTIN_FONT_THEMES.map((theme) => theme.id);
|
|
344
|
+
if (trimmed && !ids.includes(trimmed)) {
|
|
345
|
+
throw new ValidationError(
|
|
346
|
+
`FONT_THEME must be a font theme ID: ${ids.join(", ")}.`,
|
|
347
|
+
);
|
|
348
|
+
}
|
|
349
|
+
return trimmed;
|
|
350
|
+
}
|
|
351
|
+
case "THEME_MODE":
|
|
352
|
+
if (!(THEME_MODES as readonly string[]).includes(trimmed)) {
|
|
353
|
+
throw new ValidationError(
|
|
354
|
+
`THEME_MODE must be one of: ${THEME_MODES.join(", ")}.`,
|
|
355
|
+
);
|
|
356
|
+
}
|
|
357
|
+
return trimmed;
|
|
358
|
+
case "SHOW_HEADER_AVATAR":
|
|
359
|
+
if (trimmed !== "true" && trimmed !== "false") {
|
|
360
|
+
throw new ValidationError(
|
|
361
|
+
'SHOW_HEADER_AVATAR must be "true" or "false".',
|
|
362
|
+
);
|
|
363
|
+
}
|
|
364
|
+
return trimmed;
|
|
365
|
+
case "CUSTOM_CSS":
|
|
366
|
+
return trimmed;
|
|
367
|
+
}
|
|
368
|
+
}
|
|
369
|
+
|
|
370
|
+
/**
|
|
371
|
+
* Every setting `GET /api/settings` reports, with the value in effect: the
|
|
372
|
+
* Config Editor's editable settings, the appearance settings, and the
|
|
373
|
+
* languages.
|
|
374
|
+
*/
|
|
375
|
+
export function buildApiSettingsResponse(
|
|
249
376
|
allSettings: Record<string, string>,
|
|
250
377
|
demoMode: boolean,
|
|
251
378
|
env?: Bindings,
|
|
@@ -254,6 +381,9 @@ export function buildEditableSettingsResponse(
|
|
|
254
381
|
for (const key of editableSettingKeys) {
|
|
255
382
|
result[key] = getEditableSettingValue(allSettings, key, env);
|
|
256
383
|
}
|
|
384
|
+
for (const key of [...appearanceSettingKeys, ...languageSettingKeys]) {
|
|
385
|
+
result[key] = readScreenSetting(allSettings, key, env);
|
|
386
|
+
}
|
|
257
387
|
if (demoMode) {
|
|
258
388
|
result.NOINDEX = "true";
|
|
259
389
|
}
|
|
@@ -261,32 +391,32 @@ export function buildEditableSettingsResponse(
|
|
|
261
391
|
return result;
|
|
262
392
|
}
|
|
263
393
|
|
|
264
|
-
|
|
394
|
+
/**
|
|
395
|
+
* Split a `PUT /api/settings` body into what it may write and what it names
|
|
396
|
+
* that it may not. Appearance values are checked here; editable ones when the
|
|
397
|
+
* settings service stores them.
|
|
398
|
+
*
|
|
399
|
+
* @throws {ValidationError} When an appearance value isn't one its screen offers
|
|
400
|
+
*/
|
|
401
|
+
export function partitionApiSettingUpdates(
|
|
265
402
|
updates: Record<string, string>,
|
|
266
403
|
demoMode: boolean,
|
|
267
404
|
): {
|
|
268
|
-
filteredUpdates: Partial<Record<
|
|
405
|
+
filteredUpdates: Partial<Record<ConfigKey, string>>;
|
|
269
406
|
rejectedKeys: string[];
|
|
270
407
|
} {
|
|
271
|
-
const filteredUpdates: Partial<Record<
|
|
408
|
+
const filteredUpdates: Partial<Record<ConfigKey, string>> = {};
|
|
272
409
|
const rejectedKeys: string[] = [];
|
|
273
410
|
|
|
274
411
|
for (const [key, value] of Object.entries(updates)) {
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
if (
|
|
278
|
-
demoMode &&
|
|
279
|
-
editableSettingKeys.includes(configKey) &&
|
|
280
|
-
demoLockedSettingKeys.has(configKey)
|
|
281
|
-
) {
|
|
412
|
+
if (!isEditableSettingKey(key) && !isAppearanceSettingKey(key)) {
|
|
282
413
|
rejectedKeys.push(key);
|
|
283
|
-
|
|
284
|
-
}
|
|
285
|
-
|
|
286
|
-
if (editableSettingKeys.includes(configKey)) {
|
|
287
|
-
filteredUpdates[configKey] = value;
|
|
288
|
-
} else {
|
|
414
|
+
} else if (demoMode && demoLockedSettingKeys.has(key)) {
|
|
289
415
|
rejectedKeys.push(key);
|
|
416
|
+
} else {
|
|
417
|
+
filteredUpdates[key] = isAppearanceSettingKey(key)
|
|
418
|
+
? normalizeAppearanceSettingValue(key, value)
|
|
419
|
+
: value;
|
|
290
420
|
}
|
|
291
421
|
}
|
|
292
422
|
|
|
@@ -297,46 +427,21 @@ export function partitionEditableSettingUpdates(
|
|
|
297
427
|
}
|
|
298
428
|
|
|
299
429
|
/**
|
|
300
|
-
*
|
|
301
|
-
*
|
|
302
|
-
* editor, header toggle) but that the site export emits as plain values and
|
|
303
|
-
* the importer needs to restore verbatim. Bytes-and-storage-keyed internal
|
|
304
|
-
* settings (favicon/avatar blobs, storage paths) are excluded — those round
|
|
305
|
-
* trip through `/api/settings/avatar`, not this route.
|
|
430
|
+
* Split a `PUT /api/settings/import` body into the language settings it
|
|
431
|
+
* restores and the keys it names that it doesn't take.
|
|
306
432
|
*/
|
|
307
|
-
export
|
|
308
|
-
"THEME",
|
|
309
|
-
"FONT_THEME",
|
|
310
|
-
"THEME_MODE",
|
|
311
|
-
"CUSTOM_CSS",
|
|
312
|
-
"SHOW_HEADER_AVATAR",
|
|
313
|
-
] as const satisfies readonly ConfigKey[];
|
|
314
|
-
|
|
315
|
-
export function partitionImportableSettingUpdates(
|
|
433
|
+
export function partitionLanguageSettingUpdates(
|
|
316
434
|
updates: Record<string, string>,
|
|
317
|
-
demoMode: boolean,
|
|
318
435
|
): {
|
|
319
436
|
filteredUpdates: Partial<Record<ConfigKey, string>>;
|
|
320
437
|
rejectedKeys: string[];
|
|
321
438
|
} {
|
|
322
439
|
const filteredUpdates: Partial<Record<ConfigKey, string>> = {};
|
|
323
440
|
const rejectedKeys: string[] = [];
|
|
324
|
-
const whitelist = new Set<ConfigKey>(importableInternalSettingKeys);
|
|
325
441
|
|
|
326
442
|
for (const [key, value] of Object.entries(updates)) {
|
|
327
|
-
|
|
328
|
-
|
|
329
|
-
if (
|
|
330
|
-
demoMode &&
|
|
331
|
-
whitelist.has(configKey) &&
|
|
332
|
-
demoLockedSettingKeys.has(configKey)
|
|
333
|
-
) {
|
|
334
|
-
rejectedKeys.push(key);
|
|
335
|
-
continue;
|
|
336
|
-
}
|
|
337
|
-
|
|
338
|
-
if (whitelist.has(configKey)) {
|
|
339
|
-
filteredUpdates[configKey] = value;
|
|
443
|
+
if ((languageSettingKeys as readonly string[]).includes(key)) {
|
|
444
|
+
filteredUpdates[key as ConfigKey] = value;
|
|
340
445
|
} else {
|
|
341
446
|
rejectedKeys.push(key);
|
|
342
447
|
}
|
package/src/lib/api-threads.ts
CHANGED
|
@@ -17,8 +17,11 @@ import {
|
|
|
17
17
|
import {
|
|
18
18
|
loadPublicPostResponses,
|
|
19
19
|
type PublicPostResponse,
|
|
20
|
+
type PublicResponseDeps,
|
|
20
21
|
} from "./api-public-posts.js";
|
|
21
|
-
import {
|
|
22
|
+
import { encodeThreadPostsCursorAfter } from "./post-list-cursor.js";
|
|
23
|
+
import type { PostContent } from "./schemas.js";
|
|
24
|
+
import { getPostPath, toPublicPath } from "./url.js";
|
|
22
25
|
|
|
23
26
|
/**
|
|
24
27
|
* The homepage fold of one Thread: what it shows either side of the gap, and
|
|
@@ -56,6 +59,8 @@ export interface ApiThreadResponse<P, G> {
|
|
|
56
59
|
export interface ApiThreadGap {
|
|
57
60
|
id: string;
|
|
58
61
|
slug: string;
|
|
62
|
+
/** Lists the Thread's posts from this one on: the replies the fold hides. */
|
|
63
|
+
cursor: string;
|
|
59
64
|
}
|
|
60
65
|
|
|
61
66
|
/** The author API's and MCP's Thread object. */
|
|
@@ -105,7 +110,8 @@ export function collectThreadResponsePosts(summaries: ThreadSummary[]): Post[] {
|
|
|
105
110
|
*
|
|
106
111
|
* @param summary - The Thread
|
|
107
112
|
* @param respond - The rendered response for a Post in it
|
|
108
|
-
* @param reference - How the surface names the Post a fold leaves out
|
|
113
|
+
* @param reference - How the surface names the Post a fold leaves out, given
|
|
114
|
+
* the cursor that lists the Thread's posts from it on
|
|
109
115
|
* @returns The Thread object
|
|
110
116
|
* @example
|
|
111
117
|
* toApiThreadResponse(summary, (post) => byId.get(post.id)!, toGap);
|
|
@@ -113,7 +119,7 @@ export function collectThreadResponsePosts(summaries: ThreadSummary[]): Post[] {
|
|
|
113
119
|
export function toApiThreadResponse<P, G>(
|
|
114
120
|
summary: ThreadSummary,
|
|
115
121
|
respond: (post: Post) => P,
|
|
116
|
-
reference: (post: Post) => G,
|
|
122
|
+
reference: (post: Post, cursor: string) => G,
|
|
117
123
|
): ApiThreadResponse<P, G> {
|
|
118
124
|
const { root, fold } = summary;
|
|
119
125
|
const response: ApiThreadResponse<P, G> = {
|
|
@@ -129,7 +135,14 @@ export function toApiThreadResponse<P, G>(
|
|
|
129
135
|
response.fold = {
|
|
130
136
|
leading: fold.leadingReplies.map(respond),
|
|
131
137
|
hidden: fold.hiddenCount,
|
|
132
|
-
gap: fold.firstHiddenReply
|
|
138
|
+
gap: fold.firstHiddenReply
|
|
139
|
+
? reference(
|
|
140
|
+
fold.firstHiddenReply,
|
|
141
|
+
// The hidden run starts right after the last Post the fold shows
|
|
142
|
+
// above it.
|
|
143
|
+
encodeThreadPostsCursorAfter(fold.leadingReplies.at(-1) ?? root),
|
|
144
|
+
)
|
|
145
|
+
: null,
|
|
133
146
|
trailing: [...fold.trailingReplies, fold.latestReply].map(respond),
|
|
134
147
|
};
|
|
135
148
|
}
|
|
@@ -141,6 +154,7 @@ export function toApiThreadResponse<P, G>(
|
|
|
141
154
|
*
|
|
142
155
|
* @param deps - Services and app config
|
|
143
156
|
* @param summaries - Threads to respond with, in order
|
|
157
|
+
* @param options - `content: "markdown"` returns `bodyMarkdown` on every Post
|
|
144
158
|
* @returns One Thread object per summary, in the same order
|
|
145
159
|
* @example
|
|
146
160
|
* const threads = await loadApiThreadResponses(c.var, page.threads);
|
|
@@ -148,11 +162,12 @@ export function toApiThreadResponse<P, G>(
|
|
|
148
162
|
export async function loadApiThreadResponses(
|
|
149
163
|
deps: ApiPostResponseDeps,
|
|
150
164
|
summaries: ThreadSummary[],
|
|
165
|
+
options: { content?: PostContent } = {},
|
|
151
166
|
): Promise<ApiAuthorThreadResponse[]> {
|
|
152
167
|
return buildThreadResponses(
|
|
153
168
|
summaries,
|
|
154
|
-
(posts) => loadApiPostResponses(deps, posts),
|
|
155
|
-
(post) => ({ id: post.id, slug: post.slug }),
|
|
169
|
+
(posts) => loadApiPostResponses(deps, posts, options),
|
|
170
|
+
(post, cursor) => ({ id: post.id, slug: post.slug, cursor }),
|
|
156
171
|
);
|
|
157
172
|
}
|
|
158
173
|
|
|
@@ -167,17 +182,25 @@ export async function loadApiThreadResponses(
|
|
|
167
182
|
* const threads = await loadPublicThreadResponses(c.var, page.threads, {});
|
|
168
183
|
*/
|
|
169
184
|
export async function loadPublicThreadResponses(
|
|
170
|
-
deps:
|
|
185
|
+
deps: PublicResponseDeps,
|
|
171
186
|
summaries: ThreadSummary[],
|
|
172
|
-
options: { content?:
|
|
187
|
+
options: { content?: PostContent } = {},
|
|
173
188
|
): Promise<PublicThreadResponse[]> {
|
|
189
|
+
const gapPostIds = summaries.flatMap((summary) =>
|
|
190
|
+
summary.fold?.firstHiddenReply ? [summary.fold.firstHiddenReply.id] : [],
|
|
191
|
+
);
|
|
192
|
+
const gapAliases = await deps.services.paths.getPostAliases(gapPostIds);
|
|
174
193
|
return buildThreadResponses(
|
|
175
194
|
summaries,
|
|
176
195
|
(posts) => loadPublicPostResponses(deps, posts, options),
|
|
177
|
-
(post) => ({
|
|
196
|
+
(post, cursor) => ({
|
|
178
197
|
id: post.id,
|
|
179
198
|
slug: post.slug,
|
|
180
|
-
permalink: toPublicPath(
|
|
199
|
+
permalink: toPublicPath(
|
|
200
|
+
getPostPath(post.slug, gapAliases.get(post.id)?.[0]),
|
|
201
|
+
deps.appConfig.sitePathPrefix,
|
|
202
|
+
),
|
|
203
|
+
cursor,
|
|
181
204
|
}),
|
|
182
205
|
);
|
|
183
206
|
}
|
|
@@ -186,7 +209,7 @@ export async function loadPublicThreadResponses(
|
|
|
186
209
|
async function buildThreadResponses<P, G>(
|
|
187
210
|
summaries: ThreadSummary[],
|
|
188
211
|
render: (posts: Post[]) => Promise<P[]>,
|
|
189
|
-
reference: (post: Post) => G,
|
|
212
|
+
reference: (post: Post, cursor: string) => G,
|
|
190
213
|
): Promise<ApiThreadResponse<P, G>[]> {
|
|
191
214
|
const posts = collectThreadResponsePosts(summaries);
|
|
192
215
|
const responses = await render(posts);
|
package/src/lib/constants.ts
CHANGED
|
@@ -62,6 +62,8 @@ export type ReservedPath = (typeof RESERVED_PATHS)[number];
|
|
|
62
62
|
* @returns Whether the path's first segment is unavailable
|
|
63
63
|
* @example
|
|
64
64
|
* isReservedPath("archive"); // true
|
|
65
|
+
* isReservedPath("_drafts"); // true — Jant's namespace
|
|
66
|
+
* isReservedPath(".well-known/security.txt"); // true
|
|
65
67
|
* isReservedPath("sitemap-posts-2.xml"); // true
|
|
66
68
|
* isReservedPath("ja/hello", ["ja"]); // true
|
|
67
69
|
* isReservedPath("ja/hello"); // false — no language configured
|
|
@@ -72,6 +74,10 @@ export function isReservedPath(
|
|
|
72
74
|
): boolean {
|
|
73
75
|
const firstSegment = path.split("/")[0]?.toLowerCase();
|
|
74
76
|
if (!firstSegment) return false;
|
|
77
|
+
// A slug starts with a letter or digit, so a first segment that starts with
|
|
78
|
+
// `_` or `.` can only be Jant's: new system addresses go there (`/_assets`,
|
|
79
|
+
// `/__sso`, `/.well-known/`) and never take an address the author has.
|
|
80
|
+
if (/^[_.]/.test(firstSegment)) return true;
|
|
75
81
|
if (RESERVED_PATHS.includes(firstSegment as ReservedPath)) return true;
|
|
76
82
|
if (RESERVED_SITEMAP_PATTERN.test(firstSegment)) return true;
|
|
77
83
|
return languagePrefixes.includes(firstSegment);
|
package/src/lib/discover.ts
CHANGED
|
@@ -8,10 +8,6 @@
|
|
|
8
8
|
* effective-mode rules and the identifiers the feed declaration is built
|
|
9
9
|
* from. The declaration is specified in `docs/feeds.md`; how a directory
|
|
10
10
|
* behaves is that directory's own business, documented where it lives.
|
|
11
|
-
*
|
|
12
|
-
* `featured` survives as a stored value: older releases offered it as a
|
|
13
|
-
* choice, and a site that made it still declares it, which a directory reads
|
|
14
|
-
* as "only this feed". Nothing writes it any more.
|
|
15
11
|
*/
|
|
16
12
|
|
|
17
13
|
/**
|
|
@@ -25,7 +21,7 @@
|
|
|
25
21
|
export const DISCOVER_NAMESPACE_URI = "https://jant.me/ns";
|
|
26
22
|
|
|
27
23
|
/** Stored value of the `DISCOVER` site setting. */
|
|
28
|
-
export type DiscoverSetting = "latest" | "
|
|
24
|
+
export type DiscoverSetting = "latest" | "off";
|
|
29
25
|
|
|
30
26
|
/**
|
|
31
27
|
* Effective Discover mode, as declared in the feed.
|
|
@@ -34,13 +30,9 @@ export type DiscoverSetting = "latest" | "featured" | "off";
|
|
|
34
30
|
* element's absence already means "this site predates Discover" — the two
|
|
35
31
|
* states are different and must stay tellable apart.
|
|
36
32
|
*/
|
|
37
|
-
export type DiscoverMode = "latest" | "
|
|
33
|
+
export type DiscoverMode = "latest" | "none";
|
|
38
34
|
|
|
39
|
-
const DISCOVER_SETTINGS: readonly DiscoverSetting[] = [
|
|
40
|
-
"latest",
|
|
41
|
-
"featured",
|
|
42
|
-
"off",
|
|
43
|
-
];
|
|
35
|
+
const DISCOVER_SETTINGS: readonly DiscoverSetting[] = ["latest", "off"];
|
|
44
36
|
|
|
45
37
|
/**
|
|
46
38
|
* Parse a stored or environment-supplied Discover setting.
|
|
@@ -49,7 +41,7 @@ const DISCOVER_SETTINGS: readonly DiscoverSetting[] = [
|
|
|
49
41
|
* @returns The setting, or `null` when absent or unrecognized
|
|
50
42
|
* @example
|
|
51
43
|
* ```ts
|
|
52
|
-
* parseDiscoverSetting("
|
|
44
|
+
* parseDiscoverSetting("latest"); // "latest"
|
|
53
45
|
* parseDiscoverSetting("yes"); // null
|
|
54
46
|
* ```
|
|
55
47
|
*/
|
|
@@ -134,26 +126,18 @@ export function resolveDiscoverMode(input: {
|
|
|
134
126
|
* Site-relative path of the feed a Discover crawler should poll.
|
|
135
127
|
*
|
|
136
128
|
* The declaration names the feed to poll rather than leaving a crawler to
|
|
137
|
-
* guess
|
|
138
|
-
* `/featured/feed` and never at `/latest/feed`.
|
|
129
|
+
* guess.
|
|
139
130
|
*
|
|
140
131
|
* @param mode - Effective Discover mode
|
|
141
132
|
* @returns Site-relative feed path, or `null` when the site is not listed
|
|
142
133
|
* @example
|
|
143
134
|
* ```ts
|
|
144
|
-
* getDiscoverFeedPath("
|
|
135
|
+
* getDiscoverFeedPath("latest"); // "/latest/feed"
|
|
145
136
|
* getDiscoverFeedPath("none"); // null
|
|
146
137
|
* ```
|
|
147
138
|
*/
|
|
148
139
|
export function getDiscoverFeedPath(mode: DiscoverMode): string | null {
|
|
149
|
-
|
|
150
|
-
case "latest":
|
|
151
|
-
return "/latest/feed";
|
|
152
|
-
case "featured":
|
|
153
|
-
return "/featured/feed";
|
|
154
|
-
case "none":
|
|
155
|
-
return null;
|
|
156
|
-
}
|
|
140
|
+
return mode === "latest" ? "/latest/feed" : null;
|
|
157
141
|
}
|
|
158
142
|
|
|
159
143
|
/**
|
|
@@ -0,0 +1,140 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Environment values
|
|
3
|
+
*
|
|
4
|
+
* The one reader for a setting's environment variable, and the startup check
|
|
5
|
+
* that names every environment value Jant can't use.
|
|
6
|
+
*
|
|
7
|
+
* A setting the dashboard can also change is checked by the rules the
|
|
8
|
+
* dashboard applies (`normalizeEditableSettingValue`) and read back in the
|
|
9
|
+
* form the dashboard stores. `PUBLIC_API_ENABLED=TRUE` therefore means what
|
|
10
|
+
* `true` means, both where the site acts on it and where `GET /api/settings`
|
|
11
|
+
* reports it. An environment-only variable is checked by its rule in
|
|
12
|
+
* `ENV_RULES`.
|
|
13
|
+
*/
|
|
14
|
+
|
|
15
|
+
import { CONFIG_FIELDS, type ConfigKey } from "../types/config.js";
|
|
16
|
+
import {
|
|
17
|
+
checkEnvValue,
|
|
18
|
+
ENV_RULES,
|
|
19
|
+
getEnvString,
|
|
20
|
+
hasEnvRule,
|
|
21
|
+
type EnvValueCheck,
|
|
22
|
+
} from "./env.js";
|
|
23
|
+
import { ValidationError } from "./errors.js";
|
|
24
|
+
import { normalizeEditableSettingValue } from "./schemas.js";
|
|
25
|
+
|
|
26
|
+
type EnvSource = object | undefined | null;
|
|
27
|
+
|
|
28
|
+
/** An environment variable holding a value Jant can't use. */
|
|
29
|
+
export interface EnvValueIssue {
|
|
30
|
+
variable: string;
|
|
31
|
+
message: string;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
function checkConfigEnvValue(
|
|
35
|
+
key: ConfigKey,
|
|
36
|
+
variable: string,
|
|
37
|
+
raw: string,
|
|
38
|
+
): EnvValueCheck {
|
|
39
|
+
const field = CONFIG_FIELDS[key];
|
|
40
|
+
if ("editor" in field) {
|
|
41
|
+
try {
|
|
42
|
+
return { ok: true, value: normalizeEditableSettingValue(key, raw) };
|
|
43
|
+
} catch (error) {
|
|
44
|
+
if (error instanceof ValidationError) {
|
|
45
|
+
return { ok: false, message: error.message };
|
|
46
|
+
}
|
|
47
|
+
throw error;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
return hasEnvRule(variable)
|
|
51
|
+
? checkEnvValue(variable, raw)
|
|
52
|
+
: { ok: true, value: raw };
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
function configEnvKeys(key: ConfigKey): readonly string[] {
|
|
56
|
+
const field = CONFIG_FIELDS[key];
|
|
57
|
+
return "envKeys" in field ? field.envKeys : [];
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/**
|
|
61
|
+
* A setting's value from the environment, in the form the dashboard stores.
|
|
62
|
+
*
|
|
63
|
+
* @param env - Runtime environment bindings
|
|
64
|
+
* @param key - The setting
|
|
65
|
+
* @returns The first of its variables that is set, normalized; `undefined`
|
|
66
|
+
* when none is set or the value is one the startup check reports
|
|
67
|
+
* @example
|
|
68
|
+
* ```ts
|
|
69
|
+
* readConfigEnvValue({ PUBLIC_API_ENABLED: "TRUE" }, "PUBLIC_API_ENABLED");
|
|
70
|
+
* // "true"
|
|
71
|
+
* ```
|
|
72
|
+
*/
|
|
73
|
+
export function readConfigEnvValue(
|
|
74
|
+
env: EnvSource,
|
|
75
|
+
key: ConfigKey,
|
|
76
|
+
): string | undefined {
|
|
77
|
+
for (const variable of configEnvKeys(key)) {
|
|
78
|
+
const raw = getEnvString(env, variable)?.trim();
|
|
79
|
+
if (!raw) continue;
|
|
80
|
+
const checked = checkConfigEnvValue(key, variable, raw);
|
|
81
|
+
return checked.ok ? checked.value : undefined;
|
|
82
|
+
}
|
|
83
|
+
return undefined;
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
function issue(variable: string, raw: string, message: string): EnvValueIssue {
|
|
87
|
+
return { variable, message: `${variable} can't be "${raw}". ${message}` };
|
|
88
|
+
}
|
|
89
|
+
|
|
90
|
+
/**
|
|
91
|
+
* Every environment value Jant can't use: a setting's variable the dashboard
|
|
92
|
+
* would refuse, and an environment-only variable outside its rule.
|
|
93
|
+
*
|
|
94
|
+
* @param env - Runtime environment bindings
|
|
95
|
+
* @returns One issue per variable, in no particular order; empty when all
|
|
96
|
+
* values are usable
|
|
97
|
+
* @example
|
|
98
|
+
* ```ts
|
|
99
|
+
* getEnvValueIssues({ PAGE_SIZE: "500" });
|
|
100
|
+
* // [{ variable: "PAGE_SIZE", message: 'PAGE_SIZE can\'t be "500". …' }]
|
|
101
|
+
* ```
|
|
102
|
+
*/
|
|
103
|
+
export function getEnvValueIssues(env: EnvSource): EnvValueIssue[] {
|
|
104
|
+
// The check runs before every request; bindings don't change while a
|
|
105
|
+
// Worker isolate or a Node process lives, so one answer per object serves.
|
|
106
|
+
if (env) {
|
|
107
|
+
const cached = issuesByEnv.get(env);
|
|
108
|
+
if (cached) return cached;
|
|
109
|
+
}
|
|
110
|
+
const issues = collectEnvValueIssues(env);
|
|
111
|
+
if (env) issuesByEnv.set(env, issues);
|
|
112
|
+
return issues;
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
const issuesByEnv = new WeakMap<object, EnvValueIssue[]>();
|
|
116
|
+
|
|
117
|
+
function collectEnvValueIssues(env: EnvSource): EnvValueIssue[] {
|
|
118
|
+
const issues: EnvValueIssue[] = [];
|
|
119
|
+
const checked = new Set<string>();
|
|
120
|
+
|
|
121
|
+
for (const key of Object.keys(CONFIG_FIELDS) as ConfigKey[]) {
|
|
122
|
+
for (const variable of configEnvKeys(key)) {
|
|
123
|
+
checked.add(variable);
|
|
124
|
+
const raw = getEnvString(env, variable)?.trim();
|
|
125
|
+
if (!raw) continue;
|
|
126
|
+
const result = checkConfigEnvValue(key, variable, raw);
|
|
127
|
+
if (!result.ok) issues.push(issue(variable, raw, result.message));
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
|
|
131
|
+
for (const variable of Object.keys(ENV_RULES)) {
|
|
132
|
+
if (checked.has(variable) || !hasEnvRule(variable)) continue;
|
|
133
|
+
const raw = getEnvString(env, variable)?.trim();
|
|
134
|
+
if (!raw) continue;
|
|
135
|
+
const result = checkEnvValue(variable, raw);
|
|
136
|
+
if (!result.ok) issues.push(issue(variable, raw, result.message));
|
|
137
|
+
}
|
|
138
|
+
|
|
139
|
+
return issues;
|
|
140
|
+
}
|