@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
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import { readFileSync, writeFileSync } from "node:fs";
|
|
2
1
|
import { stat } from "node:fs/promises";
|
|
3
2
|
import { resolve } from "node:path";
|
|
4
3
|
import { parseArgs } from "node:util";
|
|
5
4
|
import {
|
|
6
5
|
pullSiteExportDirectory,
|
|
7
|
-
|
|
6
|
+
pullSiteExportZipFile,
|
|
8
7
|
} from "../../lib/site-pull-media.js";
|
|
9
8
|
|
|
10
9
|
function describeProgressUrl(value) {
|
|
@@ -102,13 +101,10 @@ export async function run(argv) {
|
|
|
102
101
|
}
|
|
103
102
|
|
|
104
103
|
const outputPath = resolve(process.cwd(), values.output || values.path);
|
|
105
|
-
const inputBytes = new Uint8Array(readFileSync(inputPath));
|
|
106
104
|
console.log(`Pulling media in ${values.path}...`);
|
|
107
|
-
const
|
|
105
|
+
const stats = await pullSiteExportZipFile(inputPath, outputPath, {
|
|
108
106
|
logger: logPullProgress,
|
|
109
107
|
});
|
|
110
|
-
console.log(`Writing ${values.output || values.path}...`);
|
|
111
|
-
writeFileSync(outputPath, Buffer.from(zipBytes));
|
|
112
108
|
console.log(
|
|
113
109
|
`Pulled media in ${values.path} -> ${values.output || values.path}`,
|
|
114
110
|
);
|
|
@@ -1,17 +1,12 @@
|
|
|
1
|
-
import { existsSync } from "node:fs";
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
readFile,
|
|
6
|
-
readdir,
|
|
7
|
-
rm,
|
|
8
|
-
writeFile,
|
|
9
|
-
} from "node:fs/promises";
|
|
1
|
+
import { createWriteStream, existsSync } from "node:fs";
|
|
2
|
+
import { Readable } from "node:stream";
|
|
3
|
+
import { pipeline } from "node:stream/promises";
|
|
4
|
+
import { mkdir, mkdtemp, rm, writeFile } from "node:fs/promises";
|
|
10
5
|
import { tmpdir } from "node:os";
|
|
11
|
-
import { dirname, join,
|
|
6
|
+
import { dirname, join, resolve } from "node:path";
|
|
12
7
|
import { parseArgs } from "node:util";
|
|
13
|
-
import {
|
|
14
|
-
import { queryD1 } from "../../../lib/d1-query.js";
|
|
8
|
+
import { writeDirectoryToZip } from "../../../lib/zip-archive.js";
|
|
9
|
+
import { D1_DUMP_PAGE_SIZE, queryD1 } from "../../../lib/d1-query.js";
|
|
15
10
|
import { loadNodeRuntime } from "../../../lib/load-node-runtime.js";
|
|
16
11
|
import { openNodeDatabase } from "../../../lib/node-database.js";
|
|
17
12
|
import {
|
|
@@ -23,6 +18,7 @@ import {
|
|
|
23
18
|
buildSnapshotStorageQuery,
|
|
24
19
|
collectSnapshotObjects,
|
|
25
20
|
getSnapshotSelectSql,
|
|
21
|
+
orderSnapshotPostRows,
|
|
26
22
|
SNAPSHOT_TABLES,
|
|
27
23
|
snapshotObjectPath,
|
|
28
24
|
} from "../../../lib/site-snapshot.js";
|
|
@@ -38,49 +34,6 @@ function isZipPath(filePath) {
|
|
|
38
34
|
return filePath.toLowerCase().endsWith(".zip");
|
|
39
35
|
}
|
|
40
36
|
|
|
41
|
-
async function readStorageBody(body) {
|
|
42
|
-
const reader = body.getReader();
|
|
43
|
-
const chunks = [];
|
|
44
|
-
let totalLength = 0;
|
|
45
|
-
|
|
46
|
-
for (;;) {
|
|
47
|
-
const { done, value } = await reader.read();
|
|
48
|
-
if (done) break;
|
|
49
|
-
chunks.push(value);
|
|
50
|
-
totalLength += value.length;
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
const bytes = new Uint8Array(totalLength);
|
|
54
|
-
let offset = 0;
|
|
55
|
-
for (const chunk of chunks) {
|
|
56
|
-
bytes.set(chunk, offset);
|
|
57
|
-
offset += chunk.length;
|
|
58
|
-
}
|
|
59
|
-
|
|
60
|
-
return bytes;
|
|
61
|
-
}
|
|
62
|
-
|
|
63
|
-
async function readDirectoryEntries(rootDir) {
|
|
64
|
-
const entries = {};
|
|
65
|
-
|
|
66
|
-
async function walk(dir) {
|
|
67
|
-
const items = await readdir(dir, { withFileTypes: true });
|
|
68
|
-
for (const item of items) {
|
|
69
|
-
const fullPath = join(dir, item.name);
|
|
70
|
-
if (item.isDirectory()) {
|
|
71
|
-
await walk(fullPath);
|
|
72
|
-
continue;
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
const relativePath = relative(rootDir, fullPath).replace(/\\/g, "/");
|
|
76
|
-
entries[relativePath] = new Uint8Array(await readFile(fullPath));
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
await walk(rootDir);
|
|
81
|
-
return entries;
|
|
82
|
-
}
|
|
83
|
-
|
|
84
37
|
async function assertWritableOutput(outputPath, force) {
|
|
85
38
|
if (!existsSync(outputPath)) {
|
|
86
39
|
return;
|
|
@@ -123,7 +76,12 @@ async function createNodeExportContext() {
|
|
|
123
76
|
}
|
|
124
77
|
|
|
125
78
|
await mkdir(dirname(filePath), { recursive: true });
|
|
126
|
-
|
|
79
|
+
// Straight to disk: a snapshot holds every media file, and collecting
|
|
80
|
+
// each one in memory first ran a 3 GB export to a 2 GB peak.
|
|
81
|
+
await pipeline(
|
|
82
|
+
Readable.fromWeb(object.body),
|
|
83
|
+
createWriteStream(filePath),
|
|
84
|
+
);
|
|
127
85
|
},
|
|
128
86
|
};
|
|
129
87
|
}
|
|
@@ -295,6 +253,9 @@ export async function run(argv) {
|
|
|
295
253
|
{
|
|
296
254
|
dialect: context.dialect,
|
|
297
255
|
source: runtime,
|
|
256
|
+
// D1 answers through Wrangler's buffered output; read it in pages.
|
|
257
|
+
pageSize: runtime === "node" ? undefined : D1_DUMP_PAGE_SIZE,
|
|
258
|
+
orderRowsByTable: { post: orderSnapshotPostRows },
|
|
298
259
|
tables: SNAPSHOT_TABLES,
|
|
299
260
|
selectSqlByTable: Object.fromEntries(
|
|
300
261
|
SNAPSHOT_TABLES.map((tableName) => [
|
|
@@ -344,10 +305,7 @@ export async function run(argv) {
|
|
|
344
305
|
|
|
345
306
|
if (shouldZip) {
|
|
346
307
|
await mkdir(dirname(outputPath), { recursive: true });
|
|
347
|
-
|
|
348
|
-
level: 6,
|
|
349
|
-
});
|
|
350
|
-
await writeFile(outputPath, zipped);
|
|
308
|
+
await writeDirectoryToZip(scratchDir, outputPath);
|
|
351
309
|
if (process.env.SNAPSHOT_SUPPRESS_SUCCESS_LOG !== "true") {
|
|
352
310
|
console.log(
|
|
353
311
|
`Exported ${getCliRuntimeLabel(runtime)} snapshot to ${values.output}`,
|
|
@@ -1,16 +1,10 @@
|
|
|
1
|
-
import { existsSync } from "node:fs";
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
mkdtemp,
|
|
5
|
-
readFile,
|
|
6
|
-
rm,
|
|
7
|
-
stat,
|
|
8
|
-
writeFile,
|
|
9
|
-
} from "node:fs/promises";
|
|
1
|
+
import { createReadStream, existsSync } from "node:fs";
|
|
2
|
+
import { Readable } from "node:stream";
|
|
3
|
+
import { mkdtemp, readFile, rm, stat } from "node:fs/promises";
|
|
10
4
|
import { tmpdir } from "node:os";
|
|
11
|
-
import {
|
|
5
|
+
import { join, resolve } from "node:path";
|
|
12
6
|
import { parseArgs } from "node:util";
|
|
13
|
-
import {
|
|
7
|
+
import { extractZipFile } from "../../../lib/zip-archive.js";
|
|
14
8
|
import { executeD1, queryD1 } from "../../../lib/d1-query.js";
|
|
15
9
|
import { loadNodeRuntime } from "../../../lib/load-node-runtime.js";
|
|
16
10
|
import { openNodeDatabase } from "../../../lib/node-database.js";
|
|
@@ -18,6 +12,9 @@ import { deleteR2Object, uploadR2Object } from "../../../lib/r2-query.js";
|
|
|
18
12
|
import {
|
|
19
13
|
assertSnapshotDialectMatches,
|
|
20
14
|
assertSnapshotMeta,
|
|
15
|
+
assertSnapshotSchemaInstalled,
|
|
16
|
+
buildMediaProviderSql,
|
|
17
|
+
DEFER_FOREIGN_KEYS_SQL,
|
|
21
18
|
buildReplaceSql,
|
|
22
19
|
buildSnapshotStorageQuery,
|
|
23
20
|
collectSnapshotObjects,
|
|
@@ -58,11 +55,13 @@ async function createNodeImportContext() {
|
|
|
58
55
|
// the current site, which (a) is redundant with the bin-level resolveCliSite
|
|
59
56
|
// call below and (b) prints a generic "/setup first" error when the
|
|
60
57
|
// snapshot's own error path is more informative.
|
|
61
|
-
const { createStorageDriver } =
|
|
58
|
+
const { createStorageDriver, getConfiguredStorageDriver } =
|
|
59
|
+
await loadNodeRuntime();
|
|
62
60
|
const storage = createStorageDriver(nodeDatabase.bindings);
|
|
63
61
|
|
|
64
62
|
return {
|
|
65
63
|
dialect: nodeDatabase.database.dialect,
|
|
64
|
+
storageProvider: getConfiguredStorageDriver(nodeDatabase.bindings),
|
|
66
65
|
async close() {
|
|
67
66
|
await nodeDatabase.close();
|
|
68
67
|
},
|
|
@@ -77,8 +76,7 @@ async function createNodeImportContext() {
|
|
|
77
76
|
throw new Error("Snapshot import requires configured storage.");
|
|
78
77
|
}
|
|
79
78
|
|
|
80
|
-
|
|
81
|
-
await storage.put(key, bytes, {
|
|
79
|
+
await storage.put(key, Readable.toWeb(createReadStream(filePath)), {
|
|
82
80
|
contentType: contentType || undefined,
|
|
83
81
|
});
|
|
84
82
|
},
|
|
@@ -96,6 +94,8 @@ function createD1ImportContext(runtime, values) {
|
|
|
96
94
|
|
|
97
95
|
return {
|
|
98
96
|
dialect: "sqlite",
|
|
97
|
+
// Objects go up through the wrangler R2 binding below.
|
|
98
|
+
storageProvider: "r2",
|
|
99
99
|
async close() {},
|
|
100
100
|
async query(sql) {
|
|
101
101
|
return queryD1(sql, runtime, wranglerOptions);
|
|
@@ -141,14 +141,7 @@ async function materializeSnapshotInput(inputPath) {
|
|
|
141
141
|
}
|
|
142
142
|
|
|
143
143
|
const outputDir = await mkdtemp(join(tmpdir(), "jant-site-snapshot-import-"));
|
|
144
|
-
|
|
145
|
-
const files = unzipSync(bytes);
|
|
146
|
-
|
|
147
|
-
for (const [relativePath, data] of Object.entries(files)) {
|
|
148
|
-
const absolutePath = join(outputDir, relativePath);
|
|
149
|
-
await mkdir(dirname(absolutePath), { recursive: true });
|
|
150
|
-
await writeFile(absolutePath, data);
|
|
151
|
-
}
|
|
144
|
+
await extractZipFile(inputPath, outputDir);
|
|
152
145
|
|
|
153
146
|
return {
|
|
154
147
|
cleanup: async () => {
|
|
@@ -281,6 +274,7 @@ export async function run(argv) {
|
|
|
281
274
|
try {
|
|
282
275
|
const meta = await readSnapshotJson(materialized.rootDir, "meta.json");
|
|
283
276
|
assertSnapshotMeta(meta);
|
|
277
|
+
assertSnapshotSchemaInstalled(meta);
|
|
284
278
|
assertSnapshotDialectMatches(meta, context.dialect);
|
|
285
279
|
const explicitRemap = values["remap-site"] === true;
|
|
286
280
|
const snapshotSite = getSnapshotBootstrapSite(meta);
|
|
@@ -402,7 +396,14 @@ export async function run(argv) {
|
|
|
402
396
|
);
|
|
403
397
|
}
|
|
404
398
|
|
|
405
|
-
await context.execute(
|
|
399
|
+
await context.execute(
|
|
400
|
+
[
|
|
401
|
+
...(context.dialect === "postgres" ? [] : [DEFER_FOREIGN_KEYS_SQL]),
|
|
402
|
+
buildReplaceSql(targetSite.id),
|
|
403
|
+
dbSql,
|
|
404
|
+
buildMediaProviderSql(targetSite.id, context.storageProvider),
|
|
405
|
+
].join("\n"),
|
|
406
|
+
);
|
|
406
407
|
|
|
407
408
|
const keysToDelete = [...currentKeys].filter(
|
|
408
409
|
(key) => !snapshotKeys.has(key),
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { parseArgs } from "node:util";
|
|
2
2
|
import { autoloadNodeEnv } from "../../lib/node-env.js";
|
|
3
|
+
import { findRenamedOption } from "../../lib/renamed-arguments.js";
|
|
4
|
+
import { resolveSiteUrl } from "../../lib/site-url.js";
|
|
3
5
|
|
|
4
6
|
const TELEGRAM_API_BASE = "https://api.telegram.org";
|
|
5
7
|
|
|
@@ -16,40 +18,63 @@ async function callTelegram(token, method, body) {
|
|
|
16
18
|
return payload.result;
|
|
17
19
|
}
|
|
18
20
|
|
|
21
|
+
function printUsage() {
|
|
22
|
+
console.log("Usage: jant telegram register-webhooks [--url <url>]");
|
|
23
|
+
console.log("");
|
|
24
|
+
console.log(
|
|
25
|
+
"Registers a webhook for every bot in TELEGRAM_BOT_TOKENS, pointing at",
|
|
26
|
+
);
|
|
27
|
+
console.log("<url>/api/telegram/webhook/<bot_id> with the shared");
|
|
28
|
+
console.log("TELEGRAM_WEBHOOK_SECRET. Run once after configuring the pool.");
|
|
29
|
+
console.log("");
|
|
30
|
+
console.log("Options:");
|
|
31
|
+
console.log(" --url The site's public URL");
|
|
32
|
+
console.log("");
|
|
33
|
+
console.log(
|
|
34
|
+
"If --url is omitted, uses SITE_ORIGIN + SITE_PATH_PREFIX from the environment.",
|
|
35
|
+
);
|
|
36
|
+
console.log("");
|
|
37
|
+
console.log("Environment (also read from .env.node):");
|
|
38
|
+
console.log(
|
|
39
|
+
" TELEGRAM_BOT_TOKENS Comma-separated <bot_id>:<secret> tokens",
|
|
40
|
+
);
|
|
41
|
+
console.log(
|
|
42
|
+
" TELEGRAM_WEBHOOK_SECRET Shared secret_token for the webhooks",
|
|
43
|
+
);
|
|
44
|
+
}
|
|
45
|
+
|
|
19
46
|
export async function run(argv) {
|
|
47
|
+
const renamed = findRenamedOption("telegram register-webhooks", argv, {
|
|
48
|
+
"--base-url": "--url",
|
|
49
|
+
});
|
|
50
|
+
if (renamed) {
|
|
51
|
+
console.error(`Error: ${renamed}`);
|
|
52
|
+
process.exit(1);
|
|
53
|
+
}
|
|
54
|
+
|
|
20
55
|
const { values } = parseArgs({
|
|
21
56
|
args: argv,
|
|
22
57
|
options: {
|
|
23
|
-
|
|
58
|
+
url: { type: "string" },
|
|
24
59
|
help: { type: "boolean", short: "h" },
|
|
25
60
|
},
|
|
26
61
|
});
|
|
27
62
|
|
|
28
|
-
if (values.help
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
);
|
|
32
|
-
console.log("");
|
|
33
|
-
console.log(
|
|
34
|
-
"Registers a webhook for every bot in TELEGRAM_BOT_TOKENS, pointing at",
|
|
35
|
-
);
|
|
36
|
-
console.log("<base-url>/api/telegram/webhook/<bot_id> with the shared");
|
|
37
|
-
console.log(
|
|
38
|
-
"TELEGRAM_WEBHOOK_SECRET. Run once after configuring the pool.",
|
|
39
|
-
);
|
|
40
|
-
console.log("");
|
|
41
|
-
console.log("Environment (also read from .env.node):");
|
|
42
|
-
console.log(
|
|
43
|
-
" TELEGRAM_BOT_TOKENS Comma-separated <bot_id>:<secret> tokens",
|
|
44
|
-
);
|
|
45
|
-
console.log(
|
|
46
|
-
" TELEGRAM_WEBHOOK_SECRET Shared secret_token for the webhooks",
|
|
47
|
-
);
|
|
48
|
-
process.exit(values.help ? 0 : 1);
|
|
63
|
+
if (values.help) {
|
|
64
|
+
printUsage();
|
|
65
|
+
process.exit(0);
|
|
49
66
|
}
|
|
50
67
|
|
|
51
68
|
autoloadNodeEnv();
|
|
52
69
|
|
|
70
|
+
const siteUrl = resolveSiteUrl({ url: values.url });
|
|
71
|
+
if (!siteUrl) {
|
|
72
|
+
console.error(
|
|
73
|
+
"Error: telegram register-webhooks requires --url or SITE_ORIGIN in the environment.",
|
|
74
|
+
);
|
|
75
|
+
process.exit(1);
|
|
76
|
+
}
|
|
77
|
+
|
|
53
78
|
const rawTokens = process.env.TELEGRAM_BOT_TOKENS ?? "";
|
|
54
79
|
const secret = process.env.TELEGRAM_WEBHOOK_SECRET ?? "";
|
|
55
80
|
if (!rawTokens.trim()) {
|
|
@@ -61,7 +86,7 @@ export async function run(argv) {
|
|
|
61
86
|
process.exit(1);
|
|
62
87
|
}
|
|
63
88
|
|
|
64
|
-
const baseUrl =
|
|
89
|
+
const baseUrl = siteUrl.replace(/\/+$/, "");
|
|
65
90
|
const tokens = rawTokens
|
|
66
91
|
.split(",")
|
|
67
92
|
.map((entry) => entry.trim())
|
package/bin/jant.js
CHANGED
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
import { readdir } from "node:fs/promises";
|
|
4
4
|
import { fileURLToPath } from "node:url";
|
|
5
|
-
import { dirname, join,
|
|
5
|
+
import { dirname, join, relative } from "node:path";
|
|
6
|
+
import { PUBLIC_COMMAND_GROUPS } from "./lib/command-registry.js";
|
|
6
7
|
|
|
7
8
|
const __dirname = dirname(fileURLToPath(import.meta.url));
|
|
8
9
|
const commandsDir = join(__dirname, "commands");
|
|
@@ -32,15 +33,19 @@ async function listCommands() {
|
|
|
32
33
|
return commands;
|
|
33
34
|
}
|
|
34
35
|
|
|
35
|
-
|
|
36
|
-
const
|
|
36
|
+
function showHelp() {
|
|
37
|
+
const width = Math.max(
|
|
38
|
+
...PUBLIC_COMMAND_GROUPS.flatMap((group) =>
|
|
39
|
+
group.commands.map((command) => command.name.length),
|
|
40
|
+
),
|
|
41
|
+
);
|
|
37
42
|
console.log("Usage: jant <command> [options]");
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
43
|
+
for (const group of PUBLIC_COMMAND_GROUPS) {
|
|
44
|
+
console.log("");
|
|
45
|
+
console.log(`${group.title}:`);
|
|
46
|
+
for (const command of group.commands) {
|
|
47
|
+
console.log(` ${command.name.padEnd(width)} ${command.summary}`);
|
|
48
|
+
}
|
|
44
49
|
}
|
|
45
50
|
console.log("");
|
|
46
51
|
console.log("Run 'jant <command> --help' for command-specific help.");
|
|
@@ -49,7 +54,7 @@ async function showHelp() {
|
|
|
49
54
|
const argv = process.argv.slice(2);
|
|
50
55
|
const commandStart = argv.findIndex((arg) => !arg.startsWith("-"));
|
|
51
56
|
if (commandStart === -1) {
|
|
52
|
-
|
|
57
|
+
showHelp();
|
|
53
58
|
process.exit(0);
|
|
54
59
|
}
|
|
55
60
|
|
|
@@ -80,7 +85,7 @@ for (let length = positionalTail.length; length >= 1; length -= 1) {
|
|
|
80
85
|
if (!matched) {
|
|
81
86
|
console.error(`Unknown command: ${positionalTail[0]}`);
|
|
82
87
|
console.error("");
|
|
83
|
-
|
|
88
|
+
showHelp();
|
|
84
89
|
process.exit(1);
|
|
85
90
|
}
|
|
86
91
|
|
|
@@ -0,0 +1,120 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Every `jant` command, classified.
|
|
3
|
+
*
|
|
4
|
+
* Public commands are part of Jant's compatibility promise: their names,
|
|
5
|
+
* options, and behavior change only in a major release, and `docs/cli.md`
|
|
6
|
+
* documents each one. Internal commands are build and operations tooling for
|
|
7
|
+
* the Jant repository and the hosted service. They still run, but help leaves
|
|
8
|
+
* them out and they can change in any release.
|
|
9
|
+
*
|
|
10
|
+
* `src/__tests__/cli-commands.test.ts` fails when a file under
|
|
11
|
+
* `bin/commands/` is in neither list, so a new command has to be classified
|
|
12
|
+
* before it ships.
|
|
13
|
+
*/
|
|
14
|
+
|
|
15
|
+
/**
|
|
16
|
+
* @typedef {object} PublicCommand
|
|
17
|
+
* @property {string} name Space-separated command path, e.g. `site export`
|
|
18
|
+
* @property {string} summary One-line description shown by `jant --help`
|
|
19
|
+
*/
|
|
20
|
+
|
|
21
|
+
/**
|
|
22
|
+
* @typedef {object} PublicCommandGroup
|
|
23
|
+
* @property {string} title Group heading shown by `jant --help`
|
|
24
|
+
* @property {PublicCommand[]} commands Commands in display order
|
|
25
|
+
*/
|
|
26
|
+
|
|
27
|
+
/** @type {PublicCommandGroup[]} */
|
|
28
|
+
export const PUBLIC_COMMAND_GROUPS = [
|
|
29
|
+
{
|
|
30
|
+
title: "Set up and run",
|
|
31
|
+
commands: [
|
|
32
|
+
{
|
|
33
|
+
name: "setup",
|
|
34
|
+
summary: "Create the owner account and site without a browser",
|
|
35
|
+
},
|
|
36
|
+
{ name: "start", summary: "Start the Node.js server" },
|
|
37
|
+
{
|
|
38
|
+
name: "migrate",
|
|
39
|
+
summary: "Apply database migrations and data backfills",
|
|
40
|
+
},
|
|
41
|
+
{
|
|
42
|
+
name: "deploy",
|
|
43
|
+
summary: "Apply remote migrations and deploy to Cloudflare Workers",
|
|
44
|
+
},
|
|
45
|
+
{
|
|
46
|
+
name: "reset-password",
|
|
47
|
+
summary: "Generate a password reset token",
|
|
48
|
+
},
|
|
49
|
+
],
|
|
50
|
+
},
|
|
51
|
+
{
|
|
52
|
+
title: "Move and back up content",
|
|
53
|
+
commands: [
|
|
54
|
+
{
|
|
55
|
+
name: "site export",
|
|
56
|
+
summary: "Export a site as a Hugo site, as a ZIP or a directory",
|
|
57
|
+
},
|
|
58
|
+
{ name: "site import", summary: "Import a Hugo site export into a site" },
|
|
59
|
+
{
|
|
60
|
+
name: "site pull-media",
|
|
61
|
+
summary: "Download the media a site export refers to",
|
|
62
|
+
},
|
|
63
|
+
{
|
|
64
|
+
name: "site snapshot export",
|
|
65
|
+
summary: "Export a snapshot that keeps IDs, storage keys, and files",
|
|
66
|
+
},
|
|
67
|
+
{
|
|
68
|
+
name: "site snapshot import",
|
|
69
|
+
summary: "Restore a snapshot into a site",
|
|
70
|
+
},
|
|
71
|
+
{ name: "db export", summary: "Export the database to a SQL file" },
|
|
72
|
+
],
|
|
73
|
+
},
|
|
74
|
+
{
|
|
75
|
+
title: "Maintenance",
|
|
76
|
+
commands: [
|
|
77
|
+
{ name: "search reindex", summary: "Rebuild the search index" },
|
|
78
|
+
{
|
|
79
|
+
name: "posts rebuild-html",
|
|
80
|
+
summary: "Rebuild stored post HTML at the current format",
|
|
81
|
+
},
|
|
82
|
+
{
|
|
83
|
+
name: "uploads cleanup",
|
|
84
|
+
summary: "Clear expired uploads and purge deleted media",
|
|
85
|
+
},
|
|
86
|
+
{
|
|
87
|
+
name: "telegram register-webhooks",
|
|
88
|
+
summary: "Register the webhooks of the Telegram bots",
|
|
89
|
+
},
|
|
90
|
+
],
|
|
91
|
+
},
|
|
92
|
+
];
|
|
93
|
+
|
|
94
|
+
/**
|
|
95
|
+
* Build and operations tooling, left out of help and out of the
|
|
96
|
+
* compatibility promise.
|
|
97
|
+
*
|
|
98
|
+
* @type {string[]}
|
|
99
|
+
*/
|
|
100
|
+
export const INTERNAL_COMMANDS = [
|
|
101
|
+
"assets prepare",
|
|
102
|
+
"assets upload",
|
|
103
|
+
"db execute-file",
|
|
104
|
+
"db rehearse",
|
|
105
|
+
];
|
|
106
|
+
|
|
107
|
+
/**
|
|
108
|
+
* Names of all public commands, in display order.
|
|
109
|
+
*
|
|
110
|
+
* @returns {string[]} Space-separated command paths
|
|
111
|
+
* @example
|
|
112
|
+
* ```js
|
|
113
|
+
* listPublicCommandNames(); // ["setup", "start", …, "telegram register-webhooks"]
|
|
114
|
+
* ```
|
|
115
|
+
*/
|
|
116
|
+
export function listPublicCommandNames() {
|
|
117
|
+
return PUBLIC_COMMAND_GROUPS.flatMap((group) =>
|
|
118
|
+
group.commands.map((command) => command.name),
|
|
119
|
+
);
|
|
120
|
+
}
|
package/bin/lib/d1-query.js
CHANGED
|
@@ -1,9 +1,23 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
|
|
2
|
+
import { tmpdir } from "node:os";
|
|
3
|
+
import { join } from "node:path";
|
|
4
|
+
import { WRANGLER_MAX_BUFFER, runLocalWrangler } from "./wrangler-cli.js";
|
|
2
5
|
import { extractWranglerJson } from "./wrangler-json.js";
|
|
3
6
|
|
|
4
7
|
const DEFAULT_RETRY_ATTEMPTS = 4;
|
|
5
8
|
const DEFAULT_RETRY_DELAY_MS = 500;
|
|
6
9
|
|
|
10
|
+
/**
|
|
11
|
+
* Byte ceiling for a statement batch sent as one `--command=` argument.
|
|
12
|
+
*
|
|
13
|
+
* Linux caps a single argv entry at 128 KiB (`MAX_ARG_STRLEN`) and fails the
|
|
14
|
+
* spawn with `E2BIG`; macOS has no per-argument cap, so an oversized batch
|
|
15
|
+
* works on a developer's Mac and dies in CI and in the demo rebuild, which is
|
|
16
|
+
* exactly how it first surfaced — a snapshot import whose `db.sql` had grown
|
|
17
|
+
* past the limit. Anything at or above this goes through `--file` instead.
|
|
18
|
+
*/
|
|
19
|
+
const MAX_INLINE_COMMAND_BYTES = 96 * 1024;
|
|
20
|
+
|
|
7
21
|
function getD1Flag(runtime) {
|
|
8
22
|
return runtime === "d1-remote" ? "--remote" : "--local";
|
|
9
23
|
}
|
|
@@ -62,6 +76,46 @@ function sleepSync(ms) {
|
|
|
62
76
|
Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
|
|
63
77
|
}
|
|
64
78
|
|
|
79
|
+
const WRANGLER_OUTPUT_EXCERPT_LENGTH = 2000;
|
|
80
|
+
|
|
81
|
+
/**
|
|
82
|
+
* Rows per read when dumping a D1 table: small enough that a page of long
|
|
83
|
+
* posts stays well inside {@link WRANGLER_MAX_BUFFER}.
|
|
84
|
+
*/
|
|
85
|
+
export const D1_DUMP_PAGE_SIZE = 200;
|
|
86
|
+
|
|
87
|
+
/**
|
|
88
|
+
* Say why a Wrangler call failed without echoing its whole output: on a
|
|
89
|
+
* failed `d1 execute` that output can be a site's rows, hundreds of KB of it.
|
|
90
|
+
*
|
|
91
|
+
* @param {string[]} args - The Wrangler arguments
|
|
92
|
+
* @param {Error & { code?: string, stdout?: string, stderr?: string }} error
|
|
93
|
+
* @returns {string} A message naming the command and the cause
|
|
94
|
+
* @example
|
|
95
|
+
* describeWranglerFailure(["d1", "execute", "DB"], enobufsError);
|
|
96
|
+
* // "`wrangler d1 execute DB` printed more than 67108864 bytes, …"
|
|
97
|
+
*/
|
|
98
|
+
export function describeWranglerFailure(args, error) {
|
|
99
|
+
const command = `wrangler ${args.slice(0, 3).join(" ")}`;
|
|
100
|
+
if (error?.code === "ENOBUFS") {
|
|
101
|
+
return `\`${command}\` printed more than ${WRANGLER_MAX_BUFFER} bytes, the most the CLI buffers.`;
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
const stderr = String(error?.stderr ?? "").trim();
|
|
105
|
+
if (stderr) return `\`${command}\` failed: ${stderr}`;
|
|
106
|
+
|
|
107
|
+
const stdout = String(error?.stdout ?? "").trim();
|
|
108
|
+
if (stdout) {
|
|
109
|
+
const excerpt =
|
|
110
|
+
stdout.length > WRANGLER_OUTPUT_EXCERPT_LENGTH
|
|
111
|
+
? `${stdout.slice(0, WRANGLER_OUTPUT_EXCERPT_LENGTH)}… (${stdout.length} characters)`
|
|
112
|
+
: stdout;
|
|
113
|
+
return `\`${command}\` failed: ${excerpt}`;
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
return `\`${command}\` failed: ${error?.message ?? "unknown error"}`;
|
|
117
|
+
}
|
|
118
|
+
|
|
65
119
|
export function isRetryableWranglerD1Failure(output, error) {
|
|
66
120
|
const combined = `${output ?? ""}\n${error?.message ?? ""}`.toLowerCase();
|
|
67
121
|
return [
|
|
@@ -123,12 +177,43 @@ function runWrangler(args, options = {}) {
|
|
|
123
177
|
throw new Error(`Wrangler error: ${wranglerError}`);
|
|
124
178
|
}
|
|
125
179
|
|
|
126
|
-
throw new Error(
|
|
180
|
+
throw new Error(describeWranglerFailure(args, error), { cause: error });
|
|
127
181
|
}
|
|
128
182
|
}
|
|
129
183
|
}
|
|
130
184
|
|
|
185
|
+
/**
|
|
186
|
+
* Whether a statement batch is too large to travel as one CLI argument.
|
|
187
|
+
*
|
|
188
|
+
* @param {string} sql - SQL batch about to be sent to Wrangler
|
|
189
|
+
* @returns {boolean} true when it has to go through a file instead
|
|
190
|
+
* @example
|
|
191
|
+
* ```js
|
|
192
|
+
* exceedsInlineCommandLimit("SELECT 1;"); // false
|
|
193
|
+
* ```
|
|
194
|
+
*/
|
|
195
|
+
export function exceedsInlineCommandLimit(sql) {
|
|
196
|
+
return Buffer.byteLength(sql, "utf8") >= MAX_INLINE_COMMAND_BYTES;
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
function withTemporarySqlFile(sql, run) {
|
|
200
|
+
const directory = mkdtempSync(join(tmpdir(), "jant-d1-"));
|
|
201
|
+
try {
|
|
202
|
+
const filePath = join(directory, "batch.sql");
|
|
203
|
+
writeFileSync(filePath, sql);
|
|
204
|
+
return run(filePath);
|
|
205
|
+
} finally {
|
|
206
|
+
rmSync(directory, { recursive: true, force: true });
|
|
207
|
+
}
|
|
208
|
+
}
|
|
209
|
+
|
|
131
210
|
export function executeD1(sql, runtime, options = {}) {
|
|
211
|
+
if (exceedsInlineCommandLimit(sql)) {
|
|
212
|
+
return withTemporarySqlFile(sql, (filePath) =>
|
|
213
|
+
executeD1File(filePath, runtime, options),
|
|
214
|
+
);
|
|
215
|
+
}
|
|
216
|
+
|
|
132
217
|
const args = appendWranglerContext(
|
|
133
218
|
[
|
|
134
219
|
"d1",
|
package/bin/lib/hugo-markdown.js
CHANGED
|
@@ -20,6 +20,7 @@ const FRONT_MATTER_KEY_ORDER = [
|
|
|
20
20
|
"type",
|
|
21
21
|
"draft",
|
|
22
22
|
"aliases",
|
|
23
|
+
"feed_id",
|
|
23
24
|
"build",
|
|
24
25
|
|
|
25
26
|
// Post payload
|
|
@@ -27,12 +28,15 @@ const FRONT_MATTER_KEY_ORDER = [
|
|
|
27
28
|
"status",
|
|
28
29
|
"visibility",
|
|
29
30
|
"summary_text",
|
|
31
|
+
"truncated",
|
|
30
32
|
"link_url",
|
|
31
33
|
"source_name",
|
|
32
34
|
"source_url",
|
|
33
35
|
"quote_text",
|
|
34
36
|
"rating",
|
|
35
37
|
"featured_at",
|
|
38
|
+
"featured_post_ids",
|
|
39
|
+
"featured_sort_at",
|
|
36
40
|
"pinned_at",
|
|
37
41
|
|
|
38
42
|
// Bookkeeping / attachments
|
|
@@ -19,6 +19,25 @@ export function resolveBundledBackfillsDir(moduleUrl = import.meta.url) {
|
|
|
19
19
|
return join(resolveBundledDbDir(moduleUrl), "backfills");
|
|
20
20
|
}
|
|
21
21
|
|
|
22
|
+
/**
|
|
23
|
+
* Directory of the schema migrations this package ships for a dialect.
|
|
24
|
+
*
|
|
25
|
+
* @param {"sqlite" | "pg"} dialect SQLite (D1 and Node) or Postgres
|
|
26
|
+
* @param {string} [moduleUrl] Module URL the package root is resolved from
|
|
27
|
+
* @returns {string} Absolute path of the migrations directory
|
|
28
|
+
* @example
|
|
29
|
+
* ```js
|
|
30
|
+
* resolveBundledSchemaMigrationsDir("pg"); // ".../src/db/migrations/pg"
|
|
31
|
+
* ```
|
|
32
|
+
*/
|
|
33
|
+
export function resolveBundledSchemaMigrationsDir(
|
|
34
|
+
dialect,
|
|
35
|
+
moduleUrl = import.meta.url,
|
|
36
|
+
) {
|
|
37
|
+
const dir = join(resolveBundledDbDir(moduleUrl), "migrations");
|
|
38
|
+
return dialect === "pg" ? join(dir, "pg") : dir;
|
|
39
|
+
}
|
|
40
|
+
|
|
22
41
|
export function extractNumberPrefix(name) {
|
|
23
42
|
const match = String(name).match(/^(\d+)/);
|
|
24
43
|
return match ? match[1] : null;
|