@nakedcreativity/cee-ms-node 2.0.0-beta.4 → 2.0.0-beta.7

package/lib/social-meta.js

@@ -0,0 +1,73 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.socialMeta = socialMeta;
+exports.renderSocialMeta = renderSocialMeta;
+const structured_data_1 = require("./structured-data");
+/**
+ * The page's link-preview tags: Open Graph, read by Facebook, LinkedIn, WhatsApp, Slack and others, and X's
+ * card. Built from what the page already publishes for search (title, description, social image, dates), so
+ * a template needs no more than `{% socialmeta %}`. X reads the title, description and image from Open Graph.
+ */
+function socialMeta(site, page) {
+    const root = String(site.site?.url ?? '').replace(/\/+$/, '');
+    const path = page.fullpath && page.fullpath !== 'home' ? `/${page.fullpath}` : '/';
+    const absolute = (href) => /^https?:\/\//i.test(href) ? href : `${root}${href.startsWith('/') ? '' : '/'}${href}`;
+    const entity = (0, structured_data_1.entityOf)(page);
+    const image = (0, structured_data_1.imageUrl)(page.social);
+    const tags = [];
+    const og = (key, value) => {
+        const content = (0, structured_data_1.text)(value);
+        if (content)
+            tags.push({ attribute: 'property', key, content });
+    };
+    const x = (key, value) => {
+        const content = (0, structured_data_1.text)(value);
+        if (content)
+            tags.push({ attribute: 'name', key, content });
+    };
+    og('og:type', entity === 'ARTICLE' ? 'article' : entity === 'PERSON' ? 'profile' : 'website');
+    og('og:title', (0, structured_data_1.text)(page.title) ?? (0, structured_data_1.text)(page.name) ?? site.site?.name);
+    og('og:description', (0, structured_data_1.plain)(page.description));
+    if (root)
+        og('og:url', root + path);
+    og('og:site_name', site.site?.name);
+    if (image) {
+        og('og:image', absolute(image));
+        if (page.social?.width && page.social?.height) {
+            og('og:image:width', page.social.width);
+            og('og:image:height', page.social.height);
+        }
+        og('og:image:alt', page.social?.alt);
+    }
+    if (entity === 'ARTICLE') {
+        const published = (0, structured_data_1.isoDate)(page.date) ?? (0, structured_data_1.isoDate)(page.publishedAt);
+        og('article:published_time', published);
+        og('article:modified_time', (0, structured_data_1.isoDate)(page.updatedAt) ?? published);
+        for (const author of page.authors ?? []) {
+            const profile = (0, structured_data_1.text)(author.profile);
+            if (profile)
+                og('article:author', absolute(profile));
+        }
+        for (const tag of page.tags ?? [])
+            og('article:tag', tag);
+    }
+    x('twitter:card', image ? 'summary_large_image' : 'summary');
+    x('twitter:site', xHandle(site.site?.organisation?.sameAs));
+    return tags;
+}
+/** The organisation's X account, `@name`, from its profile links. */
+function xHandle(sameAs) {
+    for (const url of sameAs ?? []) {
+        const match = /^https?:\/\/(?:www\.)?(?:x|twitter)\.com\/@?([A-Za-z0-9_]{1,15})\/?$/i.exec(url.trim());
+        if (match)
+            return `@${match[1]}`;
+    }
+}
+/** The tags as HTML, their content escaped for an attribute. */
+function renderSocialMeta(tags) {
+    return tags.map((t) => `<meta ${t.attribute}="${t.key}" content="${escapeAttribute(t.content)}">`).join('');
+}
+function escapeAttribute(value) {
+    return value.replace(/&/g, '&amp;').replace(/"/g, '&quot;').replace(/</g, '&lt;').replace(/>/g, '&gt;');
+}
+//# sourceMappingURL=social-meta.js.map

package/lib/social-meta.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"social-meta.js","sourceRoot":"","sources":["../src/social-meta.ts"],"names":[],"mappings":";;AAeA,gCA6CC;AAWD,4CAEC;AAxED,uDAA6E;AAS7E;;;;GAIG;AACH,SAAgB,UAAU,CAAC,IAAe,EAAE,IAAe;IACvD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IAC9D,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;IACnF,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,EAAE,CAC9B,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,EAAE,CAAC;IAC3F,MAAM,MAAM,GAAG,IAAA,0BAAQ,EAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,KAAK,GAAG,IAAA,0BAAQ,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAEpC,MAAM,IAAI,GAAoB,EAAE,CAAC;IACjC,MAAM,EAAE,GAAG,CAAC,GAAW,EAAE,KAAc,EAAE,EAAE;QACvC,MAAM,OAAO,GAAG,IAAA,sBAAI,EAAC,KAAK,CAAC,CAAC;QAC5B,IAAI,OAAO;YAAE,IAAI,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;IACpE,CAAC,CAAC;IACF,MAAM,CAAC,GAAG,CAAC,GAAW,EAAE,KAAc,EAAE,EAAE;QACtC,MAAM,OAAO,GAAG,IAAA,sBAAI,EAAC,KAAK,CAAC,CAAC;QAC5B,IAAI,OAAO;YAAE,IAAI,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC;IAChE,CAAC,CAAC;IAEF,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC9F,EAAE,CAAC,UAAU,EAAE,IAAA,sBAAI,EAAC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAA,sBAAI,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACvE,EAAE,CAAC,gBAAgB,EAAE,IAAA,uBAAK,EAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IAC9C,IAAI,IAAI;QAAE,EAAE,CAAC,QAAQ,EAAE,IAAI,GAAG,IAAI,CAAC,CAAC;IACpC,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACpC,IAAI,KAAK,EAAE,CAAC;QACR,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;QAChC,IAAI,IAAI,CAAC,MAAM,EAAE,KAAK,IAAI,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;YAC5C,EAAE,CAAC,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACxC,EAAE,CAAC,iBAAiB,EAAE,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAC9C,CAAC;QACD,EAAE,CAAC,cAAc,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACvB,MAAM,SAAS,GAAG,IAAA,yBAAO,EAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAA,yBAAO,EAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAClE,EAAE,CAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC;QACxC,EAAE,CAAC,uBAAuB,EAAE,IAAA,yBAAO,EAAC,IAAI,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,CAAC;QAClE,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;YACtC,MAAM,OAAO,GAAG,IAAA,sBAAI,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACrC,IAAI,OAAO;gBAAE,EAAE,CAAC,gBAAgB,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;QACzD,CAAC;QACD,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,IAAI,EAAE;YAAE,EAAE,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;IAC9D,CAAC;IAED,CAAC,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IAC7D,CAAC,CAAC,cAAc,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5D,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,qEAAqE;AACrE,SAAS,OAAO,CAAC,MAAiB;IAC9B,KAAK,MAAM,GAAG,IAAI,MAAM,IAAI,EAAE,EAAE,CAAC;QAC7B,MAAM,KAAK,GAAG,uEAAuE,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;QACvG,IAAI,KAAK;YAAE,OAAO,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;IACrC,CAAC;AACL,CAAC;AAED,gEAAgE;AAChE,SAAgB,gBAAgB,CAAC,IAAqB;IAClD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,GAAG,cAAc,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAChH,CAAC;AAED,SAAS,eAAe,CAAC,KAAa;IAClC,OAAO,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AAC5G,CAAC"}

package/lib/structured-data.d.ts

@@ -1,20 +1,35 @@
-import type { CeemsPage, CeemsSite, StructuredDataDefaults, StructuredDataType } from './interfaces';
-/** Every type the `{% structureddata %}` tag can output, in the order it outputs them. */
+import type { CeemsImage, CeemsPage, CeemsSite, PageEntity, StructuredDataDefaults, StructuredDataType } from './interfaces';
+/** The types a page or the site's defaults can switch on, in the order the tag outputs them. */
 export declare const STRUCTURED_DATA_TYPES: readonly StructuredDataType[];
-/** Used when the site has published no defaults (sites published before structured data). */
+/** What `{% structureddata %}` can be limited to: the types, and the page's entity (its product, event…). */
+export type StructuredDataPart = StructuredDataType | 'ENTITY';
+export declare const STRUCTURED_DATA_PARTS: readonly StructuredDataPart[];
+/**
+ * Used when the site has published no defaults. The site and organisation are described once, on the home
+ * page; other pages refer to them by `@id` with a short copy.
+ */
 export declare const DEFAULT_STRUCTURED_DATA: StructuredDataDefaults;
 type Node = Record<string, unknown>;
+/** The page's entity, defaulting as Cee.ms publishes it, for pages published before entities. */
+export declare function entityOf(page: CeemsPage): PageEntity;
 /** The types a page outputs: its own choice, else the site's defaults for its kind. */
 export declare function enabledTypes(site: CeemsSite, page: CeemsPage): StructuredDataType[];
 /**
- * The page's schema.org graph: one node for each enabled type that has the data it needs. A type missing a
- * required property (an event with no start date, a product with no price) is left out rather than output
- * invalid. `only` limits the graph to those types.
+ * The page's schema.org graph: one node for each enabled type that has the data it needs, and one for its
+ * entity. A node missing a required property (an event with no start date, a product with neither price nor
+ * reviews) is left out rather than output invalid. `only` limits the graph to those parts.
  */
-export declare function structuredDataGraph(site: CeemsSite, page: CeemsPage, only?: StructuredDataType[]): {
+export declare function structuredDataGraph(site: CeemsSite, page: CeemsPage, only?: StructuredDataPart[]): {
     '@context': string;
     '@graph': Node[];
 };
 /** JSON for a `<script>`: `<`, `>` and `&` are escaped so content can't end the script. */
 export declare function serialiseJsonLd(value: unknown): string;
+export declare function imageUrl(image?: CeemsImage | null): string | undefined;
+/** A date published as an ISO string (or a `Date`, for custom pages) as an ISO string. */
+export declare function isoDate(value: unknown): string | undefined;
+/** A non-empty trimmed string, else `undefined`. Stored links (`LinkDrop`) read as their address. */
+export declare function text(value: unknown): string | undefined;
+/** Rich text as plain text, for properties that take no markup. */
+export declare function plain(value: unknown): unknown;
 export {};

package/lib/structured-data.js

@@ -1,10 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_STRUCTURED_DATA = exports.STRUCTURED_DATA_TYPES = void 0;
+exports.DEFAULT_STRUCTURED_DATA = exports.STRUCTURED_DATA_PARTS = exports.STRUCTURED_DATA_TYPES = void 0;
+exports.entityOf = entityOf;
 exports.enabledTypes = enabledTypes;
 exports.structuredDataGraph = structuredDataGraph;
 exports.serialiseJsonLd = serialiseJsonLd;
-/** Every type the `{% structureddata %}` tag can output, in the order it outputs them. */
+exports.imageUrl = imageUrl;
+exports.isoDate = isoDate;
+exports.text = text;
+exports.plain = plain;
+/** The types a page or the site's defaults can switch on, in the order the tag outputs them. */
 exports.STRUCTURED_DATA_TYPES = [
     'WEBSITE',
     'ORGANISATION',
@@ -12,59 +17,94 @@ exports.STRUCTURED_DATA_TYPES = [
     'BREADCRUMB',
     'ARTICLE',
     'FAQ',
-    'EVENT',
-    'PRODUCT',
-    'PERSON',
 ];
-const BASE = ['WEBSITE', 'WEBPAGE', 'BREADCRUMB', 'ORGANISATION'];
-/** Used when the site has published no defaults (sites published before structured data). */
+exports.STRUCTURED_DATA_PARTS = [...exports.STRUCTURED_DATA_TYPES, 'ENTITY'];
+/**
+ * Used when the site has published no defaults. The site and organisation are described once, on the home
+ * page; other pages refer to them by `@id` with a short copy.
+ */
 exports.DEFAULT_STRUCTURED_DATA = {
-    page: BASE,
-    blog: BASE,
-    article: [...BASE, 'ARTICLE'],
+    home: ['WEBSITE', 'WEBPAGE', 'ORGANISATION', 'FAQ'],
+    page: ['WEBPAGE', 'BREADCRUMB', 'FAQ'],
+    blog: ['WEBPAGE', 'BREADCRUMB', 'FAQ'],
+    article: ['WEBPAGE', 'BREADCRUMB', 'ARTICLE', 'FAQ'],
 };
+/** Entities whose node takes reviews. Google ignores reviews a business publishes about itself. */
+const REVIEWED = ['PRODUCT', 'EVENT'];
+/** The page's entity, defaulting as Cee.ms publishes it, for pages published before entities. */
+function entityOf(page) {
+    if (page.entity)
+        return page.entity;
+    if (page.type === 'article')
+        return 'ARTICLE';
+    return page.fullpath ? 'PAGE' : 'HOME';
+}
+/** Which of the site's defaults a page uses: articles and home by their entity, blogs by their type. */
+function kindOf(page) {
+    const entity = entityOf(page);
+    if (entity === 'ARTICLE')
+        return 'article';
+    if (page.type === 'blog')
+        return 'blog';
+    return entity === 'HOME' ? 'home' : 'page';
+}
 /** The types a page outputs: its own choice, else the site's defaults for its kind. */
 function enabledTypes(site, page) {
     const own = page.structuredData?.types;
     if (Array.isArray(own))
         return own;
-    const defaults = site.site?.structuredData?.defaults ?? exports.DEFAULT_STRUCTURED_DATA;
-    const kind = page.type === 'article' ? 'article' : page.type === 'blog' ? 'blog' : 'page';
-    return defaults[kind] ?? exports.DEFAULT_STRUCTURED_DATA[kind];
+    const kind = kindOf(page);
+    return site.site?.structuredData?.defaults?.[kind] ?? exports.DEFAULT_STRUCTURED_DATA[kind];
 }
 /**
- * The page's schema.org graph: one node for each enabled type that has the data it needs. A type missing a
- * required property (an event with no start date, a product with no price) is left out rather than output
- * invalid. `only` limits the graph to those types.
+ * The page's schema.org graph: one node for each enabled type that has the data it needs, and one for its
+ * entity. A node missing a required property (an event with no start date, a product with neither price nor
+ * reviews) is left out rather than output invalid. `only` limits the graph to those parts.
  */
 function structuredDataGraph(site, page, only) {
-    const enabled = new Set(enabledTypes(site, page));
+    const b = new Builder(site, page, enabledTypes(site, page));
+    const entity = ENTITIES[entityOf(page)]?.(b);
+    if (entity)
+        b.entityId = entity['@id'];
     const graph = [];
     for (const type of exports.STRUCTURED_DATA_TYPES) {
-        if (!enabled.has(type) || (only && !only.includes(type)))
+        if (!b.enabled.has(type) || (only && !only.includes(type)))
             continue;
-        const node = BUILDERS[type](new Builder(site, page));
+        const node = BUILDERS[type](b);
         if (node)
             graph.push(node);
     }
+    if (!only || only.includes('ENTITY')) {
+        if (entity)
+            graph.push(entity);
+        // people the page's modules feature, each once
+        const ids = new Set(graph.map((n) => n['@id']));
+        for (const person of featuredPeople(b)) {
+            if (ids.has(person['@id']))
+                continue;
+            ids.add(person['@id']);
+            graph.push(person);
+        }
+    }
     return { '@context': 'https://schema.org', '@graph': graph };
 }
 /** JSON for a `<script>`: `<`, `>` and `&` are escaped so content can't end the script. */
 function serialiseJsonLd(value) {
-    return JSON.stringify(value)
-        .replace(/</g, '\\u003c')
-        .replace(/>/g, '\\u003e')
-        .replace(/&/g, '\\u0026');
+    return JSON.stringify(value).replace(/</g, '\\u003c').replace(/>/g, '\\u003e').replace(/&/g, '\\u0026');
 }
 /** The URLs and shared properties every builder needs. */
 class Builder {
     site;
     page;
     root;
-    constructor(site, page) {
+    enabled;
+    /** The `@id` of the page's entity node, when it has one. */
+    entityId;
+    constructor(site, page, enabled) {
         this.site = site;
         this.page = page;
         this.root = String(site.site?.url ?? '').replace(/\/+$/, '');
+        this.enabled = new Set(enabled);
     }
     /** The absolute URL of a site path, `''` being the home page. */
     url(path = '') {
@@ -76,12 +116,90 @@ class Builder {
     id(path, fragment) {
         return `${this.url(path)}#${fragment}`;
     }
-    get hasOrganisation() {
-        return !!this.site.site?.organisation?.name;
-    }
     get pageName() {
         return text(this.page.title) ?? text(this.page.name);
     }
+    /**
+     * The organisation, for a publisher, organiser or provider: its `@id` when this page carries the full
+     * node, else a short copy, so the property still has a name where the full node isn't output.
+     */
+    get organisation() {
+        const org = this.site.site?.organisation;
+        if (!org?.name)
+            return;
+        const ref = { '@id': this.id('', 'organization') };
+        if (this.enabled.has('ORGANISATION'))
+            return ref;
+        return compact({
+            '@type': org.type || 'Organization',
+            ...ref,
+            name: org.name,
+            url: text(org.url) ?? (this.root ? this.url() : undefined),
+            logo: imageUrl(org.logo),
+        });
+    }
+    /** An address on the site as an absolute URL; one that is already absolute is left alone. */
+    absolute(href) {
+        return /^https?:\/\//i.test(href) ? href : `${this.root}${href.startsWith('/') ? '' : '/'}${href}`;
+    }
+    /**
+     * A person from People. Every page uses the same `@id` for them: their profile page's when it is published,
+     * else one of the site's. The short copy names them; `full` describes them, as their profile page and the
+     * pages featuring them do.
+     */
+    person(person, full = false) {
+        const name = text(person.name);
+        if (!name)
+            return;
+        const profile = text(person.profile);
+        const sameAs = list(sameAsOf(person));
+        const short = compact({
+            '@type': 'Person',
+            '@id': profile ? `${this.absolute(profile)}#person` : this.id('', `person-${person._id}`),
+            name,
+            jobTitle: text(person.jobTitle),
+            url: profile ? this.absolute(profile) : sameAs?.[0],
+        });
+        if (!full)
+            return short;
+        return compact({
+            ...short,
+            image: imageUrl(person.photo),
+            description: text(plain(person.bio)),
+            sameAs,
+            worksFor: this.organisation,
+        });
+    }
+    /** An article's authors (`page.authors`), else the organisation. One author is a node; several, a list. */
+    get authors() {
+        const nodes = (this.page.authors ?? []).flatMap((author) => {
+            if (author.kind === 'person')
+                return list([this.person(author)]) ?? [];
+            if (author.kind === 'organisation')
+                return list([this.organisation]) ?? [];
+            const name = text(author.name);
+            return name
+                ? [compact({ '@type': 'Person', name, jobTitle: text(author.jobTitle), url: text(author.url) })]
+                : [];
+        });
+        if (!nodes.length)
+            return this.organisation;
+        return nodes.length === 1 ? nodes[0] : nodes;
+    }
+    /** The person from People whose profile page this is, once loaded (see `wrapLinks`). */
+    get profilePerson() {
+        const person = this.page.person;
+        return entityOf(this.page) === 'PERSON' && person && typeof person === 'object' && text(person.name)
+            ? person
+            : undefined;
+    }
+    /** The website, by `@id` when this page carries it, else a short copy. */
+    get website() {
+        const ref = { '@id': this.id('', 'website') };
+        if (this.enabled.has('WEBSITE'))
+            return ref;
+        return compact({ '@type': 'WebSite', ...ref, url: this.url(), name: text(this.site.site?.name) });
+    }
 }
 const BUILDERS = {
     WEBSITE(b) {
@@ -92,7 +210,7 @@ const BUILDERS = {
             '@id': b.id('', 'website'),
             url: b.url(),
             name: text(b.site.site?.name),
-            publisher: b.hasOrganisation ? { '@id': b.id('', 'organization') } : undefined,
+            publisher: b.organisation,
         });
     },
     ORGANISATION(b) {
@@ -126,16 +244,24 @@ const BUILDERS = {
     WEBPAGE(b) {
         if (!b.root)
             return;
+        const profile = !!b.profilePerson;
+        const reviewer = b.page.byline?.reviewedBy;
         return compact({
-            '@type': 'WebPage',
+            // a page about one person from People is their profile page
+            '@type': profile ? 'ProfilePage' : 'WebPage',
             '@id': b.id(b.page.fullpath, 'webpage'),
             url: b.pageUrl,
             name: b.pageName,
             description: text(b.page.description),
             primaryImageOfPage: imageUrl(b.page.social),
-            isPartOf: { '@id': b.id('', 'website') },
-            breadcrumb: crumbs(b).length > 1 ? { '@id': b.id(b.page.fullpath, 'breadcrumb') } : undefined,
+            isPartOf: b.website,
+            breadcrumb: b.enabled.has('BREADCRUMB') && crumbs(b).length > 1
+                ? { '@id': b.id(b.page.fullpath, 'breadcrumb') }
+                : undefined,
+            mainEntity: b.entityId ? { '@id': b.entityId } : undefined,
+            dateCreated: profile ? isoDate(b.page.createdAt) : undefined,
             dateModified: isoDate(b.page.updatedAt),
+            reviewedBy: reviewer && typeof reviewer === 'object' ? b.person(reviewer) : undefined,
         });
     },
     BREADCRUMB(b) {
@@ -155,7 +281,7 @@ const BUILDERS = {
         };
     },
     ARTICLE(b) {
-        if (b.page.type !== 'article' || !b.pageName)
+        if (entityOf(b.page) !== 'ARTICLE' || !b.pageName)
             return;
         const published = isoDate(b.page.date) ?? isoDate(b.page.publishedAt);
         return compact({
@@ -167,8 +293,8 @@ const BUILDERS = {
             datePublished: published,
             dateModified: isoDate(b.page.updatedAt) ?? published,
             mainEntityOfPage: b.root ? { '@id': b.id(b.page.fullpath, 'webpage') } : undefined,
-            author: b.hasOrganisation ? { '@id': b.id('', 'organization') } : undefined,
-            publisher: b.hasOrganisation ? { '@id': b.id('', 'organization') } : undefined,
+            author: b.authors,
+            publisher: b.organisation,
             keywords: list(b.page.tags)?.join(', '),
         });
     },
@@ -196,18 +322,21 @@ const BUILDERS = {
             return;
         return { '@type': 'FAQPage', '@id': b.id(b.page.fullpath, 'faq'), mainEntity: questions };
     },
+};
+/** The node for what the page is about. Home and plain pages have none of their own. */
+const ENTITIES = {
     EVENT(b) {
         const event = b.page.structuredData?.event;
         const name = text(event?.name) ?? b.pageName;
         const startDate = isoDate(event?.startDate);
         if (!event || !name || !startDate)
             return;
-        const online = event.attendance === 'ONLINE';
         const venue = compact({
             '@type': 'Place',
             name: text(event.location?.name),
             address: postalAddress(event.location?.address),
         });
+        const place = Object.keys(venue).length > 1 ? venue : undefined;
         const virtual = event.location?.url ? { '@type': 'VirtualLocation', url: event.location.url } : undefined;
         return compact({
             '@type': 'Event',
@@ -220,35 +349,41 @@ const BUILDERS = {
             eventAttendanceMode: event.attendance
                 ? `https://schema.org/${pascal(event.attendance)}EventAttendanceMode`
                 : undefined,
-            location: online
-                ? virtual
-                : event.attendance === 'MIXED'
-                    ? list([Object.keys(venue).length > 1 ? venue : undefined, virtual])
-                    : Object.keys(venue).length > 1
-                        ? venue
-                        : undefined,
+            location: event.attendance === 'ONLINE' ? virtual : event.attendance === 'MIXED' ? list([place, virtual]) : place,
             image: imageUrl(event.image) ?? imageUrl(b.page.social),
-            offers: event.offers ? offer(event.offers, b.pageUrl) : undefined,
-            organizer: b.hasOrganisation ? { '@id': b.id('', 'organization') } : undefined,
+            offers: offer(event.offers, b.pageUrl),
+            organizer: b.organisation,
+            ...reviews(b),
         });
     },
     PRODUCT(b) {
         const product = b.page.structuredData?.product;
         const name = text(product?.name) ?? b.pageName;
-        if (!product || !name || !(typeof product.price === 'number') || !product.currency)
+        if (!name)
+            return;
+        const offers = product && offer(product, b.pageUrl);
+        const rated = reviews(b);
+        // Google needs an offer, a review or a rating
+        if (!offers && !rated.review)
             return;
         return compact({
             '@type': 'Product',
             '@id': b.id(b.page.fullpath, 'product'),
             name,
-            description: text(product.description) ?? text(b.page.description),
-            image: imageUrl(product.image) ?? imageUrl(b.page.social),
-            sku: text(product.sku),
-            brand: product.brand ? { '@type': 'Brand', name: product.brand } : undefined,
-            offers: offer(product, b.pageUrl),
+            description: text(product?.description) ?? text(b.page.description),
+            image: imageUrl(product?.image) ?? imageUrl(b.page.social),
+            sku: text(product?.sku),
+            brand: product?.brand ? { '@type': 'Brand', name: product.brand } : undefined,
+            offers,
+            ...rated,
         });
     },
     PERSON(b) {
+        // their full description, on their profile page
+        const chosen = b.profilePerson;
+        if (chosen)
+            return compact({ ...b.person(chosen, true), '@id': b.id(b.page.fullpath, 'person'), url: b.pageUrl });
+        // the details typed on the page, before People
         const person = b.page.structuredData?.person;
         if (!person?.name)
             return;
@@ -258,12 +393,107 @@ const BUILDERS = {
             name: person.name,
             jobTitle: text(person.jobTitle),
             url: text(person.url) ?? (b.root ? b.pageUrl : undefined),
-            image: imageUrl(person.image),
+            image: imageUrl(person.image) ?? imageUrl(b.page.social),
             sameAs: list(person.sameAs),
-            worksFor: b.hasOrganisation ? { '@id': b.id('', 'organization') } : undefined,
+            worksFor: b.organisation,
+        });
+    },
+    SERVICE(b) {
+        const service = b.page.structuredData?.service;
+        const name = text(service?.name) ?? b.pageName;
+        if (!name)
+            return;
+        return compact({
+            '@type': 'Service',
+            '@id': b.id(b.page.fullpath, 'service'),
+            name,
+            description: text(service?.description) ?? text(b.page.description),
+            serviceType: text(service?.serviceType),
+            areaServed: text(service?.areaServed),
+            image: imageUrl(service?.image) ?? imageUrl(b.page.social),
+            provider: b.organisation,
+            offers: offer(service?.offers, b.pageUrl),
         });
     },
 };
+/**
+ * `review` and `aggregateRating` from the page's modules whose type maps reviews, for a product or event.
+ * The rating is worked out from the reviews, so it always matches what the page shows. Ratings on other
+ * scales are converted to the first module's.
+ */
+function reviews(b) {
+    if (!REVIEWED.includes(entityOf(b.page)))
+        return {};
+    const mappings = b.site.site?.structuredData?.reviewModules ?? {};
+    const review = [];
+    let scale;
+    let total = 0;
+    for (const module of pageModules(b.page)) {
+        const map = mappings[module.type];
+        const items = map && module.content?.[map.itemsField];
+        if (!Array.isArray(items))
+            continue;
+        const best = map.bestRating ?? 5;
+        const worst = map.worstRating ?? 1;
+        for (const item of items) {
+            const author = text(plain(item?.[map.authorField]));
+            const rating = Number(text(item?.[map.ratingField]));
+            if (!author || !isFinite(rating) || rating < worst || rating > best || best <= worst)
+                continue;
+            scale ??= { best, worst };
+            total += scale.worst + ((rating - worst) / (best - worst)) * (scale.best - scale.worst);
+            review.push(compact({
+                '@type': 'Review',
+                author: { '@type': 'Person', name: author },
+                reviewRating: { '@type': 'Rating', ratingValue: rating, bestRating: best, worstRating: worst },
+                reviewBody: map.bodyField ? text(plain(item?.[map.bodyField])) : undefined,
+                datePublished: map.dateField ? isoDate(item?.[map.dateField])?.slice(0, 10) : undefined,
+            }));
+        }
+    }
+    if (!review.length || !scale)
+        return {};
+    return {
+        review,
+        aggregateRating: {
+            '@type': 'AggregateRating',
+            ratingValue: Math.round((total / review.length) * 10) / 10,
+            reviewCount: review.length,
+            bestRating: scale.best,
+            worstRating: scale.worst,
+        },
+    };
+}
+/** A person's profile addresses: `sameAs` from `site.json`, else their `links` column. */
+function sameAsOf(person) {
+    if (Array.isArray(person.sameAs))
+        return person.sameAs.map(String);
+    const links = Array.isArray(person.links) ? person.links : [];
+    return links.flatMap((link) => {
+        const url = text(link?.url);
+        return url ? [url] : [];
+    });
+}
+/**
+ * The people the page's modules feature, from module types that map a row field to People: each described,
+ * and working for the organisation. A person merely mentioned in a module without the mapping isn't output.
+ */
+function featuredPeople(b) {
+    const mappings = b.site.site?.structuredData?.peopleModules ?? {};
+    const nodes = [];
+    for (const module of pageModules(b.page)) {
+        const map = mappings[module.type];
+        const value = map && module.content?.[map.field];
+        for (const person of Array.isArray(value) ? value : value ? [value] : []) {
+            if (!person || typeof person !== 'object')
+                continue;
+            const node = b.person(person, true);
+            if (node)
+                nodes.push(node);
+        }
+    }
+    return nodes;
+}
 /** Home, then the page's published ancestors, as `tags/breadcrumb.ts` walks them, ending at the page. */
 function crumbs(b) {
     const { site, page } = b;
@@ -293,7 +523,7 @@ function pageModules(page) {
     return modules;
 }
 function offer(o, fallbackUrl) {
-    if (typeof o.price !== 'number' || !o.currency)
+    if (!o || typeof o.price !== 'number' || !o.currency)
         return;
     return compact({
         '@type': 'Offer',