@geekity/cms 0.30.0 → 0.32.0

package/dist/admin/settings-page.d.ts

@@ -8,20 +8,14 @@
  * into a screen you can read and a form you can save. A page module describes
  * itself and writes its own template; nothing about how a page is wired lives
  * in the page.
- *
- * The save is the part worth reading twice. A page writes only the fields it
- * carries, and it writes them onto `content/_data/site.json` as re-read inside
- * the atomic update (decision-9), not onto the copy the form was rendered
- * from. So two people saving two different pages at the same moment both land:
- * the second save is applied to what the first one actually wrote, and a
- * setting neither page shows is not even in the picture.
  */
 import type { Context, Hono } from 'hono';
 import type { ResolvedConfig } from '../config.ts';
-import type { GeekityEnv } from '../env.ts';
+import type { GeekityEnv } from '../web/env.ts';
 import type { DeliveryReport } from '../federation/delivery.ts';
+import type { SiteSettings } from '../site/settings.ts';
 import type { AdminRender } from './documents.ts';
-import type { SettingsField, SettingsForm, SiteSettings } from './settings.ts';
+import type { SettingsField, SettingsForm } from './settings-fields.ts';
 /** What {@link mountSettingsPage} needs from the admin around it. */
 export interface MountSettingsOptions {
     /** The admin's renderer, which injects the chrome, the CSRF token and the flash. */
@@ -63,24 +57,11 @@ export interface SettingsPage {
      */
     shown?: (config: ResolvedConfig, settings: SiteSettings) => SiteSettings;
     /** What the page renders beyond its own fields: a panel, a credential, a list. */
-    panels?: (c: Context<GeekityEnv>, settings: SiteSettings) => Record<string, unknown>;
-    /**
-     * The fields this page does not read straight off the body, because
-     * something other than the form decides them — a field rendered read-only
-     * submits nothing, and a save must not clear it.
-     */
+    panels?: (c: Context<GeekityEnv>, settings: SiteSettings) => Promise<Record<string, unknown>> | Record<string, unknown>;
     reads?: (options: {
         c: Context<GeekityEnv>;
         body: SubmittedBody;
-        current: SiteSettings;
     }) => Partial<SettingsForm>;
-    /**
-     * What a save of this page sets off beyond the file, as the sentence the
-     * flash adds. The side effect stays where the field is: the actor is told
-     * about a profile change on the page the profile is on, and the relays are
-     * reconciled on the page the relay list is on.
-     */
-    saved?: (c: Context<GeekityEnv>, before: SiteSettings, after: SiteSettings) => Promise<string> | string;
     /**
      * The page's own endpoints: a credential, a test message. Each is its own
      * POST so a refused one cannot lose an edit to a field.
@@ -98,18 +79,10 @@ export declare function settingsPagePath(child: string): string;
 /**
  * Register one settings page: the screen, the save, and whatever endpoints of
  * its own it has.
- *
- * Every read is of `content/_data/site.json` as it is at that moment, and a
- * save rewrites it: a page is a view of the file rather than of anything this
- * process remembers (decision-9). A form the page's own validator has anything
- * to say about is a 400 that writes nothing at all and comes back with the
- * problems on the fields that have them.
  */
 export declare function mountSettingsPage(app: Hono<GeekityEnv>, page: SettingsPage, options: MountSettingsOptions): void;
 /** Everything one settings page's template renders. */
-export declare function settingsScreen(c: Context<GeekityEnv>, page: SettingsPage, settings: SiteSettings): Record<string, unknown>;
-/** A form field as a string. A file upload, or a missing field, is the empty one. */
-export declare function bodyField(value: unknown): string;
+export declare function settingsScreen(c: Context<GeekityEnv>, page: SettingsPage, settings: SiteSettings, elsewhere: Readonly<Record<string, string>>): Promise<Record<string, unknown>>;
 /**
  * The sentence a flash adds about the followers, when there were any: a save
  * of the profile is also an announcement, and it should say so rather than

package/dist/admin/settings-page.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-page.d.ts","sourceRoot":"","sources":["../../src/admin/settings-page.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAWlD,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE/E,qEAAqE;AACrE,MAAM,WAAW,oBAAoB;IACnC,oFAAoF;IACpF,MAAM,EAAE,WAAW,CAAC;CACrB;AAED,iEAAiE;AACjE,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEpD,qDAAqD;AACrD,MAAM,WAAW,YAAY;IAC3B,uEAAuE;IACvE,KAAK,EAAE,MAAM,CAAC;IACd,8BAA8B;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,wEAAwE;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,6DAA6D;IAC7D,QAAQ,EAAE,MAAM,CAAC;IACjB,qEAAqE;IACrE,MAAM,EAAE,SAAS,aAAa,EAAE,CAAC;IACjC;;;OAGG;IACH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,KAAK,YAAY,CAAC;IACzE,kFAAkF;IAClF,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,YAAY,KAAK,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrF;;;;OAIG;IACH,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE;QAChB,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QACvB,IAAI,EAAE,aAAa,CAAC;QACpB,OAAO,EAAE,YAAY,CAAC;KACvB,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAC5B;;;;;OAKG;IACH,KAAK,CAAC,EAAE,CACN,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EACtB,MAAM,EAAE,YAAY,EACpB,KAAK,EAAE,YAAY,KAChB,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;IAC9B;;;OAGG;IACH,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAC;CAC5E;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EACrB,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,oBAAoB,GAC5B,IAAI,CA2CN;AAED,uDAAuD;AACvD,wBAAgB,cAAc,CAC5B,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EACtB,IAAI,EAAE,YAAY,EAClB,QAAQ,EAAE,YAAY,GACrB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAiBzB;AA2BD,qFAAqF;AACrF,wBAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAEhD;AAED;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,cAAc,GAAG,SAAS,GAAG,MAAM,CAMxE"}
+{"version":3,"file":"settings-page.d.ts","sourceRoot":"","sources":["../../src/admin/settings-page.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEhE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAWlD,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAoB,MAAM,sBAAsB,CAAC;AAG1F,qEAAqE;AACrE,MAAM,WAAW,oBAAoB;IACnC,oFAAoF;IACpF,MAAM,EAAE,WAAW,CAAC;CACrB;AAED,iEAAiE;AACjE,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAEpD,qDAAqD;AACrD,MAAM,WAAW,YAAY;IAC3B,uEAAuE;IACvE,KAAK,EAAE,MAAM,CAAC;IACd,8BAA8B;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd;;;;;;;OAOG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;;OAKG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,wEAAwE;IACxE,IAAI,EAAE,MAAM,CAAC;IACb,6DAA6D;IAC7D,QAAQ,EAAE,MAAM,CAAC;IACjB,qEAAqE;IACrE,MAAM,EAAE,SAAS,aAAa,EAAE,CAAC;IACjC;;;OAGG;IACH,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,YAAY,KAAK,YAAY,CAAC;IACzE,kFAAkF;IAClF,MAAM,CAAC,EAAE,CACP,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EACtB,QAAQ,EAAE,YAAY,KACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChE,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE;QAAE,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC;QAAC,IAAI,EAAE,aAAa,CAAA;KAAE,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAC5F;;;OAGG;IACH,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAC;CAC5E;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EACrB,IAAI,EAAE,YAAY,EAClB,OAAO,EAAE,oBAAoB,GAC5B,IAAI,CA8CN;AAED,uDAAuD;AACvD,wBAAsB,cAAc,CAClC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EACtB,IAAI,EAAE,YAAY,EAClB,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAC1C,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAmBlC;AAgCD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,cAAc,GAAG,SAAS,GAAG,MAAM,CAMxE"}

package/dist/admin/settings-page.js

@@ -8,16 +8,13 @@
  * into a screen you can read and a form you can save. A page module describes
  * itself and writes its own template; nothing about how a page is wired lives
  * in the page.
- *
- * The save is the part worth reading twice. A page writes only the fields it
- * carries, and it writes them onto `content/_data/site.json` as re-read inside
- * the atomic update (decision-9), not onto the copy the form was rendered
- * from. So two people saving two different pages at the same moment both land:
- * the second save is applied to what the first one actually wrote, and a
- * setting neither page shows is not even in the picture.
  */
+import { SITE } from '../site/settings.js';
+import { stringOrEmpty } from '../util/forms.js';
 import { flash } from './flash.js';
-import { formFromSettings, readSiteSettings, SETTINGS_FIELDS, SETTINGS_PATH, settingsFromForm, settingsProblems, updateSiteSettings, } from './settings.js';
+import { setElsewhere } from './setting-overrides.js';
+import { formFromSettings, SETTINGS_FIELDS, settingOf, settingsProblems, siteChanges, submittedSettings, } from './settings-fields.js';
+import { SETTINGS_PATH } from './settings.js';
 /**
  * Where one settings page lives.
  *
@@ -31,89 +28,76 @@ export function settingsPagePath(child) {
 /**
  * Register one settings page: the screen, the save, and whatever endpoints of
  * its own it has.
- *
- * Every read is of `content/_data/site.json` as it is at that moment, and a
- * save rewrites it: a page is a view of the file rather than of anything this
- * process remembers (decision-9). A form the page's own validator has anything
- * to say about is a 400 that writes nothing at all and comes back with the
- * problems on the fields that have them.
  */
 export function mountSettingsPage(app, page, options) {
     const { render } = options;
-    app.get(page.path, (c) => render(c, page.template, settingsScreen(c, page, readSiteSettings(c.var.config.contentDir))));
+    app.get(page.path, async (c) => render(c, page.template, await settingsScreen(c, page, c.var.siteAtRequestStart, await setElsewhereOn(c, page))));
     app.post(page.path, async (c) => {
         const body = await c.req.parseBody();
-        const stored = readSiteSettings(c.var.config.contentDir);
-        const submitted = pageForm(c, page, body, stored);
-        const problems = settingsProblems(submitted, page.fields, {
-            themesDir: c.var.config.themesDir,
-            contentDir: c.var.config.contentDir,
-        });
-        if (Object.keys(problems).length > 0) {
+        const site = c.var.siteAtRequestStart;
+        const elsewhere = await setElsewhereOn(c, page);
+        const editable = page.fields.filter((name) => elsewhere[settingOf(name)] === undefined);
+        const submitted = pageForm(c, page, editable, body, site);
+        const refuse = async (problems) => {
             c.status(400);
             return render(c, page.template, {
-                ...settingsScreen(c, page, stored),
+                ...(await settingsScreen(c, page, site, elsewhere)),
                 form: submitted,
                 problems,
                 hasProblems: true,
             });
-        }
-        // The change is applied to the settings re-read inside the write, so a
-        // field this page does not carry is whatever the file says now rather than
-        // whatever it said when the form was drawn. The archive renames and the
-        // menus come from there for the same reason: a save of the title must not
-        // undo a term somebody renamed, or a menu somebody edited, while this form
-        // was open.
-        const settings = await updateSiteSettings({
+        };
+        const problems = settingsProblems(submitted, editable, {
+            themesDir: c.var.config.themesDir,
             contentDir: c.var.config.contentDir,
-            change: (current) => settingsFromForm(pageForm(c, page, body, current), current),
         });
-        const note = page.saved === undefined ? '' : await page.saved(c, stored, settings);
-        flash(c, 'notice', `${pageHeading(page)} settings saved.${note}`);
+        if (Object.keys(problems).length > 0)
+            return await refuse(problems);
+        const result = await c.var.settings.set('site', siteChanges(submittedSettings(submitted, editable)), 'admin');
+        if (!result.ok)
+            return await refuse(result.problems);
+        flash(c, 'notice', `${pageHeading(page)} settings saved.`);
         return c.redirect(page.path, 303);
     });
     page.endpoints?.(app, options);
 }
 /** Everything one settings page's template renders. */
-export function settingsScreen(c, page, settings) {
-    const shown = page.shown === undefined ? settings : page.shown(c.var.config, settings);
+export async function settingsScreen(c, page, settings, elsewhere) {
     return {
         section: page.section ?? 'settings',
         child: page.child,
         settingsUrl: page.path,
         settingsLabel: pageHeading(page),
         fields: SETTINGS_FIELDS,
-        form: formFromSettings(shown),
+        form: formFromSettings(shownOn(c, page, settings)),
+        setElsewhere: Object.entries(elsewhere).map(([key, source]) => ({
+            setting: `site.${key}`,
+            source,
+        })),
         problems: {},
         // Whether to say "nothing was saved" over the form. A template cannot ask
         // an object whether it is empty, and every page would otherwise spell out
         // the list of its own fields to find out.
         hasProblems: false,
-        ...page.panels?.(c, settings),
+        ...(await page.panels?.(c, settings)),
     };
 }
 /** What the page is headed, and what a save of it says it saved. */
 function pageHeading(page) {
     return page.heading ?? page.label;
 }
-/**
- * The whole form as this page's save means it: what is stored, with the
- * page's own fields taken from what was submitted.
- *
- * Every other field comes from `current` rather than from the body, which is
- * what makes a page write only its own settings — and it is read out of a
- * checkbox correctly for free, since a clear checkbox submits nothing at all
- * and only this page's checkboxes are read off the body.
- */
-function pageForm(c, page, body, current) {
-    const form = formFromSettings(current);
-    for (const name of page.fields)
-        form[name] = bodyField(body[SETTINGS_FIELDS[name]]);
-    return { ...form, ...page.reads?.({ c, body, current }) };
+function shownOn(c, page, settings) {
+    return page.shown === undefined ? settings : page.shown(c.var.config, settings);
+}
+async function setElsewhereOn(c, page) {
+    return await setElsewhere(c.var.settings, SITE, page.fields.map(settingOf));
 }
-/** A form field as a string. A file upload, or a missing field, is the empty one. */
-export function bodyField(value) {
-    return typeof value === 'string' ? value : '';
+function pageForm(c, page, editable, body, site) {
+    const form = formFromSettings(shownOn(c, page, site));
+    const read = page.reads?.({ c, body }) ?? {};
+    for (const name of editable)
+        form[name] = read[name] ?? stringOrEmpty(body[SETTINGS_FIELDS[name]]);
+    return form;
 }
 /**
  * The sentence a flash adds about the followers, when there were any: a save

package/dist/admin/settings-page.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings-page.js","sourceRoot":"","sources":["../../src/admin/settings-page.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settings-page.js","sourceRoot":"","sources":["../../src/admin/settings-page.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAOH,OAAO,EAAE,IAAI,EAAE,MAAM,qBAAqB,CAAC;AAE3C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,SAAS,EACT,gBAAgB,EAChB,WAAW,EACX,iBAAiB,GAClB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAyD9C;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAa;IAC5C,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,IAAI,KAAK,EAAE,CAAC;AAC3E,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,iBAAiB,CAC/B,GAAqB,EACrB,IAAkB,EAClB,OAA6B;IAE7B,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAE3B,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,CAC7B,MAAM,CACJ,CAAC,EACD,IAAI,CAAC,QAAQ,EACb,MAAM,cAAc,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,kBAAkB,EAAE,MAAM,cAAc,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CACvF,CACF,CAAC;IAEF,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE;QAC9B,MAAM,IAAI,GAAkB,MAAM,CAAC,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QACpD,MAAM,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC;QACtC,MAAM,SAAS,GAAG,MAAM,cAAc,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;QAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,SAAS,CAAC,CAAC;QACxF,MAAM,SAAS,GAAG,QAAQ,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QAE1D,MAAM,MAAM,GAAG,KAAK,EAAE,QAA0B,EAAqB,EAAE;YACrE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YACd,OAAO,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE;gBAC9B,GAAG,CAAC,MAAM,cAAc,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;gBACnD,IAAI,EAAE,SAAS;gBACf,QAAQ;gBACR,WAAW,EAAE,IAAI;aAClB,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,MAAM,QAAQ,GAAG,gBAAgB,CAAC,SAAS,EAAE,QAAQ,EAAE;YACrD,SAAS,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,SAAS;YACjC,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,UAAU;SACpC,CAAC,CAAC;QACH,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC;YAAE,OAAO,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEpE,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CACrC,MAAM,EACN,WAAW,CAAC,iBAAiB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,EACnD,OAAO,CACR,CAAC;QACF,IAAI,CAAC,MAAM,CAAC,EAAE;YAAE,OAAO,MAAM,MAAM,CAAC,MAAM,CAAC,QAA4B,CAAC,CAAC;QAEzE,KAAK,CAAC,CAAC,EAAE,QAAQ,EAAE,GAAG,WAAW,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC3D,OAAO,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AACjC,CAAC;AAED,uDAAuD;AACvD,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,CAAsB,EACtB,IAAkB,EAClB,QAAsB,EACtB,SAA2C;IAE3C,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,UAAU;QACnC,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,WAAW,EAAE,IAAI,CAAC,IAAI;QACtB,aAAa,EAAE,WAAW,CAAC,IAAI,CAAC;QAChC,MAAM,EAAE,eAAe;QACvB,IAAI,EAAE,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;QAClD,YAAY,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;YAC9D,OAAO,EAAE,QAAQ,GAAG,EAAE;YACtB,MAAM;SACP,CAAC,CAAC;QACH,QAAQ,EAAE,EAAE;QACZ,0EAA0E;QAC1E,0EAA0E;QAC1E,0CAA0C;QAC1C,WAAW,EAAE,KAAK;QAClB,GAAG,CAAC,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;KACtC,CAAC;AACJ,CAAC;AAED,oEAAoE;AACpE,SAAS,WAAW,CAAC,IAAkB;IACrC,OAAO,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,KAAK,CAAC;AACpC,CAAC;AAED,SAAS,OAAO,CAAC,CAAsB,EAAE,IAAkB,EAAE,QAAsB;IACjF,OAAO,IAAI,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;AAClF,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,CAAsB,EACtB,IAAkB;IAElB,OAAO,MAAM,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,QAAQ,CACf,CAAsB,EACtB,IAAkB,EAClB,QAAkC,EAClC,IAAmB,EACnB,IAAkB;IAElB,MAAM,IAAI,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;IACtD,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC;IAC7C,KAAK,MAAM,IAAI,IAAI,QAAQ;QACzB,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACxE,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,MAAkC;IAC9D,MAAM,KAAK,GAAG,MAAM,EAAE,UAAU,CAAC,MAAM,IAAI,CAAC,CAAC;IAC7C,IAAI,KAAK,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAC3B,OAAO,KAAK,KAAK,CAAC;QAChB,CAAC,CAAC,8BAA8B;QAChC,CAAC,CAAC,IAAI,MAAM,CAAC,KAAK,CAAC,4BAA4B,CAAC;AACpD,CAAC"}

package/dist/admin/settings-pages.d.ts

@@ -19,7 +19,7 @@
  * agree with.
  */
 import type { Hono } from 'hono';
-import type { GeekityEnv } from '../env.ts';
+import type { GeekityEnv } from '../web/env.ts';
 import type { MountSettingsOptions, SettingsPage } from './settings-page.ts';
 /** The settings pages the Settings menu lists, in the order it lists them. */
 export declare const SETTINGS_PAGES: readonly SettingsPage[];

package/dist/admin/settings-pages.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-pages.d.ts","sourceRoot":"","sources":["../../src/admin/settings-pages.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAEjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAM5C,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAK7E,8EAA8E;AAC9E,eAAO,MAAM,cAAc,EAAE,SAAS,YAAY,EAOjD,CAAC;AAEF,uDAAuD;AACvD,eAAO,MAAM,kBAAkB,EAAE,SAAS,YAAY,EAA6C,CAAC;AAEpG,8EAA8E;AAC9E,wBAAgB,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAExF"}
+{"version":3,"file":"settings-pages.d.ts","sourceRoot":"","sources":["../../src/admin/settings-pages.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAEjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAMhD,OAAO,KAAK,EAAE,oBAAoB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAK7E,8EAA8E;AAC9E,eAAO,MAAM,cAAc,EAAE,SAAS,YAAY,EAOjD,CAAC;AAEF,uDAAuD;AACvD,eAAO,MAAM,kBAAkB,EAAE,SAAS,YAAY,EAA6C,CAAC;AAEpG,8EAA8E;AAC9E,wBAAgB,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,oBAAoB,GAAG,IAAI,CAExF"}

package/dist/admin/settings-permalinks.js

@@ -10,7 +10,7 @@
  * as a term is renamed or merged, and this is the page whose fields decide
  * which URLs they are about.
  */
-import { TAXONOMY_LABELS } from '../web/taxonomy.js';
+import { TAXONOMY_LABELS } from '../content/taxonomy.js';
 import { settingsPagePath } from './settings-page.js';
 import { ADMIN_TEMPLATES } from './templates.js';
 /** The Permalinks settings page. */
@@ -19,9 +19,9 @@ export const PERMALINKS_SETTINGS = {
     label: 'Permalinks',
     path: settingsPagePath('permalinks'),
     template: ADMIN_TEMPLATES.settingsPermalinks,
-    fields: ['tagBase', 'categoryBase'],
+    fields: ['tag_base', 'category_base'],
     panels: (_c, settings) => ({
-        taxonomyRedirects: settings.taxonomyRedirects.map((entry) => ({
+        taxonomyRedirects: settings.taxonomy_redirects.map((entry) => ({
             ...entry,
             // What the taxonomy is called in a sentence, so the list reads as the
             // taxonomy screens name it rather than as the file spells it.

package/dist/admin/settings-permalinks.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings-permalinks.js","sourceRoot":"","sources":["../../src/admin/settings-permalinks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,oCAAoC;AACpC,MAAM,CAAC,MAAM,mBAAmB,GAAiB;IAC/C,KAAK,EAAE,YAAY;IACnB,KAAK,EAAE,YAAY;IACnB,IAAI,EAAE,gBAAgB,CAAC,YAAY,CAAC;IACpC,QAAQ,EAAE,eAAe,CAAC,kBAAkB;IAC5C,MAAM,EAAE,CAAC,SAAS,EAAE,cAAc,CAAC;IAEnC,MAAM,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QACzB,iBAAiB,EAAE,QAAQ,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC5D,GAAG,KAAK;YACR,sEAAsE;YACtE,8DAA8D;YAC9D,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC;SACvC,CAAC,CAAC;KACJ,CAAC;CACH,CAAC"}
+{"version":3,"file":"settings-permalinks.js","sourceRoot":"","sources":["../../src/admin/settings-permalinks.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,oCAAoC;AACpC,MAAM,CAAC,MAAM,mBAAmB,GAAiB;IAC/C,KAAK,EAAE,YAAY;IACnB,KAAK,EAAE,YAAY;IACnB,IAAI,EAAE,gBAAgB,CAAC,YAAY,CAAC;IACpC,QAAQ,EAAE,eAAe,CAAC,kBAAkB;IAC5C,MAAM,EAAE,CAAC,UAAU,EAAE,eAAe,CAAC;IAErC,MAAM,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAC;QACzB,iBAAiB,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YAC7D,GAAG,KAAK;YACR,sEAAsE;YACtE,8DAA8D;YAC9D,KAAK,EAAE,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC;SACvC,CAAC,CAAC;KACJ,CAAC;CACH,CAAC"}

package/dist/admin/settings-privacy.js

@@ -5,6 +5,6 @@ export const PRIVACY_SETTINGS = {
     label: 'Privacy',
     path: settingsPagePath('privacy'),
     template: ADMIN_TEMPLATES.settingsPrivacy,
-    fields: ['locationSharing'],
+    fields: ['location_sharing'],
 };
 //# sourceMappingURL=settings-privacy.js.map

package/dist/admin/settings-privacy.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings-privacy.js","sourceRoot":"","sources":["../../src/admin/settings-privacy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,MAAM,CAAC,MAAM,gBAAgB,GAAiB;IAC5C,KAAK,EAAE,SAAS;IAChB,KAAK,EAAE,SAAS;IAChB,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAAC;IACjC,QAAQ,EAAE,eAAe,CAAC,eAAe;IACzC,MAAM,EAAE,CAAC,iBAAiB,CAAC;CAC5B,CAAC"}
+{"version":3,"file":"settings-privacy.js","sourceRoot":"","sources":["../../src/admin/settings-privacy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,MAAM,CAAC,MAAM,gBAAgB,GAAiB;IAC5C,KAAK,EAAE,SAAS;IAChB,KAAK,EAAE,SAAS;IAChB,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAAC;IACjC,QAAQ,EAAE,eAAe,CAAC,eAAe;IACzC,MAAM,EAAE,CAAC,kBAAkB,CAAC;CAC7B,CAAC"}

package/dist/admin/settings-reading.d.ts

@@ -9,7 +9,7 @@
  * a page of fields can be.
  */
 import type { Context } from 'hono';
-import type { GeekityEnv } from '../env.ts';
+import type { GeekityEnv } from '../web/env.ts';
 import type { SettingsPage } from './settings-page.ts';
 /** One page the homepage or the posts page may be. */
 export interface PageChoice {
@@ -18,7 +18,7 @@ export interface PageChoice {
     /** What the option reads. */
     title: string;
 }
-/** The published pages, by title, as the two picks offer them. */
+/** The published pages, by label, as the two picks offer them. */
 export declare function pageChoices(c: Context<GeekityEnv>): PageChoice[];
 /**
  * The Reading settings page.

package/dist/admin/settings-reading.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settings-reading.d.ts","sourceRoot":"","sources":["../../src/admin/settings-reading.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAGpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAE5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGvD,sDAAsD;AACtD,MAAM,WAAW,UAAU;IACzB,+BAA+B;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,6BAA6B;IAC7B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,kEAAkE;AAClE,wBAAgB,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,UAAU,EAAE,CAQhE;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,EAAE,YAgC9B,CAAC"}
+{"version":3,"file":"settings-reading.d.ts","sourceRoot":"","sources":["../../src/admin/settings-reading.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAIpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGvD,sDAAsD;AACtD,MAAM,WAAW,UAAU;IACzB,+BAA+B;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,6BAA6B;IAC7B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,kEAAkE;AAClE,wBAAgB,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,GAAG,UAAU,EAAE,CAQhE;AAED;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,EAAE,YAgC9B,CAAC"}

package/dist/admin/settings-reading.js

@@ -8,16 +8,17 @@
  * menus there are to edit comes from the active theme, which is not something
  * a page of fields can be.
  */
-import { isServed } from '../web/documents.js';
+import { postLabel } from '../content/post-type.js';
+import { isServed } from '../content/served.js';
 import { settingsPagePath } from './settings-page.js';
 import { ADMIN_TEMPLATES } from './templates.js';
-/** The published pages, by title, as the two picks offer them. */
+/** The published pages, by label, as the two picks offer them. */
 export function pageChoices(c) {
     const now = c.var.store.now();
     return c.var.store
         .listAll({ type: 'page', draft: false, trashed: false, scheduled: false })
         .filter((document) => isServed(document, now))
-        .map((document) => ({ slug: document.slug, title: document.title }))
+        .map((document) => ({ slug: document.slug, title: postLabel(document) }))
         .sort((a, b) => a.title.localeCompare(b.title));
 }
 /**
@@ -37,18 +38,18 @@ export const READING_SETTINGS = {
     template: ADMIN_TEMPLATES.settingsReading,
     fields: [
         'homepage',
-        'postsPage',
-        'postsPerPage',
-        'notifyServer',
-        'feedUpdatePeriod',
-        'feedUpdateFrequency',
-        'aiCrawlers',
-        'contentSignalSearch',
-        'contentSignalAiInput',
-        'contentSignalAiTrain',
-        'robotsRules',
-        'llmsTxt',
-        'indexNow',
+        'posts_page',
+        'posts_per_page',
+        'notify_server',
+        'feed_update_period',
+        'feed_update_frequency',
+        'ai_crawlers',
+        'content_signal_search',
+        'content_signal_ai_input',
+        'content_signal_ai_train',
+        'robots_rules',
+        'llms_txt',
+        'index_now',
     ],
     panels: (c, settings) => {
         const choices = pageChoices(c);
@@ -56,7 +57,7 @@ export const READING_SETTINGS = {
         return {
             pageChoices: choices,
             homepageMissing: missing(settings.homepage),
-            postsPageMissing: missing(settings.postsPage),
+            postsPageMissing: missing(settings.posts_page),
         };
     },
 };

package/dist/admin/settings-reading.js.map

@@ -1 +1 @@
-{"version":3,"file":"settings-reading.js","sourceRoot":"","sources":["../../src/admin/settings-reading.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAUjD,kEAAkE;AAClE,MAAM,UAAU,WAAW,CAAC,CAAsB;IAChD,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;IAE9B,OAAO,CAAC,CAAC,GAAG,CAAC,KAAK;SACf,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;SACzE,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;SAC7C,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;SACnE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;AACpD,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAiB;IAC5C,KAAK,EAAE,SAAS;IAChB,KAAK,EAAE,SAAS;IAChB,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAAC;IACjC,QAAQ,EAAE,eAAe,CAAC,eAAe;IACzC,MAAM,EAAE;QACN,UAAU;QACV,WAAW;QACX,cAAc;QACd,cAAc;QACd,kBAAkB;QAClB,qBAAqB;QACrB,YAAY;QACZ,qBAAqB;QACrB,sBAAsB;QACtB,sBAAsB;QACtB,aAAa;QACb,SAAS;QACT,UAAU;KACX;IAED,MAAM,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE;QACtB,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,OAAO,GAAG,CAAC,IAAY,EAAW,EAAE,CACxC,IAAI,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAEjE,OAAO;YACL,WAAW,EAAE,OAAO;YACpB,eAAe,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC3C,gBAAgB,EAAE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;SAC9C,CAAC;IACJ,CAAC;CACF,CAAC"}
+{"version":3,"file":"settings-reading.js","sourceRoot":"","sources":["../../src/admin/settings-reading.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAEhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAUjD,kEAAkE;AAClE,MAAM,UAAU,WAAW,CAAC,CAAsB;IAChD,MAAM,GAAG,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC;IAE9B,OAAO,CAAC,CAAC,GAAG,CAAC,KAAK;SACf,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;SACzE,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;SAC7C,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;SACxE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;AACpD,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAiB;IAC5C,KAAK,EAAE,SAAS;IAChB,KAAK,EAAE,SAAS;IAChB,IAAI,EAAE,gBAAgB,CAAC,SAAS,CAAC;IACjC,QAAQ,EAAE,eAAe,CAAC,eAAe;IACzC,MAAM,EAAE;QACN,UAAU;QACV,YAAY;QACZ,gBAAgB;QAChB,eAAe;QACf,oBAAoB;QACpB,uBAAuB;QACvB,aAAa;QACb,uBAAuB;QACvB,yBAAyB;QACzB,yBAAyB;QACzB,cAAc;QACd,UAAU;QACV,WAAW;KACZ;IAED,MAAM,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE;QACtB,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,OAAO,GAAG,CAAC,IAAY,EAAW,EAAE,CACxC,IAAI,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAEjE,OAAO;YACL,WAAW,EAAE,OAAO;YACpB,eAAe,EAAE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC3C,gBAAgB,EAAE,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC;SAC/C,CAAC;IACJ,CAAC;CACF,CAAC"}

package/dist/admin/settings-renderer.d.ts

@@ -0,0 +1,32 @@
+import type { RenderedSetting, SetResult, SettingsRegistry } from '../settings/types.ts';
+export interface SettingsForm {
+    readonly values: Readonly<Record<string, string>>;
+    readonly forget: ReadonlySet<string>;
+}
+export declare function settingsForm(body: Readonly<Record<string, unknown>>): SettingsForm;
+export declare function settingViews(settings: SettingsRegistry, envPrefix: string, fields: readonly RenderedSetting[], refused?: {
+    problems?: Readonly<Record<string, string>>;
+    submitted?: SettingsForm;
+}): Promise<{
+    key: string;
+    widget: import("../settings/types.ts").SettingWidget;
+    id: string;
+    name: string;
+    forgetName: string;
+    label: string;
+    hint: string | undefined;
+    value: string;
+    checked: boolean;
+    options: {
+        value: string;
+        label: string;
+        selected: boolean;
+    }[];
+    error: string | undefined;
+    stored: string | undefined;
+    setBy: string | undefined;
+    storedSet: boolean;
+    variable: string | undefined;
+}[]>;
+export declare function saveSettings(settings: SettingsRegistry, namespace: string, fields: readonly RenderedSetting[], form: SettingsForm): Promise<SetResult>;
+//# sourceMappingURL=settings-renderer.d.ts.map

package/dist/admin/settings-renderer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"settings-renderer.d.ts","sourceRoot":"","sources":["../../src/admin/settings-renderer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAEzF,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAClD,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CACtC;AAKD,wBAAgB,YAAY,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,YAAY,CASlF;AAED,wBAAsB,YAAY,CAChC,QAAQ,EAAE,gBAAgB,EAC1B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,SAAS,eAAe,EAAE,EAClC,OAAO,GAAE;IAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IAAC,SAAS,CAAC,EAAE,YAAY,CAAA;CAAO;;;;;;;;;;;;;;;;;;;;KAiCxF;AAED,wBAAsB,YAAY,CAChC,QAAQ,EAAE,gBAAgB,EAC1B,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,SAAS,eAAe,EAAE,EAClC,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,SAAS,CAAC,CA0BpB"}

package/dist/admin/settings-renderer.js

@@ -0,0 +1,79 @@
+import { overridden, sourceText } from '../settings/registry.js';
+import { settingVariable } from '../settings/names.js';
+const SETTING_PREFIX = 'setting.';
+const FORGET_PREFIX = 'forget.';
+export function settingsForm(body) {
+    const values = {};
+    const forget = new Set();
+    for (const [field, value] of Object.entries(body)) {
+        if (typeof value !== 'string')
+            continue;
+        if (field.startsWith(SETTING_PREFIX))
+            values[field.slice(SETTING_PREFIX.length)] = value;
+        if (field.startsWith(FORGET_PREFIX))
+            forget.add(field.slice(FORGET_PREFIX.length));
+    }
+    return { values, forget };
+}
+export async function settingViews(settings, envPrefix, fields, refused = {}) {
+    return await Promise.all(fields.map(async (field) => {
+        const { ref, widget } = field;
+        const resolved = await settings.resolve(ref);
+        const typed = refused.submitted?.values;
+        const value = typed === undefined ? ref.declaration.type.toText(resolved.value) : (typed[ref.key] ?? '');
+        const checked = typed === undefined ? resolved.value === true : typed[ref.key] !== undefined;
+        return {
+            key: ref.key,
+            widget,
+            id: `setting-${ref.key}`,
+            name: `${SETTING_PREFIX}${ref.key}`,
+            forgetName: `${FORGET_PREFIX}${ref.key}`,
+            label: field.label,
+            hint: field.hint,
+            value: widget === 'secret' ? '' : value,
+            checked,
+            options: (field.options ?? []).map((option) => ({
+                ...option,
+                selected: option.value === value,
+            })),
+            error: refused.problems?.[ref.key],
+            stored: resolved.problem === undefined ? undefined : `${resolved.problem}, so it is set aside.`,
+            setBy: overridden(resolved.source) ? sourceText(resolved.source) : undefined,
+            storedSet: resolved.stored !== undefined,
+            variable: ref.declaration.env === false ? undefined : settingVariable(envPrefix, ref.key),
+        };
+    }));
+}
+export async function saveSettings(settings, namespace, fields, form) {
+    const changes = new Map();
+    const problems = {};
+    for (const { ref, label, widget } of fields) {
+        if (overridden((await settings.resolve(ref)).source))
+            continue;
+        const submitted = form.values[ref.key]?.trim();
+        const { type } = ref.declaration;
+        if (widget === 'checkbox') {
+            changes.set(ref.key, type.toJson(submitted !== undefined));
+            continue;
+        }
+        if (widget === 'secret' && form.forget.has(ref.key)) {
+            changes.set(ref.key, undefined);
+            continue;
+        }
+        if (submitted === undefined || (submitted === '' && widget === 'secret'))
+            continue;
+        if (submitted === '') {
+            changes.set(ref.key, undefined);
+            continue;
+        }
+        const parsed = type.fromText(submitted);
+        if (parsed.ok)
+            changes.set(ref.key, type.toJson(parsed.value));
+        else
+            problems[ref.key] = `${label} ${parsed.problem}.`;
+    }
+    if (Object.keys(problems).length > 0)
+        return { ok: false, problems };
+    return await settings.set(namespace, changes, 'admin');
+}
+//# sourceMappingURL=settings-renderer.js.map

package/dist/admin/settings-renderer.js.map

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