@morphemecms/cms 0.2.0 → 0.3.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @morphemecms/cms
 
+## 0.3.0
+
+### Minor Changes
+
+- 07db64b: A site can show one block in a column beside the text of its pages: a block says it can with `beside: true` in its `load.ts`, the owner picks it under Appearance › Side column (`src/data/side.json`), and a page can turn it off (`side: false`); each block now gives its own front-page lead in a `lead.ts`; `defineSite` takes `logo` for the structured data; and the icon packs have calendar-x, identification-card, money, receipt and wallet.
+
 ## 0.2.0
 
 ### Minor Changes

package/defaults/collections.ts

@@ -347,6 +347,17 @@ export const collections: Collection[] = [
         layout: true,
         hint: 'Siden fylder hele bredden uden spalten ved siden af teksten.',
       },
+      {
+        name: 'side',
+        label: 'Sidekolonne',
+        type: 'boolean',
+        toggle: ['Til', 'Fra'],
+        // Without the key the column is on; only "Fra" is written (side: false).
+        default: true,
+        missing: true,
+        layout: true,
+        hint: 'Blokken ved siden af teksten vises på siden. Den vælges under Udseende › Sidekolonne.',
+      },
       {
         name: 'review',
         label: 'Til gennemsyn',

package/defaults/editor.ts

@@ -39,6 +39,7 @@ import {
   PuzzlePiece,
   Shapes,
   ShieldCheck,
+  SidebarSimple,
   Signpost,
   Smiley,
   SlidersHorizontal,
@@ -133,6 +134,7 @@ export const icons: Record<string, Icon> = {
   logo: Sticker,
   ikonpakker: Smiley,
   bevaegelse: WaveSine,
+  sidekolonne: SidebarSimple,
   dele: Shapes,
 };
 

package/defaults/standardPages.ts

@@ -9,25 +9,11 @@
 // "Kontakt", the footer's "Find vej" and Google's contact details (the structured data) go to it. The privacy policy and
 // the cookie policy are shown at their own addresses too; the cookie banner's "Læs mere" goes to the cookie policy (its
 // heading about cookies, when it is the privacy policy: cookiesHref in packages/editor/site/standardPages.ts). What of a section of the front page is only text and pictures is
-// written as text above its card (its lead, packages/editor/src/sections.mjs): in the editor, when that page is open
+// written as text above its card (its lead, lead.ts in the block's folder, frontLeads.ts; packages/editor/src/sections.mjs): in the editor, when that page is open
 // (EntryForm.tsx), and on the site, when it is read into sections. No React here, so the build can use it.
-import type { Lead, Template } from '../src/schema';
+import type { Template } from '../src/schema';
 
-/** The text above a block's card that is the block's own on the front page: its heading, text and picture. The top is
- * the standard block "Banner", whose text up to its "Knapper" block (with its heading and picture) is the text at the
- * top; the block and the text after it are on its card. */
-export const frontLeads: Record<string, Lead> = {
-  hero: { body: 'text', upTo: 'buttons' },
-  accordion: { heading: 'heading', body: 'intro' },
-  testimonials: { heading: 'heading' },
-  presentation: { heading: 'heading', body: 'paragraphs', list: true },
-  cards: { heading: 'heading' },
-  book: { image: true },
-  steps: { heading: 'heading' },
-  prices: { heading: 'heading', body: 'notes', list: true },
-  posts: { heading: 'heading' },
-  address: { image: true, heading: 'heading', body: 'text' },
-};
+export { frontLeads } from '../src/standard/frontLeads';
 
 /** A standard page: its field in the file (`key`), its name there and in a message ("Forsiden …") in the site's language,
  * where it is shown (null: nowhere at an address, the 404 page; left out: at its own address), the rules its page has

package/defaults/texts.ts

@@ -26,6 +26,9 @@ export const texts: Record<string, Record<string, string>> = {
     'Skærmlæsere springer billedet over.': 'Screen readers skip the picture.',
     Til: 'On',
     Fra: 'Off',
+    Sidekolonne: 'Side column',
+    'Blokken ved siden af teksten vises på siden. Den vælges under Udseende › Sidekolonne.':
+      'The block beside the text is shown on the page. It is chosen under Appearance › Side column.',
     'Hele bredden': 'Full width',
     'Siden fylder hele bredden uden spalten ved siden af teksten.': 'The page fills the whole width without the column beside the text.',
     Status: 'Status',

package/icons/lucide/calendar-x.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M8 2v3" /> <path d="M16 2v3" /> <rect x="3" y="3" width="18" height="18" rx="2" /> <path d="M3 9h18" /> <path d="m14 13-4 4" /> <path d="m10 13 4 4" /></g></svg>

package/icons/lucide/identification-card.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M13 19a4 4 0 00-8 0" /> <path d="M16 10h2" /> <path d="M16 14h2" /> <circle cx="9" cy="12" r="3" /> <rect x="2" y="5" width="20" height="14" rx="2" /></g></svg>

package/icons/lucide/money.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect width="20" height="12" x="2" y="6" rx="2" /> <circle cx="12" cy="12" r="2" /> <path d="M6 12h.01M18 12h.01" /></g></svg>

package/icons/lucide/receipt.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 17V7" /> <path d="M16 8h-6a2 2 0 0 0 0 4h4a2 2 0 0 1 0 4H8" /> <path d="M4 3a1 1 0 0 1 1-1 1.3 1.3 0 0 1 .7.2l.933.6a1.3 1.3 0 0 0 1.4 0l.934-.6a1.3 1.3 0 0 1 1.4 0l.933.6a1.3 1.3 0 0 0 1.4 0l.933-.6a1.3 1.3 0 0 1 1.4 0l.934.6a1.3 1.3 0 0 0 1.4 0l.933-.6A1.3 1.3 0 0 1 19 2a1 1 0 0 1 1 1v18a1 1 0 0 1-1 1 1.3 1.3 0 0 1-.7-.2l-.933-.6a1.3 1.3 0 0 0-1.4 0l-.934.6a1.3 1.3 0 0 1-1.4 0l-.933-.6a1.3 1.3 0 0 0-1.4 0l-.933.6a1.3 1.3 0 0 1-1.4 0l-.934-.6a1.3 1.3 0 0 0-1.4 0l-.933.6a1.3 1.3 0 0 1-.7.2 1 1 0 0 1-1-1z" /></g></svg>

package/icons/lucide/wallet.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M19 7V4a1 1 0 0 0-1-1H5a2 2 0 0 0 0 4h15a1 1 0 0 1 1 1v4h-3a2 2 0 0 0 0 4h3a1 1 0 0 0 1-1v-2a1 1 0 0 0-1-1" /> <path d="M3 5v14a2 2 0 0 0 2 2h15a1 1 0 0 0 1-1v-4" /></g></svg>

package/icons/material-symbols/calendar-x.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="m381-218-43-43 100-99-100-99 43-43 99 100 99-100 43 43-100 99 100 99-43 43-99-100-99 100ZM180-80q-24 0-42-18t-18-42v-620q0-24 18-42t42-18h65v-60h65v60h340v-60h65v60h65q24 0 42 18t18 42v620q0 24-18 42t-42 18H180Zm0-60h600v-430H180v430Zm0-490h600v-130H180v130Zm0 0v-130 130Z"/></svg>

package/icons/material-symbols/identification-card.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M580-450h180v-60H580v60Zm0-120h180v-60H580v60ZM200-320h320v-19q0-42-42.5-68.5T360-434q-75 0-117.5 26.5T200-339v19Zm211.5-195.42q21.5-21.42 21.5-51.5t-21.42-51.58q-21.42-21.5-51.5-21.5t-51.58 21.42q-21.5 21.42-21.5 51.5t21.42 51.58q21.42 21.5 51.5 21.5t51.58-21.42ZM140-160q-24 0-42-18t-18-42v-520q0-24 18-42t42-18h680q24 0 42 18t18 42v520q0 24-18 42t-42 18H140Zm0-60h680v-520H140v520Zm0 0v-520 520Z"/></svg>

package/icons/material-symbols/money.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M540-420q-50 0-85-35t-35-85q0-50 35-85t85-35q50 0 85 35t35 85q0 50-35 85t-85 35ZM220-280q-24.75 0-42.37-17.63Q160-315.25 160-340v-400q0-24.75 17.63-42.38Q195.25-800 220-800h640q24.75 0 42.38 17.62Q920-764.75 920-740v400q0 24.75-17.62 42.37Q884.75-280 860-280H220Zm100-60h440q0-42 29-71t71-29v-200q-42 0-71-29t-29-71H320q0 42-29 71t-71 29v200q42 0 71 29t29 71Zm480 180H100q-24.75 0-42.37-17.63Q40-195.25 40-220v-460h60v460h700v60ZM220-340v-400 400Z"/></svg>

package/icons/material-symbols/receipt.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M120-81v-798l60 60 60-60 60 60 60-60 60 60 60-60 60 60 60-60 60 60 60-60 60 60 60-60v798l-60-60-60 60-60-60-60 60-60-60-60 60-60-59.85L360-81l-60-59.85L240-81l-60-59.85L120-81Zm117-215h490v-60H237v60Zm0-154h490v-60H237v60Zm0-155h490v-60H237v60Zm-57 423h600v-596H180v596Zm0-596v596-596Z"/></svg>

package/icons/material-symbols/wallet.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M240-160q-66 0-113-47T80-320v-320q0-66 47-113t113-47h480q66 0 113 47t47 113v320q0 66-47 113t-113 47H240Zm0-470h480q29 0 54.5 9t45.5 26v-45q0-42-29-71t-71-29H240q-42 0-71 29t-29 71v45q20-17 45.5-26t54.5-9Zm-97 136 477 115q7 2 14.5.5T647-385l160-134q-13-23-36-37t-51-14H240q-35 0-62 21.5T143-494Z"/></svg>

package/icons/phosphor/calendar-x.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" fill="currentColor"><path d="M208,32H184V24a8,8,0,0,0-16,0v8H88V24a8,8,0,0,0-16,0v8H48A16,16,0,0,0,32,48V208a16,16,0,0,0,16,16H208a16,16,0,0,0,16-16V48A16,16,0,0,0,208,32ZM72,48v8a8,8,0,0,0,16,0V48h80v8a8,8,0,0,0,16,0V48h24V80H48V48ZM208,208H48V96H208V208Zm-50.34-74.34L139.31,152l18.35,18.34a8,8,0,0,1-11.32,11.32L128,163.31l-18.34,18.35a8,8,0,0,1-11.32-11.32L116.69,152,98.34,133.66a8,8,0,0,1,11.32-11.32L128,140.69l18.34-18.35a8,8,0,0,1,11.32,11.32Z"/></svg>

package/icons/phosphor/identification-card.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" fill="currentColor"><path d="M200,112a8,8,0,0,1-8,8H152a8,8,0,0,1,0-16h40A8,8,0,0,1,200,112Zm-8,24H152a8,8,0,0,0,0,16h40a8,8,0,0,0,0-16Zm40-80V200a16,16,0,0,1-16,16H40a16,16,0,0,1-16-16V56A16,16,0,0,1,40,40H216A16,16,0,0,1,232,56ZM216,200V56H40V200H216Zm-80.26-34a8,8,0,1,1-15.5,4c-2.63-10.26-13.06-18-24.25-18s-21.61,7.74-24.25,18a8,8,0,1,1-15.5-4,39.84,39.84,0,0,1,17.19-23.34,32,32,0,1,1,45.12,0A39.76,39.76,0,0,1,135.75,166ZM96,136a16,16,0,1,0-16-16A16,16,0,0,0,96,136Z"/></svg>

package/icons/phosphor/money.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" fill="currentColor"><path d="M128,88a40,40,0,1,0,40,40A40,40,0,0,0,128,88Zm0,64a24,24,0,1,1,24-24A24,24,0,0,1,128,152ZM240,56H16a8,8,0,0,0-8,8V192a8,8,0,0,0,8,8H240a8,8,0,0,0,8-8V64A8,8,0,0,0,240,56ZM193.65,184H62.35A56.78,56.78,0,0,0,24,145.65v-35.3A56.78,56.78,0,0,0,62.35,72h131.3A56.78,56.78,0,0,0,232,110.35v35.3A56.78,56.78,0,0,0,193.65,184ZM232,93.37A40.81,40.81,0,0,1,210.63,72H232ZM45.37,72A40.81,40.81,0,0,1,24,93.37V72ZM24,162.63A40.81,40.81,0,0,1,45.37,184H24ZM210.63,184A40.81,40.81,0,0,1,232,162.63V184Z"/></svg>

package/icons/phosphor/receipt.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" fill="currentColor"><path d="M72,104a8,8,0,0,1,8-8h96a8,8,0,0,1,0,16H80A8,8,0,0,1,72,104Zm8,40h96a8,8,0,0,0,0-16H80a8,8,0,0,0,0,16ZM232,56V208a8,8,0,0,1-11.58,7.15L192,200.94l-28.42,14.21a8,8,0,0,1-7.16,0L128,200.94,99.58,215.15a8,8,0,0,1-7.16,0L64,200.94,35.58,215.15A8,8,0,0,1,24,208V56A16,16,0,0,1,40,40H216A16,16,0,0,1,232,56Zm-16,0H40V195.06l20.42-10.22a8,8,0,0,1,7.16,0L96,199.06l28.42-14.22a8,8,0,0,1,7.16,0L160,199.06l28.42-14.22a8,8,0,0,1,7.16,0L216,195.06Z"/></svg>

package/icons/phosphor/wallet.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" fill="currentColor"><path d="M216,64H56a8,8,0,0,1,0-16H192a8,8,0,0,0,0-16H56A24,24,0,0,0,32,56V184a24,24,0,0,0,24,24H216a16,16,0,0,0,16-16V80A16,16,0,0,0,216,64Zm0,128H56a8,8,0,0,1-8-8V78.63A23.84,23.84,0,0,0,56,80H216Zm-48-60a12,12,0,1,1,12,12A12,12,0,0,1,168,132Z"/></svg>

package/lib/side-block.d.mts

@@ -0,0 +1,45 @@
+/**
+ * The block type to draw beside a page's text, or null.
+ * @param {{ wide?: boolean, side?: boolean }} page  the page's front matter
+ * @param {{ block: string | null } | null} setting  the contents of src/data/side.json, or null when the file is missing
+ * @param {(type: string) => boolean} beside  whether that type's load.ts has beside: true
+ * @returns {string | null}
+ */
+export function sideBlockOf(page: {
+    wide?: boolean;
+    side?: boolean;
+}, setting: {
+    block: string | null;
+} | null, beside: (type: string) => boolean): string | null;
+/**
+ * Whether a block's load.ts source says `export const beside = true` (the editor never imports load.ts, so it reads the text).
+ * @param {string} source
+ * @returns {boolean}
+ */
+export function besideInSource(source: string): boolean;
+/**
+ * The installed block types that can be drawn beside a page's text, for the choice under "Udseende" › "Sidekolonne".
+ * @param {{ type: string, label: string, app?: string }[]} blocks  every block the editor knows (siteBlocks)
+ * @param {Record<string, string>} sources  the text of each block's load.ts, by type
+ * @param {string[]} installed  the ids of the apps installed
+ * @returns {{ type: string, label: string }[]}
+ */
+export function sideChoices(blocks: {
+    type: string;
+    label: string;
+    app?: string;
+}[], sources: Record<string, string>, installed: string[]): {
+    type: string;
+    label: string;
+}[];
+/**
+ * Whether the page form shows the switch "Sidekolonne": src/data/side.json chooses a block and the page is not wide.
+ * @param {{ block?: unknown } | null | undefined} setting  the contents of src/data/side.json
+ * @param {{ wide?: unknown }} page  the page's values
+ * @returns {boolean}
+ */
+export function sideSwitchShown(setting: {
+    block?: unknown;
+} | null | undefined, page: {
+    wide?: unknown;
+}): boolean;

package/lib/side-block.mjs

@@ -0,0 +1,75 @@
+// Determines the side block type to draw beside a page's text, and what the editor offers about it.
+// Exposes sideBlockOf (the site), besideInSource, sideChoices and sideSwitchShown (the editor: Sidekolonne).
+// No dependencies.
+
+/**
+ * The block type to draw beside a page's text, or null.
+ * @param {{ wide?: boolean, side?: boolean }} page  the page's front matter
+ * @param {{ block: string | null } | null} setting  the contents of src/data/side.json, or null when the file is missing
+ * @param {(type: string) => boolean} beside  whether that type's load.ts has beside: true
+ * @returns {string | null}
+ */
+export function sideBlockOf(page, setting, beside) {
+  // Treat null or undefined page as empty object
+  const p = page || {};
+
+  // Rule 1: When setting is null or undefined, return null
+  if (setting === null || setting === undefined) {
+    return null;
+  }
+
+  // Rule 2: When setting.block is not a non-empty string, return null
+  if (typeof setting.block !== 'string' || setting.block.length === 0) {
+    return null;
+  }
+
+  // Rule 3: When page.wide === true, return null
+  if (p.wide === true) {
+    return null;
+  }
+
+  // Rule 4: When page.side === false, return null
+  if (p.side === false) {
+    return null;
+  }
+
+  // Rule 5: When beside(setting.block) is not true, return null
+  if (beside(setting.block) !== true) {
+    return null;
+  }
+
+  // Rule 6: Return setting.block
+  return setting.block;
+}
+
+/**
+ * Whether a block's load.ts source says `export const beside = true` (the editor never imports load.ts, so it reads the text).
+ * @param {string} source
+ * @returns {boolean}
+ */
+export function besideInSource(source) {
+  return /^export\s+const\s+beside\s*=\s*true\s*;?\s*$/m.test(source);
+}
+
+/**
+ * The installed block types that can be drawn beside a page's text, for the choice under "Udseende" › "Sidekolonne".
+ * @param {{ type: string, label: string, app?: string }[]} blocks  every block the editor knows (siteBlocks)
+ * @param {Record<string, string>} sources  the text of each block's load.ts, by type
+ * @param {string[]} installed  the ids of the apps installed
+ * @returns {{ type: string, label: string }[]}
+ */
+export function sideChoices(blocks, sources, installed) {
+  return blocks
+    .filter((b) => (!b.app || installed.includes(b.app)) && besideInSource(sources[b.type] ?? ''))
+    .map((b) => ({ type: b.type, label: b.label }));
+}
+
+/**
+ * Whether the page form shows the switch "Sidekolonne": src/data/side.json chooses a block and the page is not wide.
+ * @param {{ block?: unknown } | null | undefined} setting  the contents of src/data/side.json
+ * @param {{ wide?: unknown }} page  the page's values
+ * @returns {boolean}
+ */
+export function sideSwitchShown(setting, page) {
+  return typeof setting?.block === 'string' && setting.block.length > 0 && page?.wide !== true;
+}

package/lib/side-block.test.d.mts

@@ -0,0 +1 @@
+export {};

package/lib/side-block.test.mjs

@@ -0,0 +1,79 @@
+// Tests for sideBlockOf (the site) and besideInSource, sideChoices and sideSwitchShown (the editor's Sidekolonne).
+// Validates side block selection logic.
+// Depends on lib/side-block.mjs.
+import { test } from 'node:test';
+import assert from 'node:assert/strict';
+import { besideInSource, sideBlockOf, sideChoices, sideSwitchShown } from './side-block.mjs';
+
+const yes = () => true;
+const no = () => false;
+
+test('returns null when setting is null', () => {
+  assert.equal(sideBlockOf({}, null, yes), null);
+});
+
+test('returns null when setting.block is null', () => {
+  assert.equal(sideBlockOf({}, { block: null }, yes), null);
+});
+
+test('returns block type when valid', () => {
+  assert.equal(sideBlockOf({}, { block: 'side-card' }, yes), 'side-card');
+});
+
+test('returns null when page.wide is true', () => {
+  assert.equal(sideBlockOf({ wide: true }, { block: 'side-card' }, yes), null);
+});
+
+test('returns null when page.side is false', () => {
+  assert.equal(sideBlockOf({ side: false }, { block: 'side-card' }, yes), null);
+});
+
+test('returns block type when page.side is true', () => {
+  assert.equal(sideBlockOf({ side: true }, { block: 'side-card' }, yes), 'side-card');
+});
+
+test('returns null when beside returns false', () => {
+  assert.equal(sideBlockOf({}, { block: 'side-card' }, no), null);
+});
+
+test('beside is called with the chosen type', () => {
+  const seen = [];
+  sideBlockOf({}, { block: 'side-card' }, (t) => {
+    seen.push(t);
+    return true;
+  });
+  assert.deepEqual(seen, ['side-card']);
+});
+
+test('treats undefined page as empty object', () => {
+  assert.equal(sideBlockOf(undefined, { block: 'side-card' }, yes), 'side-card');
+});
+
+test('besideInSource reads export const beside = true', () => {
+  assert.equal(besideInSource('import x from "y";\nexport const beside = true;\nexport const load = 1;'), true);
+  assert.equal(besideInSource('export const beside = false;'), false);
+  assert.equal(besideInSource('// export const beside = true;'), false);
+  assert.equal(besideInSource('export const load = 1;'), false);
+}); 
+
+test('sideChoices lists installed blocks with beside, by label', () => {
+  const blocks = [
+    { type: 'hero', label: 'Hero' },
+    { type: 'toc', label: 'Contents' },
+    { type: 'chat', label: 'Chat', app: 'chat' },
+    { type: 'gone', label: 'Gone', app: 'gone' },
+  ];
+  const beside = 'export const beside = true;';
+  const sources = { toc: beside, chat: beside, gone: beside, hero: 'export const load = 1;' };
+  assert.deepEqual(sideChoices(blocks, sources, ['chat']), [
+    { type: 'toc', label: 'Contents' },
+    { type: 'chat', label: 'Chat' },
+  ]);
+});
+
+test('sideSwitchShown needs a chosen block and a page that is not wide', () => {
+  assert.equal(sideSwitchShown({ block: 'toc' }, {}), true);
+  assert.equal(sideSwitchShown({ block: 'toc' }, { wide: true }), false);
+  assert.equal(sideSwitchShown({ block: null }, {}), false);
+  assert.equal(sideSwitchShown(null, {}), false);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@morphemecms/cms",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "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",

package/scripts/check-side.mjs

@@ -0,0 +1,56 @@
+// Checks the column beside a page's text (src/data/side.json, `beside` in a block's load.ts, PageLayout.astro) with the
+// theme now in src/data/theme.json: puts a TEST-ONLY block and three pages in the site (scripts/fixtures/side/), builds it
+// in a folder of its own and looks in the HTML. Exposes checkSide(root, theme); used by check-themes.mjs. Removes what it
+// put in the site, and the side.json it wrote, however it ends.
+import { execFileSync } from 'node:child_process';
+import { cpSync, existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { binOf } from './bin.mjs';
+
+const fixtures = fileURLToPath(new URL('fixtures/side/', import.meta.url));
+const BLOCK = 'src/apps/side-fixture/blocks/side-test';
+const PAGES = ['side-plain', 'side-wide', 'side-off'];
+
+/** What the fixture's pages must show: [page, whether the column is on it]. */
+export const expected = [
+  ['side-plain', true],
+  ['side-wide', false],
+  ['side-off', false],
+];
+
+/** Whether the built page has the block beside its text, and its text's length (data-side-length). */
+export const columnOf = (html) => ({
+  column: /<aside class="page-side">[\s\S]*?data-side-test="\/side-plain\/"[\s\S]*?<\/aside>/.test(html),
+  grid: html.includes('class="page-with-side"'),
+  anywhere: html.includes('data-side-test'),
+});
+
+/** Builds the site with the fixture and checks the three cases for the theme in use; throws with what is wrong. */
+export function checkSide(root) {
+  const put = [BLOCK, 'src/data/side.json', ...PAGES.map((p) => `src/content/pages/${p}.md`)].map((f) => join(root, f));
+  if (put.some(existsSync)) throw new Error('Remove the side-fixture files from src/ first (scripts/check-side.mjs puts them there).');
+  const out = mkdtempSync(join(tmpdir(), 'side-'));
+  try {
+    mkdirSync(join(root, BLOCK), { recursive: true });
+    cpSync(join(fixtures, 'block'), join(root, BLOCK), { recursive: true });
+    cpSync(join(fixtures, 'side.json'), join(root, 'src/data/side.json'));
+    for (const p of PAGES) cpSync(join(fixtures, `${p}.md`), join(root, `src/content/pages/${p}.md`));
+    execFileSync(process.execPath, [binOf('astro'), 'build', '--outDir', out], { cwd: root, stdio: 'inherit' });
+    const problems = [];
+    for (const [page, on] of expected) {
+      const html = readFileSync(join(out, page, 'index.html'), 'utf8');
+      const found = columnOf(html);
+      if (on && !(found.column && found.grid)) problems.push(`/${page}/ has no column beside its text`);
+      if (!on && (found.anywhere || found.grid)) problems.push(`/${page}/ has the column, and should not`);
+    }
+    const plain = columnOf(readFileSync(join(out, 'side-plain/index.html'), 'utf8'));
+    if (!plain.anywhere) problems.push('the block was not drawn at all');
+    if (problems.length) throw new Error(problems.join('\n'));
+  } finally {
+    rmSync(out, { recursive: true, force: true });
+    rmSync(join(root, 'src/apps/side-fixture'), { recursive: true, force: true });
+    for (const f of put.slice(1)) rmSync(f, { force: true });
+  }
+}

package/scripts/check-themes.mjs

@@ -2,7 +2,8 @@
 // others than the one in use (src/data/theme.json), the editor's check of the content (check-content.mjs), the site
 // built (in a folder of its own, so dist/ stays the theme in use's) and every screen of the editor opened
 // (editor-screens.mjs). The theme in use is checked by the steps before (npm run build, npm run check:screens).
-// src/data/theme.json is the theme being checked while it runs, and as it was after.
+// src/data/theme.json is the theme being checked while it runs, and as it was after. The theme in use too builds once with
+// a test block beside the text of the pages (check-side.mjs), as each of the others does after its screens.
 import { execFileSync } from 'node:child_process';
 import { mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
@@ -10,6 +11,7 @@ import { join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { activeTheme, installedThemes } from '@morphemecms/cms/site/theme.mjs';
 import { binOf } from './bin.mjs';
+import { checkSide } from './check-side.mjs';
 
 const ROOT = `${process.cwd()}/`;
 const file = join(ROOT, 'src/data/theme.json');
@@ -18,7 +20,18 @@ const others = installedThemes().filter((t) => t !== activeTheme());
 const run = (cmd, args) => execFileSync(cmd, args, { cwd: ROOT, stdio: 'inherit' });
 
 const failed = [];
+const side = (theme) => {
+  try {
+    console.log(`
+Kolonnen ved siden af teksten med temaet ${theme}:`);
+    checkSide(ROOT);
+  } catch (error) {
+    console.error(error.message);
+    failed.push(`${theme} (kolonnen)`);
+  }
+};
 try {
+  side(activeTheme());
   for (const theme of others) {
     console.log(`\nTemaet ${theme}:`);
     writeFileSync(file, `${JSON.stringify({ theme }, null, 2)}\n`);
@@ -27,6 +40,7 @@ try {
       run(process.execPath, [fileURLToPath(new URL('check-content.mjs', import.meta.url))]);
       run(process.execPath, [binOf('astro'), 'build', '--outDir', out]);
       run(process.execPath, [fileURLToPath(new URL('editor-screens.mjs', import.meta.url)), out]);
+      checkSide(ROOT);
     } catch {
       failed.push(theme);
     } finally {

package/scripts/editor-roundtrip.mjs

@@ -5,7 +5,7 @@
 // sections as blocks (packages/editor/src/sections.mjs) and read back: the sections must be the same, a section
 // of text with the same heading and the same HTML. Every page is also read into sections as the front page (as the
 // site reads the page that is the front page without the editor, partsOfMarkdown in sections.mjs, packages/editor/site/home.ts):
-// they must be those the editor reads. Run: npm run check:editor [files...]
+// they must be those the editor reads. A page with the switch "Sidekolonne" off and on again has the same front matter. Run: npm run check:editor [files...]
 // Milkdown needs a DOM; jsdom stands in for the browser.
 import { existsSync, readFileSync, readdirSync } from 'node:fs';
 import { join } from 'node:path';
@@ -45,7 +45,7 @@ const textOf = Object.fromEntries(
     .flatMap((c) => c.files)
     .map((f) => [f.file, f.fields.find((x) => x.type === 'blocks')]),
 );
-const { splitFrontmatter, writeFields } = await import('@morphemecms/cms/src/frontmatter.mjs');
+const { booleanWrite, splitFrontmatter, writeFields } = await import('@morphemecms/cms/src/frontmatter.mjs');
 
 const walk = (dir) =>
   (existsSync(dir) ? readdirSync(dir, { withFileTypes: true }) : []).flatMap((e) =>
@@ -103,6 +103,17 @@ for (const file of files) {
     console.log(`\n✗ ${file}\n  front matter skrives ikke tilbage uændret`);
     continue;
   }
+  // The switch "Sidekolonne" (side): off writes `side: false`; on again removes the key, and the front matter is as before.
+  if (file.includes('src/content/pages/')) {
+    const off = writeFields(yaml, { side: booleanWrite(false, true) });
+    if (!/^side: false$/m.test(off) || writeFields(off, { side: booleanWrite(true, true) }) !== writeFields(yaml, { side: '' })) {
+      failed++;
+      console.log(`
+✗ ${file}
+  Sidekolonne slået fra og til giver ikke det samme front matter`);
+      continue;
+    }
+  }
   const root = document.createElement('div');
   // As in the editor: with the free lines between the blocks, written without them.
   const editor = await makeEditor(root, body).use(spacing).create();

package/scripts/fixtures/side/block/View.tsx

@@ -0,0 +1,9 @@
+// TEST-ONLY drawing of the block in load.ts (scripts/check-side.mjs): a paragraph the check looks for in the built page.
+// Exposes a React component given the block's view.
+export default function SideTest({ view }: { view: { path: string; length: number } }) {
+  return (
+    <p data-side-test={view.path} data-side-length={view.length}>
+      Side test block
+    </p>
+  );
+}

package/scripts/fixtures/side/block/load.ts

@@ -0,0 +1,8 @@
+// TEST-ONLY block for check:themes (scripts/check-side.mjs): a block that can be drawn beside a page's text (`beside`).
+// Its view is the page's address and the length of the text it was given, so the check sees that both reach the block.
+import type { Load } from '@morphemecms/cms/src/standard/view';
+
+export const beside = true;
+
+export const load: Load<{ path: string; length: number }> = async (props, at) =>
+  Object.keys(props).length === 0 && at.html ? { path: at.path ?? '', length: at.html.length } : null;

package/scripts/fixtures/side/side-off.md

@@ -0,0 +1,8 @@
+---
+title: "Side off"
+side: false
+---
+
+# Side off
+
+A page with side false: no column.

package/scripts/fixtures/side/side-plain.md

@@ -0,0 +1,7 @@
+---
+title: "Side plain"
+---
+
+# Side plain
+
+A plain page: the column is beside this text.

package/scripts/fixtures/side/side-wide.md

@@ -0,0 +1,8 @@
+---
+title: "Side wide"
+wide: true
+---
+
+# Side wide
+
+A wide page: no column.

package/scripts/fixtures/side/side.json

@@ -0,0 +1,3 @@
+{
+  "block": "side-test"
+}

package/scripts/icon-packs.mjs

@@ -19,7 +19,7 @@ import { execFileSync } from 'node:child_process';
 import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'node:fs';
 import { ICON_PACK_FILE, ICON_PACK_LICENSE, SYSTEM_PACKS } from '@morphemecms/cms/site/iconPacks.mjs';
 import { packFolder } from '@morphemecms/cms/site/icons.mjs';
-import { MATERIAL_DESIGN_ICONS, PACK_MAPS, PACK_SOURCES, phosphorFile, usedIcons } from '@morphemecms/cms/site/icons.mjs';
+import { MATERIAL_DESIGN_ICONS, PACK_MAPS, PACK_SOURCES, phosphorFile, phosphorNames, usedIcons } from '@morphemecms/cms/site/icons.mjs';
 
 const MDI = 'material-design-icons';
 const version = (spec) => spec.replace(/^.*@/, '');
@@ -78,7 +78,7 @@ const lines = (fill) => (inner) =>
 
 // What each pack's files are, by Phosphor's name: its set's, and those from Material Design Icons.
 function sourcesOf(id) {
-  if (id === 'phosphor') return used.map((name) => ({ name, text: () => phosphorFile(name) }));
+  if (id === 'phosphor') return phosphorNames(used).map((name) => ({ name, text: () => phosphorFile(name) }));
   const map = PACK_MAPS[id];
   const mdi = MATERIAL_DESIGN_ICONS[id] ?? {};
   return [
@@ -104,7 +104,7 @@ for (const id of SYSTEM_PACKS) {
     );
   for (const { name, icon, file } of sources)
     if (file && !existsSync(file)) problems.push(`${PACK_SOURCES[id].name} har intet "${icon}" (for ${name}).`);
-  if (id === 'phosphor') for (const name of used) if (!phosphorFile(name)) problems.push(`Phosphor har intet "${name}".`);
+  if (id === 'phosphor') for (const name of phosphorNames(used)) if (!phosphorFile(name)) problems.push(`Phosphor har intet "${name}".`);
 }
 if (problems.length) {
   for (const p of problems) console.error(p);

package/site/content.config.ts

@@ -1,3 +1,5 @@
+// The site's content collections (blog posts, pages) and their front matter. Exposes `collections` for Astro.
+// Depends on astro:content.
 import { defineCollection, z } from 'astro:content';
 import { glob } from 'astro/loaders';
 
@@ -74,6 +76,8 @@ const pages = defineCollection({
     noindex: z.boolean().optional().default(false),
     // Across the whole page, without the owner's card beside the text (PageLayout.astro).
     wide: z.boolean().optional().default(false),
+    // `false`: without the block beside the text, which src/data/side.json chooses (PageLayout.astro).
+    side: z.boolean().optional(),
     // A new version of a page (/ny/…): what the owner should look at or answer before it replaces the
     // current page. Shown at the top of the new version and on /ny/.
     review: z.string().optional(),

package/site/defineSite.d.mts

@@ -45,7 +45,7 @@ export type SiteOwn = {
  * What a site can say of itself, else the standard: the owner's picture (beside a blog post, and shown when a page with
  * none of its own is shared), the booking page and the pages a booking ends on, the page about the owner, the block
  * drawn after every blog post, the word a page's title can end in, pictures that are the same though their names say
- * otherwise, and the file of its redirects from old addresses.
+ * otherwise, the file of its redirects from old addresses, and the logo in the structured data.
  */
 export type SiteChoices = {
     /**
@@ -91,6 +91,11 @@ export type SiteChoices = {
         rules: string;
         map: string;
     };
+    /**
+     * The address of the site's logo in the structured data (the business's `logo`,
+     * site/schema.ts), a path on the site ("/logo.svg").
+     */
+    logo: string;
 };
 export type SiteConfig = SiteOwn & SiteChoices & typeof STANDARD;
 declare namespace STANDARD {
@@ -113,6 +118,7 @@ declare namespace STANDARD {
     let theme: string;
     let icons: string;
     let motion: string;
+    let side: string;
     let themes: string;
     let csp: string;
     let colors: string;