@morphemecms/cms 0.1.0 → 0.2.0-next-20261104150211

package/src/standard/pricecards/index.tsx

@@ -1,57 +1,57 @@
-// "Priskort", a standard block: a heading and one to four price cards side by side where there is room, each with a
-// name, a price and what it is for (`unit`, after it), a short text, what is included (each line with a check, as
-// "Tjekliste") and a button at the bottom (as one of "Knapper", buttons/fields.ts); one can be highlighted, with a small
-// label over its name. The prices are written here (a site's own price list is an app's block). How it looks
-// is the theme's (packages/editor/theme/blocks/pricecards/View.tsx); what it shows: view.ts, and load.ts on the site.
-import { CurrencyCircleDollar } from '@phosphor-icons/react';
-import { defineBlock } from '../../blocks';
-import { siteT, t } from '../../i18n';
-import { headFields } from '../head';
-import { buttonList } from '../buttons/fields';
-import type { PriceCardProps } from './view';
-
-const texts = t.blocks.pricecards;
-
-export default defineBlock({
-  label: texts.label,
-  icon: CurrencyCircleDollar,
-  hint: texts.hint,
-  fields: [
-    ...headFields,
-    {
-      name: 'items',
-      label: texts.items,
-      singular: texts.item,
-      type: 'list',
-      summary: 'name',
-      required: true,
-      maxItems: 4,
-      fields: [
-        { name: 'name', label: texts.name, type: 'string', required: true, max: 40 },
-        { name: 'price', label: texts.price, type: 'string', required: true, max: 20 },
-        { name: 'unit', label: texts.unit, type: 'string', max: 30, hint: texts.unitHint },
-        { name: 'text', label: texts.text, type: 'text' },
-        {
-          name: 'features',
-          label: texts.features,
-          singular: texts.feature,
-          type: 'list',
-          field: { name: 'feature', label: texts.text, type: 'string', required: true },
-        },
-        // One button, as a "Knapper" block's; without one, none (not the shared buttons).
-        { ...buttonList, name: 'buttons', label: texts.button, singular: texts.buttonItem, maxItems: 1 },
-        { name: 'featured', label: texts.featured, type: 'boolean', toggle: texts.featuredToggle },
-        { name: 'badge', label: texts.badge, type: 'string', max: 20, hint: texts.badgeHint, only: { field: 'featured', is: ['true'] } },
-      ],
-    },
-  ],
-  // In the site's language, like the drawing: the middle one highlighted, its button filled and the others' outlined.
-  example: {
-    items: siteT.blocks.pricecards.example.map(({ button, badge, ...card }) => ({
-      ...card,
-      ...(badge ? { featured: true, badge } : {}),
-      buttons: [{ to: 'page', href: '/', label: button, kind: badge ? 'filled' : 'outlined' }],
-    })),
-  },
-  detail: (p) => [((p.items ?? []) as PriceCardProps[]).map((c) => [c.name, c.price].filter(Boolean).join(' ')).join(' · ')],
-});
+// "Priskort", a standard block: a heading and one to four price cards side by side where there is room, each with a
+// name, a price and what it is for (`unit`, after it), a short text, what is included (each line with a check, as
+// "Tjekliste") and a button at the bottom (as one of "Knapper", buttons/fields.ts); one can be highlighted, with a small
+// label over its name. The prices are written here (a site's own price list is an app's block). How it looks
+// is the theme's (packages/editor/theme/blocks/pricecards/View.tsx); what it shows: view.ts, and load.ts on the site.
+import { CurrencyCircleDollar } from '@phosphor-icons/react';
+import { defineBlock } from '../../blocks';
+import { siteT, t } from '../../i18n';
+import { headFields } from '../head';
+import { buttonList } from '../buttons/fields';
+import type { PriceCardProps } from './view';
+
+const texts = t.blocks.pricecards;
+
+export default defineBlock({
+  label: texts.label,
+  icon: CurrencyCircleDollar,
+  hint: texts.hint,
+  fields: [
+    ...headFields,
+    {
+      name: 'items',
+      label: texts.items,
+      singular: texts.item,
+      type: 'list',
+      summary: 'name',
+      required: true,
+      maxItems: 4,
+      fields: [
+        { name: 'name', label: texts.name, type: 'string', required: true, max: 40 },
+        { name: 'price', label: texts.price, type: 'string', required: true, max: 20 },
+        { name: 'unit', label: texts.unit, type: 'string', max: 30, hint: texts.unitHint },
+        { name: 'text', label: texts.text, type: 'text' },
+        {
+          name: 'features',
+          label: texts.features,
+          singular: texts.feature,
+          type: 'list',
+          field: { name: 'feature', label: texts.text, type: 'string', required: true },
+        },
+        // One button, as a "Knapper" block's; without one, none (not the shared buttons).
+        { ...buttonList, name: 'buttons', label: texts.button, singular: texts.buttonItem, maxItems: 1 },
+        { name: 'featured', label: texts.featured, type: 'boolean', toggle: texts.featuredToggle },
+        { name: 'badge', label: texts.badge, type: 'string', max: 20, hint: texts.badgeHint, only: { field: 'featured', is: ['true'] } },
+      ],
+    },
+  ],
+  // In the site's language, like the drawing: the middle one highlighted, its button filled and the others' outlined.
+  example: {
+    items: siteT.blocks.pricecards.example.map(({ button, badge, ...card }) => ({
+      ...card,
+      ...(badge ? { featured: true, badge } : {}),
+      buttons: [{ to: 'page', href: '/', label: button, kind: badge ? 'filled' : 'outlined' }],
+    })),
+  },
+  detail: (p) => [((p.items ?? []) as PriceCardProps[]).map((c) => [c.name, c.price].filter(Boolean).join(' ')).join(' · ')],
+});

package/src/standard/pricecards/load.ts

@@ -1,11 +1,11 @@
-// "Priskort" on the site (view.ts): each card's button as a "Knapper" block's (loadButtons, which knows the site's pages
-// and targets), and none without one.
-import { loadButtons } from '../buttons/load';
-import { headOf } from '../head';
-import type { Load } from '../view';
-import { priceCardOf, type PriceCardProps, type PriceCardsView } from './view';
-
-export const load: Load<PriceCardsView> = async (props) => ({
-  ...headOf(props),
-  items: await Promise.all(((props.items ?? []) as PriceCardProps[]).map(async (c) => priceCardOf(c, await loadButtons(c.buttons, [])))),
-});
+// "Priskort" on the site (view.ts): each card's button as a "Knapper" block's (loadButtons, which knows the site's pages
+// and targets), and none without one.
+import { loadButtons } from '../buttons/load';
+import { headOf } from '../head';
+import type { Load } from '../view';
+import { priceCardOf, type PriceCardProps, type PriceCardsView } from './view';
+
+export const load: Load<PriceCardsView> = async (props) => ({
+  ...headOf(props),
+  items: await Promise.all(((props.items ?? []) as PriceCardProps[]).map(async (c) => priceCardOf(c, await loadButtons(c.buttons, [])))),
+});

package/src/standard/pricecards/view.ts

@@ -1,50 +1,50 @@
-// What "Priskort" shows (its view, drawn by the theme's View.tsx): its heading, and each card's name, price, what the
-// price is for (`unit`), text, what is included, button, and whether it is highlighted, with its label. In the editor:
-// viewOf, with the buttons as the editor has them (buttonsOf); on the site: load.ts (loadButtons). A card without a
-// button has none, not the shared buttons of "Knapper".
-import type { Button } from '../buttons/fields';
-import { buttonsOf, type ButtonView } from '../buttons/view';
-import { headOf, type HeadView } from '../head';
-import type { ViewOf } from '../view';
-
-/** A card as its fields write it. */
-export type PriceCardProps = {
-  name?: string;
-  price?: string;
-  unit?: string;
-  text?: string;
-  features?: string[];
-  buttons?: Button[];
-  featured?: boolean;
-  badge?: string;
-};
-
-/** A card as it is drawn: its label only when it is highlighted. */
-export type PriceCard = {
-  name: string;
-  price: string;
-  unit?: string;
-  text?: string;
-  features: string[];
-  buttons: ButtonView[];
-  featured: boolean;
-  badge?: string;
-};
-export type PriceCardsView = HeadView & { items: PriceCard[] };
-
-/** A card with its buttons, as the editor or the site makes them. */
-export const priceCardOf = (c: PriceCardProps, buttons: ButtonView[]): PriceCard => ({
-  name: c.name ?? '',
-  price: c.price ?? '',
-  unit: c.unit?.trim() || undefined,
-  text: c.text?.trim() || undefined,
-  features: (c.features ?? []).filter(Boolean),
-  buttons,
-  featured: c.featured === true,
-  badge: (c.featured === true && c.badge?.trim()) || undefined,
-});
-
-export const viewOf: ViewOf<PriceCardsView> = (props, data) => ({
-  ...headOf(props),
-  items: ((props.items ?? []) as PriceCardProps[]).map((c) => priceCardOf(c, c.buttons?.length ? buttonsOf(c.buttons, data) : [])),
-});
+// What "Priskort" shows (its view, drawn by the theme's View.tsx): its heading, and each card's name, price, what the
+// price is for (`unit`), text, what is included, button, and whether it is highlighted, with its label. In the editor:
+// viewOf, with the buttons as the editor has them (buttonsOf); on the site: load.ts (loadButtons). A card without a
+// button has none, not the shared buttons of "Knapper".
+import type { Button } from '../buttons/fields';
+import { buttonsOf, type ButtonView } from '../buttons/view';
+import { headOf, type HeadView } from '../head';
+import type { ViewOf } from '../view';
+
+/** A card as its fields write it. */
+export type PriceCardProps = {
+  name?: string;
+  price?: string;
+  unit?: string;
+  text?: string;
+  features?: string[];
+  buttons?: Button[];
+  featured?: boolean;
+  badge?: string;
+};
+
+/** A card as it is drawn: its label only when it is highlighted. */
+export type PriceCard = {
+  name: string;
+  price: string;
+  unit?: string;
+  text?: string;
+  features: string[];
+  buttons: ButtonView[];
+  featured: boolean;
+  badge?: string;
+};
+export type PriceCardsView = HeadView & { items: PriceCard[] };
+
+/** A card with its buttons, as the editor or the site makes them. */
+export const priceCardOf = (c: PriceCardProps, buttons: ButtonView[]): PriceCard => ({
+  name: c.name ?? '',
+  price: c.price ?? '',
+  unit: c.unit?.trim() || undefined,
+  text: c.text?.trim() || undefined,
+  features: (c.features ?? []).filter(Boolean),
+  buttons,
+  featured: c.featured === true,
+  badge: (c.featured === true && c.badge?.trim()) || undefined,
+});
+
+export const viewOf: ViewOf<PriceCardsView> = (props, data) => ({
+  ...headOf(props),
+  items: ((props.items ?? []) as PriceCardProps[]).map((c) => priceCardOf(c, c.buttons?.length ? buttonsOf(c.buttons, data) : [])),
+});

package/src/standard/sharedTexts.ts

@@ -1,6 +1,6 @@
-// The shared texts of the standard blocks that have them (shared.ts in the block's folder, see
-// ../shared.ts), by the path of the file like a site's own (src/apps/<app>/blocks/<type>/shared.ts): the site puts
-// them before its own (packages/editor/site/site.ts), so a block of its own by the same name has its own instead.
-import type { SharedTexts } from '../shared';
-
-export const standardShared = import.meta.glob<SharedTexts>('./*/shared.ts', { eager: true, import: 'default' });
+// The shared texts of the standard blocks that have them (shared.ts in the block's folder, see
+// ../shared.ts), by the path of the file like a site's own (src/apps/<app>/blocks/<type>/shared.ts): the site puts
+// them before its own (packages/editor/site/site.ts), so a block of its own by the same name has its own instead.
+import type { SharedTexts } from '../shared';
+
+export const standardShared = import.meta.glob<SharedTexts>('./*/shared.ts', { eager: true, import: 'default' });

package/src/standard/site.ts

@@ -1,124 +1,124 @@
-// What the standard blocks take from a site, where they need more than their own fields and shared
-// texts. On the site: the site's `@site/standard` (packages/editor/defaults/standard.ts, StandardSite); only the blocks'
-// load.ts (and the site's own pages that draw the same parts) import it, never the editor, so it
-// may read the site's content (astro:content) and use its components. In the editor: the site's data
-// (BlockData.site, from the site's siteOf), which has StandardSiteData too. And in the site's config
-// (@site/config): where the buttons can go (`buttonTargets`).
-import type { CookieCategory } from '../../lib/cookieCategories.mjs';
-
-/** Where a button of "Knapper" can go besides a page, as the site's config names it (its label in the
- * site's language, e.g. "Book en tid"), and what to know about it in the hint of a button's text. `pick`: it
- * opens something picked among those shown on the page (a relation with Option.on, e.g. "Åbn promovering"), in a
- * field named `pickLabel` (the button's `open`). */
-export type ButtonTargetName = { value: string; label: string; note?: string; pick?: string; pickLabel?: string };
-
-/** A button's text for where it goes, when it has none of its own (e.g. "Ring"), and what comes after
- * every text (e.g. the phone number). `open`: what the button opens on the page instead of going to its address
- * (its `data-open`, which a promotion on the page answers: "booking" the booking sheet, "promotion:<file name>" a
- * pop-up); without one there, the address is an ordinary link. */
-export type ButtonText = { text: string; after?: string; open?: string };
-
-/** Which posts a "Blogindlæg" block shows (its fields): those with any of `categories` (all when empty), with `show`
- * "all" all of them, else the newest `count` ('3' to '6') or with `order` "random" picked anew on each visit, or with
- * `show` "picked" those picked; and the tag "Alle indlæg" goes to (`link`). */
-export type PostChoice = {
-  show?: string;
-  categories?: string[];
-  count?: string;
-  order?: string;
-  picked?: string[];
-  link?: string;
-};
-
-/** A blog post as "Blogindlæg" shows it: its address, title, description, picture (its file), date (ISO)
- * and reading time in minutes. */
-export type ListedPost = {
-  href: string;
-  title: string;
-  description?: string;
-  image?: string;
-  imageAlt?: string;
-  date: string;
-  minutes: number;
-};
-
-/** What the editor's drawings of the standard blocks take from the site's data (BlockData.site). */
-export type StandardSiteData = {
-  pages: { path: string; title: string }[];
-  /** The posts on the blog, newest first, by file name, with what "Blogindlæg" shows of them (reading time in minutes). */
-  posts: {
-    slug: string;
-    title: string;
-    image?: string;
-    imageAlt?: string;
-    description?: string;
-    date: Date;
-    minutes: number;
-    categories: string[];
-  }[];
-  /** The tags that are not on the blog (no page of their own): "Alle indlæg" does not go to them. */
-  tagsOffBlog: string[];
-  /** The texts of the buttons that go elsewhere than a page, by `buttonTargets` value. */
-  buttons: Record<string, ButtonText>;
-  /** The cookie list ("Cookies", standard/cookies/list.ts), as the files are now. */
-  cookies: CookieItem[];
-};
-
-/** A cookie in the site's cookie list (cookieList.ts): its name (`*` for the rest of it), who sets it, what for, how
- * long it lasts and its category (necessary, or one the visitor says yes to in the cookie banner,
- * lib/cookieCategories.mjs). */
-export type CookieItem = { name: string; provider: string; purpose?: string; lasts?: string; category: CookieCategory };
-
-/** A testimonial as the site has it (its file name, its picture, the quote's paragraphs, its tags). */
-export type TestimonialItem = {
-  slug: string;
-  name: string;
-  /** Its picture (optional), by the name. */
-  image?: string;
-  context?: string;
-  quote: string[];
-  categories: string[];
-  frontPage: boolean;
-};
-
-export type StandardSite = {
-  /** The blocks' shared texts (shared.ts, with those saved over them), by type: for a block that shows another's
-   * (Banner: the shared buttons, "Læs mere"). */
-  texts: Record<string, Record<string, any>>;
-  /** The opening of a page's text, by its address (Accordion: a row without a text of its own);
-   * undefined when there is no such page. `preview`: the page is a new version (/ny/), so the opening
-   * of the new version of the page, when there is one. */
-  pageOpening(href: string, preview?: boolean): Promise<string | undefined>;
-  /** A page's name on a button without a text of its own, by its address. */
-  pageName(href: string): Promise<string>;
-  /** A page's title, its name in a list of pages ("Links"), by its address; undefined when there is no such page. */
-  pageTitle(href: string): Promise<string | undefined>;
-  /** The buttons that go elsewhere than a page, by `buttonTargets` value: their address and text. */
-  buttons: Record<string, ButtonText & { href: string }>;
-  /** A button of a target that picks something (ButtonTargetName.pick): what it opens, by what is picked (a
-   * promotion's file name), with its address without JavaScript and its text; undefined when there is no such. */
-  picked(target: string, value: string): (ButtonText & { href: string }) | undefined;
-  /** The cookie list ("Cookies"), for "Cookieliste". */
-  cookies: CookieItem[];
-  testimonials: {
-    /** All of them, in their order. */
-    list: TestimonialItem[];
-    /** The page with all of them in full, and the anchor of one there (a short one links to it). */
-    page: string;
-    anchor(t: TestimonialItem): string;
-    /** A tag's name, and its page when it has one. */
-    tag(slug: string): Promise<{ name: string; href?: string }>;
-  };
-  posts: {
-    /** The posts a choice shows, and whether they are picked at random on the page (then all it picks
-     * from are there, and the page shows `count` of them). */
-    choose(choice: PostChoice, count: number): Promise<{ posts: ListedPost[]; random: boolean }>;
-    /** The posts on the blog with any of `categories` (all when empty), newest first. */
-    list(categories: string[]): Promise<ListedPost[]>;
-    /** Where its "Alle indlæg" goes: a tag's page, with the tag's name, or the blog. */
-    all(choice: PostChoice): { href: string; tag?: string };
-    /** A picture's sizes, for the browser to pick the one that fits (srcset, width and height). Also
-     * the pictures on "Kort" (LinkCards.tsx). */
-    image(src: string): { srcset?: string; width?: number; height?: number };
-  };
-};
+// What the standard blocks take from a site, where they need more than their own fields and shared
+// texts. On the site: the site's `@site/standard` (packages/editor/defaults/standard.ts, StandardSite); only the blocks'
+// load.ts (and the site's own pages that draw the same parts) import it, never the editor, so it
+// may read the site's content (astro:content) and use its components. In the editor: the site's data
+// (BlockData.site, from the site's siteOf), which has StandardSiteData too. And in the site's config
+// (@site/config): where the buttons can go (`buttonTargets`).
+import type { CookieCategory } from '../../lib/cookieCategories.mjs';
+
+/** Where a button of "Knapper" can go besides a page, as the site's config names it (its label in the
+ * site's language, e.g. "Book en tid"), and what to know about it in the hint of a button's text. `pick`: it
+ * opens something picked among those shown on the page (a relation with Option.on, e.g. "Åbn promovering"), in a
+ * field named `pickLabel` (the button's `open`). */
+export type ButtonTargetName = { value: string; label: string; note?: string; pick?: string; pickLabel?: string };
+
+/** A button's text for where it goes, when it has none of its own (e.g. "Ring"), and what comes after
+ * every text (e.g. the phone number). `open`: what the button opens on the page instead of going to its address
+ * (its `data-open`, which a promotion on the page answers: "booking" the booking sheet, "promotion:<file name>" a
+ * pop-up); without one there, the address is an ordinary link. */
+export type ButtonText = { text: string; after?: string; open?: string };
+
+/** Which posts a "Blogindlæg" block shows (its fields): those with any of `categories` (all when empty), with `show`
+ * "all" all of them, else the newest `count` ('3' to '6') or with `order` "random" picked anew on each visit, or with
+ * `show` "picked" those picked; and the tag "Alle indlæg" goes to (`link`). */
+export type PostChoice = {
+  show?: string;
+  categories?: string[];
+  count?: string;
+  order?: string;
+  picked?: string[];
+  link?: string;
+};
+
+/** A blog post as "Blogindlæg" shows it: its address, title, description, picture (its file), date (ISO)
+ * and reading time in minutes. */
+export type ListedPost = {
+  href: string;
+  title: string;
+  description?: string;
+  image?: string;
+  imageAlt?: string;
+  date: string;
+  minutes: number;
+};
+
+/** What the editor's drawings of the standard blocks take from the site's data (BlockData.site). */
+export type StandardSiteData = {
+  pages: { path: string; title: string }[];
+  /** The posts on the blog, newest first, by file name, with what "Blogindlæg" shows of them (reading time in minutes). */
+  posts: {
+    slug: string;
+    title: string;
+    image?: string;
+    imageAlt?: string;
+    description?: string;
+    date: Date;
+    minutes: number;
+    categories: string[];
+  }[];
+  /** The tags that are not on the blog (no page of their own): "Alle indlæg" does not go to them. */
+  tagsOffBlog: string[];
+  /** The texts of the buttons that go elsewhere than a page, by `buttonTargets` value. */
+  buttons: Record<string, ButtonText>;
+  /** The cookie list ("Cookies", standard/cookies/list.ts), as the files are now. */
+  cookies: CookieItem[];
+};
+
+/** A cookie in the site's cookie list (cookieList.ts): its name (`*` for the rest of it), who sets it, what for, how
+ * long it lasts and its category (necessary, or one the visitor says yes to in the cookie banner,
+ * lib/cookieCategories.mjs). */
+export type CookieItem = { name: string; provider: string; purpose?: string; lasts?: string; category: CookieCategory };
+
+/** A testimonial as the site has it (its file name, its picture, the quote's paragraphs, its tags). */
+export type TestimonialItem = {
+  slug: string;
+  name: string;
+  /** Its picture (optional), by the name. */
+  image?: string;
+  context?: string;
+  quote: string[];
+  categories: string[];
+  frontPage: boolean;
+};
+
+export type StandardSite = {
+  /** The blocks' shared texts (shared.ts, with those saved over them), by type: for a block that shows another's
+   * (Banner: the shared buttons, "Læs mere"). */
+  texts: Record<string, Record<string, any>>;
+  /** The opening of a page's text, by its address (Accordion: a row without a text of its own);
+   * undefined when there is no such page. `preview`: the page is a new version (/ny/), so the opening
+   * of the new version of the page, when there is one. */
+  pageOpening(href: string, preview?: boolean): Promise<string | undefined>;
+  /** A page's name on a button without a text of its own, by its address. */
+  pageName(href: string): Promise<string>;
+  /** A page's title, its name in a list of pages ("Links"), by its address; undefined when there is no such page. */
+  pageTitle(href: string): Promise<string | undefined>;
+  /** The buttons that go elsewhere than a page, by `buttonTargets` value: their address and text. */
+  buttons: Record<string, ButtonText & { href: string }>;
+  /** A button of a target that picks something (ButtonTargetName.pick): what it opens, by what is picked (a
+   * promotion's file name), with its address without JavaScript and its text; undefined when there is no such. */
+  picked(target: string, value: string): (ButtonText & { href: string }) | undefined;
+  /** The cookie list ("Cookies"), for "Cookieliste". */
+  cookies: CookieItem[];
+  testimonials: {
+    /** All of them, in their order. */
+    list: TestimonialItem[];
+    /** The page with all of them in full, and the anchor of one there (a short one links to it). */
+    page: string;
+    anchor(t: TestimonialItem): string;
+    /** A tag's name, and its page when it has one. */
+    tag(slug: string): Promise<{ name: string; href?: string }>;
+  };
+  posts: {
+    /** The posts a choice shows, and whether they are picked at random on the page (then all it picks
+     * from are there, and the page shows `count` of them). */
+    choose(choice: PostChoice, count: number): Promise<{ posts: ListedPost[]; random: boolean }>;
+    /** The posts on the blog with any of `categories` (all when empty), newest first. */
+    list(categories: string[]): Promise<ListedPost[]>;
+    /** Where its "Alle indlæg" goes: a tag's page, with the tag's name, or the blog. */
+    all(choice: PostChoice): { href: string; tag?: string };
+    /** A picture's sizes, for the browser to pick the one that fits (srcset, width and height). Also
+     * the pictures on "Kort" (LinkCards.tsx). */
+    image(src: string): { srcset?: string; width?: number; height?: number };
+  };
+};

package/src/standard/siteLooks.ts

@@ -1,19 +1,19 @@
-// How the blocks look on the site, for the site's build (blockViews and blockLoads in
-// packages/editor/src/standard/views.ts): the standard blocks' drawing (View.tsx) in the theme in use
-// (src/themes/<theme>/blocks/<type>/, @theme), else in the standard theme (packages/editor/theme/blocks/), and the apps'
-// blocks' (src/apps/<app>/blocks/<type>/: View.tsx and load.ts). Apart from apps.ts, which the editor loads too.
-import type { Contract, View } from './view';
-
-type Views = Record<string, { default: View<any> }>;
-
-/** The standard blocks' drawings in the standard theme, and in the theme in use (the same, when it is the standard). */
-export const themeViews = {
-  standard: import.meta.glob<{ default: View<any> }>('@saturn/blocks/*/View.tsx', { eager: true }) as Views,
-  own: import.meta.glob<{ default: View<any> }>('@theme/blocks/*/View.tsx', { eager: true }) as Views,
-};
-
-/** The apps' blocks: their drawing (View.tsx) and their view on the site (load.ts). */
-export const appLooks = {
-  views: import.meta.glob<{ default: View<any> }>('/src/apps/*/blocks/*/View.tsx', { eager: true }) as Views,
-  loads: import.meta.glob<Contract<any>>('/src/apps/*/blocks/*/load.ts', { eager: true }),
-};
+// How the blocks look on the site, for the site's build (blockViews and blockLoads in
+// packages/editor/src/standard/views.ts): the standard blocks' drawing (View.tsx) in the theme in use
+// (src/themes/<theme>/blocks/<type>/, @theme), else in the standard theme (packages/editor/theme/blocks/), and the apps'
+// blocks' (src/apps/<app>/blocks/<type>/: View.tsx and load.ts). Apart from apps.ts, which the editor loads too.
+import type { Contract, View } from './view';
+
+type Views = Record<string, { default: View<any> }>;
+
+/** The standard blocks' drawings in the standard theme, and in the theme in use (the same, when it is the standard). */
+export const themeViews = {
+  standard: import.meta.glob<{ default: View<any> }>('@saturn/blocks/*/View.tsx', { eager: true }) as Views,
+  own: import.meta.glob<{ default: View<any> }>('@theme/blocks/*/View.tsx', { eager: true }) as Views,
+};
+
+/** The apps' blocks: their drawing (View.tsx) and their view on the site (load.ts). */
+export const appLooks = {
+  views: import.meta.glob<{ default: View<any> }>('/src/apps/*/blocks/*/View.tsx', { eager: true }) as Views,
+  loads: import.meta.glob<Contract<any>>('/src/apps/*/blocks/*/load.ts', { eager: true }),
+};

package/src/standard/sites.ts

@@ -1,13 +1,13 @@
-// How the blocks look on the site, by their folder's name: each drawn from its view by BlockSite.astro (the view its
-// contract's load.ts makes, drawn by its View.tsx: views.ts). The theme's RichText.astro shows them in the text of a
-// page, and Block.astro one by its type anywhere else, each with its type.
-import type { AstroComponentFactory } from 'astro/runtime/server/index.js';
-import { blockViews } from './views';
-
-// BlockSite.astro, found by Vite: TypeScript does not read an .astro file.
-const [{ default: BlockSite }] = Object.values(import.meta.glob<{ default: AstroComponentFactory }>('./BlockSite.astro', { eager: true }));
-
-/** Every block on the site, by its type. */
-export const blockSites: Record<string, AstroComponentFactory> = Object.fromEntries(
-  Object.keys(blockViews).map((type) => [type, BlockSite]),
-);
+// How the blocks look on the site, by their folder's name: each drawn from its view by BlockSite.astro (the view its
+// contract's load.ts makes, drawn by its View.tsx: views.ts). The theme's RichText.astro shows them in the text of a
+// page, and Block.astro one by its type anywhere else, each with its type.
+import type { AstroComponentFactory } from 'astro/runtime/server/index.js';
+import { blockViews } from './views';
+
+// BlockSite.astro, found by Vite: TypeScript does not read an .astro file.
+const [{ default: BlockSite }] = Object.values(import.meta.glob<{ default: AstroComponentFactory }>('./BlockSite.astro', { eager: true }));
+
+/** Every block on the site, by its type. */
+export const blockSites: Record<string, AstroComponentFactory> = Object.fromEntries(
+  Object.keys(blockViews).map((type) => [type, BlockSite]),
+);

package/src/standard/steps/index.tsx

@@ -1,28 +1,28 @@
-// "Trin", a standard block: numbered steps with a heading and a text along a line. How it looks is the theme's
-// (packages/editor/theme/blocks/steps/View.tsx; what it shows: view.ts, and load.ts on the site).
-import { ListNumbers } from '@phosphor-icons/react';
-import { defineBlock } from '../../blocks';
-import { t } from '../../i18n';
-import { headFields } from '../head';
-
-export default defineBlock({
-  label: t.blocks.steps.label,
-  icon: ListNumbers,
-  hint: t.blocks.steps.hint,
-  fields: [
-    ...headFields,
-    {
-      name: 'items',
-      label: t.blocks.steps.items,
-      singular: t.blocks.steps.item,
-      type: 'list',
-      summary: 'title',
-      required: true,
-      fields: [
-        { name: 'title', label: t.blocks.steps.title, type: 'string', required: true },
-        { name: 'text', label: t.blocks.steps.text, type: 'text', required: true },
-      ],
-    },
-  ],
-  detail: (p) => [((p.items ?? []) as { title?: string }[]).map((s, i) => `${i + 1}. ${s.title ?? ''}`).join(' · ')],
-});
+// "Trin", a standard block: numbered steps with a heading and a text along a line. How it looks is the theme's
+// (packages/editor/theme/blocks/steps/View.tsx; what it shows: view.ts, and load.ts on the site).
+import { ListNumbers } from '@phosphor-icons/react';
+import { defineBlock } from '../../blocks';
+import { t } from '../../i18n';
+import { headFields } from '../head';
+
+export default defineBlock({
+  label: t.blocks.steps.label,
+  icon: ListNumbers,
+  hint: t.blocks.steps.hint,
+  fields: [
+    ...headFields,
+    {
+      name: 'items',
+      label: t.blocks.steps.items,
+      singular: t.blocks.steps.item,
+      type: 'list',
+      summary: 'title',
+      required: true,
+      fields: [
+        { name: 'title', label: t.blocks.steps.title, type: 'string', required: true },
+        { name: 'text', label: t.blocks.steps.text, type: 'text', required: true },
+      ],
+    },
+  ],
+  detail: (p) => [((p.items ?? []) as { title?: string }[]).map((s, i) => `${i + 1}. ${s.title ?? ''}`).join(' · ')],
+});