@geekity/cms 0.4.0 → 0.5.0

package/admin/pages/navigation/menus.njk

@@ -0,0 +1,129 @@
+{# /admin/navigation: every menu this site holds, and what renders it.
+
+   Two lists, and a menu is in exactly one of them. First the areas the active
+   theme declares, in the theme's own order and under the theme's own labels,
+   each a box to type links into — an area the site has never filled in is an
+   empty box rather than a missing one. Then every other menu the site stores,
+   under a heading that says this theme renders them nowhere, each with a
+   Delete, which is the only way a menu is removed. #}
+{% extends "layouts/shell.njk" %}
+{% import "components/fields.njk" as field %}
+
+{% block title %}{{ heading }}{% endblock %}
+
+{# One menu: its heading, the box its items are typed into, and the button
+   that saves it. `extra` is whatever else belongs under the box — the Delete
+   form, on a menu nothing renders. #}
+{% macro box(menu, fields, url, csrfToken, extra='') %}
+  <li class="admin-menu-box">
+    <h3>{{ menu.label }}</h3>
+
+    <p class="admin-menu-name">
+      <code>menus.{{ menu.name }}</code>
+      {% if menu.stored %}
+        <span class="admin-status">{{ menu.count }} item{% if menu.count != 1 %}s{% endif %}</span>
+      {% else %}
+        <span class="admin-status">empty — nothing has been typed here yet</span>
+      {% endif %}
+    </p>
+
+    <form method="post" action="{{ url }}">
+      <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
+      <input type="hidden" name="{{ fields.menu }}" value="{{ menu.name }}" />
+      {% set itemsHint %}
+        One item per line, written <code>Label | URL</code> &mdash; for example
+        <code>About | /about/</code> or
+        <code>Mastodon | https://example.social/@me</code>. They are the whole of
+        this menu, in this order: nothing else puts a link in it. A page serving
+        as the front page goes in as <code>Home | /</code>, where a reader lands.
+        End a line <code>| me</code> to mark the link
+        <strong>a profile that is you</strong>: it is given
+        <code>rel="me"</code>, which is how Mastodon and the rest of the
+        IndieWeb verify that the site and the profile it links are the same
+        person.
+      {% endset %}
+      {{ field.textarea('menu-' + menu.name, fields.items, 'Items', menu.items,
+           error=menu.problem, hint=itemsHint, rows='5', spellcheck='false') }}
+      <p class="admin-menu-buttons">
+        <button type="submit">Save menu</button>
+      </p>
+    </form>
+
+    {{ extra | safe }}
+  </li>
+{% endmacro %}
+
+{% block content %}
+  <h1>{{ heading }}</h1>
+
+  {% if hasProblems %}
+    <p class="admin-field-error">Nothing was saved. See below.</p>
+  {% endif %}
+
+  <h2>Where {{ themeName }} puts a menu</h2>
+
+  {% if areas.length %}
+    <p class="admin-hint">
+      These are the areas the active theme declares in its <code>theme.json</code>, in the order it
+      declares them. A theme renders a menu by asking for it by name, and an area with nothing in it
+      renders nothing at all.
+    </p>
+
+    <ul class="admin-menu-boxes">
+      {% for menu in areas %}
+        {{ box(menu, fields, navigationUrl, csrfToken) }}
+      {% endfor %}
+    </ul>
+  {% else %}
+    <p class="admin-hint">
+      {{ themeName }} declares no areas, so it asks for no menu by name. A theme declares them as an
+      <code>areas</code> list in its <code>theme.json</code>, each entry a <code>name</code> &mdash;
+      the name the template loops over as <code>menus.&lt;name&gt;</code> &mdash; and a
+      <code>label</code> to head the box here. A menu added below is still stored, ready for the
+      theme that asks for it.
+    </p>
+  {% endif %}
+
+  {% if others.length %}
+    <h2>Kept, rendered nowhere</h2>
+
+    <p class="admin-hint">
+      This site stores these menus and {{ themeName }} renders none of them: no template loops over
+      those names, so nothing on the public site shows them. They are kept, because that is how the
+      menu a theme will use gets written before the site switches to it. Delete is the only way one
+      is removed.
+    </p>
+
+    <ul class="admin-menu-boxes">
+      {% for menu in others %}
+        {% set remove %}
+          <form class="admin-menu-delete" method="post" action="{{ deleteUrl }}">
+            <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
+            <input type="hidden" name="{{ fields.menu }}" value="{{ menu.name }}" />
+            <button type="submit">Delete this menu</button>
+          </form>
+        {% endset %}
+        {{ box(menu, fields, navigationUrl, csrfToken, remove) }}
+      {% endfor %}
+    </ul>
+  {% endif %}
+
+  <h2>Add a menu</h2>
+
+  <form class="admin-menu-add" method="post" action="{{ addUrl }}">
+    <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
+    {% set nameHint %}
+      The name a theme asks for the menu by: lower-case letters, digits and
+      underscores, starting with a letter. It is written after the dot &mdash;
+      <code>{% raw %}{% for item in menus.footer %}{% endraw %}</code> &mdash; which is why a dash
+      is not allowed in one. A name this theme declares puts the menu in its place above; any other
+      name is a menu kept and rendered nowhere, which is how you fill one in before switching to the
+      theme that will use it.
+    {% endset %}
+    {{ field.text('menu-name', fields.name, 'Name', newName,
+         error=nameProblem, hint=nameHint, spellcheck='false', required=true) }}
+    <p class="admin-menu-buttons">
+      <button type="submit">Add menu</button>
+    </p>
+  </form>
+{% endblock %}

package/admin/pages/settings/reading.njk

@@ -1,5 +1,6 @@
 {# /admin/settings/reading: what a visitor is shown, and who is told when it
-   changes. #}
+   changes. The site menu was here until TASK-108; it is on /admin/navigation,
+   with every other menu the site holds. #}
 {% extends "layouts/settings-page.njk" %}
 {% import "components/fields.njk" as field %}
 
@@ -53,15 +54,6 @@
        error=problems.postsPerPage, inputmode='numeric', required=true,
        hint='How many posts a listing page holds, on the home page and on every archive.') }}
 
-  {% set navigationHint %}
-    One item per line, written <code>Label | URL</code> &mdash; for example
-    <code>About | /about/</code> or <code>Mastodon | https://example.social/@me</code>.
-    They are the menu in the site header, in this order. A page can put itself
-    on the end of it by ticking <em>Show in navigation</em> in the editor.
-  {% endset %}
-  {{ field.textarea('settings-navigation', fields.navigation, 'Menu', form.navigation,
-       error=problems.navigation, hint=navigationHint, rows='4', spellcheck='false') }}
-
   {% set notifyHint %}
     An rssCloud and WebSub server, told whenever a feed changes so subscribers
     hear at once instead of waiting for their next poll. Every feed advertises

package/admin/pages/tools/content-index.njk

@@ -0,0 +1,89 @@
+{# /admin/tools: what the derived index holds, and the button that reads every
+   file back into it without stopping the site (TASK-95).
+
+   The counts are the point of the screen as much as the button is: an index
+   that disagrees with the files is not something the site complains about, so
+   the only way to notice is to be shown what it holds. #}
+{% extends "layouts/shell.njk" %}
+
+{% block title %}{{ heading }}{% endblock %}
+
+{% block content %}
+  <h1>{{ heading }}</h1>
+
+  <p>
+    Everything in <code>data/geekity.db</code> is a reading of the files under
+    <code>{{ contentDir }}</code>, so it can always be read again. Rebuild it after
+    editing content outside the admin &mdash; over ssh, or with a
+    <code>git pull</code> while the site was down &mdash; or when what is listed here
+    disagrees with what is on disk.
+  </p>
+
+  <table class="admin-list">
+    <thead>
+      <tr>
+        <th scope="col">What the index holds</th>
+        <th scope="col">Count</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <th scope="row">Documents</th>
+        <td>{{ indexed.documents }}</td>
+      </tr>
+      <tr>
+        <th scope="row">Followers</th>
+        <td>{{ indexed.followers }}</td>
+      </tr>
+      <tr>
+        <th scope="row">Inbox activities</th>
+        <td>{{ indexed.activities }}</td>
+      </tr>
+      <tr>
+        <th scope="row">Comments</th>
+        <td>{{ indexed.comments }}</td>
+      </tr>
+    </tbody>
+  </table>
+
+  {% if confirm %}
+    {# Offered rather than done, the way a merge is on the taxonomy screens.
+       The window in the middle is the whole reason: for as long as the scan
+       runs the site answers 404 for documents whose files are perfectly fine,
+       and that is not a thing to discover afterwards. #}
+    <form class="admin-settings" method="post" action="{{ rebuildUrl }}">
+      <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
+      <input type="hidden" name="{{ fields.confirm }}" value="1" />
+
+      <h2>Rebuild the index now?</h2>
+
+      <p>
+        The index is emptied and every file read again. Until the scan finishes, this
+        site answers <strong>404</strong> for its posts and pages &mdash; under a second
+        on a small site, longer on a large one &mdash; and it is serving the whole time.
+        Nothing is deleted and nothing is sent: you stay signed in, the delivery log and
+        the relays are kept, and no follower, feed or linked page is told about a post
+        the scan re-indexes.
+      </p>
+
+      <p class="admin-settings-buttons">
+        <button type="submit">Rebuild it</button>
+        <a href="{{ toolsUrl }}">Cancel</a>
+      </p>
+    </form>
+  {% else %}
+    <form class="admin-settings" method="post" action="{{ rebuildUrl }}">
+      <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
+      <p class="admin-settings-buttons">
+        <button type="submit">Rebuild the index</button>
+      </p>
+    </form>
+  {% endif %}
+
+  <p class="admin-hint">
+    This runs on the site as it is: nothing is deleted, no connection is swapped and
+    nobody is signed out. <code>geekity rebuild</code> at the command line is the other
+    door, and it is for the one case this screen cannot be: a database this version
+    refuses to open, where there is no site running to press a button in.
+  </p>
+{% endblock %}

package/admin/pages/users/list.njk

@@ -26,12 +26,14 @@
         <tr>
           <td>
             <a href="{{ entry.editUrl }}">{{ entry.username }}</a>{% if entry.you %} <span class="admin-status">(you)</span>{% endif %}
-            <br /><a href="{{ entry.archiveUrl }}">{{ entry.archiveUrl }}</a>
           </td>
           <td>{% if entry.email %}{{ entry.email }}{% else %}<span class="admin-status">None</span>{% endif %}</td>
           <td>{{ entry.createdAt | date('html') }}</td>
+          {# Edit, then what can be done, then View: the order and the shape
+             `pages/documents/list.njk` uses, down to Edit being a plain link
+             rather than a button. A row here is a row there. #}
           <td class="admin-actions">
-            <a class="admin-button admin-button-small" href="{{ entry.editUrl }}">Edit</a>
+            <a href="{{ entry.editUrl }}">Edit</a>
             {% if entry.deletable %}
               <form method="post" action="{{ deleteUserUrl }}">
                 <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
@@ -39,6 +41,7 @@
                 <button type="submit">Delete</button>
               </form>
             {% endif %}
+            <a href="{{ entry.archiveUrl }}">View</a>
           </td>
         </tr>
       {% endfor %}

package/admin/static/admin.css

@@ -1219,3 +1219,63 @@ button[type='submit']:hover,
   color: var(--admin-muted);
   overflow-wrap: anywhere;
 }
+
+/* Navigation. One panel per menu, stacked down the page rather than laid out
+   as cards: a menu is a box of text somebody types into, so it wants the width
+   a paragraph wants rather than a column in a grid. The two lists — the areas
+   the theme declares, and the menus it renders nowhere — are the same panel,
+   because they are the same thing in two different situations. */
+
+.admin-menu-boxes {
+  margin: 1rem 0 2rem;
+  padding: 0;
+  list-style: none;
+}
+
+.admin-menu-box {
+  max-width: 42rem;
+  padding: 0.9rem 1.1rem 1.1rem;
+  background: var(--admin-surface);
+  border: 1px solid var(--admin-border);
+}
+
+.admin-menu-box + .admin-menu-box {
+  margin-top: 1rem;
+}
+
+.admin-menu-box h3 {
+  margin: 0;
+  font-size: 1.05rem;
+}
+
+/* The name a theme asks for the menu by, and how much is in it. The name is
+   the useful half: it is what a template loops over and what `site.json`
+   holds, so it is printed rather than left implied by the label above it. */
+
+.admin-menu-name {
+  margin: 0.15rem 0 0.6rem;
+  color: var(--admin-muted);
+  font-size: 0.9em;
+  overflow-wrap: anywhere;
+}
+
+.admin-menu-buttons {
+  margin: 0.8rem 0 0;
+}
+
+/* Delete is the only way a menu is removed, and it is offered only on one the
+   theme renders nowhere. It sits apart from the Save above it, so the two
+   buttons of one panel are not a pair to be pressed carelessly. */
+
+.admin-menu-delete {
+  margin-top: 0.8rem;
+  padding-top: 0.8rem;
+  border-top: 1px solid var(--admin-field);
+}
+
+.admin-menu-add {
+  max-width: 42rem;
+  padding: 0.9rem 1.1rem 1.1rem;
+  background: var(--admin-surface);
+  border: 1px solid var(--admin-border);
+}

package/dist/access-log.d.ts

@@ -0,0 +1,44 @@
+import type { MiddlewareHandler } from 'hono';
+import type { ResolvedConfig } from './config.ts';
+import type { GeekityEnv } from './env.ts';
+/**
+ * Where one access-log line goes.
+ *
+ * The line arrives without a trailing newline; the sink decides the framing.
+ * The default sink is stdout — what a container collects, what dockge shows
+ * and what journald keeps — and a test hands in one that keeps the lines.
+ */
+export type AccessLogWriter = (line: string) => void;
+/** What {@link createAccessLog} needs to know. */
+export interface AccessLogOptions {
+    /**
+     * Whether a client address goes on the line, and which one is right. Read
+     * once, at boot: the log is registered before the context is, so it cannot
+     * read the config off a request.
+     */
+    config: Pick<ResolvedConfig, 'accessLogAddress' | 'trustProxy'>;
+    /** Where the lines go. Defaults to stdout. */
+    write?: AccessLogWriter;
+}
+/**
+ * One line per request: what was asked, what was answered, and how long it
+ * took.
+ *
+ * ```
+ * GET /.well-known/webfinger?resource=acct:ada@example.com 200 3.1ms
+ * ```
+ *
+ * The fields are in a fixed order and separated by spaces, so the status is
+ * always the third and a line is readable by eye, by `grep` and by `awk`
+ * alike. The client address, when the site asks for one, goes last for that
+ * reason — turning it on moves nothing else.
+ *
+ * Only the request line is ever read: no body is touched, so nothing is
+ * buffered and no password posted to the login form can reach the log, and no
+ * header but the forwarded address a site has said to believe is looked at, so
+ * no cookie and no `Authorization` can either. The query string is logged as
+ * it arrived, because it is what a peer's WebFinger lookup carries and what a
+ * question about who asked for what is answered with.
+ */
+export declare function createAccessLog(options: AccessLogOptions): MiddlewareHandler<GeekityEnv>;
+//# sourceMappingURL=access-log.d.ts.map

package/dist/access-log.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"access-log.d.ts","sourceRoot":"","sources":["../src/access-log.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAG9C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C;;;;;;GAMG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;AAErD,kDAAkD;AAClD,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,kBAAkB,GAAG,YAAY,CAAC,CAAC;IAChE,8CAA8C;IAC9C,KAAK,CAAC,EAAE,eAAe,CAAC;CACzB;AAsBD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,gBAAgB,GAAG,iBAAiB,CAAC,UAAU,CAAC,CA4BxF"}

package/dist/access-log.js

@@ -0,0 +1,71 @@
+import { clientAddress } from './admin/throttle.js';
+/** The default sink: one write per line, the newline included, like the CLI's. */
+function writeToStdout(line) {
+    process.stdout.write(`${line}\n`);
+}
+/**
+ * The path and query string of a request, taken out of its URL by hand.
+ *
+ * `new URL(...)` per request would parse and allocate the whole of an address
+ * this only ever wants the tail of, and this runs on every request the site
+ * answers. There is nothing to escape: Node's HTTP parser refuses a request
+ * target with a control character in it, so whatever survives to here is one
+ * line's worth of text.
+ */
+function requestTarget(url) {
+    const afterScheme = url.indexOf('://');
+    const start = afterScheme < 0 ? -1 : url.indexOf('/', afterScheme + 3);
+    return start < 0 ? '/' : url.slice(start);
+}
+/**
+ * One line per request: what was asked, what was answered, and how long it
+ * took.
+ *
+ * ```
+ * GET /.well-known/webfinger?resource=acct:ada@example.com 200 3.1ms
+ * ```
+ *
+ * The fields are in a fixed order and separated by spaces, so the status is
+ * always the third and a line is readable by eye, by `grep` and by `awk`
+ * alike. The client address, when the site asks for one, goes last for that
+ * reason — turning it on moves nothing else.
+ *
+ * Only the request line is ever read: no body is touched, so nothing is
+ * buffered and no password posted to the login form can reach the log, and no
+ * header but the forwarded address a site has said to believe is looked at, so
+ * no cookie and no `Authorization` can either. The query string is logged as
+ * it arrived, because it is what a peer's WebFinger lookup carries and what a
+ * question about who asked for what is answered with.
+ */
+export function createAccessLog(options) {
+    const write = options.write ?? writeToStdout;
+    const { accessLogAddress, trustProxy } = options.config;
+    return async function accessLog(c, next) {
+        const started = performance.now();
+        let threw = false;
+        try {
+            await next();
+        }
+        catch (error) {
+            // A handler that threw has no response of its own: the error is on its
+            // way up to Hono's error handler, which answers 500, and `c.res` would
+            // hand back a freshly made 200 if asked. A request that failed is the
+            // one most worth having a line for, so it gets the status it will be
+            // answered with rather than the one it never had.
+            threw = true;
+            throw error;
+        }
+        finally {
+            const elapsed = (performance.now() - started).toFixed(1);
+            const status = threw ? 500 : c.res.status;
+            let line = `${c.req.method} ${requestTarget(c.req.url)} ${String(status)} ${elapsed}ms`;
+            if (accessLogAddress) {
+                const address = clientAddress(c, { trustProxy });
+                if (address !== undefined)
+                    line += ` ${address}`;
+            }
+            write(line);
+        }
+    };
+}
+//# sourceMappingURL=access-log.js.map

package/dist/access-log.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"access-log.js","sourceRoot":"","sources":["../src/access-log.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAyBpD,kFAAkF;AAClF,SAAS,aAAa,CAAC,IAAY;IACjC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC;AACpC,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,aAAa,CAAC,GAAW;IAChC,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACvC,MAAM,KAAK,GAAG,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,WAAW,GAAG,CAAC,CAAC,CAAC;IACvE,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAC5C,CAAC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,UAAU,eAAe,CAAC,OAAyB;IACvD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,IAAI,aAAa,CAAC;IAC7C,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAExD,OAAO,KAAK,UAAU,SAAS,CAAC,CAAC,EAAE,IAAI;QACrC,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;QAClC,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,IAAI,CAAC;YACH,MAAM,IAAI,EAAE,CAAC;QACf,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,uEAAuE;YACvE,uEAAuE;YACvE,sEAAsE;YACtE,qEAAqE;YACrE,kDAAkD;YAClD,KAAK,GAAG,IAAI,CAAC;YACb,MAAM,KAAK,CAAC;QACd,CAAC;gBAAS,CAAC;YACT,MAAM,OAAO,GAAG,CAAC,WAAW,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACzD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC;YAC1C,IAAI,IAAI,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,OAAO,IAAI,CAAC;YACxF,IAAI,gBAAgB,EAAE,CAAC;gBACrB,MAAM,OAAO,GAAG,aAAa,CAAC,CAAC,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;gBACjD,IAAI,OAAO,KAAK,SAAS;oBAAE,IAAI,IAAI,IAAI,OAAO,EAAE,CAAC;YACnD,CAAC;YACD,KAAK,CAAC,IAAI,CAAC,CAAC;QACd,CAAC;IACH,CAAC,CAAC;AACJ,CAAC"}

package/dist/admin/documents.d.ts

@@ -34,15 +34,9 @@ export interface DocumentKind {
      */
     excludable: boolean;
     /**
-     * Whether the editor offers the site menu. Pages only: a post is in the
-     * archive and in the feeds, and putting one in the header beside About is
-     * not what a menu is for.
-     */
-    navigable: boolean;
-    /**
-     * Whether the editor offers the contact form (TASK-56). Pages only, for the
-     * reason the menu is: a form for writing to the site belongs on a standing
-     * page rather than under one post out of a thousand.
+     * Whether the editor offers the contact form (TASK-56). Pages only: a form
+     * for writing to the site belongs on a standing page rather than under one
+     * post out of a thousand.
      *
      * The front matter key itself is honoured wherever it is written, so a theme
      * that includes the partial in its post layout is free to; this only decides
@@ -168,10 +162,6 @@ export interface EditorForm {
     draft: boolean;
     /** Whether `eleventyExcludeFromCollections` is set. Pages only. */
     exclude: boolean;
-    /** Whether the page put itself in the site menu. Pages only. */
-    navigation: boolean;
-    /** Where in the menu it goes, as typed. Empty for "after the ordered ones". */
-    navigationOrder: string;
     /** Whether the page offers a contact form. Pages only. */
     contact: boolean;
     /**

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

@@ -1 +1 @@
-{"version":3,"file":"documents.d.ts","sourceRoot":"","sources":["../../src/admin/documents.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE1C,OAAO,KAAK,EAAE,QAAQ,EAAmB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAMtF,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AASxE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAgB5C;;;;;;;GAOG;AACH,MAAM,WAAW,YAAY;IAC3B,0CAA0C;IAC1C,IAAI,EAAE,YAAY,CAAC;IACnB,mDAAmD;IACnD,OAAO,EAAE,MAAM,CAAC;IAChB,gDAAgD;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,2DAA2D;IAC3D,QAAQ,EAAE,MAAM,CAAC;IACjB,kDAAkD;IAClD,MAAM,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,KAAK,EAAE,OAAO,CAAC;IACf,oDAAoD;IACpD,MAAM,EAAE,OAAO,CAAC;IAChB,iEAAiE;IACjE,WAAW,EAAE,OAAO,CAAC;IACrB;;;;OAIG;IACH,UAAU,EAAE,OAAO,CAAC;IACpB;;;;OAIG;IACH,SAAS,EAAE,OAAO,CAAC;IACnB;;;;;;;;OAQG;IACH,WAAW,EAAE,OAAO,CAAC;CACtB;AAED;;;;;;GAMG;AACH,eAAO,MAAM,WAAW,mCAAmC,CAAC;AAE5D;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB;aAAK,IAAI,EAAE,EAAE;aAAE,IAAI,EAAE,MAAM;aAAE,MAAM,EAAE,QAAQ;CAAW,CAAC;AAiBtF,2EAA2E;AAC3E,eAAO,MAAM,SAAS,EAAE,YAYvB,CAAC;AAEF,2EAA2E;AAC3E,eAAO,MAAM,SAAS,EAAE,YAYvB,CAAC;AAEF,8CAA8C;AAC9C,wBAAgB,UAAU,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAEnE;AAED,oEAAoE;AACpE,wBAAgB,aAAa,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CAExD;AAED;;;;;;GAMG;AACH,MAAM,MAAM,cAAc,GAAG,KAAK,GAAG,WAAW,GAAG,WAAW,GAAG,OAAO,GAAG,OAAO,CAAC;AAEnF,gDAAgD;AAChD,eAAO,MAAM,gBAAgB,EAAE,SAAS,cAAc,EAMrD,CAAC;AAEF,iDAAiD;AACjD,eAAO,MAAM,kBAAkB,KAAK,CAAC;AAErC,0EAA0E;AAC1E,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,cAAc,CAExE;AAED,wEAAwE;AACxE,wBAAgB,cAAc,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,cAAc,GAAG,cAAc,CAQzF;AAED,mEAAmE;AACnE,MAAM,MAAM,WAAW,GAAG,CACxB,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EACtB,QAAQ,EAAE,MAAM,EAChB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAC9B,QAAQ,CAAC;AAEd,wEAAwE;AACxE,MAAM,WAAW,2BAA2B;IAC1C,2CAA2C;IAC3C,IAAI,EAAE,YAAY,CAAC;IACnB,oFAAoF;IACpF,MAAM,EAAE,WAAW,CAAC;CACrB;AAED;;;;;;;GAOG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EACrB,OAAO,EAAE,2BAA2B,GACnC,IAAI,CAuEN;AA0ZD;;;GAGG;AACH,wBAAgB,SAAS,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAOjD;AAkCD,+CAA+C;AAC/C,MAAM,WAAW,YAAY;IAC3B,uEAAuE;IACvE,KAAK,EAAE,MAAM,CAAC;IACd,uEAAuE;IACvE,KAAK,EAAE,MAAM,CAAC;IACd,kDAAkD;IAClD,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,MAAM,GAAG,YAAY,EAAE,CAkBrF;AA0LD;;;;;GAKG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAK5D;AAWD,iEAAiE;AACjE,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB;;;;;;;OAOG;IACH,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,mEAAmE;IACnE,OAAO,EAAE,OAAO,CAAC;IACjB,gEAAgE;IAChE,UAAU,EAAE,OAAO,CAAC;IACpB,+EAA+E;IAC/E,eAAe,EAAE,MAAM,CAAC;IACxB,0DAA0D;IAC1D,OAAO,EAAE,OAAO,CAAC;IACjB;;;;;;;OAOG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,6EAA6E;IAC7E,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;GAMG;AACH,wBAAgB,SAAS,CACvB,IAAI,EAAE,YAAY,EAClB,QAAQ,GAAE,MAAyB,EACnC,GAAG,GAAE,IAAiB,GACrB,UAAU,CAsBZ;AAED;;;;;;;GAOG;AACH,wBAAgB,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,GAAE,MAAyB,GAAG,UAAU,CAmB3F;AA+ED;;;;;;;GAOG;AACH,wBAAgB,UAAU,CACxB,KAAK,EAAE,YAAY,EACnB,IAAI,EAAE,YAAY,EAClB,IAAI,EAAE,MAAM,GACX,QAAQ,GAAG,SAAS,CAWtB;AAED,wDAAwD;AACxD,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;IACzB,+EAA+E;IAC/E,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,+EAA+E;IAC/E,SAAS,EAAE,OAAO,CAAC;IACnB,qCAAqC;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,8EAA8E;IAC9E,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B;;;OAGG;IACH,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1B;AAED;;;;GAIG;AACH,eAAO,MAAM,gBAAgB;aAAK,QAAQ,EAAE,YAAY;aAAE,SAAS,EAAE,YAAY;CAAW,CAAC;AAoD7F,2EAA2E;AAC3E,wBAAgB,UAAU,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,cAAc,EAAE,IAAI,SAAI,GAAG,MAAM,CAMvF"}
+{"version":3,"file":"documents.d.ts","sourceRoot":"","sources":["../../src/admin/documents.ts"],"names":[],"mappings":"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"}

package/dist/admin/documents.js

@@ -10,7 +10,6 @@ import { normalizeBody, serializeDocument } from '../content/writer.js';
 import { isPublicDocument } from '../web/documents.js';
 import { COMMENTS_FRONT_MATTER_KEY } from '../comments/policy.js';
 import { CONTACT_FRONT_MATTER_KEY } from '../contact/form.js';
-import { NAVIGATION_KEY, NAVIGATION_ORDER_KEY, navigationOrder } from '../web/navigation.js';
 import { userForAuthor } from '../web/authors.js';
 import { findUserById, listUsers } from './accounts.js';
 import { flash } from './flash.js';
@@ -62,7 +61,6 @@ export const POST_KIND = {
     tagged: true,
     categorised: true,
     excludable: false,
-    navigable: false,
     contactable: false,
 };
 /** The pages screens: standing content, no date prefix and no taxonomy. */
@@ -76,7 +74,6 @@ export const PAGE_KIND = {
     tagged: false,
     categorised: false,
     excludable: true,
-    navigable: true,
     contactable: true,
 };
 /** The URL of the editor for one document. */
@@ -202,8 +199,6 @@ async function saveFromForm(c, options) {
         author: text(body['author']).trim(),
         draft: body['draft'] !== undefined,
         exclude: body['exclude'] !== undefined,
-        navigation: body['navigation'] !== undefined,
-        navigationOrder: text(body['navigation_order']).trim(),
         contact: body['contact'] !== undefined,
         comments: commentSetting(text(body['comments'])),
         body: normalizeBody(text(body['body'])),
@@ -225,9 +220,6 @@ async function saveFromForm(c, options) {
     }
     if (form.title === '')
         return refuse(`A ${kind.singular} needs a title.`);
-    if (form.navigationOrder !== '' && !Number.isFinite(Number(form.navigationOrder))) {
-        return refuse('A menu order is a number, and pulls the lower numbers to the front.');
-    }
     const timezone = siteTimezone(c);
     // 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.
@@ -486,29 +478,9 @@ function resolveExtra(kind, document, form) {
         else if (EXCLUDE_KEY in extra)
             extra[EXCLUDE_KEY] = false;
     }
-    if (kind.navigable) {
-        if (form.navigation) {
-            extra[NAVIGATION_KEY] = true;
-            if (form.navigationOrder === '')
-                delete extra[NAVIGATION_ORDER_KEY];
-            else
-                extra[NAVIGATION_ORDER_KEY] = Number(form.navigationOrder);
-        }
-        else {
-            // Both keys go rather than being written `false`, which is where this
-            // parts company with `eleventyExcludeFromCollections` above. That one is
-            // Eleventy's key and a site may have written it by hand for a build of
-            // its own, so a `false` says something; these two are the CMS's own, and
-            // absent and false mean the same thing to everything that reads them. An
-            // order on a page that is not in the menu means nothing at all.
-            delete extra[NAVIGATION_KEY];
-            delete extra[NAVIGATION_ORDER_KEY];
-        }
-    }
     if (kind.contactable) {
-        // Written or removed, never `false`, for the reason the menu keys are: it
-        // is the CMS's own key, and absent and false mean the same thing to
-        // everything that reads it (TASK-56).
+        // 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
@@ -760,8 +732,6 @@ export function blankForm(kind, timezone = DEFAULT_TIMEZONE, now = new Date()) {
         author: '',
         draft: false,
         exclude: false,
-        navigation: false,
-        navigationOrder: '',
         contact: false,
         comments: COMMENT_SETTINGS.site,
         body: '',
@@ -788,8 +758,6 @@ export function formFor(document, timezone = DEFAULT_TIMEZONE) {
         author: document.author ?? '',
         draft: document.draft,
         exclude: document.extra[EXCLUDE_KEY] === true,
-        navigation: document.extra[NAVIGATION_KEY] === true,
-        navigationOrder: navigationOrder(document)?.toString() ?? '',
         contact: document.extra[CONTACT_FRONT_MATTER_KEY] === true,
         comments: commentSettingOf(document),
         body: document.body,