@jsenv/core 39.10.0 → 39.10.2

package/dist/html/directory.html

@@ -15,6 +15,7 @@
       }
       
       .directory_nav {
+        gap: .3em;
         margin: 20px 25px 15px;
         font-size: 16px;
         font-weight: bold;
@@ -26,12 +27,10 @@
         position: relative;
       }
       
-      .directory_separator {
-        margin: 0 .3em;
-      }
-      
-      .directory_separator:first-child {
-        margin-left: 0;
+      .directory_empty_message {
+        color: #bbb;
+        margin: 1em;
+        padding: .5em;
       }
       
       .directory_content {

package/dist/html/html_404_and_ancestor_dir.html

@@ -15,6 +15,7 @@
       }
       
       .directory_nav {
+        gap: .3em;
         margin: 20px 25px 15px;
         font-size: 16px;
         font-weight: bold;
@@ -26,12 +27,10 @@
         position: relative;
       }
       
-      .directory_separator {
-        margin: 0 .3em;
-      }
-      
-      .directory_separator:first-child {
-        margin-left: 0;
+      .directory_empty_message {
+        color: #bbb;
+        margin: 1em;
+        padding: .5em;
       }
       
       .directory_content {
@@ -195,7 +194,7 @@
         No entry on the filesystem for <code>/${fileRelativeUrl}</code> (at
         ${fileUrl})
         <br>
-        Content of the ancestor directory is listed below:
+        Content of first ancestor directory is listed below:
       </span>
     </p>
     <h1 class="directory_nav">${ancestorDirectoryNav}</h1>

package/dist/jsenv_core.js

@@ -12648,9 +12648,9 @@ const createEventEmitter = () => {
     callbackSet.delete(callback);
   };
   const emit = (...args) => {
-    callbackSet.forEach((callback) => {
+    for (const callback of callbackSet) {
       callback(...args);
-    });
+    }
   };
   return { on, off, emit };
 };
@@ -12817,7 +12817,7 @@ const createDependencies = (ownerUrlInfo) => {
 
     const stopCollecting = () => {
       for (const prevReferenceToOther of prevReferenceToOthersSet) {
-        applyDependencyRemovalEffects(prevReferenceToOther);
+        checkForDependencyRemovalEffects(prevReferenceToOther);
       }
       prevReferenceToOthersSet.clear();
     };
@@ -13322,7 +13322,7 @@ ${ownerUrlInfo.url}`,
     implicitRef.remove();
   }
   ownerUrlInfo.referenceToOthersSet.delete(reference);
-  return applyDependencyRemovalEffects(reference);
+  return checkForDependencyRemovalEffects(reference);
 };
 
 const canAddOrRemoveReference = (reference) => {
@@ -13351,7 +13351,7 @@ const canAddOrRemoveReference = (reference) => {
   return false;
 };
 
-const applyDependencyRemovalEffects = (reference) => {
+const checkForDependencyRemovalEffects = (reference) => {
   const { ownerUrlInfo } = reference;
   const { referenceToOthersSet } = ownerUrlInfo;
   if (reference.isImplicit && !reference.isInline) {
@@ -13386,6 +13386,7 @@ const applyDependencyRemovalEffects = (reference) => {
   referencedUrlInfo.referenceFromOthersSet.delete(reference);
 
   let firstReferenceFromOther;
+  let wasInlined;
   for (const referenceFromOther of referencedUrlInfo.referenceFromOthersSet) {
     if (referenceFromOther.urlInfo !== referencedUrlInfo) {
       continue;
@@ -13400,7 +13401,8 @@ const applyDependencyRemovalEffects = (reference) => {
     if (referenceFromOther.type === "http_request") {
       continue;
     }
-    if (referenceFromOther.gotInlined()) {
+    wasInlined = referenceFromOther.gotInlined();
+    if (wasInlined) {
       // the url info was inlined, an other reference is required
       // to consider the non-inlined urlInfo as used
       continue;
@@ -13418,6 +13420,9 @@ const applyDependencyRemovalEffects = (reference) => {
     }
     return false;
   }
+  if (wasInlined) {
+    return false;
+  }
   // referencedUrlInfo.firstReference = null;
   // referencedUrlInfo.lastReference = null;
   referencedUrlInfo.onDereferenced(reference);
@@ -19176,6 +19181,7 @@ const jsenvPluginVersionSearchParam = () => {
 };
 
 const jsenvPluginFsRedirection = ({
+  directoryContentMagicName,
   magicExtensions = ["inherit", ".js"],
   magicDirectoryIndex = true,
   preserveSymlinks = false,
@@ -19198,10 +19204,14 @@ const jsenvPluginFsRedirection = ({
       if (reference.subtype === "new_url_second_arg") {
         return `ignore:${reference.url}`;
       }
-      if (reference.specifierPathname.endsWith("/...")) {
+      if (
+        reference.specifierPathname.endsWith(`/${directoryContentMagicName}`)
+      ) {
         const { rootDirectoryUrl } = reference.ownerUrlInfo.context;
         const directoryUrl = new URL(
-          reference.specifierPathname.replace("/...", "/").slice(1),
+          reference.specifierPathname
+            .replace(`/${directoryContentMagicName}`, "/")
+            .slice(1),
           rootDirectoryUrl,
         ).href;
         return directoryUrl;
@@ -19312,6 +19322,7 @@ const htmlFileUrlForDirectory = new URL(
   "./html/directory.html",
   import.meta.url,
 );
+const directoryContentMagicName = "...";
 
 const jsenvPluginProtocolFile = ({
   magicExtensions,
@@ -19321,6 +19332,7 @@ const jsenvPluginProtocolFile = ({
 }) => {
   return [
     jsenvPluginFsRedirection({
+      directoryContentMagicName,
       magicExtensions,
       magicDirectoryIndex,
       preserveSymlinks,
@@ -19360,8 +19372,9 @@ const jsenvPluginProtocolFile = ({
         if (reference.original) {
           const originalSpecifierPathname =
             reference.original.specifierPathname;
-
-          if (originalSpecifierPathname.endsWith("/...")) {
+          if (
+            originalSpecifierPathname.endsWith(`/${directoryContentMagicName}`)
+          ) {
             return originalSpecifierPathname;
           }
         }
@@ -19517,14 +19530,31 @@ const generateDirectoryNav = (relativeUrl, rootDirectoryUrl) => {
   const parts = isDir
     ? relativeUrlWithRoot.slice(0, -1).split("/")
     : relativeUrlWithRoot.split("/");
+  const items = [];
+  items.push({
+    href: "/",
+    text: "/",
+  });
   let dirPartsHtml = "";
   let i = 0;
   while (i < parts.length) {
     const part = parts[i];
-    const href = i === 0 ? "/..." : `/${parts.slice(1, i + 1).join("/")}/`;
+    const href =
+      i === 0
+        ? `/${directoryContentMagicName}`
+        : `/${parts.slice(1, i + 1).join("/")}/`;
     const text = part;
     const isLastPart = i === parts.length - 1;
-    if (isLastPart) {
+    items.push({
+      href,
+      text,
+      isCurrent: isLastPart,
+    });
+    i++;
+  }
+  i = 0;
+  for (const { href, text, isCurrent } of items) {
+    if (isCurrent) {
       dirPartsHtml += `
       <span class="directory_nav_item" data-current>
         ${text}
@@ -19535,13 +19565,15 @@ const generateDirectoryNav = (relativeUrl, rootDirectoryUrl) => {
       <a class="directory_nav_item" href="${href}">
         ${text}
       </a>`;
-    dirPartsHtml += `
-    <span class="directory_separator">/</span>`;
+    if (i > 0) {
+      dirPartsHtml += `
+      <span class="directory_separator">/</span>`;
+    }
     i++;
   }
   if (isDir) {
     dirPartsHtml += `
-    <span class="directory_separator">/</span>`;
+      <span class="directory_separator">/</span>`;
   }
   return dirPartsHtml;
 };
@@ -19628,7 +19660,7 @@ const generateDirectoryContentItems = (directoryUrl, rootDirectoryUrl) => {
 };
 const generateDirectoryContent = (directoryContentItems) => {
   if (directoryContentItems.length === 0) {
-    return `<p>Directory is empty</p>`;
+    return `<p class="directory_empty_message">Directory is empty</p>`;
   }
   let html = `<ul class="directory_content">`;
   for (const directoryContentItem of directoryContentItems) {
@@ -20811,6 +20843,11 @@ const jsenvPluginAutoreloadServer = ({
                 // are lost and sourcemap is considered as pruned
                 continue;
               }
+              if (lastReferenceFromOther.type === "http_request") {
+                // no need to tell client to reload when a http request is pruned
+                // happens when reloading the current html page for instance
+                continue;
+              }
               const { ownerUrlInfo } = lastReferenceFromOther;
               if (!ownerUrlInfo.isUsed()) {
                 continue;

package/package.json

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

package/src/helpers/event_emitter.js

@@ -10,9 +10,9 @@ export const createEventEmitter = () => {
     callbackSet.delete(callback);
   };
   const emit = (...args) => {
-    callbackSet.forEach((callback) => {
+    for (const callback of callbackSet) {
       callback(...args);
-    });
+    }
   };
   return { on, off, emit };
 };

package/src/kitchen/url_graph/references.js

@@ -22,7 +22,7 @@ export const createDependencies = (ownerUrlInfo) => {
 
     const stopCollecting = () => {
       for (const prevReferenceToOther of prevReferenceToOthersSet) {
-        applyDependencyRemovalEffects(prevReferenceToOther);
+        checkForDependencyRemovalEffects(prevReferenceToOther);
       }
       prevReferenceToOthersSet.clear();
     };
@@ -527,7 +527,7 @@ ${ownerUrlInfo.url}`,
     implicitRef.remove();
   }
   ownerUrlInfo.referenceToOthersSet.delete(reference);
-  return applyDependencyRemovalEffects(reference);
+  return checkForDependencyRemovalEffects(reference);
 };
 
 const canAddOrRemoveReference = (reference) => {
@@ -556,7 +556,7 @@ const canAddOrRemoveReference = (reference) => {
   return false;
 };
 
-const applyDependencyRemovalEffects = (reference) => {
+const checkForDependencyRemovalEffects = (reference) => {
   const { ownerUrlInfo } = reference;
   const { referenceToOthersSet } = ownerUrlInfo;
   if (reference.isImplicit && !reference.isInline) {
@@ -591,6 +591,7 @@ const applyDependencyRemovalEffects = (reference) => {
   referencedUrlInfo.referenceFromOthersSet.delete(reference);
 
   let firstReferenceFromOther;
+  let wasInlined;
   for (const referenceFromOther of referencedUrlInfo.referenceFromOthersSet) {
     if (referenceFromOther.urlInfo !== referencedUrlInfo) {
       continue;
@@ -605,7 +606,8 @@ const applyDependencyRemovalEffects = (reference) => {
     if (referenceFromOther.type === "http_request") {
       continue;
     }
-    if (referenceFromOther.gotInlined()) {
+    wasInlined = referenceFromOther.gotInlined();
+    if (wasInlined) {
       // the url info was inlined, an other reference is required
       // to consider the non-inlined urlInfo as used
       continue;
@@ -623,6 +625,9 @@ const applyDependencyRemovalEffects = (reference) => {
     }
     return false;
   }
+  if (wasInlined) {
+    return false;
+  }
   // referencedUrlInfo.firstReference = null;
   // referencedUrlInfo.lastReference = null;
   referencedUrlInfo.onDereferenced(reference);

package/src/plugins/autoreload/jsenv_plugin_autoreload_server.js

@@ -238,6 +238,11 @@ export const jsenvPluginAutoreloadServer = ({
                 // are lost and sourcemap is considered as pruned
                 continue;
               }
+              if (lastReferenceFromOther.type === "http_request") {
+                // no need to tell client to reload when a http request is pruned
+                // happens when reloading the current html page for instance
+                continue;
+              }
               const { ownerUrlInfo } = lastReferenceFromOther;
               if (!ownerUrlInfo.isUsed()) {
                 continue;

package/src/plugins/protocol_file/client/assets/directory.css

@@ -20,16 +20,16 @@ button {
   font-weight: bold;
   margin: 20px 25px 15px 25px;
   display: flex;
+  gap: 0.3em;
 }
 .directory_nav_item {
   text-decoration: none;
   position: relative;
 }
-.directory_separator {
-  margin: 0 0.3em;
-}
-.directory_separator:first-child {
-  margin-left: 0;
+.directory_empty_message {
+  margin: 1em;
+  padding: 0.5em;
+  color: #bbbbbb;
 }
 .directory_content {
   margin: 10px 15px 10px 15px;

package/src/plugins/protocol_file/client/html_404_and_ancestor_dir.html

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

package/src/plugins/protocol_file/jsenv_plugin_fs_redirection.js

@@ -8,6 +8,7 @@ import { realpathSync } from "node:fs";
 import { pathToFileURL } from "node:url";
 
 export const jsenvPluginFsRedirection = ({
+  directoryContentMagicName,
   magicExtensions = ["inherit", ".js"],
   magicDirectoryIndex = true,
   preserveSymlinks = false,
@@ -30,10 +31,14 @@ export const jsenvPluginFsRedirection = ({
       if (reference.subtype === "new_url_second_arg") {
         return `ignore:${reference.url}`;
       }
-      if (reference.specifierPathname.endsWith("/...")) {
+      if (
+        reference.specifierPathname.endsWith(`/${directoryContentMagicName}`)
+      ) {
         const { rootDirectoryUrl } = reference.ownerUrlInfo.context;
         const directoryUrl = new URL(
-          reference.specifierPathname.replace("/...", "/").slice(1),
+          reference.specifierPathname
+            .replace(`/${directoryContentMagicName}`, "/")
+            .slice(1),
           rootDirectoryUrl,
         ).href;
         return directoryUrl;

package/src/plugins/protocol_file/jsenv_plugin_protocol_file.js

@@ -24,6 +24,7 @@ const htmlFileUrlForDirectory = new URL(
   "./client/directory.html",
   import.meta.url,
 );
+const directoryContentMagicName = "...";
 
 export const jsenvPluginProtocolFile = ({
   magicExtensions,
@@ -33,6 +34,7 @@ export const jsenvPluginProtocolFile = ({
 }) => {
   return [
     jsenvPluginFsRedirection({
+      directoryContentMagicName,
       magicExtensions,
       magicDirectoryIndex,
       preserveSymlinks,
@@ -72,8 +74,9 @@ export const jsenvPluginProtocolFile = ({
         if (reference.original) {
           const originalSpecifierPathname =
             reference.original.specifierPathname;
-
-          if (originalSpecifierPathname.endsWith("/...")) {
+          if (
+            originalSpecifierPathname.endsWith(`/${directoryContentMagicName}`)
+          ) {
             return originalSpecifierPathname;
           }
         }
@@ -229,14 +232,31 @@ const generateDirectoryNav = (relativeUrl, rootDirectoryUrl) => {
   const parts = isDir
     ? relativeUrlWithRoot.slice(0, -1).split("/")
     : relativeUrlWithRoot.split("/");
+  const items = [];
+  items.push({
+    href: "/",
+    text: "/",
+  });
   let dirPartsHtml = "";
   let i = 0;
   while (i < parts.length) {
     const part = parts[i];
-    const href = i === 0 ? "/..." : `/${parts.slice(1, i + 1).join("/")}/`;
+    const href =
+      i === 0
+        ? `/${directoryContentMagicName}`
+        : `/${parts.slice(1, i + 1).join("/")}/`;
     const text = part;
     const isLastPart = i === parts.length - 1;
-    if (isLastPart) {
+    items.push({
+      href,
+      text,
+      isCurrent: isLastPart,
+    });
+    i++;
+  }
+  i = 0;
+  for (const { href, text, isCurrent } of items) {
+    if (isCurrent) {
       dirPartsHtml += `
       <span class="directory_nav_item" data-current>
         ${text}
@@ -247,13 +267,15 @@ const generateDirectoryNav = (relativeUrl, rootDirectoryUrl) => {
       <a class="directory_nav_item" href="${href}">
         ${text}
       </a>`;
-    dirPartsHtml += `
-    <span class="directory_separator">/</span>`;
+    if (i > 0) {
+      dirPartsHtml += `
+      <span class="directory_separator">/</span>`;
+    }
     i++;
   }
   if (isDir) {
     dirPartsHtml += `
-    <span class="directory_separator">/</span>`;
+      <span class="directory_separator">/</span>`;
   }
   return dirPartsHtml;
 };
@@ -340,7 +362,7 @@ const generateDirectoryContentItems = (directoryUrl, rootDirectoryUrl) => {
 };
 const generateDirectoryContent = (directoryContentItems) => {
   if (directoryContentItems.length === 0) {
-    return `<p>Directory is empty</p>`;
+    return `<p class="directory_empty_message">Directory is empty</p>`;
   }
   let html = `<ul class="directory_content">`;
   for (const directoryContentItem of directoryContentItems) {