@jxsuite/feed 0.4.1 → 0.4.3

package/dist/feed.js

@@ -1,3 +1,30 @@
+// ../../packages/schema/src/guards.ts
+function isString(value) {
+  return typeof value === "string";
+}
+function isNonNullObject(value) {
+  return typeof value === "object" && value !== null;
+}
+function isJsonObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+var SCHEMA_KEYWORDS = new Set([
+  "type",
+  "enum",
+  "minimum",
+  "maximum",
+  "minLength",
+  "maxLength",
+  "pattern",
+  "format",
+  "items",
+  "properties",
+  "required",
+  "description",
+  "title",
+  "$comment"
+]);
+
 // ../../packages/schema/src/locale.ts
 var RTL_SCRIPTS = new Set([
   "Adlm",
@@ -41,7 +68,7 @@ var RTL_SCRIPTS = new Set([
   "Yezi"
 ]);
 function canonicalizeLocale(tag) {
-  if (typeof tag !== "string" || tag.trim() === "") {
+  if (!isString(tag) || tag.trim() === "") {
     return null;
   }
   try {
@@ -54,7 +81,7 @@ var DEFAULT_ROUTING = "prefix-except-default";
 function resolveI18n(projectConfig) {
   const raw = projectConfig.i18n;
   const errors = [];
-  if (!raw || typeof raw !== "object") {
+  if (!isNonNullObject(raw)) {
     return { errors, i18n: null };
   }
   const declared = Array.isArray(raw.locales) ? raw.locales : [];
@@ -111,11 +138,11 @@ var DEFAULTS = {
 };
 function normalizeFeedConfig(section, siteLanguage) {
   const out = {};
-  if (!section || typeof section !== "object") {
+  if (!section || !isNonNullObject(section)) {
     return out;
   }
   for (const [key, raw] of Object.entries(section)) {
-    if (!raw || typeof raw !== "object") {
+    if (!raw || !isNonNullObject(raw)) {
       continue;
     }
     const cfg = raw;
@@ -146,7 +173,7 @@ function entryUrl(siteUrl, basePath, id, trailingSlash) {
   return new URL(path, siteUrl).href;
 }
 function readDate(value) {
-  if (typeof value !== "string" || value === "") {
+  if (!isString(value) || value === "") {
     return null;
   }
   if (/^\d{4}-\d{2}-\d{2}$/.test(value)) {
@@ -155,18 +182,19 @@ function readDate(value) {
   return /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d+)?([Zz]|[+-]\d{2}:\d{2})$/.test(value) ? value : null;
 }
 function entryToItem(entry, feed, siteUrl, trailingSlash) {
-  const data = entry.data ?? {};
-  const meta = entry._meta ?? {};
-  const url = typeof meta.url === "string" && meta.url.startsWith("/") ? new URL(meta.url, siteUrl).href : entryUrl(siteUrl, feed.basePath, entry.id, trailingSlash);
-  const published = readDate(data[feed.dateField]) ?? readDate(meta.mtime);
-  const { author } = data;
+  const { _meta: meta, data } = entry;
+  const metaUrl = meta?.url;
+  const url = metaUrl !== undefined && metaUrl.startsWith("/") ? new URL(metaUrl, siteUrl).href : entryUrl(siteUrl, feed.basePath, entry.id, trailingSlash);
+  const published = readDate(data[feed.dateField]) ?? readDate(meta?.mtime);
+  const { author, description, title } = data;
+  const entryAuthorName = isString(author) ? author : isNonNullObject(author) && ("name" in author) && isString(author.name) ? author.name : undefined;
   return {
-    authorName: typeof author === "string" ? author : author?.name ?? feed.author?.name ?? null,
+    authorName: entryAuthorName ?? feed.author?.name ?? null,
     contentHtml: feed.contentMode === "full" ? String(entry.body ?? "") : null,
     id: url,
     published,
-    summary: typeof data.description === "string" ? data.description : typeof meta.excerpt === "string" ? meta.excerpt : "",
-    title: typeof data.title === "string" ? data.title : entry.id,
+    summary: isString(description) ? description : meta?.excerpt ?? "",
+    title: isString(title) ? title : entry.id,
     updated: readDate(data[feed.updatedField]) ?? published,
     url
   };
@@ -296,7 +324,7 @@ function renderJsonFeed(page) {
     next_url: page.nextUrl,
     title: feed.title === "" ? "Feed" : feed.title,
     version: VERSION,
-    ...feed.author?.name === undefined ? {} : { authors: [{ name: feed.author.name }] },
+    authors: feed.author?.name === undefined ? undefined : [{ name: feed.author.name }],
     items: items.map((item) => {
       const out = { id: item.id, title: item.title, url: item.url };
       if (item.contentHtml !== null) {
@@ -330,13 +358,14 @@ function jsonFeedUrl(siteUrl, output, archiveIndex) {
 var MEDIA_TYPES = { atom: "application/atom+xml", json: "application/feed+json" };
 function siteUrlOf(projectConfig) {
   const url = projectConfig?.url;
-  return typeof url === "string" && url !== "" ? url : null;
+  return isString(url) && url !== "" ? url : null;
 }
 function feedLocales(projectConfig, collection) {
   const { i18n } = resolveI18n(projectConfig ?? {});
   const content = projectConfig?.content;
-  const source = content?.[collection]?.source;
-  const localized = typeof source === "string" && source.includes("{locale}");
+  const contentType = isJsonObject(content) ? content[collection] : undefined;
+  const source = isJsonObject(contentType) ? contentType.source : undefined;
+  const localized = isString(source) && source.includes("{locale}");
   return { i18n, locales: i18n !== null && localized ? i18n.locales : [] };
 }
 function localeVariant(feed, locale, i18n) {
@@ -365,16 +394,14 @@ var Feed = {
       for (const variant of published) {
         for (const format of variant.formats) {
           const href = format === "atom" ? atomUrl(siteUrl, variant.output) : jsonFeedUrl(siteUrl, variant.output);
-          entries.push({
-            attributes: {
-              href,
-              ...variant.language !== null && locales.length > 0 ? { hreflang: variant.language } : {},
-              rel: "alternate",
-              title: variant.title === "" ? "Feed" : variant.title,
-              type: MEDIA_TYPES[format]
-            },
-            tagName: "link"
-          });
+          const attributes = { href };
+          if (variant.language !== null && locales.length > 0) {
+            attributes.hreflang = variant.language;
+          }
+          attributes.rel = "alternate";
+          attributes.title = variant.title === "" ? "Feed" : variant.title;
+          attributes.type = MEDIA_TYPES[format];
+          entries.push({ attributes, tagName: "link" });
         }
       }
     }
@@ -419,32 +446,32 @@ function renderFeed(feed, entries, siteUrl, trailingSlash) {
   for (const format of feed.formats) {
     const url = format === "atom" ? atomUrl : jsonFeedUrl;
     if (format === "atom") {
-      files.push({
-        content: renderAtom({
-          complete,
+      const subscription = {
+        complete,
+        feed,
+        items: current,
+        selfUrl: url(siteUrl, feed.output),
+        siteUrl,
+        updated: feedUpdated(items)
+      };
+      if (archives.length > 0) {
+        subscription.prevArchiveUrl = url(siteUrl, feed.output, archives.length - 1);
+      }
+      files.push({ content: renderAtom(subscription), path: feedPath(feed.output, "xml") });
+      for (const [i, page] of archives.entries()) {
+        const archive = {
+          currentUrl: url(siteUrl, feed.output),
           feed,
-          items: current,
-          selfUrl: url(siteUrl, feed.output),
+          items: page,
+          selfUrl: url(siteUrl, feed.output, i),
           siteUrl,
-          updated: feedUpdated(items),
-          ...archives.length > 0 ? { prevArchiveUrl: url(siteUrl, feed.output, archives.length - 1) } : {}
-        }),
-        path: feedPath(feed.output, "xml")
-      });
-      for (const [i, page] of archives.entries()) {
-        files.push({
-          content: renderAtom({
-            currentUrl: url(siteUrl, feed.output),
-            feed,
-            items: page,
-            selfUrl: url(siteUrl, feed.output, i),
-            siteUrl,
-            updated: feedUpdated(page),
-            ...i > 0 ? { prevArchiveUrl: url(siteUrl, feed.output, i - 1) } : {},
-            nextArchiveUrl: i < archives.length - 1 ? url(siteUrl, feed.output, i + 1) : url(siteUrl, feed.output)
-          }),
-          path: feedPath(feed.output, "xml", i)
-        });
+          updated: feedUpdated(page)
+        };
+        if (i > 0) {
+          archive.prevArchiveUrl = url(siteUrl, feed.output, i - 1);
+        }
+        archive.nextArchiveUrl = i < archives.length - 1 ? url(siteUrl, feed.output, i + 1) : url(siteUrl, feed.output);
+        files.push({ content: renderAtom(archive), path: feedPath(feed.output, "xml", i) });
       }
     } else {
       files.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jxsuite/feed",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "Syndication feeds for Jx: Atom (RFC 4287) and JSON Feed emitted from content collections at build time",
   "license": "MIT",
   "repository": {
@@ -35,7 +35,7 @@
     "upgrade": "bun update --latest && bun install"
   },
   "dependencies": {
-    "@jxsuite/schema": "^3.0.0"
+    "@jxsuite/schema": "^4.1.0"
   },
   "devDependencies": {
     "ajv": "^8.20.0"

package/src/feed.ts

@@ -9,10 +9,18 @@
  * @docs framework/site/feeds
  */
 
+import type { EmitHostContext } from "@jxsuite/schema/format-registry";
+import { isJsonObject, isString } from "@jxsuite/schema/guards";
 import { canonicalizeLocale, localeUrlPrefix, resolveI18n } from "@jxsuite/schema/locale";
 import type { ResolvedI18n } from "@jxsuite/schema/locale";
-import type { ContentLoaderEntry, JxHeadEntry, ProjectConfig } from "@jxsuite/schema/types";
+import type {
+  ContentLoaderEntry,
+  JsonValue,
+  JxHeadEntry,
+  ProjectConfig,
+} from "@jxsuite/schema/types";
 import { atomUrl, renderAtom } from "./atom.ts";
+import type { AtomPage } from "./atom.ts";
 import { jsonFeedUrl, renderJsonFeed } from "./json-feed.ts";
 import {
   entryToItem,
@@ -24,13 +32,6 @@ import {
 } from "./shared.ts";
 import type { NormalizedFeed, NormalizedFeedConfig } from "./shared.ts";
 
-interface EmitContext {
-  projectConfig?: ProjectConfig;
-  root?: string;
-  sections?: Record<string, unknown>;
-  routes?: unknown[];
-}
-
 interface HeadContext {
   projectConfig?: ProjectConfig;
   root?: string;
@@ -40,7 +41,13 @@ const MEDIA_TYPES = { atom: "application/atom+xml", json: "application/feed+json
 
 function siteUrlOf(projectConfig: ProjectConfig | undefined): string | null {
   const url = projectConfig?.url;
-  return typeof url === "string" && url !== "" ? url : null;
+  return isString(url) && url !== "" ? url : null;
+}
+
+/** The project's resolved i18n, and the locales one feed is published in. */
+interface FeedLocales {
+  i18n: ResolvedI18n | null;
+  locales: string[];
 }
 
 /**
@@ -57,17 +64,14 @@ function siteUrlOf(projectConfig: ProjectConfig | undefined): string | null {
  *
  * @param {ProjectConfig | undefined} projectConfig
  * @param {string} collection
- * @returns {{ i18n: ResolvedI18n | null; locales: string[] }}
+ * @returns {FeedLocales}
  */
-function feedLocales(
-  projectConfig: ProjectConfig | undefined,
-  collection: string,
-): { i18n: ResolvedI18n | null; locales: string[] } {
+function feedLocales(projectConfig: ProjectConfig | undefined, collection: string): FeedLocales {
   const { i18n } = resolveI18n(projectConfig ?? {});
-  const content = (projectConfig as { content?: Record<string, { source?: unknown }> } | undefined)
-    ?.content;
-  const source = content?.[collection]?.source;
-  const localized = typeof source === "string" && source.includes("{locale}");
+  const content = projectConfig?.content;
+  const contentType = isJsonObject(content) ? content[collection] : undefined;
+  const source = isJsonObject(contentType) ? contentType.source : undefined;
+  const localized = isString(source) && source.includes("{locale}");
   return { i18n, locales: i18n !== null && localized ? i18n.locales : [] };
 }
 
@@ -84,7 +88,7 @@ function localeVariant(feed: NormalizedFeed, locale: string, i18n: ResolvedI18n
 
 export const Feed = {
   /** Normalize the `feed` section into `_project.feed`. */
-  projectData(sectionValue: unknown, ctx?: HeadContext): NormalizedFeedConfig {
+  projectData(sectionValue: JsonValue | undefined, ctx?: HeadContext): NormalizedFeedConfig {
     return normalizeFeedConfig(sectionValue, ctx?.projectConfig?.defaults?.lang);
   },
 
@@ -94,7 +98,7 @@ export const Feed = {
    * Pure configuration, which is exactly why this can run before content loads — a feed's URL comes
    * from its `output`, not from its entries.
    */
-  head(sectionValue: unknown, ctx: HeadContext): JxHeadEntry[] {
+  head(sectionValue: JsonValue | undefined, ctx: HeadContext): JxHeadEntry[] {
     const siteUrl = siteUrlOf(ctx.projectConfig);
     if (siteUrl === null) {
       return [];
@@ -116,18 +120,15 @@ export const Feed = {
             format === "atom"
               ? atomUrl(siteUrl, variant.output)
               : jsonFeedUrl(siteUrl, variant.output);
-          entries.push({
-            attributes: {
-              href,
-              ...(variant.language !== null && locales.length > 0
-                ? { hreflang: variant.language }
-                : {}),
-              rel: "alternate",
-              title: variant.title === "" ? "Feed" : variant.title,
-              type: MEDIA_TYPES[format],
-            },
-            tagName: "link",
-          });
+          // Attribute order is emitted order: href, then hreflang when localized, then the rest.
+          const attributes: NonNullable<JxHeadEntry["attributes"]> = { href };
+          if (variant.language !== null && locales.length > 0) {
+            attributes.hreflang = variant.language;
+          }
+          attributes.rel = "alternate";
+          attributes.title = variant.title === "" ? "Feed" : variant.title;
+          attributes.type = MEDIA_TYPES[format];
+          entries.push({ attributes, tagName: "link" });
         }
       }
     }
@@ -135,13 +136,19 @@ export const Feed = {
   },
 
   /** Serialize every configured feed, plus its RFC 5005 archives when enabled. */
-  emit(sectionValue: unknown, ctx: EmitContext): { path: string; content: string }[] {
+  emit(
+    sectionValue: JsonValue | undefined,
+    ctx: Partial<Pick<EmitHostContext, "projectConfig" | "sections">>,
+  ): { path: string; content: string }[] {
     const siteUrl = siteUrlOf(ctx.projectConfig);
     if (siteUrl === null) {
       console.warn("@jxsuite/feed: `url` is not set in project.json — feeds need absolute links.");
       return [];
     }
     const config = normalizeFeedConfig(sectionValue, ctx.projectConfig?.defaults?.lang);
+    /* SAFETY: the `content` section's owner (the parser's `Content.projectData`) answers a
+       Map of collection name to loaded entries (specs/extensions.md §8.4), and the host forwards
+       each section's answer unchanged. */
     const content = ctx.sections?.content as Map<string, ContentLoaderEntry[]> | undefined;
     const trailingSlash = String(ctx.projectConfig?.build?.trailingSlash ?? "always");
     const files: { path: string; content: string }[] = [];
@@ -198,38 +205,34 @@ function renderFeed(
   for (const format of feed.formats) {
     const url = format === "atom" ? atomUrl : jsonFeedUrl;
     if (format === "atom") {
-      files.push({
-        content: renderAtom({
-          complete,
-          feed,
-          items: current,
-          selfUrl: url(siteUrl, feed.output),
-          siteUrl,
-          updated: feedUpdated(items),
-          ...(archives.length > 0
-            ? { prevArchiveUrl: url(siteUrl, feed.output, archives.length - 1) }
-            : {}),
-        }),
-        path: feedPath(feed.output, "xml"),
-      });
+      const subscription: AtomPage = {
+        complete,
+        feed,
+        items: current,
+        selfUrl: url(siteUrl, feed.output),
+        siteUrl,
+        updated: feedUpdated(items),
+      };
+      if (archives.length > 0) {
+        subscription.prevArchiveUrl = url(siteUrl, feed.output, archives.length - 1);
+      }
+      files.push({ content: renderAtom(subscription), path: feedPath(feed.output, "xml") });
       // Archives run oldest-first, so `prev-archive` walks backwards through time.
       for (const [i, page] of archives.entries()) {
-        files.push({
-          content: renderAtom({
-            currentUrl: url(siteUrl, feed.output),
-            feed,
-            items: page,
-            selfUrl: url(siteUrl, feed.output, i),
-            siteUrl,
-            updated: feedUpdated(page),
-            ...(i > 0 ? { prevArchiveUrl: url(siteUrl, feed.output, i - 1) } : {}),
-            nextArchiveUrl:
-              i < archives.length - 1
-                ? url(siteUrl, feed.output, i + 1)
-                : url(siteUrl, feed.output),
-          }),
-          path: feedPath(feed.output, "xml", i),
-        });
+        const archive: AtomPage = {
+          currentUrl: url(siteUrl, feed.output),
+          feed,
+          items: page,
+          selfUrl: url(siteUrl, feed.output, i),
+          siteUrl,
+          updated: feedUpdated(page),
+        };
+        if (i > 0) {
+          archive.prevArchiveUrl = url(siteUrl, feed.output, i - 1);
+        }
+        archive.nextArchiveUrl =
+          i < archives.length - 1 ? url(siteUrl, feed.output, i + 1) : url(siteUrl, feed.output);
+        files.push({ content: renderAtom(archive), path: feedPath(feed.output, "xml", i) });
       }
     } else {
       files.push({

package/src/json-feed.ts

@@ -32,9 +32,25 @@ interface JsonFeedItem {
   authors?: { name: string }[];
 }
 
+/*
+ * The top-level JSON Feed object, members in serialized order. An `undefined` member is dropped by
+ * JSON.stringify, which is how an optional key stays absent rather than null.
+ */
+interface JsonFeedDocument {
+  description: string | undefined;
+  feed_url: string;
+  home_page_url: string;
+  language: string | undefined;
+  next_url: string | undefined;
+  title: string;
+  version: string;
+  authors: { name: string }[] | undefined;
+  items: JsonFeedItem[];
+}
+
 export function renderJsonFeed(page: JsonFeedPage): string {
   const { feed, items, siteUrl } = page;
-  const doc: Record<string, unknown> = {
+  const doc: JsonFeedDocument = {
     description: feed.description === "" ? undefined : feed.description,
     feed_url: page.selfUrl,
     home_page_url: new URL(feed.basePath, siteUrl).href,
@@ -44,7 +60,7 @@ export function renderJsonFeed(page: JsonFeedPage): string {
     title: feed.title === "" ? "Feed" : feed.title,
     version: VERSION,
     // Authors is the 1.1 spelling; `author` was 1.0 and is deprecated.
-    ...(feed.author?.name === undefined ? {} : { authors: [{ name: feed.author.name }] }),
+    authors: feed.author?.name === undefined ? undefined : [{ name: feed.author.name }],
     items: items.map((item): JsonFeedItem => {
       const out: JsonFeedItem = { id: item.id, title: item.title, url: item.url };
       if (item.contentHtml !== null) {

package/src/shared.ts

@@ -5,7 +5,8 @@
  * text, which is what makes both testable with a literal array.
  */
 
-import type { ContentLoaderEntry } from "@jxsuite/schema/types";
+import { isNonNullObject, isString } from "@jxsuite/schema/guards";
+import type { ContentFieldValue, ContentLoaderEntry, JsonValue } from "@jxsuite/schema/types";
 
 /** What a project may declare under one key of the `feed` section. */
 export interface FeedConfig {
@@ -29,6 +30,7 @@ export interface NormalizedFeed extends Required<Omit<FeedConfig, "author" | "la
   language: string | null;
 }
 
+/** The normalized `feed` section: each declared feed key mapped to its defaults-filled config. */
 export type NormalizedFeedConfig = Record<string, NormalizedFeed>;
 
 const DEFAULTS = {
@@ -43,16 +45,22 @@ const DEFAULTS = {
   updatedField: "updated",
 } as const;
 
-export function normalizeFeedConfig(section: unknown, siteLanguage?: string): NormalizedFeedConfig {
+export function normalizeFeedConfig(section: JsonValue | undefined, siteLanguage?: string) {
   const out: NormalizedFeedConfig = {};
-  if (!section || typeof section !== "object") {
+  if (!section || !isNonNullObject(section)) {
     return out;
   }
-  for (const [key, raw] of Object.entries(section as Record<string, unknown>)) {
-    if (!raw || typeof raw !== "object") {
+  for (const [key, raw] of Object.entries(section)) {
+    if (!raw || !isNonNullObject(raw)) {
       continue;
     }
-    const cfg = raw as FeedConfig;
+    /*
+     * SAFETY: `raw` is a non-null JSON object (checked above), and the member types below are the
+     * contract of schemas/project.fragment.schema.json, which `jx validate` and the editor enforce.
+     * `collection` and `basePath` are read as optional because this normalizer fills defaults for
+     * them rather than rejecting their absence; it never re-validates member types.
+     */
+    const cfg = raw as Partial<FeedConfig>;
     out[key] = {
       archive: cfg.archive ?? DEFAULTS.archive,
       author: cfg.author ?? null,
@@ -102,8 +110,8 @@ export function entryUrl(
 }
 
 /** RFC 3339 or nothing. A feed date that is not a real timestamp is worse than an absent one. */
-function readDate(value: unknown): string | null {
-  if (typeof value !== "string" || value === "") {
+function readDate(value: ContentFieldValue | undefined): string | null {
+  if (!isString(value) || value === "") {
     return null;
   }
   if (/^\d{4}-\d{2}-\d{2}$/.test(value)) {
@@ -120,35 +128,33 @@ export function entryToItem(
   siteUrl: string,
   trailingSlash: string,
 ): FeedItem {
-  const data = (entry.data ?? {}) as Record<string, unknown>;
-  const meta = (entry._meta ?? {}) as Record<string, unknown>;
+  const { _meta: meta, data } = entry;
   /*
    * An entry of a content type with a `route` already knows its URL: the loader stamped it at
    * `_meta.url`, from the same template the pages and the links were generated from. Only an entry
    * with no route is placed by the feed's own `basePath` + id, which is the older, flat rule.
    */
+  const metaUrl = meta?.url;
   const url =
-    typeof meta.url === "string" && meta.url.startsWith("/")
-      ? new URL(meta.url, siteUrl).href
+    metaUrl !== undefined && metaUrl.startsWith("/")
+      ? new URL(metaUrl, siteUrl).href
       : entryUrl(siteUrl, feed.basePath, entry.id, trailingSlash);
-  const published = readDate(data[feed.dateField]) ?? readDate(meta.mtime);
-  const { author } = data;
+  const published = readDate(data[feed.dateField]) ?? readDate(meta?.mtime);
+  const { author, description, title } = data;
+  // A frontmatter author is either a bare name or an object carrying one (`{ name, uri }`).
+  const entryAuthorName = isString(author)
+    ? author
+    : isNonNullObject(author) && "name" in author && isString(author.name)
+      ? author.name
+      : undefined;
 
   return {
-    authorName:
-      typeof author === "string"
-        ? author
-        : ((author as { name?: string } | undefined)?.name ?? feed.author?.name ?? null),
+    authorName: entryAuthorName ?? feed.author?.name ?? null,
     contentHtml: feed.contentMode === "full" ? String(entry.body ?? "") : null,
     id: url,
     published,
-    summary:
-      typeof data.description === "string"
-        ? data.description
-        : typeof meta.excerpt === "string"
-          ? meta.excerpt
-          : "",
-    title: typeof data.title === "string" ? data.title : entry.id,
+    summary: isString(description) ? description : (meta?.excerpt ?? ""),
+    title: isString(title) ? title : entry.id,
     updated: readDate(data[feed.updatedField]) ?? published,
     url,
   };
@@ -187,6 +193,12 @@ export function feedUpdated(items: readonly FeedItem[]): string | null {
   return newest;
 }
 
+/** A feed split for RFC 5005: the subscription page and its archives, oldest archive first. */
+export interface FeedPages {
+  current: FeedItem[];
+  archives: FeedItem[][];
+}
+
 /**
  * Split into the subscription page and its archives (RFC 5005 §2).
  *
@@ -198,10 +210,7 @@ export function feedUpdated(items: readonly FeedItem[]): string | null {
  * each time an entry is added; counting from the oldest means archive 1 keeps its contents forever
  * and only the newest archive — the one still filling — ever changes.
  */
-export function paginate(
-  items: readonly FeedItem[],
-  pageSize: number,
-): { current: FeedItem[]; archives: FeedItem[][] } {
+export function paginate(items: readonly FeedItem[], pageSize: number): FeedPages {
   if (items.length <= pageSize) {
     return { archives: [], current: [...items] };
   }