@morphemecms/cms 0.1.0 → 0.2.0-next-20261104150211

package/site/content.config.ts

@@ -1,84 +1,84 @@
-import { defineCollection, z } from 'astro:content';
-import { glob } from 'astro/loaders';
-
-// Kladde, Skjult or Planlagt (Udgivet when left out), and for Planlagt when, in Danish time
-// ("2026-11-01T08:00"): what each one is on the site is in packages/editor/lib/status.mjs.
-const status = {
-  status: z.enum(['draft', 'unlisted', 'scheduled']).optional(),
-  publishAt: z.string().optional(),
-};
-
-// Blog posts: one .md file per post in src/content/blog/.
-// The file name becomes the URL: mit-foerste-indlaeg.md -> /mit-foerste-indlaeg/
-const blog = defineCollection({
-  loader: glob({ pattern: '**/*.md', base: './src/content/blog' }),
-  schema: z.object({
-    title: z.string(),
-    date: z.coerce.date(),
-    // Last edit (when imported, the old site's); dateModified in the structured data.
-    updated: z.coerce.date().optional(),
-    description: z.string().optional().default(''),
-    categories: z.array(z.string()).optional().default([]),
-    image: z.string().optional(),
-    imageAlt: z.string().optional(),
-    // "Dekorativt billede": `image` is drawn with alt="" (screen readers skip it), whatever `imageAlt` says.
-    imageDecorative: z.boolean().optional(),
-    ...status,
-    // Google title and description (the <title> and meta description). Empty: built from the title.
-    seoTitle: z.string().optional(),
-    seoDescription: z.string().optional(),
-    // The picture shown when it is shared (og:image). Empty: `image`, else the first picture in the text.
-    shareImage: z.string().optional(),
-    // The title and description when it is shared (og:title, og:description). Empty: the Google title and description.
-    shareTitle: z.string().optional(),
-    shareDescription: z.string().optional(),
-    // Words that link here from the other pages and posts (packages/editor/site/autolinks.mjs): the primary
-    // keyword, and more separated by commas.
-    keyword: z.string().optional(),
-    keywords: z.string().optional(),
-    // The address of the page Google should count as the original (rel=canonical). Empty: this one.
-    canonical: z.string().optional(),
-    // Not for search engines: noindex (Base.astro) and not in the sitemap (packages/editor/astro.mjs).
-    noindex: z.boolean().optional().default(false),
-  }),
-});
-
-// Imported pages. `path` is the exact URL, e.g. /ydelser/raadgivning/
-// Pages created in the editor (/editor/) have no `path`: the file name is the URL (getPages()).
-const pages = defineCollection({
-  loader: glob({ pattern: '**/*.md', base: './src/content/pages' }),
-  schema: z.object({
-    title: z.string(),
-    path: z
-      .string()
-      .regex(/^\/.*\/$/, 'path skal starte og slutte med /')
-      .optional(),
-    description: z.string().optional().default(''),
-    order: z.number().optional().default(0),
-    ...status,
-    // Google title and description (the <title> and meta description). Empty: built from the title.
-    seoTitle: z.string().optional(),
-    seoDescription: z.string().optional(),
-    // The picture shown when it is shared (og:image). Empty: the first picture in the text.
-    shareImage: z.string().optional(),
-    // The title and description when it is shared (og:title, og:description). Empty: the Google title and description.
-    shareTitle: z.string().optional(),
-    shareDescription: z.string().optional(),
-    // Words that link here from the other pages and posts (packages/editor/site/autolinks.mjs): the primary
-    // keyword, and more separated by commas.
-    keyword: z.string().optional(),
-    keywords: z.string().optional(),
-    // The address of the page Google should count as the original (rel=canonical). Empty: this one.
-    canonical: z.string().optional(),
-    // Not for search engines: noindex (Base.astro) and not in the sitemap (packages/editor/astro.mjs).
-    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),
-    // 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(),
-    updated: z.coerce.date().optional(),
-  }),
-});
-
-export const collections = { blog, pages };
+import { defineCollection, z } from 'astro:content';
+import { glob } from 'astro/loaders';
+
+// Kladde, Skjult or Planlagt (Udgivet when left out), and for Planlagt when, in Danish time
+// ("2026-11-01T08:00"): what each one is on the site is in packages/editor/lib/status.mjs.
+const status = {
+  status: z.enum(['draft', 'unlisted', 'scheduled']).optional(),
+  publishAt: z.string().optional(),
+};
+
+// Blog posts: one .md file per post in src/content/blog/.
+// The file name becomes the URL: mit-foerste-indlaeg.md -> /mit-foerste-indlaeg/
+const blog = defineCollection({
+  loader: glob({ pattern: '**/*.md', base: './src/content/blog' }),
+  schema: z.object({
+    title: z.string(),
+    date: z.coerce.date(),
+    // Last edit (when imported, the old site's); dateModified in the structured data.
+    updated: z.coerce.date().optional(),
+    description: z.string().optional().default(''),
+    categories: z.array(z.string()).optional().default([]),
+    image: z.string().optional(),
+    imageAlt: z.string().optional(),
+    // "Dekorativt billede": `image` is drawn with alt="" (screen readers skip it), whatever `imageAlt` says.
+    imageDecorative: z.boolean().optional(),
+    ...status,
+    // Google title and description (the <title> and meta description). Empty: built from the title.
+    seoTitle: z.string().optional(),
+    seoDescription: z.string().optional(),
+    // The picture shown when it is shared (og:image). Empty: `image`, else the first picture in the text.
+    shareImage: z.string().optional(),
+    // The title and description when it is shared (og:title, og:description). Empty: the Google title and description.
+    shareTitle: z.string().optional(),
+    shareDescription: z.string().optional(),
+    // Words that link here from the other pages and posts (packages/editor/site/autolinks.mjs): the primary
+    // keyword, and more separated by commas.
+    keyword: z.string().optional(),
+    keywords: z.string().optional(),
+    // The address of the page Google should count as the original (rel=canonical). Empty: this one.
+    canonical: z.string().optional(),
+    // Not for search engines: noindex (Base.astro) and not in the sitemap (packages/editor/astro.mjs).
+    noindex: z.boolean().optional().default(false),
+  }),
+});
+
+// Imported pages. `path` is the exact URL, e.g. /ydelser/raadgivning/
+// Pages created in the editor (/editor/) have no `path`: the file name is the URL (getPages()).
+const pages = defineCollection({
+  loader: glob({ pattern: '**/*.md', base: './src/content/pages' }),
+  schema: z.object({
+    title: z.string(),
+    path: z
+      .string()
+      .regex(/^\/.*\/$/, 'path skal starte og slutte med /')
+      .optional(),
+    description: z.string().optional().default(''),
+    order: z.number().optional().default(0),
+    ...status,
+    // Google title and description (the <title> and meta description). Empty: built from the title.
+    seoTitle: z.string().optional(),
+    seoDescription: z.string().optional(),
+    // The picture shown when it is shared (og:image). Empty: the first picture in the text.
+    shareImage: z.string().optional(),
+    // The title and description when it is shared (og:title, og:description). Empty: the Google title and description.
+    shareTitle: z.string().optional(),
+    shareDescription: z.string().optional(),
+    // Words that link here from the other pages and posts (packages/editor/site/autolinks.mjs): the primary
+    // keyword, and more separated by commas.
+    keyword: z.string().optional(),
+    keywords: z.string().optional(),
+    // The address of the page Google should count as the original (rel=canonical). Empty: this one.
+    canonical: z.string().optional(),
+    // Not for search engines: noindex (Base.astro) and not in the sitemap (packages/editor/astro.mjs).
+    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),
+    // 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(),
+    updated: z.coerce.date().optional(),
+  }),
+});
+
+export const collections = { blog, pages };

package/site/content.ts

@@ -1,104 +1,104 @@
-import { getCollection, type CollectionEntry } from 'astro:content';
-import { categories, isBlogCategory } from './categories';
-import { displayTitle } from './text';
-import { isPreview } from './noindex.mjs';
-import { stateOf } from '@morphemecms/cms/lib/status.mjs';
-import { pageH1 } from '@morphemecms/cms/src/sections.mjs';
-
-// From text.ts, which the editor uses too (it has no content collections).
-export { displayTitle, openingText } from './text';
-export { stateOf };
-
-export type Post = CollectionEntry<'blog'>;
-// Every page has a path: its own, or /<file name>/ for pages created in the editor.
-export type Page = CollectionEntry<'pages'> & { data: { path: string } };
-
-export const postPath = (post: Post) => `/${post.id}/`;
-
-// What a page or post is on this site (packages/editor/lib/status.mjs); in dev a draft is on it, as if published.
-const stateHere = (data: { status?: string; publishAt?: string }) => {
-  const state = stateOf(data);
-  return state === 'draft' && import.meta.env.DEV ? 'published' : state;
-};
-// Whether a page or post in that state is built: a published one, and with `unlisted` a hidden one.
-const shown = (state: ReturnType<typeof stateOf>, unlisted: boolean) => state === 'published' || (unlisted && state === 'unlisted');
-
-// The posts on the blog and in every list of posts; with `unlisted`, also those that only open on
-// their address (Skjult; the pages of the posts are made for those too). A draft is not on the site.
-export async function getPosts({ unlisted = false } = {}) {
-  return (await getCollection('blog', ({ data }) => shown(stateHere(data), unlisted))).sort(
-    (a, b) => b.data.date.valueOf() - a.data.date.valueOf(),
-  );
-}
-
-/** Which posts a "Blogindlæg" block or the front page's section shows (packages/editor/site/home.ts): those in
- * any of `categories` (all when empty), the newest `count`, or with `order` "random" all of them,
- * to show `count` of at random on the page (the theme's PostList.tsx); or with `show` "picked" those picked. */
-export async function postsFor(
-  { show = 'categories', categories = [], order = 'newest', picked = [] }: PostChoice,
-  count: number,
-): Promise<{ posts: Post[]; random: boolean }> {
-  const posts = await getPosts();
-  if (show === 'picked') return { posts: picked.map((id) => posts.find((p) => p.id === id)).filter((p) => p !== undefined), random: false };
-  const pool = posts.filter((p) => !categories.length || p.data.categories.some((c) => categories.includes(c)));
-  const random = order === 'random' && pool.length > count;
-  return { posts: random ? pool : pool.slice(0, count), random };
-}
-export type PostChoice = {
-  /** "all": all of them, which "Blogindlæg" lists itself (StandardSite.posts.list), not by this. */
-  show?: 'all' | 'categories' | 'picked';
-  categories?: string[];
-  /** How many, '3' to '6' (postCount in the standard block Blogindlæg's shared.ts). */
-  count?: string;
-  order?: 'newest' | 'random';
-  picked?: string[];
-  /** The category "Alle indlæg" goes to (allPostsCategory in packages/editor/site/home.ts). */
-  link?: string;
-};
-
-// The pages on the site, also the hidden ones (Skjult; with `unlisted: false` not those) and, like the
-// posts, the drafts on the editor's preview; with `previews: false`, not the new versions of pages under /ny/.
-export async function getPages({ previews = true, unlisted = true } = {}): Promise<Page[]> {
-  const pages = await getCollection('pages', ({ data }) => shown(stateHere(data), unlisted));
-  for (const page of pages) page.data.path ??= `/${page.id}/`;
-  return (previews ? pages : pages.filter((p) => !isPreview(p.data.path!))) as Page[];
-}
-
-const categoryNames = new Map(categories.map((c) => [c.slug, c.name]));
-export const categoryName = (slug: string) => categoryNames.get(slug) ?? slug.replace(/-/g, ' ').replace(/^./, (c) => c.toUpperCase());
-
-// The blog categories that actually have posts, most used first: the pills on the blog index and
-// the pages /blog/kategori/<slug>/.
-export async function getCategories() {
-  const posts = await getPosts();
-  const counts = new Map<string, number>();
-  for (const p of posts) for (const c of p.data.categories.filter(isBlogCategory)) counts.set(c, (counts.get(c) ?? 0) + 1);
-  return [...counts].sort((a, b) => b[1] - a[1]).map(([slug, count]) => ({ slug, name: categoryName(slug), count }));
-}
-
-export function parentPage(page: Page, all: Page[]) {
-  const folder = page.data.path.replace(/[^/]+\/$/, '');
-  if (folder === '/') return undefined;
-  return all.find((p) => p.data.path === folder);
-}
-
-// The H1 of a page: the heading at the top of its text ("# …", pageH1), else its title.
-export const pageHeading = (page: Page) => pageH1(page.body ?? '').heading ?? displayTitle(page.data.title);
-
-/** The H1 of a page as HTML, when a word in it has a colour (<span class="color-accent">, packages/editor/lib/text-colors.mjs),
- * for the layout to draw in its place; else undefined, and the layout draws pageHeading. */
-export const pageHeadingHtml = (page: Page): string | undefined => pageH1(page.body ?? '').html;
-
-/** A page's text as HTML without its H1 at the top, which the layout draws in its own place (above the picture). */
-export const withoutH1 = (html: string) => html.replace(/^\s*<h1\b[^>]*>[\s\S]*?<\/h1>\s*/, '');
-
-/** Anchor for a testimonial on the testimonials page, e.g. "marie-louise-eriksen". */
-export const testimonialId = (t: { name: string }) =>
-  t.name
-    .toLowerCase()
-    .replace(/æ/g, 'ae')
-    .replace(/ø/g, 'oe')
-    .replace(/å/g, 'aa')
-    .normalize('NFD')
-    .replace(/[^a-z0-9]+/g, '-')
-    .replace(/^-|-$/g, '');
+import { getCollection, type CollectionEntry } from 'astro:content';
+import { categories, isBlogCategory } from './categories';
+import { displayTitle } from './text';
+import { isPreview } from './noindex.mjs';
+import { stateOf } from '@morphemecms/cms/lib/status.mjs';
+import { pageH1 } from '@morphemecms/cms/src/sections.mjs';
+
+// From text.ts, which the editor uses too (it has no content collections).
+export { displayTitle, openingText } from './text';
+export { stateOf };
+
+export type Post = CollectionEntry<'blog'>;
+// Every page has a path: its own, or /<file name>/ for pages created in the editor.
+export type Page = CollectionEntry<'pages'> & { data: { path: string } };
+
+export const postPath = (post: Post) => `/${post.id}/`;
+
+// What a page or post is on this site (packages/editor/lib/status.mjs); in dev a draft is on it, as if published.
+const stateHere = (data: { status?: string; publishAt?: string }) => {
+  const state = stateOf(data);
+  return state === 'draft' && import.meta.env.DEV ? 'published' : state;
+};
+// Whether a page or post in that state is built: a published one, and with `unlisted` a hidden one.
+const shown = (state: ReturnType<typeof stateOf>, unlisted: boolean) => state === 'published' || (unlisted && state === 'unlisted');
+
+// The posts on the blog and in every list of posts; with `unlisted`, also those that only open on
+// their address (Skjult; the pages of the posts are made for those too). A draft is not on the site.
+export async function getPosts({ unlisted = false } = {}) {
+  return (await getCollection('blog', ({ data }) => shown(stateHere(data), unlisted))).sort(
+    (a, b) => b.data.date.valueOf() - a.data.date.valueOf(),
+  );
+}
+
+/** Which posts a "Blogindlæg" block or the front page's section shows (packages/editor/site/home.ts): those in
+ * any of `categories` (all when empty), the newest `count`, or with `order` "random" all of them,
+ * to show `count` of at random on the page (the theme's PostList.tsx); or with `show` "picked" those picked. */
+export async function postsFor(
+  { show = 'categories', categories = [], order = 'newest', picked = [] }: PostChoice,
+  count: number,
+): Promise<{ posts: Post[]; random: boolean }> {
+  const posts = await getPosts();
+  if (show === 'picked') return { posts: picked.map((id) => posts.find((p) => p.id === id)).filter((p) => p !== undefined), random: false };
+  const pool = posts.filter((p) => !categories.length || p.data.categories.some((c) => categories.includes(c)));
+  const random = order === 'random' && pool.length > count;
+  return { posts: random ? pool : pool.slice(0, count), random };
+}
+export type PostChoice = {
+  /** "all": all of them, which "Blogindlæg" lists itself (StandardSite.posts.list), not by this. */
+  show?: 'all' | 'categories' | 'picked';
+  categories?: string[];
+  /** How many, '3' to '6' (postCount in the standard block Blogindlæg's shared.ts). */
+  count?: string;
+  order?: 'newest' | 'random';
+  picked?: string[];
+  /** The category "Alle indlæg" goes to (allPostsCategory in packages/editor/site/home.ts). */
+  link?: string;
+};
+
+// The pages on the site, also the hidden ones (Skjult; with `unlisted: false` not those) and, like the
+// posts, the drafts on the editor's preview; with `previews: false`, not the new versions of pages under /ny/.
+export async function getPages({ previews = true, unlisted = true } = {}): Promise<Page[]> {
+  const pages = await getCollection('pages', ({ data }) => shown(stateHere(data), unlisted));
+  for (const page of pages) page.data.path ??= `/${page.id}/`;
+  return (previews ? pages : pages.filter((p) => !isPreview(p.data.path!))) as Page[];
+}
+
+const categoryNames = new Map(categories.map((c) => [c.slug, c.name]));
+export const categoryName = (slug: string) => categoryNames.get(slug) ?? slug.replace(/-/g, ' ').replace(/^./, (c) => c.toUpperCase());
+
+// The blog categories that actually have posts, most used first: the pills on the blog index and
+// the pages /blog/kategori/<slug>/.
+export async function getCategories() {
+  const posts = await getPosts();
+  const counts = new Map<string, number>();
+  for (const p of posts) for (const c of p.data.categories.filter(isBlogCategory)) counts.set(c, (counts.get(c) ?? 0) + 1);
+  return [...counts].sort((a, b) => b[1] - a[1]).map(([slug, count]) => ({ slug, name: categoryName(slug), count }));
+}
+
+export function parentPage(page: Page, all: Page[]) {
+  const folder = page.data.path.replace(/[^/]+\/$/, '');
+  if (folder === '/') return undefined;
+  return all.find((p) => p.data.path === folder);
+}
+
+// The H1 of a page: the heading at the top of its text ("# …", pageH1), else its title.
+export const pageHeading = (page: Page) => pageH1(page.body ?? '').heading ?? displayTitle(page.data.title);
+
+/** The H1 of a page as HTML, when a word in it has a colour (<span class="color-accent">, packages/editor/lib/text-colors.mjs),
+ * for the layout to draw in its place; else undefined, and the layout draws pageHeading. */
+export const pageHeadingHtml = (page: Page): string | undefined => pageH1(page.body ?? '').html;
+
+/** A page's text as HTML without its H1 at the top, which the layout draws in its own place (above the picture). */
+export const withoutH1 = (html: string) => html.replace(/^\s*<h1\b[^>]*>[\s\S]*?<\/h1>\s*/, '');
+
+/** Anchor for a testimonial on the testimonials page, e.g. "marie-louise-eriksen". */
+export const testimonialId = (t: { name: string }) =>
+  t.name
+    .toLowerCase()
+    .replace(/æ/g, 'ae')
+    .replace(/ø/g, 'oe')
+    .replace(/å/g, 'aa')
+    .normalize('NFD')
+    .replace(/[^a-z0-9]+/g, '-')
+    .replace(/^-|-$/g, '');

package/site/cookieList.ts

@@ -1,17 +1,17 @@
-// The site's cookie list: one JSON file per cookie in src/data/cookie-list/ (config.cookieList), edited in the editor
-// ("Lister" › "Cookies"), with those of the apps installed and those the app "Cookiescanner" finds (see
-// packages/editor/src/cookieList.ts). The standard block "Cookieliste" shows them (StandardSite.cookies).
-import { categoryOf } from '@morphemecms/cms/lib/cookieCategories.mjs';
-import type { CookieItem } from '@morphemecms/cms/src/standard/site';
-
-const files = import.meta.glob<Record<string, unknown>>('@data/cookie-list/*.json', { eager: true, import: 'default' });
-
-const text = (v: unknown) => (v == null ? '' : String(v));
-
-export const cookieList: CookieItem[] = Object.values(files).map((c) => ({
-  name: text(c.name),
-  provider: text(c.provider),
-  purpose: text(c.purpose) || undefined,
-  lasts: text(c.lasts) || undefined,
-  category: categoryOf(c),
-}));
+// The site's cookie list: one JSON file per cookie in src/data/cookie-list/ (config.cookieList), edited in the editor
+// ("Lister" › "Cookies"), with those of the apps installed and those the app "Cookiescanner" finds (see
+// packages/editor/src/cookieList.ts). The standard block "Cookieliste" shows them (StandardSite.cookies).
+import { categoryOf } from '@morphemecms/cms/lib/cookieCategories.mjs';
+import type { CookieItem } from '@morphemecms/cms/src/standard/site';
+
+const files = import.meta.glob<Record<string, unknown>>('@data/cookie-list/*.json', { eager: true, import: 'default' });
+
+const text = (v: unknown) => (v == null ? '' : String(v));
+
+export const cookieList: CookieItem[] = Object.values(files).map((c) => ({
+  name: text(c.name),
+  provider: text(c.provider),
+  purpose: text(c.purpose) || undefined,
+  lasts: text(c.lasts) || undefined,
+  category: categoryOf(c),
+}));

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, the file of its redirects from old addresses, and its app store.
+ * otherwise, and the file of its redirects from old addresses.
  */
 export type SiteChoices = {
     /**
@@ -85,24 +85,12 @@ export type SiteChoices = {
     /**
      * The site's other redirects: rules ("<from> <to> 301", one to a
      * line) and the Worker's map (`{ ids, paths }`, worker/index.js), shown and changed with the editor's own under
-     * Videresendelser (src/redirects.ts).
+     * Videresendelser (src/redirectData.ts).
      */
     siteRedirects: {
         rules: string;
         map: string;
     };
-    /**
-     * The app store ("Apps" ›
-     * "Appstore", src/store.ts): the GitHub repository and branch of its catalog (`catalog`, the apps and themes that can
-     * be installed, each with where its folder is in the repository, at which commit), or none: then "Appstore" has only
-     * the site's own.
-     */
-    store: {
-        owner: string;
-        name: string;
-        branch: string;
-        catalog: string;
-    } | null;
 };
 export type SiteConfig = SiteOwn & SiteChoices & typeof STANDARD;
 declare namespace STANDARD {