@geekity/cms 0.5.0 → 0.6.0

package/dist/web/navigation.d.ts

@@ -5,17 +5,64 @@ import type { SiteData } from './context.ts';
  */
 export declare const DEFAULT_MENU_NAME = "primary";
 /**
- * The flags one menu item may carry, as `site.json` spells them and as the
- * settings screen writes them at the end of a line.
+ * What one `rel` value may be spelled with: letters and dashes, which is what
+ * every HTML link type is spelled with.
  *
- * A flag is a word rather than a value, and the list is here rather than
- * spread through the parsers so that a second one — `nofollow`, say, or a flag
- * that opens a link in its own tab — is one entry and its handling in the
- * theme, not a new shape for an item.
+ * Deliberately not a list of the values this CMS knows about (TASK-114). The
+ * trailing part of a link line is whatever `rel` values the person typed —
+ * `me`, `nofollow`, `author`, `noopener`, one somebody's own reader looks for
+ * — and all of them reach the rendered attribute. A closed list would mean
+ * every value anybody wanted had to be added here first, and `me` was never a
+ * flag in the first place: it is a `rel` value that this CMS happened to be
+ * the only one to know.
  */
-export declare const MENU_ITEM_FLAGS: readonly ['me'];
-/** One of {@link MENU_ITEM_FLAGS}. */
-export type MenuItemFlag = (typeof MENU_ITEM_FLAGS)[number];
+export declare const REL_VALUE_PATTERN: RegExp;
+/**
+ * What a link line's trailing part may be, in the words both boxes explain it
+ * in, beside {@link LINK_URL_RULE}.
+ */
+export declare const LINK_REL_RULE = "the rel values the link carries, a word each \u2014 \"| me\", \"| nofollow noopener\"";
+/**
+ * One bar-separated part as the `rel` values it names, or `undefined` when it
+ * is not a list of them.
+ *
+ * Every word has to be one: `nofollow noopener` is a list, `a=1|2`'s `2` is
+ * not, and that is what keeps a bar inside a URL a bar. An empty part names no
+ * values rather than an empty list, because `About | /about/ |` is a line with
+ * a trailing bar, not a line with a rel.
+ */
+export declare function relValuesOf(text: string): string[] | undefined;
+/**
+ * Some `rel` values as one attribute holds them: lower case, each said once,
+ * in the order they were first typed.
+ *
+ * A theme prints this string and nothing else, so it never joins a list itself
+ * and never emits two `rel` attributes on one link. Lower case is what makes
+ * saying a value twice — `me` typed on a profile link that already carries it
+ * — a no-op rather than `rel="me ME"`.
+ */
+export declare function relText(values: Iterable<string>): string;
+/** A link line split at the point where its `rel` values begin. */
+export interface LinkLine {
+    /** The line with its trailing `rel` values taken off: the label and the URL. */
+    text: string;
+    /** The values that were typed, as one attribute holds them. Empty for none. */
+    rel: string;
+}
+/**
+ * One typed link line, with the `rel` values taken off the end of it.
+ *
+ * The values come off the right, one bar-separated part at a time, and only
+ * while the last part is a list of rel values — so `Mastodon |
+ * https://example.social/@me | me | nofollow` and `... | me nofollow` are the
+ * same line, and `Odd | /odd/?a=1|2` keeps its bar because `2` is not one.
+ *
+ * The one place a link line is split, for the reason the URL rule is worded
+ * once (TASK-114): the menu box on the Navigation screen and the Links box on
+ * a profile take the same line, so somebody who learns one box has learned the
+ * other.
+ */
+export declare function splitLinkRel(line: string): LinkLine;
 /**
  * What a menu name may be spelled with.
  *
@@ -51,16 +98,17 @@ export interface NavigationItem {
     /** Where it goes: a site-root path, or an absolute URL for somewhere else. */
     url: string;
     /**
-     * Whether the link carries `rel="me"`, which is how Mastodon and the rest of
-     * the IndieWeb verify that the site and the profile it links are the same
-     * person.
+     * What the link's `rel` attribute says, as one string holding every value:
+     * `me` for a profile that is you, `nofollow noopener` for somewhere you are
+     * only pointing at, whatever else a reader of this site looks for.
      *
-     * Present only when it is set. An unmarked item is spelled exactly as every
-     * item was before flags existed, so a `site.json` holding a plain
-     * `{ label, url }` is a complete item rather than one missing a key, and a
-     * flag added later never has to be written across a file to mean nothing.
+     * Present only when there is something to say, so a `site.json` holding a
+     * plain `{ label, url }` is a complete item rather than one missing a key.
+     * Already lower case and deduplicated ({@link relText}), because a theme
+     * prints it as it stands and no theme should be joining a list or emitting
+     * two `rel` attributes on one link.
      */
-    me?: true;
+    rel?: string;
 }
 /** Every menu one site stores, by name. */
 export type NavigationMenus = Record<string, NavigationItem[]>;
@@ -148,10 +196,15 @@ export declare function menusOf(value: unknown): NavigationMenus;
  * One menu's stored value as the items it names, ignoring anything that is not
  * one.
  *
- * A flag is read only when it is spelled exactly `true`: `"yes"`, `1` and
- * `false` all leave the item unmarked, so a flag is either set or it is not
- * and a theme writes `{% if item.me %}` without wondering what else the file
- * might have put there.
+ * `rel` is read through {@link relText}, so a file that wrote it in capitals
+ * or said a value twice renders one attribute either way, and a `rel` that is
+ * not a string is an item with none rather than an item dropped.
+ *
+ * `me: true` is still read, as `rel: "me"`. It is how every marked item was
+ * spelled before the trailing part of a line was a list of rel values
+ * (TASK-107, TASK-114), and a site that had set the only flag there was must
+ * not lose it on upgrade; the Navigation screen writes `rel` the next time
+ * that menu is saved. Only the literal `true` counts, the way it always did.
  */
 export declare function navigationItemsOf(value: unknown): NavigationItem[];
 /**
@@ -161,13 +214,9 @@ export declare function navigationItemsOf(value: unknown): NavigationItem[];
  * `about/` would be resolved against whatever page it was printed on, which is
  * never what a menu means.
  *
- * A line may end in the flags the item carries, one per bar — `Mastodon |
- * https://example.social/@me | me` — and those are taken off the end first,
- * from the right, and only while the last part is the name of a flag this CMS
- * actually has ({@link MENU_ITEM_FLAGS}). That is what lets a URL still hold a
- * bar, a query string say: a trailing `| elsewhere` is not a flag, so it stays
- * part of the URL and the line is refused for not naming one, rather than
- * being quietly read as a flag nobody asked for.
+ * A line may end in the `rel` values the link carries — `Mastodon |
+ * https://example.social/@me | me`, `A source | https://example.com/thing |
+ * nofollow noopener` — which {@link splitLinkRel} takes off the end first.
  *
  * What is left splits at its first bar, so a label still cannot hold one.
  */
@@ -192,4 +241,33 @@ export declare function menuItemsText(items: readonly NavigationItem[]): string;
  * half of the sentence.
  */
 export declare function menuItemLineProblem(value: string): string | undefined;
+/**
+ * What a URL typed into a link box may be, in the words both boxes explain it
+ * in: the menu on the Navigation screen and the Links on a user's profile.
+ *
+ * One sentence fragment rather than two, so the rule {@link isLinkUrl} applies
+ * is worded the same wherever somebody is told about it (TASK-112). Somebody
+ * who learns one box should not be taught the wrong thing about the other.
+ */
+export declare const LINK_URL_RULE = "a path like /about/ or an absolute http:// or https:// URL, with no spaces in it";
+/**
+ * Whether a typed URL is one a link box accepts: a site-root path, or an
+ * absolute http(s) URL, and no whitespace either way.
+ *
+ * A bare `about/` would be resolved against whatever page it was printed on,
+ * which is never what a link box means, and a `javascript:` or `data:` URL is
+ * not somewhere a reader goes.
+ *
+ * The whitespace half is not decoration. `new URL` does not throw on
+ * `https://shll.me/@a | me`: it reads the space and the bar as path
+ * characters and percent-encodes them, so a check that only asked the parser
+ * took a label, a URL and a trailing word as one URL and stored it — which is
+ * how a reader of shll.me ended up at `/author/a%20%7C%20me/` (TASK-112). A
+ * URL somebody types has no spaces in it; a space means they typed two things.
+ *
+ * Deliberately a test rather than a normaliser: a link keeps the URL as it was
+ * typed, so `https://example.social/@me` is what the link says and what the
+ * box shows it back as.
+ */
+export declare function isLinkUrl(url: string): boolean;
 //# sourceMappingURL=navigation.d.ts.map

package/dist/web/navigation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"navigation.d.ts","sourceRoot":"","sources":["../../src/web/navigation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE7C;;;GAGG;AACH,eAAO,MAAM,iBAAiB,YAAY,CAAC;AAE3C;;;;;;;;GAQG;AACH,eAAO,MAAM,eAAe,YAAI,IAAI,CAAU,CAAC;AAE/C,sCAAsC;AACtC,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC;AAE5D;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,iBAAiB,QAAsB,CAAC;AAErD,sFAAsF;AACtF,eAAO,MAAM,oBAAoB,KAAK,CAAC;AAEvC;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAmBhE;AAED,4EAA4E;AAC5E,MAAM,WAAW,cAAc;IAC7B,6BAA6B;IAC7B,KAAK,EAAE,MAAM,CAAC;IACd,8EAA8E;IAC9E,GAAG,EAAE,MAAM,CAAC;IACZ;;;;;;;;;OASG;IACH,EAAE,CAAC,EAAE,IAAI,CAAC;CACX;AAED,2CAA2C;AAC3C,MAAM,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC;AAE/D,6CAA6C;AAC7C,MAAM,WAAW,QAAS,SAAQ,cAAc;IAC9C,oEAAoE;IACpE,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,+EAA+E;AAC/E,MAAM,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;AAElD,wDAAwD;AACxD,MAAM,WAAW,qBAAqB;IACpC,2DAA2D;IAC3D,IAAI,EAAE,QAAQ,CAAC;IACf,oEAAoE;IACpE,GAAG,EAAE,MAAM,CAAC;IACZ,+DAA+D;IAC/D,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3B;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,QAAQ,EAAE,CAEzE;AAED,6DAA6D;AAC7D,MAAM,WAAW,sBAAsB;IACrC,2DAA2D;IAC3D,IAAI,EAAE,QAAQ,CAAC;IACf,oEAAoE;IACpE,GAAG,EAAE,MAAM,CAAC;CACb;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,OAAO,EAAE,sBAAsB,GAAG,QAAQ,CAMzE;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,QAAQ,EACd,IAAI,GAAE,MAA0B,GAC/B,cAAc,EAAE,CAElB;AAED;;;;;;;GAOG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,QAAQ,GAAG,eAAe,CAEzD;AAED;;;;;;;;;GASG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,eAAe,CASvD;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,GAAG,cAAc,EAAE,CAYlE;AAeD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,SAAS,CAyBnE;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,cAAc,EAAE,CAOjE;AAED,8DAA8D;AAC9D,wBAAgB,aAAa,CAAC,KAAK,EAAE,SAAS,cAAc,EAAE,GAAG,MAAM,CAItE;AAED;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAOrE"}
+{"version":3,"file":"navigation.d.ts","sourceRoot":"","sources":["../../src/web/navigation.ts"],"names":[],"mappings":"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"}

package/dist/web/navigation.js

@@ -4,15 +4,88 @@
  */
 export const DEFAULT_MENU_NAME = 'primary';
 /**
- * The flags one menu item may carry, as `site.json` spells them and as the
- * settings screen writes them at the end of a line.
+ * What one `rel` value may be spelled with: letters and dashes, which is what
+ * every HTML link type is spelled with.
  *
- * A flag is a word rather than a value, and the list is here rather than
- * spread through the parsers so that a second one — `nofollow`, say, or a flag
- * that opens a link in its own tab — is one entry and its handling in the
- * theme, not a new shape for an item.
+ * Deliberately not a list of the values this CMS knows about (TASK-114). The
+ * trailing part of a link line is whatever `rel` values the person typed —
+ * `me`, `nofollow`, `author`, `noopener`, one somebody's own reader looks for
+ * — and all of them reach the rendered attribute. A closed list would mean
+ * every value anybody wanted had to be added here first, and `me` was never a
+ * flag in the first place: it is a `rel` value that this CMS happened to be
+ * the only one to know.
  */
-export const MENU_ITEM_FLAGS = ['me'];
+export const REL_VALUE_PATTERN = /^[a-z-]+$/i;
+/**
+ * What a link line's trailing part may be, in the words both boxes explain it
+ * in, beside {@link LINK_URL_RULE}.
+ */
+export const LINK_REL_RULE = 'the rel values the link carries, a word each — "| me", "| nofollow noopener"';
+/**
+ * One bar-separated part as the `rel` values it names, or `undefined` when it
+ * is not a list of them.
+ *
+ * Every word has to be one: `nofollow noopener` is a list, `a=1|2`'s `2` is
+ * not, and that is what keeps a bar inside a URL a bar. An empty part names no
+ * values rather than an empty list, because `About | /about/ |` is a line with
+ * a trailing bar, not a line with a rel.
+ */
+export function relValuesOf(text) {
+    const words = text
+        .trim()
+        .split(/\s+/)
+        .filter((word) => word !== '');
+    if (words.length === 0)
+        return undefined;
+    return words.every((word) => REL_VALUE_PATTERN.test(word)) ? words : undefined;
+}
+/**
+ * Some `rel` values as one attribute holds them: lower case, each said once,
+ * in the order they were first typed.
+ *
+ * A theme prints this string and nothing else, so it never joins a list itself
+ * and never emits two `rel` attributes on one link. Lower case is what makes
+ * saying a value twice — `me` typed on a profile link that already carries it
+ * — a no-op rather than `rel="me ME"`.
+ */
+export function relText(values) {
+    const said = new Set();
+    for (const value of values) {
+        for (const word of value.trim().toLowerCase().split(/\s+/)) {
+            if (word !== '')
+                said.add(word);
+        }
+    }
+    return [...said].join(' ');
+}
+/**
+ * One typed link line, with the `rel` values taken off the end of it.
+ *
+ * The values come off the right, one bar-separated part at a time, and only
+ * while the last part is a list of rel values — so `Mastodon |
+ * https://example.social/@me | me | nofollow` and `... | me nofollow` are the
+ * same line, and `Odd | /odd/?a=1|2` keeps its bar because `2` is not one.
+ *
+ * The one place a link line is split, for the reason the URL rule is worded
+ * once (TASK-114): the menu box on the Navigation screen and the Links box on
+ * a profile take the same line, so somebody who learns one box has learned the
+ * other.
+ */
+export function splitLinkRel(line) {
+    const values = [];
+    let text = line;
+    for (;;) {
+        const bar = text.lastIndexOf('|');
+        if (bar === -1)
+            break;
+        const rel = relValuesOf(text.slice(bar + 1));
+        if (rel === undefined)
+            break;
+        values.unshift(...rel);
+        text = text.slice(0, bar);
+    }
+    return { text: text.trim(), rel: relText(values) };
+}
 /**
  * What a menu name may be spelled with.
  *
@@ -140,10 +213,15 @@ export function menusOf(value) {
  * One menu's stored value as the items it names, ignoring anything that is not
  * one.
  *
- * A flag is read only when it is spelled exactly `true`: `"yes"`, `1` and
- * `false` all leave the item unmarked, so a flag is either set or it is not
- * and a theme writes `{% if item.me %}` without wondering what else the file
- * might have put there.
+ * `rel` is read through {@link relText}, so a file that wrote it in capitals
+ * or said a value twice renders one attribute either way, and a `rel` that is
+ * not a string is an item with none rather than an item dropped.
+ *
+ * `me: true` is still read, as `rel: "me"`. It is how every marked item was
+ * spelled before the trailing part of a line was a list of rel values
+ * (TASK-107, TASK-114), and a site that had set the only flag there was must
+ * not lose it on upgrade; the Navigation screen writes `rel` the next time
+ * that menu is saved. Only the literal `true` counts, the way it always did.
  */
 export function navigationItemsOf(value) {
     if (!Array.isArray(value))
@@ -152,12 +230,16 @@ export function navigationItemsOf(value) {
     for (const entry of value) {
         if (typeof entry !== 'object' || entry === null)
             continue;
-        const { label, url, me } = entry;
+        const { label, url, rel, me } = entry;
         if (typeof label !== 'string' || label === '')
             continue;
         if (typeof url !== 'string' || url === '')
             continue;
-        items.push({ label, url, ...(me === true ? { me: true } : {}) });
+        const values = relText([
+            ...(me === true ? ['me'] : []),
+            ...(typeof rel === 'string' ? [rel] : []),
+        ]);
+        items.push({ label, url, ...(values === '' ? {} : { rel: values }) });
     }
     return items;
 }
@@ -180,42 +262,22 @@ function menuLines(value) {
  * `about/` would be resolved against whatever page it was printed on, which is
  * never what a menu means.
  *
- * A line may end in the flags the item carries, one per bar — `Mastodon |
- * https://example.social/@me | me` — and those are taken off the end first,
- * from the right, and only while the last part is the name of a flag this CMS
- * actually has ({@link MENU_ITEM_FLAGS}). That is what lets a URL still hold a
- * bar, a query string say: a trailing `| elsewhere` is not a flag, so it stays
- * part of the URL and the line is refused for not naming one, rather than
- * being quietly read as a flag nobody asked for.
+ * A line may end in the `rel` values the link carries — `Mastodon |
+ * https://example.social/@me | me`, `A source | https://example.com/thing |
+ * nofollow noopener` — which {@link splitLinkRel} takes off the end first.
  *
  * What is left splits at its first bar, so a label still cannot hold one.
  */
 export function menuItemOf(line) {
-    const flags = new Set();
-    let rest = line;
-    for (;;) {
-        const bar = rest.lastIndexOf('|');
-        if (bar === -1)
-            break;
-        const flag = rest
-            .slice(bar + 1)
-            .trim()
-            .toLowerCase();
-        if (!MENU_ITEM_FLAGS.includes(flag))
-            break;
-        flags.add(flag);
-        rest = rest.slice(0, bar);
-    }
-    const bar = rest.indexOf('|');
+    const { text, rel } = splitLinkRel(line);
+    const bar = text.indexOf('|');
     if (bar === -1)
         return undefined;
-    const label = rest.slice(0, bar).trim();
-    const url = rest.slice(bar + 1).trim();
-    if (label === '' || url === '')
-        return undefined;
-    if (!url.startsWith('/') && !isAbsoluteHttpUrl(url))
+    const label = text.slice(0, bar).trim();
+    const url = text.slice(bar + 1).trim();
+    if (label === '' || !isLinkUrl(url))
         return undefined;
-    return { label, url, ...(flags.has('me') ? { me: true } : {}) };
+    return { label, url, ...(rel === '' ? {} : { rel }) };
 }
 /**
  * A menu box as the ordered items it names, dropping the lines that are not
@@ -238,7 +300,7 @@ export function menuItemsFromText(value) {
 /** The items as a box shows them: one line each, in order. */
 export function menuItemsText(items) {
     return items
-        .map((item) => `${item.label} | ${item.url}${item.me === true ? ' | me' : ''}`)
+        .map((item) => `${item.label} | ${item.url}${item.rel === undefined ? '' : ` | ${item.rel}`}`)
         .join('\n');
 }
 /**
@@ -252,18 +314,42 @@ export function menuItemLineProblem(value) {
     const bad = menuLines(value).find((line) => menuItemOf(line) === undefined);
     return bad === undefined
         ? undefined
-        : `A menu item is "Label | URL", one per line, where the URL is a path ` +
-            `like /about/ or an absolute http:// or https:// URL, and ends ` +
-            `"| me" for a link that should carry rel="me". "${bad}" is not one.`;
+        : `A menu item is "Label | URL", one per line, where the URL is ` +
+            `${LINK_URL_RULE}, and may end in ${LINK_REL_RULE}. "${bad}" is not one.`;
 }
 /**
- * Whether a menu URL is an absolute http(s) one.
+ * What a URL typed into a link box may be, in the words both boxes explain it
+ * in: the menu on the Navigation screen and the Links on a user's profile.
+ *
+ * One sentence fragment rather than two, so the rule {@link isLinkUrl} applies
+ * is worded the same wherever somebody is told about it (TASK-112). Somebody
+ * who learns one box should not be taught the wrong thing about the other.
+ */
+export const LINK_URL_RULE = 'a path like /about/ or an absolute http:// or https:// URL, with no spaces in it';
+/**
+ * Whether a typed URL is one a link box accepts: a site-root path, or an
+ * absolute http(s) URL, and no whitespace either way.
+ *
+ * A bare `about/` would be resolved against whatever page it was printed on,
+ * which is never what a link box means, and a `javascript:` or `data:` URL is
+ * not somewhere a reader goes.
  *
- * Deliberately a test rather than a normaliser: a menu keeps the URL as it was
+ * The whitespace half is not decoration. `new URL` does not throw on
+ * `https://shll.me/@a | me`: it reads the space and the bar as path
+ * characters and percent-encodes them, so a check that only asked the parser
+ * took a label, a URL and a trailing word as one URL and stored it — which is
+ * how a reader of shll.me ended up at `/author/a%20%7C%20me/` (TASK-112). A
+ * URL somebody types has no spaces in it; a space means they typed two things.
+ *
+ * Deliberately a test rather than a normaliser: a link keeps the URL as it was
  * typed, so `https://example.social/@me` is what the link says and what the
  * box shows it back as.
  */
-function isAbsoluteHttpUrl(url) {
+export function isLinkUrl(url) {
+    if (url === '' || /\s/.test(url))
+        return false;
+    if (url.startsWith('/'))
+        return true;
     let parsed;
     try {
         parsed = new URL(url);

package/dist/web/navigation.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekity/cms",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "type": "module",
   "description": "A file-first CMS: Markdown content, a SQLite index, a Hono server that is both the editor and the public site.",
   "license": "MIT",

package/themes/default/README.md

@@ -262,7 +262,9 @@ person on an author archive.
 What the bio prints: a round `u-photo` at 50px when they have an avatar,
 "Written by" and their name as a `p-name u-url` linked `rel="author me"` to
 their archive, then `p-job-title` and `p-locality` when the profile says, then
-their `p-note` and their `rel="me"` links as a `ul.hlist.bio-links`. Each of
+their `p-note` and their `rel="me"` links as a `ul.hlist.bio-links` — each
+link's `rel` is on it ready to print, `me` first and then whatever else the
+Links box typed. Each of
 those is printed only when the profile says it, so a profile holding a name
 alone prints a name alone. A name this site has no account for is printed
 unlinked, because the file still said somebody wrote this.
@@ -834,7 +836,7 @@ A site stores its menus by name in `content/_data/site.json`:
     ],
     "footer": [
       { "label": "Colophon", "url": "/colophon/" },
-      { "label": "Mastodon", "url": "https://example.social/@me", "me": true }
+      { "label": "Mastodon", "url": "https://example.social/@me", "rel": "me" }
     ]
   }
 }
@@ -882,14 +884,17 @@ rather than failing to load it.
 
 ### One item
 
-Each item is `{ label, url, current }`, plus `me: true` on a link that should
-carry `rel="me"`. `url` is a site-root path or an absolute URL for somewhere
-else, so put it through the `url` filter and a site served from a subdirectory
-still links correctly. `current` is true for the item whose path is the one
-being rendered, comparing without the trailing slash; an item pointing off the
-site is never current. `me` is for the IndieWeb's identity check: Mastodon
-verifies a link on a profile by looking for a `rel="me"` link back, so a footer
-link to a profile marked `me` is what makes the tick appear.
+Each item is `{ label, url, current }`, plus `rel` on a link that carries `rel`
+values. `url` is a site-root path or an absolute URL for somewhere else, so put
+it through the `url` filter and a site served from a subdirectory still links
+correctly. `current` is true for the item whose path is the one being rendered,
+comparing without the trailing slash; an item pointing off the site is never
+current. `rel` is one string holding every value the line carried, already
+lower case and each said once — print it as the whole attribute,
+`rel="{{ item.rel }}"`, rather than building one of your own. `me` is the value
+most menus have, for the IndieWeb's identity check: Mastodon verifies a link on
+a profile by looking for a `rel="me"` link back, so a footer link to a profile
+marked `me` is what makes the tick appear.
 
 ### Where this theme prints them
 
@@ -920,6 +925,16 @@ account: it used to print one `rel="me"` link per entry of `siteAuthor.links`,
 which meant one nominated user's links stood for the site and nobody else's
 appeared at all.
 
+Every menu reads the same: a link in one is the colour, the underline and the
+size of a link in the page's prose, in the sans heading font a `nav` is set in
+(TASK-111). A menu is navigation somebody is meant to use rather than a
+footnote, so none of them is set smaller than the words around it, and the same
+goes for the `rel="me"` links `partials/bio.njk` prints under a post. The two
+links that read as plain text instead are the site title and
+`a.header-link-home`, which are the page saying where it is rather than
+somewhere to go, and the stylesheet names those two rather than reaching for
+every link that happens to sit in a `<header>`.
+
 `menus.primary` is the whole of the site menu, in the order the Navigation
 screen names it. Both areas are declared in this theme's `theme.json`, which is
 what puts them on `/admin/navigation` with those labels; a theme that renders a

package/themes/default/partials/bio.njk

@@ -29,6 +29,10 @@
   otherwise. An author archive sets "Posts by", because the card there heads a
   list of somebody's writing rather than crediting one piece of it.
 
+  A link's `rel` always holds `me` — the CMS puts it there whether or not the
+  Links box typed it — followed by whatever else that line carried, so this
+  prints one attribute rather than one of its own beside one of theirs.
+
   The `p-note` and the `rel="me"` links are printed wherever the card is, which
   is what `bioProfile` used to ask for on an author archive alone. An entry
   left that switch unset because the page footer carried the site's identity
@@ -62,7 +66,7 @@
     {%- if bioAuthor.links.length %}
     <ul class="hlist bio-links">
       {%- for link in bioAuthor.links %}
-      <li><a class="u-url" rel="me" href="{{ link.href }}">{{ link.label }}</a></li>
+      <li><a class="u-url" rel="{{ link.rel }}" href="{{ link.href }}">{{ link.label }}</a></li>
       {%- endfor %}
     </ul>
     {%- endif %}

package/themes/default/partials/menu.njk

@@ -17,15 +17,17 @@
   which of a page's menus this one is. Two navs with no labels are two navs
   called "navigation".
 
-  An item marked `me` carries `rel="me"`, which is how Mastodon and the rest of
-  the IndieWeb verify that the site and the profile it links belong to the same
-  person: the profile links back, and the pair is the proof.
+  An item's `rel` is whatever `rel` values its line carried, already lower case
+  and each said once, so it is printed as one attribute and nothing is joined
+  here. `me` is the one most menus want: it is how Mastodon and the rest of the
+  IndieWeb verify that the site and the profile it links belong to the same
+  person — the profile links back, and the pair is the proof.
 #}
 {% macro list(items, label) %}{% if items.length %}
 <nav class="site-nav" aria-label="{{ label }}">
   <ul class="hlist">
     {% for item in items %}
-    <li><a href="{{ item.url | url }}"{% if item.me %} rel="me"{% endif %}{% if item.current %} class="is-current" aria-current="page"{% endif %}>{{ item.label }}</a></li>
+    <li><a href="{{ item.url | url }}"{% if item.rel %} rel="{{ item.rel }}"{% endif %}{% if item.current %} class="is-current" aria-current="page"{% endif %}>{{ item.label }}</a></li>
     {% endfor %}
   </ul>
 </nav>