@canopy-iiif/app 1.5.16 → 1.6.0

package/lib/build/iiif.js

@@ -99,6 +99,20 @@ function normalizeCollectionUris(value) {
   return uris;
 }
 
+function normalizeManifestConfig(cfg) {
+  if (!cfg || typeof cfg !== "object") return [];
+  const entries = [];
+  const push = (value) => {
+    if (value === undefined || value === null) return;
+    if (Array.isArray(value)) entries.push(...value);
+    else entries.push(value);
+  };
+  push(cfg.manifest);
+  push(cfg.manifests);
+  if (!entries.length) return [];
+  return normalizeCollectionUris(entries);
+}
+
 function clampSlugLength(slug, limit = MAX_ENTRY_SLUG_LENGTH) {
   if (!slug) return "";
   const max = Math.max(1, limit);
@@ -1457,7 +1471,8 @@ async function buildIiifCollectionPages(CONFIG) {
       process.env.CANOPY_COLLECTION_URI || ""
     );
   }
-  if (!collectionUris.length) return {searchRecords: []};
+  const manifestUris = normalizeManifestConfig(cfg);
+  if (!collectionUris.length && !manifestUris.length) return {searchRecords: []};
 
   const searchIndexCfg = (cfg && cfg.search && cfg.search.index) || {};
   const metadataCfg = (searchIndexCfg && searchIndexCfg.metadata) || {};
@@ -1524,6 +1539,7 @@ async function buildIiifCollectionPages(CONFIG) {
 
   // Recursively traverse Collections and gather all Manifest tasks
   const tasks = [];
+  const queuedManifestIds = new Set();
   const visitedCollections = new Set(); // normalized ids
   const norm = (x) => {
     try {
@@ -1567,7 +1583,11 @@ async function buildIiifCollectionPages(CONFIG) {
         const entryId = entry && entry.id;
         if (!entryId) continue;
         const entryType = normalizeIiifType(entry.type || entry.fallback || "");
+        const dedupeKey = norm(entryId) || String(entryId || "");
+        if (!dedupeKey) continue;
         if (entryType === "manifest") {
+          if (queuedManifestIds.has(dedupeKey)) continue;
+          queuedManifestIds.add(dedupeKey);
           tasks.push({id: entryId, parent: collectionKey});
         } else if (entryType === "collection") {
           await gatherFromCollection(entry.raw || entryId, collectionKey);
@@ -1597,6 +1617,14 @@ async function buildIiifCollectionPages(CONFIG) {
     } catch (_) {}
     await gatherFromCollection(normalizedRoot, "");
   }
+  if (manifestUris.length) {
+    for (const uri of manifestUris) {
+      const dedupeKey = norm(uri) || String(uri || "");
+      if (!dedupeKey || queuedManifestIds.has(dedupeKey)) continue;
+      queuedManifestIds.add(dedupeKey);
+      tasks.push({id: uri, parent: ""});
+    }
+  }
   if (!tasks.length) return {searchRecords: []};
 
   // Split into chunks and process with limited concurrency
@@ -2395,6 +2423,7 @@ module.exports.__TESTING__ = {
   formatDurationMs,
   resolveBoolean,
   normalizeCollectionUris,
+  normalizeManifestConfig,
   clampSlugLength,
   isSlugTooLong,
   normalizeSlugBase,

package/lib/common.js

@@ -15,7 +15,10 @@ const BASE_PATH = readBasePath();
 let cachedAppearance = null;
 let cachedAccent = null;
 let cachedSiteMetadata = null;
+let cachedSearchPageMetadata = null;
 const DEFAULT_SITE_TITLE = 'Site title';
+const DEFAULT_SEARCH_PAGE_TITLE = 'Search';
+const DEFAULT_SEARCH_PAGE_DESCRIPTION = '';
 
 function resolveThemeAppearance() {
   if (cachedAppearance) return cachedAppearance;
@@ -87,6 +90,32 @@ function getSiteTitle() {
   return DEFAULT_SITE_TITLE;
 }
 
+function readSearchPageMetadata() {
+  if (cachedSearchPageMetadata) return cachedSearchPageMetadata;
+  cachedSearchPageMetadata = {
+    title: DEFAULT_SEARCH_PAGE_TITLE,
+    description: DEFAULT_SEARCH_PAGE_DESCRIPTION,
+  };
+  try {
+    const cfgPath = resolveCanopyConfigPath();
+    if (!fs.existsSync(cfgPath)) return cachedSearchPageMetadata;
+    const raw = fs.readFileSync(cfgPath, 'utf8');
+    const data = yaml.load(raw) || {};
+    const searchCfg = data && data.search ? data.search : null;
+    const pageCfg = searchCfg && searchCfg.page ? searchCfg.page : null;
+    const title = pageCfg && typeof pageCfg.title === 'string' ? pageCfg.title.trim() : '';
+    const description =
+      pageCfg && typeof pageCfg.description === 'string'
+        ? pageCfg.description.trim()
+        : '';
+    cachedSearchPageMetadata = {
+      title: title || DEFAULT_SEARCH_PAGE_TITLE,
+      description: description || DEFAULT_SEARCH_PAGE_DESCRIPTION,
+    };
+  } catch (_) {}
+  return cachedSearchPageMetadata;
+}
+
 // Determine the absolute site origin (scheme + host[:port])
 // Priority:
 // 1) CANOPY_BASE_URL env
@@ -256,4 +285,7 @@ module.exports = {
   readSiteMetadata,
   getSiteTitle,
   DEFAULT_SITE_TITLE,
+  readSearchPageMetadata,
+  DEFAULT_SEARCH_PAGE_TITLE,
+  DEFAULT_SEARCH_PAGE_DESCRIPTION,
 };

package/lib/search/search.js

@@ -11,6 +11,7 @@ const {
   OUT_DIR,
   htmlShell,
   canopyBodyClassForType,
+  readSearchPageMetadata,
 } = require('../common');
 const { resolveCanopyConfigPath } = require('../config-path');
 
@@ -259,14 +260,25 @@ async function buildSearchPage() {
     }
     const mdx = require('../build/mdx');
     const searchHref = rootRelativeHref('search.html');
+    const searchPageMeta = readSearchPageMetadata() || {};
+    const pageTitle =
+      typeof searchPageMeta.title === 'string' && searchPageMeta.title.trim()
+        ? searchPageMeta.title.trim()
+        : 'Search';
+    const pageDescription =
+      typeof searchPageMeta.description === 'string'
+        ? searchPageMeta.description
+        : '';
     const pageDetails = {
-      title: 'Search',
+      title: pageTitle,
+      description: pageDescription,
       href: searchHref,
       url: searchHref,
       type: 'search',
       canonical: searchHref,
       meta: {
-        title: 'Search',
+        title: pageTitle,
+        description: pageDescription,
         type: 'search',
         url: searchHref,
         canonical: searchHref,
@@ -312,7 +324,7 @@ async function buildSearchPage() {
       }
     } catch (_) {}
     const bodyClass = canopyBodyClassForType('search');
-    let html = htmlShell({ title: 'Search', body, cssHref: null, scriptHref: jsRel, headExtra, bodyClass });
+    let html = htmlShell({ title: pageTitle, body, cssHref: null, scriptHref: jsRel, headExtra, bodyClass });
     try { html = require('../common').applyBaseToHtml(html); } catch (_) {}
     await fsp.writeFile(outPath, html, 'utf8');
     console.log('Search: Built', path.relative(process.cwd(), outPath));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopy-iiif/app",
-  "version": "1.5.16",
+  "version": "1.6.0",
   "private": false,
   "license": "MIT",
   "author": "Mat Jordan <mat@northwestern.edu>",