@riboseinc/anafero-cli 0.0.42 → 0.0.43

package/build-site.mjs

@@ -313125,6 +313125,7 @@ __export(anafero_exports, {
   gatherDescribedResourcesFromJsonifiedProseMirrorNode: () => gatherDescribedResourcesFromJsonifiedProseMirrorNode,
   gatherTextFromJsonifiedProseMirrorNode: () => gatherTextFromJsonifiedProseMirrorNode,
   getAllParentPaths: () => getAllParentPaths,
+  isURIString: () => isURIString,
   makeDummyInMemoryCache: () => makeDummyInMemoryCache,
   parseModuleRef: () => parseModuleRef,
   stripLeadingSlash: () => stripLeadingSlash,
@@ -313192,6 +313193,38 @@ function getAllParentPaths(aPath) {
   return parents;
 }
 
+// ../anafero/URI.mts
+init_cjs_shim();
+function makeURI(input) {
+  const match19 = ("" + input).match(pattern2);
+  if (!match19) {
+    throw new SyntaxError("Invalid URI");
+  }
+  return {
+    protocol: match19[1],
+    slashes: match19[2],
+    authority: match19[3],
+    host: match19[4],
+    port: match19[5],
+    path: match19[6] || match19[7] || match19[8],
+    query: match19[9],
+    hash: match19[10]
+  };
+}
+function isURIString(input) {
+  return ["urn:", "http:", "https:", "ftp:", "file:"].find((prefix) => input.startsWith(prefix)) !== void 0;
+  if (input.startsWith("urn:")) {
+    return true;
+  }
+  try {
+    makeURI(input);
+    return true;
+  } catch (e3) {
+    return false;
+  }
+}
+var pattern2 = new RegExp("([A-Za-z][A-Za-z0-9+\\-.]{2,6}):(?:(//)(?:((?:[A-Za-z0-9\\-._~!$&'()*+,;=:]|%[0-9A-Fa-f]{2})*)@)?((?:\\[(?:(?:(?:(?:[0-9A-Fa-f]{1,4}:){6}|::(?:[0-9A-Fa-f]{1,4}:){5}|(?:[0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:){4}|(?:(?:[0-9A-Fa-f]{1,4}:){0,1}[0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:){3}|(?:(?:[0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:){2}|(?:(?:[0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})?::[0-9A-Fa-f]{1,4}:|(?:(?:[0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})?::)(?:[0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))|(?:(?:[0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})?::[0-9A-Fa-f]{1,4}|(?:(?:[0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})?::)|[Vv][0-9A-Fa-f]+\\.[A-Za-z0-9\\-._~!$&'()*+,;=:]+)\\]|(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|(?:[A-Za-z0-9\\-._~!$&'()*+,;=]|%[0-9A-Fa-f]{2})*))(?::([0-9]*))?((?:/(?:[A-Za-z0-9\\-._~!$&'()*+,;=:@]|%[0-9A-Fa-f]{2})*)*)|/((?:(?:[A-Za-z0-9\\-._~!$&'()*+,;=:@]|%[0-9A-Fa-f]{2})+(?:/(?:[A-Za-z0-9\\-._~!$&'()*+,;=:@]|%[0-9A-Fa-f]{2})*)*)?)|((?:[A-Za-z0-9\\-._~!$&'()*+,;=:@]|%[0-9A-Fa-f]{2})+(?:/(?:[A-Za-z0-9\\-._~!$&'()*+,;=:@]|%[0-9A-Fa-f]{2})*)*)|)(?:\\?((?:[A-Za-z0-9\\-._~!$&'()*+,;=:@/?]|%[0-9A-Fa-f]{2})*))?(?:\\#((?:[A-Za-z0-9\\-._~!$&'()*+,;=:@/?]|%[0-9A-Fa-f]{2})*))?");
+
 // ../firelight-gui/loader.mts
 init_cjs_shim();
 
@@ -316446,40 +316479,6 @@ function processAttributes(el, locateResource, reverseResource, onIntegrityViola
 
 // ../anafero/ContentReader.mts
 init_cjs_shim();
-
-// ../anafero/URI.mts
-init_cjs_shim();
-function makeURI(input) {
-  const match19 = ("" + input).match(pattern2);
-  if (!match19) {
-    throw new SyntaxError("Invalid URI");
-  }
-  return {
-    protocol: match19[1],
-    slashes: match19[2],
-    authority: match19[3],
-    host: match19[4],
-    port: match19[5],
-    path: match19[6] || match19[7] || match19[8],
-    query: match19[9],
-    hash: match19[10]
-  };
-}
-function isURIString(input) {
-  return ["urn:", "http:", "https:", "ftp:", "file:"].find((prefix) => input.startsWith(prefix)) !== void 0;
-  if (input.startsWith("urn:")) {
-    return true;
-  }
-  try {
-    makeURI(input);
-    return true;
-  } catch (e3) {
-    return false;
-  }
-}
-var pattern2 = new RegExp("([A-Za-z][A-Za-z0-9+\\-.]{2,6}):(?:(//)(?:((?:[A-Za-z0-9\\-._~!$&'()*+,;=:]|%[0-9A-Fa-f]{2})*)@)?((?:\\[(?:(?:(?:(?:[0-9A-Fa-f]{1,4}:){6}|::(?:[0-9A-Fa-f]{1,4}:){5}|(?:[0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:){4}|(?:(?:[0-9A-Fa-f]{1,4}:){0,1}[0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:){3}|(?:(?:[0-9A-Fa-f]{1,4}:){0,2}[0-9A-Fa-f]{1,4})?::(?:[0-9A-Fa-f]{1,4}:){2}|(?:(?:[0-9A-Fa-f]{1,4}:){0,3}[0-9A-Fa-f]{1,4})?::[0-9A-Fa-f]{1,4}:|(?:(?:[0-9A-Fa-f]{1,4}:){0,4}[0-9A-Fa-f]{1,4})?::)(?:[0-9A-Fa-f]{1,4}:[0-9A-Fa-f]{1,4}|(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))|(?:(?:[0-9A-Fa-f]{1,4}:){0,5}[0-9A-Fa-f]{1,4})?::[0-9A-Fa-f]{1,4}|(?:(?:[0-9A-Fa-f]{1,4}:){0,6}[0-9A-Fa-f]{1,4})?::)|[Vv][0-9A-Fa-f]+\\.[A-Za-z0-9\\-._~!$&'()*+,;=:]+)\\]|(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)|(?:[A-Za-z0-9\\-._~!$&'()*+,;=]|%[0-9A-Fa-f]{2})*))(?::([0-9]*))?((?:/(?:[A-Za-z0-9\\-._~!$&'()*+,;=:@]|%[0-9A-Fa-f]{2})*)*)|/((?:(?:[A-Za-z0-9\\-._~!$&'()*+,;=:@]|%[0-9A-Fa-f]{2})+(?:/(?:[A-Za-z0-9\\-._~!$&'()*+,;=:@]|%[0-9A-Fa-f]{2})*)*)?)|((?:[A-Za-z0-9\\-._~!$&'()*+,;=:@]|%[0-9A-Fa-f]{2})+(?:/(?:[A-Za-z0-9\\-._~!$&'()*+,;=:@]|%[0-9A-Fa-f]{2})*)*)|)(?:\\?((?:[A-Za-z0-9\\-._~!$&'()*+,;=:@/?]|%[0-9A-Fa-f]{2})*))?(?:\\#((?:[A-Za-z0-9\\-._~!$&'()*+,;=:@/?]|%[0-9A-Fa-f]{2})*))?");
-
-// ../anafero/ContentReader.mts
 var makeContentReader = async function(entryPointURI, storeAdapters, contentAdapter, { fetchBlob, reportProgress, decodeXML, cache: cache3 }) {
   let totalPathCount = 0;
   let totalRelationCount = 0;
@@ -316545,10 +316544,11 @@ var makeContentReader = async function(entryPointURI, storeAdapters, contentAdap
     }
     const maybeContributingRelations = contentAdapter.contributingToHierarchy.filter((r4) => r4[0] === relation.predicate).map((r4) => r4.slice(1));
     if (maybeContributingRelations.length > 0) {
-      return resolvePredicateChainsToFirstValue(
+      const result = resolvePredicateChainsToFirstValue(
         relation.target,
         maybeContributingRelations
       );
+      return result ? result.replaceAll(":", "_").replaceAll("/", "_") : result;
     }
     return null;
   }
@@ -316610,6 +316610,7 @@ var makeContentReader = async function(entryPointURI, storeAdapters, contentAdap
   }
   function getResourceGraph(resourceURI) {
     if (!cache3.has(`graphs/${resourceURI}`)) {
+      cache3.add(`graphs/${resourceURI}`, []);
       const queue = [resourceURI];
       while (queue.length > 0) {
         const currentResource = queue.pop();
@@ -316679,10 +316680,10 @@ var makeContentReader = async function(entryPointURI, storeAdapters, contentAdap
       const maybePathComponent = maybeGetPathComponent(rel);
       if (maybePathComponent) {
         if (!isValidPathComponent(maybePathComponent)) {
+          console.error("Generated path component is not valid", maybePathComponent, rel);
           throw new Error("Generated path component is not valid");
         }
-        const encodedComponent = maybePathComponent.replace(":", "_");
-        const newPath = pathPrefix ? `${pathPrefix}/${encodedComponent}` : encodedComponent;
+        const newPath = pathPrefix ? `${pathPrefix}/${maybePathComponent}` : maybePathComponent;
         processHierarchy(rel.target, newPath, onProgress);
       } else {
         processResourceContents(rel.target, pathPrefix);
@@ -316751,16 +316752,16 @@ var makeContentReader = async function(entryPointURI, storeAdapters, contentAdap
     const validAdapters = storeAdapters.filter((mod) => mod.canResolve(resourceURI) && mod.readerFromBlob !== void 0);
     for (const mod of validAdapters) {
       try {
-        return (await mod.readerFromBlob(blob, { decodeXML }))[1];
+        const reader = (await mod.readerFromBlob(blob, { decodeXML }))[1];
+        return reader;
       } catch (e3) {
-        console.warn("Failed to create resource reader for URI", mod.name, resourceURI);
       }
     }
-    throw new Error("Failed to initialize resource reader");
+    throw new Error(`Failed to initialize resource reader for ${resourceURI}`);
   }
 };
 function isValidPathComponent(val) {
-  return val.indexOf("/") < 0 && val.indexOf("#") < 0;
+  return val.indexOf("/") < 0 && val.indexOf(":") < 0 && val.indexOf("#") < 0;
 }
 function joinFileURI(baseFileURI, fileURI) {
   const baseFilePath = baseFileURI.startsWith("file:") ? baseFileURI.split("file:")[1] : void 0;
@@ -316982,14 +316983,22 @@ ${inject.head ?? ""}`;
     for (const [, , o2] of relations) {
       if (o2.startsWith("file:")) {
         const filePath = o2.split("file:")[1];
-        const filename = encodeURIComponent(filePath);
+        const filename = o2.replaceAll("/", "_").replaceAll(":", "_");
         if (!assetsToWrite[filename]) {
-          assetsToWrite[filename] = await fetchBlobAtThisVersion(filePath);
-          resourceGraph.push([resourceURI, "isDownloadableAt", filename]);
-          resourceMap[filename] = o2;
-          resourceDescriptions[o2] = {
-            labelInPlainText: filePath
-          };
+          try {
+            assetsToWrite[filename] = await fetchBlobAtThisVersion(filePath);
+            resourceGraph.push([
+              o2,
+              "isDownloadableAt",
+              filename
+            ]);
+            resourceMap[filename] = o2;
+            resourceDescriptions[o2] = {
+              labelInPlainText: filePath
+            };
+          } catch (e3) {
+            console.error("Failed to fetch asset", filePath);
+          }
         }
       }
     }

package/package.json

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