@riboseinc/anafero-cli 0.0.46 → 0.0.47

package/build-site.mjs

@@ -316514,7 +316514,6 @@ 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 normalizedFileURI = originalURI2 ?? normalizeFileURI(
@@ -316845,21 +316844,24 @@ var makeContentReader = async function(entryPointURI, storeAdapters, findContent
 function isValidPathComponent(val) {
   return val.indexOf("/") < 0 && val.indexOf(":") < 0 && val.indexOf("#") < 0;
 }
-function normalizeFileURI(rawFileURI, baseFileURI) {
-  const fileURI = rawFileURI.startsWith("./") ? rawFileURI.split("./")[1] : rawFileURI;
-  if (fileURI.startsWith("./") || fileURI.startsWith("../")) {
-    throw new Error("Malformed file URI");
+function unprefixLocalPath(filePath) {
+  return filePath.startsWith("./") ? filePath.split("./")[1] : filePath;
+}
+function normalizeFileURI(fileURI, baseFileURI) {
+  const normalizedPath = unprefixLocalPath(fileURI.split("file:")[1]);
+  if (normalizedPath.startsWith("./") || normalizedPath.startsWith("../")) {
+    throw new Error("Malformed path in file URI");
   }
+  const normalizedURI = `file:${normalizedPath}`;
   if (baseFileURI === void 0) {
-    return fileURI;
+    return normalizedURI;
   }
-  const baseFilePath = baseFileURI.startsWith("file:") ? baseFileURI.split("file:")[1] : void 0;
-  if (!baseFilePath) {
+  const basePath = baseFileURI.startsWith("file:") ? unprefixLocalPath(baseFileURI.split("file:")[1]) : void 0;
+  if (!basePath) {
     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("/")) : "";
-  return filePath.startsWith("/") ? fileURI : `file:${dirname3}${dirname3 ? "/" : ""}${filePath}`;
+  const dirname3 = basePath.indexOf("/") >= 1 ? basePath.slice(0, basePath.lastIndexOf("/")) : "";
+  return normalizedPath.startsWith("/") ? normalizedURI : `file:${dirname3}${dirname3 ? "/" : ""}${normalizedPath}`;
 }
 
 // ../anafero/process.mts

package/package.json

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