@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
|
@@ -0,0 +1,106 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Streaming ZIP helpers used by `site export`, `site import`,
|
|
3
|
+
* `site pull-media`, and `site snapshot`.
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
import { createWriteStream } from "node:fs";
|
|
7
|
+
import {
|
|
8
|
+
chmod,
|
|
9
|
+
mkdir,
|
|
10
|
+
mkdtemp,
|
|
11
|
+
readFile,
|
|
12
|
+
rm,
|
|
13
|
+
stat,
|
|
14
|
+
writeFile,
|
|
15
|
+
} from "node:fs/promises";
|
|
16
|
+
import { tmpdir } from "node:os";
|
|
17
|
+
import { join } from "node:path";
|
|
18
|
+
import { pipeline } from "node:stream/promises";
|
|
19
|
+
import { zipSync } from "fflate";
|
|
20
|
+
import yazl from "yazl";
|
|
21
|
+
import { afterEach, beforeEach, describe, expect, it } from "vitest";
|
|
22
|
+
import {
|
|
23
|
+
extractZipFile,
|
|
24
|
+
writeDirectoryToZip,
|
|
25
|
+
} from "../../bin/lib/zip-archive.js";
|
|
26
|
+
|
|
27
|
+
describe("zip-archive", () => {
|
|
28
|
+
let tempDir: string;
|
|
29
|
+
|
|
30
|
+
beforeEach(async () => {
|
|
31
|
+
tempDir = await mkdtemp(join(tmpdir(), "jant-zip-"));
|
|
32
|
+
});
|
|
33
|
+
|
|
34
|
+
afterEach(async () => {
|
|
35
|
+
await chmod(join(tempDir, "source", "locked.md"), 0o644).catch(() => {});
|
|
36
|
+
await rm(tempDir, { recursive: true, force: true });
|
|
37
|
+
});
|
|
38
|
+
|
|
39
|
+
it("writes a directory and reads it back byte for byte", async () => {
|
|
40
|
+
const source = join(tempDir, "source");
|
|
41
|
+
const image = new Uint8Array(4096).map((_, index) => index % 251);
|
|
42
|
+
await mkdir(join(source, "content", "hello"), { recursive: true });
|
|
43
|
+
await mkdir(join(source, "static", "media"), { recursive: true });
|
|
44
|
+
await writeFile(
|
|
45
|
+
join(source, "hugo.toml"),
|
|
46
|
+
'baseURL = "https://a.example/"',
|
|
47
|
+
);
|
|
48
|
+
await writeFile(
|
|
49
|
+
join(source, "content", "hello", "_index.md"),
|
|
50
|
+
"---\n---\n你好",
|
|
51
|
+
);
|
|
52
|
+
await writeFile(join(source, "static", "media", "a.jpg"), image);
|
|
53
|
+
|
|
54
|
+
const zipPath = join(tempDir, "out", "site.zip");
|
|
55
|
+
expect(await writeDirectoryToZip(source, zipPath)).toEqual({ files: 3 });
|
|
56
|
+
|
|
57
|
+
const target = join(tempDir, "target");
|
|
58
|
+
expect(await extractZipFile(zipPath, target)).toEqual({ files: 3 });
|
|
59
|
+
expect(
|
|
60
|
+
await readFile(join(target, "content", "hello", "_index.md"), "utf8"),
|
|
61
|
+
).toBe("---\n---\n你好");
|
|
62
|
+
expect(
|
|
63
|
+
new Uint8Array(await readFile(join(target, "static", "media", "a.jpg"))),
|
|
64
|
+
).toEqual(image);
|
|
65
|
+
});
|
|
66
|
+
|
|
67
|
+
it("reads a ZIP64 archive", async () => {
|
|
68
|
+
const zipFile = new yazl.ZipFile();
|
|
69
|
+
zipFile.addBuffer(Buffer.from("big enough to need ZIP64"), "data/a.txt");
|
|
70
|
+
zipFile.end({ forceZip64Format: true });
|
|
71
|
+
const zipPath = join(tempDir, "zip64.zip");
|
|
72
|
+
await pipeline(zipFile.outputStream, createWriteStream(zipPath));
|
|
73
|
+
|
|
74
|
+
await extractZipFile(zipPath, join(tempDir, "target"));
|
|
75
|
+
|
|
76
|
+
expect(
|
|
77
|
+
await readFile(join(tempDir, "target", "data", "a.txt"), "utf8"),
|
|
78
|
+
).toBe("big enough to need ZIP64");
|
|
79
|
+
});
|
|
80
|
+
|
|
81
|
+
it("refuses an entry that climbs out of the target directory", async () => {
|
|
82
|
+
const zipPath = join(tempDir, "escape.zip");
|
|
83
|
+
await writeFile(
|
|
84
|
+
zipPath,
|
|
85
|
+
zipSync({ "../escaped.txt": new TextEncoder().encode("x") }),
|
|
86
|
+
);
|
|
87
|
+
|
|
88
|
+
await expect(
|
|
89
|
+
extractZipFile(zipPath, join(tempDir, "target")),
|
|
90
|
+
).rejects.toThrow();
|
|
91
|
+
await expect(stat(join(tempDir, "escaped.txt"))).rejects.toThrow();
|
|
92
|
+
});
|
|
93
|
+
|
|
94
|
+
it("leaves no archive behind when writing fails", async () => {
|
|
95
|
+
if (process.getuid?.() === 0) return; // root reads a mode-000 file anyway
|
|
96
|
+
const source = join(tempDir, "source");
|
|
97
|
+
await mkdir(source, { recursive: true });
|
|
98
|
+
await writeFile(join(source, "locked.md"), "secret");
|
|
99
|
+
await chmod(join(source, "locked.md"), 0o000);
|
|
100
|
+
|
|
101
|
+
const zipPath = join(tempDir, "site.zip");
|
|
102
|
+
await expect(writeDirectoryToZip(source, zipPath)).rejects.toThrow();
|
|
103
|
+
await expect(stat(zipPath)).rejects.toThrow();
|
|
104
|
+
await expect(stat(`${zipPath}.partial`)).rejects.toThrow();
|
|
105
|
+
});
|
|
106
|
+
});
|
package/src/app.tsx
CHANGED
|
@@ -43,7 +43,6 @@ import { smartCollectionsApiRoutes } from "./routes/api/smart-collections.js";
|
|
|
43
43
|
import { settingsApiRoutes } from "./routes/api/settings.js";
|
|
44
44
|
import { uploadApiRoutes } from "./routes/api/upload.js";
|
|
45
45
|
import { uploadsApiRoutes } from "./routes/api/uploads.js";
|
|
46
|
-
import { multipartUploadApiRoutes } from "./routes/api/upload-multipart.js";
|
|
47
46
|
import { searchApiRoutes } from "./routes/api/search.js";
|
|
48
47
|
import { mcpApiRoutes } from "./routes/api/mcp.js";
|
|
49
48
|
import { customUrlsApiRoutes } from "./routes/api/custom-urls.js";
|
|
@@ -56,7 +55,6 @@ import {
|
|
|
56
55
|
githubSyncAdminRoutes,
|
|
57
56
|
} from "./routes/api/github-sync.js";
|
|
58
57
|
import { telegramWebhookRoutes } from "./routes/api/telegram.js";
|
|
59
|
-
import { internalTextAttachmentsRoutes } from "./routes/api/internal/text-attachments.js";
|
|
60
58
|
import { internalSearchReindexRoutes } from "./routes/api/internal/search-reindex.js";
|
|
61
59
|
import { internalPostBodyHtmlRoutes } from "./routes/api/internal/post-body-html.js";
|
|
62
60
|
import { internalUploadsRoutes } from "./routes/api/internal/uploads.js";
|
|
@@ -93,7 +91,7 @@ import {
|
|
|
93
91
|
} from "./lib/jant-branding.js";
|
|
94
92
|
import { isAssetPath } from "./lib/asset-path.js";
|
|
95
93
|
import { getHostedCanonicalRedirect } from "./lib/hosted-domain.js";
|
|
96
|
-
import { stripSitePathPrefix, toPublicHref } from "./lib/url.js";
|
|
94
|
+
import { normalizePath, stripSitePathPrefix, toPublicHref } from "./lib/url.js";
|
|
97
95
|
import {
|
|
98
96
|
matchesIfNoneMatch,
|
|
99
97
|
withConditionalResponse,
|
|
@@ -399,7 +397,6 @@ export function createApp(): App {
|
|
|
399
397
|
app.route("/api/attachments", attachmentsApiRoutes);
|
|
400
398
|
app.route("/api/internal/api-tokens", internalApiTokensRoutes);
|
|
401
399
|
app.route("/api/internal/sites", internalSitesRoutes);
|
|
402
|
-
app.route("/api/internal/text-attachments", internalTextAttachmentsRoutes);
|
|
403
400
|
app.route("/api/internal/search/reindex", internalSearchReindexRoutes);
|
|
404
401
|
app.route("/api/internal/posts/body-html", internalPostBodyHtmlRoutes);
|
|
405
402
|
app.route("/api/internal/uploads", internalUploadsRoutes);
|
|
@@ -533,7 +530,13 @@ export function createApp(): App {
|
|
|
533
530
|
await next();
|
|
534
531
|
});
|
|
535
532
|
|
|
536
|
-
// Redirect middleware — only handles redirect-type custom URLs
|
|
533
|
+
// Redirect middleware — only handles redirect-type custom URLs.
|
|
534
|
+
//
|
|
535
|
+
// The lookup it needs is the same `path_registry` read the catch-all route
|
|
536
|
+
// makes to resolve a post or collection, so the record is stashed on the
|
|
537
|
+
// context and that route reuses it instead of asking again. Nothing between
|
|
538
|
+
// here and the route writes to the registry, so the record cannot go stale
|
|
539
|
+
// within the request.
|
|
537
540
|
app.use("*", async (c, next) => {
|
|
538
541
|
const path = new URL(c.req.url).pathname;
|
|
539
542
|
// Skip redirect lookup for fixed machine routes and static assets.
|
|
@@ -541,17 +544,20 @@ export function createApp(): App {
|
|
|
541
544
|
return next();
|
|
542
545
|
}
|
|
543
546
|
|
|
544
|
-
const
|
|
545
|
-
|
|
547
|
+
const storedPath = normalizePath(path);
|
|
548
|
+
const record = await c.var.services.paths.resolve(storedPath);
|
|
549
|
+
c.set("pathLookup", { path: storedPath, record });
|
|
550
|
+
|
|
551
|
+
if (record?.kind === "redirect" && record.redirectToPath) {
|
|
546
552
|
return c.redirect(
|
|
547
553
|
toPublicHref(
|
|
548
|
-
|
|
554
|
+
`/${record.redirectToPath}`,
|
|
549
555
|
getRuntimeSitePathPrefix({
|
|
550
556
|
env: c.env,
|
|
551
557
|
currentSiteDomain: c.var.currentSiteDomain,
|
|
552
558
|
}),
|
|
553
559
|
),
|
|
554
|
-
|
|
560
|
+
record.redirectType ?? 301,
|
|
555
561
|
);
|
|
556
562
|
}
|
|
557
563
|
|
|
@@ -598,8 +604,7 @@ export function createApp(): App {
|
|
|
598
604
|
app.route("/settings/custom-urls", customUrlsRoutes);
|
|
599
605
|
app.route("/settings", settingsRoutes);
|
|
600
606
|
|
|
601
|
-
// Protected API routes
|
|
602
|
-
app.route("/api/upload/multipart", multipartUploadApiRoutes);
|
|
607
|
+
// Protected API routes
|
|
603
608
|
app.route("/api/upload", uploadApiRoutes);
|
|
604
609
|
app.route("/api/uploads", uploadsApiRoutes);
|
|
605
610
|
app.route("/api/search", searchApiRoutes);
|
|
@@ -74,7 +74,7 @@ const labels: SettingsLabels = {
|
|
|
74
74
|
discoverEnabled: "Allow Jant Discover to list my site",
|
|
75
75
|
discoverIntro:
|
|
76
76
|
"Jant Discover is a directory of Jant blogs, curated by hand by the Jant community to help people find new Jant blogs and posts. A post you mark Featured appears on the Discover home page 24 hours later, and link and quote posts appear on the Links and Quotes lists 24 hours after they are published. You can keep editing them in the meantime. See the Discover community rules.",
|
|
77
|
-
discoverDemoLocked: "Demo sites are never listed in Discover.",
|
|
77
|
+
discoverDemoLocked: "Demo sites are never listed in Jant Discover.",
|
|
78
78
|
discoverFeedsOffLocked:
|
|
79
79
|
"Discover reads your Atom feed, so it needs feeds turned on.",
|
|
80
80
|
discoverSearchOff:
|
|
@@ -123,7 +123,7 @@ const labels: SettingsLabels = {
|
|
|
123
123
|
discoverEnabled: "Allow Jant Discover to list my site",
|
|
124
124
|
discoverIntro:
|
|
125
125
|
"Jant Discover is a directory of Jant blogs, curated by hand by the Jant community to help people find new Jant blogs and posts. A post you mark Featured appears on the Discover home page 24 hours later, and link and quote posts appear on the Links and Quotes lists 24 hours after they are published. You can keep editing them in the meantime. See the Discover community rules.",
|
|
126
|
-
discoverDemoLocked: "Demo sites are never listed in Discover.",
|
|
126
|
+
discoverDemoLocked: "Demo sites are never listed in Jant Discover.",
|
|
127
127
|
discoverFeedsOffLocked:
|
|
128
128
|
"Discover reads your Atom feed, so it needs feeds turned on.",
|
|
129
129
|
discoverSearchOff:
|
|
@@ -856,6 +856,26 @@ describe("JantSettingsGeneral", () => {
|
|
|
856
856
|
expect(el.textContent).toContain(labels.discoverDemoLocked);
|
|
857
857
|
});
|
|
858
858
|
|
|
859
|
+
// The notice replaces the help line, and with it the only link to the
|
|
860
|
+
// directory, so it carries that link itself.
|
|
861
|
+
it("links the directory from the demo notice", async () => {
|
|
862
|
+
const el = await createElement({ demoMode: true });
|
|
863
|
+
const notice = requireElement(
|
|
864
|
+
Array.from(el.querySelectorAll<HTMLElement>("p")).find(
|
|
865
|
+
(paragraph) =>
|
|
866
|
+
paragraph.textContent?.trim() === labels.discoverDemoLocked,
|
|
867
|
+
) ?? null,
|
|
868
|
+
"expected the demo notice",
|
|
869
|
+
);
|
|
870
|
+
const links = Array.from(notice.querySelectorAll<HTMLAnchorElement>("a"));
|
|
871
|
+
|
|
872
|
+
expect(
|
|
873
|
+
links.map((link) => [link.textContent, link.getAttribute("href")]),
|
|
874
|
+
).toEqual([[labels.discoverName, discoverPages.home]]);
|
|
875
|
+
expect(links[0]?.getAttribute("target")).toBe("_blank");
|
|
876
|
+
expect(links[0]?.getAttribute("rel")).toBe("noopener noreferrer");
|
|
877
|
+
});
|
|
878
|
+
|
|
859
879
|
// Discover reads the Atom feed, so with feeds off there is nothing to read.
|
|
860
880
|
it("locks the control off when the site publishes no feeds", async () => {
|
|
861
881
|
const el = await createElement({ feedsEnabled: false });
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Types shared between the server-side template and the
|
|
3
3
|
* `jant-repo-picker` Lit component.
|
|
4
|
+
*
|
|
5
|
+
* Labels arrive translated and already formatted. A `{name}` left in one is
|
|
6
|
+
* deliberate: the value only exists in the browser, so the server keeps the
|
|
7
|
+
* token literal (see `keepForClient` in the settings route) and the component
|
|
8
|
+
* replaces it. Anything the server already knows is interpolated there.
|
|
4
9
|
*/
|
|
5
10
|
|
|
6
11
|
export interface RepoPickerLabels {
|
|
@@ -20,7 +25,7 @@ export interface RepoPickerLabels {
|
|
|
20
25
|
repoSearchHint: string;
|
|
21
26
|
refreshRepos: string; // aria-label + tooltip for the refresh button
|
|
22
27
|
createOnGitHub: string; // primary call-to-action text
|
|
23
|
-
createOnGitHubHint: string; //
|
|
28
|
+
createOnGitHubHint: string; // repo name already interpolated
|
|
24
29
|
classifyLoading: string;
|
|
25
30
|
classificationEmpty: string;
|
|
26
31
|
classificationOwned: string;
|
|
@@ -557,7 +557,7 @@ export class JantRepoPicker extends LitElement {
|
|
|
557
557
|
<li>
|
|
558
558
|
<button
|
|
559
559
|
type="button"
|
|
560
|
-
class="flex w-full items-center gap-2 px-3 py-2 text-left text-sm hover:bg-muted"
|
|
560
|
+
class="flex w-full cursor-pointer items-center gap-2 px-3 py-2 text-left text-sm hover:bg-muted"
|
|
561
561
|
@click=${() => this.#selectOwner(inst)}
|
|
562
562
|
role="option"
|
|
563
563
|
aria-selected=${
|
|
@@ -692,7 +692,7 @@ export class JantRepoPicker extends LitElement {
|
|
|
692
692
|
<li>
|
|
693
693
|
<button
|
|
694
694
|
type="button"
|
|
695
|
-
class="flex w-full items-center gap-2 px-3 py-2 text-left text-sm hover:bg-muted"
|
|
695
|
+
class="flex w-full cursor-pointer items-center gap-2 px-3 py-2 text-left text-sm hover:bg-muted"
|
|
696
696
|
@click=${() => this.#selectRepo(r)}
|
|
697
697
|
role="option"
|
|
698
698
|
aria-selected=${
|
|
@@ -717,7 +717,7 @@ export class JantRepoPicker extends LitElement {
|
|
|
717
717
|
<div class="border-t p-2">
|
|
718
718
|
<button
|
|
719
719
|
type="button"
|
|
720
|
-
class="flex w-full items-start gap-2 px-2 py-2 text-left text-sm text-primary hover:bg-muted
|
|
720
|
+
class="flex w-full cursor-pointer items-start gap-2 rounded-md px-2 py-2 text-left text-sm text-primary hover:bg-muted"
|
|
721
721
|
@click=${() => this.#openCreateOnGitHub()}
|
|
722
722
|
>
|
|
723
723
|
<span class="flex flex-col">
|
|
@@ -725,10 +725,7 @@ export class JantRepoPicker extends LitElement {
|
|
|
725
725
|
${
|
|
726
726
|
this.createRepoNameHint
|
|
727
727
|
? html`<span class="text-xs text-muted-foreground">
|
|
728
|
-
${this.labels.createOnGitHubHint
|
|
729
|
-
"{name}",
|
|
730
|
-
this.createRepoNameHint,
|
|
731
|
-
)}
|
|
728
|
+
${this.labels.createOnGitHubHint}
|
|
732
729
|
</span>`
|
|
733
730
|
: nothing
|
|
734
731
|
}
|
|
@@ -511,10 +511,11 @@ export class JantSettingsGeneral extends LitElement {
|
|
|
511
511
|
*
|
|
512
512
|
* The same `resolveDiscoverMode` the server runs, over the same inputs, so
|
|
513
513
|
* the checkbox cannot disagree with the feed. It has to be computed here
|
|
514
|
-
* rather than sent down resolved because
|
|
515
|
-
*
|
|
516
|
-
*
|
|
517
|
-
*
|
|
514
|
+
* rather than sent down resolved because one of its inputs, search indexing,
|
|
515
|
+
* is a control on this page: a value resolved on the server is correct until
|
|
516
|
+
* the first click and wrong from then until the next page load, which is
|
|
517
|
+
* exactly the state an owner reads it in. The feed switch is not — it lives
|
|
518
|
+
* in the Config Editor, so `feedsEnabled` holds for the life of the page.
|
|
518
519
|
*/
|
|
519
520
|
private _effectiveDiscoverMode(overrides: { noindex?: boolean } = {}) {
|
|
520
521
|
return resolveDiscoverMode({
|
|
@@ -1004,13 +1005,13 @@ export class JantSettingsGeneral extends LitElement {
|
|
|
1004
1005
|
<span>${this.labels.discoverEnabled}</span>
|
|
1005
1006
|
</label>
|
|
1006
1007
|
<p class="text-sm text-muted-foreground">
|
|
1007
|
-
${
|
|
1008
|
+
${this._renderDiscoverHelp(
|
|
1008
1009
|
locked
|
|
1009
1010
|
? this.demoMode
|
|
1010
1011
|
? this.labels.discoverDemoLocked
|
|
1011
1012
|
: this.labels.discoverFeedsOffLocked
|
|
1012
|
-
: this.
|
|
1013
|
-
}
|
|
1013
|
+
: this.labels.discoverIntro,
|
|
1014
|
+
)}
|
|
1014
1015
|
</p>
|
|
1015
1016
|
${
|
|
1016
1017
|
heldBackBySearch
|
|
@@ -1026,14 +1027,18 @@ export class JantSettingsGeneral extends LitElement {
|
|
|
1026
1027
|
}
|
|
1027
1028
|
|
|
1028
1029
|
/**
|
|
1029
|
-
* The help line, with each page it names linking to that
|
|
1030
|
+
* The help line under the checkbox, with each page it names linking to that
|
|
1031
|
+
* page.
|
|
1030
1032
|
*
|
|
1031
|
-
*
|
|
1032
|
-
*
|
|
1033
|
+
* Whichever line is showing goes through here, the usual one or the notice
|
|
1034
|
+
* that replaces it while the box is locked, so a demo site's notice links the
|
|
1035
|
+
* directory's name too. Which words link where is `discoverIntroRuns`'s to
|
|
1036
|
+
* decide, so the setup screen, which shows the same opening, links the same
|
|
1037
|
+
* words.
|
|
1033
1038
|
*/
|
|
1034
|
-
private
|
|
1039
|
+
private _renderDiscoverHelp(line: string) {
|
|
1035
1040
|
const runs = discoverIntroRuns(
|
|
1036
|
-
|
|
1041
|
+
line ?? "",
|
|
1037
1042
|
{
|
|
1038
1043
|
name: this.labels.discoverName ?? "",
|
|
1039
1044
|
rules: this.labels.discoverRules ?? "",
|