@geekity/cms 0.30.0 → 0.32.0

package/dist/comments/migrations.js

@@ -0,0 +1,194 @@
+import { readdirSync, readFileSync } from 'node:fs';
+import path from 'node:path';
+import { COMMENT_PAGE_PREFIX, commentPageHref, repliesKey, isKey } from '../content/guids.js';
+import { readFileIfPresentSync, writeFileAtomicallySync } from '../files/atomic.js';
+import { nonEmptyStringOrNull } from '../util/forms.js';
+import { isRecord } from '../util/guards.js';
+import { COMMENT_EMAILS_FILE_MODE, commentEmailsFile, commentSlugs, commentsFile, contactsIn, contactsJson, } from './records.js';
+/**
+ * Move every email still in a comment file into `data/` (TASK-182).
+ *
+ * A site that kept comments before the emails moved has them in
+ * `content/_data/comments/`, and a comment file somebody edits by hand may
+ * gain one again. Boot calls this before `rebuildCommentIndexes`, so
+ * both end up in the private file and out of the published one. It edits each
+ * file's JSON as it finds it, taking off `author.email` and `notify` and
+ * nothing else, so a key this version does not know and an entry it cannot
+ * read survive it. An email `data/` already holds for that comment wins. A file
+ * with nothing to take off is not written, so a second boot writes nothing.
+ *
+ * Synchronous, like the other boot migrations, and run before anything else
+ * can be writing a comment.
+ */
+export function migrateCommentEmails(records) {
+    let files = 0;
+    for (const slug of commentSlugs(records.contentDir)) {
+        const file = commentsFile(records.contentDir, slug);
+        let parsed;
+        try {
+            parsed = JSON.parse(readFileIfPresentSync(file) ?? '');
+        }
+        catch {
+            continue;
+        }
+        if (!isRecord(parsed) || !Array.isArray(parsed['comments']))
+            continue;
+        const found = new Map();
+        let stripped = false;
+        const entries = parsed['comments'].map((entry) => {
+            if (!isRecord(entry))
+                return entry;
+            const author = isRecord(entry['author']) ? entry['author'] : undefined;
+            if (!('notify' in entry) && !(author !== undefined && 'email' in author))
+                return entry;
+            stripped = true;
+            const email = nonEmptyStringOrNull(author?.['email']);
+            const id = entry['id'];
+            if (typeof id === 'string' && id !== '' && email !== null) {
+                found.set(id, { email, notify: entry['notify'] === true });
+            }
+            const kept = without(entry, 'notify');
+            if (author !== undefined)
+                kept['author'] = without(author, 'email');
+            return kept;
+        });
+        if (!stripped)
+            continue;
+        const privateFile = commentEmailsFile(records.dataDir, slug);
+        const contacts = contactsIn(readFileIfPresentSync(privateFile));
+        for (const [id, contact] of found)
+            if (!contacts.has(id))
+                contacts.set(id, contact);
+        if (contacts.size > 0) {
+            writeFileAtomicallySync(privateFile, contactsJson(contacts), {
+                mode: COMMENT_EMAILS_FILE_MODE,
+            });
+        }
+        writeFileAtomicallySync(file, `${JSON.stringify({ ...parsed, comments: entries }, null, 2)}\n`);
+        files += 1;
+    }
+    return { files };
+}
+/**
+ * Give every stored comment whose id is not a key the key of that id
+ * (decision-51): the first 16 hex digits of its SHA-256, so every boot works
+ * out the same one. A UUID a form comment or a webmention was given before
+ * keys, and a URL an import wrote, both become keys this way.
+ *
+ * What names an old id follows it: a comment's `inReplyTo`, the email `data/`
+ * keeps for it, and a document naming its old page or anchor, such as a reply
+ * post's `in-reply-to`. The documents go first, then for each post the private
+ * file with both keys, the comment file, and the private file with the new key
+ * alone, so a boot stopped anywhere loses nothing and the next one finishes
+ * the job. A site whose ids are all keys has its files read and none written.
+ *
+ * Synchronous, like the other boot migrations, and run before anything else
+ * can be writing a comment.
+ */
+export function migrateCommentKeys(records) {
+    const keys = new Map();
+    const held = [];
+    for (const slug of commentSlugs(records.contentDir)) {
+        const file = commentsFile(records.contentDir, slug);
+        let parsed;
+        try {
+            parsed = JSON.parse(readFileIfPresentSync(file) ?? '');
+        }
+        catch {
+            continue;
+        }
+        if (!isRecord(parsed) || !Array.isArray(parsed['comments']))
+            continue;
+        for (const entry of parsed['comments']) {
+            const id = isRecord(entry) ? entry['id'] : undefined;
+            if (typeof id === 'string' && id !== '' && !isKey(id))
+                keys.set(id, repliesKey(id));
+        }
+        held.push({ slug, file, parsed, entries: parsed['comments'] });
+    }
+    const renamed = renamer(keys);
+    if (keys.size > 0)
+        rewriteDocuments(records.contentDir, renamed);
+    for (const { slug, file, parsed, entries } of held) {
+        const rekeyed = entries.map((entry) => {
+            if (!isRecord(entry))
+                return entry;
+            const id = entry['id'];
+            const inReplyTo = entry['inReplyTo'];
+            return {
+                ...entry,
+                ...(typeof id === 'string' && keys.has(id) ? { id: keys.get(id) } : {}),
+                ...(typeof inReplyTo === 'string'
+                    ? { inReplyTo: keys.get(inReplyTo) ?? renamed(inReplyTo) }
+                    : {}),
+            };
+        });
+        const changed = JSON.stringify(rekeyed) !== JSON.stringify(entries);
+        const privateFile = commentEmailsFile(records.dataDir, slug);
+        const contacts = contactsIn(readFileIfPresentSync(privateFile));
+        const keyed = new Map();
+        for (const [id, contact] of contacts) {
+            const key = isKey(id) ? id : repliesKey(id);
+            if (!keyed.has(key) || id === key)
+                keyed.set(key, contact);
+        }
+        const stale = [...contacts.keys()].some((id) => !isKey(id));
+        const writePrivate = (written) => {
+            writeFileAtomicallySync(privateFile, contactsJson(written), {
+                mode: COMMENT_EMAILS_FILE_MODE,
+            });
+        };
+        if (changed) {
+            if (stale)
+                writePrivate(new Map([...contacts, ...keyed]));
+            writeFileAtomicallySync(file, `${JSON.stringify({ ...parsed, comments: rekeyed }, null, 2)}\n`);
+        }
+        if (stale)
+            writePrivate(keyed);
+    }
+    return { comments: keys.size };
+}
+/**
+ * Text with every old comment page and anchor in it naming the comment by its
+ * key. The longest ids go first, so an id that begins another cannot take a
+ * piece of it.
+ */
+function renamer(keys) {
+    const swaps = [...keys]
+        .sort(([left], [right]) => right.length - left.length)
+        .flatMap(([id, key]) => [
+        [`${COMMENT_PAGE_PREFIX}${encodeURIComponent(id)}/`, commentPageHref(key)],
+        [`#comment-${id}`, `#comment-${key}`],
+    ]);
+    return (text) => swaps.reduce((said, [from = '', to = '']) => said.replaceAll(from, to), text);
+}
+/** Every Markdown file under the content directory, rewritten where `renamed` changes it. */
+function rewriteDocuments(contentDir, renamed) {
+    let names;
+    try {
+        names = readdirSync(contentDir, { recursive: true, encoding: 'utf8' });
+    }
+    catch {
+        return;
+    }
+    for (const name of names) {
+        if (!/\.(md|markdown)$/i.test(name) || name.split(path.sep).includes('node_modules'))
+            continue;
+        const file = path.join(contentDir, name);
+        let text;
+        try {
+            text = readFileSync(file, 'utf8');
+        }
+        catch {
+            continue;
+        }
+        const next = renamed(text);
+        if (next !== text)
+            writeFileAtomicallySync(file, next);
+    }
+}
+/** A copy of a record without one key, every other key where it was. */
+function without(record, key) {
+    return Object.fromEntries(Object.entries(record).filter(([name]) => name !== key));
+}
+//# sourceMappingURL=migrations.js.map

package/dist/comments/migrations.js.map

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

package/dist/comments/moderate.d.ts

@@ -1,6 +1,6 @@
-import type { CommentStatus, PostComment } from '../admin/store.ts';
+import type { CommentStatus, PostComment } from '../store/admin-store.ts';
 import type { CommentRecords } from './records.ts';
-import type { CommentChecker } from './submission.ts';
+import type { CommentChecker } from '../forms/checker.ts';
 /**
  * The three things that can be done to a stored comment, in one place.
  *

package/dist/comments/moderate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"moderate.d.ts","sourceRoot":"","sources":["../../src/comments/moderate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEpE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAiB,MAAM,iBAAiB,CAAC;AAErE;;;;;;;;;;;;;GAaG;AAEH,kEAAkE;AAClE,eAAO,MAAM,kBAAkB,YAAI,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAU,CAAC;AAEzE,yCAAyC;AACzC,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEnE,qCAAqC;AACrC,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,gBAAgB,CAE3E;AAED,qCAAqC;AACrC,MAAM,MAAM,iBAAiB;AAC3B,yEAAyE;AACvE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE;AAC3B,2DAA2D;GACzD;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAA;CAAE;AAC/D,iDAAiD;GAC/C;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAA;CAAE;AAC3F,+DAA+D;GAC7D;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAA;CAAE,CAAC;AAEhE,oDAAoD;AACpD,MAAM,WAAW,sBAAsB;IACrC,2DAA2D;IAC3D,OAAO,EAAE,cAAc,CAAC;IACxB,qBAAqB;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,wBAAwB;IACxB,MAAM,EAAE,gBAAgB,CAAC;IACzB,iFAAiF;IACjF,OAAO,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IACrC,kEAAkE;IAClE,OAAO,EAAE,MAAM,CAAC;IAChB,mEAAmE;IACnE,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,SAAS,CAAC;CACtD;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAkBjG"}
+{"version":3,"file":"moderate.d.ts","sourceRoot":"","sources":["../../src/comments/moderate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAI1E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,cAAc,EAAiB,MAAM,qBAAqB,CAAC;AAEzE;;;;;;;;;;;;;GAaG;AAEH,kEAAkE;AAClE,eAAO,MAAM,kBAAkB,YAAI,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAU,CAAC;AAEzE,yCAAyC;AACzC,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEnE,qCAAqC;AACrC,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,gBAAgB,CAE3E;AAED,qCAAqC;AACrC,MAAM,MAAM,iBAAiB;AAC3B,yEAAyE;AACvE;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE;AAC3B,2DAA2D;GACzD;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAA;CAAE;AAC/D,iDAAiD;GAC/C;IAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,aAAa,CAAA;CAAE;AAC3F,+DAA+D;GAC7D;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAA;CAAE,CAAC;AAEhE,oDAAoD;AACpD,MAAM,WAAW,sBAAsB;IACrC,2DAA2D;IAC3D,OAAO,EAAE,cAAc,CAAC;IACxB,qBAAqB;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,wBAAwB;IACxB,MAAM,EAAE,gBAAgB,CAAC;IACzB,iFAAiF;IACjF,OAAO,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IACrC,kEAAkE;IAClE,OAAO,EAAE,MAAM,CAAC;IAChB,mEAAmE;IACnE,MAAM,CAAC,EAAE;QAAE,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,SAAS,CAAC;CACtD;AAED;;;;;;GAMG;AACH,wBAAsB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAkBjG"}

package/dist/comments/moderate.js

@@ -1,3 +1,5 @@
+import { messageOf } from '../util/errors.js';
+import { absoluteUrl } from '../util/url.js';
 import { deleteComment, updateComment } from './records.js';
 /**
  * The three things that can be done to a stored comment, in one place.
@@ -57,7 +59,7 @@ async function tellChecker(options, comment, before) {
         return;
     const report = {
         comment,
-        url: absolute(comment.permalink, options.baseUrl),
+        url: absoluteUrl(comment.permalink, options.baseUrl),
         baseUrl: options.baseUrl,
     };
     try {
@@ -73,16 +75,4 @@ async function tellChecker(options, comment, before) {
         logger.warn(`The comment checker would not take the correction: ${messageOf(error)}`);
     }
 }
-/** A site-root path as an absolute URL. */
-function absolute(pathname, baseUrl) {
-    try {
-        return new URL(pathname, baseUrl).href;
-    }
-    catch {
-        return pathname;
-    }
-}
-function messageOf(error) {
-    return error instanceof Error ? error.message : String(error);
-}
 //# sourceMappingURL=moderate.js.map

package/dist/comments/moderate.js.map

@@ -1 +1 @@
-{"version":3,"file":"moderate.js","sourceRoot":"","sources":["../../src/comments/moderate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"moderate.js","sourceRoot":"","sources":["../../src/comments/moderate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAI5D;;;;;;;;;;;;;GAaG;AAEH,kEAAkE;AAClE,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAU,CAAC;AAKzE,qCAAqC;AACrC,MAAM,UAAU,kBAAkB,CAAC,KAAa;IAC9C,OAAQ,kBAAwC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACnE,CAAC;AA6BD;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAA+B;IACnE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IACxC,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;IAC1C,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAEhD,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;QACxB,MAAM,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACjC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC5C,CAAC;IAED,MAAM,MAAM,GAAkB,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,CAAC;IACzE,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM;QAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAExE,MAAM,KAAK,GAAG,MAAM,aAAa,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAC3D,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC;IAEjD,MAAM,WAAW,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC/C,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;AAChE,CAAC;AAED;;;;;;GAMG;AACH,KAAK,UAAU,WAAW,CACxB,OAA+B,EAC/B,OAAoB,EACpB,MAAqB;IAErB,MAAM,OAAO,GAA+B,OAAO,CAAC,OAAO,CAAC;IAC5D,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO;IAElC,MAAM,MAAM,GAAkB;QAC5B,OAAO;QACP,GAAG,EAAE,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC;QACpD,OAAO,EAAE,OAAO,CAAC,OAAO;KACzB,CAAC;IAEF,IAAI,CAAC;QACH,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM;YAAE,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC,MAAM,CAAC,CAAC;aAC7D,IAAI,MAAM,KAAK,MAAM;YAAE,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC,MAAM,CAAC,CAAC;IAChE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,0EAA0E;QAC1E,8DAA8D;QAC9D,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,sDAAsD,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACxF,CAAC;AACH,CAAC"}

package/dist/comments/page-form.d.ts

@@ -0,0 +1,52 @@
+import type { Document } from '../content/document.ts';
+import type { AdminStore } from '../store/admin-store.ts';
+import type { Conversation } from './conversation.ts';
+import type { CommentFormContext, CommentViewer } from './form.ts';
+/**
+ * The same form drawn for whoever is filling it in: the short one when the
+ * site knows them, and the stranger's one when it does not.
+ */
+export declare function drawnFor(form: CommentFormContext, viewer: CommentViewer | undefined): CommentFormContext;
+/**
+ * The thank-you a reader is shown after posting, from the query the redirect
+ * carried, or `undefined` when the URL says nothing.
+ *
+ * A query rather than a flash message, because a reader has no session to hang
+ * one on, and because a comment form that only works for people with cookies
+ * is not a comment form.
+ */
+export declare function commentNoticeFor(query: string | undefined): string | undefined;
+/**
+ * The comment a `?reply_to=` query points at, as the theme needs it, or an
+ * empty object when the query names nothing on this post.
+ *
+ * Checked against the index rather than trusted, so a made-up id — or one from
+ * another page — cannot put a stranger's name on somebody's reply form, and so
+ * a comment waiting for a moderator cannot be discovered by guessing. With the
+ * post's `thread`, which is handed over for somebody signed in (TASK-300), any
+ * entry a reader can see is answerable: a webmention, a fediverse reply or a
+ * reply post as well as a comment.
+ */
+export declare function commentReplyTarget(options: {
+    admin: AdminStore;
+    document: Document;
+    id: string | undefined;
+    thread?: Conversation | undefined;
+}): Record<string, unknown>;
+/**
+ * The form for a post, or `undefined` when it is not taking comments.
+ *
+ * What the renderer is handed at boot. It reads the settings and the clock on
+ * every render, so a post that closed an hour ago stops offering a form on the
+ * very next request.
+ */
+export declare function commentFormFor(options: {
+    document: Document;
+    site: Record<string, unknown>;
+    now: Date;
+    /** Whether the site can send mail, which is whether the box is offered. */
+    notifiable?: boolean | undefined;
+    /** Who the request's session says is reading, when it says anybody. */
+    viewer?: CommentViewer | undefined;
+}): CommentFormContext | undefined;
+//# sourceMappingURL=page-form.d.ts.map

package/dist/comments/page-form.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"page-form.d.ts","sourceRoot":"","sources":["../../src/comments/page-form.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAE1D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAGnE;;;GAGG;AACH,wBAAgB,QAAQ,CACtB,IAAI,EAAE,kBAAkB,EACxB,MAAM,EAAE,aAAa,GAAG,SAAS,GAChC,kBAAkB,CAEpB;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAE9E;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,OAAO,EAAE;IAC1C,KAAK,EAAE,UAAU,CAAC;IAClB,QAAQ,EAAE,QAAQ,CAAC;IACnB,EAAE,EAAE,MAAM,GAAG,SAAS,CAAC;IACvB,MAAM,CAAC,EAAE,YAAY,GAAG,SAAS,CAAC;CACnC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAe1B;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE;IACtC,QAAQ,EAAE,QAAQ,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC9B,GAAG,EAAE,IAAI,CAAC;IACV,2EAA2E;IAC3E,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,uEAAuE;IACvE,MAAM,CAAC,EAAE,aAAa,GAAG,SAAS,CAAC;CACpC,GAAG,kBAAkB,GAAG,SAAS,CAKjC"}

package/dist/comments/page-form.js

@@ -0,0 +1,62 @@
+import { visibleReply } from './conversation.js';
+import { COMMENT_NOTICES, commentForm, signedInCommentForm } from './form.js';
+import { commentPolicyOf, commentsOpen } from './policy.js';
+/**
+ * The same form drawn for whoever is filling it in: the short one when the
+ * site knows them, and the stranger's one when it does not.
+ */
+export function drawnFor(form, viewer) {
+    return viewer === undefined ? form : signedInCommentForm(form, viewer);
+}
+/**
+ * The thank-you a reader is shown after posting, from the query the redirect
+ * carried, or `undefined` when the URL says nothing.
+ *
+ * A query rather than a flash message, because a reader has no session to hang
+ * one on, and because a comment form that only works for people with cookies
+ * is not a comment form.
+ */
+export function commentNoticeFor(query) {
+    return query === undefined ? undefined : COMMENT_NOTICES[query];
+}
+/**
+ * The comment a `?reply_to=` query points at, as the theme needs it, or an
+ * empty object when the query names nothing on this post.
+ *
+ * Checked against the index rather than trusted, so a made-up id — or one from
+ * another page — cannot put a stranger's name on somebody's reply form, and so
+ * a comment waiting for a moderator cannot be discovered by guessing. With the
+ * post's `thread`, which is handed over for somebody signed in (TASK-300), any
+ * entry a reader can see is answerable: a webmention, a fediverse reply or a
+ * reply post as well as a comment.
+ */
+export function commentReplyTarget(options) {
+    if (options.id === undefined || options.id === '')
+        return {};
+    if (options.thread !== undefined) {
+        const reply = visibleReply(options.thread.replies, options.id);
+        return reply === undefined
+            ? {}
+            : { commentReplyTo: reply.key, commentReplyingTo: reply.author.name };
+    }
+    const parent = options.admin.getComment(options.id);
+    if (parent === undefined || parent.slug !== options.document.slug)
+        return {};
+    if (parent.status !== 'approved')
+        return {};
+    return { commentReplyTo: parent.id, commentReplyingTo: parent.author.name };
+}
+/**
+ * The form for a post, or `undefined` when it is not taking comments.
+ *
+ * What the renderer is handed at boot. It reads the settings and the clock on
+ * every render, so a post that closed an hour ago stops offering a form on the
+ * very next request.
+ */
+export function commentFormFor(options) {
+    if (!commentsOpen(options.document, commentPolicyOf(options.site), options.now))
+        return undefined;
+    const form = commentForm(options.document, options.now, options.notifiable ?? false);
+    return drawnFor(form, options.viewer);
+}
+//# sourceMappingURL=page-form.js.map

package/dist/comments/page-form.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"page-form.js","sourceRoot":"","sources":["../../src/comments/page-form.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAE9E,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE5D;;;GAGG;AACH,MAAM,UAAU,QAAQ,CACtB,IAAwB,EACxB,MAAiC;IAEjC,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,mBAAmB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACzE,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAyB;IACxD,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;AAClE,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAKlC;IACC,IAAI,OAAO,CAAC,EAAE,KAAK,SAAS,IAAI,OAAO,CAAC,EAAE,KAAK,EAAE;QAAE,OAAO,EAAE,CAAC;IAE7D,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACjC,MAAM,KAAK,GAAG,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;QAC/D,OAAO,KAAK,KAAK,SAAS;YACxB,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,EAAE,cAAc,EAAE,KAAK,CAAC,GAAG,EAAE,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC1E,CAAC;IAED,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACpD,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,CAAC,QAAQ,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IAC7E,IAAI,MAAM,CAAC,MAAM,KAAK,UAAU;QAAE,OAAO,EAAE,CAAC;IAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,CAAC,EAAE,EAAE,iBAAiB,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;AAC9E,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAAC,OAQ9B;IACC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC;QAAE,OAAO,SAAS,CAAC;IAElG,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,UAAU,IAAI,KAAK,CAAC,CAAC;IACrF,OAAO,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;AACxC,CAAC"}

package/dist/comments/policy.d.ts

@@ -1,27 +1,25 @@
-import type { Document } from '../content/document.ts';
+import type { Document, DocumentType } from '../content/document.ts';
 /**
- * When a post is taking comments, and when it has stopped.
+ * When a post or a page is taking comments, and when it has stopped.
  *
- * WordPress spells this as three things that argue with each other — a site
- * switch, an age, and a per-post override — and so does this. They are read in
- * one place so the form under a post and the endpoint that refuses a
- * submission can never disagree about whether a post is open, which is the
- * only way a comment form can lie to somebody who has just typed a paragraph.
- */
-/** The front-matter key a post opens or closes its own comments with. */
-export declare const COMMENTS_FRONT_MATTER_KEY = "comments";
-/**
- * How long a post takes comments for, in days, before this is decided
- * otherwise. WordPress's own default, and the age at which a post stops being
- * a conversation and starts being a spam target.
+ * WordPress spells this as things that argue with each other — a site switch,
+ * a default per type, an age, and a per-document override — and so does this.
+ * They are read in one place so the form under a document, the endpoint that
+ * refuses a submission and the editor's "Follow the site settings" can never
+ * disagree about whether it is open, which is the only way a comment form can
+ * lie to somebody who has just typed a paragraph.
+ *
+ * Only the form and the endpoint ask. What was already said is shown under
+ * every document, open or closed.
  */
-export declare const DEFAULT_COMMENTS_CLOSE_AFTER_DAYS = 14;
-/** The site's half of the decision: the two settings that apply to every post. */
+/** The site's half of the decision: the settings that apply to every document. */
 export interface CommentPolicy {
     /** Whether the site takes comments at all. Off means off everywhere. */
     enabled: boolean;
-    /** Days after a post's `date` that it stops taking them. Zero never closes. */
+    /** Days after a document's `date` that it stops taking them. Zero never closes. */
     closeAfterDays: number;
+    /** Whether a document of each type takes comments when its front matter does not say. */
+    openByDefault: Readonly<Record<DocumentType, boolean>>;
 }
 /**
  * Whether this document is taking native comments right now.
@@ -35,33 +33,24 @@ export interface CommentPolicy {
  *   not exist yet.
  * - `comments: true` or `comments: false` in the front matter is the post's
  *   own answer and beats everything below it, in both directions.
- * - A page is closed. A page is standing content — an about page, a colophon —
- *   and WordPress defaults them closed for the same reason.
- * - Otherwise a post is open until it is `closeAfterDays` old, counted from
- *   its `date`. A post with no date has no age and stays open.
+ * - A type the Discussion settings leave unticked is closed. Pages are, unless
+ *   the site says otherwise: standing content, closed by default in WordPress
+ *   for the same reason.
+ * - Otherwise the document is open until it is `closeAfterDays` old, counted
+ *   from its `date`. One with no date has no age and stays open.
  *
  * None of this touches the fediverse. A reply, a like or a boost arrives
  * because a remote server sent it, which nothing here can stop and nothing
- * here should hide: a closed post still shows every one of them.
- */
-export declare function commentsOpen(document: Document, policy: CommentPolicy, now?: Date): boolean;
-/**
- * Whether what has been said about this document belongs under it: every
- * post, open or closed, and a page only while it is taking comments.
- *
- * A post is answered whether or not it still takes comments, so a closed one
- * keeps its thread. A page is standing content that opts in, so one that has
- * not, or has opted back out, shows nothing and advertises nothing that would
- * invite an answer.
+ * here should hide: a closed document still shows every one of them.
  */
-export declare function answerable(document: Document, policy: CommentPolicy, now: Date): boolean;
+export declare function commentsOpen(document: Document, policy: CommentPolicy, now: Date): boolean;
 /**
  * The site's comment policy, as `content/_data/site.json` says it.
  *
  * Read off the site data rather than the typed settings so the public site can
- * ask without reaching into the admin: the two keys are ordinary keys of that
+ * ask without reaching into the admin: the keys are ordinary keys of that
  * file, and a site that has never saved its settings gets the defaults —
- * comments on, closing after a fortnight.
+ * comments on, posts open and pages closed, closing after a fortnight.
  */
 export declare function commentPolicyOf(site: Record<string, unknown>): CommentPolicy;
 //# sourceMappingURL=policy.d.ts.map

package/dist/comments/policy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"policy.d.ts","sourceRoot":"","sources":["../../src/comments/policy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEvD;;;;;;;;GAQG;AAEH,yEAAyE;AACzE,eAAO,MAAM,yBAAyB,aAAa,CAAC;AAEpD;;;;GAIG;AACH,eAAO,MAAM,iCAAiC,KAAK,CAAC;AAEpD,kFAAkF;AAClF,MAAM,WAAW,aAAa;IAC5B,wEAAwE;IACxE,OAAO,EAAE,OAAO,CAAC;IACjB,+EAA+E;IAC/E,cAAc,EAAE,MAAM,CAAC;CACxB;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,aAAa,EACrB,GAAG,GAAE,IAAiB,GACrB,OAAO,CAiBT;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,IAAI,GAAG,OAAO,CAExF;AAKD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,aAAa,CAU5E"}
+{"version":3,"file":"policy.d.ts","sourceRoot":"","sources":["../../src/comments/policy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAGrE;;;;;;;;;;;;GAYG;AAEH,kFAAkF;AAClF,MAAM,WAAW,aAAa;IAC5B,wEAAwE;IACxE,OAAO,EAAE,OAAO,CAAC;IACjB,mFAAmF;IACnF,cAAc,EAAE,MAAM,CAAC;IACvB,yFAAyF;IACzF,aAAa,EAAE,QAAQ,CAAC,MAAM,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;CACxD;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,IAAI,GAAG,OAAO,CAiB1F;AAKD;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,aAAa,CAc5E"}

package/dist/comments/policy.js

@@ -1,20 +1,5 @@
-/**
- * When a post is taking comments, and when it has stopped.
- *
- * WordPress spells this as three things that argue with each other — a site
- * switch, an age, and a per-post override — and so does this. They are read in
- * one place so the form under a post and the endpoint that refuses a
- * submission can never disagree about whether a post is open, which is the
- * only way a comment form can lie to somebody who has just typed a paragraph.
- */
-/** The front-matter key a post opens or closes its own comments with. */
-export const COMMENTS_FRONT_MATTER_KEY = 'comments';
-/**
- * How long a post takes comments for, in days, before this is decided
- * otherwise. WordPress's own default, and the age at which a post stops being
- * a conversation and starts being a spam target.
- */
-export const DEFAULT_COMMENTS_CLOSE_AFTER_DAYS = 14;
+import { COMMENTS_FRONT_MATTER_KEY } from '../content/comments.js';
+import { DEFAULT_COMMENTS_CLOSE_AFTER_DAYS } from '../site/settings.js';
 /**
  * Whether this document is taking native comments right now.
  *
@@ -27,16 +12,17 @@ export const DEFAULT_COMMENTS_CLOSE_AFTER_DAYS = 14;
  *   not exist yet.
  * - `comments: true` or `comments: false` in the front matter is the post's
  *   own answer and beats everything below it, in both directions.
- * - A page is closed. A page is standing content — an about page, a colophon —
- *   and WordPress defaults them closed for the same reason.
- * - Otherwise a post is open until it is `closeAfterDays` old, counted from
- *   its `date`. A post with no date has no age and stays open.
+ * - A type the Discussion settings leave unticked is closed. Pages are, unless
+ *   the site says otherwise: standing content, closed by default in WordPress
+ *   for the same reason.
+ * - Otherwise the document is open until it is `closeAfterDays` old, counted
+ *   from its `date`. One with no date has no age and stays open.
  *
  * None of this touches the fediverse. A reply, a like or a boost arrives
  * because a remote server sent it, which nothing here can stop and nothing
- * here should hide: a closed post still shows every one of them.
+ * here should hide: a closed document still shows every one of them.
  */
-export function commentsOpen(document, policy, now = new Date()) {
+export function commentsOpen(document, policy, now) {
     if (!policy.enabled)
         return false;
     if (document.draft)
@@ -46,7 +32,7 @@ export function commentsOpen(document, policy, now = new Date()) {
         return false;
     if (own === true)
         return true;
-    if (document.type !== 'post')
+    if (!policy.openByDefault[document.type])
         return false;
     if (policy.closeAfterDays <= 0)
         return true;
@@ -58,27 +44,15 @@ export function commentsOpen(document, policy, now = new Date()) {
     const closesAt = published.getTime() + policy.closeAfterDays * DAY_MS;
     return now.getTime() < closesAt;
 }
-/**
- * Whether what has been said about this document belongs under it: every
- * post, open or closed, and a page only while it is taking comments.
- *
- * A post is answered whether or not it still takes comments, so a closed one
- * keeps its thread. A page is standing content that opts in, so one that has
- * not, or has opted back out, shows nothing and advertises nothing that would
- * invite an answer.
- */
-export function answerable(document, policy, now) {
-    return document.type === 'post' || commentsOpen(document, policy, now);
-}
 /** A day, in milliseconds. */
 const DAY_MS = 24 * 60 * 60 * 1000;
 /**
  * The site's comment policy, as `content/_data/site.json` says it.
  *
  * Read off the site data rather than the typed settings so the public site can
- * ask without reaching into the admin: the two keys are ordinary keys of that
+ * ask without reaching into the admin: the keys are ordinary keys of that
  * file, and a site that has never saved its settings gets the defaults —
- * comments on, closing after a fortnight.
+ * comments on, posts open and pages closed, closing after a fortnight.
  */
 export function commentPolicyOf(site) {
     const closeAfterDays = Number(site['commentsCloseAfterDays']);
@@ -87,6 +61,10 @@ export function commentPolicyOf(site) {
         closeAfterDays: Number.isInteger(closeAfterDays) && closeAfterDays >= 0
             ? closeAfterDays
             : DEFAULT_COMMENTS_CLOSE_AFTER_DAYS,
+        openByDefault: {
+            post: site['commentsOnPosts'] !== false,
+            page: site['commentsOnPages'] === true,
+        },
     };
 }
 //# sourceMappingURL=policy.js.map

package/dist/comments/policy.js.map

@@ -1 +1 @@
-{"version":3,"file":"policy.js","sourceRoot":"","sources":["../../src/comments/policy.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AAEH,yEAAyE;AACzE,MAAM,CAAC,MAAM,yBAAyB,GAAG,UAAU,CAAC;AAEpD;;;;GAIG;AACH,MAAM,CAAC,MAAM,iCAAiC,GAAG,EAAE,CAAC;AAUpD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,UAAU,YAAY,CAC1B,QAAkB,EAClB,MAAqB,EACrB,GAAG,GAAS,IAAI,IAAI,EAAE;IAEtB,IAAI,CAAC,MAAM,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAClC,IAAI,QAAQ,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IAEjC,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;IACtD,IAAI,GAAG,KAAK,KAAK;QAAE,OAAO,KAAK,CAAC;IAChC,IAAI,GAAG,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAE9B,IAAI,QAAQ,CAAC,IAAI,KAAK,MAAM;QAAE,OAAO,KAAK,CAAC;IAC3C,IAAI,MAAM,CAAC,cAAc,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAC5C,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IAE7C,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC1C,IAAI,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QAAE,OAAO,IAAI,CAAC;IAEnD,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC;IACtE,OAAO,GAAG,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC;AAClC,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,UAAU,CAAC,QAAkB,EAAE,MAAqB,EAAE,GAAS;IAC7E,OAAO,QAAQ,CAAC,IAAI,KAAK,MAAM,IAAI,YAAY,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC;AACzE,CAAC;AAED,8BAA8B;AAC9B,MAAM,MAAM,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEnC;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAAC,IAA6B;IAC3D,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAE9D,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK,KAAK;QACnC,cAAc,EACZ,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,cAAc,IAAI,CAAC;YACrD,CAAC,CAAC,cAAc;YAChB,CAAC,CAAC,iCAAiC;KACxC,CAAC;AACJ,CAAC"}
+{"version":3,"file":"policy.js","sourceRoot":"","sources":["../../src/comments/policy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAEnE,OAAO,EAAE,iCAAiC,EAAE,MAAM,qBAAqB,CAAC;AA0BxE;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,UAAU,YAAY,CAAC,QAAkB,EAAE,MAAqB,EAAE,GAAS;IAC/E,IAAI,CAAC,MAAM,CAAC,OAAO;QAAE,OAAO,KAAK,CAAC;IAClC,IAAI,QAAQ,CAAC,KAAK;QAAE,OAAO,KAAK,CAAC;IAEjC,MAAM,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;IACtD,IAAI,GAAG,KAAK,KAAK;QAAE,OAAO,KAAK,CAAC;IAChC,IAAI,GAAG,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAE9B,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IACvD,IAAI,MAAM,CAAC,cAAc,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAC5C,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IAE7C,MAAM,SAAS,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC1C,IAAI,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;QAAE,OAAO,IAAI,CAAC;IAEnD,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC;IACtE,OAAO,GAAG,CAAC,OAAO,EAAE,GAAG,QAAQ,CAAC;AAClC,CAAC;AAED,8BAA8B;AAC9B,MAAM,MAAM,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAEnC;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAAC,IAA6B;IAC3D,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC,CAAC;IAE9D,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK,KAAK;QACnC,cAAc,EACZ,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,cAAc,IAAI,CAAC;YACrD,CAAC,CAAC,cAAc;YAChB,CAAC,CAAC,iCAAiC;QACvC,aAAa,EAAE;YACb,IAAI,EAAE,IAAI,CAAC,iBAAiB,CAAC,KAAK,KAAK;YACvC,IAAI,EAAE,IAAI,CAAC,iBAAiB,CAAC,KAAK,IAAI;SACvC;KACF,CAAC;AACJ,CAAC"}