@jsenv/core 39.7.5 → 39.7.6

package/dist/html/{html_404_and_parent_dir.html → html_404_and_ancestor_dir.html}

@@ -195,10 +195,10 @@
         No entry on the filesystem for <code>/${fileRelativeUrl}</code> (at
         ${fileUrl})
         <br>
-        Content of the parent directory is listed below:
+        Content of the ancestor directory is listed below:
       </span>
     </p>
-    <h1 class="directory_nav">${parentDirectoryNav}</h1>
-    ${parentDirectoryContent}
+    <h1 class="directory_nav">${ancestorDirectoryNav}</h1>
+    ${ancestorDirectoryContent}
   </body>
 </html>

package/dist/jsenv_core.js

@@ -18890,8 +18890,8 @@ const resolveSymlink = (fileUrl) => {
   return realUrlObject.href;
 };
 
-const html404AndParentDirFileUrl = new URL(
-  "./html/html_404_and_parent_dir.html",
+const html404AndAncestorDirFileUrl = new URL(
+  "./html/html_404_and_ancestor_dir.html",
   import.meta.url,
 );
 const htmlFileUrlForDirectory = new URL(
@@ -18959,68 +18959,86 @@ const jsenvPluginProtocolFile = ({
         if (!urlInfo.url.startsWith("file:")) {
           return null;
         }
-        const urlObject = new URL(urlInfo.url);
-        const { firstReference } = urlInfo;
-        if (firstReference.leadsToADirectory) {
-          const directoryContentArray = readdirSync(urlObject);
-          if (firstReference.type === "filesystem") {
-            const content = JSON.stringify(directoryContentArray, null, "  ");
+        const generateContent = () => {
+          const urlObject = new URL(urlInfo.url);
+          const { firstReference } = urlInfo;
+          if (firstReference.leadsToADirectory) {
+            const directoryContentArray = readdirSync(urlObject);
+            if (firstReference.type === "filesystem") {
+              const content = JSON.stringify(directoryContentArray, null, "  ");
+              return {
+                type: "directory",
+                contentType: "application/json",
+                content,
+              };
+            }
+            const acceptsHtml = urlInfo.context.request
+              ? pickContentType(urlInfo.context.request, ["text/html"])
+              : false;
+            if (acceptsHtml) {
+              firstReference.expectedType = "html";
+              const html = generateHtmlForDirectory(
+                urlObject.href,
+                directoryContentArray,
+                urlInfo.context.rootDirectoryUrl,
+              );
+              return {
+                type: "html",
+                contentType: "text/html",
+                content: html,
+              };
+            }
             return {
               type: "directory",
               contentType: "application/json",
-              content,
-            };
-          }
-          const acceptsHtml = urlInfo.context.request
-            ? pickContentType(urlInfo.context.request, ["text/html"])
-            : false;
-          if (acceptsHtml) {
-            firstReference.expectedType = "html";
-            const html = generateHtmlForDirectory(
-              urlObject.href,
-              directoryContentArray,
-              urlInfo.context.rootDirectoryUrl,
-            );
-            return {
-              type: "html",
-              contentType: "text/html",
-              content: html,
+              content: JSON.stringify(directoryContentArray, null, "  "),
             };
           }
+          const contentType = CONTENT_TYPE.fromUrlExtension(urlInfo.url);
+          const fileBuffer = readFileSync(urlObject);
+          const content = CONTENT_TYPE.isTextual(contentType)
+            ? String(fileBuffer)
+            : fileBuffer;
           return {
-            type: "directory",
-            contentType: "application/json",
-            content: JSON.stringify(directoryContentArray, null, "  "),
+            content,
+            contentType,
+            contentLength: fileBuffer.length,
           };
-        }
-        const contentType = CONTENT_TYPE.fromUrlExtension(urlInfo.url);
+        };
+
         const request = urlInfo.context.request;
         if (request && request.headers["sec-fetch-dest"] === "document") {
           try {
-            const fileBuffer = readFileSync(urlObject);
-            const content = CONTENT_TYPE.isTextual(contentType)
-              ? String(fileBuffer)
-              : fileBuffer;
-            return {
-              content,
-              contentType,
-              contentLength: fileBuffer.length,
-            };
+            return generateContent();
           } catch (e) {
             if (e.code !== "ENOENT") {
               throw e;
             }
-            const parentDirectoryUrl = new URL("./", urlInfo.url);
-            if (!existsSync(parentDirectoryUrl)) {
-              throw e;
+            const rootDirectoryUrl = urlInfo.context.rootDirectoryUrl;
+            let firstExistingAncestorDirectoryUrl = new URL("./", urlInfo.url);
+            while (!existsSync(firstExistingAncestorDirectoryUrl)) {
+              firstExistingAncestorDirectoryUrl = new URL(
+                "../",
+                firstExistingAncestorDirectoryUrl,
+              );
+              if (
+                !urlIsInsideOf(
+                  firstExistingAncestorDirectoryUrl,
+                  rootDirectoryUrl,
+                )
+              ) {
+                firstExistingAncestorDirectoryUrl = rootDirectoryUrl;
+                break;
+              }
             }
-            const parentDirectoryContentArray = readdirSync(
-              new URL(parentDirectoryUrl),
+
+            const firstExistingAncestorDirectoryContent = readdirSync(
+              new URL(firstExistingAncestorDirectoryUrl),
             );
             const html = generateHtmlForENOENT(
               urlInfo.url,
-              parentDirectoryContentArray,
-              parentDirectoryUrl,
+              firstExistingAncestorDirectoryContent,
+              firstExistingAncestorDirectoryUrl,
               urlInfo.context.rootDirectoryUrl,
               directoryListingUrlMocks,
             );
@@ -19034,15 +19052,7 @@ const jsenvPluginProtocolFile = ({
             };
           }
         }
-        const fileBuffer = readFileSync(urlObject);
-        const content = CONTENT_TYPE.isTextual(contentType)
-          ? String(fileBuffer)
-          : fileBuffer;
-        return {
-          content,
-          contentType,
-          contentLength: fileBuffer.length,
-        };
+        return generateContent();
       },
     },
   ];
@@ -19073,17 +19083,17 @@ const generateHtmlForDirectory = (
 };
 const generateHtmlForENOENT = (
   url,
-  parentDirectoryContentArray,
-  parentDirectoryUrl,
+  ancestorDirectoryContentArray,
+  ancestorDirectoryUrl,
   rootDirectoryUrl,
   directoryListingUrlMocks,
 ) => {
-  const htmlFor404AndParentDir = String(
-    readFileSync(html404AndParentDirFileUrl),
+  const htmlFor404AndAncestorDir = String(
+    readFileSync(html404AndAncestorDirFileUrl),
   );
   const fileRelativeUrl = urlToRelativeUrl(url, rootDirectoryUrl);
-  const parentDirectoryRelativeUrl = urlToRelativeUrl(
-    parentDirectoryUrl,
+  const ancestorDirectoryRelativeUrl = urlToRelativeUrl(
+    ancestorDirectoryUrl,
     rootDirectoryUrl,
   );
   const replacers = {
@@ -19091,18 +19101,18 @@ const generateHtmlForENOENT = (
       ? `@jsenv/core/${urlToRelativeUrl(url, jsenvCoreDirectoryUrl)}`
       : url,
     fileRelativeUrl,
-    parentDirectoryUrl,
-    parentDirectoryRelativeUrl,
-    parentDirectoryNav: () =>
-      generateDirectoryNav(parentDirectoryRelativeUrl, rootDirectoryUrl),
-    parentDirectoryContent: () =>
+    ancestorDirectoryUrl,
+    ancestorDirectoryRelativeUrl,
+    ancestorDirectoryNav: () =>
+      generateDirectoryNav(ancestorDirectoryRelativeUrl, rootDirectoryUrl),
+    ancestorDirectoryContent: () =>
       generateDirectoryContent(
-        parentDirectoryContentArray,
-        parentDirectoryUrl,
+        ancestorDirectoryContentArray,
+        ancestorDirectoryUrl,
         rootDirectoryUrl,
       ),
   };
-  const html = replacePlaceholders$1(htmlFor404AndParentDir, replacers);
+  const html = replacePlaceholders$1(htmlFor404AndAncestorDir, replacers);
   return html;
 };
 const generateDirectoryNav = (relativeUrl, rootDirectoryUrl) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "39.7.5",
+  "version": "39.7.6",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {

package/src/plugins/protocol_file/client/{html_404_and_parent_dir.html → html_404_and_ancestor_dir.html}

@@ -45,10 +45,10 @@
         No entry on the filesystem for <code>/${fileRelativeUrl}</code> (at
         ${fileUrl})
         <br />
-        Content of the parent directory is listed below:
+        Content of the ancestor directory is listed below:
       </span>
     </p>
-    <h1 class="directory_nav">${parentDirectoryNav}</h1>
-    ${parentDirectoryContent}
+    <h1 class="directory_nav">${ancestorDirectoryNav}</h1>
+    ${ancestorDirectoryContent}
   </body>
 </html>

package/src/plugins/protocol_file/jsenv_plugin_protocol_file.js

@@ -14,8 +14,8 @@ import { existsSync, lstatSync, readdirSync, readFileSync } from "node:fs";
 import { jsenvCoreDirectoryUrl } from "../../jsenv_core_directory_url.js";
 import { jsenvPluginFsRedirection } from "./jsenv_plugin_fs_redirection.js";
 
-const html404AndParentDirFileUrl = new URL(
-  "./client/html_404_and_parent_dir.html",
+const html404AndAncestorDirFileUrl = new URL(
+  "./client/html_404_and_ancestor_dir.html",
   import.meta.url,
 );
 const htmlFileUrlForDirectory = new URL(
@@ -83,68 +83,86 @@ export const jsenvPluginProtocolFile = ({
         if (!urlInfo.url.startsWith("file:")) {
           return null;
         }
-        const urlObject = new URL(urlInfo.url);
-        const { firstReference } = urlInfo;
-        if (firstReference.leadsToADirectory) {
-          const directoryContentArray = readdirSync(urlObject);
-          if (firstReference.type === "filesystem") {
-            const content = JSON.stringify(directoryContentArray, null, "  ");
+        const generateContent = () => {
+          const urlObject = new URL(urlInfo.url);
+          const { firstReference } = urlInfo;
+          if (firstReference.leadsToADirectory) {
+            const directoryContentArray = readdirSync(urlObject);
+            if (firstReference.type === "filesystem") {
+              const content = JSON.stringify(directoryContentArray, null, "  ");
+              return {
+                type: "directory",
+                contentType: "application/json",
+                content,
+              };
+            }
+            const acceptsHtml = urlInfo.context.request
+              ? pickContentType(urlInfo.context.request, ["text/html"])
+              : false;
+            if (acceptsHtml) {
+              firstReference.expectedType = "html";
+              const html = generateHtmlForDirectory(
+                urlObject.href,
+                directoryContentArray,
+                urlInfo.context.rootDirectoryUrl,
+              );
+              return {
+                type: "html",
+                contentType: "text/html",
+                content: html,
+              };
+            }
             return {
               type: "directory",
               contentType: "application/json",
-              content,
-            };
-          }
-          const acceptsHtml = urlInfo.context.request
-            ? pickContentType(urlInfo.context.request, ["text/html"])
-            : false;
-          if (acceptsHtml) {
-            firstReference.expectedType = "html";
-            const html = generateHtmlForDirectory(
-              urlObject.href,
-              directoryContentArray,
-              urlInfo.context.rootDirectoryUrl,
-            );
-            return {
-              type: "html",
-              contentType: "text/html",
-              content: html,
+              content: JSON.stringify(directoryContentArray, null, "  "),
             };
           }
+          const contentType = CONTENT_TYPE.fromUrlExtension(urlInfo.url);
+          const fileBuffer = readFileSync(urlObject);
+          const content = CONTENT_TYPE.isTextual(contentType)
+            ? String(fileBuffer)
+            : fileBuffer;
           return {
-            type: "directory",
-            contentType: "application/json",
-            content: JSON.stringify(directoryContentArray, null, "  "),
+            content,
+            contentType,
+            contentLength: fileBuffer.length,
           };
-        }
-        const contentType = CONTENT_TYPE.fromUrlExtension(urlInfo.url);
+        };
+
         const request = urlInfo.context.request;
         if (request && request.headers["sec-fetch-dest"] === "document") {
           try {
-            const fileBuffer = readFileSync(urlObject);
-            const content = CONTENT_TYPE.isTextual(contentType)
-              ? String(fileBuffer)
-              : fileBuffer;
-            return {
-              content,
-              contentType,
-              contentLength: fileBuffer.length,
-            };
+            return generateContent();
           } catch (e) {
             if (e.code !== "ENOENT") {
               throw e;
             }
-            const parentDirectoryUrl = new URL("./", urlInfo.url);
-            if (!existsSync(parentDirectoryUrl)) {
-              throw e;
+            const rootDirectoryUrl = urlInfo.context.rootDirectoryUrl;
+            let firstExistingAncestorDirectoryUrl = new URL("./", urlInfo.url);
+            while (!existsSync(firstExistingAncestorDirectoryUrl)) {
+              firstExistingAncestorDirectoryUrl = new URL(
+                "../",
+                firstExistingAncestorDirectoryUrl,
+              );
+              if (
+                !urlIsInsideOf(
+                  firstExistingAncestorDirectoryUrl,
+                  rootDirectoryUrl,
+                )
+              ) {
+                firstExistingAncestorDirectoryUrl = rootDirectoryUrl;
+                break;
+              }
             }
-            const parentDirectoryContentArray = readdirSync(
-              new URL(parentDirectoryUrl),
+
+            const firstExistingAncestorDirectoryContent = readdirSync(
+              new URL(firstExistingAncestorDirectoryUrl),
             );
             const html = generateHtmlForENOENT(
               urlInfo.url,
-              parentDirectoryContentArray,
-              parentDirectoryUrl,
+              firstExistingAncestorDirectoryContent,
+              firstExistingAncestorDirectoryUrl,
               urlInfo.context.rootDirectoryUrl,
               directoryListingUrlMocks,
             );
@@ -158,15 +176,7 @@ export const jsenvPluginProtocolFile = ({
             };
           }
         }
-        const fileBuffer = readFileSync(urlObject);
-        const content = CONTENT_TYPE.isTextual(contentType)
-          ? String(fileBuffer)
-          : fileBuffer;
-        return {
-          content,
-          contentType,
-          contentLength: fileBuffer.length,
-        };
+        return generateContent();
       },
     },
   ];
@@ -197,17 +207,17 @@ const generateHtmlForDirectory = (
 };
 const generateHtmlForENOENT = (
   url,
-  parentDirectoryContentArray,
-  parentDirectoryUrl,
+  ancestorDirectoryContentArray,
+  ancestorDirectoryUrl,
   rootDirectoryUrl,
   directoryListingUrlMocks,
 ) => {
-  const htmlFor404AndParentDir = String(
-    readFileSync(html404AndParentDirFileUrl),
+  const htmlFor404AndAncestorDir = String(
+    readFileSync(html404AndAncestorDirFileUrl),
   );
   const fileRelativeUrl = urlToRelativeUrl(url, rootDirectoryUrl);
-  const parentDirectoryRelativeUrl = urlToRelativeUrl(
-    parentDirectoryUrl,
+  const ancestorDirectoryRelativeUrl = urlToRelativeUrl(
+    ancestorDirectoryUrl,
     rootDirectoryUrl,
   );
   const replacers = {
@@ -215,18 +225,18 @@ const generateHtmlForENOENT = (
       ? `@jsenv/core/${urlToRelativeUrl(url, jsenvCoreDirectoryUrl)}`
       : url,
     fileRelativeUrl,
-    parentDirectoryUrl,
-    parentDirectoryRelativeUrl,
-    parentDirectoryNav: () =>
-      generateDirectoryNav(parentDirectoryRelativeUrl, rootDirectoryUrl),
-    parentDirectoryContent: () =>
+    ancestorDirectoryUrl,
+    ancestorDirectoryRelativeUrl,
+    ancestorDirectoryNav: () =>
+      generateDirectoryNav(ancestorDirectoryRelativeUrl, rootDirectoryUrl),
+    ancestorDirectoryContent: () =>
       generateDirectoryContent(
-        parentDirectoryContentArray,
-        parentDirectoryUrl,
+        ancestorDirectoryContentArray,
+        ancestorDirectoryUrl,
         rootDirectoryUrl,
       ),
   };
-  const html = replacePlaceholders(htmlFor404AndParentDir, replacers);
+  const html = replacePlaceholders(htmlFor404AndAncestorDir, replacers);
   return html;
 };
 const generateDirectoryNav = (relativeUrl, rootDirectoryUrl) => {