@riboseinc/anafero-cli 0.0.43 → 0.0.44

package/build-site.mjs

@@ -316479,7 +316479,11 @@ function processAttributes(el, locateResource, reverseResource, onIntegrityViola
 
 // ../anafero/ContentReader.mts
 init_cjs_shim();
-var makeContentReader = async function(entryPointURI, storeAdapters, contentAdapter, { fetchBlob, reportProgress, decodeXML, cache: cache3 }) {
+var makeContentReader = async function(entryPointURI, storeAdapters, findContentAdapter, { fetchBlob, reportProgress, decodeXML, cache: cache3 }) {
+  const canonicalURIs = {};
+  const originalURIs = {};
+  const contentAdapters = {};
+  const resourceReaders = {};
   let totalPathCount = 0;
   let totalRelationCount = 0;
   let doneRelationCount = 0;
@@ -316488,54 +316492,110 @@ var makeContentReader = async function(entryPointURI, storeAdapters, contentAdap
     await processRelations(entryPointURI, relationsProgress);
     relationsProgress(null);
     const [hierarchyProgress] = reportProgress("prepare site structure");
-    processHierarchy(entryPointURI, "", function reportHierarchyProgress(state) {
-      hierarchyProgress({ state });
-    });
+    processHierarchy(
+      canonicalURIs[entryPointURI] ?? entryPointURI,
+      "",
+      function reportHierarchyProgress(state) {
+        hierarchyProgress({ state });
+      }
+    );
     hierarchyProgress(null);
   }
   await process14();
-  async function processRelations(entryPointURI2, onProgress) {
+  async function processRelations(entryPointURI2, onProgress, _seenEntryPoints) {
+    const seenEntryPoints = _seenEntryPoints ?? /* @__PURE__ */ new Set();
+    async function expandURI(uri) {
+      const originalURI2 = originalURIs[uri];
+      const isFileURI = (originalURI2 ?? uri).startsWith("file:");
+      let expanded;
+      if (isFileURI) {
+        const fullFileURI = originalURI2 ?? (entryPointURI2 === uri ? originalURI2 ?? uri : joinFileURI(entryPointURI2, uri));
+        try {
+          resourceReaders[fullFileURI] ??= await startReader(fullFileURI);
+          const canonicalRootResourceURI = resourceReaders[fullFileURI]?.getCanonicalRootURI?.() ?? uri;
+          canonicalURIs[fullFileURI] = canonicalRootResourceURI;
+          originalURIs[canonicalRootResourceURI] = fullFileURI;
+          expanded = canonicalRootResourceURI;
+        } catch (e3) {
+          expanded = fullFileURI;
+        }
+      } else {
+        expanded = `${uri}---${entryPointURI2}`;
+      }
+      return expanded;
+    }
+    const subjectRelations = {};
     function handleRelations(triples) {
-      const subjectRelations = {};
-      for (const [s2, predicate, target] of triples) {
+      for (const [s2, predicate, t3] of triples) {
         const subject = s2 === ROOT_SUBJECT ? entryPointURI2 : s2;
+        const target = t3;
         subjectRelations[subject] ??= [];
         subjectRelations[subject].push({ predicate, target });
-        cache3.add(`edges-from/${subject}/${predicate}`, [target]);
-      }
-      for (const [subject, relations] of Object.entries(subjectRelations)) {
-        cache3.add(`edges-from/${subject}`, relations);
-        cache3.add(`${entryPointURI2}/subjects`, [subject]);
       }
       doneRelationCount += triples.length;
       onProgress({ done: doneRelationCount, total: totalRelationCount });
     }
-    const reader = await startReader(entryPointURI2);
-    totalRelationCount += reader.estimateRelationCount();
-    onProgress({ total: totalRelationCount });
-    reader.discoverAllResources(handleRelations, {
-      onProgress: function(msg) {
-        onProgress({
-          state: `${entryPointURI2}->\u2026->${msg}`
-        });
+    const canonicalURI = await expandURI(entryPointURI2);
+    const originalURI = originalURIs[canonicalURI] ?? canonicalURI;
+    const reader = resourceReaders[originalURI];
+    if (reader) {
+      totalRelationCount += reader.estimateRelationCount();
+      onProgress({ total: totalRelationCount });
+      reader.discoverAllResources(handleRelations, {
+        onProgress: function(msg) {
+          onProgress({
+            state: `${decodeURIComponent(canonicalURI)}->\u2026->${msg}`
+          });
+        }
+      });
+    }
+    for (const [subject, relations] of Object.entries(subjectRelations)) {
+      delete subjectRelations[subject];
+      const expandedSubject = await expandURI(subject);
+      const expandedRelations = [];
+      for (const { predicate, target } of relations) {
+        let expandedTarget;
+        expandedTarget = isURIString(target) ? await expandURI(target) : target;
+        cache3.add(`edges-from/${expandedSubject}/${predicate}`, [expandedTarget]);
+        expandedRelations.push({ predicate, target: expandedTarget });
       }
-    });
+      cache3.add(`edges-from/${expandedSubject}`, expandedRelations);
+      cache3.add(`${entryPointURI2}/subjects`, [expandedSubject]);
+    }
     for (const subject of cache3.iterate(`${entryPointURI2}/subjects`)) {
       for (const relation of cache3.iterate(`edges-from/${subject}`)) {
         if (isURIString(relation.target)) {
-          if (!cache3.has(`edges-from/${relation.target}`)) {
-            if (relation.target.startsWith("file:")) {
-              const fullFileURI = joinFileURI(entryPointURI2, relation.target);
-              processRelations(fullFileURI, onProgress);
-            } else {
-              cache3.add("unresolved-relations", [[subject, relation.predicate, relation.target]]);
+          if (!seenEntryPoints.has(relation.target)) {
+            seenEntryPoints.add(relation.target);
+            const originalURI2 = originalURIs[relation.target] ?? relation.target;
+            const isFileURI = originalURI2.startsWith("file:");
+            if (isFileURI) {
+              if (resourceReaders[originalURI2]) {
+                await processRelations(
+                  relation.target,
+                  onProgress,
+                  seenEntryPoints
+                );
+              } else {
+                cache3.add(
+                  "unresolved-relations",
+                  [[subject, relation.predicate, relation.target]]
+                );
+                console.debug(
+                  "Not processing relations for",
+                  relation.target,
+                  originalURI2
+                );
+              }
             }
+          } else {
+            console.debug("URI relation is seen again", relation.target);
           }
         }
       }
     }
   }
-  function maybeGetPathComponent(relation) {
+  function maybeGetPathComponent(contentAdapter, relation) {
     if (!isURIString(relation.target) || contentAdapter.crossReferences?.(relation)) {
       return null;
     }
@@ -316611,6 +316671,11 @@ var makeContentReader = async function(entryPointURI, storeAdapters, contentAdap
   function getResourceGraph(resourceURI) {
     if (!cache3.has(`graphs/${resourceURI}`)) {
       cache3.add(`graphs/${resourceURI}`, []);
+      const contentAdapter = contentAdapters[resourceURI];
+      if (!contentAdapter) {
+        console.error("Resource does not have associated content adapter on record", resourceURI);
+        throw new Error("Resource does not have associated content adapter on record");
+      }
       const queue = [resourceURI];
       while (queue.length > 0) {
         const currentResource = queue.pop();
@@ -316637,7 +316702,8 @@ var makeContentReader = async function(entryPointURI, storeAdapters, contentAdap
     }
     return cache3.list(`graphs/${resourceURI}`);
   }
-  function processResourceContents(resourceURI, containingResourcePath, _seen) {
+  function processResourceContents(contentAdapter, resourceURI, containingResourcePath, _seen) {
+    contentAdapters[resourceURI] = contentAdapter;
     const seen = _seen ?? /* @__PURE__ */ new Set();
     cache3.set({
       [`path-for/${resourceURI}`]: `${containingResourcePath}#${resourceURI}`
@@ -316650,15 +316716,18 @@ var makeContentReader = async function(entryPointURI, storeAdapters, contentAdap
           continue;
         } else {
           seen.add(key);
-          processResourceContents(rel.target, containingResourcePath, seen);
+          processResourceContents(contentAdapter, rel.target, containingResourcePath, seen);
         }
       }
     }
   }
   function processHierarchy(resourceURI, pathPrefix, onProgress) {
+    const canonicalURI = canonicalURIs[resourceURI] ?? resourceURI;
+    const contentAdapter = findContentAdapter(canonicalURI);
+    contentAdapters[canonicalURI] = contentAdapter;
     cache3.add("all-paths", [pathPrefix]);
-    cache3.set({ [pathPrefix]: resourceURI });
-    cache3.set({ [`path-for/${resourceURI}`]: pathPrefix });
+    cache3.set({ [pathPrefix]: canonicalURI });
+    cache3.set({ [`path-for/${canonicalURI}`]: pathPrefix });
     onProgress(`${pathPrefix ?? "/"}: ${resourceURI}`);
     totalPathCount += 1;
     const parentPath = pathPrefix !== "" ? pathPrefix.includes("/") ? pathPrefix.slice(0, pathPrefix.lastIndexOf("/")) : "" : null;
@@ -316676,8 +316745,8 @@ var makeContentReader = async function(entryPointURI, storeAdapters, contentAdap
         [`${pathPrefix}/parents`]: parentPaths
       });
     }
-    for (const rel of generateRelations(resourceURI)) {
-      const maybePathComponent = maybeGetPathComponent(rel);
+    for (const rel of generateRelations(canonicalURI)) {
+      const maybePathComponent = maybeGetPathComponent(contentAdapter, rel);
       if (maybePathComponent) {
         if (!isValidPathComponent(maybePathComponent)) {
           console.error("Generated path component is not valid", maybePathComponent, rel);
@@ -316685,26 +316754,31 @@ var makeContentReader = async function(entryPointURI, storeAdapters, contentAdap
         }
         const newPath = pathPrefix ? `${pathPrefix}/${maybePathComponent}` : maybePathComponent;
         processHierarchy(rel.target, newPath, onProgress);
-      } else {
-        processResourceContents(rel.target, pathPrefix);
+      } else if (isURIString(rel.target)) {
+        processResourceContents(contentAdapter, rel.target, pathPrefix);
       }
     }
   }
+  function getCachedResourceURIForPath(path3) {
+    const resourceURI = cache3.get(path3);
+    if (!resourceURI) {
+      throw new Error("Unable to obtain resource URI for path");
+    }
+    const canonicalURI = canonicalURIs[resourceURI] ?? resourceURI;
+    return canonicalURI;
+  }
   function* generateAllPaths() {
     for (const path3 of cache3.iterate("all-paths")) {
-      const resourceURI = cache3.get(path3);
-      if (!resourceURI) {
-        throw new Error("Have path, but not its resource URI during processing");
-      }
+      const resourceURI = getCachedResourceURIForPath(path3);
       yield {
         path: path3,
         resourceURI,
         directDescendants: cache3.has(`${path3}/direct-descendants`) ? cache3.list(`${path3}/direct-descendants`).map((path4) => {
-          const res = cache3.get(path4);
+          const res = getCachedResourceURIForPath(path4);
           return [`/${path4}`, res, getResourceGraph(res)];
         }) : [],
         parentChain: path3 !== "" ? cache3.list(`${path3}/parents`).map((path4) => {
-          const res = cache3.get(path4);
+          const res = getCachedResourceURIForPath(path4);
           return [`/${path4}`, res, getResourceGraph(res)];
         }) : []
       };
@@ -316905,15 +316979,21 @@ async function* generateVersion(cfg, fetchBlobAtThisVersion, {
   ).join("\n");
   const extraHead = `${dependencyCSS}
 ${inject.head ?? ""}`;
-  const contentAdapter = contentAdapters[cfg.contentAdapters[0]];
-  const findContentAdapter = function(relations) {
-    return [cfg.contentAdapters[0], contentAdapter];
+  const findContentAdapter = function(resourceURI) {
+    for (const [moduleID, contentAdapter] of Object.entries(contentAdapters)) {
+      if (contentAdapter.canGenerateContent(resourceURI)) {
+        return [moduleID, contentAdapter];
+      }
+    }
+    throw new Error(`No content adapters report capability to generate content for ${resourceURI}`);
   };
   const [contentReaderInitProgress, contentReaderSubtask] = reportProgress("read source data");
   const reader = await makeContentReader(
     cfg.entryPoint,
     Object.values(storeAdapters),
-    contentAdapter,
+    function _findContentAdapter(resourceURI) {
+      return findContentAdapter(resourceURI)[1];
+    },
     {
       fetchBlob: fetchBlobAtThisVersion,
       decodeXML,
@@ -316947,6 +317027,13 @@ ${inject.head ?? ""}`;
   const [allPathProgress, pathSubtask] = reportProgress("build page content", { total: totalPaths, done: done11 });
   const hierarchicalResources = reader.generatePaths();
   for (const { path: path3, resourceURI, parentChain, directDescendants } of hierarchicalResources) {
+    let contentAdapter;
+    try {
+      contentAdapter = findContentAdapter(resourceURI)?.[1];
+    } catch (e3) {
+      console.error("Unable to find content adapter for resource", resourceURI, e3);
+      continue;
+    }
     done11 += 1;
     allPathProgress({ total: totalPaths, done: done11 });
     if (path3.startsWith("/")) {
@@ -317024,14 +317111,14 @@ ${inject.head ?? ""}`;
       { head: extraHead, tail: inject.tail, htmlAttrs: inject.htmlAttrs },
       maybeMainTitle ?? "Workspace",
       resourceMeta.primaryLanguageID ?? maybePrimaryLanguageID ?? "en",
-      function describe(relations2) {
-        const maybeAdapter = findContentAdapter(relations2);
+      function describe(relations2, uri) {
+        const maybeAdapter = findContentAdapter(uri);
         return maybeAdapter ? maybeAdapter[1].describe(relations2) : null;
       },
       function generateContent(relations2, uri) {
         if (!contentCache[uri]) {
           let content;
-          const maybeAdapter = findContentAdapter(relations2);
+          const maybeAdapter = findContentAdapter(uri);
           if (maybeAdapter) {
             try {
               content = maybeAdapter[1].generateContent(
@@ -317060,7 +317147,7 @@ ${inject.head ?? ""}`;
                   resourceGraph.push([inPageResourceID, "isDefinedBy", `${path3}/resource.json`]);
                   resourceDescriptions[inPageResourceID] = {
                     primaryLanguageID: maybePrimaryLanguageID,
-                    ...contentAdapter.describe(relativeGraph(relations2, inPageResourceID))
+                    ...maybeAdapter[1].describe(relativeGraph(relations2, inPageResourceID))
                   };
                 } else {
                   console.warn(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@riboseinc/anafero-cli",
   "type": "module",
-  "version": "0.0.43",
+  "version": "0.0.44",
   "packageManager": "yarn@4.5.0",
   "bin": {
     "build-site": "build-site.mjs"