@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
|
@@ -11,22 +11,44 @@
|
|
|
11
11
|
import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
|
|
12
12
|
import { tmpdir } from "node:os";
|
|
13
13
|
import { join } from "node:path";
|
|
14
|
-
import { afterEach, beforeEach, describe, expect, it } from "vitest";
|
|
15
|
-
import {
|
|
14
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
15
|
+
import {
|
|
16
|
+
__test__,
|
|
17
|
+
SUPPORTED_SITE_EXPORT_VERSION,
|
|
18
|
+
} from "../../bin/commands/site/import.js";
|
|
19
|
+
import {
|
|
20
|
+
partitionEditableSettingUpdates,
|
|
21
|
+
partitionImportableSettingUpdates,
|
|
22
|
+
} from "../lib/api-settings.js";
|
|
23
|
+
import { normalizeEditableSettingValue } from "../lib/schemas.js";
|
|
24
|
+
import { SITE_EXPORT_FORMAT_VERSION } from "../services/export.js";
|
|
25
|
+
import type { ConfigKey } from "../types/config.js";
|
|
16
26
|
|
|
17
27
|
const {
|
|
18
28
|
walkHugoContent,
|
|
19
29
|
loadSiteConfig,
|
|
30
|
+
checkSiteExportVersion,
|
|
20
31
|
buildSettingsUpdatesFromConfig,
|
|
32
|
+
splitSettingsUpdatesForImport,
|
|
33
|
+
buildSiteAvatarImport,
|
|
21
34
|
mediaSpecFromJantMedia,
|
|
22
35
|
resolveCollectionMemberships,
|
|
23
36
|
resolveThreadCollectionMemberships,
|
|
24
37
|
buildPostPayloadFromBundle,
|
|
25
38
|
getRootAliasPathsForImport,
|
|
26
39
|
uploadMediaList,
|
|
40
|
+
uploadBundleResources,
|
|
41
|
+
normalizeImportedNavItems,
|
|
42
|
+
buildNavItemCreateRequest,
|
|
43
|
+
buildSmartCollectionCreateRequest,
|
|
44
|
+
normalizeImportedCollectionDirectory,
|
|
45
|
+
syncImportedCollectionDirectory,
|
|
46
|
+
normalizeImportedCustomUrls,
|
|
47
|
+
buildImportedAttachments,
|
|
27
48
|
normalizeTextAttachmentSpec,
|
|
28
49
|
isAbsoluteImportUrl,
|
|
29
50
|
shouldImportReplyQuietly,
|
|
51
|
+
getNextThreadTail,
|
|
30
52
|
} = __test__;
|
|
31
53
|
|
|
32
54
|
async function writeFileTree(
|
|
@@ -53,6 +75,27 @@ describe("Hugo import CLI helpers", () => {
|
|
|
53
75
|
await rm(tempDir, { recursive: true, force: true });
|
|
54
76
|
});
|
|
55
77
|
|
|
78
|
+
it("reads the export format version the exporter writes", () => {
|
|
79
|
+
expect(SUPPORTED_SITE_EXPORT_VERSION).toBe(SITE_EXPORT_FORMAT_VERSION);
|
|
80
|
+
});
|
|
81
|
+
|
|
82
|
+
it("refuses an export in a newer format version, and accepts older or unversioned ones", async () => {
|
|
83
|
+
const withVersion = async (line: string) => {
|
|
84
|
+
await writeFileTree(tempDir, {
|
|
85
|
+
"data/jant.toml": `format = "jant-site"\n${line}site_name = "Test"\n`,
|
|
86
|
+
});
|
|
87
|
+
return checkSiteExportVersion(await loadSiteConfig(tempDir));
|
|
88
|
+
};
|
|
89
|
+
|
|
90
|
+
expect(
|
|
91
|
+
await withVersion(`version = ${SUPPORTED_SITE_EXPORT_VERSION + 1}\n`),
|
|
92
|
+
).toMatch(/format version 2.*Upgrade @jant\/core/);
|
|
93
|
+
expect(
|
|
94
|
+
await withVersion(`version = ${SUPPORTED_SITE_EXPORT_VERSION}\n`),
|
|
95
|
+
).toBeNull();
|
|
96
|
+
expect(await withVersion("")).toBeNull();
|
|
97
|
+
});
|
|
98
|
+
|
|
56
99
|
it("walkHugoContent classifies root posts, replies, and collection bundles", async () => {
|
|
57
100
|
await writeFileTree(tempDir, {
|
|
58
101
|
"content/_index.md": "---\ntype: home\n---\n",
|
|
@@ -152,6 +195,119 @@ describe("Hugo import CLI helpers", () => {
|
|
|
152
195
|
expect(siteConfig.extra.jant.collections_directory).toHaveLength(2);
|
|
153
196
|
});
|
|
154
197
|
|
|
198
|
+
it.each([true, false])(
|
|
199
|
+
"sends settings the settings API accepts when every flag is %s",
|
|
200
|
+
async (flag) => {
|
|
201
|
+
// The Config Editor (6c79f0b4) made boolean settings "true" or "false".
|
|
202
|
+
// The importer kept sending "" for a false flag, the settings route
|
|
203
|
+
// answered 400, and the import stopped before it created anything.
|
|
204
|
+
await writeFileTree(tempDir, {
|
|
205
|
+
"data/jant.toml": [
|
|
206
|
+
'format = "jant-site"',
|
|
207
|
+
"version = 1",
|
|
208
|
+
'site_name = "Example Site"',
|
|
209
|
+
'site_language = "en"',
|
|
210
|
+
`show_jant_branding_on_home = ${flag}`,
|
|
211
|
+
`show_header_avatar = ${flag}`,
|
|
212
|
+
`noindex = ${flag}`,
|
|
213
|
+
`public_api_enabled = ${flag}`,
|
|
214
|
+
`rss_feeds_enabled = ${flag}`,
|
|
215
|
+
'theme_id = "paper"',
|
|
216
|
+
'default_theme_id = "tufte"',
|
|
217
|
+
'font_theme_id = "classic"',
|
|
218
|
+
'theme_mode = "dark"',
|
|
219
|
+
"",
|
|
220
|
+
].join("\n"),
|
|
221
|
+
});
|
|
222
|
+
|
|
223
|
+
const siteConfig = await loadSiteConfig(tempDir);
|
|
224
|
+
const { editable, internal } = splitSettingsUpdatesForImport(
|
|
225
|
+
buildSettingsUpdatesFromConfig(siteConfig, "body { color: red; }"),
|
|
226
|
+
);
|
|
227
|
+
|
|
228
|
+
// The two routes the importer calls, in the order the routes apply them:
|
|
229
|
+
// which keys each accepts, then the value check `settings.setMany` runs.
|
|
230
|
+
const settingsRoute = partitionEditableSettingUpdates(editable, false);
|
|
231
|
+
const importRoute = partitionImportableSettingUpdates(internal, false);
|
|
232
|
+
expect(settingsRoute.rejectedKeys).toEqual([]);
|
|
233
|
+
expect(importRoute.rejectedKeys).toEqual([]);
|
|
234
|
+
|
|
235
|
+
const accepted = {
|
|
236
|
+
...settingsRoute.filteredUpdates,
|
|
237
|
+
...importRoute.filteredUpdates,
|
|
238
|
+
};
|
|
239
|
+
for (const [key, value] of Object.entries(accepted)) {
|
|
240
|
+
expect(
|
|
241
|
+
() => normalizeEditableSettingValue(key as ConfigKey, value),
|
|
242
|
+
`${key}=${JSON.stringify(value)}`,
|
|
243
|
+
).not.toThrow();
|
|
244
|
+
}
|
|
245
|
+
},
|
|
246
|
+
);
|
|
247
|
+
|
|
248
|
+
it("buildSiteAvatarImport reads exported icons from the theme's static directory", async () => {
|
|
249
|
+
// The export writes favicon.ico and apple-touch-icon.png under
|
|
250
|
+
// themes/jant/static/. Looking only in static/ sent the importer to the
|
|
251
|
+
// source site for them, and an unreachable source dropped the avatar too.
|
|
252
|
+
await writeFileTree(tempDir, {
|
|
253
|
+
"data/jant.toml": [
|
|
254
|
+
'format = "jant-site"',
|
|
255
|
+
'site_avatar_mode = "custom"',
|
|
256
|
+
'favicon_mode = "custom"',
|
|
257
|
+
'apple_touch_mode = "custom"',
|
|
258
|
+
'favicon_path = "/favicon.ico"',
|
|
259
|
+
'apple_touch_icon_path = "/apple-touch-icon.png"',
|
|
260
|
+
'site_avatar_url = "/media/avatar.png"',
|
|
261
|
+
"",
|
|
262
|
+
].join("\n"),
|
|
263
|
+
"hugo.toml": 'baseURL = "https://gone.example/"\n',
|
|
264
|
+
"static/media/avatar.png": new Uint8Array([1]),
|
|
265
|
+
"themes/jant/static/favicon.ico": new Uint8Array([2]),
|
|
266
|
+
"themes/jant/static/apple-touch-icon.png": new Uint8Array([3]),
|
|
267
|
+
});
|
|
268
|
+
|
|
269
|
+
const avatarImport = await buildSiteAvatarImport(
|
|
270
|
+
await loadSiteConfig(tempDir),
|
|
271
|
+
tempDir,
|
|
272
|
+
);
|
|
273
|
+
|
|
274
|
+
expect(avatarImport).toMatchObject({
|
|
275
|
+
mode: "set",
|
|
276
|
+
avatarFilePath: join(tempDir, "static/media/avatar.png"),
|
|
277
|
+
faviconFilePath: join(tempDir, "themes/jant/static/favicon.ico"),
|
|
278
|
+
appleTouchFilePath: join(
|
|
279
|
+
tempDir,
|
|
280
|
+
"themes/jant/static/apple-touch-icon.png",
|
|
281
|
+
),
|
|
282
|
+
});
|
|
283
|
+
});
|
|
284
|
+
|
|
285
|
+
it("buildSiteAvatarImport prefers an icon in the root static directory", async () => {
|
|
286
|
+
// Hugo serves the site's own static/ over the theme's, so a file placed
|
|
287
|
+
// there after export is the one the site shows.
|
|
288
|
+
await writeFileTree(tempDir, {
|
|
289
|
+
"data/jant.toml": [
|
|
290
|
+
'format = "jant-site"',
|
|
291
|
+
'site_avatar_mode = "custom"',
|
|
292
|
+
'favicon_mode = "custom"',
|
|
293
|
+
'site_avatar_url = "/media/avatar.png"',
|
|
294
|
+
"",
|
|
295
|
+
].join("\n"),
|
|
296
|
+
"static/media/avatar.png": new Uint8Array([1]),
|
|
297
|
+
"static/favicon.ico": new Uint8Array([4]),
|
|
298
|
+
"themes/jant/static/favicon.ico": new Uint8Array([2]),
|
|
299
|
+
});
|
|
300
|
+
|
|
301
|
+
const avatarImport = await buildSiteAvatarImport(
|
|
302
|
+
await loadSiteConfig(tempDir),
|
|
303
|
+
tempDir,
|
|
304
|
+
);
|
|
305
|
+
|
|
306
|
+
expect(avatarImport).toMatchObject({
|
|
307
|
+
faviconFilePath: join(tempDir, "static/favicon.ico"),
|
|
308
|
+
});
|
|
309
|
+
});
|
|
310
|
+
|
|
155
311
|
it("mediaSpecFromJantMedia resolves site-relative src under static/", async () => {
|
|
156
312
|
await mkdir(join(tempDir, "static", "media"), { recursive: true });
|
|
157
313
|
await writeFile(join(tempDir, "static/media/med-1.webp"), "PHOTO");
|
|
@@ -237,6 +393,362 @@ describe("Hugo import CLI helpers", () => {
|
|
|
237
393
|
);
|
|
238
394
|
});
|
|
239
395
|
|
|
396
|
+
it("rebuilds navigation with its placement, labels, and targets", () => {
|
|
397
|
+
const siteConfig = {
|
|
398
|
+
extra: {
|
|
399
|
+
jant: {
|
|
400
|
+
nav: [
|
|
401
|
+
{
|
|
402
|
+
type: "system",
|
|
403
|
+
label: "All",
|
|
404
|
+
url: "/archive/",
|
|
405
|
+
system_key: "archive",
|
|
406
|
+
placement: "header",
|
|
407
|
+
custom_label: "All",
|
|
408
|
+
},
|
|
409
|
+
{
|
|
410
|
+
type: "collection",
|
|
411
|
+
label: "Now",
|
|
412
|
+
url: "/now",
|
|
413
|
+
system_key: "",
|
|
414
|
+
placement: "header",
|
|
415
|
+
collection_slug: "now",
|
|
416
|
+
},
|
|
417
|
+
// An export from before `collection_slug`: the URL names it.
|
|
418
|
+
{
|
|
419
|
+
type: "collection",
|
|
420
|
+
label: "Books",
|
|
421
|
+
url: "/books/",
|
|
422
|
+
system_key: "",
|
|
423
|
+
placement: "more",
|
|
424
|
+
},
|
|
425
|
+
{
|
|
426
|
+
type: "page",
|
|
427
|
+
label: "About",
|
|
428
|
+
url: "/about",
|
|
429
|
+
system_key: "",
|
|
430
|
+
placement: "more",
|
|
431
|
+
post_slug: "about",
|
|
432
|
+
},
|
|
433
|
+
{
|
|
434
|
+
type: "link",
|
|
435
|
+
label: "More Quotes",
|
|
436
|
+
url: "https://jant.me/quotes",
|
|
437
|
+
system_key: "",
|
|
438
|
+
placement: "more",
|
|
439
|
+
},
|
|
440
|
+
{
|
|
441
|
+
type: "collection",
|
|
442
|
+
label: "Gone",
|
|
443
|
+
url: "/gone",
|
|
444
|
+
system_key: "",
|
|
445
|
+
placement: "header",
|
|
446
|
+
collection_slug: "gone",
|
|
447
|
+
},
|
|
448
|
+
{
|
|
449
|
+
type: "smart_collection",
|
|
450
|
+
label: "Thoughts",
|
|
451
|
+
url: "/thoughts",
|
|
452
|
+
system_key: "",
|
|
453
|
+
placement: "header",
|
|
454
|
+
smart_collection_slug: "thoughts",
|
|
455
|
+
},
|
|
456
|
+
],
|
|
457
|
+
},
|
|
458
|
+
},
|
|
459
|
+
};
|
|
460
|
+
const targets = {
|
|
461
|
+
collectionSlugToId: new Map([
|
|
462
|
+
["now", "col-now"],
|
|
463
|
+
["books", "col-books"],
|
|
464
|
+
]),
|
|
465
|
+
smartCollectionSlugToId: new Map([["thoughts", "smc-thoughts"]]),
|
|
466
|
+
postSlugToId: new Map([["about", "pst-about"]]),
|
|
467
|
+
};
|
|
468
|
+
|
|
469
|
+
const requests = normalizeImportedNavItems(siteConfig).items.map((item) =>
|
|
470
|
+
buildNavItemCreateRequest(item, targets),
|
|
471
|
+
);
|
|
472
|
+
|
|
473
|
+
expect(requests.map((request) => request.payload)).toEqual([
|
|
474
|
+
{ type: "system", systemKey: "archive", placement: "header" },
|
|
475
|
+
{ type: "collection", collectionId: "col-now", placement: "header" },
|
|
476
|
+
{ type: "collection", collectionId: "col-books", placement: "more" },
|
|
477
|
+
{ type: "page", postId: "pst-about", placement: "more" },
|
|
478
|
+
{
|
|
479
|
+
type: "link",
|
|
480
|
+
label: "More Quotes",
|
|
481
|
+
url: "https://jant.me/quotes",
|
|
482
|
+
placement: "more",
|
|
483
|
+
},
|
|
484
|
+
{ type: "link", label: "Gone", url: "/gone", placement: "header" },
|
|
485
|
+
{
|
|
486
|
+
type: "smart_collection",
|
|
487
|
+
smartCollectionId: "smc-thoughts",
|
|
488
|
+
placement: "header",
|
|
489
|
+
},
|
|
490
|
+
]);
|
|
491
|
+
expect(requests[0]?.customLabel).toBe("All");
|
|
492
|
+
expect(requests[5]?.warning).toContain('"Gone"');
|
|
493
|
+
});
|
|
494
|
+
|
|
495
|
+
it("recreates a smart collection from its exported conditions", () => {
|
|
496
|
+
const bundle = {
|
|
497
|
+
slug: "pictures",
|
|
498
|
+
frontMatter: {
|
|
499
|
+
title: "Pictures",
|
|
500
|
+
type: "smart_collection",
|
|
501
|
+
summary_text: "Photos from the ideas collection.",
|
|
502
|
+
sort_order: "rating_desc",
|
|
503
|
+
display_layout: "grid",
|
|
504
|
+
selection: {
|
|
505
|
+
collection: "ideas",
|
|
506
|
+
media: ["image", "video"],
|
|
507
|
+
year: 2025,
|
|
508
|
+
title: false,
|
|
509
|
+
},
|
|
510
|
+
},
|
|
511
|
+
};
|
|
512
|
+
|
|
513
|
+
expect(
|
|
514
|
+
buildSmartCollectionCreateRequest(
|
|
515
|
+
bundle,
|
|
516
|
+
new Map([["ideas", "col-ideas"]]),
|
|
517
|
+
),
|
|
518
|
+
).toEqual({
|
|
519
|
+
payload: {
|
|
520
|
+
slug: "pictures",
|
|
521
|
+
title: "Pictures",
|
|
522
|
+
description: "Photos from the ideas collection.",
|
|
523
|
+
selection: {
|
|
524
|
+
collection: ["col-ideas"],
|
|
525
|
+
media: ["image", "video"],
|
|
526
|
+
year: 2025,
|
|
527
|
+
title: false,
|
|
528
|
+
},
|
|
529
|
+
sort: "rating_desc",
|
|
530
|
+
layout: "grid",
|
|
531
|
+
},
|
|
532
|
+
warning: null,
|
|
533
|
+
});
|
|
534
|
+
|
|
535
|
+
// Without the collection it names, the smart collection would gather
|
|
536
|
+
// every post the other conditions match; it is skipped instead.
|
|
537
|
+
const skipped = buildSmartCollectionCreateRequest(bundle, new Map());
|
|
538
|
+
expect(skipped.payload).toBeNull();
|
|
539
|
+
expect(skipped.warning).toContain('"ideas"');
|
|
540
|
+
|
|
541
|
+
expect(
|
|
542
|
+
buildSmartCollectionCreateRequest(
|
|
543
|
+
{ slug: "everything", frontMatter: { type: "smart_collection" } },
|
|
544
|
+
new Map(),
|
|
545
|
+
).payload,
|
|
546
|
+
).toEqual({ slug: "everything", title: "everything", selection: {} });
|
|
547
|
+
});
|
|
548
|
+
|
|
549
|
+
it("finds smart collection pages in the content tree", async () => {
|
|
550
|
+
await writeFileTree(tempDir, {
|
|
551
|
+
"content/thoughts/_index.md": [
|
|
552
|
+
"---",
|
|
553
|
+
'title: "Thoughts"',
|
|
554
|
+
'slug: "thoughts"',
|
|
555
|
+
'type: "smart_collection"',
|
|
556
|
+
"selection:",
|
|
557
|
+
' format: "note"',
|
|
558
|
+
"---",
|
|
559
|
+
"",
|
|
560
|
+
].join("\n"),
|
|
561
|
+
"content/ideas/_index.md": [
|
|
562
|
+
"---",
|
|
563
|
+
'title: "Ideas"',
|
|
564
|
+
'type: "collection"',
|
|
565
|
+
"---",
|
|
566
|
+
"",
|
|
567
|
+
].join("\n"),
|
|
568
|
+
});
|
|
569
|
+
|
|
570
|
+
const { rootBundles, collectionBundles, smartCollectionBundles } =
|
|
571
|
+
await walkHugoContent(tempDir);
|
|
572
|
+
|
|
573
|
+
expect(rootBundles).toHaveLength(0);
|
|
574
|
+
expect(collectionBundles.map((bundle) => bundle.slug)).toEqual(["ideas"]);
|
|
575
|
+
expect(smartCollectionBundles).toMatchObject([
|
|
576
|
+
{ slug: "thoughts", frontMatter: { selection: { format: "note" } } },
|
|
577
|
+
]);
|
|
578
|
+
});
|
|
579
|
+
|
|
580
|
+
// Creating a collection or smart collection gives it a directory row;
|
|
581
|
+
// dividers and links are rebuilt. The sync keeps the first kind and puts
|
|
582
|
+
// every row in the exported order.
|
|
583
|
+
it("restores the directory order with smart collections in it", async () => {
|
|
584
|
+
let rows = [
|
|
585
|
+
{ id: "dir-col", type: "collection", collectionId: "col-ideas" },
|
|
586
|
+
{
|
|
587
|
+
id: "dir-smc",
|
|
588
|
+
type: "smart_collection",
|
|
589
|
+
smartCollectionId: "smc-thoughts",
|
|
590
|
+
},
|
|
591
|
+
{ id: "dir-old-divider", type: "divider" },
|
|
592
|
+
];
|
|
593
|
+
let nextId = 0;
|
|
594
|
+
const target = {
|
|
595
|
+
async listCollectionDirectoryItems() {
|
|
596
|
+
return rows;
|
|
597
|
+
},
|
|
598
|
+
async deleteCollectionDirectoryItem(id: string) {
|
|
599
|
+
rows = rows.filter((row) => row.id !== id);
|
|
600
|
+
},
|
|
601
|
+
async createCollectionDirectoryItem(data: { type: string }) {
|
|
602
|
+
const row = { id: `dir-new-${nextId++}`, type: data.type };
|
|
603
|
+
rows = [...rows, row];
|
|
604
|
+
return row;
|
|
605
|
+
},
|
|
606
|
+
async moveCollectionDirectoryItem(
|
|
607
|
+
id: string,
|
|
608
|
+
afterId: string | null,
|
|
609
|
+
beforeId: string | null,
|
|
610
|
+
) {
|
|
611
|
+
const moving = rows.find((row) => row.id === id)!;
|
|
612
|
+
const rest = rows.filter((row) => row.id !== id);
|
|
613
|
+
const index =
|
|
614
|
+
afterId !== null
|
|
615
|
+
? rest.findIndex((row) => row.id === afterId) + 1
|
|
616
|
+
: beforeId !== null
|
|
617
|
+
? rest.findIndex((row) => row.id === beforeId)
|
|
618
|
+
: 0;
|
|
619
|
+
rest.splice(index, 0, moving);
|
|
620
|
+
rows = rest;
|
|
621
|
+
},
|
|
622
|
+
};
|
|
623
|
+
const directory = normalizeImportedCollectionDirectory({
|
|
624
|
+
extra: {
|
|
625
|
+
jant: {
|
|
626
|
+
collections_directory: [
|
|
627
|
+
{ type: "smart_collection", slug: "thoughts" },
|
|
628
|
+
{ type: "divider", label: "Topics" },
|
|
629
|
+
{ type: "collection", slug: "ideas" },
|
|
630
|
+
],
|
|
631
|
+
},
|
|
632
|
+
},
|
|
633
|
+
});
|
|
634
|
+
|
|
635
|
+
const result = await syncImportedCollectionDirectory(
|
|
636
|
+
target,
|
|
637
|
+
directory,
|
|
638
|
+
new Map([["ideas", "col-ideas"]]),
|
|
639
|
+
new Map([["thoughts", "smc-thoughts"]]),
|
|
640
|
+
);
|
|
641
|
+
|
|
642
|
+
expect(rows.map((row) => row.id)).toEqual([
|
|
643
|
+
"dir-smc",
|
|
644
|
+
"dir-new-0",
|
|
645
|
+
"dir-col",
|
|
646
|
+
]);
|
|
647
|
+
expect(result).toMatchObject({ created: 1, deleted: 1 });
|
|
648
|
+
});
|
|
649
|
+
|
|
650
|
+
// The API refuses a reply to anything but the Thread's end, which the site
|
|
651
|
+
// reads as the last post in Thread order: the root first whatever its
|
|
652
|
+
// creation time, then replies by creation time, then ID. A reply can be
|
|
653
|
+
// older than its root (moved into the Thread, or dated by publish time in
|
|
654
|
+
// an older export) and still end the Thread.
|
|
655
|
+
it("follows the Thread's end the way the site reads it", () => {
|
|
656
|
+
const root = { id: "pst_05", createdAt: 1_000, replyToId: null };
|
|
657
|
+
const older = { id: "pst_06", createdAt: 500, replyToId: root.id };
|
|
658
|
+
const oldest = { id: "pst_07", createdAt: 400, replyToId: older.id };
|
|
659
|
+
const tiedLowerId = { id: "pst_04", createdAt: 500, replyToId: older.id };
|
|
660
|
+
const tiedHigherId = { id: "pst_08", createdAt: 500, replyToId: older.id };
|
|
661
|
+
const newer = { id: "pst_09", createdAt: 2_000, replyToId: older.id };
|
|
662
|
+
|
|
663
|
+
expect(getNextThreadTail(root, older)).toBe(older);
|
|
664
|
+
expect(getNextThreadTail(older, oldest)).toBe(older);
|
|
665
|
+
expect(getNextThreadTail(older, tiedLowerId)).toBe(older);
|
|
666
|
+
expect(getNextThreadTail(older, tiedHigherId)).toBe(tiedHigherId);
|
|
667
|
+
expect(getNextThreadTail(older, newer)).toBe(newer);
|
|
668
|
+
expect(getNextThreadTail(root, null)).toBe(root);
|
|
669
|
+
});
|
|
670
|
+
|
|
671
|
+
it("reads the redirects and archive URLs an export lists", () => {
|
|
672
|
+
expect(
|
|
673
|
+
normalizeImportedCustomUrls({
|
|
674
|
+
extra: {
|
|
675
|
+
jant: {
|
|
676
|
+
custom_urls: [
|
|
677
|
+
{ path: "atom.xml", kind: "redirect", to: "/feed", status: 301 },
|
|
678
|
+
{
|
|
679
|
+
path: "/inspires",
|
|
680
|
+
kind: "redirect",
|
|
681
|
+
to: "/inspired",
|
|
682
|
+
status: 302,
|
|
683
|
+
},
|
|
684
|
+
{ path: "links", kind: "archive", archive_query: "format=link" },
|
|
685
|
+
{ path: "", kind: "redirect", to: "/x" },
|
|
686
|
+
],
|
|
687
|
+
},
|
|
688
|
+
},
|
|
689
|
+
}),
|
|
690
|
+
).toEqual([
|
|
691
|
+
{ path: "atom.xml", kind: "redirect", to: "/feed", status: 301 },
|
|
692
|
+
{ path: "inspires", kind: "redirect", to: "/inspired", status: 302 },
|
|
693
|
+
{ path: "links", kind: "archive", archiveQuery: "format=link" },
|
|
694
|
+
]);
|
|
695
|
+
});
|
|
696
|
+
|
|
697
|
+
it("uploadMediaList keeps a body image as a link when its upload fails", async () => {
|
|
698
|
+
const warn = vi.spyOn(console, "warn").mockImplementation(() => {});
|
|
699
|
+
const target = {
|
|
700
|
+
uploadMedia: async () => {
|
|
701
|
+
throw new Error("Couldn't read https://gone.example/a.png");
|
|
702
|
+
},
|
|
703
|
+
};
|
|
704
|
+
|
|
705
|
+
const result = await uploadMediaList(
|
|
706
|
+
[{ src: "https://gone.example/a.png" }],
|
|
707
|
+
target,
|
|
708
|
+
{ base_url: "https://origin.example/" },
|
|
709
|
+
tempDir,
|
|
710
|
+
);
|
|
711
|
+
|
|
712
|
+
expect(result.uploaded).toBe(0);
|
|
713
|
+
expect(result.urlMap.size).toBe(0);
|
|
714
|
+
expect(warn).toHaveBeenCalledWith(
|
|
715
|
+
expect.stringContaining("kept https://gone.example/a.png as a link"),
|
|
716
|
+
);
|
|
717
|
+
warn.mockRestore();
|
|
718
|
+
});
|
|
719
|
+
|
|
720
|
+
it("uploadBundleResources stops when a post's own file can't be uploaded", async () => {
|
|
721
|
+
const target = {
|
|
722
|
+
uploadMedia: async () => {
|
|
723
|
+
throw new Error("The site refused /media/a.webp: HTTP 413");
|
|
724
|
+
},
|
|
725
|
+
};
|
|
726
|
+
|
|
727
|
+
await expect(
|
|
728
|
+
uploadBundleResources(
|
|
729
|
+
[{ src: "/media/a.webp", srcFilePath: join(tempDir, "a.webp") }],
|
|
730
|
+
target,
|
|
731
|
+
),
|
|
732
|
+
).rejects.toThrow("Couldn't upload /media/a.webp: The site refused");
|
|
733
|
+
});
|
|
734
|
+
|
|
735
|
+
it("buildImportedAttachments stops when an attachment can't be uploaded", async () => {
|
|
736
|
+
const target = {
|
|
737
|
+
uploadMedia: async () => {
|
|
738
|
+
throw new Error("The site refused /media/b.jpg: HTTP 500");
|
|
739
|
+
},
|
|
740
|
+
};
|
|
741
|
+
|
|
742
|
+
await expect(
|
|
743
|
+
buildImportedAttachments(
|
|
744
|
+
[{ src: "https://origin.example/media/b.jpg" }],
|
|
745
|
+
target,
|
|
746
|
+
{ base_url: "https://origin.example/" },
|
|
747
|
+
tempDir,
|
|
748
|
+
),
|
|
749
|
+
).rejects.toThrow("Couldn't upload https://origin.example/media/b.jpg");
|
|
750
|
+
});
|
|
751
|
+
|
|
240
752
|
it("isAbsoluteImportUrl distinguishes absolute URLs from relative paths for --skip-remote-media", () => {
|
|
241
753
|
// Relative paths — always treated as the source site's own files.
|
|
242
754
|
expect(isAbsoluteImportUrl("/media/foo.png")).toBe(false);
|
|
@@ -1,22 +1,93 @@
|
|
|
1
|
-
import { readFileSync } from "node:fs";
|
|
1
|
+
import { readdirSync, readFileSync } from "node:fs";
|
|
2
2
|
import { resolve } from "node:path";
|
|
3
3
|
import { describe, expect, it } from "vitest";
|
|
4
4
|
import { parse } from "smol-toml";
|
|
5
5
|
|
|
6
|
+
const REPO_ROOT = resolve(import.meta.dirname, "../../../..");
|
|
7
|
+
|
|
6
8
|
interface MiseConfig {
|
|
7
9
|
tasks?: Record<
|
|
8
10
|
string,
|
|
9
11
|
{
|
|
10
12
|
env?: Record<string, string>;
|
|
13
|
+
run?: string | string[];
|
|
11
14
|
}
|
|
12
15
|
>;
|
|
13
16
|
}
|
|
14
17
|
|
|
18
|
+
function readMiseConfig(): MiseConfig {
|
|
19
|
+
return parse(
|
|
20
|
+
readFileSync(resolve(REPO_ROOT, "mise.toml"), "utf8"),
|
|
21
|
+
) as MiseConfig;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* Every shell command the repo defines: mise tasks and the scripts of each
|
|
26
|
+
* workspace package.
|
|
27
|
+
*
|
|
28
|
+
* @returns Each command with the name of the task or script that runs it
|
|
29
|
+
*/
|
|
30
|
+
function collectCommands(): { name: string; command: string }[] {
|
|
31
|
+
const packageDirs = ["packages", "sites"].flatMap((parent) =>
|
|
32
|
+
readdirSync(resolve(REPO_ROOT, parent), { withFileTypes: true })
|
|
33
|
+
.filter((entry) => entry.isDirectory())
|
|
34
|
+
.map((entry) => `${parent}/${entry.name}`),
|
|
35
|
+
);
|
|
36
|
+
|
|
37
|
+
return [
|
|
38
|
+
...Object.entries(readMiseConfig().tasks ?? {}).flatMap(([name, task]) =>
|
|
39
|
+
[task.run ?? []].flat().map((command) => ({
|
|
40
|
+
name: `mise task ${name}`,
|
|
41
|
+
command,
|
|
42
|
+
})),
|
|
43
|
+
),
|
|
44
|
+
...packageDirs.flatMap((dir) => {
|
|
45
|
+
const pkg = JSON.parse(
|
|
46
|
+
readFileSync(resolve(REPO_ROOT, dir, "package.json"), "utf8"),
|
|
47
|
+
) as { scripts?: Record<string, string> };
|
|
48
|
+
return Object.entries(pkg.scripts ?? {}).map(([name, command]) => ({
|
|
49
|
+
name: `${dir} script ${name}`,
|
|
50
|
+
command,
|
|
51
|
+
}));
|
|
52
|
+
}),
|
|
53
|
+
];
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
/** A `jant migrate` call and its arguments, up to the end of that command. */
|
|
57
|
+
const MIGRATE_INVOCATION =
|
|
58
|
+
/(?:\bjant(?:\.js)?|run-jant\.mjs)\s+migrate(?![\w-])([^\n;&|]*)/g;
|
|
59
|
+
|
|
60
|
+
const RUNTIME_FLAG = /(?:^|\s)--(local|remote|node)(?=\s|$)/;
|
|
61
|
+
|
|
15
62
|
describe("mise tasks", () => {
|
|
16
63
|
it("enables environment proxy support before the Node dev runtime starts", () => {
|
|
17
|
-
|
|
18
|
-
|
|
64
|
+
expect(readMiseConfig().tasks?.["dev-node"]?.env?.NODE_USE_ENV_PROXY).toBe(
|
|
65
|
+
"1",
|
|
66
|
+
);
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
// Without a runtime flag, `jant migrate` loads packages/core/.env.node and
|
|
70
|
+
// targets the Node database whenever that file sets DATABASE_URL or DATA_DIR.
|
|
71
|
+
// `db-wrangler-migrate` once ran that way: in a worktree with a Postgres
|
|
72
|
+
// `.env.node` it migrated Postgres and left local D1 empty.
|
|
73
|
+
it("names the runtime on every scripted jant migrate", () => {
|
|
74
|
+
const invocations = collectCommands().flatMap(({ name, command }) =>
|
|
75
|
+
[...command.matchAll(MIGRATE_INVOCATION)].map(([, args]) => ({
|
|
76
|
+
name,
|
|
77
|
+
runtime: RUNTIME_FLAG.exec(args)?.[1] ?? null,
|
|
78
|
+
})),
|
|
79
|
+
);
|
|
19
80
|
|
|
20
|
-
expect(
|
|
81
|
+
expect(invocations).toContainEqual({
|
|
82
|
+
name: "mise task db-wrangler-migrate",
|
|
83
|
+
runtime: "local",
|
|
84
|
+
});
|
|
85
|
+
expect(invocations.filter(({ runtime }) => runtime === null)).toEqual([]);
|
|
86
|
+
expect(
|
|
87
|
+
invocations.filter(
|
|
88
|
+
({ name, runtime }) =>
|
|
89
|
+
name.startsWith("mise task db-wrangler-") && runtime !== "local",
|
|
90
|
+
),
|
|
91
|
+
).toEqual([]);
|
|
21
92
|
});
|
|
22
93
|
});
|