@geekity/cms 0.17.0 → 0.18.0

package/admin/pages/users/apps.njk

@@ -3,6 +3,7 @@
    Only your own connections, each with a Revoke button that names the app,
    so a screen reader moving between buttons hears which one it is on. #}
 {% extends "layouts/shell.njk" %}
+{% import "components/fields.njk" as field %}
 
 {% block title %}Connected apps{% endblock %}
 
@@ -13,8 +14,9 @@
     <p class="admin-hint">
       These apps signed in as you and can act as you, within the permissions
       listed. An app that keeps using its connection stays connected; one left
-      unused is disconnected on the date shown. Revoking disconnects it now:
-      its next request is refused, and it has to ask you again.
+      unused is disconnected on the date shown. A token you created works
+      until the date shown. Revoking disconnects it now: its next request is
+      refused, and it has to ask you again.
     </p>
 
     <table class="admin-list">
@@ -32,7 +34,13 @@
       <tbody>
         {% for connection in connections %}
           <tr>
-            <td><a href="{{ connection.url }}">{{ connection.name }}</a></td>
+            <td>
+              {% if connection.url %}
+                <a href="{{ connection.url }}">{{ connection.name }}</a>
+              {% else %}
+                {{ connection.name }} <span class="admin-status">Token you created</span>
+              {% endif %}
+            </td>
             <td>
               <ul>
                 {% for scope in connection.scopes %}
@@ -71,4 +79,102 @@
       is listed here, with a button to disconnect it.
     </p>
   {% endif %}
+
+  <h2 id="create-token">Create a token</h2>
+
+  {% if createToken.created %}
+    <div class="admin-flash" role="status">
+      {{ field.text('created-token', 'created-token', 'Token for ' ~ createToken.created.name, createToken.created.token,
+           readonly=true, spellcheck='false',
+           hint='Copy it now. It will not be shown again: the site keeps only a fingerprint of it.') }}
+    </div>
+  {% endif %}
+
+  {% if createToken.problems.name or createToken.problems.scopes or createToken.problems.expires %}
+    {% call field.summary('Nothing was saved. Fix the fields marked below and try again.') %}
+      {{ field.problem('create-token-name', createToken.problems.name) }}
+      {{ field.problem('create-token-scope-profile', createToken.problems.scopes) }}
+      {{ field.problem('create-token-expires', createToken.problems.expires) }}
+    {% endcall %}
+  {% endif %}
+
+  <p class="admin-hint">
+    Some tools and scripts cannot sign in, but accept a token you paste in,
+    such as the Manual tab of micropub.rocks. A token acts as you on this
+    site's Micropub endpoint, with only the permissions you tick, until it
+    expires or you revoke it above.
+  </p>
+
+  <form method="post" action="{{ createToken.url }}">
+    <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
+    {{ field.text('create-token-name', 'name', 'Name', createToken.name,
+         error=createToken.problems.name, required=true,
+         hint='What will use it, such as Publishing script.') }}
+    <fieldset>
+      <legend>It may</legend>
+      {% for scope in createToken.scopes %}
+        {{ field.checkbox('create-token-scope-' ~ scope.name, 'scope', scope.label, checked=scope.checked, value=scope.name,
+             error=(createToken.problems.scopes if loop.first else '')) }}
+      {% endfor %}
+    </fieldset>
+    {% call field.select('create-token-expires', 'expires', 'Expires after', error=createToken.problems.expires) %}
+      {% for expiry in createToken.expiries %}
+        <option value="{{ expiry.days }}"{% if expiry.selected %} selected{% endif %}>{% if expiry.days == 365 %}1 year{% else %}{{ expiry.days }} days{% endif %}</option>
+      {% endfor %}
+    {% endcall %}
+    <button type="submit">Create token</button>
+  </form>
+
+  <h2 id="without-pkce">Apps allowed without PKCE</h2>
+
+  {% if withoutPkce.problem %}
+    {% call field.summary('Nothing was saved. Fix the field marked below and try again.') %}
+      {{ field.problem('without-pkce-client', withoutPkce.problem) }}
+    {% endcall %}
+  {% endif %}
+
+  <p class="admin-hint">
+    PKCE protects a sign-in when somebody intercepts the one-time code an app
+    is handed: without the secret the app kept, the code is useless. Every app
+    must use it, unless you list it here. List only an app you trust that
+    cannot sign in otherwise, such as iA Writer. A listed app is let in without
+    PKCE only when it sends you back to an https address on its own host, and
+    the consent screen tells you when it is.
+  </p>
+
+  {% if withoutPkce.clients | length %}
+    <table class="admin-list">
+      <caption class="admin-visually-hidden">Apps allowed without PKCE</caption>
+      <thead>
+        <tr>
+          <th scope="col">client_id</th>
+          <th scope="col">Actions</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for client in withoutPkce.clients %}
+          <tr>
+            <td><code>{{ client }}</code></td>
+            <td class="admin-actions">
+              <form method="post" action="{{ withoutPkce.removeUrl }}">
+                <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
+                <input type="hidden" name="{{ withoutPkce.field }}" value="{{ client }}" />
+                <button type="submit">Remove {{ client }}</button>
+              </form>
+            </td>
+          </tr>
+        {% endfor %}
+      </tbody>
+    </table>
+  {% else %}
+    <p>No apps are listed. Every app must use PKCE to sign in.</p>
+  {% endif %}
+
+  <form method="post" action="{{ withoutPkce.addUrl }}">
+    <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
+    {{ field.text('without-pkce-client', withoutPkce.field, 'App&rsquo;s client_id', withoutPkce.value,
+         error=withoutPkce.problem, inputmode='url', spellcheck='false', required=true,
+         hint='The URL the app names itself by when it signs in, as App activity shows it, such as <code>https://ia.net/writer</code>.') }}
+    <button type="submit">Allow without PKCE</button>
+  </form>
 {% endblock %}

package/dist/admin/documents.d.ts

@@ -2,13 +2,17 @@ import type { Context, Hono } from 'hono';
 import type { Document, DocumentType } from '../content/document.ts';
 import type { Enclosure } from '../content/enclosure.ts';
 import type { Photo } from '../content/photo.ts';
+import type { PostLocation } from '../content/location.ts';
 import type { ContentStore, ListAllOptions } from '../content/store.ts';
+import type { StoredVisibility } from '../content/visibility.ts';
 import type { ResolvedConfig } from '../config.ts';
 import type { DocumentChange } from '../content/sync.ts';
 import type { GeekityEnv } from '../env.ts';
 import type { UndescribedImage } from '../images/alt-text.ts';
 import type { EnclosureForm } from './enclosure-field.ts';
+import type { LocationForm } from './location-field.ts';
 import type { PhotoRow } from './photo-field.ts';
+import type { ReadOfForm } from './read-field.ts';
 /**
  * Everything that differs between the posts screens and the pages screens.
  *
@@ -258,9 +262,21 @@ export interface EditorForm {
     likeOf: string;
     /** The page this one bookmarks, the mf2 `bookmark-of` (TASK-169). Posts only. */
     bookmarkOf: string;
+    /**
+     * How far the post's author got with what they read, the mf2 `read-status`
+     * (TASK-229), as the file or the form spells it. Posts only.
+     */
+    readStatus: string;
+    /** What was read, the mf2 `read-of` (TASK-229). Posts only. */
+    readOf: ReadOfForm;
     /** The language it is written in, the `lang` key; empty for the site's. */
     lang: string;
     draft: boolean;
+    /**
+     * Whether the document is listed or only served at its URL (TASK-227), or a
+     * value the site does not recognize, which hides it until one is chosen.
+     */
+    visibility: StoredVisibility;
     /** Whether `eleventyExcludeFromCollections` is set. Pages only. */
     exclude: boolean;
     /** Whether the page offers a contact form. Pages only. */
@@ -280,6 +296,12 @@ export interface EditorForm {
     enclosure: EnclosureForm;
     /** The post's photos (TASK-166), without the blank row the editor adds. Posts only. */
     photos: PhotoRow[];
+    /**
+     * Where the post was written (TASK-223). Posts only; blank on a page. It is
+     * the one field that is not written into the file: the save puts it in
+     * `data/locations.json` under the post's permalink (decision-29).
+     */
+    location: LocationForm;
     /** The ids of the declared syndication targets it selects (TASK-155). Posts only. */
     syndicateTo: string[];
     body: string;
@@ -301,8 +323,12 @@ export declare function blankForm(kind: DocumentKind, timezone?: string, now?: D
  * {@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 declare function formFor(document: Document, timezone?: string): EditorForm;
+export declare function formFor(document: Document, timezone: string, location: PostLocation | undefined): EditorForm;
 /**
  * The document of this kind with this slug.
  *
@@ -327,6 +353,8 @@ export interface DocumentRow {
     trashed: boolean;
     /** Whether its date has not arrived, so the public site is holding it back. */
     scheduled: boolean;
+    /** Whether its `visibility` is one the site does not recognize, so it is not served. */
+    hidden: boolean;
     /** Where the editor for it lives. */
     editUrl: string;
     /** Its public URL, or `undefined` when the public site would not serve it. */

package/dist/admin/documents.d.ts.map

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

package/dist/admin/documents.js

@@ -5,17 +5,20 @@ 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 { 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 { ENCLOSURE_FRONT_MATTER_KEY, enclosureOf, isWebUrl, TRANSCRIPT_TYPES, } from '../content/enclosure.js';
 import { PHOTO_FRONT_MATTER_KEY, photoFrontMatter } from '../content/photo.js';
+import { postLocations } from '../content/locations.js';
 import { contentFilePath, freeSlug, saveDocument } from '../content/save.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 { normalizeBody, serializeDocument } from '../content/writer.js';
 import { readAltTexts, undescribedImages, undescribedPhotos } from '../images/alt-text.js';
-import { isPublicDocument } from '../web/documents.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';
@@ -30,7 +33,9 @@ import { ADMIN_PREFIX } from './session.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 { 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 { SYNDICATE_TO_FRONT_MATTER_KEY, syndicateToOf, syndicationTargetsReader, } from '../webmention/syndication.js';
 /**
  * The Eleventy key that keeps a document out of every collection.
@@ -54,6 +59,11 @@ function commentSetting(value) {
         ? value
         : COMMENT_SETTINGS.site;
 }
+function formVisibility(value) {
+    if (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];
@@ -174,7 +184,13 @@ export function mountDocumentScreens(app, options) {
         const document = findBySlug(c.var.store, kind, c.req.param('slug'));
         if (document === undefined)
             return c.notFound();
-        return renderEditor(c, { kind, render, document, form: formFor(document, siteTimezone(c)) });
+        const location = postLocations(c.var.config.dataDir).read(document.permalink);
+        return renderEditor(c, {
+            kind,
+            render,
+            document,
+            form: formFor(document, siteTimezone(c), location),
+        });
     });
     app.post(`${kind.basePath}/:slug`, async (c) => {
         const document = findBySlug(c.var.store, kind, c.req.param('slug'));
@@ -208,14 +224,18 @@ async function saveFromForm(c, options) {
         author: text(body['author']).trim(),
         inReplyTo: text(body['in-reply-to']).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,
         lang: text(body['lang']).trim(),
         draft: body['draft'] !== undefined,
+        visibility: formVisibility(text(body['visibility'])),
         exclude: body['exclude'] !== undefined,
         contact: body['contact'] !== undefined,
         pinned: kind.type === 'post' && body['pinned'] !== undefined,
         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)
@@ -287,6 +307,7 @@ export async function writeDocument(site, write) {
     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/.');
     }
+    let read;
     if (kind.type === 'post') {
         for (const property of CITATION_PROPERTIES) {
             const cited = form[CITATION_FIELDS[property]];
@@ -294,6 +315,13 @@ export async function writeDocument(site, write) {
                 return refused(`${CITATION_LABELS[property]} has to be a web address, like https://example.com/a-post/.`);
             }
         }
+        const resolved = resolveRead(form.readStatus, form.readOf);
+        if ('error' in resolved)
+            return refused(resolved.error);
+        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.');
     }
     if (form.lang !== '' && !LANGUAGE_TAG_PATTERN.test(form.lang)) {
         return refused('That is not a language tag, such as en, fr or pt-BR.');
@@ -308,6 +336,13 @@ export async function writeDocument(site, write) {
             return refused(photos.error);
         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);
+        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)) {
@@ -346,6 +381,7 @@ export async function writeDocument(site, write) {
         slugify(form.title) ||
         (document?.slug ?? '') ||
         noteSlug(form.body) ||
+        slugify(form.readOf.name) ||
         'untitled';
     const trashed = document !== undefined && isTrashedPath(document.path);
     // The calendar day the document is filed under: the site zone's day at its
@@ -421,6 +457,13 @@ export async function writeDocument(site, write) {
     if (renamedFrom !== undefined) {
         await rm(path.join(contentDir, ...renamedFrom.path.split('/')), { force: true });
     }
+    if (kind.type === 'post') {
+        const locations = postLocations(config.dataDir);
+        if (document !== undefined && document.permalink !== saved.permalink) {
+            await locations.move(document.permalink, saved.permalink);
+        }
+        await locations.set(saved.permalink, location);
+    }
     // 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
@@ -482,7 +525,7 @@ function promisedDocument(document, now) {
     if (document === undefined)
         return undefined;
     const announced = document.activitypub?.published !== undefined;
-    return isPublicDocument(document, now) || announced ? document : undefined;
+    return isServed(document, now) || announced ? document : undefined;
 }
 /**
  * The URLs a document is saved as having lived at (TASK-127).
@@ -633,6 +676,18 @@ function resolveExtra(kind, document, form, now, media, declared) {
             else
                 extra[property] = cited;
         }
+        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
@@ -657,6 +712,12 @@ function resolveExtra(kind, document, form, now, media, declared) {
         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];
@@ -984,14 +1045,18 @@ export function blankForm(kind, timezone = DEFAULT_TIMEZONE, now = new Date()) {
         author: '',
         inReplyTo: '',
         ...citationFields(() => ''),
+        readStatus: '',
+        readOf: BLANK_READ_OF_FORM,
         lang: '',
         draft: false,
+        visibility: 'public',
         exclude: false,
         contact: false,
         pinned: false,
         comments: COMMENT_SETTINGS.site,
         enclosure: BLANK_ENCLOSURE_FORM,
         photos: [],
+        location: BLANK_LOCATION_FORM,
         syndicateTo: [],
         body: '',
         hash: '',
@@ -1004,8 +1069,12 @@ export function blankForm(kind, timezone = DEFAULT_TIMEZONE, now = new Date()) {
  * {@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 = DEFAULT_TIMEZONE) {
+export function formFor(document, timezone, location) {
     return {
         title: document.title,
         slug: document.slug,
@@ -1018,16 +1087,22 @@ export function formFor(document, timezone = DEFAULT_TIMEZONE) {
         inReplyTo: document.inReplyTo ?? '',
         // 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),
         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,
         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,
@@ -1082,6 +1157,12 @@ async function renderEditor(c, options) {
                 photoFields: PHOTO_FIELDS,
                 photoRows: photoRowViews(form.photos, readAltTexts(c.var.config.contentDir)),
                 photoChoices: await photoChoices(c.var.config.contentDir),
+                locationFields: LOCATION_FIELDS,
+                readFields: READ_FIELDS,
+                readStatuses: READ_STATUSES.map((value) => ({ value, label: READ_STATUS_LABELS[value] })),
+                ...(form.readStatus === '' || isReadStatus(form.readStatus)
+                    ? {}
+                    : { unrecognizedReadStatus: form.readStatus }),
                 // TASK-155: one checkbox per target the site declares.
                 syndicationTargets: syndicationTargetsReader(c.var.config.contentDir)().map((target) => ({
                     ...target,
@@ -1101,7 +1182,7 @@ async function renderEditor(c, options) {
         listUrl: kind.basePath,
         previewUrl: PREVIEW_PATH,
         uploadUrl: UPLOADS_PATH,
-        viewUrl: document !== undefined && isPublicDocument(document, now) ? document.permalink : undefined,
+        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) } : {}),
@@ -1150,7 +1231,7 @@ function pageRole(kind, document, c) {
     return undefined;
 }
 function listRow(kind, document, now, role) {
-    const isPublic = isPublicDocument(document, now);
+    const isPublic = isServed(document, now);
     return {
         title: postLabel(document),
         slug: document.slug,
@@ -1165,6 +1246,7 @@ function listRow(kind, document, now, role) {
         draft: document.draft,
         trashed: isTrashedPath(document.path),
         scheduled: scheduledFor(document, now) !== undefined,
+        hidden: typeof visibilityOf(document) !== 'string',
         editUrl: editorPath(kind, document.slug),
         viewUrl: isPublic ? document.permalink : undefined,
         role,