@morphemecms/cms 0.11.0 → 0.13.0-next-20261106203613

package/lib/appRoute.test.mjs

@@ -7,23 +7,23 @@ test('apps/cms-version', () => {
   deepEqual(appRouteOf('apps/cms-version', 'cms-version'), { tab: 'settings' });
 });
 
-test('apps/cms-version/om', () => {
-  deepEqual(appRouteOf('apps/cms-version/om', 'cms-version'), { tab: 'information' });
+test('apps/cms-version/about', () => {
+  deepEqual(appRouteOf('apps/cms-version/about', 'cms-version'), { tab: 'information' });
 });
 
-test('apps/cms-version/indstillinger', () => {
-  deepEqual(appRouteOf('apps/cms-version/indstillinger', 'cms-version'), { tab: 'settings' });
+test('apps/cms-version/settings', () => {
+  deepEqual(appRouteOf('apps/cms-version/settings', 'cms-version'), { tab: 'settings' });
 });
 
-test('apps/cms-version/indstillinger/variant', () => {
-  deepEqual(appRouteOf('apps/cms-version/indstillinger/variant', 'cms-version'), {
+test('apps/cms-version/settings/variant', () => {
+  deepEqual(appRouteOf('apps/cms-version/settings/variant', 'cms-version'), {
     tab: 'settings',
     page: 'variant',
   });
 });
 
-test('apps/cms-version/indstillinger/a/b', () => {
-  deepEqual(appRouteOf('apps/cms-version/indstillinger/a/b', 'cms-version'), null);
+test('apps/cms-version/settings/a/b', () => {
+  deepEqual(appRouteOf('apps/cms-version/settings/a/b', 'cms-version'), null);
 });
 
 test('apps/cms-version/other', () => {

package/lib/apps.mjs

@@ -1,3 +1,4 @@
+// A site folder in src/apps/ named app_ or theme_ that is not a store id stops the build (appIds, strayStoreId).
 // What an app (src/apps/<app>/, packages/editor/src/apps.ts) can have outside the editor and the pages, each only while
 // it is installed (src/data/apps.json):
 //   worker.js  its part of the site's Worker: its own addresses, /api/<app>/… (`fetch`), and what it does each hour
@@ -11,6 +12,7 @@
 import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from 'node:fs';
 import { join, sep } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
+import { strayStoreId } from './storeEntries.mjs';
 
 /** Where an app's files from the build are, in the build (dist/) and so on the site (served only to the Worker). */
 export const APP_FILES = '_apps';
@@ -19,14 +21,22 @@ const APPS = 'src/apps';
 const INSTALLED = 'src/data/apps.json';
 const WORKERS = 'worker/apps.js';
 
-/** The ids of the apps, all of them (the folders in src/apps/). @param {string} root */
-export const appIds = (root) =>
-  existsSync(join(root, APPS))
+/** The ids of the apps, all of them (the folders in src/apps/). Stops on a folder that starts with `app_` or `theme_` but
+ * is not a store id of an app. @param {string} root */
+export const appIds = (root) => {
+  const ids = existsSync(join(root, APPS))
     ? readdirSync(join(root, APPS), { withFileTypes: true })
         .filter((d) => d.isDirectory())
         .map((d) => d.name)
         .sort()
     : [];
+  const stray = ids.find((id) => strayStoreId(id, 'app'));
+  if (stray)
+    throw new Error(
+      `${APPS}/${stray}: the folder name looks like a store id but is not one. A store app id is app_ and 16 lowercase hex characters; rename the folder.`,
+    );
+  return ids;
+};
 
 /** The ids of the apps installed. @param {string} root @returns {string[]} */
 export function installedApps(root) {

package/lib/apps.test.mjs

@@ -5,7 +5,7 @@ import { strict as assert } from 'node:assert/strict';
 import { mkdtempSync, rmSync, writeFileSync, mkdirSync, readFileSync } from 'node:fs';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
-import { appWorkersFile, appWorkersProblems, writeAppWorkers } from './apps.mjs';
+import { appIds, appWorkersFile, appWorkersProblems, writeAppWorkers } from './apps.mjs';
 
 describe('lib/apps.mjs', () => {
   let root;
@@ -47,4 +47,13 @@ describe('lib/apps.mjs', () => {
     assert.equal(writeAppWorkers(root), true);
     assert.equal(readFileSync(file, 'utf8'), appWorkersFile(root));
   });
+
+  it('appIds lists permanent ids and own names, and stops on a folder that is not a store id', () => {
+    mkdirSync(join(root, 'src/apps/app_a030dfba69793996'), { recursive: true });
+    assert.deepEqual(appIds(root), ['app_a030dfba69793996', 'booking']);
+    mkdirSync(join(root, 'src/apps/app_xyz'), { recursive: true });
+    assert.throws(() => appIds(root), /src\/apps\/app_xyz/);
+    rmSync(join(root, 'src/apps/app_xyz'), { recursive: true });
+    rmSync(join(root, 'src/apps/app_a030dfba69793996'), { recursive: true });
+  });
 });

package/lib/contracts.d.mts

@@ -5,8 +5,9 @@
 /** The version of the contract between the editor and an app (apps.ts: defineApp, its folder, and the theme's parts it
  * draws with: the standard blocks' and the UI components, @theme/blocks/… and @theme/ui/…, imported from
  * @morphemecms/cms): an app in the store says which it is written to, and only those the editor can run are
- * offered. Raised when an app written to the one before no longer works. */
-export const APP_API: 2;
+ * offered. Raised when an app written to the one before no longer works. 3 adds `import self from '@app/self'` (the id
+ * of the app's own folder, site/appSelf.mjs); an app written to 2 works as before. */
+export const APP_API: 3;
 /** The version of the contract between the editor and a theme (what a theme must and may have, "Hvad et tema må" in
  * CLAUDE.md, themeProblems in packages/editor/site/theme.mjs, the standard theme's UI parts with Material 3's names and
  * variants, the motion scheme's --motion-* springs and motionSpring/motionTiming (@morphemecms/cms/lib/motion),

package/lib/contracts.mjs

@@ -6,8 +6,9 @@
 /** The version of the contract between the editor and an app (apps.ts: defineApp, its folder, and the theme's parts it
  * draws with: the standard blocks' and the UI components, @theme/blocks/… and @theme/ui/…, imported from
  * @morphemecms/cms): an app in the store says which it is written to, and only those the editor can run are
- * offered. Raised when an app written to the one before no longer works. */
-export const APP_API = 2;
+ * offered. Raised when an app written to the one before no longer works. 3 adds `import self from '@app/self'` (the id
+ * of the app's own folder, site/appSelf.mjs); an app written to 2 works as before. */
+export const APP_API = 3;
 
 /** The version of the contract between the editor and a theme (what a theme must and may have, "Hvad et tema må" in
  * CLAUDE.md, themeProblems in packages/editor/site/theme.mjs, the standard theme's UI parts with Material 3's names and

package/lib/folderChanges.d.mts

@@ -0,0 +1,29 @@
+/** @typedef {{ path: string, oid: string }} RepoFile
+ * @typedef {{ path: string, content: string | Uint8Array | null, oid: string | null }} Change */
+/** The changes that make a folder in the site (`current`, its files now) the store's version of an app or a theme, with
+ * the note of where it came from, or remove it (`next` null).
+ * @param {string} folder
+ * @param {RepoFile[]} current
+ * @param {{ files: { path: string, content: string | Uint8Array }[], record: { files: { path: string, oid: string }[] } } | null} next
+ * @returns {Change[]} */
+export function folderChanges(folder: string, current: RepoFile[], next: {
+    files: {
+        path: string;
+        content: string | Uint8Array;
+    }[];
+    record: {
+        files: {
+            path: string;
+            oid: string;
+        }[];
+    };
+} | null): Change[];
+export type RepoFile = {
+    path: string;
+    oid: string;
+};
+export type Change = {
+    path: string;
+    content: string | Uint8Array | null;
+    oid: string | null;
+};

package/lib/folderChanges.mjs

@@ -0,0 +1,34 @@
+// The changes that make a folder in a site the store's version of an app or a theme, with its store.json note, or remove
+// it. Exposes folderChanges (used by src/store.ts and src/legacyMove.ts). Depends on ./storeEntries.mjs (RECORD).
+import { RECORD } from './storeEntries.mjs';
+
+/** @typedef {{ path: string, oid: string }} RepoFile
+ * @typedef {{ path: string, content: string | Uint8Array | null, oid: string | null }} Change */
+
+/** The changes that make a folder in the site (`current`, its files now) the store's version of an app or a theme, with
+ * the note of where it came from, or remove it (`next` null).
+ * @param {string} folder
+ * @param {RepoFile[]} current
+ * @param {{ files: { path: string, content: string | Uint8Array }[], record: { files: { path: string, oid: string }[] } } | null} next
+ * @returns {Change[]} */
+export function folderChanges(folder, current, next) {
+  const now = new Map(current.map((f) => [f.path, f.oid]));
+  /** @type {{ path: string, content: string | Uint8Array, oid?: string }[]} */
+  const wanted = next
+    ? [
+        ...next.files.map((f) => ({
+          path: `${folder}/${f.path}`,
+          content: f.content,
+          oid: next.record.files.find((r) => r.path === f.path)?.oid,
+        })),
+        { path: `${folder}/${RECORD}`, content: `${JSON.stringify(next.record, null, 2)}\n` },
+      ]
+    : [];
+  return [
+    // A file the site has as it is in the store is left as it is.
+    ...wanted
+      .filter((w) => !w.oid || now.get(w.path) !== w.oid)
+      .map((w) => ({ path: w.path, content: w.content, oid: now.get(w.path) ?? null })),
+    ...current.filter((f) => !wanted.some((w) => w.path === f.path)).map((f) => ({ path: f.path, content: null, oid: f.oid })),
+  ];
+}

package/lib/licenses.mjs

@@ -237,8 +237,8 @@ export function importsIn(folder) {
 }
 
 /** An app's or a theme's id among the licences ("Licenser": its group, its own licence's page), and where it brings
- * something (a shipped package's `where`): `app/<id>`, `tema/<id>`. */
-export const ownerId = (kind, id) => `${kind === 'app' ? 'app' : 'tema'}/${id}`;
+ * something (a shipped package's `where`): `app/<id>`, `theme/<id>`. */
+export const ownerId = (kind, id) => `${kind === 'app' ? 'app' : 'theme'}/${id}`;
 
 /** A text's id in an address (`Pictogrammers Free License` → `pictogrammers-free-license`). */
 const slug = (text) =>

package/lib/licenses.owner.test.mjs

@@ -0,0 +1,9 @@
+// Tests ownerId in licenses.mjs: an app's and a theme's id among the licences, with their English kinds.
+import { test } from 'node:test';
+import assert from 'node:assert/strict';
+import { ownerId } from './licenses.mjs';
+
+test('an owner id starts with the English kind', () => {
+  assert.equal(ownerId('app', 'calendly'), 'app/calendly');
+  assert.equal(ownerId('theme', 'saturn'), 'theme/saturn');
+});

package/lib/menu.mjs

@@ -33,7 +33,7 @@ export function menuTree(groups, partOf, childrenOf) {
   });
 }
 
-const PARENTS = ['virksomheden', 'blokke', 'udseende', 'seo', 'apps'];
+const PARENTS = ['company', 'blocks', 'appearance', 'seo', 'apps'];
 
 const under = (path, prefix) => path === prefix || path.startsWith(prefix + '/');
 
@@ -47,15 +47,15 @@ export function currentPart(route, known) {
     return 'appstore';
   }
 
-  const part = known.open || route.replace(/^(liste|ny|slettet)\/([^/]+).*/, '$2');
+  const part = known.open || route.replace(/^(list|new|deleted)\/([^/]+).*/, '$2');
 
   if (part === known.cookies) {
     // The cookie list is a list, but its place is under Privacy.
-    return 'privatliv';
+    return 'privacy';
   }
 
   if (known.lists.includes(part)) {
-    return 'lister';
+    return 'lists';
   }
 
   if (known.header.includes(part)) {

package/lib/menu.test.mjs

@@ -7,92 +7,92 @@ import assert from 'node:assert/strict';
 import { currentPart, menuTree, currentPlace } from './menu.mjs';
 
 const known = {
-  lists: ['udtalelser', 'cookies', 'priser'],
-  header: ['menu', 'mobilmenu', 'headerknap'],
-  partScreens: ['privatliv'],
+  lists: ['testimonials', 'cookies', 'priser'],
+  header: ['menu', 'mobile-menu', 'header-button'],
+  partScreens: ['privacy'],
   cookies: 'cookies',
-  store: 'indstillinger/appstore',
+  store: 'settings/appstore',
 };
 
 const treeGroups = [
   { id: 'home', title: 'Home', href: '#', ids: [] },
-  { id: 'indhold', title: 'Content', ids: ['pages', 'lister', 'videresendelser'] },
-  { id: 'udseende', title: 'Appearance', ids: ['udseende/farver', 'udseende/logo'] },
+  { id: 'content', title: 'Content', ids: ['pages', 'lists', 'redirects'] },
+  { id: 'appearance', title: 'Appearance', ids: ['appearance/colors', 'appearance/logo'] },
 ];
-const treePartOf = (id) => ({ label: `L ${id}`, href: `#${id === 'videresendelser' ? 'seo/videresendelser' : id}`, count: null });
+const treePartOf = (id) => ({ label: `L ${id}`, href: `#${id === 'redirects' ? 'seo/redirects' : id}`, count: null });
 const treeChildren = (id) =>
-  id === 'videresendelser'
+  id === 'redirects'
     ? [
-        { id: 'alle', label: 'All', href: '#seo/videresendelser/alle' },
-        { id: 'ikke-fundet', label: 'Not found', href: '#seo/videresendelser/ikke-fundet' },
+        { id: 'all', label: 'All', href: '#seo/redirects/all' },
+        { id: 'not-found', label: 'Not found', href: '#seo/redirects/not-found' },
       ]
-    : id === 'lister'
-      ? [{ id: 'priser', label: 'Prices', href: '#liste/priser' }]
+    : id === 'lists'
+      ? [{ id: 'priser', label: 'Prices', href: '#list/priser' }]
       : [];
 const tree = menuTree(treeGroups, treePartOf, treeChildren);
 
 test('an open collection is its own item', () => {
   assert.equal(currentPart('src/content/pages/om.md', { ...known, open: 'pages' }), 'pages');
-  assert.equal(currentPart('liste/blog', { ...known, open: 'blog' }), 'blog');
+  assert.equal(currentPart('list/blog', { ...known, open: 'blog' }), 'blog');
 });
 
 test('a short list is under Lists', () => {
-  assert.equal(currentPart('liste/udtalelser', known), 'lister');
-  assert.equal(currentPart('ny/udtalelser', known), 'lister');
-  assert.equal(currentPart('slettet/priser', known), 'lister');
-  assert.equal(currentPart('src/data/prices/a.json', { ...known, open: 'priser' }), 'lister');
+  assert.equal(currentPart('list/testimonials', known), 'lists');
+  assert.equal(currentPart('new/testimonials', known), 'lists');
+  assert.equal(currentPart('deleted/priser', known), 'lists');
+  assert.equal(currentPart('src/data/prices/a.json', { ...known, open: 'priser' }), 'lists');
 });
 
 test('the cookie list is under Privacy, whatever the way to it', () => {
-  assert.equal(currentPart('liste/cookies', known), 'privatliv');
-  assert.equal(currentPart('liste/cookies/cookiescanner', known), 'privatliv');
-  assert.equal(currentPart('ny/cookies', known), 'privatliv');
-  assert.equal(currentPart('slettet/cookies', known), 'privatliv');
-  assert.equal(currentPart('src/data/cookie-list/a.json', { ...known, open: 'cookies' }), 'privatliv');
+  assert.equal(currentPart('list/cookies', known), 'privacy');
+  assert.equal(currentPart('list/cookies/cookiescanner', known), 'privacy');
+  assert.equal(currentPart('new/cookies', known), 'privacy');
+  assert.equal(currentPart('deleted/cookies', known), 'privacy');
+  assert.equal(currentPart('src/data/cookie-list/a.json', { ...known, open: 'cookies' }), 'privacy');
 });
 
 test('the menus are under Header', () => {
   assert.equal(currentPart('src/data/menu.json', { ...known, open: 'menu' }), 'header');
-  assert.equal(currentPart('liste/mobilmenu', known), 'header');
-  assert.equal(currentPart('src/data/header.json', { ...known, open: 'headerknap' }), 'header');
+  assert.equal(currentPart('list/mobile-menu', known), 'header');
+  assert.equal(currentPart('src/data/header.json', { ...known, open: 'header-button' }), 'header');
 });
 
 test('a screen under a part is that part', () => {
-  assert.equal(currentPart('virksomheden', known), 'virksomheden');
-  assert.equal(currentPart('virksomheden/betaling/mobilepay', known), 'virksomheden');
-  assert.equal(currentPart('blokke', known), 'blokke');
-  assert.equal(currentPart('blokke/hero', known), 'blokke');
-  assert.equal(currentPart('udseende/farver', known), 'udseende');
-  assert.equal(currentPart('seo/videresendelser', known), 'seo');
+  assert.equal(currentPart('company', known), 'company');
+  assert.equal(currentPart('company/payment/mobilepay', known), 'company');
+  assert.equal(currentPart('blocks', known), 'blocks');
+  assert.equal(currentPart('blocks/hero', known), 'blocks');
+  assert.equal(currentPart('appearance/colors', known), 'appearance');
+  assert.equal(currentPart('seo/redirects', known), 'seo');
   assert.equal(currentPart('apps/calendly', known), 'apps');
-  assert.equal(currentPart('apps/calendly/indstillinger', known), 'apps');
+  assert.equal(currentPart('apps/calendly/settings', known), 'apps');
 });
 
 test('Block settings is not under Block templates, and a longer name is not under a shorter one', () => {
-  assert.equal(currentPart('blokvalg', known), 'blokvalg');
+  assert.equal(currentPart('block-settings', known), 'block-settings');
   assert.equal(currentPart('appsx', known), 'appsx');
 });
 
 test('the screens with parts, and their parts, are the screen', () => {
-  assert.equal(currentPart('privatliv', known), 'privatliv');
-  assert.equal(currentPart('privatliv/cookiebanner', known), 'privatliv');
+  assert.equal(currentPart('privacy', known), 'privacy');
+  assert.equal(currentPart('privacy/cookie-banner', known), 'privacy');
 });
 
 test('the app store, and its themes, are Find apps', () => {
-  assert.equal(currentPart('indstillinger/appstore', known), 'appstore');
-  assert.equal(currentPart('indstillinger/appstore/temaer', known), 'appstore');
+  assert.equal(currentPart('settings/appstore', known), 'appstore');
+  assert.equal(currentPart('settings/appstore/themes', known), 'appstore');
 });
 
 test('a screen of its own is itself, and the start screen is none', () => {
-  assert.equal(currentPart('avanceret', known), 'avanceret');
-  assert.equal(currentPart('licenser', known), 'licenser');
+  assert.equal(currentPart('advanced', known), 'advanced');
+  assert.equal(currentPart('licenses', known), 'licenses');
   assert.equal(currentPart('', known), '');
 });
 
 test('menuTree keeps the groups in the order written', () => {
   assert.deepEqual(
     tree.map((e) => e.id),
-    ['home', 'indhold', 'udseende'],
+    ['home', 'content', 'appearance'],
   );
 });
 
@@ -105,7 +105,7 @@ test('menuTree copies href only when the group has it', () => {
 test('menuTree gives the items in the order written', () => {
   assert.deepEqual(
     tree[1].items.map((i) => i.id),
-    ['pages', 'lister', 'videresendelser'],
+    ['pages', 'lists', 'redirects'],
   );
   assert.equal(tree[1].items[0].label, 'L pages');
 });
@@ -120,23 +120,23 @@ test('currentPlace on the start screen is no section', () => {
 });
 
 test('currentPlace finds a child', () => {
-  assert.deepEqual(currentPlace('seo/videresendelser/alle', tree, known), { section: 'indhold', item: 'videresendelser', child: 'alle' });
+  assert.deepEqual(currentPlace('seo/redirects/all', tree, known), { section: 'content', item: 'redirects', child: 'all' });
 });
 
 test('currentPlace finds a list as a child of Lists', () => {
-  assert.deepEqual(currentPlace('liste/priser', tree, known), { section: 'indhold', item: 'lister', child: 'priser' });
+  assert.deepEqual(currentPlace('list/priser', tree, known), { section: 'content', item: 'lists', child: 'priser' });
 });
 
 test('currentPlace finds an item by its href', () => {
-  assert.deepEqual(currentPlace('seo/videresendelser', tree, known), { section: 'indhold', item: 'videresendelser' });
+  assert.deepEqual(currentPlace('seo/redirects', tree, known), { section: 'content', item: 'redirects' });
 });
 
 test('currentPlace finds a screen under an item', () => {
-  assert.deepEqual(currentPlace('udseende/farver/tekst', tree, known), { section: 'udseende', item: 'udseende/farver' });
+  assert.deepEqual(currentPlace('appearance/colors/tekst', tree, known), { section: 'appearance', item: 'appearance/colors' });
 });
 
 test('currentPlace falls back to currentPart', () => {
-  assert.deepEqual(currentPlace('rediger/pages/app-store', tree, { ...known, open: 'pages' }), { section: 'indhold', item: 'pages' });
+  assert.deepEqual(currentPlace('rediger/pages/app-store', tree, { ...known, open: 'pages' }), { section: 'content', item: 'pages' });
 });
 
 test('currentPlace gives no section for an unknown route', () => {
@@ -144,82 +144,82 @@ test('currentPlace gives no section for an unknown route', () => {
 });
 
 test('currentPlace gives the section of a screen that is a section itself', () => {
-  assert.deepEqual(currentPlace('udseende', tree, known), { section: 'udseende' });
+  assert.deepEqual(currentPlace('appearance', tree, known), { section: 'appearance' });
 });
 
 // The menu as defaults/editor.ts `groups` writes it, with the hrefs the editor gives.
 const menuGroups = [
   { id: 'home', title: 'Home', href: '#', ids: [] },
   {
-    id: 'indhold',
+    id: 'content',
     title: 'Content',
-    ids: ['pages', 'blog', 'lister', 'popups', 'kategorier', 'filer', 'interne-links', 'videresendelser'],
+    ids: ['pages', 'blog', 'lists', 'popups', 'tags', 'files', 'internal-links', 'redirects'],
   },
-  { id: 'globalt', title: 'Global', ids: ['header', 'footer', 'virksomheden'] },
+  { id: 'global', title: 'Global', ids: ['header', 'footer', 'company'] },
   { id: 'apps', title: 'Apps', ids: ['apps', 'appstore'] },
-  { id: 'blokke', title: 'Blocks', ids: ['blokke', 'blokvalg'] },
-  { id: 'udseende', title: 'Appearance', ids: ['farver', 'logo'] },
-  { id: 'privatliv', title: 'Privacy', ids: ['cookiebanner', 'cookies'] },
-  { id: 'indstillinger', title: 'Settings', ids: ['avanceret'] },
+  { id: 'blocks', title: 'Blocks', ids: ['blocks', 'block-settings'] },
+  { id: 'appearance', title: 'Appearance', ids: ['colors', 'logo'] },
+  { id: 'privacy', title: 'Privacy', ids: ['cookie-banner', 'cookies'] },
+  { id: 'settings', title: 'Settings', ids: ['advanced'] },
 ];
 const hrefs = {
-  pages: '#liste/pages',
-  blog: '#liste/blog',
-  lister: '#lister',
-  popups: '#liste/popups',
-  kategorier: '#liste/kategorier',
-  filer: '#filer',
-  'interne-links': '#seo/interne-links',
-  videresendelser: '#seo/videresendelser',
-  header: '#udseende/header',
-  footer: '#udseende/footer',
-  virksomheden: '#virksomheden',
+  pages: '#list/pages',
+  blog: '#list/blog',
+  lists: '#lists',
+  popups: '#list/popups',
+  tags: '#list/tags',
+  files: '#files',
+  'internal-links': '#seo/internal-links',
+  redirects: '#seo/redirects',
+  header: '#appearance/header',
+  footer: '#appearance/footer',
+  company: '#company',
   apps: '#apps',
-  appstore: '#indstillinger/appstore',
-  blokke: '#blokke',
-  blokvalg: '#blokvalg',
-  farver: '#udseende/farver',
-  logo: '#udseende/logo',
-  cookiebanner: '#privatliv/cookiebanner',
-  cookies: '#liste/cookies',
-  avanceret: '#avanceret',
+  appstore: '#settings/appstore',
+  blocks: '#blocks',
+  'block-settings': '#block-settings',
+  colors: '#appearance/colors',
+  logo: '#appearance/logo',
+  'cookie-banner': '#privacy/cookie-banner',
+  cookies: '#list/cookies',
+  advanced: '#advanced',
 };
 const menu = menuTree(
   menuGroups,
   (id) => ({ label: id, href: hrefs[id], count: null }),
   (id) =>
-    id === 'videresendelser'
+    id === 'redirects'
       ? [
-          { id: 'alle', label: 'All', href: '#seo/videresendelser/alle' },
-          { id: 'ikke-fundet', label: 'Not found', href: '#seo/videresendelser/ikke-fundet' },
+          { id: 'all', label: 'All', href: '#seo/redirects/all' },
+          { id: 'not-found', label: 'Not found', href: '#seo/redirects/not-found' },
         ]
       : id === 'apps'
         ? [{ id: 'calendly', label: 'Calendly', href: '#apps/calendly' }]
         : [],
 );
-const menuKnown = { ...known, store: 'indstillinger/appstore' };
+const menuKnown = { ...known, store: 'settings/appstore' };
 const allIds = menu.flatMap((e) => e.items.flatMap((i) => [i.id, ...(i.children ?? []).map((c) => c.id)]));
 const allHrefs = menu.flatMap((e) => e.items.flatMap((i) => [i.href, ...(i.children ?? []).map((c) => c.href)]));
 
 test('the menu has the eight sections in order', () => {
   assert.deepEqual(
     menu.map((e) => e.id),
-    ['home', 'indhold', 'globalt', 'apps', 'blokke', 'udseende', 'privatliv', 'indstillinger'],
+    ['home', 'content', 'global', 'apps', 'blocks', 'appearance', 'privacy', 'settings'],
   );
 });
 
 test('Content holds Internal links and Redirects after the files, in order', () => {
   assert.deepEqual(
     menu[1].items.map((i) => i.id),
-    ['pages', 'blog', 'lister', 'popups', 'kategorier', 'filer', 'interne-links', 'videresendelser'],
+    ['pages', 'blog', 'lists', 'popups', 'tags', 'files', 'internal-links', 'redirects'],
   );
 });
 
 test('Redirects has All and Not found as children', () => {
-  const redirects = menu[1].items.find((i) => i.id === 'videresendelser');
+  const redirects = menu[1].items.find((i) => i.id === 'redirects');
   assert.deepEqual(
     redirects.children.map((c) => c.href),
-    ['#seo/videresendelser/alle', '#seo/videresendelser/ikke-fundet'],
+    ['#seo/redirects/all', '#seo/redirects/not-found'],
   );
 });
 
@@ -230,51 +230,51 @@ test('Find apps is the first item under Apps, then the apps installed, and Advan
   );
   assert.deepEqual(
     menu[7].items.map((i) => i.id),
-    ['avanceret'],
+    ['advanced'],
   );
 });
 
 test('Analytics, SEO, the SEO rating and Licenses are not in the menu', () => {
-  for (const gone of ['maaling', 'seo', 'vurdering', 'licenser']) {
+  for (const gone of ['analytics', 'seo', 'rating', 'licenses']) {
     assert.equal(allIds.includes(gone), false);
   }
-  for (const gone of ['#maaling', '#seo', '#seo/vurdering', '#licenser']) {
+  for (const gone of ['#analytics', '#seo', '#seo/rating', '#licenses']) {
     assert.equal(allHrefs.includes(gone), false);
   }
 });
 
 test('currentPlace of a page being edited, a list, the SEO rating, an Appearance screen, an app, Find apps and Privacy', () => {
-  assert.deepEqual(currentPlace('liste/pages/app-store', menu, menuKnown), { section: 'indhold', item: 'pages' });
-  assert.deepEqual(currentPlace('src/content/pages/om.md', menu, { ...menuKnown, open: 'pages' }), { section: 'indhold', item: 'pages' });
-  assert.deepEqual(currentPlace('seo/videresendelser/alle', menu, menuKnown), {
-    section: 'indhold',
-    item: 'videresendelser',
-    child: 'alle',
+  assert.deepEqual(currentPlace('list/pages/app-store', menu, menuKnown), { section: 'content', item: 'pages' });
+  assert.deepEqual(currentPlace('src/content/pages/om.md', menu, { ...menuKnown, open: 'pages' }), { section: 'content', item: 'pages' });
+  assert.deepEqual(currentPlace('seo/redirects/all', menu, menuKnown), {
+    section: 'content',
+    item: 'redirects',
+    child: 'all',
   });
-  assert.deepEqual(currentPlace('seo/interne-links', menu, menuKnown), { section: 'indhold', item: 'interne-links' });
-  assert.deepEqual(currentPlace('seo/vurdering', menu, menuKnown), { section: null });
-  assert.deepEqual(currentPlace('udseende/farver', menu, menuKnown), { section: 'udseende', item: 'farver' });
+  assert.deepEqual(currentPlace('seo/internal-links', menu, menuKnown), { section: 'content', item: 'internal-links' });
+  assert.deepEqual(currentPlace('seo/rating', menu, menuKnown), { section: null });
+  assert.deepEqual(currentPlace('appearance/colors', menu, menuKnown), { section: 'appearance', item: 'colors' });
   assert.deepEqual(currentPlace('apps/calendly', menu, menuKnown), { section: 'apps', item: 'calendly' });
   assert.deepEqual(currentPlace('apps/mailchimp', menu, menuKnown), { section: 'apps' });
-  assert.deepEqual(currentPlace('indstillinger/appstore/temaer', menu, menuKnown), { section: 'apps', item: 'appstore' });
-  assert.deepEqual(currentPlace('privatliv/cookiebanner', menu, menuKnown), { section: 'privatliv', item: 'cookiebanner' });
-  assert.deepEqual(currentPlace('src/data/cookie-list/a.json', menu, { ...menuKnown, open: 'cookies' }), { section: 'privatliv' });
+  assert.deepEqual(currentPlace('settings/appstore/themes', menu, menuKnown), { section: 'apps', item: 'appstore' });
+  assert.deepEqual(currentPlace('privacy/cookie-banner', menu, menuKnown), { section: 'privacy', item: 'cookie-banner' });
+  assert.deepEqual(currentPlace('src/data/cookie-list/a.json', menu, { ...menuKnown, open: 'cookies' }), { section: 'privacy' });
 });
 
 test('currentPlace of Appearance › Header and its menus is Global › Header', () => {
-  assert.deepEqual(currentPlace('udseende/header', menu, menuKnown), { section: 'globalt', item: 'header' });
-  assert.deepEqual(currentPlace('src/data/menu.json', menu, { ...menuKnown, open: 'menu' }), { section: 'globalt', item: 'header' });
+  assert.deepEqual(currentPlace('appearance/header', menu, menuKnown), { section: 'global', item: 'header' });
+  assert.deepEqual(currentPlace('src/data/menu.json', menu, { ...menuKnown, open: 'menu' }), { section: 'global', item: 'header' });
 });
 
 test('currentPlace of Appearance › Footer is Global › Footer, a row without children', () => {
-  assert.deepEqual(currentPlace('udseende/footer', menu, menuKnown), { section: 'globalt', item: 'footer' });
-  const global = menu.find((entry) => entry.id === 'globalt');
+  assert.deepEqual(currentPlace('appearance/footer', menu, menuKnown), { section: 'global', item: 'footer' });
+  const global = menu.find((entry) => entry.id === 'global');
   assert.equal(global.items.find((item) => item.id === 'footer').children, undefined);
   assert.equal(global.items.find((item) => item.id === 'header').children, undefined);
 });
 
 const appsGroups = [{ id: 'apps', title: 'Apps', ids: ['apps', 'appstore'] }];
-const appsPartOf = (id) => ({ label: `L ${id}`, href: id === 'appstore' ? '#indstillinger/appstore' : '#apps', count: null });
+const appsPartOf = (id) => ({ label: `L ${id}`, href: id === 'appstore' ? '#settings/appstore' : '#apps', count: null });
 const appsOf = (list) => (id) => (id === 'apps' ? list.map((a) => ({ id: a, label: `A ${a}`, href: `#apps/${a}` })) : []);
 
 test('the Apps section lists Appstore, then each installed app, and not the apps list', () => {
@@ -300,5 +300,5 @@ test('an app screen selects its row; the apps list and Appstore keep the Apps se
   const appsTree = menuTree(appsGroups, appsPartOf, appsOf(['mailchimp', 'mobilepay']));
   assert.deepEqual(currentPlace('apps/mailchimp', appsTree, known), { section: 'apps', item: 'mailchimp' });
   assert.deepEqual(currentPlace('apps', appsTree, known), { section: 'apps' });
-  assert.deepEqual(currentPlace('indstillinger/appstore', appsTree, known), { section: 'apps', item: 'appstore' });
+  assert.deepEqual(currentPlace('settings/appstore', appsTree, known), { section: 'apps', item: 'appstore' });
 });

package/lib/scheduled.mjs

@@ -33,5 +33,5 @@ export function published(text) {
 /** A file as a commit names it: `blogindlæg "x"`. */
 export function nameOf(path) {
   const kind = KINDS.find((k) => path.startsWith(`${k.dir}/`));
-  return `${kind?.name ?? 'fil'} "${path.slice((kind?.dir.length ?? -1) + 1).replace(/(\/index)?\.md$/, '')}"`;
+  return `${kind?.name ?? 'file'} "${path.slice((kind?.dir.length ?? -1) + 1).replace(/(\/index)?\.md$/, '')}"`;
 }