@riboseinc/anafero-cli 0.0.10 → 0.0.11

package/build-site.mjs

@@ -316933,25 +316933,38 @@ var makeContentReader = async function(entryPointURI, storeAdapters, contentAdap
     }
   }
   function* generateRelations(resourceURI) {
-    const chunkSize = 1e3;
-    let finished = false;
-    let cursor4 = 0;
-    while (!finished) {
-      const relations = cache3.list(
-        `edges-from/${resourceURI}`,
-        { start: cursor4, size: chunkSize }
-      );
-      if (relations.length > 0) {
-        yield* relations;
-        cursor4 += chunkSize;
-      } else {
-        finished = true;
+    if (cache3.has(`edges-from/${resourceURI}`)) {
+      const chunkSize = 1e3;
+      let finished = false;
+      let cursor4 = 0;
+      while (!finished) {
+        const relations = cache3.list(
+          `edges-from/${resourceURI}`,
+          { start: cursor4, size: chunkSize }
+        );
+        if (relations.length > 0) {
+          yield* relations;
+          cursor4 += chunkSize;
+        } else {
+          finished = true;
+        }
       }
     }
   }
+  function isInPageHierarchy(resourceURI) {
+    if (cache3.has(`graphs/${resourceURI}`)) {
+      try {
+        const path3 = cache3.get(`path-for/${resourceURI}`);
+        return path3 && path3.indexOf("#") < 1;
+      } catch (e2) {
+        return false;
+      }
+    } else {
+      return false;
+    }
+  }
   function getResourceGraph(resourceURI) {
     if (!cache3.has(`graphs/${resourceURI}`)) {
-      const resourcePath = cache3.get(`path-for/${resourceURI}`);
       const queue = [resourceURI];
       while (queue.length > 0) {
         const currentResource = queue.pop();
@@ -316966,13 +316979,8 @@ var makeContentReader = async function(entryPointURI, storeAdapters, contentAdap
               target
             ])
           );
-          if (currentResource !== resourceURI) {
-            cache3.set({
-              [`path-for/${currentResource}`]: `${resourcePath}#${currentResource}`
-            });
-          }
           const newTargets = relations.filter(({ target }) => isURIString(target)).filter(
-            (rel) => !cache3.has(`path-for/${rel.target}`) && !contentAdapter.crossReferences?.(rel)
+            (rel) => !isInPageHierarchy(rel.target) && !contentAdapter.crossReferences?.(rel)
           ).filter((rel) => !queue.includes(rel.target)).map(({ target }) => target);
           queue.push(...newTargets);
         }
@@ -316980,6 +316988,20 @@ var makeContentReader = async function(entryPointURI, storeAdapters, contentAdap
     }
     return cache3.list(`graphs/${resourceURI}`);
   }
+  function processResourceContents(resourceURI, containingResourcePath) {
+    if (containingResourcePath.indexOf("tocC/tocC_03/tocC_03_01/tocC_03_01_04") >= 0) {
+      console.debug("Marking as contained", containingResourcePath, resourceURI);
+      console.debug(`${containingResourcePath}#${resourceURI}`);
+    }
+    cache3.set({
+      [`path-for/${resourceURI}`]: `${containingResourcePath}#${resourceURI}`
+    });
+    for (const rel of generateRelations(resourceURI)) {
+      if (isURIString(rel.target) && !contentAdapter.crossReferences?.(rel)) {
+        processResourceContents(containingResourcePath, rel.target);
+      }
+    }
+  }
   function processHierarchy(resourceURI, pathPrefix, onProgress) {
     cache3.add("all-paths", [pathPrefix]);
     cache3.set({ [pathPrefix]: resourceURI });
@@ -317010,6 +317032,8 @@ var makeContentReader = async function(entryPointURI, storeAdapters, contentAdap
         const encodedComponent = maybePathComponent.replace(":", "_");
         const newPath = pathPrefix ? `${pathPrefix}/${encodedComponent}` : encodedComponent;
         processHierarchy(rel.target, newPath, onProgress);
+      } else {
+        processResourceContents(rel.target, pathPrefix);
       }
     }
   }
@@ -317313,6 +317337,8 @@ ${inject.head ?? ""}`;
         onIntegrityViolation: console.warn,
         reverseResource: (path4) => getReverseResourceMap()[path4],
         uri: resourceURI,
+        // TODO: Consider slash-prepending the outcome of findURL,
+        // if it’s reliably not slash-prepended
         locateResource: (uri) => expandVersionedPath(reader.findURL(uri))
       },
       expandVersionedPath,

package/package.json

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