@morphemecms/cms 0.11.0 → 0.13.0-next-20261106203613

package/lib/section-ranges.d.mts

@@ -1,7 +1,7 @@
 /** The kind of a part, from its ProseMirror node name and heading level; the label is the eyebrow line before a heading. */
 export function partKind(typeName: any, level: any): "h1" | "h2" | "other" | "label";
 /**
- * The sections of a text: each H2 (with a label directly before it) and every part after it up to the next H2, the next H1
+ * The sections of a text: each H1 or H2 (with a label directly before it) and every part after it up to the next H1 or H2
  * or the end. `parts` is the top-level parts in order; the result has the index of each section's first and last part.
  */
 export function sectionRanges(parts: any): any[];

package/lib/section-ranges.mjs

@@ -1,4 +1,4 @@
-// Which top-level parts of a page's or blog post's text form H2 sections, for the editor's dotted frame.
+// Which top-level parts of a page's or blog post's text form sections (an H1 or an H2 starts one), for the editor's dotted frame.
 // Exposes sectionRanges, sectionPart and partKind. Pure, no dependencies (used by src/sectionFrame.ts).
 
 /** The kind of a part, from its ProseMirror node name and heading level; the label is the eyebrow line before a heading. */
@@ -7,8 +7,10 @@ export function partKind(typeName, level) {
   return typeName === 'eyebrow' ? 'label' : 'other';
 }
 
+const startsSection = (kind) => kind === 'h1' || kind === 'h2';
+
 /**
- * The sections of a text: each H2 (with a label directly before it) and every part after it up to the next H2, the next H1
+ * The sections of a text: each H1 or H2 (with a label directly before it) and every part after it up to the next H1 or H2
  * or the end. `parts` is the top-level parts in order; the result has the index of each section's first and last part.
  */
 export function sectionRanges(parts) {
@@ -19,18 +21,10 @@ export function sectionRanges(parts) {
     from = -1;
   };
   parts.forEach((part, i) => {
-    const next = parts[i + 1]?.kind;
-    if (part.kind === 'label') {
-      if (next === 'h2') {
-        close(i - 1);
-        from = i;
-      } else if (next === 'h1') close(i - 1);
-    } else if (part.kind === 'h2') {
-      if (parts[i - 1]?.kind !== 'label') {
-        close(i - 1);
-        from = i;
-      }
-    } else if (part.kind === 'h1') close(i - 1);
+    const starts = part.kind === 'label' ? startsSection(parts[i + 1]?.kind) : startsSection(part.kind) && parts[i - 1]?.kind !== 'label';
+    if (!starts) return;
+    close(i - 1);
+    from = i;
   });
   close(parts.length - 1);
   return ranges;

package/lib/section-ranges.test.mjs

@@ -1,4 +1,4 @@
-// Tests lib/section-ranges.mjs: which top-level parts of a text form H2 sections (the editor's dotted frame).
+// Tests lib/section-ranges.mjs: which top-level parts of a text form sections, H1 or H2 (the editor's dotted frame).
 // Run with `node --test packages/editor/lib/*.test.mjs` (part of npm run check).
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
@@ -15,13 +15,26 @@ const ranges = (text) =>
   );
 
 test('no parts, no sections', () => assert.deepEqual(ranges(''), []));
-test('no H2, no sections', () => assert.deepEqual(ranges('1 o o'), []));
+test('no heading, no sections', () => assert.deepEqual(ranges('o o'), []));
+test('an H1 starts a section', () => assert.deepEqual(ranges('1 o o'), [{ from: 0, to: 2 }]));
+test('an H1 then an H2 are a section each', () =>
+  assert.deepEqual(ranges('1 o 2 o'), [
+    { from: 0, to: 1 },
+    { from: 2, to: 3 },
+  ]));
+test('a label before an H1 starts the section', () => assert.deepEqual(ranges('l 1 o'), [{ from: 0, to: 2 }]));
+test('consecutive H1s are a section each', () =>
+  assert.deepEqual(ranges('o 1 1'), [
+    { from: 1, to: 1 },
+    { from: 2, to: 2 },
+  ]));
 test('an H2 at the start runs to the end', () => assert.deepEqual(ranges('2 o o'), [{ from: 0, to: 2 }]));
 test('text before the first H2 is outside', () => assert.deepEqual(ranges('o 2 o'), [{ from: 1, to: 2 }]));
 test('an H2 as the last part is a section of one', () => assert.deepEqual(ranges('o o 2'), [{ from: 2, to: 2 }]));
-test('an H1 ends a section', () =>
+test('an H1 ends the section above it and starts its own', () =>
   assert.deepEqual(ranges('2 o 1 o 2 o'), [
     { from: 0, to: 1 },
+    { from: 2, to: 3 },
     { from: 4, to: 5 },
   ]));
 test('consecutive H2s are a section each', () =>
@@ -36,8 +49,16 @@ test('a label before an H2 ends the section above it', () =>
     { from: 0, to: 1 },
     { from: 2, to: 4 },
   ]));
-test('a label before an H1 belongs to the H1', () => assert.deepEqual(ranges('2 o l 1 o'), [{ from: 0, to: 1 }]));
-test('a label at the start before an H1 starts nothing', () => assert.deepEqual(ranges('l 1 2 o'), [{ from: 2, to: 3 }]));
+test('a label before an H1 belongs to the H1', () =>
+  assert.deepEqual(ranges('2 o l 1 o'), [
+    { from: 0, to: 1 },
+    { from: 2, to: 4 },
+  ]));
+test('a label at the start before an H1 starts its section', () =>
+  assert.deepEqual(ranges('l 1 2 o'), [
+    { from: 0, to: 1 },
+    { from: 2, to: 3 },
+  ]));
 test('a label not before a heading is an ordinary part', () => {
   assert.deepEqual(ranges('2 l o'), [{ from: 0, to: 2 }]);
   assert.deepEqual(ranges('l o 2'), [{ from: 2, to: 2 }]);

package/lib/storeEntries.d.mts

@@ -13,6 +13,8 @@ export function validTheme(x: any, api: number): boolean;
 export function isText(v: unknown): v is string;
 export function isPath(v: unknown): boolean;
 export const ITEM_ID: RegExp;
-export const REFUSED_APPS: string[];
+export const HANDLE: RegExp;
+export const LEGACY: RegExp;
 export const STANDARD: "saturn";
 export const RECORD: "store.json";
+export function strayStoreId(name: string, kind: "app" | "theme"): boolean;

package/lib/storeEntries.mjs

@@ -1,6 +1,6 @@
 /**
  * Pure validation logic for store apps and themes.
- * Exposes isText, isPath, ITEM_ID, REFUSED_APPS, STANDARD, RECORD, validApp, validTheme.
+ * Exposes isText, isPath, ITEM_ID, HANDLE, LEGACY, STANDARD, RECORD, validApp, validTheme, strayStoreId.
  * No external dependencies.
  */
 
@@ -16,14 +16,28 @@ export const isText = (v) => typeof v === 'string' && v.trim() !== '';
  */
 export const isPath = (v) => isText(v) && v.split('/').every((part) => part !== '' && part !== '.' && part !== '..');
 
-export const ITEM_ID = /^[a-z0-9][a-z0-9-]*$/;
-// The store's address before and a developer's page (STORE_BEFORE and DEVELOPER_ROUTE in src/store.ts)
-export const REFUSED_APPS = ['butik', 'udvikler'];
+// A permanent id: the kind, then 16 lowercase hex characters
+export const ITEM_ID = /^(app|theme)_[0-9a-f]{16}$/;
+// An item's address in the store: publisher/name
+export const HANDLE = /^[a-z0-9][a-z0-9-]{0,39}\/[a-z0-9][a-z0-9-]{0,39}$/;
+// An item's folder name before it had a permanent id
+export const LEGACY = /^[a-z0-9][a-z0-9-]*$/;
 // The standard theme, which every site has
 export const STANDARD = 'saturn';
 // The note in an installed folder of where it came from
 export const RECORD = 'store.json';
 
+const hasId = (x, kind) => ITEM_ID.test(x?.id ?? '') && x.id.startsWith(`${kind}_`);
+const hasHandle = (x) => HANDLE.test(x?.handle ?? '') && (x.legacy === undefined || LEGACY.test(x.legacy));
+
+/**
+ * True when a site's own folder name looks like a store id of this kind (it starts with `app_` or `theme_`) but is not one.
+ * @param {string} name
+ * @param {'app' | 'theme'} kind
+ * @returns {boolean}
+ */
+export const strayStoreId = (name, kind) => /^(app|theme)_/.test(name) && !(ITEM_ID.test(name) && name.startsWith(`${kind}_`));
+
 const isAdd = (v) => isText(v?.label) && isText(v?.icon);
 const isGoodFile = (f) => isText(f?.oid) && isPath(f?.path) && f.path !== RECORD;
 
@@ -34,8 +48,8 @@ const isGoodFile = (f) => isText(f?.oid) && isPath(f?.path) && f.path !== RECORD
  */
 export function validApp(x, api) {
   return (
-    ITEM_ID.test(x?.id ?? '') &&
-    !REFUSED_APPS.includes(x.id) &&
+    hasId(x, 'app') &&
+    hasHandle(x) &&
     isText(x.version) &&
     x.api === api &&
     [x.label, x.publisher, x.icon, x.hint].every(isText) &&
@@ -53,8 +67,8 @@ export function validApp(x, api) {
  */
 export function validTheme(x, api) {
   return (
-    ITEM_ID.test(x?.id ?? '') &&
-    x.id !== STANDARD &&
+    hasId(x, 'theme') &&
+    hasHandle(x) &&
     x.api === api &&
     [x.version, x.name, x.author, x.icon].every(isText) &&
     Array.isArray(x.files) &&

package/lib/storeEntries.test.mjs

@@ -1,13 +1,15 @@
 /**
- * Tests for store entry validation logic (validApp, validTheme, isPath).
+ * Tests for store entry validation logic (validApp, validTheme, isPath, strayStoreId).
  * Run with `node --test packages/editor/lib/*.test.mjs` (part of npm run check).
  */
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
-import { validApp, validTheme, isPath } from './storeEntries.mjs';
+import { validApp, validTheme, isPath, strayStoreId } from './storeEntries.mjs';
 
 const theme = () => ({
-  id: 'venus',
+  id: 'theme_fa395ad84690acbd',
+  handle: 'morpheme/venus',
+  legacy: 'venus',
   version: '1.0.0',
   api: 4,
   name: 'Venus',
@@ -16,7 +18,8 @@ const theme = () => ({
   files: [{ path: 'theme.json', oid: 'a'.repeat(40) }],
 });
 const app = () => ({
-  id: 'calendly',
+  id: 'app_a030dfba69793996',
+  handle: 'morpheme/calendly',
   version: '1.0.0',
   api: 2,
   label: 'Calendly',
@@ -35,8 +38,30 @@ test('valid theme wrong api', () => {
   assert.equal(validTheme({ ...theme(), api: 3 }, 4), false);
 });
 
-test('valid theme standard id', () => {
-  assert.equal(validTheme({ ...theme(), id: 'saturn' }, 4), false);
+test('valid theme old-style id', () => {
+  assert.equal(validTheme({ ...theme(), id: 'venus' }, 4), false);
+});
+
+test('valid theme app id (wrong kind)', () => {
+  assert.equal(validTheme({ ...theme(), id: 'app_a030dfba69793996' }, 4), false);
+});
+
+test('valid theme without handle', () => {
+  const { handle, ...rest } = theme();
+  assert.equal(validTheme(rest, 4), false);
+});
+
+test('valid theme bad handle', () => {
+  assert.equal(validTheme({ ...theme(), handle: 'venus' }, 4), false);
+  assert.equal(validTheme({ ...theme(), handle: 'Morpheme/venus' }, 4), false);
+});
+
+test('valid theme keeps legacy, and drops a bad one', () => {
+  assert.equal(validTheme(theme(), 4), true);
+  assert.equal(theme().legacy, 'venus');
+  assert.equal(validTheme({ ...theme(), legacy: 'Venus!' }, 4), false);
+  const { legacy, ...rest } = theme();
+  assert.equal(validTheme(rest, 4), true);
 });
 
 test('valid theme bad path', () => {
@@ -55,8 +80,26 @@ test('valid app', () => {
   assert.equal(validApp(app(), 2), true);
 });
 
-test('valid app refused id', () => {
+test('valid app old-style id', () => {
+  assert.equal(validApp({ ...app(), id: 'calendly' }, 2), false);
   assert.equal(validApp({ ...app(), id: 'butik' }, 2), false);
+  assert.equal(validApp({ ...app(), id: 'store' }, 2), false);
+  assert.equal(validApp({ ...app(), id: 'udvikler' }, 2), false);
+  assert.equal(validApp({ ...app(), id: 'developer' }, 2), false);
+});
+
+test('valid app theme id (wrong kind)', () => {
+  assert.equal(validApp({ ...app(), id: 'theme_fa395ad84690acbd' }, 2), false);
+});
+
+test('valid app without handle', () => {
+  const { handle, ...rest } = app();
+  assert.equal(validApp(rest, 2), false);
+});
+
+test('valid app bad id length', () => {
+  assert.equal(validApp({ ...app(), id: 'app_a030dfba6979399' }, 2), false);
+  assert.equal(validApp({ ...app(), id: 'app_A030DFBA69793996' }, 2), false);
 });
 
 test('valid app missing adds kinds', () => {
@@ -69,3 +112,12 @@ test('isPath cases', () => {
   assert.equal(isPath('./a'), false);
   assert.equal(isPath(''), false);
 });
+
+test('strayStoreId: a store-looking name that is not a store id of the kind', () => {
+  assert.equal(strayStoreId('app_a030dfba69793996', 'app'), false);
+  assert.equal(strayStoreId('app_xyz', 'app'), true);
+  assert.equal(strayStoreId('theme_fa395ad84690acbd', 'app'), true);
+  assert.equal(strayStoreId('theme_xyz', 'theme'), true);
+  assert.equal(strayStoreId('calendly', 'app'), false);
+  assert.equal(strayStoreId('my_theme', 'theme'), false);
+});

package/lib/text-sections.d.mts

@@ -1,5 +1,5 @@
 /** The text's HTML as runs: { color, html } with the marker removed; color is null for text outside a coloured section.
- * A marker with an unknown colour, or not followed by an H2, is dropped. Without any coloured section, the HTML is
+ * A marker with an unknown colour, or not followed by an H1 or H2, is dropped. Without any coloured section, the HTML is
  * returned as it came, in one run.
  * @param {string} html
  * @returns {{ color: string | null, html: string }[]} */
@@ -7,4 +7,14 @@ export function sectionsOf(html: string): {
     color: string | null;
     html: string;
 }[];
+/** The text before its first section starts (a marker, a label or an H1 or H2), and the rest from there. Without a heading
+ * the whole text is the intro. For a page whose coloured H1 panel holds the header and this intro (PageLayout.astro).
+ * @param {string} html
+ * @returns {{ intro: string, rest: string }} */
+export function introOf(html: string): {
+    intro: string;
+    rest: string;
+};
+export const MARKER: string;
+export const LABEL: string;
 export function sectionClass(color: any): string;

package/lib/text-sections.mjs

@@ -1,14 +1,15 @@
-// A page's or post's rendered text cut into runs for the site: a section with a colour (the marker before its H2,
-// lib/section-marker.mjs) is one run from the marker to the next H2, H1 or the end. Exposes sectionsOf and sectionClass,
-// used by theme/components/RichText.astro and src/pagePreview.tsx. Depends on section-marker.mjs.
+// A page's or post's rendered text cut into runs for the site: a section with a colour (the marker before its H1 or H2,
+// lib/section-marker.mjs) is one run from the marker to the next H1, H2 or the end. Exposes sectionsOf, introOf,
+// sectionClass and the marker and label patterns (MARKER, LABEL), used by theme/components/RichText.astro, lib/without-h1.mjs
+// and src/pagePreview.tsx. Depends on section-marker.mjs.
 import { SECTION_COLORS } from './section-marker.mjs';
 
 // The marker as the site's HTML pipeline writes it (rehype-raw keeps it as written; a space before `>` is tolerated).
-const MARKER = String.raw`<div data-section="([^"]*)"\s*><\/div>\s*`;
+export const MARKER = String.raw`<div data-section="([^"]*)"\s*><\/div>\s*`;
 // A label line (text-menu's <p class="block-eyebrow">) directly before a heading starts the heading's section.
-const LABEL = String.raw`(?:<p class="block-eyebrow">(?:(?!<\/p>)[\s\S])*<\/p>\s*)?`;
-// A marker followed by an H2 (with its label between): where a coloured section starts. Ends just after `<h2`.
-const START = new RegExp(`${MARKER}${LABEL}<h2\\b`, 'g');
+export const LABEL = String.raw`(?:<p class="block-eyebrow">(?:(?!<\/p>)[\s\S])*<\/p>\s*)?`;
+// A marker followed by an H1 or H2 (with its label between): where a coloured section starts. Ends just after `<h1` or `<h2`.
+const START = new RegExp(`${MARKER}${LABEL}<h[12]\\b`, 'g');
 // Where the next section (or an H1) starts: its marker and label if it has them, else its heading.
 const NEXT = new RegExp(`(?:${MARKER})?${LABEL}<h[12]\\b`);
 const MARKERS = new RegExp(MARKER, 'g');
@@ -16,7 +17,7 @@ const MARKERS = new RegExp(MARKER, 'g');
 const withoutMarkers = (html) => html.replace(MARKERS, '');
 
 /** The text's HTML as runs: { color, html } with the marker removed; color is null for text outside a coloured section.
- * A marker with an unknown colour, or not followed by an H2, is dropped. Without any coloured section, the HTML is
+ * A marker with an unknown colour, or not followed by an H1 or H2, is dropped. Without any coloured section, the HTML is
  * returned as it came, in one run.
  * @param {string} html
  * @returns {{ color: string | null, html: string }[]} */
@@ -41,5 +42,14 @@ export function sectionsOf(html) {
   return runs;
 }
 
+/** The text before its first section starts (a marker, a label or an H1 or H2), and the rest from there. Without a heading
+ * the whole text is the intro. For a page whose coloured H1 panel holds the header and this intro (PageLayout.astro).
+ * @param {string} html
+ * @returns {{ intro: string, rest: string }} */
+export function introOf(html) {
+  const at = html.search(NEXT);
+  return at < 0 ? { intro: html, rest: '' } : { intro: html.slice(0, at), rest: html.slice(at) };
+}
+
 /** The classes of a coloured section on the site (blocks.css). */
 export const sectionClass = (color) => `text-section text-section-${color}`;

package/lib/text-sections.test.mjs

@@ -4,7 +4,7 @@ import { test } from 'node:test';
 import assert from 'node:assert/strict';
 import { createMarkdownProcessor } from '@astrojs/markdown-remark';
 import rehypeRaw from 'rehype-raw';
-import { sectionClass, sectionsOf } from './text-sections.mjs';
+import { introOf, sectionClass, sectionsOf } from './text-sections.mjs';
 
 const M = (color) => `<div data-section="${color}"></div>`;
 
@@ -36,6 +36,23 @@ test('a run ends at an h1', () => {
   ]);
 });
 
+test('a marker before an h1 starts a coloured run that ends at the next h2', () => {
+  const html = `${M('tint')}<h1>A</h1><p>x</p><h2>B</h2>`;
+  assert.deepEqual(sectionsOf(html), [
+    { color: 'tint', html: '<h1>A</h1><p>x</p>' },
+    { color: null, html: '<h2>B</h2>' },
+  ]);
+});
+
+test('a marker and a label before an h1 start a coloured run', () => {
+  const html = `<p>Intro</p>${M('accent')}<p class="block-eyebrow">Hi</p><h1>A</h1><p>x</p><h1>B</h1>`;
+  assert.deepEqual(sectionsOf(html), [
+    { color: null, html: '<p>Intro</p>' },
+    { color: 'accent', html: '<p class="block-eyebrow">Hi</p><h1>A</h1><p>x</p>' },
+    { color: null, html: '<h1>B</h1>' },
+  ]);
+});
+
 test('two coloured sections after each other are two runs', () => {
   const html = `${M('tint')}\n<h2>A</h2>\n<p>x</p>\n${M('accent')}\n<h2>B</h2>\n<p>y</p>`;
   assert.deepEqual(sectionsOf(html), [
@@ -61,6 +78,22 @@ test('a marker not followed by an h2 is dropped', () => {
   assert.deepEqual(sectionsOf(`<p>a</p>\n${M('tint')}\n<h3>c</h3>`), [{ color: null, html: '<p>a</p>\n<h3>c</h3>' }]);
 });
 
+test('the intro is the text before the first section starts', () => {
+  assert.deepEqual(introOf(`<p>a</p>\n<p>b</p>\n${M('tint')}\n<h2>c</h2>\n<p>d</p>`), {
+    intro: '<p>a</p>\n<p>b</p>\n',
+    rest: `${M('tint')}\n<h2>c</h2>\n<p>d</p>`,
+  });
+  assert.deepEqual(introOf('<p>a</p><p class="block-eyebrow">L</p><h1>c</h1>'), {
+    intro: '<p>a</p>',
+    rest: '<p class="block-eyebrow">L</p><h1>c</h1>',
+  });
+});
+
+test('without a heading the text is all intro, and a text that starts with one has none', () => {
+  assert.deepEqual(introOf('<p>a</p>'), { intro: '<p>a</p>', rest: '' });
+  assert.deepEqual(introOf('<h2>a</h2><p>b</p>'), { intro: '', rest: '<h2>a</h2><p>b</p>' });
+});
+
 test('the class of a coloured section', () => {
   assert.equal(sectionClass('tint'), 'text-section text-section-tint');
 });

package/lib/translate.d.mts

@@ -6,3 +6,14 @@
  * @returns {string}
  */
 export function translate(dictionary: Record<string, string> | undefined, text: string, values?: Record<string, string | number>): string;
+/**
+ * Splits the texts that have no translation in a language: the standard parts' (English texts of
+ * defaults/, whose translations the package must have: they stop the check) and the others (the site's and the apps' own).
+ * @param {Iterable<string>} missing The texts with no translation.
+ * @param {ReadonlySet<string>} standard The standard parts' texts (the keys of defaults/i18n/da-DK/).
+ * @returns {{ standard: string[], own: string[] }}
+ */
+export function splitMissing(missing: Iterable<string>, standard: ReadonlySet<string>): {
+    standard: string[];
+    own: string[];
+};

package/lib/translate.mjs

@@ -1,5 +1,5 @@
 // The text lookup of the editor: a dictionary maps a text as written to its translation.
-// Exposes translate. Pure: no packages, no file access.
+// Exposes translate, splitMissing. Pure: no packages, no file access.
 
 /**
  * Takes dictionary[text] when the dictionary has that own key, else the text. Then fills each {name} from values.
@@ -13,3 +13,15 @@ export function translate(dictionary, text, values) {
   if (!values) return taken;
   return taken.replace(/\{(\w+)\}/g, (whole, name) => (name in values ? String(values[name]) : whole));
 }
+
+/**
+ * Splits the texts that have no translation in a language: the standard parts' (English texts of
+ * defaults/, whose translations the package must have: they stop the check) and the others (the site's and the apps' own).
+ * @param {Iterable<string>} missing The texts with no translation.
+ * @param {ReadonlySet<string>} standard The standard parts' texts (the keys of defaults/i18n/da-DK/).
+ * @returns {{ standard: string[], own: string[] }}
+ */
+export function splitMissing(missing, standard) {
+  const all = [...missing];
+  return { standard: all.filter((text) => standard.has(text)), own: all.filter((text) => !standard.has(text)) };
+}

package/lib/translate.test.mjs

@@ -1,9 +1,9 @@
-// Tests for lib/translate.mjs. Run: node --test lib/translate.test.mjs
+// Tests for lib/translate.mjs (translate, splitMissing). Run: node --test lib/translate.test.mjs
 // Danish letters are written as \u escapes.
 
 import assert from 'node:assert/strict';
 import { test } from 'node:test';
-import { translate } from './translate.mjs';
+import { splitMissing, translate } from './translate.mjs';
 
 test('takes the dictionary entry', () => {
   assert.equal(translate({ 'Read more': 'L\u00e6s mere' }, 'Read more'), 'L\u00e6s mere');
@@ -36,3 +36,24 @@ test('ignores inherited keys', () => {
 test('keeps a name when no values are given', () => {
   assert.equal(translate({}, 'Hi {name}'), 'Hi {name}');
 });
+
+// splitMissing: a standard text with no translation stops the check, the site's own only warns.
+test('splits the missing texts into the standard parts and the own', () => {
+  const split = splitMissing(['Content', 'Indhold', 'Pris'], new Set(['Content', 'Media']));
+  assert.deepEqual(split, { standard: ['Content'], own: ['Indhold', 'Pris'] });
+});
+
+test('has nothing to split when nothing is missing', () => {
+  assert.deepEqual(splitMissing([], new Set(['Content'])), { standard: [], own: [] });
+});
+
+test('an own text of an English site with no Danish only warns', () => {
+  const split = splitMissing(['Opening hours'], new Set(['Content']));
+  assert.deepEqual(split, { standard: [], own: ['Opening hours'] });
+});
+
+test('a standard text whose Danish entry was removed stops the check', () => {
+  // The standard set is built from the standard definitions, not from the Danish dictionary.
+  const split = splitMissing(['Button text', 'Opening hours'], new Set(['Button text', 'Content']));
+  assert.deepEqual(split, { standard: ['Button text'], own: ['Opening hours'] });
+});

package/lib/video-id.d.mts

@@ -7,8 +7,12 @@ export function videoOf(text: any): {
     id: string;
     hash: string | null;
 } | null;
-/** The address that plays the video, with the settings in the address of the iframe it came from. */
-export function player(video: any, frame: any): string;
+/** The address that plays the video, with the settings in the address of the iframe it came from.
+ * @param {any} video
+ * @param {string | null} [frame]
+ * @returns {string}
+ */
+export function player(video: any, frame?: string | null): string;
 export function videoPage(video: any): string;
 export function stillName(video: any): string;
 export function vimeoInfo(video: any, width: any): string;

package/lib/video-id.mjs

@@ -43,7 +43,11 @@ export function videoOf(text) {
   return null;
 }
 
-/** The address that plays the video, with the settings in the address of the iframe it came from. */
+/** The address that plays the video, with the settings in the address of the iframe it came from.
+ * @param {any} video
+ * @param {string | null} [frame]
+ * @returns {string}
+ */
 export function player(video, frame) {
   let params;
   try {

package/lib/video.d.mts

@@ -1,7 +1,11 @@
 /** What stands in for a video (videoOf) on the site: its page, the address that plays it (`frame`: the address of the
  * iframe it replaces, if any), its title, and its still from the site, when it could be fetched. The video block's
- * view too (src/standard/video/load.ts). */
-export function facadeOf(video: any, title: any, frame: any): {
+ * view too (src/standard/video/load.ts).
+ * @param {any} video
+ * @param {any} [title]
+ * @param {string | null} [frame]
+ */
+export function facadeOf(video: any, title?: any, frame?: string | null): {
     href: string;
     player: string;
     title: any;

package/lib/video.mjs

@@ -39,7 +39,11 @@ function facade(video, title, frame, play) {
 
 /** What stands in for a video (videoOf) on the site: its page, the address that plays it (`frame`: the address of the
  * iframe it replaces, if any), its title, and its still from the site, when it could be fetched. The video block's
- * view too (src/standard/video/load.ts). */
+ * view too (src/standard/video/load.ts).
+ * @param {any} video
+ * @param {any} [title]
+ * @param {string | null} [frame]
+ */
 export function facadeOf(video, title, frame) {
   const still = `/images/_video/${stillName(video)}`;
   return {

package/lib/without-h1.d.mts

@@ -1 +1,2 @@
 export function withoutH1(html: string): string;
+export function h1SectionColor(html: string): string | null;

package/lib/without-h1.mjs

@@ -1,7 +1,22 @@
-// A page's text as HTML without its H1, which the layout draws in its own place (above the picture, PageLayout.astro).
-// Exposes withoutH1 (pure); the H1 is the first one wherever it stands, as pageH1 (src/sections.mjs) reads it. No dependencies.
+// A page's text as HTML without its H1, which the layout draws in its own place (above the picture, PageLayout.astro), and the
+// colour of the H1's section (the marker before it, lib/section-marker.mjs). Exposes withoutH1 and h1SectionColor (pure); the H1
+// is the first one wherever it stands, as pageH1 (src/sections.mjs) reads it. Depends on text-sections.mjs and section-marker.mjs.
+import { LABEL, MARKER } from './text-sections.mjs';
+import { SECTION_COLORS } from './section-marker.mjs';
 
-/** The html without its first <h1>…</h1> and the white space after it.
+// The first <h1>…</h1> and the white space after it, with the marker before it and the label between them, if any.
+const H1 = new RegExp(`(?:${MARKER})?(${LABEL})<h1\\b[^>]*>[\\s\\S]*?<\\/h1>\\s*`);
+
+/** The html without its first <h1>…</h1> and the white space after it, and without the marker before it (a label above it
+ * stays in the text).
  * @param {string} html
  * @returns {string} */
-export const withoutH1 = (html) => html.replace(/<h1\b[^>]*>[\s\S]*?<\/h1>\s*/, '');
+export const withoutH1 = (html) => html.replace(H1, (_, __, label) => label);
+
+/** The colour of the section the first H1 starts (the marker before it, or before the label above it), or null.
+ * @param {string} html
+ * @returns {string | null} */
+export const h1SectionColor = (html) => {
+  const color = html.match(H1)?.[1];
+  return SECTION_COLORS.includes(color) ? color : null;
+};

package/lib/without-h1.test.mjs

@@ -2,7 +2,7 @@
 // Run with `node --test packages/editor/lib/*.test.mjs` (part of npm run check).
 import { test } from 'node:test';
 import assert from 'node:assert/strict';
-import { withoutH1 } from './without-h1.mjs';
+import { h1SectionColor, withoutH1 } from './without-h1.mjs';
 
 test('an H1 at the top is taken out, with the space after it', () => {
   assert.equal(withoutH1('<h1 id="title">Title</h1>\n<p>Text</p>'), '<p>Text</p>');
@@ -20,6 +20,35 @@ test('only the first H1 goes', () => {
   assert.equal(withoutH1('<h1>A</h1><p>x</p><h1>B</h1>'), '<p>x</p><h1>B</h1>');
 });
 
+const M = (color) => `<div data-section="${color}"></div>`;
+
+test('the marker before the H1 is taken out with it', () => {
+  assert.equal(withoutH1(`${M('tint')}\n<h1 id="t">Title</h1>\n<p>Text</p>`), '<p>Text</p>');
+  assert.equal(withoutH1(`<p>Intro</p>\n${M('tint')}\n<h1>Title</h1>\n<h2>A</h2>`), '<p>Intro</p>\n<h2>A</h2>');
+});
+
+test('a label between the marker and the H1 stays in the text', () => {
+  const label = '<p class="block-eyebrow">Hello</p>';
+  assert.equal(withoutH1(`${M('accent')}\n${label}\n<h1>Title</h1>\n<p>Text</p>`), `${label}\n<p>Text</p>`);
+});
+
+test('the marker of an H2 is not taken out', () => {
+  const html = `<h1>Title</h1>\n${M('tint')}\n<h2>A</h2>`;
+  assert.equal(withoutH1(html), `${M('tint')}\n<h2>A</h2>`);
+});
+
+test('the colour of the H1 section is the marker before the H1', () => {
+  assert.equal(h1SectionColor(`${M('tint')}\n<h1>Title</h1>\n<p>x</p>`), 'tint');
+  assert.equal(h1SectionColor(`<p>a</p>${M('accent')}<p class="block-eyebrow">L</p><h1>T</h1>`), 'accent');
+});
+
+test('without a marker before the H1 there is no colour', () => {
+  assert.equal(h1SectionColor('<h1>Title</h1><p>x</p>'), null);
+  assert.equal(h1SectionColor(`<h1>Title</h1>${M('tint')}<h2>A</h2>`), null);
+  assert.equal(h1SectionColor(`${M('red')}<h1>Title</h1>`), null);
+  assert.equal(h1SectionColor('<p>x</p>'), null);
+});
+
 test('without an H1 the html is as it was', () => {
   assert.equal(withoutH1('<p>Text</p><h2>Section</h2>'), '<p>Text</p><h2>Section</h2>');
   assert.equal(withoutH1('<header>x</header>'), '<header>x</header>');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morphemecms/cms",
-  "version": "0.11.0",
+  "version": "0.13.0-next-20261106203613",
   "description": "Morpheme CMS: the editor for a site built with Astro, its screens, its blocks and the rules a site gives it. See README.md.",
   "license": "MIT",
   "author": "Lars Adolfsen",
@@ -40,7 +40,8 @@
   },
   "scripts": {
     "build": "node scripts/demo-build.mjs",
-    "check": "npm run format:check && npm run check:language && npm test && npm run check:types && npm run build && npm run check:editor",
+    "check": "npm run format:check && npm run check:language && npm test && npm run check:types && npm run build && npm run check:site-types && npm run check:editor",
+    "check:site-types": "node scripts/check-site-types.mjs",
     "check:types": "tsc -p tsconfig.types.json --noEmit",
     "check:editor": "cd .morpheme/demo/site && node ../../../bin/morpheme.mjs check:editor",
     "check:screens": "cd .morpheme/demo/site && node ../../../bin/morpheme.mjs check:screens",