@geekity/cms 0.29.0 → 0.31.0

package/dist/content/post-fields.js

@@ -0,0 +1,256 @@
+import { stringOrEmpty, trimmedField } from '../util/forms.js';
+import { SYNDICATE_TO_FRONT_MATTER_KEY, syndicateToOf } from './syndicate-to.js';
+import { citationOf, citationText, CITED_ALT_FRONT_MATTER_KEY, PREVIEW_FRONT_MATTER_KEY, previewShown, } from './citation.js';
+import { CITATION_FIELDS } from './document-form.js';
+import { ENCLOSURE_FRONT_MATTER_KEY } from './enclosure.js';
+import { enclosureForm, enclosureFrontMatter, readEnclosureForm } from './enclosure-form.js';
+import { eventOf } from './event.js';
+import { eventForm, eventFrontMatter, eventPlaceFromMicropub, resolveEvent, submittedEventForm, } from './event-form.js';
+import { PHOTO_FRONT_MATTER_KEY, photoFrontMatter } from './photo.js';
+import { photoRowFromMicropub, photoRows, photoToMicropub, readPhotoForm } from './photo-form.js';
+import { PINNED_FRONT_MATTER_KEY, pinnedAt } from './pinned.js';
+import { isReadStatus, READ_OF_FRONT_MATTER_KEY, READ_STATUS_FRONT_MATTER_KEY, READ_STATUSES, readOf, readWork, readWorkFrontMatter, } from './read.js';
+import { READ_FIELDS, readCite, readOfForm, readOfFromMicropub, resolveRead, submittedReadOfForm, } from './read-form.js';
+import { RSVP_FRONT_MATTER_KEY, rsvpOf, rsvpValue } from './rsvp.js';
+import { toUtcInstant } from './time.js';
+function setOrDelete(extra, key, value) {
+    if (value === undefined)
+        delete extra[key];
+    else
+        extra[key] = value;
+}
+function answered(name, value) {
+    return value === undefined || value === '' ? {} : { [name]: [value] };
+}
+const ENCLOSURE_FIELD = {
+    read: (document) => ({ enclosure: enclosureForm(document) }),
+    submitted: (body) => ({ enclosure: readEnclosureForm(body) }),
+    write: (extra, _form, { media }) => {
+        setOrDelete(extra, ENCLOSURE_FRONT_MATTER_KEY, media.recording === undefined ? undefined : enclosureFrontMatter(media.recording));
+    },
+};
+const PHOTO_FIELD = {
+    read: (document) => ({ photos: photoRows(document) }),
+    submitted: (body) => ({ photos: readPhotoForm(body) }),
+    write: (extra, _form, { media }) => {
+        setOrDelete(extra, PHOTO_FRONT_MATTER_KEY, media.photos.length === 0 ? undefined : photoFrontMatter(media.photos));
+    },
+    micropub: {
+        properties: { photo: ['photos'] },
+        publishable: ['photo'],
+        toForm: (request) => ({
+            photos: request.values('photo').map((value, row) => {
+                if (value instanceof File) {
+                    request.upload(row, value);
+                    return { url: '', alt: '' };
+                }
+                const photo = photoRowFromMicropub(value, request.baseUrl);
+                if (photo === undefined) {
+                    request.refuse('photo is a web address, { "value": "…", "alt": "…" } or an uploaded file.');
+                    return { url: '', alt: '' };
+                }
+                return photo;
+            }),
+        }),
+        toProperties: (document, { baseUrl }) => {
+            const photos = photoRows(document).map((row) => photoToMicropub(row, baseUrl));
+            return photos.length === 0 ? {} : { photo: photos };
+        },
+    },
+};
+function citationField(property, field) {
+    const key = CITATION_FIELDS[property];
+    return {
+        // As the file spells it, so a save writes back what it read.
+        read: (document) => field(citationText(document.extra[property])),
+        submitted: (body) => field(trimmedField(body, property)),
+        write: (extra, form) => {
+            setOrDelete(extra, property, form[key] === '' ? undefined : form[key]);
+        },
+        micropub: {
+            properties: { [property]: [key] },
+            publishable: [property],
+            toForm: (request) => field(request.text(property)),
+            toProperties: (document) => answered(property, citationOf(document, property)),
+        },
+    };
+}
+const RSVP_FIELD = {
+    read: (document) => ({ rsvp: stringOrEmpty(document.extra[RSVP_FRONT_MATTER_KEY]) }),
+    submitted: (body) => ({ rsvp: trimmedField(body, RSVP_FRONT_MATTER_KEY) }),
+    write: (extra, form) => {
+        setOrDelete(extra, RSVP_FRONT_MATTER_KEY, rsvpValue(form.rsvp));
+    },
+    micropub: {
+        properties: { rsvp: ['rsvp'] },
+        publishable: [],
+        toForm: (request) => ({ rsvp: request.text('rsvp') }),
+        toProperties: (document) => answered('rsvp', rsvpOf(document.extra)),
+    },
+};
+const EVENT_FIELD = {
+    read: (document, timezone) => ({ event: eventForm(document.extra, timezone) }),
+    submitted: (body) => ({ event: submittedEventForm(body) }),
+    write: (extra, form, { document, timezone }) => {
+        const event = resolveEvent(form.event, timezone);
+        if (!('event' in event) || !isOrWasEvent(event.event, document))
+            return;
+        for (const [key, value] of Object.entries(eventFrontMatter(event.event))) {
+            setOrDelete(extra, key, value);
+        }
+    },
+    micropub: {
+        properties: { start: ['event'], end: ['event'] },
+        publishable: [],
+        toForm: (request) => {
+            if (request.type === 'h-event') {
+                const event = {
+                    start: request.text('start'),
+                    end: request.text('end'),
+                    location: eventPlaceFromMicropub(request.values('location'), request.refuse),
+                };
+                if (event.start === '')
+                    request.refuse('An h-event needs a start.');
+                return { event };
+            }
+            const eventOnly = ['start', 'end'].filter((name) => request.has(name));
+            if (eventOnly.length > 0) {
+                request.refuse(`${eventOnly.join(' and ')} belong to an event; send it as an h-event.`);
+            }
+            return {};
+        },
+        toProperties: (document) => Object.fromEntries(Object.entries(eventFrontMatter(eventOf(document.extra))).flatMap(([name, value]) => Object.entries(answered(name, value)))),
+    },
+};
+function isOrWasEvent(saved, document) {
+    return saved !== undefined || (document !== undefined && eventOf(document.extra) !== undefined);
+}
+const PREVIEW_FIELD = {
+    read: (document) => ({ previewHidden: !previewShown(document.extra) }),
+    submitted: (body) => ({ previewHidden: body[PREVIEW_FRONT_MATTER_KEY] !== undefined }),
+    write: (extra, form) => {
+        setOrDelete(extra, PREVIEW_FRONT_MATTER_KEY, form.previewHidden ? false : undefined);
+    },
+};
+const CITED_ALT_FIELD = {
+    read: (document) => ({ citedAlt: stringOrEmpty(document.extra[CITED_ALT_FRONT_MATTER_KEY]) }),
+    submitted: (body) => ({ citedAlt: trimmedField(body, CITED_ALT_FRONT_MATTER_KEY) }),
+    write: (extra, form) => {
+        setOrDelete(extra, CITED_ALT_FRONT_MATTER_KEY, form.citedAlt === '' ? undefined : form.citedAlt);
+    },
+};
+const READ_FIELD = {
+    read: (document) => ({
+        readStatus: stringOrEmpty(document.extra[READ_STATUS_FRONT_MATTER_KEY]),
+        readOf: readOfForm(readWork(document.extra[READ_OF_FRONT_MATTER_KEY])),
+    }),
+    submitted: (body) => ({
+        readStatus: trimmedField(body, READ_FIELDS.status),
+        readOf: submittedReadOfForm(body),
+    }),
+    write: (extra, form) => {
+        const resolved = resolveRead(form.readStatus, form.readOf);
+        if (!('read' in resolved))
+            return;
+        const { read } = resolved;
+        setOrDelete(extra, READ_OF_FRONT_MATTER_KEY, read && readWorkFrontMatter(read.of));
+        setOrDelete(extra, READ_STATUS_FRONT_MATTER_KEY, read?.status);
+    },
+    micropub: {
+        properties: { 'read-of': ['readOf'], 'read-status': ['readStatus'] },
+        publishable: ['read-of'],
+        toForm: (request) => {
+            const readOfForm = readOfFromMicropub(request.values('read-of'), request.refuse);
+            const readStatus = request.text('read-status');
+            if (readStatus !== '' && !isReadStatus(readStatus)) {
+                request.refuse(`read-status is ${READ_STATUSES.join(', ')}, not ${readStatus}.`);
+            }
+            return { readOf: readOfForm, readStatus };
+        },
+        toProperties: (document) => {
+            const read = readOf(document.extra);
+            return read === undefined
+                ? {}
+                : { 'read-of': [readCite(read.of)], 'read-status': [read.status] };
+        },
+    },
+};
+/** The editor checkbox that selects one syndication target. */
+export function syndicateToField(target) {
+    return `${SYNDICATE_TO_FRONT_MATTER_KEY}-${target.id}`;
+}
+const SYNDICATE_TO_FIELD = {
+    read: (document) => ({ syndicateTo: syndicateToOf(document.extra) }),
+    submitted: (body, declared) => ({
+        syndicateTo: declared
+            .filter((target) => body[syndicateToField(target)] !== undefined)
+            .map((target) => target.id),
+    }),
+    // 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.
+    write: (extra, form, { declared }) => {
+        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])];
+        setOrDelete(extra, SYNDICATE_TO_FRONT_MATTER_KEY, listed.length === 0 ? undefined : listed);
+    },
+    micropub: {
+        properties: { 'mp-syndicate-to': ['syndicateTo'] },
+        publishable: [],
+        toForm: (request) => ({ syndicateTo: syndicateTo(request) }),
+        toProperties: (document, { targets }) => {
+            const declared = new Set(targets.map(({ id }) => id));
+            const selected = syndicateToOf(document.extra).filter((id) => declared.has(id));
+            return selected.length === 0 ? {} : { 'mp-syndicate-to': selected };
+        },
+    },
+};
+/**
+ * The targets `mp-syndicate-to` selects, each once, as the editor's checkboxes
+ * would. A uid the site does not declare is refused by name: a post read back
+ * ignores it, so a client would never learn the post went nowhere.
+ */
+function syndicateTo(request) {
+    const values = request.values('mp-syndicate-to');
+    if (!values.every((value) => typeof value === 'string')) {
+        request.refuse('mp-syndicate-to has to be text, one target uid to a value.');
+        return [];
+    }
+    const declared = new Set(request.targets.map(({ id }) => id));
+    const unknown = values.filter((uid) => !declared.has(uid));
+    if (unknown.length > 0) {
+        request.refuse(`mp-syndicate-to names no syndication target ${unknown.join(', ')}.`);
+    }
+    return [...new Set(values)];
+}
+const PINNED_FIELD = {
+    read: (document) => ({ pinned: pinnedAt(document) !== undefined }),
+    submitted: (body) => ({ pinned: body[PINNED_FRONT_MATTER_KEY] !== undefined }),
+    // 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).
+    write: (extra, form, { document, now }) => {
+        if (!form.pinned)
+            delete extra[PINNED_FRONT_MATTER_KEY];
+        else if (document === undefined || pinnedAt(document) === undefined) {
+            extra[PINNED_FRONT_MATTER_KEY] = toUtcInstant(now, 'UTC');
+        }
+    },
+};
+export const POST_FIELDS = [
+    ENCLOSURE_FIELD,
+    PHOTO_FIELD,
+    citationField('repost-of', (repostOf) => ({ repostOf })),
+    citationField('like-of', (likeOf) => ({ likeOf })),
+    citationField('bookmark-of', (bookmarkOf) => ({ bookmarkOf })),
+    RSVP_FIELD,
+    EVENT_FIELD,
+    PREVIEW_FIELD,
+    CITED_ALT_FIELD,
+    READ_FIELD,
+    SYNDICATE_TO_FIELD,
+    PINNED_FIELD,
+];
+//# sourceMappingURL=post-fields.js.map

package/dist/content/post-fields.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"post-fields.js","sourceRoot":"","sources":["../../src/content/post-fields.ts"],"names":[],"mappings":"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"}

package/dist/{admin/read-field.d.ts → content/read-form.d.ts}

@@ -1,5 +1,5 @@
-import type { Read, ReadOf } from '../content/read.ts';
-import type { FieldError } from './editor-layout.ts';
+import type { FieldError } from './form-error.ts';
+import type { Read, ReadOf } from './read.ts';
 export interface ReadOfForm {
     name: string;
     author: string;
@@ -13,10 +13,12 @@ export declare const READ_FIELDS: {
     readonly uid: 'read-of-uid';
     readonly url: 'read-of-url';
 };
+export declare function submittedReadOfForm(body: Readonly<Record<string, unknown>>): ReadOfForm;
 export declare const BLANK_READ_OF_FORM: ReadOfForm;
 export declare function readOfForm(of: ReadOf | undefined): ReadOfForm;
-export declare function submittedReadOfForm(body: Record<string, unknown>): ReadOfForm;
 export declare function resolveRead(status: string, of: ReadOfForm): {
     read: Read | undefined;
 } | FieldError;
-//# sourceMappingURL=read-field.d.ts.map
+export declare function readOfFromMicropub(values: readonly unknown[], refuse: (message: string) => void): ReadOfForm;
+export declare function readCite(of: ReadOf): object;
+//# sourceMappingURL=read-form.d.ts.map

package/dist/content/read-form.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"read-form.d.ts","sourceRoot":"","sources":["../../src/content/read-form.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAElD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAE9C,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb;AAED,eAAO,MAAM,WAAW;aACtB,MAAM,EAAE,aAAa;aACrB,IAAI,EAAE,cAAc;aACpB,MAAM,EAAE,gBAAgB;aACxB,GAAG,EAAE,aAAa;aAClB,GAAG,EAAE,aAAa;CACV,CAAC;AAEX,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,UAAU,CAOvF;AAED,eAAO,MAAM,kBAAkB,EAAE,UAAuD,CAAC;AAEzF,wBAAgB,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,CAO7D;AAED,wBAAgB,WAAW,CACzB,MAAM,EAAE,MAAM,EACd,EAAE,EAAE,UAAU,GACb;IAAE,IAAI,EAAE,IAAI,GAAG,SAAS,CAAA;CAAE,GAAG,UAAU,CAgCzC;AAID,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,SAAS,OAAO,EAAE,EAC1B,MAAM,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAChC,UAAU,CAiCZ;AAED,wBAAgB,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM,CAM3C"}

package/dist/content/read-form.js

@@ -0,0 +1,99 @@
+import { trimmedField } from '../util/forms.js';
+import { isWebUrl } from './enclosure.js';
+import { isReadStatus, READ_STATUSES } from './read.js';
+export const READ_FIELDS = {
+    status: 'read-status',
+    name: 'read-of-name',
+    author: 'read-of-author',
+    uid: 'read-of-uid',
+    url: 'read-of-url',
+};
+export function submittedReadOfForm(body) {
+    return {
+        name: trimmedField(body, READ_FIELDS.name),
+        author: trimmedField(body, READ_FIELDS.author),
+        uid: trimmedField(body, READ_FIELDS.uid),
+        url: trimmedField(body, READ_FIELDS.url),
+    };
+}
+export const BLANK_READ_OF_FORM = { name: '', author: '', uid: '', url: '' };
+export function readOfForm(of) {
+    return {
+        name: of?.name ?? '',
+        author: of?.author ?? '',
+        uid: of?.uid ?? '',
+        url: of?.url ?? '',
+    };
+}
+export function resolveRead(status, of) {
+    const filled = Object.values(of).some((value) => value !== '');
+    if (status === '' && !filled)
+        return { read: undefined };
+    if (status !== '' && !isReadStatus(status)) {
+        return {
+            error: `A read status is ${READ_STATUSES.join(', ')}, not ${status}.`,
+            field: 'editor-read-status',
+        };
+    }
+    if (of.name === '') {
+        return { error: 'A read needs the title of what was read.', field: 'editor-read-of-name' };
+    }
+    if (!isReadStatus(status)) {
+        return {
+            error: 'A read needs a read status: want to read, currently reading or finished.',
+            field: 'editor-read-status',
+        };
+    }
+    if (of.url !== '' && !isWebUrl(of.url)) {
+        return {
+            error: 'The address of what was read has to be a web address, like https://example.com/a-book/.',
+            field: 'editor-read-of-url',
+        };
+    }
+    const word = (value) => (value === '' ? undefined : value);
+    return {
+        read: {
+            status,
+            of: { name: of.name, author: word(of.author), uid: word(of.uid), url: word(of.url) },
+        },
+    };
+}
+const READ_OF_PROPERTIES = ['name', 'author', 'uid', 'url'];
+export function readOfFromMicropub(values, refuse) {
+    if (values.length > 1)
+        refuse('read-of takes one value.');
+    const [value] = values;
+    if (value === undefined)
+        return BLANK_READ_OF_FORM;
+    const { type, properties } = typeof value === 'object' && value !== null ? value : {};
+    if (!Array.isArray(type) ||
+        !type.includes('h-cite') ||
+        typeof properties !== 'object' ||
+        properties === null) {
+        refuse('read-of is an h-cite, { "type": ["h-cite"], "properties": { "name": ["…"] } }.');
+        return BLANK_READ_OF_FORM;
+    }
+    const given = properties;
+    const unknown = Object.keys(given).filter((name) => !READ_OF_PROPERTIES.includes(name));
+    if (unknown.length > 0)
+        refuse(`read-of does not understand ${unknown.join(', ')}.`);
+    const field = (name) => {
+        const values = given[name] ?? [];
+        if (!Array.isArray(values) ||
+            values.length > 1 ||
+            !values.every((v) => typeof v === 'string')) {
+            refuse(`read-of ${name} takes one text value.`);
+            return '';
+        }
+        return (values[0] ?? '').trim();
+    };
+    return { name: field('name'), author: field('author'), uid: field('uid'), url: field('url') };
+}
+export function readCite(of) {
+    const fields = Object.entries(of).filter(([, value]) => value !== undefined);
+    return {
+        type: ['h-cite'],
+        properties: Object.fromEntries(fields.map(([name, value]) => [name, [value]])),
+    };
+}
+//# sourceMappingURL=read-form.js.map

package/dist/content/read-form.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"read-form.js","sourceRoot":"","sources":["../../src/content/read-form.ts"],"names":[],"mappings":"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"}

package/dist/content/read.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../src/content/read.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,wBAAwB,YAAY,CAAC;AAClD,eAAO,MAAM,4BAA4B,gBAAgB,CAAC;AAE1D,eAAO,MAAM,aAAa,YAAI,SAAS,EAAE,SAAS,EAAE,UAAU,CAAU,CAAC;AAEzE,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAExD,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,CAInE,CAAC;AAEF,MAAM,WAAW,MAAM;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC;AAED,MAAM,WAAW,IAAI;IACnB,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,UAAU,CAEhE;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAKjF;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAW3D;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE5C;AAED,wBAAgB,mBAAmB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,MAAM,GAAG,MAAM,CAO9E;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,GAAG,MAAM,CAcvD"}
+{"version":3,"file":"read.d.ts","sourceRoot":"","sources":["../../src/content/read.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,wBAAwB,YAAY,CAAC;AAClD,eAAO,MAAM,4BAA4B,gBAAgB,CAAC;AAE1D,eAAO,MAAM,aAAa,YAAI,SAAS,EAAE,SAAS,EAAE,UAAU,CAAU,CAAC;AAEzE,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;AAExD,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU,EAAE,MAAM,CAAC,CAInE,CAAC;AAEF,MAAM,WAAW,MAAM;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC;AAED,MAAM,WAAW,IAAI;IACnB,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;CACrB;AAED,wBAAgB,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,UAAU,CAEhE;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,IAAI,GAAG,SAAS,CAKjF;AAED,wBAAgB,QAAQ,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAW3D;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE5C;AAED,wBAAgB,mBAAmB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,MAAM,GAAG,MAAM,CAO9E;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,GAAG,MAAM,CAgBvD"}

package/dist/content/read.js

@@ -1,3 +1,4 @@
+import { escapeAttribute, escapeText } from '../util/html.js';
 import { isWebUrl } from './enclosure.js';
 export const READ_OF_FRONT_MATTER_KEY = 'read-of';
 export const READ_STATUS_FRONT_MATTER_KEY = 'read-status';
@@ -47,21 +48,16 @@ export function readLine(read) {
     if (read === undefined)
         return '';
     const { status, of } = read;
-    const cited = `<cite class="p-name">${escapeHtml(of.name)}</cite>`;
+    const cited = `<cite class="p-name">${escapeText(of.name)}</cite>`;
     return (`<p class="read-line"><data class="p-read-status" value="${status}">` +
         `${READ_STATUS_LABELS[status]}</data>: <span class="p-read-of h-cite">` +
-        (of.url === undefined ? cited : `<a class="u-url" href="${escapeHtml(of.url)}">${cited}</a>`) +
-        (of.author === undefined ? '' : ` by <span class="p-author">${escapeHtml(of.author)}</span>`) +
+        (of.url === undefined
+            ? cited
+            : `<a class="u-url" href="${escapeAttribute(of.url)}">${cited}</a>`) +
+        (of.author === undefined ? '' : ` by <span class="p-author">${escapeText(of.author)}</span>`) +
         (of.uid === undefined
             ? ''
-            : `, <data class="p-uid" value="${escapeHtml(of.uid)}">${escapeHtml(uidLabel(of.uid))}</data>`) +
+            : `, <data class="p-uid" value="${escapeAttribute(of.uid)}">${escapeText(uidLabel(of.uid))}</data>`) +
         '</span></p>\n');
 }
-function escapeHtml(value) {
-    return value
-        .replaceAll('&', '&amp;')
-        .replaceAll('<', '&lt;')
-        .replaceAll('>', '&gt;')
-        .replaceAll('"', '&quot;');
-}
 //# sourceMappingURL=read.js.map

package/dist/content/read.js.map

@@ -1 +1 @@
-{"version":3,"file":"read.js","sourceRoot":"","sources":["../../src/content/read.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"read.js","sourceRoot":"","sources":["../../src/content/read.ts"],"names":[],"mappings":"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"}

package/dist/content/redirects.d.ts

@@ -0,0 +1,84 @@
+/**
+ * The site's own redirects, relative to the content directory (TASK-128).
+ * Content rather than data, like `site.json`: a site's old URLs are part of the
+ * site, and belong in the same git history as the posts they lead to
+ * (decision-9).
+ */
+export declare const REDIRECTS_FILE = "_data/redirects.json";
+declare const STATUSES: readonly [301, 302, 307, 308];
+/** A redirect's status: permanent (301, 308) or temporary (302, 307). */
+export type RedirectStatus = (typeof STATUSES)[number];
+/** One declared redirect, parsed and checked. */
+export interface Redirect {
+    /** The source as the file spells it, for messages. */
+    from: string;
+    /** The `Location` to send, already URL-safe. */
+    location: string;
+    status: RedirectStatus;
+    /**
+     * Whether the request's query goes on to the target: true for a source
+     * without a query of its own whose target names none either, so
+     * `/old/?utm=x` lands on `/new/?utm=x`.
+     */
+    passQuery: boolean;
+}
+/**
+ * Every declared redirect, keyed the way a request is looked up: by decoded
+ * path for a source without a query, and by decoded path plus its sorted query
+ * for one with.
+ */
+export interface RedirectTable {
+    readonly paths: ReadonlyMap<string, Redirect>;
+    readonly queries: ReadonlyMap<string, Redirect>;
+}
+/** A site that declares no redirects. */
+export declare const NO_REDIRECTS: RedirectTable;
+interface RedirectFile {
+    readonly path: string;
+    readonly text: string;
+}
+/**
+ * Parse the redirect files, in order, into the redirects they can serve and a
+ * line for every one they cannot: an entry that is not a well-formed
+ * redirect, a source declared twice (the first wins, so the earlier file
+ * does), and every entry that leads into a loop. A file is a list of
+ * `{ "from", "to", "status" }` or an object mapping each source to its target.
+ */
+export declare function parseRedirects(files: readonly RedirectFile[]): {
+    table: RedirectTable;
+    problems: string[];
+};
+/** The redirect whose source names this path with exactly this query. */
+export declare function findQueryRedirect(table: RedirectTable, pathname: string, search: string): Redirect | undefined;
+/**
+ * The redirect whose source names this path with no query, asked after every
+ * live lookup has missed. A path asked for without its trailing slash finds a
+ * source declared with one, so it reaches the target in one hop.
+ */
+export declare function findPathRedirect(table: RedirectTable, pathname: string): Redirect | undefined;
+/** Where a redirect sends a request that came with `search`. */
+export declare function redirectLocation(redirect: Redirect, search: string): string;
+/** A query as a redirect source is keyed by: its parameters, sorted. */
+export declare function sortedQuery(search: string): string;
+/** A path decoded as a request's is, or as it came when it does not decode. */
+export declare function decodedPath(pathname: string): string;
+/** The site's declared redirects, read from the files as they are now. */
+export interface RedirectSource {
+    current(): RedirectTable;
+}
+/**
+ * Read `content/_data/redirects.json` and every file in
+ * `content/_data/redirects/` per call, parsing them again only when one has
+ * changed, so an edit takes effect on the next request with no restart and
+ * with the watcher off. Each problem is logged once per change rather than on
+ * every request; the CMS asks once at boot, so a file with problems says so
+ * before the first request arrives.
+ */
+export declare function createRedirectSource(options: {
+    contentDir: string;
+    logger?: {
+        warn(message: string): void;
+    } | undefined;
+}): RedirectSource;
+export {};
+//# sourceMappingURL=redirects.d.ts.map

package/dist/content/redirects.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"redirects.d.ts","sourceRoot":"","sources":["../../src/content/redirects.ts"],"names":[],"mappings":"AAKA;;;;;GAKG;AACH,eAAO,MAAM,cAAc,yBAAyB,CAAC;AAIrD,QAAA,MAAM,QAAQ,YAAI,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAU,CAAC;AAE/C,yEAAyE;AACzE,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC;AAEvD,iDAAiD;AACjD,MAAM,WAAW,QAAQ;IACvB,sDAAsD;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,gDAAgD;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,cAAc,CAAC;IACvB;;;;OAIG;IACH,SAAS,EAAE,OAAO,CAAC;CACpB;AAED;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC9C,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;CACjD;AAED,yCAAyC;AACzC,eAAO,MAAM,YAAY,EAAE,aAAwD,CAAC;AAKpF,UAAU,YAAY;IACpB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,SAAS,YAAY,EAAE,GAAG;IAC9D,KAAK,EAAE,aAAa,CAAC;IACrB,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,CA+CA;AA2FD,yEAAyE;AACzE,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,QAAQ,GAAG,SAAS,CAGtB;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAK7F;AAED,gEAAgE;AAChE,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAM3E;AAED,wEAAwE;AACxE,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAIlD;AAED,+EAA+E;AAC/E,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAMpD;AAED,0EAA0E;AAC1E,MAAM,WAAW,cAAc;IAC7B,OAAO,IAAI,aAAa,CAAC;CAC1B;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE;IAC5C,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,SAAS,CAAC;CACtD,GAAG,cAAc,CAuBjB"}