@jsenv/core 39.7.5 → 39.7.7

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

@@ -3,7 +3,7 @@ import os, { networkInterfaces } from "node:os";
 import tty from "node:tty";
 import stringWidth from "string-width";
 import { pathToFileURL, fileURLToPath } from "node:url";
-import { readdir, chmod, stat, lstat, chmodSync, statSync, lstatSync, promises, readFileSync, writeFileSync as writeFileSync$1, mkdirSync, unlink, openSync, closeSync, rmdir, watch, readdirSync, createReadStream, readFile, existsSync, realpathSync } from "node:fs";
+import { readdir, chmod, stat, lstat, chmodSync, statSync, lstatSync, promises, readFileSync, writeFileSync as writeFileSync$1, mkdirSync, unlink, openSync, closeSync, rmdir, unlinkSync, readdirSync, rmdirSync, watch, createReadStream, readFile, existsSync, realpathSync } from "node:fs";
 import { extname } from "node:path";
 import crypto, { createHash } from "node:crypto";
 import cluster from "node:cluster";
@@ -3668,7 +3668,7 @@ const removeEntry = async (
       sourceStats.isCharacterDevice() ||
       sourceStats.isBlockDevice()
     ) {
-      await removeNonDirectory(
+      await removeNonDirectory$1(
         sourceUrl.endsWith("/") ? sourceUrl.slice(0, -1) : sourceUrl,
         {
           maxRetries,
@@ -3689,7 +3689,7 @@ const removeEntry = async (
   }
 };
 
-const removeNonDirectory = (sourceUrl, { maxRetries, retryDelay }) => {
+const removeNonDirectory$1 = (sourceUrl, { maxRetries, retryDelay }) => {
   const sourcePath = urlToFileSystemPath(sourceUrl);
 
   let retryCount = 0;
@@ -3828,11 +3828,11 @@ const removeDirectory = async (
   };
 
   const visitFile = async (fileUrl) => {
-    await removeNonDirectory(fileUrl, { maxRetries, retryDelay });
+    await removeNonDirectory$1(fileUrl, { maxRetries, retryDelay });
   };
 
   const visitSymbolicLink = async (symbolicLinkUrl) => {
-    await removeNonDirectory(symbolicLinkUrl, { maxRetries, retryDelay });
+    await removeNonDirectory$1(symbolicLinkUrl, { maxRetries, retryDelay });
   };
 
   try {
@@ -3877,6 +3877,204 @@ const removeDirectoryNaive = (
 
 process.platform === "win32";
 
+const removeEntrySync = (
+  source,
+  {
+    allowUseless = false,
+    recursive = false,
+    maxRetries = 3,
+    retryDelay = 100,
+    onlyContent = false,
+  } = {},
+) => {
+  const sourceUrl = assertAndNormalizeFileUrl(source);
+  const sourceStats = readEntryStatSync(sourceUrl, {
+    nullIfNotFound: true,
+    followLink: false,
+  });
+  if (!sourceStats) {
+    if (allowUseless) {
+      return;
+    }
+    throw new Error(`nothing to remove at ${urlToFileSystemPath(sourceUrl)}`);
+  }
+
+  // https://nodejs.org/dist/latest-v13.x/docs/api/fs.html#fs_class_fs_stats
+  // FIFO and socket are ignored, not sure what they are exactly and what to do with them
+  // other libraries ignore them, let's do the same.
+  if (
+    sourceStats.isFile() ||
+    sourceStats.isSymbolicLink() ||
+    sourceStats.isCharacterDevice() ||
+    sourceStats.isBlockDevice()
+  ) {
+    removeNonDirectory(
+      sourceUrl.endsWith("/") ? sourceUrl.slice(0, -1) : sourceUrl);
+  } else if (sourceStats.isDirectory()) {
+    const directoryUrl = ensurePathnameTrailingSlash(sourceUrl);
+    removeDirectorySync$1(directoryUrl, {
+      recursive,
+      maxRetries,
+      retryDelay,
+      onlyContent,
+    });
+  }
+};
+
+const removeNonDirectory = (sourceUrl) => {
+  const sourcePath = urlToFileSystemPath(sourceUrl);
+  const attempt = () => {
+    unlinkSyncNaive(sourcePath);
+  };
+  attempt();
+};
+
+const unlinkSyncNaive = (sourcePath, { handleTemporaryError = null } = {}) => {
+  try {
+    unlinkSync(sourcePath);
+  } catch (error) {
+    if (error.code === "ENOENT") {
+      return;
+    }
+    if (
+      handleTemporaryError &&
+      (error.code === "EBUSY" ||
+        error.code === "EMFILE" ||
+        error.code === "ENFILE" ||
+        error.code === "ENOENT")
+    ) {
+      handleTemporaryError(error);
+      return;
+    }
+    throw error;
+  }
+};
+
+const removeDirectorySync$1 = (
+  rootDirectoryUrl,
+  { maxRetries, retryDelay, recursive, onlyContent },
+) => {
+  const visit = (sourceUrl) => {
+    const sourceStats = readEntryStatSync(sourceUrl, {
+      nullIfNotFound: true,
+      followLink: false,
+    });
+
+    // file/directory not found
+    if (sourceStats === null) {
+      return;
+    }
+
+    if (
+      sourceStats.isFile() ||
+      sourceStats.isCharacterDevice() ||
+      sourceStats.isBlockDevice()
+    ) {
+      visitFile(sourceUrl);
+    } else if (sourceStats.isSymbolicLink()) {
+      visitSymbolicLink(sourceUrl);
+    } else if (sourceStats.isDirectory()) {
+      visitDirectory(`${sourceUrl}/`);
+    }
+  };
+
+  const visitDirectory = (directoryUrl) => {
+    const directoryPath = urlToFileSystemPath(directoryUrl);
+    const optionsFromRecursive = recursive
+      ? {
+          handleNotEmptyError: () => {
+            removeDirectoryContent(directoryUrl);
+            visitDirectory(directoryUrl);
+          },
+        }
+      : {};
+    removeDirectorySyncNaive(directoryPath, {
+      ...optionsFromRecursive,
+      // Workaround for https://github.com/joyent/node/issues/4337
+      ...(process.platform === "win32"
+        ? {
+            handlePermissionError: (error) => {
+              console.error(
+                `trying to fix windows EPERM after readir on ${directoryPath}`,
+              );
+
+              let openOrCloseError;
+              try {
+                const fd = openSync(directoryPath);
+                closeSync(fd);
+              } catch (e) {
+                openOrCloseError = e;
+              }
+
+              if (openOrCloseError) {
+                if (openOrCloseError.code === "ENOENT") {
+                  return;
+                }
+                console.error(
+                  `error while trying to fix windows EPERM after readir on ${directoryPath}: ${openOrCloseError.stack}`,
+                );
+                throw error;
+              }
+              removeDirectorySyncNaive(directoryPath, {
+                ...optionsFromRecursive,
+              });
+            },
+          }
+        : {}),
+    });
+  };
+
+  const removeDirectoryContent = (directoryUrl) => {
+    const entryNames = readdirSync(new URL(directoryUrl));
+    for (const entryName of entryNames) {
+      const url = resolveUrl$1(entryName, directoryUrl);
+      visit(url);
+    }
+  };
+
+  const visitFile = (fileUrl) => {
+    removeNonDirectory(fileUrl);
+  };
+
+  const visitSymbolicLink = (symbolicLinkUrl) => {
+    removeNonDirectory(symbolicLinkUrl);
+  };
+
+  if (onlyContent) {
+    removeDirectoryContent(rootDirectoryUrl);
+  } else {
+    visitDirectory(rootDirectoryUrl);
+  }
+};
+
+const removeDirectorySyncNaive = (
+  directoryPath,
+  { handleNotEmptyError = null, handlePermissionError = null } = {},
+) => {
+  try {
+    rmdirSync(directoryPath);
+  } catch (error) {
+    if (handlePermissionError && error.code === "EPERM") {
+      handlePermissionError(error);
+      return;
+    }
+    if (error.code === "ENOENT") {
+      return;
+    }
+    if (
+      handleNotEmptyError &&
+      // linux os
+      (error.code === "ENOTEMPTY" ||
+        // SunOS
+        error.code === "EEXIST")
+    ) {
+      handleNotEmptyError(error);
+      return;
+    }
+    throw error;
+  }
+};
+
 process.platform === "win32";
 
 const ensureEmptyDirectory = async (source) => {
@@ -3906,6 +4104,13 @@ const ensureEmptyDirectory = async (source) => {
   );
 };
 
+const removeDirectorySync = (url, options = {}) => {
+  return removeEntrySync(url, {
+    ...options,
+    recursive: true,
+  });
+};
+
 const callOnceIdlePerFile = (callback, idleMs) => {
   const timeoutIdMap = new Map();
   return (fileEvent) => {
@@ -14163,7 +14368,18 @@ const createUrlInfoTransformer = ({
       contentIsInlined = false;
     }
     if (!contentIsInlined) {
-      writeFileSync(new URL(generatedUrl), urlInfo.content);
+      try {
+        writeFileSync(new URL(generatedUrl), urlInfo.content);
+      } catch (e) {
+        if (e.code === "EISDIR") {
+          // happens when directory existed but got delete
+          // we can safely remove that directory and write the new file
+          removeDirectorySync(new URL(generatedUrl));
+          writeFileSync(new URL(generatedUrl), urlInfo.content);
+        } else {
+          throw e;
+        }
+      }
     }
     const { sourcemapGeneratedUrl, sourcemapReference } = urlInfo;
     if (sourcemapGeneratedUrl && sourcemapReference) {
@@ -18890,8 +19106,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 +19175,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 +19268,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 +19299,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 +19317,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.7",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {

package/src/kitchen/url_graph/url_info_transformations.js

@@ -1,4 +1,4 @@
-import { writeFileSync } from "@jsenv/filesystem";
+import { removeDirectorySync, writeFileSync } from "@jsenv/filesystem";
 import {
   composeTwoSourcemaps,
   generateSourcemapDataUrl,
@@ -275,7 +275,18 @@ export const createUrlInfoTransformer = ({
       contentIsInlined = false;
     }
     if (!contentIsInlined) {
-      writeFileSync(new URL(generatedUrl), urlInfo.content);
+      try {
+        writeFileSync(new URL(generatedUrl), urlInfo.content);
+      } catch (e) {
+        if (e.code === "EISDIR") {
+          // happens when directory existed but got delete
+          // we can safely remove that directory and write the new file
+          removeDirectorySync(new URL(generatedUrl));
+          writeFileSync(new URL(generatedUrl), urlInfo.content);
+        } else {
+          throw e;
+        }
+      }
     }
     const { sourcemapGeneratedUrl, sourcemapReference } = urlInfo;
     if (sourcemapGeneratedUrl && sourcemapReference) {

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) => {