@riboseinc/anafero-cli 0.0.45 → 0.0.46

package/build-site.mjs

@@ -316514,17 +316514,21 @@ var makeContentReader = async function(entryPointURI, storeAdapters, findContent
     async function expandURI(uri) {
       const originalURI2 = originalURIs[uri];
       const isFileURI = (originalURI2 ?? uri).startsWith("file:");
+      console.debug("Expanding URI", uri, originalURI2, entryPointURI2);
       let expanded;
       if (isFileURI) {
-        const fullFileURI = originalURI2 ?? (entryPointURI2 === uri ? originalURI2 ?? uri : joinFileURI(entryPointURI2, uri));
+        const normalizedFileURI = originalURI2 ?? normalizeFileURI(
+          uri,
+          uri === entryPointURI2 ? void 0 : entryPointURI2
+        );
         try {
-          resourceReaders[fullFileURI] ??= await startReader(fullFileURI);
-          const canonicalRootResourceURI = resourceReaders[fullFileURI]?.getCanonicalRootURI?.() ?? uri;
-          canonicalURIs[fullFileURI] = canonicalRootResourceURI;
-          originalURIs[canonicalRootResourceURI] = fullFileURI;
+          resourceReaders[normalizedFileURI] ??= await startReader(normalizedFileURI);
+          const canonicalRootResourceURI = resourceReaders[normalizedFileURI]?.getCanonicalRootURI?.() ?? uri;
+          canonicalURIs[normalizedFileURI] = canonicalRootResourceURI;
+          originalURIs[canonicalRootResourceURI] = normalizedFileURI;
           expanded = canonicalRootResourceURI;
         } catch (e3) {
-          expanded = fullFileURI;
+          expanded = normalizedFileURI;
         }
       } else {
         expanded = `${uri}---${entryPointURI2}`;
@@ -316584,16 +316588,13 @@ var makeContentReader = async function(entryPointURI, storeAdapters, findContent
                   seenEntryPoints
                 );
               } else {
+                console.warn("Unable to follow relation", relation.target, originalURI2);
                 cache3.add(
                   "unresolved-relations",
                   [[subject, relation.predicate, relation.target]]
                 );
-                console.debug(
-                  "Not processing relations for",
-                  relation.target,
-                  originalURI2
-                );
               }
+            } else {
             }
           } else {
             console.debug("URI relation is seen again", relation.target);
@@ -316844,10 +316845,17 @@ var makeContentReader = async function(entryPointURI, storeAdapters, findContent
 function isValidPathComponent(val) {
   return val.indexOf("/") < 0 && val.indexOf(":") < 0 && val.indexOf("#") < 0;
 }
-function joinFileURI(baseFileURI, fileURI) {
+function normalizeFileURI(rawFileURI, baseFileURI) {
+  const fileURI = rawFileURI.startsWith("./") ? rawFileURI.split("./")[1] : rawFileURI;
+  if (fileURI.startsWith("./") || fileURI.startsWith("../")) {
+    throw new Error("Malformed file URI");
+  }
+  if (baseFileURI === void 0) {
+    return fileURI;
+  }
   const baseFilePath = baseFileURI.startsWith("file:") ? baseFileURI.split("file:")[1] : void 0;
   if (!baseFilePath) {
-    throw new Error("Trying to expand a file: URI, but respective entry point is not using that scheme");
+    throw new Error("Trying to normalize a file: URI, but base URI is not using that scheme");
   }
   const filePath = fileURI.split("file:")[1];
   const dirname3 = baseFilePath.indexOf("/") >= 1 ? baseFilePath.slice(0, baseFilePath.lastIndexOf("/")) : "";

package/package.json

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