npm - @jsenv/core - Versions diffs - 39.3.3 → 39.3.4 - Mend

@jsenv/core 39.3.3 → 39.3.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (18) hide show

package/src/plugins/protocol_file/client/html_404_and_parent_dir.html ADDED Viewed

@@ -0,0 +1,54 @@
+<!doctype html>
+<html>
+  <head>
+    <title>404 ENOENT</title>
+    <meta charset="utf-8" />
+    <link rel="icon" href="data:," />
+    <link
+      rel="stylesheet"
+      href="node_esm:@jsenv/core/src/plugins/protocol_file/client/assets/directory.css?inline"
+    />
+    <style>
+      .error_message {
+        background-color: #fce4e4;
+        border: 1px solid #fcc2c3;
+        padding: 1.5em 1.2em;
+        margin: 1em;
+        display: block;
+      }
+      .error_text {
+        color: #cc0033;
+        font-weight: bold;
+        line-height: 2em;
+        text-shadow: 1px 1px rgba(250, 250, 250, 0.3);
+      }
+      .hint_message {
+        background-color: lightblue;
+        border: 1px solid #fcc2c3;
+        padding: 1.5em 1.2em;
+        margin: 1em;
+        display: block;
+      }
+      .hint_text {
+        color: black;
+        font-weight: bold;
+        line-height: 2em;
+        text-shadow: 1px 1px rgba(250, 250, 250, 0.3);
+      }
+    </style>
+  </head>
+  <body data-theme="dark">
+    <p class="error_message">
+      <span class="error_text">
+        No entry on the filesystem for <code>/${fileRelativeUrl}</code> (at
+        ${fileUrl})
+        <br />
+        Content of the parent directory is listed below:
+      </span>
+    </p>
+    <h1 class="directory_nav">${parentDirectoryNav}</h1>
+    ${parentDirectoryContent}
+  </body>
+</html>

package/src/plugins/protocol_file/jsenv_plugin_protocol_file.js CHANGED Viewed

@@ -6,21 +6,21 @@ import { pickContentType } from "@jsenv/server";
 import {
   ensurePathnameTrailingSlash,
   urlIsInsideOf,
+  urlToFilename,
   urlToRelativeUrl,
 } from "@jsenv/urls";
 import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js";
 import { existsSync, lstatSync, readdirSync, readFileSync } from "node:fs";
 import { jsenvPluginFsRedirection } from "./jsenv_plugin_fs_redirection.js";
-const html404AndParentDirIsEmptyFileUrl = new URL(
-  "./html_404_and_parent_dir_is_empty.html",
+const html404AndParentDirFileUrl = new URL(
+  "./client/html_404_and_parent_dir.html",
   import.meta.url,
 );
-const html404AndParentDirFileUrl = new URL(
-  "./html_404_and_parent_dir.html",
+const htmlFileUrlForDirectory = new URL(
+  "./client/directory.html",
   import.meta.url,
 );
-const htmlFileUrlForDirectory = new URL("./directory.html", import.meta.url);
 export const jsenvPluginProtocolFile = ({
   magicExtensions,
@@ -97,12 +97,14 @@ export const jsenvPluginProtocolFile = ({
             ? 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,
             };
@@ -143,6 +145,9 @@ export const jsenvPluginProtocolFile = ({
             return {
               contentType: "text/html",
               content: html,
+              headers: {
+                "cache-control": "no-cache",
+              },
             };
           }
         }
@@ -166,10 +171,13 @@ const generateHtmlForDirectory = (
   rootDirectoryUrl,
 ) => {
   directoryUrl = assertAndNormalizeDirectoryUrl(directoryUrl);
   const htmlForDirectory = String(readFileSync(htmlFileUrlForDirectory));
+  const directoryRelativeUrl = urlToRelativeUrl(directoryUrl, rootDirectoryUrl);
   const replacers = {
-    directoryRelativeUrl: urlToRelativeUrl(directoryUrl, rootDirectoryUrl),
     directoryUrl,
+    directoryNav: () =>
+      generateDirectoryNav(directoryRelativeUrl, rootDirectoryUrl),
     directoryContent: () =>
       generateDirectoryContent(
         directoryContentArray,
@@ -186,30 +194,21 @@ const generateHtmlForENOENTOnHtmlFile = (
   parentDirectoryUrl,
   rootDirectoryUrl,
 ) => {
-  if (parentDirectoryContentArray.length === 0) {
-    const htmlFor404AndParentDirIsEmpty = String(
-      readFileSync(html404AndParentDirIsEmptyFileUrl),
-    );
-    return replacePlaceholders(htmlFor404AndParentDirIsEmpty, {
-      fileRelativeUrl: urlToRelativeUrl(url, rootDirectoryUrl),
-      parentDirectoryRelativeUrl: urlToRelativeUrl(
-        parentDirectoryUrl,
-        rootDirectoryUrl,
-      ),
-    });
-  }
   const htmlFor404AndParentDir = String(
     readFileSync(html404AndParentDirFileUrl),
   );
+  const fileRelativeUrl = urlToRelativeUrl(url, rootDirectoryUrl);
+  const parentDirectoryRelativeUrl = urlToRelativeUrl(
+    parentDirectoryUrl,
+    rootDirectoryUrl,
+  );
   const replacers = {
     fileUrl: url,
-    fileRelativeUrl: urlToRelativeUrl(url, rootDirectoryUrl),
+    fileRelativeUrl,
     parentDirectoryUrl,
-    parentDirectoryRelativeUrl: urlToRelativeUrl(
-      parentDirectoryUrl,
-      rootDirectoryUrl,
-    ),
+    parentDirectoryRelativeUrl,
+    parentDirectoryNav: () =>
+      generateDirectoryNav(parentDirectoryRelativeUrl, rootDirectoryUrl),
     parentDirectoryContent: () =>
       generateDirectoryContent(
         parentDirectoryContentArray,
@@ -220,11 +219,51 @@ const generateHtmlForENOENTOnHtmlFile = (
   const html = replacePlaceholders(htmlFor404AndParentDir, replacers);
   return html;
 };
+const generateDirectoryNav = (relativeUrl, rootDirectoryUrl) => {
+  const rootDirectoryUrlName = urlToFilename(rootDirectoryUrl);
+  const relativeUrlWithRoot = relativeUrl
+    ? `${rootDirectoryUrlName}/${relativeUrl}`
+    : `${rootDirectoryUrlName}/`;
+  const isDir = relativeUrlWithRoot.endsWith("/");
+  const parts = isDir
+    ? relativeUrlWithRoot.slice(0, -1).split("/")
+    : relativeUrlWithRoot.split("/");
+  let dirPartsHtml = "";
+  let i = 0;
+  while (i < parts.length) {
+    const part = parts[i];
+    const href = i === 0 ? "/" : `/${parts.slice(1, i + 1).join("/")}/`;
+    const text = part;
+    const isLastPart = i === parts.length - 1;
+    if (isLastPart) {
+      dirPartsHtml += `
+      <span class="directory_nav_item" data-current>
+        ${text}
+      </span>`;
+      break;
+    }
+    dirPartsHtml += `
+      <a class="directory_nav_item" href="${href}">
+        ${text}
+      </a>`;
+    dirPartsHtml += `
+    <span class="directory_separator">/</span>`;
+    i++;
+  }
+  if (isDir) {
+    dirPartsHtml += `
+    <span class="directory_separator">/</span>`;
+  }
+  return dirPartsHtml;
+};
 const generateDirectoryContent = (
   directoryContentArray,
   directoryUrl,
   rootDirectoryUrl,
 ) => {
+  if (directoryContentArray.length === 0) {
+    return `<p>Directory is empty</p>`;
+  }
   const sortedNames = [];
   for (const filename of directoryContentArray) {
     const fileUrlObject = new URL(filename, directoryUrl);
@@ -235,15 +274,20 @@ const generateDirectoryContent = (
     }
   }
   sortedNames.sort(comparePathnames);
-  return sortedNames.map((filename) => {
+  let html = `<ul class="directory_content">`;
+  for (const filename of sortedNames) {
     const fileUrlObject = new URL(filename, directoryUrl);
     const fileUrl = String(fileUrlObject);
-    let fileUrlRelative = urlToRelativeUrl(fileUrl, rootDirectoryUrl);
-    return `<li>
-    <a href="/${fileUrlRelative}">/${fileUrlRelative}</a>
-  </li>`;
-  }).join(`
-  `);
+    const fileUrlRelativeToParent = urlToRelativeUrl(fileUrl, directoryUrl);
+    const fileUrlRelativeToRoot = urlToRelativeUrl(fileUrl, rootDirectoryUrl);
+    const type = fileUrlRelativeToParent.endsWith("/") ? "dir" : "file";
+    html += `
+      <li class="directory_child" data-type="${type}">
+        <a href="/${fileUrlRelativeToRoot}">${fileUrlRelativeToParent}</a>
+      </li>`;
+  }
+  html += `\n  </ul>`;
+  return html;
 };
 const replacePlaceholders = (html, replacers) => {
   return html.replace(/\$\{(\w+)\}/g, (match, name) => {

package/src/plugins/resolution_node_esm/jsenv_plugin_node_esm_resolution.js CHANGED Viewed

@@ -57,6 +57,11 @@ export const jsenvPluginNodeEsmResolution = (resolutionConfig = {}) => {
       }
     },
     resolveReference: (reference) => {
+      if (reference.specifier.startsWith("node_esm:")) {
+        reference.specifier = reference.specifier.slice("node_esm:".length);
+        const result = nodeEsmResolverDefault(reference);
+        return result;
+      }
       const urlType = urlTypeFromReference(reference);
       const resolver = resolvers[urlType];
       return resolver ? resolver(reference) : null;
@@ -83,6 +88,5 @@ const urlTypeFromReference = (reference) => {
   if (reference.injected) {
     return reference.expectedType;
   }
   return reference.ownerUrlInfo.type;
 };

package/dist/html/html_404_and_parent_dir_is_empty.html DELETED Viewed

@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>404 ENOENT</title>
-    <meta charset="utf-8">
-    <link rel="icon" href="data:,">
-  </head>
-  <body>
-    <p>No entry on the filesystem for <strong>/${fileRelativeUrl}</strong></p>
-    <p>
-      <a jsenv-ignore="" href="/${parentDirectoryRelativeUrl}">/${parentDirectoryRelativeUrl}</a>
-      directory is empty.
-    </p>
-  </body>
-</html>

package/src/plugins/protocol_file/directory.html DELETED Viewed

@@ -1,20 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>Directory explorer</title>
-    <meta charset="utf-8" />
-    <link rel="icon" href="data:," />
-  </head>
-  <body>
-    <h1>
-      <a jsenv-ignore href="/${directoryRelativeUrl}"
-        >/${directoryRelativeUrl}</a
-      >
-      directory content:
-    </h1>
-    <ul>
-      ${directoryContent}
-    </ul>
-  </body>
-</html>

package/src/plugins/protocol_file/html_404_and_parent_dir.html DELETED Viewed

@@ -1,21 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>404 ENOENT</title>
-    <meta charset="utf-8" />
-    <link rel="icon" href="data:," />
-  </head>
-  <body>
-    <p>No entry on the filesystem for <strong>/${fileRelativeUrl}</strong></p>
-    <p>
-      <a jsenv-ignore href="/${parentDirectoryRelativeUrl}"
-        >/${parentDirectoryRelativeUrl}</a
-      >
-      directory content:
-    </p>
-    <ul>
-      ${parentDirectoryContent}
-    </ul>
-  </body>
-</html>

package/src/plugins/protocol_file/html_404_and_parent_dir_is_empty.html DELETED Viewed

@@ -1,18 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>404 ENOENT</title>
-    <meta charset="utf-8" />
-    <link rel="icon" href="data:," />
-  </head>
-  <body>
-    <p>No entry on the filesystem for <strong>/${fileRelativeUrl}</strong></p>
-    <p>
-      <a jsenv-ignore href="/${parentDirectoryRelativeUrl}"
-        >/${parentDirectoryRelativeUrl}</a
-      >
-      directory is empty.
-    </p>
-  </body>
-</html>