@canopy-iiif/app 0.7.0 → 0.7.2

package/lib/build/iiif.js

@@ -88,12 +88,12 @@ async function readJsonFromUri(uri, options = { log: false }) {
       if (options && options.log) {
         try {
           if (res && res.ok) {
-            logLine(`✓ ${String(uri)} ➜ ${res.status}`, "yellow", {
+            logLine(`↓ ${String(uri)} → ${res.status}`, "yellow", {
               bright: true,
             });
           } else {
             const code = res ? res.status : "ERR";
-            logLine(`✗ ${String(uri)} ➜ ${code}`, "red", { bright: true });
+            logLine(`⊘ ${String(uri)} → ${code}`, "red", { bright: true });
           }
         } catch (_) {}
       }
@@ -459,7 +459,7 @@ async function saveCachedCollection(collection, id, parentId) {
     try {
       if (process.env.CANOPY_IIIF_DEBUG === "1") {
         const { logLine } = require("./log");
-        logLine(`IIIF: saved collection ➜ ${slug}.json`, "cyan", { dim: true });
+        logLine(`IIIF: saved collection → ${slug}.json`, "cyan", { dim: true });
       }
     } catch (_) {}
     index.byId = Array.isArray(index.byId) ? index.byId : [];
@@ -502,7 +502,7 @@ async function buildIiifCollectionPages(CONFIG) {
   if (!collectionUri) return { searchRecords: [] };
 
   // Fetch top-level collection
-  logLine("IIIF: Fetching collection...", "blue", { bright: true });
+  logLine("• Traversing IIIF Collection(s)", "blue", { dim: true });
   const root = await readJsonFromUri(collectionUri, { log: true });
   if (!root) {
     logLine("IIIF: Failed to fetch collection", "red");
@@ -573,7 +573,16 @@ async function buildIiifCollectionPages(CONFIG) {
     )
   );
   const chunks = Math.ceil(tasks.length / chunkSize);
-  const searchRecords = [];
+  // Summary before processing chunks
+  try {
+    const collectionsCount = visitedCollections.size || 0;
+    logLine(
+      `• Fetching ${tasks.length} Manifest(s) in ${chunks} chunk(s) across ${collectionsCount} Collection(s)`,
+      "blue",
+      { dim: true }
+    );
+  } catch (_) {}
+  const iiifRecords = [];
   const unsafeThumbs = !!(
     cfg &&
     cfg.iiif &&
@@ -619,7 +628,7 @@ async function buildIiifCollectionPages(CONFIG) {
 
   for (let ci = 0; ci < chunks; ci++) {
     const chunk = tasks.slice(ci * chunkSize, (ci + 1) * chunkSize);
-    logLine(`\nChunk (${ci + 1}/${chunks})`, "white", { dim: true });
+    logLine(`• Chunk ${ci + 1}/${chunks}`, "blue", { dim: true });
 
     const concurrency = Math.max(
       1,
@@ -655,14 +664,14 @@ async function buildIiifCollectionPages(CONFIG) {
         let manifest = await loadCachedManifestById(id);
         const lns = [];
         if (manifest) {
-          lns.push([`✓ ${String(id)} ➜ Cached`, "yellow"]);
+          lns.push([`↓ ${String(id)} → Cached`, "yellow"]);
         } else if (/^https?:\/\//i.test(String(id || ""))) {
           try {
             const res = await fetch(String(id), {
               headers: { Accept: "application/json" },
             }).catch(() => null);
             if (res && res.ok) {
-              lns.push([`✓ ${String(id)} ➜ ${res.status}`, "yellow"]);
+              lns.push([`↓ ${String(id)} → ${res.status}`, "yellow"]);
               const remote = await res.json();
               const norm = await normalizeToV3(remote);
               manifest = norm;
@@ -673,20 +682,20 @@ async function buildIiifCollectionPages(CONFIG) {
               );
             } else {
               lns.push([
-                `✗ ${String(id)} ➜ ${res ? res.status : "ERR"}`,
+                `⊘ ${String(id)} → ${res ? res.status : "ERR"}`,
                 "red",
               ]);
               continue;
             }
           } catch (e) {
-            lns.push([`✗ ${String(id)} ➜ ERR`, "red"]);
+            lns.push([`⊘ ${String(id)} → ERR`, "red"]);
             continue;
           }
         } else if (/^file:\/\//i.test(String(id || ""))) {
           try {
             const local = await readJsonFromUri(String(id), { log: false });
             if (!local) {
-              lns.push([`✗ ${String(id)} ➜ ERR`, "red"]);
+              lns.push([`⊘ ${String(id)} → ERR`, "red"]);
               continue;
             }
             const norm = await normalizeToV3(local);
@@ -696,13 +705,13 @@ async function buildIiifCollectionPages(CONFIG) {
               String(id),
               String(it.parent || "")
             );
-            lns.push([`✓ ${String(id)} ➜ Cached`, "yellow"]);
+            lns.push([`↓ ${String(id)} → Cached`, "yellow"]);
           } catch (_) {
-            lns.push([`✗ ${String(id)} ➜ ERR`, "red"]);
+            lns.push([`⊘ ${String(id)} → ERR`, "red"]);
             continue;
           }
         } else {
-          lns.push([`✗ ${String(id)} ➜ SKIP`, "red"]);
+          lns.push([`⊘ ${String(id)} → SKIP`, "red"]);
           continue;
         }
         if (!manifest) continue;
@@ -903,7 +912,7 @@ async function buildIiifCollectionPages(CONFIG) {
           } catch (_) {}
           await fsp.writeFile(outPath, html, "utf8");
           lns.push([
-            `✓ Created ${path.relative(process.cwd(), outPath)}`,
+            `✔ Created ${path.relative(process.cwd(), outPath)}`,
             "green",
           ]);
           let thumbUrl = "";
@@ -935,7 +944,7 @@ async function buildIiifCollectionPages(CONFIG) {
               }
             }
           } catch (_) {}
-          searchRecords.push({
+          iiifRecords.push({
             id: String(manifest.id || id),
             title,
             href: href.split(path.sep).join("/"),
@@ -962,7 +971,7 @@ async function buildIiifCollectionPages(CONFIG) {
     );
     await Promise.all(workers);
   }
-  return { searchRecords };
+  return { iiifRecords };
 }
 
 module.exports = {

package/lib/build/log.js

@@ -1,64 +1,31 @@
-let charm = null;
-try {
-  charm = require('charm')();
-} catch (_) {
-  charm = null;
-}
-
-const ANSI = {
-  reset: '\u001b[0m',
-  bright: '\u001b[1m',
-  dim: '\u001b[2m',
-  underscore: '\u001b[4m',
-  colors: {
-    black: '\u001b[30m',
-    red: '\u001b[31m',
-    green: '\u001b[32m',
-    yellow: '\u001b[33m',
-    blue: '\u001b[34m',
-    magenta: '\u001b[35m',
-    cyan: '\u001b[36m',
-    white: '\u001b[37m'
-  }
-};
+const charm = require("charm")();
+charm.pipe(process.stdout);
 
-function log(string, color = 'blue', options = { bright: false, dim: false, underscore: false }) {
-  if (charm) {
-    const c = require('charm')();
-    c.pipe(process.stdout);
-    if (options?.bright) c.display('bright');
-    if (options?.dim) c.display('dim');
-    if (options?.underscore) c.display('underscore');
-    c.foreground(color).write(String(string)).display('reset');
-    c.end();
-  } else {
-    const parts = [];
-    if (options?.bright) parts.push(ANSI.bright);
-    if (options?.dim) parts.push(ANSI.dim);
-    if (options?.underscore) parts.push(ANSI.underscore);
-    const clr = ANSI.colors[color] || '';
-    parts.push(clr);
-    parts.push(String(string));
-    parts.push(ANSI.reset);
-    process.stdout.write(parts.join(''));
-  }
+function log(
+  string,
+  color = "blue",
+  options = { bright: false, dim: false, underscore: false }
+) {
+  if (options?.bright) charm.display("bright");
+  if (options?.dim) charm.display("dim");
+  if (options?.underscore) charm.display("underscore");
+  charm.foreground(color).write(String(string)).display("reset");
 }
 
-function logLine(string, color = 'blue', options) {
-  log(string + '\n', color, options);
+function logLine(string, color = "blue", options) {
+  log(string + "\n", color, options);
 }
 
 function logResponse(string, response, success = true) {
   if (success) {
-    log('✓ ', 'yellow', { dim: true });
-    log(String(string), 'yellow');
-    log(` ➜ ${response?.status ?? ''}\n`, 'yellow', { dim: true });
+    log("↓ ", "yellow", { dim: true });
+    log(String(string), "yellow");
+    log(` → ${response?.status ?? ""}\n`, "yellow", { dim: true });
   } else {
-    log('✗ ', 'red', { dim: true });
-    log(String(string), 'red');
-    log(` ➜ ${response?.status ?? ''}\n`, 'red', { dim: true });
+    log("⊘ ", "red", { dim: true });
+    log(String(string), "red");
+    log(` → ${response?.status ?? ""}\n`, "red", { dim: true });
   }
 }
 
 module.exports = { log, logLine, logResponse };
-

package/lib/build/search-workflow.js

@@ -0,0 +1,61 @@
+const { fs, path, OUT_DIR } = require('../common');
+const search = require('../search/search');
+const runtimes = require('./runtimes');
+const { generateFacets } = require('./facets');
+const { logLine } = require('./log');
+
+/**
+ * Ensure the search page and its runtime exist on first build.
+ * If `search.html` is missing, write an empty index, bundle the initial runtime,
+ * and build the page so subsequent steps can update artifacts incrementally.
+ */
+async function ensureSearchInitialized() {
+  const searchPath = path.join(OUT_DIR, 'search.html');
+  const needCreatePage = !fs.existsSync(searchPath);
+  if (!needCreatePage) return;
+  try { logLine('• Preparing search (initial)...', 'blue', { bright: true }); } catch (_) {}
+  // Build result item template (compat no-op) so it can be inlined if needed
+  try { await search.ensureResultTemplate(); } catch (_) {}
+  try { logLine('  - Writing empty index...', 'blue'); } catch (_) {}
+  await search.writeSearchIndex([]);
+  try { logLine('  - Writing runtime...', 'blue'); } catch (_) {}
+  await runtimes.prepareSearchRuntime(process.env.CANOPY_BUNDLE_TIMEOUT || 10000, 'initial');
+  try { logLine('  - Building search.html...', 'blue'); } catch (_) {}
+  await search.buildSearchPage();
+  try { logLine('✓ Created search page', 'cyan'); } catch (_) {}
+}
+
+/**
+ * After the search index is built, finalize related artifacts:
+ * - Generate facets for IIIF works
+ * - Re-bundle the search runtime (final)
+ * - Rebuild result template and the search page
+ * - Log a concise breakdown by type
+ */
+async function finalizeSearch(combinedRecords) {
+  const combined = Array.isArray(combinedRecords) ? combinedRecords : [];
+  await generateFacets(combined);
+  try { logLine('• Writing search runtime (final)...', 'blue', { bright: true }); } catch (_) {}
+  await runtimes.prepareSearchRuntime(process.env.CANOPY_BUNDLE_TIMEOUT || 10000, 'final');
+  try { await search.ensureResultTemplate(); } catch (_) {}
+  try { logLine('• Updating search.html...', 'blue'); } catch (_) {}
+  await search.buildSearchPage();
+  try { logLine('✓ Search page updated', 'cyan'); } catch (_) {}
+
+  // Itemize counts by type for a clearer summary
+  try {
+    const counts = new Map();
+    for (const r of combined) {
+      const t = String((r && r.type) || 'page').toLowerCase();
+      counts.set(t, (counts.get(t) || 0) + 1);
+    }
+    const parts = Array.from(counts.entries())
+      .sort((a, b) => b[1] - a[1] || a[0].localeCompare(b[0]))
+      .map(([t, n]) => `${t}: ${n}`);
+    const breakdown = parts.length ? `: ${parts.join(', ')}` : '';
+    logLine(`✓ Search index: ${combined.length} total records${breakdown}`, 'cyan');
+  } catch (_) {}
+}
+
+module.exports = { ensureSearchInitialized, finalizeSearch };
+

package/lib/build/styles.js

@@ -1,64 +1,86 @@
-const { fs, fsp, path, OUT_DIR, CONTENT_DIR, ensureDirSync } = require('../common');
+const {
+  fs,
+  fsp,
+  path,
+  OUT_DIR,
+  CONTENT_DIR,
+  ensureDirSync,
+} = require("../common");
 
 async function ensureStyles() {
-  const stylesDir = path.join(OUT_DIR, 'styles');
-  const dest = path.join(stylesDir, 'styles.css');
-  const customContentCss = path.join(CONTENT_DIR, '_styles.css');
-  const appStylesDir = path.join(process.cwd(), 'app', 'styles');
-  const customAppCss = path.join(appStylesDir, 'index.css');
+  const stylesDir = path.join(OUT_DIR, "styles");
+  const dest = path.join(stylesDir, "styles.css");
+  const customContentCss = path.join(CONTENT_DIR, "_styles.css");
+  const appStylesDir = path.join(process.cwd(), "app", "styles");
+  const customAppCss = path.join(appStylesDir, "index.css");
   ensureDirSync(stylesDir);
 
   const root = process.cwd();
   const twConfigsRoot = [
-    path.join(root, 'tailwind.config.js'),
-    path.join(root, 'tailwind.config.cjs'),
-    path.join(root, 'tailwind.config.mjs'),
-    path.join(root, 'tailwind.config.ts'),
+    path.join(root, "tailwind.config.js"),
+    path.join(root, "tailwind.config.cjs"),
+    path.join(root, "tailwind.config.mjs"),
+    path.join(root, "tailwind.config.ts"),
   ];
   const twConfigsApp = [
-    path.join(appStylesDir, 'tailwind.config.js'),
-    path.join(appStylesDir, 'tailwind.config.cjs'),
-    path.join(appStylesDir, 'tailwind.config.mjs'),
-    path.join(appStylesDir, 'tailwind.config.ts'),
+    path.join(appStylesDir, "tailwind.config.js"),
+    path.join(appStylesDir, "tailwind.config.cjs"),
+    path.join(appStylesDir, "tailwind.config.mjs"),
+    path.join(appStylesDir, "tailwind.config.ts"),
   ];
   let configPath = [...twConfigsApp, ...twConfigsRoot].find((p) => {
-    try { return fs.existsSync(p); } catch (_) { return false; }
+    try {
+      return fs.existsSync(p);
+    } catch (_) {
+      return false;
+    }
   });
   if (!configPath) {
     try {
-      const { CACHE_DIR } = require('../common');
-      const genDir = path.join(CACHE_DIR, 'tailwind');
+      const { CACHE_DIR } = require("../common");
+      const genDir = path.join(CACHE_DIR, "tailwind");
       ensureDirSync(genDir);
-      const genCfg = path.join(genDir, 'tailwind.config.js');
+      const genCfg = path.join(genDir, "tailwind.config.js");
       const cfg = `module.exports = {\n  presets: [require('@canopy-iiif/app/ui/canopy-iiif-preset')],\n  content: [\n    './content/**/*.{mdx,html}',\n    './site/**/*.html',\n    './site/**/*.js',\n    './packages/app/ui/**/*.{js,jsx,ts,tsx}',\n    './packages/app/lib/iiif/components/**/*.{js,jsx}',\n  ],\n  theme: { extend: {} },\n  plugins: [require('@canopy-iiif/app/ui/canopy-iiif-plugin')],\n};\n`;
-      fs.writeFileSync(genCfg, cfg, 'utf8');
+      fs.writeFileSync(genCfg, cfg, "utf8");
       configPath = genCfg;
-    } catch (_) { configPath = null; }
+    } catch (_) {
+      configPath = null;
+    }
   }
 
   const inputCss = fs.existsSync(customAppCss)
     ? customAppCss
-    : (fs.existsSync(customContentCss) ? customContentCss : null);
+    : fs.existsSync(customContentCss)
+    ? customContentCss
+    : null;
 
   let generatedInput = null;
   if (!inputCss) {
     try {
-      const { CACHE_DIR } = require('../common');
-      const genDir = path.join(CACHE_DIR, 'tailwind');
+      const { CACHE_DIR } = require("../common");
+      const genDir = path.join(CACHE_DIR, "tailwind");
       ensureDirSync(genDir);
-      generatedInput = path.join(genDir, 'index.css');
+      generatedInput = path.join(genDir, "index.css");
       const css = `@tailwind base;\n@tailwind components;\n@tailwind utilities;\n`;
-      fs.writeFileSync(generatedInput, css, 'utf8');
-    } catch (_) { generatedInput = null; }
+      fs.writeFileSync(generatedInput, css, "utf8");
+    } catch (_) {
+      generatedInput = null;
+    }
   }
 
   function resolveTailwindCli() {
     try {
-      const cliJs = require.resolve('tailwindcss/lib/cli.js');
+      const cliJs = require.resolve("tailwindcss/lib/cli.js");
       return { cmd: process.execPath, args: [cliJs] };
     } catch (_) {}
     try {
-      const localBin = path.join(process.cwd(), 'node_modules', '.bin', process.platform === 'win32' ? 'tailwindcss.cmd' : 'tailwindcss');
+      const localBin = path.join(
+        process.cwd(),
+        "node_modules",
+        ".bin",
+        process.platform === "win32" ? "tailwindcss.cmd" : "tailwindcss"
+      );
       if (fs.existsSync(localBin)) return { cmd: localBin, args: [] };
     } catch (_) {}
     return null;
@@ -67,33 +89,53 @@ async function ensureStyles() {
     try {
       const cli = resolveTailwindCli();
       if (!cli) return false;
-      const { spawnSync } = require('child_process');
-      const args = ['-i', input, '-o', output];
-      if (config) args.push('-c', config);
-      if (minify) args.push('--minify');
-      const res = spawnSync(cli.cmd, [...cli.args, ...args], { stdio: 'inherit', env: { ...process.env, BROWSERSLIST_IGNORE_OLD_DATA: '1' } });
+      const { spawnSync } = require("child_process");
+      const args = ["-i", input, "-o", output];
+      if (config) args.push("-c", config);
+      if (minify) args.push("--minify");
+      const res = spawnSync(cli.cmd, [...cli.args, ...args], {
+        stdio: "inherit",
+        env: { ...process.env, BROWSERSLIST_IGNORE_OLD_DATA: "1" },
+      });
       return !!res && res.status === 0;
-    } catch (_) { return false; }
+    } catch (_) {
+      return false;
+    }
   }
 
   if (configPath && (inputCss || generatedInput)) {
-    const ok = buildTailwindCli({ input: inputCss || generatedInput, output: dest, config: configPath, minify: true });
+    const ok = buildTailwindCli({
+      input: inputCss || generatedInput,
+      output: dest,
+      config: configPath,
+      minify: true,
+    });
     if (ok) return; // Tailwind compiled CSS
   }
 
   function isTailwindSource(p) {
-    try { const s = fs.readFileSync(p, 'utf8'); return /@tailwind\s+(base|components|utilities)/.test(s); } catch (_) { return false; }
+    try {
+      const s = fs.readFileSync(p, "utf8");
+      return /@tailwind\s+(base|components|utilities)/.test(s);
+    } catch (_) {
+      return false;
+    }
   }
   if (fs.existsSync(customAppCss)) {
-    if (!isTailwindSource(customAppCss)) { await fsp.copyFile(customAppCss, dest); return; }
+    if (!isTailwindSource(customAppCss)) {
+      await fsp.copyFile(customAppCss, dest);
+      return;
+    }
   }
   if (fs.existsSync(customContentCss)) {
-    if (!isTailwindSource(customContentCss)) { await fsp.copyFile(customContentCss, dest); return; }
+    if (!isTailwindSource(customContentCss)) {
+      await fsp.copyFile(customContentCss, dest);
+      return;
+    }
   }
 
   const css = `:root{--max-w:760px;--muted:#6b7280}*{box-sizing:border-box}body{font-family:system-ui,-apple-system,Segoe UI,Roboto,Ubuntu,Helvetica,Arial,sans-serif;max-width:var(--max-w);margin:2rem auto;padding:0 1rem;line-height:1.6}a{color:#2563eb;text-decoration:none}a:hover{text-decoration:underline}.site-header,.site-footer{display:flex;align-items:center;justify-content:space-between;gap:.5rem;padding:1rem 0;border-bottom:1px solid #e5e7eb}.site-footer{border-bottom:0;border-top:1px solid #e5e7eb;color:var(--muted)}.brand{font-weight:600}.content pre{background:#f6f8fa;padding:1rem;overflow:auto}.content code{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,monospace;background:#f6f8fa;padding:.1rem .3rem;border-radius:4px}.tabs{display:flex;gap:.5rem;align-items:center;border-bottom:1px solid #e5e7eb;margin:.5rem 0}.tab{background:none;border:0;color:#374151;padding:.25rem .5rem;border-radius:.375rem;cursor:pointer}.tab:hover{color:#111827}.tab-active{color:#2563eb;border:1px solid #e5e7eb;border-bottom:0;background:#fff}.masonry{column-gap:1rem;column-count:1}@media(min-width:768px){.masonry{column-count:2}}@media(min-width:1024px){.masonry{column-count:3}}.masonry>*{break-inside:avoid;margin-bottom:1rem;display:block}[data-grid-variant=masonry]{column-gap:var(--grid-gap,1rem);column-count:var(--cols-base,1)}@media(min-width:768px){[data-grid-variant=masonry]{column-count:var(--cols-md,2)}}@media(min-width:1024px){[data-grid-variant=masonry]{column-count:var(--cols-lg,3)}}[data-grid-variant=masonry]>*{break-inside:avoid;margin-bottom:var(--grid-gap,1rem);display:block}[data-grid-variant=grid]{display:grid;grid-template-columns:repeat(var(--cols-base,1),minmax(0,1fr));gap:var(--grid-gap,1rem)}@media(min-width:768px){[data-grid-variant=grid]{grid-template-columns:repeat(var(--cols-md,2),minmax(0,1fr))}}@media(min-width:1024px){[data-grid-variant=grid]{grid-template-columns:repeat(var(--cols-lg,3),minmax(0,1fr))}}`;
-  await fsp.writeFile(dest, css, 'utf8');
+  await fsp.writeFile(dest, css, "utf8");
 }
 
 module.exports = { ensureStyles };
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopy-iiif/app",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "private": false,
   "license": "MIT",
   "author": "Mat Jordan <mat@northwestern.edu>",
@@ -29,6 +29,7 @@
     "@iiif/helpers": "^1.4.0",
     "@mdx-js/mdx": "^3.1.0",
     "@mdx-js/react": "^3.1.0",
+    "charm": "^1.0.2",
     "cmdk": "^1.1.1",
     "js-yaml": "^4.1.0",
     "react-masonry-css": "^1.0.16",