@canopy-iiif/app 0.9.2 → 0.9.4

package/lib/build/iiif.js

@@ -912,7 +912,10 @@ async function buildIiifCollectionPages(CONFIG) {
   };
   async function gatherFromCollection(colLike, parentId) {
     try {
-      // Resolve uri/id
+      // Resolve the URI we were asked to fetch. Some providers (e.g. Internet Archive)
+      // return paged collections where the JSON payload's `id` does not match the
+      // URI that served it. We rely on the requested URI as the stable, unique key
+      // so pagination continues even when `id` flips back to the root collection.
       const uri =
         typeof colLike === "string"
           ? colLike
@@ -923,12 +926,19 @@ async function buildIiifCollectionPages(CONFIG) {
           : await readJsonFromUri(uri, {log: true});
       if (!col) return;
       const ncol = await normalizeToV3(col);
-      const colId = String((ncol && (ncol.id || uri)) || uri);
-      const nid = norm(colId);
-      if (visitedCollections.has(nid)) return; // avoid cycles
-      visitedCollections.add(nid);
+      const reportedId = String(
+        (ncol && (ncol.id || ncol["@id"])) ||
+          (typeof colLike === "object" &&
+            (colLike.id || colLike["@id"])) ||
+          ""
+      );
+      const effectiveId = String(uri || reportedId || "");
+      const collectionKey = effectiveId || reportedId || uri || "";
+      const visitKey = norm(collectionKey) || collectionKey;
+      if (visitedCollections.has(visitKey)) return; // avoid cycles
+      visitedCollections.add(visitKey);
       try {
-        await saveCachedCollection(ncol, colId, parentId || "");
+        await saveCachedCollection(ncol, collectionKey, parentId || "");
       } catch (_) {}
       const itemsArr = Array.isArray(ncol.items) ? ncol.items : [];
       for (const entry of itemsArr) {
@@ -936,9 +946,9 @@ async function buildIiifCollectionPages(CONFIG) {
         const t = String(entry.type || entry["@type"] || "").toLowerCase();
         const entryId = entry.id || entry["@id"] || "";
         if (t === "manifest") {
-          tasks.push({id: entryId, parent: colId});
+          tasks.push({id: entryId, parent: collectionKey});
         } else if (t === "collection") {
-          await gatherFromCollection(entryId, colId);
+          await gatherFromCollection(entryId, collectionKey);
         }
       }
       // Traverse strictly by parent/child hierarchy (Presentation 3): items → Manifest or Collection

package/lib/build/mdx.js

@@ -11,6 +11,42 @@ const {
   ensureDirSync,
   withBase,
 } = require("../common");
+
+const EXTRA_REMARK_PLUGINS = (() => {
+  try {
+    const absPath = path.resolve(process.cwd(), "packages/helpers/docs/remark-code-meta.js");
+    if (fs.existsSync(absPath)) {
+      const plugin = require(absPath);
+      if (typeof plugin === "function") return [plugin];
+    }
+  } catch (_) {}
+  return [];
+})();
+
+function buildCompileOptions(overrides = {}) {
+  const base = {
+    jsx: false,
+    development: false,
+    providerImportSource: "@mdx-js/react",
+    jsxImportSource: "react",
+    format: "mdx",
+  };
+  const remarkPlugins = [];
+  if (overrides && Array.isArray(overrides.remarkPlugins)) {
+    remarkPlugins.push(...overrides.remarkPlugins);
+  }
+  if (EXTRA_REMARK_PLUGINS.length) {
+    remarkPlugins.push(...EXTRA_REMARK_PLUGINS);
+  }
+  if (remarkPlugins.length) {
+    base.remarkPlugins = remarkPlugins;
+  }
+  if (overrides && typeof overrides === "object") {
+    const { remarkPlugins: _omit, ...rest } = overrides;
+    Object.assign(base, rest);
+  }
+  return base;
+}
 const yaml = require("js-yaml");
 const { getPageContext } = require("../page-context");
 
@@ -255,15 +291,7 @@ async function loadAppWrapper() {
   const { compile } = await import("@mdx-js/mdx");
   const raw = await fsp.readFile(appPath, "utf8");
   const { content: source } = parseFrontmatter(raw);
-  let code = String(
-    await compile(source, {
-      jsx: false,
-      development: false,
-      providerImportSource: "@mdx-js/react",
-      jsxImportSource: "react",
-      format: "mdx",
-    })
-  );
+  let code = String(await compile(source, buildCompileOptions()));
   // MDX v3 default export (MDXContent) does not forward external children.
   // When present, expose the underlying layout function as __MDXLayout for wrapping.
   if (
@@ -307,13 +335,7 @@ async function compileMdxFile(filePath, outPath, Layout, extraProps = {}) {
   const { compile } = await import("@mdx-js/mdx");
   const raw = await fsp.readFile(filePath, "utf8");
   const { content: source } = parseFrontmatter(raw);
-  const compiled = await compile(source, {
-    jsx: false,
-    development: false,
-    providerImportSource: "@mdx-js/react",
-    jsxImportSource: "react",
-    format: "mdx",
-  });
+  const compiled = await compile(source, buildCompileOptions());
   const code = String(compiled);
   ensureDirSync(CACHE_DIR);
   const relCacheName =
@@ -449,13 +471,7 @@ async function compileMdxToComponent(filePath) {
   const { compile } = await import("@mdx-js/mdx");
   const raw = await fsp.readFile(filePath, "utf8");
   const { content: source } = parseFrontmatter(raw);
-  const compiled = await compile(source, {
-    jsx: false,
-    development: false,
-    providerImportSource: "@mdx-js/react",
-    jsxImportSource: "react",
-    format: "mdx",
-  });
+  const compiled = await compile(source, buildCompileOptions());
   const code = String(compiled);
   ensureDirSync(CACHE_DIR);
   const relCacheName =

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canopy-iiif/app",
-  "version": "0.9.2",
+  "version": "0.9.4",
   "private": false,
   "license": "MIT",
   "author": "Mat Jordan <mat@northwestern.edu>",
@@ -22,7 +22,8 @@
       "import": "./lib/orchestrator.js",
       "require": "./lib/orchestrator.js",
       "default": "./lib/orchestrator.js"
-    }
+    },
+    "./docs-legacy-compat": "./docs-legacy-compat.mjs"
   },
   "files": [
     "lib/**",