domma-cms 1.6.7 → 1.6.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domma-cms",
-  "version": "1.6.7",
+  "version": "1.6.8",
   "description": "File-based CMS powered by Domma and Fastify. Run npx domma-cms my-site to create a new project.",
   "type": "module",
   "main": "server/server.js",

package/server/services/projects.js

@@ -917,3 +917,38 @@ export function projectsBadge(projects = []) {
         }
     };
 }
+
+/**
+ * The pages that are offline because their project is switched off. The public
+ * renderer 404s them (pagePublishing.resolvePublishedPage), so search and the
+ * sitemap must leave them out too - one rule, here.
+ *
+ * @param {object[]} pages - each with `urlPath` and optional `project`
+ * @param {object} [deps] - DI for tests
+ * @param {Function} [deps.projectOf]    - async (urlPath, frontmatterProject) → slug
+ * @param {Function} [deps.isEnabled]    - async (slug) → boolean
+ * @param {Function} [deps.listProjects] - async () → projects (the shortcut when none is disabled)
+ * @returns {Promise<Set<string>>} urlPaths
+ */
+export async function offlinePageUrls(pages = [], deps = {}) {
+    const offline = new Set();
+    const projectOf = deps.projectOf || getProjectForPage;
+    const isEnabled = deps.isEnabled || isProjectEnabled;
+    const listAll = deps.listProjects || (deps.projectOf && deps.isEnabled ? null : listProjects);
+    // Nothing is disabled on most sites - skip resolving every page's project.
+    let anyDisabled = true;
+    if (listAll) {
+        try { anyDisabled = (await listAll()).some(p => p?.enabled === false); } catch { anyDisabled = true; }
+    }
+    if (!anyDisabled) return offline;
+    const enabled = new Map();
+    for (const page of pages) {
+        if (!page?.urlPath) continue;
+        try {
+            const slug = await projectOf(page.urlPath, page.project);
+            if (!enabled.has(slug)) enabled.set(slug, await isEnabled(slug));
+            if (!enabled.get(slug)) offline.add(page.urlPath);
+        } catch { /* project store unreadable - leave the page to the other checks */ }
+    }
+    return offline;
+}

package/server/services/search.js

@@ -389,29 +389,9 @@ export function scorePage(page, query, words) {
  * @returns {Promise<{offline: Set<string>, noindex: Set<string>}>} urlPaths
  */
 export async function searchExclusions(pages = [], deps = {}) {
-    const offline = new Set();
     const noindex = new Set();
-
-    const projects = deps.projectOf && deps.isEnabled ? null : await import('./projects.js');
-    const projectOf = deps.projectOf || projects.getProjectForPage;
-    const isEnabled = deps.isEnabled || projects.isProjectEnabled;
-    const listAll = deps.listProjects || projects?.listProjects;
-    // Nothing is disabled on most sites - skip resolving every page's project.
-    let anyDisabled = true;
-    if (listAll) {
-        try { anyDisabled = (await listAll()).some(p => p?.enabled === false); } catch { anyDisabled = true; }
-    }
-    if (anyDisabled) {
-        const enabled = new Map();
-        for (const page of pages) {
-            if (!page?.urlPath) continue;
-            try {
-                const slug = await projectOf(page.urlPath, page.project);
-                if (!enabled.has(slug)) enabled.set(slug, await isEnabled(slug));
-                if (!enabled.get(slug)) offline.add(page.urlPath);
-            } catch { /* project store unreadable - leave the page to the other checks */ }
-        }
-    }
+    const {offlinePageUrls} = await import('./projects.js');
+    const offline = await offlinePageUrls(pages, deps);
 
     let overrides;
     if (deps.seoOverrides) {

package/server/services/sitemap.js

@@ -8,6 +8,7 @@
  * invalidates whenever a page is created, updated, renamed, or deleted.
  */
 import {listPages} from './content.js';
+import {offlinePageUrls} from './projects.js';
 import {getConfig} from '../config.js';
 import {applyTransforms, getSitemapSources} from './hooks.js';
 
@@ -22,6 +23,7 @@ const validPriority = (p) => p !== undefined && p !== null && p !== '' && Number
  *   - Must be publicly visible (role-gated pages never index)
  *   - Must not be the error page
  *   - Must not opt out via `seo.noindex`
+ *   - (in listSitemapEntries) must not be in a switched-off project - it 404s
  *
  * @param {object} page - Parsed page from content service
  * @returns {boolean}
@@ -51,8 +53,9 @@ function pageEntry(page) {
  */
 export async function listSitemapEntries(baseUrl, {log = console} = {}) {
     const normalised = normaliseBaseUrl(baseUrl);
-    const pages = await listPages();
-    const entries = pages.filter(shouldIncludeInSitemap).map(pageEntry);
+    const pages = (await listPages()).filter(shouldIncludeInSitemap);
+    const offline = await offlinePageUrls(pages);
+    const entries = pages.filter(p => !offline.has(p.urlPath)).map(pageEntry);
     const seen = new Set(entries.map(e => e.urlPath));
 
     for (const source of getSitemapSources()) {