@geekity/cms 0.29.0 → 0.31.0

package/dist/admin/documents.js

@@ -1,70 +1,54 @@
-import { existsSync } from 'node:fs';
-import { access, mkdir, readFile, rename, rm } from 'node:fs/promises';
-import path from 'node:path';
-import { CITATION_PROPERTIES, citationText, CITED_ALT_FRONT_MATTER_KEY, citedHost, citesAnImage, PREVIEW_FRONT_MATTER_KEY, previewShown, } from '../content/citation.js';
-import { handleDirectory } from '../content/handles.js';
-import { renderMarkdown } from '../content/markdown.js';
-import { parseDocument } from '../content/parser.js';
-import { PINNED_FRONT_MATTER_KEY, PINNED_POST_LIMIT, pinnedAt } from '../content/pinned.js';
-import { discoverPostType, postLabel, replyTarget } from '../content/post-type.js';
-import { isReadStatus, READ_OF_FRONT_MATTER_KEY, READ_STATUS_FRONT_MATTER_KEY, READ_STATUS_LABELS, READ_STATUSES, readWork, readWorkFrontMatter, } from '../content/read.js';
-import { respellTags } from '../content/tags.js';
-import { RSVP_FRONT_MATTER_KEY, RSVP_LABELS, RSVP_VALUES, rsvpValue } from '../content/rsvp.js';
-import { ENCLOSURE_FRONT_MATTER_KEY, enclosureOf, isWebUrl, TRANSCRIPT_TYPES, } from '../content/enclosure.js';
-import { PHOTO_FRONT_MATTER_KEY, photoFrontMatter } from '../content/photo.js';
-import { keptProperties } from '../content/kept-properties.js';
+import { CITATION_PROPERTIES, citedHost, citesAnImage, shownInFull } from '../content/citation.js';
+import { AUTHOR_UNTIL_REQUEST, blankForm, CITATION_FIELDS, COMMENT_SETTINGS, extraFromForm, formFor, formInReplyTo, postFieldsForm, splitTags, } from '../content/document-form.js';
+import { PAGE_KIND, POST_KIND } from '../content/document-kind.js';
+import { TRANSCRIPT_TYPES } from '../content/enclosure.js';
+import { ENCLOSURE_FIELDS } from '../content/enclosure-form.js';
+import { EVENT_FIELDS } from '../content/event-form.js';
+import { BLANK_LOCATION_FORM } from '../content/location-form.js';
 import { postLocations } from '../content/locations.js';
-import { contentFilePath, freeSlug, saveDocument } from '../content/save.js';
+import { PHOTO_FIELDS } from '../content/photo-form.js';
+import { syndicateToField } from '../content/post-fields.js';
+import { postLabel } from '../content/post-type.js';
+import { isReadStatus, READ_STATUS_LABELS, READ_STATUSES } from '../content/read.js';
+import { READ_FIELDS } from '../content/read-form.js';
+import { RSVP_LABELS, RSVP_VALUES, rsvpValue } from '../content/rsvp.js';
 import { scheduledFor } from '../content/schedule.js';
-import { htmlToText } from '../content/search.js';
-import { defaultPermalink, slugify } from '../content/slug.js';
-import { DuplicatePermalinkError, isTrashedPath, TRASH_DIRECTORY } from '../content/store.js';
-import { calendarDayIn, DEFAULT_TIMEZONE, toUtcInstant, wallClockIn, zoneLabel, } from '../content/time.js';
-import { isVisibility, VISIBILITY_FRONT_MATTER_KEY, visibilityOf } from '../content/visibility.js';
+import { isTrashedPath } from '../content/store.js';
+import { zoneLabel } from '../content/time.js';
+import { moveDocumentFile } from '../content/trash.js';
+import { isVisibility, visibilityOf } from '../content/visibility.js';
+import { missingAltText, writeDocument } from '../content/write.js';
+import { currentUsername, documentSite } from '../web/document-site.js';
 import { normalizeBody, serializeDocument } from '../content/writer.js';
-import { readAltTexts, undescribedImages, undescribedPhotos } from '../images/alt-text.js';
-import { isServed } from '../web/documents.js';
-import { LANG_FRONT_MATTER_KEY } from '../web/locale.js';
-import { absoluteUrl } from '../web/negotiate.js';
-import { COMMENTS_FRONT_MATTER_KEY } from '../comments/policy.js';
-import { commentsFile } from '../comments/records.js';
-import { CONTACT_FRONT_MATTER_KEY } from '../contact/form.js';
-import { authorNames, userForAuthor } from '../web/authors.js';
-import { findUserById, listUsers } from './accounts.js';
+import { readAltTexts } from '../content/alt-text.js';
+import { readSiteSettings } from '../site/site-json.js';
+import { listUsers } from '../site/users.js';
+import { stringOrEmpty } from '../util/forms.js';
+import { userForAuthor } from '../content/authors.js';
+import { isServed } from '../content/served.js';
+import { syndicationTargetsReader } from '../webmention/syndication.js';
 import { editorActionViews } from './editor-actions.js';
+import { BLANK_ALTERNATE_ROW, enclosureChoices, LOCATION_FIELDS, photoChoices, photoRowViews, readLocationForm, } from './editor-fields.js';
+import { openGroups } from './editor-layout.js';
 import { flash } from './flash.js';
 import { formatInTimezone } from './formatting.js';
-import { LANGUAGE_TAG_PATTERN, readSiteSettings } from './settings.js';
+import { allowGeolocation } from './headers.js';
 import { PREVIEW_PATH } from './preview.js';
-import { ADMIN_PREFIX } from './session.js';
+import { ADMIN_PREFIX } from '../site/admin-paths.js';
 import { ADMIN_TEMPLATES } from './templates.js';
 import { UPLOADS_PATH } from './uploads.js';
-import { BLANK_ALTERNATE_ROW, BLANK_ENCLOSURE_FORM, ENCLOSURE_FIELDS, enclosureChoices, enclosureForm, enclosureFrontMatter, readEnclosureForm, resolveEnclosure, } from './enclosure-field.js';
-import { openGroups } from './editor-layout.js';
-import { allowGeolocation } from './headers.js';
-import { BLANK_LOCATION_FORM, LOCATION_FIELDS, locationForm, readLocationForm, resolveLocation, } from './location-field.js';
-import { PHOTO_FIELDS, photoChoices, photoRows, photoRowViews, readPhotoForm, resolvePhotos, } from './photo-field.js';
-import { BLANK_READ_OF_FORM, READ_FIELDS, readOfForm, resolveRead, submittedReadOfForm, } from './read-field.js';
-import { BLANK_EVENT_FORM, EVENT_FIELDS, eventForm, eventFrontMatter, resolveEvent, submittedEventForm, } from './event-field.js';
-import { eventOf } from '../content/event.js';
-import { SYNDICATE_TO_FRONT_MATTER_KEY, syndicateToOf, syndicationTargetsReader, } from '../webmention/syndication.js';
-import { shownInFull } from '../webmention/cited-picture.js';
-/**
- * The Eleventy key that keeps a document out of every collection.
- *
- * The CMS does not model it — it is not in `KNOWN_FRONT_MATTER_KEYS` — so the
- * parser leaves it in {@link Document.extra} and the editor reads and writes it
- * there, alongside every other key somebody added by hand.
- */
-export const EXCLUDE_KEY = 'eleventyExcludeFromCollections';
-/**
- * What the editor's Comments field can say: leave it to the site's rules, hold
- * this document open, or close it.
- *
- * The values are the strings the form submits and the template renders as
- * options, spelled once so the two cannot drift.
- */
-export const COMMENT_SETTINGS = { site: '', open: 'open', closed: 'closed' };
+export const POST_SCREENS = {
+    ...POST_KIND,
+    section: 'posts',
+    basePath: `${ADMIN_PREFIX}/posts`,
+    plural: 'Posts',
+};
+export const PAGE_SCREENS = {
+    ...PAGE_KIND,
+    section: 'pages',
+    basePath: `${ADMIN_PREFIX}/pages`,
+    plural: 'Pages',
+};
 /** A submitted Comments field, or the site default for anything else. */
 function commentSetting(value) {
     return value === COMMENT_SETTINGS.open || value === COMMENT_SETTINGS.closed
@@ -76,41 +60,6 @@ function formVisibility(value) {
         return 'public';
     return isVisibility(value) ? value : { unrecognized: value };
 }
-/** What a document's front matter already says about comments. */
-function commentSettingOf(document) {
-    const own = document.extra[COMMENTS_FRONT_MATTER_KEY];
-    if (own === true)
-        return COMMENT_SETTINGS.open;
-    if (own === false)
-        return COMMENT_SETTINGS.closed;
-    return COMMENT_SETTINGS.site;
-}
-/** The posts screens: dated, tagged, categorised, filed under `posts/`. */
-export const POST_KIND = {
-    type: 'post',
-    section: 'posts',
-    basePath: `${ADMIN_PREFIX}/posts`,
-    singular: 'post',
-    plural: 'Posts',
-    dated: true,
-    tagged: true,
-    categorised: true,
-    excludable: false,
-    contactable: false,
-};
-/** The pages screens: standing content, no date prefix and no taxonomy. */
-export const PAGE_KIND = {
-    type: 'page',
-    section: 'pages',
-    basePath: `${ADMIN_PREFIX}/pages`,
-    singular: 'page',
-    plural: 'Pages',
-    dated: false,
-    tagged: false,
-    categorised: false,
-    excludable: true,
-    contactable: true,
-};
 /** The URL of the editor for one document. */
 export function editorPath(kind, slug) {
     return `${kind.basePath}/${encodeURIComponent(slug)}`;
@@ -145,7 +94,7 @@ export const DOCUMENTS_PER_PAGE = 25;
 export function documentFilter(value) {
     return DOCUMENT_FILTERS.includes(value) ? value : 'all';
 }
-/** {@link ContentStore.listAll} options for one kind and one filter. */
+/** {@link CatalogReader.listAll} options for one kind and one filter. */
 export function listOptionsFor(kind, filter) {
     return {
         type: kind.type,
@@ -159,7 +108,7 @@ export function listOptionsFor(kind, filter) {
  * Register the listing and the editor for one kind of document.
  *
  * Both `/admin/posts` and `/admin/pages` are this function with a different
- * {@link DocumentKind}: the screens, the templates and the write path are
+ * {@link DocumentScreens}: the screens, the templates and the write path are
  * shared, and the kind decides what a file is called, whether the form has a
  * date and a taxonomy, and which section of the navigation marks itself.
  */
@@ -213,7 +162,7 @@ export function mountDocumentScreens(app, options) {
             kind,
             render,
             document,
-            form: formFor(document, siteTimezone(c), location),
+            form: formFor(kind, document, siteTimezone(c), location),
         });
     });
     app.post(`${kind.basePath}/:slug`, async (c) => {
@@ -221,9 +170,9 @@ export function mountDocumentScreens(app, options) {
         if (document === undefined)
             return c.notFound();
         const body = await c.req.parseBody();
-        const action = text(body['action']);
+        const action = stringOrEmpty(body['action']);
         if (action === 'trash' || action === 'restore') {
-            return moveDocument(c, { kind, document, action, returnTo: text(body['return']) });
+            return moveDocument(c, { kind, document, action, returnTo: stringOrEmpty(body['return']) });
         }
         return saveFromForm(c, { kind, render, document, body });
     });
@@ -233,40 +182,27 @@ export function mountDocumentScreens(app, options) {
  * and for an editor action.
  */
 export function submittedForm(kind, body, contentDir) {
+    const declared = syndicationTargetsReader(contentDir)();
     return {
-        title: text(body['title']).trim(),
-        slug: text(body['slug']).trim(),
-        permalink: text(body['permalink']).trim(),
-        date: text(body['date']).trim(),
-        tags: text(body['tags']).trim(),
-        categories: text(body['categories']).trim(),
-        description: text(body['description']).trim(),
-        author: text(body['author']).trim(),
-        inReplyTo: text(body['in-reply-to']).trim(),
-        rsvp: kind.type === 'post' ? text(body[RSVP_FRONT_MATTER_KEY]).trim() : '',
-        ...citationFields((property) => (kind.type === 'post' ? text(body[property]).trim() : '')),
-        readStatus: kind.type === 'post' ? text(body[READ_FIELDS.status]).trim() : '',
-        readOf: kind.type === 'post' ? submittedReadOfForm(body) : BLANK_READ_OF_FORM,
-        event: kind.type === 'post' ? submittedEventForm(body) : BLANK_EVENT_FORM,
-        lang: text(body['lang']).trim(),
+        title: stringOrEmpty(body['title']).trim(),
+        slug: stringOrEmpty(body['slug']).trim(),
+        permalink: stringOrEmpty(body['permalink']).trim(),
+        date: stringOrEmpty(body['date']).trim(),
+        tags: stringOrEmpty(body['tags']).trim(),
+        categories: stringOrEmpty(body['categories']).trim(),
+        description: stringOrEmpty(body['description']).trim(),
+        author: stringOrEmpty(body['author']).trim(),
+        inReplyTo: stringOrEmpty(body['in-reply-to']).trim(),
+        ...postFieldsForm(kind, (field) => field.submitted(body, declared)),
+        lang: stringOrEmpty(body['lang']).trim(),
         draft: body['draft'] !== undefined,
-        visibility: formVisibility(text(body['visibility'])),
+        visibility: formVisibility(stringOrEmpty(body['visibility'])),
         exclude: body['exclude'] !== undefined,
         contact: body['contact'] !== undefined,
-        pinned: kind.type === 'post' && body['pinned'] !== undefined,
-        previewHidden: kind.type === 'post' && body[PREVIEW_FRONT_MATTER_KEY] !== undefined,
-        citedAlt: kind.type === 'post' ? text(body[CITED_ALT_FRONT_MATTER_KEY]).trim() : '',
-        comments: commentSetting(text(body['comments'])),
-        enclosure: kind.type === 'post' ? readEnclosureForm(body) : BLANK_ENCLOSURE_FORM,
-        photos: kind.type === 'post' ? readPhotoForm(body) : [],
-        location: kind.type === 'post' ? readLocationForm(body) : BLANK_LOCATION_FORM,
-        syndicateTo: kind.type === 'post'
-            ? syndicationTargetsReader(contentDir)()
-                .filter((target) => body[syndicateToField(target)] !== undefined)
-                .map((target) => target.id)
-            : [],
-        body: normalizeBody(text(body['body'])),
-        hash: text(body['hash']),
+        comments: commentSetting(stringOrEmpty(body['comments'])),
+        location: kind.located ? readLocationForm(body) : BLANK_LOCATION_FORM,
+        body: normalizeBody(stringOrEmpty(body['body'])),
+        hash: stringOrEmpty(body['hash']),
     };
 }
 /**
@@ -279,7 +215,7 @@ async function saveFromForm(c, options) {
     const store = c.var.store;
     const contentDir = c.var.config.contentDir;
     const form = submittedForm(kind, body, contentDir);
-    const action = text(body['action']);
+    const action = stringOrEmpty(body['action']);
     // The buttons doc-5 names are shortcuts past the checkbox: Save draft and
     // Publish say what they do, and Update leaves the decision to the checkbox.
     const draft = action === 'save-draft' ? true : action === 'publish' ? false : form.draft;
@@ -314,322 +250,6 @@ async function saveFromForm(c, options) {
         flash(c, 'warning', missingAltText(undescribed));
     return c.redirect(documentEditorPath(kind, saved), 303);
 }
-/**
- * The write path as one request reaches it, writing as `writer`: by default
- * whoever the admin session names.
- */
-export function documentSite(c, writer = currentUsername(c)) {
-    return {
-        store: c.var.store,
-        config: c.var.config,
-        announce: c.var.announce,
-        writer,
-        citedContext: (target) => c.var.replyContexts.describe(target),
-        storedContext: (target) => c.var.replyContexts.read(target),
-        learnHandles: c.var.learnHandles,
-    };
-}
-/**
- * The write path behind the editor and Micropub (TASK-164): one form in, one
- * file out, announced to every subscriber.
- *
- * The order matters: the form is checked before anything is touched, the
- * on-disk file is re-hashed and compared with the hash the form loaded with
- * (doc-1's conflict rule), and only then is a file written. A write that is
- * refused leaves the content directory exactly as it was.
- */
-export async function writeDocument(site, write) {
-    const { store, config, writer } = site;
-    const { kind, document, form, draft } = write;
-    const contentDir = config.contentDir;
-    function refused(message, field) {
-        return { outcome: 'refused', message, field };
-    }
-    // A post with no title is a note; a page is always named.
-    if (form.title === '' && kind.type === 'page') {
-        return refused(`A ${kind.singular} needs a title.`, 'editor-title');
-    }
-    // A post is a reply only when the target is a URL (Post Type Discovery), so
-    // anything else would be saved as a reply that is not one.
-    if (kind.type === 'post' && form.inReplyTo !== '' && replyTarget(form) === undefined) {
-        return refused('In reply to has to be a web address, like https://example.com/a-post/.', 'editor-in-reply-to');
-    }
-    if (kind.type === 'post' && form.rsvp !== '') {
-        if (rsvpValue(form.rsvp) === undefined) {
-            return refused(`RSVP is ${RSVP_VALUES.join(', ')}, not ${form.rsvp}.`, 'editor-rsvp');
-        }
-        if (form.inReplyTo === '') {
-            return refused('An RSVP answers an event. Put the event’s address in In reply to.', 'editor-in-reply-to');
-        }
-    }
-    let read;
-    if (kind.type === 'post') {
-        for (const property of CITATION_PROPERTIES) {
-            const cited = form[CITATION_FIELDS[property]];
-            if (cited !== '' && !isWebUrl(cited)) {
-                return refused(`${CITATION_LABELS[property]} has to be a web address, like https://example.com/a-post/.`, `editor-${property}`);
-            }
-        }
-        const resolved = resolveRead(form.readStatus, form.readOf);
-        if ('error' in resolved)
-            return refused(resolved.error, resolved.field);
-        read = resolved.read;
-    }
-    if (read !== undefined && form.description !== '') {
-        return refused('A read is described by what it says, so it keeps no Description. Empty Description to save it.', 'editor-description');
-    }
-    if (form.lang !== '' && !LANGUAGE_TAG_PATTERN.test(form.lang)) {
-        return refused('That is not a language tag, such as en, fr or pt-BR.', 'editor-lang');
-    }
-    let media = { recording: undefined, photos: [] };
-    if (kind.type === 'post') {
-        const resolved = resolveEnclosure(form.enclosure, document === undefined ? undefined : enclosureOf(document.extra), contentDir);
-        if ('error' in resolved)
-            return refused(resolved.error, resolved.field);
-        const photos = resolvePhotos(form.photos, contentDir);
-        if ('error' in photos)
-            return refused(photos.error, photos.field);
-        media = { recording: resolved.enclosure, photos: photos.photos };
-    }
-    let location;
-    if (kind.type === 'post') {
-        const resolved = resolveLocation(form.location);
-        if ('error' in resolved)
-            return refused(resolved.error, resolved.field);
-        location = resolved.location;
-    }
-    // TASK-207: a pin is new when the file does not carry one yet, and only a
-    // new one can take an author past Mastodon's limit.
-    if (form.pinned && (document === undefined || pinnedAt(document) === undefined)) {
-        const users = listUsers(config.dataDir);
-        const author = userForAuthor(users, chosenAuthor(config.dataDir, form.author, document, writer) ?? '');
-        const names = author === undefined ? [] : authorNames(users, author);
-        if (store.listPinnedByAuthor(names).length >= PINNED_POST_LIMIT) {
-            return refused(`You can pin up to ${String(PINNED_POST_LIMIT)} posts. Unpin one first.`, 'editor-pinned');
-        }
-    }
-    // TASK-141: an image nobody described is a problem to fix before readers
-    // meet it. A draft is not checked, since nobody meets a draft.
-    // A photo counts too, unless the media library describes it (TASK-166).
-    const library = readAltTexts(contentDir);
-    const undescribed = draft
-        ? []
-        : [
-            ...undescribedPhotos(media.photos, library),
-            ...undescribedImages(renderMarkdown(form.body), library),
-        ];
-    if (undescribed.length > 0 && config.requireAltText) {
-        return refused(`This site publishes no image without alt text. ${missingAltText(undescribed)}`);
-    }
-    if (!draft &&
-        config.requireAltText &&
-        kind.type === 'post' &&
-        (await citesUndescribedImage(site, document, form))) {
-        return refused('This site publishes no image without alt text. Describe the image this post reposts in its alt text field.', 'editor-cited-alt');
-    }
-    const timezone = readSiteSettings(contentDir).timezone;
-    if (kind.type === 'post') {
-        const resolved = resolveEvent(form.event, timezone);
-        if ('error' in resolved)
-            return refused(resolved.error, resolved.field);
-        if (resolved.event !== undefined && form.title === '') {
-            return refused('An event needs a name. Put it in Title.', 'editor-title');
-        }
-    }
-    // decision-11: what the file gets is a UTC instant, and an offset-less field
-    // is the site's own wall clock rather than the server's.
-    const typed = kind.dated ? (form.date === '' ? store.now().toISOString() : form.date) : undefined;
-    if (typed !== undefined && !/^\d{4}-\d{2}-\d{2}/.test(typed)) {
-        return refused('A date has to start with a year, a month and a day, like 2026-03-04.', 'editor-date');
-    }
-    const date = typed === undefined ? undefined : toUtcInstant(typed, timezone);
-    if (typed !== undefined && date === undefined) {
-        return refused('That date is not one anybody can read. Try 2026-03-04 09:00.', 'editor-date');
-    }
-    const slug = slugify(form.slug) ||
-        slugify(form.title) ||
-        (document?.slug ?? '') ||
-        noteSlug(form.body) ||
-        slugify(form.readOf.name) ||
-        (await typeSlug(kind, form, media.photos, site.citedContext)) ||
-        'untitled';
-    const trashed = document !== undefined && isTrashedPath(document.path);
-    // The calendar day the document is filed under: the site zone's day at its
-    // date for a new one, and the day already in the filename for one whose date
-    // has not moved, so a zone changed later never moves a URL that exists.
-    const filed = filedDay({ date, document, timezone });
-    // A new document gets out of the way of anything that already holds its
-    // name; an existing one keeps the slug it was given.
-    const finalSlug = document === undefined
-        ? await freeSlug({ contentDir, store, type: kind.type, slug, date: filed })
-        : slug;
-    // A URL somebody has been shown only moves when the author asks it to, by
-    // editing the slug or the permalink: correcting a date refiles the file and
-    // leaves the URL where it was. An empty permalink field is a form that
-    // carried none, not a request to move.
-    const promised = promisedDocument(document, store.now(), contentDir);
-    const submitted = normalizePermalink(form.permalink);
-    const asked = promised !== undefined &&
-        (finalSlug !== promised.slug || (submitted !== undefined && submitted !== promised.permalink));
-    const permalink = promised !== undefined && !asked
-        ? promised.permalink
-        : resolvePermalink({
-            kind,
-            form,
-            slug: finalSlug,
-            date: filed,
-            document,
-            timezone,
-        });
-    const target = documentPath({ kind, slug: finalSlug, date: filed, trashed });
-    if (document !== undefined) {
-        const conflict = await conflictWith(contentDir, document, form.hash);
-        if (conflict !== undefined) {
-            return { outcome: 'conflict', document, media, conflict };
-        }
-    }
-    if (target !== document?.path && store.getByPath(target) !== undefined) {
-        return refused(`Another ${kind.singular} already lives in ${target}.`, 'editor-slug');
-    }
-    const tags = respellTags(kind.tagged ? splitTags(form.tags) : [], (tag) => store.tagSpelling(tag, { excluding: document?.path }));
-    const content = {
-        title: form.title,
-        ...(date === undefined ? {} : { date }),
-        updated: store.now().toISOString(),
-        permalink,
-        ...optional('redirectFrom', formerPermalinks(document, promised, permalink)),
-        tags: tags.tags,
-        categories: kind.categorised ? splitTags(form.categories) : [],
-        draft,
-        ...(form.description === '' ? {} : { description: form.description }),
-        ...optional('author', chosenAuthor(config.dataDir, form.author, document, writer)),
-        ...optional('inReplyTo', replyTo(kind, form, document)),
-        ...optional('activitypub', keptIdentity(document, promised, permalink, config.baseUrl)),
-        extra: keptGuid(resolveExtra(kind, document, form, store.now(), media, syndicationTargetsReader(contentDir)(), timezone), promised, permalink, config.baseUrl),
-        body: form.body,
-    };
-    // The row for the old path goes first: a rename briefly leaves two rows
-    // claiming one permalink, and the index refuses that.
-    const renamedFrom = document !== undefined && document.path !== target ? document : undefined;
-    if (renamedFrom !== undefined)
-        store.remove(renamedFrom.path);
-    await site.learnHandles(content.body);
-    let saved;
-    try {
-        saved = await saveDocument({ contentDir, store, path: target, content, timezone });
-    }
-    catch (error) {
-        // Nothing was written, so the row that was taken out of the way goes back.
-        if (renamedFrom !== undefined)
-            store.upsert(renamedFrom);
-        if (error instanceof DuplicatePermalinkError)
-            return refused(error.message);
-        throw error;
-    }
-    if (renamedFrom !== undefined) {
-        await rm(path.join(contentDir, ...renamedFrom.path.split('/')), { force: true });
-    }
-    if (kind.type === 'post') {
-        const locations = postLocations(config.dataDir);
-        const kept = keptProperties(config.dataDir);
-        if (document !== undefined && document.permalink !== saved.permalink) {
-            await locations.move(document.permalink, saved.permalink);
-            await kept.move(document.permalink, saved.permalink);
-        }
-        await locations.set(saved.permalink, location);
-        if (write.keptProperties !== undefined) {
-            await kept.set(saved.permalink, write.keptProperties);
-        }
-    }
-    // Announced rather than left to the watcher: the index already holds what
-    // was written, so the watcher's re-read is a no-op and nobody would ever
-    // hear that this post was published. Awaited, so a subscriber that writes
-    // back to the file — the federation stamping `activitypub` into a post it
-    // has just announced — has finished before the editor is reloaded with a
-    // hash that would otherwise be one save behind.
-    await site.announce({
-        type: document === undefined ? 'created' : 'updated',
-        path: saved.path,
-        previous: document,
-        next: saved,
-        origin: 'admin',
-    });
-    return { outcome: 'saved', saved, undescribed, respelled: tags.respelled };
-}
-async function citesUndescribedImage(site, document, form) {
-    if (form.previewHidden || form.citedAlt !== '' || form.title !== '')
-        return false;
-    for (const property of CITATION_PROPERTIES) {
-        const url = form[CITATION_FIELDS[property]];
-        if (url === '' || !shownInFull(property, { kind: 'photo' }))
-            continue;
-        const context = document === undefined ? await site.citedContext(url) : site.storedContext(url);
-        if (context !== undefined && citesAnImage(context))
-            return true;
-    }
-    return false;
-}
-/** What a save says about the images it found with no alt text, naming each. */
-function missingAltText(images) {
-    const names = images.map((image) => image.name).join(', ');
-    const count = images.length === 1 ? '1 image has' : `${String(images.length)} images have`;
-    return (`${count} no alt text: ${names}. Describe each one inside its ![…](…), ` +
-        'or mark an upload decorative in the media library.');
-}
-/** How many of an untitled post's first words its slug is made from. */
-const NOTE_SLUG_WORDS = 5;
-/** The slug a note takes from its first words, or empty when it has none. */
-function noteSlug(body) {
-    const words = htmlToText(renderMarkdown(body)).split(' ').slice(0, NOTE_SLUG_WORDS);
-    return slugify(words.join(' '));
-}
-const TARGET_SLUG_WORDS = 4;
-const CITED_SLUGS = {
-    repost: { prefix: 'reposted', field: 'repostOf' },
-    like: { prefix: 'liked', field: 'likeOf' },
-    reply: { prefix: 'reply-to', field: 'inReplyTo' },
-    rsvp: { prefix: 'rsvp', field: 'inReplyTo' },
-    bookmark: { prefix: 'bookmarked', field: 'bookmarkOf' },
-};
-async function typeSlug(kind, form, photos, citedContext) {
-    if (kind.type !== 'post')
-        return '';
-    const type = discoverPostType({
-        'repost-of': form.repostOf,
-        'like-of': form.likeOf,
-        'in-reply-to': form.inReplyTo,
-        rsvp: form.rsvp,
-        'bookmark-of': form.bookmarkOf,
-        photo: photos.map((photo) => photo.url),
-    });
-    if (type === 'photo')
-        return slugWords(photos[0]?.alt ?? '', NOTE_SLUG_WORDS) || 'photo';
-    const cited = CITED_SLUGS[type];
-    if (cited === undefined)
-        return '';
-    const target = form[cited.field];
-    const title = slugWords((await citedContext(target))?.name ?? '', NOTE_SLUG_WORDS);
-    return `${cited.prefix}-${title || targetWords(target)}`;
-}
-function targetWords(address) {
-    const url = new URL(address);
-    const segments = url.pathname.split('/').map(decodedSegment).filter(holdsALetter);
-    return slugWords([url.hostname.replace(/^www\./, ''), ...segments].join(' '), TARGET_SLUG_WORDS);
-}
-function slugWords(text, cap) {
-    return slugify(text).split('-').slice(0, cap).join('-');
-}
-function holdsALetter(segment) {
-    return /\p{L}/u.test(segment);
-}
-function decodedSegment(segment) {
-    try {
-        return decodeURIComponent(segment);
-    }
-    catch {
-        return segment;
-    }
-}
 function respelledMessage(respelled) {
     const pairs = respelled.map(({ given, site }) => `“${site}” for “${given}”`);
     const noun = respelled.length === 1 ? 'a tag' : `${String(respelled.length)} tags`;
@@ -649,338 +269,10 @@ function savedMessage(previous, saved, now, cited) {
         return `Published: ${label}`;
     return `Updated: ${label}`;
 }
-/** Where a document's file goes, trash included. */
-function documentPath(input) {
-    const relative = contentFilePath({ type: input.kind.type, slug: input.slug, date: input.date });
-    return input.trashed ? `${TRASH_DIRECTORY}/${relative}` : relative;
-}
-/**
- * The document whose URL has already been promised, or `undefined` when
- * nothing has been promised yet.
- *
- * A published post or page is at a URL readers, search engines and other
- * sites may hold, a post that was ever announced is at one its followers hold
- * even while it is a draft, and one with comments is at the URL they were
- * left on. A draft nobody was told about, a trashed document and one whose
- * date has not arrived have been shown to nobody, and may move without
- * leaving anything behind.
- */
-function promisedDocument(document, now, contentDir) {
-    if (document === undefined)
-        return undefined;
-    const announced = document.activitypub?.published !== undefined;
-    const answered = existsSync(commentsFile(contentDir, document.slug));
-    return isServed(document, now) || announced || answered ? document : undefined;
-}
-/**
- * The URLs a document is saved as having lived at (TASK-127).
- *
- * Every entry names the document itself rather than the next hop, so a chain
- * of renames collapses by construction: the URL it is leaving joins the ones
- * it already left, and all of them redirect straight to where it is now. The
- * URL it is arriving at leaves the list, because a document moved back to an
- * old URL lives there again.
- */
-function formerPermalinks(document, promised, permalink) {
-    const left = promised !== undefined && promised.permalink !== permalink ? [promised.permalink] : [];
-    const former = [...new Set([...(document?.redirectFrom ?? []), ...left])].filter((url) => url !== permalink);
-    return former.length === 0 ? undefined : former;
-}
-/**
- * The `activitypub` block to write, which pins the object id when a promised
- * post moves (decision-20).
- *
- * decision-13 makes a post's object id its permalink, and a fediverse server
- * cannot rename an object it holds. So the URL the post is leaving is written
- * as its stored id, and the stored-id path does the rest: a peer at the old
- * URL still gets the `Article`, a browser there is sent on, and every `Update`
- * names the id the followers already have. An id the file already stores
- * stays, since it is already what they hold.
- */
-function keptIdentity(document, promised, permalink, baseUrl) {
-    const block = document?.activitypub;
-    if (promised === undefined || promised.type !== 'post' || promised.permalink === permalink) {
-        return block;
-    }
-    if (block?.id !== undefined)
-        return block;
-    return { ...block, id: absoluteUrl(promised.permalink, baseUrl) };
-}
-/**
- * The extra front matter to write, which pins the feed guid when a promised
- * page moves.
- *
- * A page has no object id, so its feed guid is its permalink (decision-12),
- * and the `/replies/` feed a reader subscribed to is keyed by that guid. The
- * URL the page is leaving is written as its stored `guid`, as a moved post's
- * is written as its `activitypub.id`.
- */
-function keptGuid(extra, promised, permalink, baseUrl) {
-    if (promised === undefined || promised.type === 'post' || promised.permalink === permalink) {
-        return extra;
-    }
-    if (extra['guid'] !== undefined)
-        return extra;
-    return { ...extra, guid: absoluteUrl(promised.permalink, baseUrl) };
-}
-/**
- * The permalink to write.
- *
- * A permalink is explicit in the file and the stored value is what counts
- * (doc-2), so one that was customised is never quietly rewritten. One that is
- * still the URL its old slug and date implied follows them to the new ones,
- * which is what makes renaming a slug in the editor do what it looks like it
- * does.
- */
-function resolvePermalink(input) {
-    const fallback = defaultPermalink({
-        type: input.kind.type,
-        slug: input.slug,
-        date: input.date,
-    });
-    const submitted = normalizePermalink(input.form.permalink);
-    if (submitted === undefined)
-        return fallback;
-    const document = input.document;
-    if (document !== undefined &&
-        submitted === previousDefaultPermalink(input.kind, document, input.timezone)) {
-        return fallback;
-    }
-    return submitted;
-}
-/**
- * The permalink a document would have had if it had never been customised:
- * its own slug over the day it is filed under, which is the day in its
- * filename rather than one re-derived from a setting that may have moved.
- */
-function previousDefaultPermalink(kind, document, timezone) {
-    try {
-        return defaultPermalink({
-            type: kind.type,
-            slug: document.slug,
-            date: filedDay({ date: document.date, document, timezone }),
-        });
-    }
-    catch {
-        return undefined;
-    }
-}
-/**
- * The calendar day a document is filed under, which is what its filename and
- * its `/{yyyy}/{mm}/` permalink are cut from.
- *
- * For a new document it is the day the site's own zone was on at its date, so
- * a post published at half past midnight on 1 October in Berlin is filed under
- * October rather than the September UTC was still on.
- *
- * For a document whose date has not moved it is the day already in its
- * filename. That is the whole of decision-11's promise that changing the
- * timezone setting cannot move an existing URL: the instant is the same, the
- * zone is a lens, and the day this post was filed under was decided once, when
- * it was written, and is on disk where no setting can reach it.
- */
-function filedDay(input) {
-    const { document } = input;
-    const date = input.date === undefined ? undefined : toUtcInstant(input.date, input.timezone);
-    if (date === undefined)
-        return undefined;
-    const was = document?.date === undefined ? undefined : toUtcInstant(document.date, input.timezone);
-    if (was === date) {
-        const existing = /(?:^|\/)(\d{4}-\d{2}-\d{2})-/.exec(document?.path ?? '')?.[1];
-        if (existing !== undefined)
-            return existing;
-    }
-    return calendarDayIn(date, input.timezone) ?? date;
-}
 /** The site's time zone, which is what every offset-less date in the admin means. */
 function siteTimezone(c) {
     return readSiteSettings(c.var.config.contentDir).timezone;
 }
-/** A submitted permalink as a URL path, or `undefined` when the field is empty. */
-function normalizePermalink(value) {
-    const trimmed = value.trim();
-    if (trimmed === '')
-        return undefined;
-    const withLeading = trimmed.startsWith('/') ? trimmed : `/${trimmed}`;
-    const last = withLeading.split('/').at(-1) ?? '';
-    // `/feed.xml` is a file and keeps its name; everything else is a directory
-    // and gets the trailing slash that is canonical here.
-    if (last === '' || last.includes('.'))
-        return withLeading;
-    return `${withLeading}/`;
-}
-/**
- * The front matter to write that the CMS does not model.
- *
- * What the file already carried comes back out untouched, so a key somebody
- * added by hand survives every admin save (doc-2). The one such key the editor
- * has a field for is `eleventyExcludeFromCollections`: ticking the box writes
- * it, and clearing the box takes the key back out rather than leaving a
- * `false` behind — unless the file spelled the key out itself, in which case
- * the `false` is written, because a key somebody wrote by hand is not the
- * editor's to delete.
- */
-function resolveExtra(kind, document, form, now, media, declared, timezone) {
-    const extra = { ...(document?.extra ?? {}) };
-    if (kind.type === 'post') {
-        if (media.recording === undefined)
-            delete extra[ENCLOSURE_FRONT_MATTER_KEY];
-        else
-            extra[ENCLOSURE_FRONT_MATTER_KEY] = enclosureFrontMatter(media.recording);
-        if (media.photos.length === 0)
-            delete extra[PHOTO_FRONT_MATTER_KEY];
-        else
-            extra[PHOTO_FRONT_MATTER_KEY] = photoFrontMatter(media.photos);
-        for (const property of CITATION_PROPERTIES) {
-            const cited = form[CITATION_FIELDS[property]];
-            if (cited === '')
-                delete extra[property];
-            else
-                extra[property] = cited;
-        }
-        const rsvp = rsvpValue(form.rsvp);
-        if (rsvp === undefined)
-            delete extra[RSVP_FRONT_MATTER_KEY];
-        else
-            extra[RSVP_FRONT_MATTER_KEY] = rsvp;
-        const event = resolveEvent(form.event, timezone);
-        if ('event' in event && isOrWasEvent(event.event, document)) {
-            for (const [key, value] of Object.entries(eventFrontMatter(event.event))) {
-                if (value === undefined)
-                    delete extra[key];
-                else
-                    extra[key] = value;
-            }
-        }
-        if (form.previewHidden)
-            extra[PREVIEW_FRONT_MATTER_KEY] = false;
-        else
-            delete extra[PREVIEW_FRONT_MATTER_KEY];
-        if (form.citedAlt === '')
-            delete extra[CITED_ALT_FRONT_MATTER_KEY];
-        else
-            extra[CITED_ALT_FRONT_MATTER_KEY] = form.citedAlt;
-        const resolved = resolveRead(form.readStatus, form.readOf);
-        if ('read' in resolved) {
-            const { read } = resolved;
-            if (read === undefined) {
-                delete extra[READ_OF_FRONT_MATTER_KEY];
-                delete extra[READ_STATUS_FRONT_MATTER_KEY];
-            }
-            else {
-                extra[READ_OF_FRONT_MATTER_KEY] = readWorkFrontMatter(read.of);
-                extra[READ_STATUS_FRONT_MATTER_KEY] = read.status;
-            }
-        }
-    }
-    // The checkboxes speak for the targets the site declares (TASK-155). An id
-    // the file lists that names no declared target has no checkbox, so it is
-    // kept as written rather than lost to a save.
-    if (kind.type === 'post') {
-        const offered = new Set(declared.map((target) => target.id));
-        const kept = syndicateToOf(extra).filter((id) => !offered.has(id));
-        // A form loaded from the file (a Micropub update) already holds those ids.
-        const listed = [...new Set([...form.syndicateTo, ...kept])];
-        if (listed.length === 0)
-            delete extra[SYNDICATE_TO_FRONT_MATTER_KEY];
-        else
-            extra[SYNDICATE_TO_FRONT_MATTER_KEY] = listed;
-    }
-    // The moment a post was pinned is what orders the featured collection, so a
-    // pin the file already carries keeps its moment through every later save,
-    // and unpinning takes the key out rather than writing `false` (TASK-207).
-    if (kind.type === 'post') {
-        const pinned = document === undefined ? undefined : pinnedAt(document);
-        if (!form.pinned)
-            delete extra[PINNED_FRONT_MATTER_KEY];
-        else if (pinned === undefined)
-            extra[PINNED_FRONT_MATTER_KEY] = toUtcInstant(now, 'UTC');
-    }
-    if (form.visibility === 'public')
-        delete extra[VISIBILITY_FRONT_MATTER_KEY];
-    else if (typeof form.visibility === 'string')
-        extra[VISIBILITY_FRONT_MATTER_KEY] = form.visibility;
-    else
-        extra[VISIBILITY_FRONT_MATTER_KEY] = form.visibility.unrecognized;
-    // Empty is the site's language, which is the key's absence (TASK-154).
-    if (form.lang === '')
-        delete extra[LANG_FRONT_MATTER_KEY];
-    else
-        extra[LANG_FRONT_MATTER_KEY] = form.lang;
-    // The post's own answer about comments, or none at all: "site default" is
-    // the absence of the key rather than a value, because that is what every
-    // reader of it — the CMS, an Eleventy build, a person looking at the file —
-    // already understands, and writing `comments: null` would say nothing new.
-    if (form.comments === COMMENT_SETTINGS.open)
-        extra[COMMENTS_FRONT_MATTER_KEY] = true;
-    else if (form.comments === COMMENT_SETTINGS.closed)
-        extra[COMMENTS_FRONT_MATTER_KEY] = false;
-    else
-        delete extra[COMMENTS_FRONT_MATTER_KEY];
-    if (kind.excludable) {
-        if (form.exclude)
-            extra[EXCLUDE_KEY] = true;
-        else if (EXCLUDE_KEY in extra)
-            extra[EXCLUDE_KEY] = false;
-    }
-    if (kind.contactable) {
-        // Written or removed, never `false`: it is the CMS's own key, and absent
-        // and false mean the same thing to everything that reads it (TASK-56).
-        if (form.contact)
-            extra[CONTACT_FRONT_MATTER_KEY] = true;
-        else
-            delete extra[CONTACT_FRONT_MATTER_KEY];
-    }
-    return extra;
-}
-function isOrWasEvent(saved, document) {
-    return saved !== undefined || (document !== undefined && eventOf(document.extra) !== undefined);
-}
-/** The editor checkbox that selects one syndication target. */
-function syndicateToField(target) {
-    return `${SYNDICATE_TO_FRONT_MATTER_KEY}-${target.id}`;
-}
-/**
- * A comma-separated taxonomy field as a list, without the blanks and the
- * repeats. Tags and categories are both entered this way.
- */
-export function splitTags(value) {
-    const tags = [];
-    for (const tag of value.split(',')) {
-        const trimmed = tag.trim();
-        if (trimmed !== '' && !tags.includes(trimmed))
-            tags.push(trimmed);
-    }
-    return tags;
-}
-/** The signed-in user's login, which is what doc-2's `author` holds. */
-function currentUsername(c) {
-    const userId = c.var.session?.userId;
-    if (userId == null)
-        return undefined;
-    return findUserById(c.var.config.dataDir, userId)?.username;
-}
-/**
- * What a save writes into the front matter's `author`.
- *
- * The submitted value is resolved through the same rule the public site reads
- * it by ({@link userForAuthor}), and what is written is that user's login: so
- * a file carrying a display name from before decision-14 is rewritten as a
- * username the first time somebody saves it, which is exactly the "until it is
- * next saved" doc-2 promises.
- *
- * A value naming nobody this site has changes nothing. There is no form this
- * CMS renders that could submit one — the select only ever offers the users
- * and, for a file that names a stranger, that file's own value — so the case
- * is either a hand-made request or a user deleted between the load and the
- * save, and neither is a reason to reattribute somebody's post.
- */
-function chosenAuthor(dataDir, submitted, document, writer) {
-    const named = userForAuthor(listUsers(dataDir), submitted);
-    if (named !== undefined)
-        return named.username;
-    return document?.author ?? writer;
-}
 /**
  * The Author select: every user, whoever the document names, and — for a file
  * naming somebody with no account here — that name too.
@@ -997,7 +289,7 @@ function chosenAuthor(dataDir, submitted, document, writer) {
 export function authorChoices(c, current) {
     const users = listUsers(c.var.config.dataDir);
     const named = userForAuthor(users, current);
-    const chosen = named?.username ?? (current === '' ? currentUsername(c) : current);
+    const chosen = named?.username ?? (current === AUTHOR_UNTIL_REQUEST ? currentUsername(c) : current);
     const choices = users.map((user) => ({
         value: user.username,
         label: authorLabel(user),
@@ -1005,7 +297,7 @@ export function authorChoices(c, current) {
     }));
     // A name the file holds that is nobody here: offered last, and marked, so it
     // is plain that the post is attributed to somebody this site cannot reach.
-    if (named === undefined && current !== '') {
+    if (named === undefined && current !== AUTHOR_UNTIL_REQUEST) {
         choices.push({ value: current, label: `${current} (no account here)`, chosen: true });
     }
     return choices;
@@ -1015,36 +307,6 @@ function authorLabel(user) {
     const displayName = user.profile?.displayName;
     return displayName === undefined ? user.username : `${displayName} (${user.username})`;
 }
-/**
- * Whether the file has moved on since the form loaded, per doc-1: files win,
- * and an edit made behind the editor's back is never silently overwritten.
- *
- * The file is read and re-parsed rather than trusted to the index, so the
- * check is right even when the watcher is off or has not caught up.
- */
-async function conflictWith(contentDir, document, submittedHash) {
-    const file = path.join(contentDir, ...document.path.split('/'));
-    let source;
-    try {
-        source = await readFile(file, 'utf8');
-    }
-    catch {
-        // The file is gone. There is nothing to lose by writing it again.
-        return undefined;
-    }
-    let hash;
-    try {
-        hash = parseDocument(source, { path: document.path, type: document.type }).hash;
-    }
-    catch {
-        // A file that will not parse cannot be compared, and overwriting it would
-        // throw away whatever is wrong with it before anyone has seen it.
-        hash = '';
-    }
-    if (hash === submittedHash)
-        return undefined;
-    return { current: source, hash };
-}
 /**
  * The refused save, side by side with the file it would have overwritten.
  *
@@ -1054,6 +316,7 @@ async function conflictWith(contentDir, document, submittedHash) {
  */
 function renderConflict(c, options) {
     const { kind, document, form, conflict } = options;
+    const inReplyTo = formInReplyTo(kind, form, document);
     const submitted = serializeDocument({
         title: form.title,
         ...(form.date === '' ? {} : { date: form.date }),
@@ -1062,10 +325,10 @@ function renderConflict(c, options) {
         categories: kind.categorised ? splitTags(form.categories) : [],
         draft: form.draft,
         ...(form.description === '' ? {} : { description: form.description }),
-        ...optional('author', document.author),
-        ...optional('inReplyTo', replyTo(kind, form, document)),
-        ...optional('activitypub', document.activitypub),
-        extra: resolveExtra(kind, document, form, c.var.store.now(), options.media, syndicationTargetsReader(c.var.config.contentDir)(), siteTimezone(c)),
+        ...(document.author === undefined ? {} : { author: document.author }),
+        ...(inReplyTo === undefined ? {} : { inReplyTo }),
+        ...(document.activitypub === undefined ? {} : { activitypub: document.activitypub }),
+        extra: extraFromForm(kind, document, form, c.var.store.now(), options.media, syndicationTargetsReader(c.var.config.contentDir)(), siteTimezone(c)),
         body: form.body,
     });
     c.status(409);
@@ -1105,91 +368,6 @@ async function moveDocument(c, options) {
     return c.redirect(returnPath(options.returnTo) ??
         (action === 'trash' ? kind.basePath : documentEditorPath(kind, moved.document)), 303);
 }
-/**
- * Move a document into `content/_trash/` or back out of it, the move behind
- * the editor's trash and restore and Micropub's delete and undelete
- * (TASK-167).
- *
- * The trash mirrors the content tree — `posts/2026-03-04-x.md` becomes
- * `_trash/posts/2026-03-04-x.md` — so restoring is the same move backwards and
- * needs to remember nothing. The index is corrected as soon as the file has
- * landed rather than waiting for the watcher, so the public site stops or
- * starts serving the document with this request (doc-1).
- *
- * A live document may take a trashed one's URL, and its file name with it
- * (TASK-195). So a restore that would land on either is refused, and a trashed
- * file already at the name is kept by numbering the newcomer: the permalink in
- * the front matter, not the file name, is what the document answers at.
- */
-export async function moveDocumentFile(site, document, action) {
-    const { store, contentDir } = site;
-    let target;
-    if (action === 'trash') {
-        target = await freeTrashPath(contentDir, document.path);
-    }
-    else {
-        target = document.path
-            .split('/')
-            .filter((segment) => segment !== TRASH_DIRECTORY)
-            .join('/');
-        const holder = store.getByPermalink(document.permalink);
-        if (holder !== undefined && !isTrashedPath(holder.path)) {
-            return refusedMove(`${holder.path} now holds ${document.permalink}, so this cannot go back there. ` +
-                'Change one of their permalinks first.');
-        }
-        if (await exists(path.join(contentDir, ...target.split('/')))) {
-            return refusedMove(`${target} already exists, so this cannot go back there.`);
-        }
-    }
-    const from = path.join(contentDir, ...document.path.split('/'));
-    const to = path.join(contentDir, ...target.split('/'));
-    let source;
-    try {
-        source = await readFile(from, 'utf8');
-        await mkdir(path.dirname(to), { recursive: true });
-        await rename(from, to);
-    }
-    catch {
-        return refusedMove(`Could not move ${document.path}. Is the file still there?`);
-    }
-    const moved = parseDocument(source, {
-        path: target,
-        type: document.type,
-        handles: handleDirectory(contentDir),
-    });
-    store.remove(document.path);
-    store.upsert(moved);
-    // Trashing takes a post off the public site and restoring puts it back, so
-    // both are visibility changes a subscriber has to hear about.
-    await site.announce({
-        type: 'updated',
-        path: target,
-        previous: document,
-        next: moved,
-        origin: 'admin',
-    });
-    return { outcome: 'moved', document: moved };
-}
-function refusedMove(reason) {
-    return { outcome: 'refused', reason };
-}
-async function freeTrashPath(contentDir, relative) {
-    const { dir, name, ext } = path.posix.parse(`${TRASH_DIRECTORY}/${relative}`);
-    for (let suffix = 1;; suffix += 1) {
-        const candidate = `${dir}/${name}${suffix === 1 ? '' : `-${String(suffix)}`}${ext}`;
-        if (!(await exists(path.join(contentDir, ...candidate.split('/')))))
-            return candidate;
-    }
-}
-async function exists(file) {
-    try {
-        await access(file);
-        return true;
-    }
-    catch {
-        return false;
-    }
-}
 /** Report a move that did not happen and go back where the form came from. */
 function backTo(c, options, message) {
     flash(c, 'error', message);
@@ -1209,142 +387,6 @@ export function returnPath(value) {
         return undefined;
     return trimmed;
 }
-function optional(key, value) {
-    return value === undefined ? {} : { [key]: value };
-}
-/** A form field as a string. A file upload, or a missing field, is the empty one. */
-function text(value) {
-    return typeof value === 'string' ? value : '';
-}
-/**
- * The `in-reply-to` a save writes: the field for a post, where an empty one
- * clears it, and whatever the file had for a page, whose editor has no field.
- */
-function replyTo(kind, form, document) {
-    if (kind.type !== 'post')
-        return document?.inReplyTo;
-    return form.inReplyTo === '' ? undefined : form.inReplyTo;
-}
-/**
- * The editor field each citing property fills (TASK-169). The form submits it
- * under the property's own name, as `in-reply-to` is.
- */
-export const CITATION_FIELDS = {
-    'repost-of': 'repostOf',
-    'like-of': 'likeOf',
-    'bookmark-of': 'bookmarkOf',
-};
-/** What the editor calls each citing field, which a refusal names. */
-const CITATION_LABELS = {
-    'repost-of': 'Repost of',
-    'like-of': 'Like of',
-    'bookmark-of': 'Bookmark of',
-};
-/** The three citing fields, each filled from its property. */
-function citationFields(value) {
-    return {
-        repostOf: value('repost-of'),
-        likeOf: value('like-of'),
-        bookmarkOf: value('bookmark-of'),
-    };
-}
-/**
- * The editor for a document that does not exist yet.
- *
- * The date field is filled in with the clock as the site's own zone reads it,
- * not with an instant: what a form offers is what a form takes back, and per
- * decision-11 an offset-less date in this field means the site's zone.
- */
-export function blankForm(kind, timezone = DEFAULT_TIMEZONE, now = new Date()) {
-    return {
-        title: '',
-        slug: '',
-        permalink: '',
-        date: kind.dated ? wallClockIn(now, timezone) : '',
-        tags: '',
-        categories: '',
-        description: '',
-        // Empty rather than the signed-in user: `blankForm` is a pure function
-        // over a kind and a clock, and who is signed in is a fact about a request.
-        // {@link authorChoices} is where the default is applied.
-        author: '',
-        inReplyTo: '',
-        rsvp: '',
-        ...citationFields(() => ''),
-        readStatus: '',
-        readOf: BLANK_READ_OF_FORM,
-        event: BLANK_EVENT_FORM,
-        lang: '',
-        draft: false,
-        visibility: 'public',
-        exclude: false,
-        contact: false,
-        pinned: false,
-        previewHidden: false,
-        citedAlt: '',
-        comments: COMMENT_SETTINGS.site,
-        enclosure: BLANK_ENCLOSURE_FORM,
-        photos: [],
-        location: BLANK_LOCATION_FORM,
-        syndicateTo: [],
-        body: '',
-        hash: '',
-    };
-}
-/**
- * The editor for a document that does.
- *
- * The stored instant is shown as the clock in the site's zone reads it, and
- * {@link wallClockIn} keeps whatever precision the instant has, so a form
- * submitted with the field untouched writes back the very instant it was
- * filled in from.
- *
- * `location` is what `data/locations.json` holds for the post (decision-29),
- * which a document does not carry. It is required because a form loaded
- * without it would remove the stored location on save.
- */
-export function formFor(document, timezone, location) {
-    return {
-        title: document.title,
-        slug: document.slug,
-        permalink: document.permalink,
-        date: document.date === undefined ? '' : wallClockIn(document.date, timezone),
-        tags: document.tags.join(', '),
-        categories: document.categories.join(', '),
-        description: document.description ?? '',
-        author: document.author ?? '',
-        inReplyTo: document.inReplyTo ?? '',
-        rsvp: document.type === 'post' && typeof document.extra[RSVP_FRONT_MATTER_KEY] === 'string'
-            ? document.extra[RSVP_FRONT_MATTER_KEY]
-            : '',
-        // As the file spells it, so a save writes back what it read.
-        ...citationFields((property) => document.type === 'post' ? citationText(document.extra[property]) : ''),
-        readStatus: document.type === 'post' && typeof document.extra[READ_STATUS_FRONT_MATTER_KEY] === 'string'
-            ? document.extra[READ_STATUS_FRONT_MATTER_KEY]
-            : '',
-        readOf: readOfForm(document.type === 'post' ? readWork(document.extra[READ_OF_FRONT_MATTER_KEY]) : undefined),
-        event: document.type === 'post' ? eventForm(document.extra, timezone) : BLANK_EVENT_FORM,
-        lang: typeof document.extra[LANG_FRONT_MATTER_KEY] === 'string'
-            ? document.extra[LANG_FRONT_MATTER_KEY]
-            : '',
-        draft: document.draft,
-        visibility: visibilityOf(document),
-        exclude: document.extra[EXCLUDE_KEY] === true,
-        contact: document.extra[CONTACT_FRONT_MATTER_KEY] === true,
-        pinned: pinnedAt(document) !== undefined,
-        previewHidden: document.type === 'post' && !previewShown(document.extra),
-        citedAlt: document.type === 'post' && typeof document.extra[CITED_ALT_FRONT_MATTER_KEY] === 'string'
-            ? document.extra[CITED_ALT_FRONT_MATTER_KEY]
-            : '',
-        comments: commentSettingOf(document),
-        enclosure: document.type === 'post' ? enclosureForm(document) : BLANK_ENCLOSURE_FORM,
-        photos: document.type === 'post' ? photoRows(document) : [],
-        location: document.type === 'post' ? locationForm(location) : BLANK_LOCATION_FORM,
-        syndicateTo: document.type === 'post' ? syndicateToOf(document.extra) : [],
-        body: document.body,
-        hash: document.hash,
-    };
-}
 /**
  * The editor screen.
  *
@@ -1376,7 +418,7 @@ async function renderEditor(c, options) {
     if (options.status !== undefined)
         c.status(options.status);
     const permissions = c.var.config.securityHeaders['permissions-policy'];
-    if (kind.type === 'post' && permissions !== undefined) {
+    if (kind.located && permissions !== undefined) {
         c.header('Permissions-Policy', allowGeolocation(permissions));
     }
     return options.render(c, ADMIN_TEMPLATES.documentEditor, {
@@ -1433,7 +475,7 @@ async function renderEditor(c, options) {
         viewUrl: document !== undefined && isServed(document, now) ? document.permalink : undefined,
         // Named beside the date field, because a wall clock with no zone on it is
         // exactly the ambiguity decision-11 exists to remove.
-        ...(kind.dated ? { dateZone: zoneLabel(form.date === '' ? now : form.date, timezone) } : {}),
+        ...(kind.dated ? { dateZone: zoneLabel(form.date, timezone, now) } : {}),
         ...(scheduledAt === undefined ? {} : { scheduledFor: formatInTimezone(scheduledAt, timezone) }),
         ...(options.refusal === undefined
             ? {}