@jant/core 0.7.1 → 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/site/export.js +48 -36
- package/bin/commands/site/import.js +3074 -2
- package/bin/commands/site/snapshot/import.js +2 -0
- 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/migration-artifacts.js +19 -0
- package/bin/lib/renamed-arguments.js +56 -0
- package/bin/lib/site-snapshot.js +83 -1
- package/dist/{app-ZcaI1kPN.js → app-CFsmRVJN.js} +7916 -499
- package/dist/client/.vite/manifest.json +3 -3
- package/dist/client/_assets/{client-DAhoqPdr.css → client-BCumu1-D.css} +1 -1
- package/dist/client/_assets/{client-knSEyUJO.js → client-DTLBOHqD.js} +1 -1
- package/dist/client/_assets/{client-auth-CAMfTrKW.js → client-auth-D6Ix6SmE.js} +1 -1
- package/dist/index.js +2 -3
- package/dist/node.js +2 -3
- package/dist/url-CKlGzvdN.js +428 -0
- package/package.json +1 -5
- package/src/__tests__/cli-commands.test.ts +144 -0
- package/src/__tests__/config-docs.test.ts +148 -0
- package/src/__tests__/export-import-roundtrip.test.ts +1 -1
- 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/site-export-import.ts +97 -0
- package/src/__tests__/import-site-command.test.ts +27 -1
- package/src/__tests__/release-fixtures.test.ts +132 -0
- package/src/__tests__/site-export-canonical-import.test.ts +11 -47
- package/src/__tests__/theme-docs.test.ts +109 -0
- package/src/app.tsx +1 -5
- 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/index.ts +6 -77
- package/src/lib/__tests__/view.test.ts +0 -46
- package/src/lib/feed.ts +0 -6
- package/src/lib/view.ts +0 -27
- package/src/node/__tests__/cli-export.test.ts +2 -2
- package/src/node/__tests__/cli-site-snapshot.test.ts +6 -0
- package/src/node/__tests__/cli-site-token-env.test.ts +4 -1
- package/src/node/__tests__/cli-snapshot-meta.test.ts +64 -0
- package/src/routes/api/internal/search-reindex.ts +1 -1
- package/src/services/__tests__/media.test.ts +0 -271
- package/src/services/export.ts +13 -5
- package/src/services/media.ts +1 -219
- package/src/styles/ui.css +0 -118
- package/bin/commands/export.js +0 -120
- package/bin/commands/import-site.js +0 -3034
- package/bin/commands/migrate-text-attachments.js +0 -181
- package/dist/github-sync-Gw4orAHk.js +0 -8398
- package/src/client/multipart-upload.ts +0 -206
- 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
package/src/services/export.ts
CHANGED
|
@@ -106,14 +106,22 @@ import {
|
|
|
106
106
|
type SystemNavKey,
|
|
107
107
|
} from "../types.js";
|
|
108
108
|
|
|
109
|
+
/**
|
|
110
|
+
* Format version written to `data/jant.toml` as `version`. Raise it when an
|
|
111
|
+
* export changes in a way an older `jant site import` would misread; the
|
|
112
|
+
* importer refuses a version newer than its `SUPPORTED_SITE_EXPORT_VERSION`,
|
|
113
|
+
* which a test keeps equal to this.
|
|
114
|
+
*/
|
|
115
|
+
export const SITE_EXPORT_FORMAT_VERSION = 1;
|
|
116
|
+
|
|
109
117
|
/** A file of the exported Hugo site whose text or bytes the export holds. */
|
|
110
118
|
export interface ExportContentFile {
|
|
111
119
|
path: string;
|
|
112
120
|
content: string | Uint8Array;
|
|
113
121
|
/**
|
|
114
122
|
* Scaffolding the destination owns once it exists. A fresh export always
|
|
115
|
-
* carries it — the ZIP is a new tree, and `site export
|
|
116
|
-
*
|
|
123
|
+
* carries it — the ZIP is a new tree, and `site export` refuses a non-empty
|
|
124
|
+
* output directory — but GitHub Sync writes it only when the
|
|
117
125
|
* repository does not have it yet, so an edit there survives every later
|
|
118
126
|
* push. Deploy config is the case that needs this: the Worker name has to
|
|
119
127
|
* be corrected by hand when it does not match the Worker already serving
|
|
@@ -1927,7 +1935,7 @@ function buildJantDataToml(
|
|
|
1927
1935
|
: "";
|
|
1928
1936
|
const parts: string[] = [
|
|
1929
1937
|
'format = "jant-site"',
|
|
1930
|
-
|
|
1938
|
+
`version = ${SITE_EXPORT_FORMAT_VERSION}`,
|
|
1931
1939
|
`generated_at = "${escapeTomlString(toISOString(Math.floor(Date.now() / 1000)))}"`,
|
|
1932
1940
|
`site_name = "${escapeTomlString(config.siteName)}"`,
|
|
1933
1941
|
`site_description = "${escapeTomlString(config.siteDescription)}"`,
|
|
@@ -2127,7 +2135,7 @@ function toWorkerName(raw: string): string {
|
|
|
2127
2135
|
* repository-import flow names a new Worker after the repository — so the
|
|
2128
2136
|
* repository name is the one value that lines up without the user editing
|
|
2129
2137
|
* anything. An export with no repository behind it (a ZIP, or
|
|
2130
|
-
* `site export
|
|
2138
|
+
* `site export` into a directory) uses the repository name the GitHub Sync
|
|
2131
2139
|
* settings page prefills for this site, so pushing the export to a repository
|
|
2132
2140
|
* created with that default still matches.
|
|
2133
2141
|
*
|
|
@@ -2512,7 +2520,7 @@ static/ — Copy files here to add them to the published site$
|
|
|
2512
2520
|
- **Jant metadata** — \`data/jant.toml\` drives nav and the collections directory, and is preserved across round-trip import.
|
|
2513
2521
|
- **Styles** — edit \`themes/jant/static/main.css\`, or drop a \`static/main.css\` at the site root to override.
|
|
2514
2522
|
- **Templates** — add files under \`layouts/\` at the site root to override the bundled theme.
|
|
2515
|
-
- **Debugging** — from a Jant site project, run \`npx jant site export --
|
|
2523
|
+
- **Debugging** — from a Jant site project, run \`npx jant site export --url <site-url> --output ./my-site\`, then \`cd my-site && hugo serve\`.
|
|
2516
2524
|
|
|
2517
2525
|
## Fetching media locally
|
|
2518
2526
|
|
package/src/services/media.ts
CHANGED
|
@@ -4,18 +4,7 @@
|
|
|
4
4
|
* Handles media upload and management with pluggable storage backends.
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import {
|
|
8
|
-
eq,
|
|
9
|
-
desc,
|
|
10
|
-
inArray,
|
|
11
|
-
asc,
|
|
12
|
-
sql,
|
|
13
|
-
and,
|
|
14
|
-
or,
|
|
15
|
-
isNull,
|
|
16
|
-
lt,
|
|
17
|
-
lte,
|
|
18
|
-
} from "drizzle-orm";
|
|
7
|
+
import { eq, desc, inArray, asc, sql, and, isNull, lt, lte } from "drizzle-orm";
|
|
19
8
|
import { generateKeyBetween } from "fractional-indexing";
|
|
20
9
|
import {
|
|
21
10
|
batchQueryRows,
|
|
@@ -33,7 +22,6 @@ import { extractBodyText } from "../lib/summary.js";
|
|
|
33
22
|
import { now } from "../lib/time.js";
|
|
34
23
|
import { supportsCopy, type StorageDriver } from "../lib/storage.js";
|
|
35
24
|
import { renderTiptapJson } from "../lib/tiptap-render.js";
|
|
36
|
-
import { tiptapJsonToMarkdown } from "../lib/tiptap-to-markdown.js";
|
|
37
25
|
import {
|
|
38
26
|
generateStorageKey,
|
|
39
27
|
imageExtensionForMimeType,
|
|
@@ -127,25 +115,6 @@ const TEXT_ATTACHMENT_FILENAME = "attached-text.md";
|
|
|
127
115
|
*/
|
|
128
116
|
const TEXT_ATTACHMENT_CACHE_CONTROL = "public, max-age=31536000, immutable";
|
|
129
117
|
|
|
130
|
-
/**
|
|
131
|
-
* MIME types that identify legacy text-attachment storage layouts, still used
|
|
132
|
-
* by the migration path to find rows that need converting to the current
|
|
133
|
-
* markdown-only format.
|
|
134
|
-
*
|
|
135
|
-
* - `text/x-tiptap+json` → single-envelope era (`{ json, html }` JSON blob).
|
|
136
|
-
* - `text/html; charset=utf-8` → split-sibling era (`.html` primary +
|
|
137
|
-
* `.json` sibling at `storageKey.replace(/\.html$/, ".json")`).
|
|
138
|
-
*/
|
|
139
|
-
const LEGACY_TEXT_ATTACHMENT_ENVELOPE_MIME_TYPE = "text/x-tiptap+json";
|
|
140
|
-
const LEGACY_TEXT_ATTACHMENT_SPLIT_MIME_TYPE = "text/html; charset=utf-8";
|
|
141
|
-
|
|
142
|
-
/**
|
|
143
|
-
* Default maximum number of legacy records processed per migration call.
|
|
144
|
-
* Keeps a single invocation bounded so callers can drive progress in batches.
|
|
145
|
-
*/
|
|
146
|
-
const TEXT_ATTACHMENT_MIGRATION_DEFAULT_LIMIT = 50;
|
|
147
|
-
const TEXT_ATTACHMENT_MIGRATION_MAX_LIMIT = 500;
|
|
148
|
-
|
|
149
118
|
/**
|
|
150
119
|
* Returns true if the given media record is a Jant-composed text attachment
|
|
151
120
|
* stored as markdown (the current format). Plain text-file uploads (`.md`,
|
|
@@ -333,27 +302,6 @@ export interface MediaService {
|
|
|
333
302
|
attachToPost(postId: string, mediaIds: string[]): Promise<void>;
|
|
334
303
|
detachFromPost(postId: string): Promise<void>;
|
|
335
304
|
updateAlt(id: string, alt: string): Promise<void>;
|
|
336
|
-
/**
|
|
337
|
-
* One-off maintenance operation that converts legacy text-attachment rows
|
|
338
|
-
* to the current markdown-only format. Handles both prior storage layouts:
|
|
339
|
-
*
|
|
340
|
-
* - Envelope era (`text/x-tiptap+json` MIME, single JSON with `json` + `html`).
|
|
341
|
-
* - Split era (`text/html; charset=utf-8` MIME with a `.json` sibling).
|
|
342
|
-
*
|
|
343
|
-
* Rows with `text/markdown; charset=utf-8` are already current and ignored.
|
|
344
|
-
* Safe to re-run. Processes in batches; pass `limit` to control batch size.
|
|
345
|
-
* Returns a summary so callers can loop until `remaining === 0`.
|
|
346
|
-
*/
|
|
347
|
-
migrateLegacyTextAttachments(deps: {
|
|
348
|
-
storage: StorageDriver;
|
|
349
|
-
storageDriver: string;
|
|
350
|
-
limit?: number;
|
|
351
|
-
}): Promise<{
|
|
352
|
-
migrated: number;
|
|
353
|
-
failed: number;
|
|
354
|
-
remaining: number;
|
|
355
|
-
errors: Array<{ mediaId: string; message: string }>;
|
|
356
|
-
}>;
|
|
357
305
|
}
|
|
358
306
|
|
|
359
307
|
export interface CreateMediaData {
|
|
@@ -523,112 +471,6 @@ export function createMediaService(
|
|
|
523
471
|
};
|
|
524
472
|
}
|
|
525
473
|
|
|
526
|
-
/**
|
|
527
|
-
* Migrate a single legacy text-attachment row to the current markdown-only
|
|
528
|
-
* format. Handles both historical shapes in one place so callers don't
|
|
529
|
-
* have to branch:
|
|
530
|
-
*
|
|
531
|
-
* - Envelope era (`text/x-tiptap+json`): single object with
|
|
532
|
-
* `{ json, html }`. Extract the Tiptap AST, convert to markdown.
|
|
533
|
-
* - Split era (`text/html; charset=utf-8`): two sibling objects; the
|
|
534
|
-
* `.json` sibling holds the AST. Read it, convert to markdown, delete
|
|
535
|
-
* both old objects.
|
|
536
|
-
*/
|
|
537
|
-
async function migrateLegacyTextAttachmentRow(
|
|
538
|
-
row: typeof media.$inferSelect,
|
|
539
|
-
storage: StorageDriver,
|
|
540
|
-
storageDriver: string,
|
|
541
|
-
): Promise<void> {
|
|
542
|
-
const provider = ensureStorageProvider(row.provider, Error);
|
|
543
|
-
const expectedProvider = ensureStorageProvider(storageDriver, Error);
|
|
544
|
-
if (provider !== expectedProvider) {
|
|
545
|
-
throw new Error(
|
|
546
|
-
`Row ${row.id} lives on provider "${provider}" but migration was called with driver "${expectedProvider}"`,
|
|
547
|
-
);
|
|
548
|
-
}
|
|
549
|
-
|
|
550
|
-
const oldKeys: string[] = [row.storageKey];
|
|
551
|
-
let markdown: string;
|
|
552
|
-
|
|
553
|
-
if (row.mimeType === LEGACY_TEXT_ATTACHMENT_ENVELOPE_MIME_TYPE) {
|
|
554
|
-
const object = await storage.get(row.storageKey);
|
|
555
|
-
if (!object) {
|
|
556
|
-
throw new Error(
|
|
557
|
-
`Legacy envelope object missing from storage at ${row.storageKey}`,
|
|
558
|
-
);
|
|
559
|
-
}
|
|
560
|
-
const raw = await new Response(object.body).text();
|
|
561
|
-
const envelope = JSON.parse(raw) as { json?: unknown };
|
|
562
|
-
if (!envelope.json) {
|
|
563
|
-
throw new Error(
|
|
564
|
-
`Envelope at ${row.storageKey} is missing expected json field`,
|
|
565
|
-
);
|
|
566
|
-
}
|
|
567
|
-
markdown = tiptapJsonToMarkdown(JSON.stringify(envelope.json));
|
|
568
|
-
} else if (row.mimeType === LEGACY_TEXT_ATTACHMENT_SPLIT_MIME_TYPE) {
|
|
569
|
-
const jsonKey = row.storageKey.replace(/\.html$/, ".json");
|
|
570
|
-
if (jsonKey === row.storageKey) {
|
|
571
|
-
throw new Error(
|
|
572
|
-
`Split-format row ${row.id} storageKey "${row.storageKey}" does not end in .html; cannot derive JSON sibling`,
|
|
573
|
-
);
|
|
574
|
-
}
|
|
575
|
-
const object = await storage.get(jsonKey);
|
|
576
|
-
if (!object) {
|
|
577
|
-
throw new Error(
|
|
578
|
-
`JSON sibling missing from storage at ${jsonKey} for split-format row ${row.id}`,
|
|
579
|
-
);
|
|
580
|
-
}
|
|
581
|
-
const raw = await new Response(object.body).text();
|
|
582
|
-
markdown = tiptapJsonToMarkdown(raw);
|
|
583
|
-
oldKeys.push(jsonKey);
|
|
584
|
-
} else {
|
|
585
|
-
throw new Error(
|
|
586
|
-
`Row ${row.id} has unrecognized legacy mimeType "${row.mimeType}"`,
|
|
587
|
-
);
|
|
588
|
-
}
|
|
589
|
-
|
|
590
|
-
const mdBytes = new TextEncoder().encode(markdown);
|
|
591
|
-
|
|
592
|
-
// Compute the new storage key by swapping extension on the old one.
|
|
593
|
-
// Reusing the path prefix keeps objects grouped by site under the same
|
|
594
|
-
// prefix, which matters for storage backends that scan by prefix.
|
|
595
|
-
const baseKey = row.storageKey.replace(/\.[^.]+$/, "");
|
|
596
|
-
const mdKey = `${baseKey}.md`;
|
|
597
|
-
|
|
598
|
-
await storage.put(mdKey, mdBytes, {
|
|
599
|
-
contentType: TEXT_ATTACHMENT_MARKDOWN_MIME_TYPE,
|
|
600
|
-
contentDisposition: TEXT_ATTACHMENT_CONTENT_DISPOSITION,
|
|
601
|
-
cacheControl: TEXT_ATTACHMENT_CACHE_CONTROL,
|
|
602
|
-
});
|
|
603
|
-
|
|
604
|
-
// Filename tracks the storageKey's trailing segment so downstream code
|
|
605
|
-
// that inspects `media.filename` stays consistent with the object layout.
|
|
606
|
-
const newFilename = mdKey.split("/").pop() ?? row.filename;
|
|
607
|
-
|
|
608
|
-
await db
|
|
609
|
-
.update(media)
|
|
610
|
-
.set({
|
|
611
|
-
storageKey: mdKey,
|
|
612
|
-
filename: newFilename,
|
|
613
|
-
originalName: TEXT_ATTACHMENT_FILENAME,
|
|
614
|
-
mimeType: TEXT_ATTACHMENT_MARKDOWN_MIME_TYPE,
|
|
615
|
-
size: mdBytes.byteLength,
|
|
616
|
-
updatedAt: now(),
|
|
617
|
-
})
|
|
618
|
-
.where(and(eq(media.siteId, siteId), eq(media.id, row.id)));
|
|
619
|
-
|
|
620
|
-
// Remove the old objects after the DB row has migrated. Best-effort —
|
|
621
|
-
// if delete fails, we leak the object but readers have already moved
|
|
622
|
-
// on to the new key.
|
|
623
|
-
for (const key of oldKeys) {
|
|
624
|
-
if (key === mdKey) continue;
|
|
625
|
-
await storage.delete(key).catch((err) => {
|
|
626
|
-
// eslint-disable-next-line no-console -- Visibility helps operators spot stuck garbage
|
|
627
|
-
console.error(`Failed to delete legacy object ${key}:`, err);
|
|
628
|
-
});
|
|
629
|
-
}
|
|
630
|
-
}
|
|
631
|
-
|
|
632
474
|
async function assertCanWriteBytes(additionalBytes: number): Promise<void> {
|
|
633
475
|
if (!Number.isFinite(additionalBytes) || additionalBytes < 0) {
|
|
634
476
|
throw new ValidationError(
|
|
@@ -1109,66 +951,6 @@ export function createMediaService(
|
|
|
1109
951
|
.where(and(eq(media.siteId, siteId), eq(media.id, id)));
|
|
1110
952
|
},
|
|
1111
953
|
|
|
1112
|
-
async migrateLegacyTextAttachments(deps) {
|
|
1113
|
-
const limit = Math.min(
|
|
1114
|
-
Math.max(deps.limit ?? TEXT_ATTACHMENT_MIGRATION_DEFAULT_LIMIT, 1),
|
|
1115
|
-
TEXT_ATTACHMENT_MIGRATION_MAX_LIMIT,
|
|
1116
|
-
);
|
|
1117
|
-
|
|
1118
|
-
// Select rows that carry either legacy mimeType. The current
|
|
1119
|
-
// markdown-only rows (`text/markdown; charset=utf-8`) are excluded
|
|
1120
|
-
// automatically because neither `eq` branch matches, making the
|
|
1121
|
-
// migration idempotent by construction.
|
|
1122
|
-
const legacyRows = await db
|
|
1123
|
-
.select()
|
|
1124
|
-
.from(media)
|
|
1125
|
-
.where(
|
|
1126
|
-
and(
|
|
1127
|
-
eq(media.siteId, siteId),
|
|
1128
|
-
eq(media.mediaKind, "text"),
|
|
1129
|
-
or(
|
|
1130
|
-
eq(media.mimeType, LEGACY_TEXT_ATTACHMENT_ENVELOPE_MIME_TYPE),
|
|
1131
|
-
eq(media.mimeType, LEGACY_TEXT_ATTACHMENT_SPLIT_MIME_TYPE),
|
|
1132
|
-
),
|
|
1133
|
-
),
|
|
1134
|
-
)
|
|
1135
|
-
.orderBy(asc(media.createdAt))
|
|
1136
|
-
.limit(limit + 1);
|
|
1137
|
-
|
|
1138
|
-
const toProcess = legacyRows.slice(0, limit);
|
|
1139
|
-
const remainingBeyondBatch = legacyRows.length > limit;
|
|
1140
|
-
|
|
1141
|
-
const errors: Array<{ mediaId: string; message: string }> = [];
|
|
1142
|
-
let migrated = 0;
|
|
1143
|
-
let failed = 0;
|
|
1144
|
-
|
|
1145
|
-
for (const row of toProcess) {
|
|
1146
|
-
try {
|
|
1147
|
-
await migrateLegacyTextAttachmentRow(
|
|
1148
|
-
row,
|
|
1149
|
-
deps.storage,
|
|
1150
|
-
deps.storageDriver,
|
|
1151
|
-
);
|
|
1152
|
-
migrated += 1;
|
|
1153
|
-
} catch (error) {
|
|
1154
|
-
failed += 1;
|
|
1155
|
-
errors.push({
|
|
1156
|
-
mediaId: row.id,
|
|
1157
|
-
message: error instanceof Error ? error.message : String(error),
|
|
1158
|
-
});
|
|
1159
|
-
}
|
|
1160
|
-
}
|
|
1161
|
-
|
|
1162
|
-
// If the batch was full and there was a peek row beyond it, there's
|
|
1163
|
-
// at least one more remaining. Otherwise remaining equals whatever
|
|
1164
|
-
// this call couldn't migrate (plus the peek row if any). Callers loop
|
|
1165
|
-
// until remaining === 0.
|
|
1166
|
-
const remaining =
|
|
1167
|
-
(remainingBeyondBatch ? 1 : 0) + (toProcess.length - migrated);
|
|
1168
|
-
|
|
1169
|
-
return { migrated, failed, remaining, errors };
|
|
1170
|
-
},
|
|
1171
|
-
|
|
1172
954
|
async delete(id, storage) {
|
|
1173
955
|
const record = await this.getById(id);
|
|
1174
956
|
if (!record) return false;
|
package/src/styles/ui.css
CHANGED
|
@@ -2677,124 +2677,6 @@
|
|
|
2677
2677
|
color: var(--site-footnote-marker);
|
|
2678
2678
|
}
|
|
2679
2679
|
|
|
2680
|
-
/* --- Legacy v1 sidenotes ----------------------------------------------- */
|
|
2681
|
-
|
|
2682
|
-
/* Kept for one compatibility window so imported snapshots or cached HTML
|
|
2683
|
-
from an older runtime remain readable during rollout. Product reads render
|
|
2684
|
-
stale post projections as v3 before the database rebuild runs. */
|
|
2685
|
-
|
|
2686
|
-
.sidenote:not([role="doc-footnote"]),
|
|
2687
|
-
.marginnote {
|
|
2688
|
-
/* Layout: float into the right margin. A floated note anchors to its containing
|
|
2689
|
-
block's right *content* edge, so if a theme gives that block inline-end padding
|
|
2690
|
-
(e.g. a padded blockquote card) the anchor is inset and the note drifts left.
|
|
2691
|
-
Themes expose that inset via --sidenote-anchor-inset (default 0) — best derived
|
|
2692
|
-
from the same token that sets the padding — so the note still reaches the gutter
|
|
2693
|
-
no matter how the container is indented. Core's own blocks add no inset. */
|
|
2694
|
-
float: right;
|
|
2695
|
-
clear: right;
|
|
2696
|
-
margin-right: calc(
|
|
2697
|
-
var(--layout-sidenote-margin) - var(--sidenote-anchor-inset, 0px)
|
|
2698
|
-
);
|
|
2699
|
-
width: var(--layout-sidenote-width);
|
|
2700
|
-
margin-top: 0.3rem;
|
|
2701
|
-
/* Breathing room so multiple notes from one paragraph don't touch when they stack. */
|
|
2702
|
-
margin-bottom: 1.4rem;
|
|
2703
|
-
vertical-align: baseline;
|
|
2704
|
-
position: relative;
|
|
2705
|
-
|
|
2706
|
-
/* Typographic isolation. A footnote is an annotation, not part of the text it
|
|
2707
|
-
hangs off of, so it must render identically no matter what its reference sits
|
|
2708
|
-
inside. The body span is emitted at the reference position (see tiptap-render
|
|
2709
|
-
renderSidenoteReference), so when the [^n] is inside a blockquote / bold run /
|
|
2710
|
-
heading the span inherits that context. Pin every inheritable type property to
|
|
2711
|
-
the canonical note look to cut every such leak — not just the blockquote
|
|
2712
|
-
serif+italic case. */
|
|
2713
|
-
font-family: var(--font-body);
|
|
2714
|
-
font-size: var(--type-sm);
|
|
2715
|
-
font-style: normal;
|
|
2716
|
-
font-weight: 400;
|
|
2717
|
-
font-variant: normal;
|
|
2718
|
-
line-height: 1.3;
|
|
2719
|
-
letter-spacing: var(--type-body-tracking, normal);
|
|
2720
|
-
text-align: left;
|
|
2721
|
-
color: var(--site-reading-meta);
|
|
2722
|
-
}
|
|
2723
|
-
|
|
2724
|
-
.sidenote-number {
|
|
2725
|
-
counter-increment: sidenote-counter;
|
|
2726
|
-
}
|
|
2727
|
-
|
|
2728
|
-
.sidenote-number::after,
|
|
2729
|
-
.sidenote:not([role="doc-footnote"])::before {
|
|
2730
|
-
position: relative;
|
|
2731
|
-
vertical-align: baseline;
|
|
2732
|
-
}
|
|
2733
|
-
|
|
2734
|
-
.sidenote-number::after {
|
|
2735
|
-
content: counter(sidenote-counter);
|
|
2736
|
-
font-size: var(--type-code);
|
|
2737
|
-
top: -0.5rem;
|
|
2738
|
-
/* Real margins (not `left`, which reserves no space) so the superscript
|
|
2739
|
-
number keeps a gap from the words on both sides — matters for CJK, which
|
|
2740
|
-
has no inter-word spacing. */
|
|
2741
|
-
margin-left: 0.1rem;
|
|
2742
|
-
margin-right: 0.25rem;
|
|
2743
|
-
}
|
|
2744
|
-
|
|
2745
|
-
.sidenote:not([role="doc-footnote"])::before {
|
|
2746
|
-
content: counter(sidenote-counter) " ";
|
|
2747
|
-
font-size: var(--type-xs);
|
|
2748
|
-
top: -0.5rem;
|
|
2749
|
-
}
|
|
2750
|
-
|
|
2751
|
-
.sidenote:not([role="doc-footnote"]) > code,
|
|
2752
|
-
.marginnote > code {
|
|
2753
|
-
font-size: var(--type-code);
|
|
2754
|
-
}
|
|
2755
|
-
|
|
2756
|
-
input.margin-toggle {
|
|
2757
|
-
display: none;
|
|
2758
|
-
}
|
|
2759
|
-
|
|
2760
|
-
label.sidenote-number {
|
|
2761
|
-
display: inline-block;
|
|
2762
|
-
max-height: 2rem;
|
|
2763
|
-
}
|
|
2764
|
-
|
|
2765
|
-
label.margin-toggle:not(.sidenote-number) {
|
|
2766
|
-
display: none;
|
|
2767
|
-
}
|
|
2768
|
-
|
|
2769
|
-
/* Collapse sidenotes from floated margin notes to inline tap-to-toggle at the
|
|
2770
|
-
same width the post column drops to `min(100%, 35rem)` (preset.css) and the
|
|
2771
|
-
Tufte gutter disappears — see --layout-content-width in tokens.css. Below
|
|
2772
|
-
1024px a floated `width: 50%; margin-right: -60%` note has no gutter to land
|
|
2773
|
-
in and overflows the right edge, so it must inline instead. */
|
|
2774
|
-
@media (max-width: 1024px) {
|
|
2775
|
-
label.margin-toggle:not(.sidenote-number) {
|
|
2776
|
-
display: inline;
|
|
2777
|
-
cursor: pointer;
|
|
2778
|
-
}
|
|
2779
|
-
|
|
2780
|
-
.sidenote:not([role="doc-footnote"]),
|
|
2781
|
-
.marginnote {
|
|
2782
|
-
display: none;
|
|
2783
|
-
}
|
|
2784
|
-
|
|
2785
|
-
.margin-toggle:checked + .sidenote:not([role="doc-footnote"]),
|
|
2786
|
-
.margin-toggle:checked + .marginnote {
|
|
2787
|
-
display: block;
|
|
2788
|
-
float: left;
|
|
2789
|
-
left: 1rem;
|
|
2790
|
-
clear: both;
|
|
2791
|
-
width: 95%;
|
|
2792
|
-
margin: 1rem 2.5%;
|
|
2793
|
-
vertical-align: baseline;
|
|
2794
|
-
position: relative;
|
|
2795
|
-
}
|
|
2796
|
-
}
|
|
2797
|
-
|
|
2798
2680
|
/* Link preview (video thumbnails, etc.) */
|
|
2799
2681
|
.link-preview {
|
|
2800
2682
|
display: block;
|
package/bin/commands/export.js
DELETED
|
@@ -1,120 +0,0 @@
|
|
|
1
|
-
import { writeFileSync } from "node:fs";
|
|
2
|
-
import { resolve } from "node:path";
|
|
3
|
-
import { parseArgs } from "node:util";
|
|
4
|
-
import { D1_DUMP_PAGE_SIZE, queryD1 } from "../lib/d1-query.js";
|
|
5
|
-
import { openNodeDatabase } from "../lib/node-database.js";
|
|
6
|
-
import { dumpDatabaseToSql } from "../lib/sql-export.js";
|
|
7
|
-
import {
|
|
8
|
-
bootstrapCliRuntime,
|
|
9
|
-
getCliRuntimeLabel,
|
|
10
|
-
} from "../lib/runtime-target.js";
|
|
11
|
-
|
|
12
|
-
function createD1QueryRunner(runtime) {
|
|
13
|
-
return {
|
|
14
|
-
async query(sql, options) {
|
|
15
|
-
return queryD1(sql, runtime, options);
|
|
16
|
-
},
|
|
17
|
-
};
|
|
18
|
-
}
|
|
19
|
-
|
|
20
|
-
export async function run(argv) {
|
|
21
|
-
const { values } = parseArgs({
|
|
22
|
-
args: argv,
|
|
23
|
-
options: {
|
|
24
|
-
config: { type: "string" },
|
|
25
|
-
database: { type: "string", default: "DB" },
|
|
26
|
-
env: { type: "string" },
|
|
27
|
-
local: { type: "boolean", default: false },
|
|
28
|
-
node: { type: "boolean", default: false },
|
|
29
|
-
remote: { type: "boolean", default: false },
|
|
30
|
-
output: { type: "string", short: "o", default: "jant-export.sql" },
|
|
31
|
-
help: { type: "boolean", short: "h" },
|
|
32
|
-
"persist-to": { type: "string" },
|
|
33
|
-
},
|
|
34
|
-
});
|
|
35
|
-
|
|
36
|
-
if (values.help) {
|
|
37
|
-
console.log(
|
|
38
|
-
"Usage: jant db export [--local | --remote | --node] [--output <file>] [--config <file>] [--env <name>] [--database <binding>]",
|
|
39
|
-
);
|
|
40
|
-
console.log("");
|
|
41
|
-
console.log("Export the current database to a SQL file.");
|
|
42
|
-
console.log("");
|
|
43
|
-
console.log("Options:");
|
|
44
|
-
console.log(" --local Force local D1 instead of DATABASE_URL");
|
|
45
|
-
console.log(
|
|
46
|
-
" --remote Export from remote D1 database (default: local)",
|
|
47
|
-
);
|
|
48
|
-
console.log(
|
|
49
|
-
" --node Force Node runtime even if DATABASE_URL is unset",
|
|
50
|
-
);
|
|
51
|
-
console.log(
|
|
52
|
-
" --output, -o Output file path (default: jant-export.sql)",
|
|
53
|
-
);
|
|
54
|
-
console.log(
|
|
55
|
-
" --config Wrangler config file (default: wrangler.toml)",
|
|
56
|
-
);
|
|
57
|
-
console.log(" --env Wrangler environment name");
|
|
58
|
-
console.log(" --database D1 binding name (default: DB)");
|
|
59
|
-
console.log(" --persist-to Local D1 state directory override");
|
|
60
|
-
console.log("");
|
|
61
|
-
console.log(
|
|
62
|
-
"`.env.node` next to your project (or in packages/core/) is auto-loaded.",
|
|
63
|
-
);
|
|
64
|
-
console.log(
|
|
65
|
-
"If DATABASE_URL or DATA_DIR is then set and no runtime flag is passed,",
|
|
66
|
-
);
|
|
67
|
-
console.log("this command uses the Node database runtime.");
|
|
68
|
-
console.log("");
|
|
69
|
-
console.log("Compatibility alias: jant export");
|
|
70
|
-
process.exit(0);
|
|
71
|
-
}
|
|
72
|
-
|
|
73
|
-
const { runtime } = bootstrapCliRuntime(values);
|
|
74
|
-
const output = values.output;
|
|
75
|
-
let sql;
|
|
76
|
-
|
|
77
|
-
if (runtime === "node") {
|
|
78
|
-
const nodeDatabase = await openNodeDatabase(process.env);
|
|
79
|
-
try {
|
|
80
|
-
sql = await dumpDatabaseToSql(
|
|
81
|
-
{
|
|
82
|
-
async query(statement) {
|
|
83
|
-
return nodeDatabase.query(statement);
|
|
84
|
-
},
|
|
85
|
-
},
|
|
86
|
-
{
|
|
87
|
-
source: "node",
|
|
88
|
-
dialect: nodeDatabase.database.dialect,
|
|
89
|
-
},
|
|
90
|
-
);
|
|
91
|
-
} finally {
|
|
92
|
-
await nodeDatabase.close();
|
|
93
|
-
}
|
|
94
|
-
} else {
|
|
95
|
-
const d1Options = {
|
|
96
|
-
configPath: values.config,
|
|
97
|
-
database: values.database,
|
|
98
|
-
env: values.env,
|
|
99
|
-
persistTo: values["persist-to"],
|
|
100
|
-
};
|
|
101
|
-
const queryRunner = createD1QueryRunner(runtime);
|
|
102
|
-
sql = await dumpDatabaseToSql(
|
|
103
|
-
{
|
|
104
|
-
async query(statement) {
|
|
105
|
-
return queryRunner.query(statement, d1Options);
|
|
106
|
-
},
|
|
107
|
-
},
|
|
108
|
-
{
|
|
109
|
-
source: runtime === "d1-remote" ? "remote" : "local",
|
|
110
|
-
dialect: "sqlite",
|
|
111
|
-
// D1 answers through Wrangler's buffered output; read it in pages.
|
|
112
|
-
pageSize: D1_DUMP_PAGE_SIZE,
|
|
113
|
-
},
|
|
114
|
-
);
|
|
115
|
-
}
|
|
116
|
-
|
|
117
|
-
const outPath = resolve(process.cwd(), output);
|
|
118
|
-
writeFileSync(outPath, sql);
|
|
119
|
-
console.log(`Exported ${getCliRuntimeLabel(runtime)} to ${output}`);
|
|
120
|
-
}
|