@jsenv/core 41.5.13 → 41.5.15

package/dist/build/build.js

@@ -2131,6 +2131,10 @@ const createUrlInfo = (url, context) => {
     modifiedTimestamp: 0,
     descendantModifiedTimestamp: 0,
     dereferencedTimestamp: 0,
+    // when a client last fetched this url outside a hot request; in other
+    // words the last time this url entered a fresh page (see
+    // jsenv_plugin_hot_search_param)
+    servedWithoutHotTimestamp: 0,
     originalContentEtag: null,
     contentEtag: null,
     isValid: () => false,
@@ -7631,7 +7635,12 @@ const getDirectoryContentItems = ({
       fileUrls.push(fileUrlObject);
     }
   }
-  fileUrls.sort(compareFileUrls);
+  // Not the default numeric order: what is drawn here is a directory as a human
+  // reads it, so a leading number is part of the name ("10_a" right after
+  // "1_a") the way the filesystem and the editor next to this browser show it.
+  fileUrls.sort((leftUrl, rightUrl) =>
+    compareFileUrls(leftUrl, rightUrl, { numeric: false }),
+  );
 
   const items = [];
   for (const fileUrl of fileUrls) {
@@ -9440,6 +9449,7 @@ const jsenvPluginHotSearchParam = () => {
         modifiedTimestamp,
         descendantModifiedTimestamp,
         dereferencedTimestamp,
+        servedWithoutHotTimestamp,
       } = referencedUrlInfo;
       if (
         !modifiedTimestamp &&
@@ -9463,6 +9473,18 @@ const jsenvPluginHotSearchParam = () => {
         descendantModifiedTimestamp,
         dereferencedTimestamp,
       );
+      // These timestamps say "this url changed at some point", not "the client
+      // is running an outdated version of it": they are never cleared, so a
+      // file modified once keeps them for the rest of the dev server's life.
+      // A client that fetched this url after that modification (a page load:
+      // see rememberServedWithoutHot in the dev server) already runs the
+      // latest content. Sending it "?hot" then makes the browser evaluate a
+      // second, identical copy of a module it already has — a second module
+      // scope for a file that never changed, which breaks everything a module
+      // holds once (registries, contexts, singletons).
+      if (latestTimestamp <= servedWithoutHotTimestamp) {
+        return null;
+      }
       return {
         hot: latestTimestamp,
       };

package/dist/build/jsenv_core_packages.js

@@ -2620,7 +2620,25 @@ const assertAndNormalizeFileUrl = (
   return value;
 };
 
-const comparePathnames = (leftPathame, rightPathname) => {
+/*
+ * Which of two pathnames comes first: directories before what is under them,
+ * deeper before shallower, then the names themselves.
+ *
+ * How a leading number reads is the caller's call, because the two readings are
+ * both right somewhere:
+ * - numeric (the default), where the number is a quantity: "9_x" then "10_x" —
+ *   what a generated list wants, so a story numbered by hand stays in the order
+ *   it happens;
+ * - { numeric: false }, where the number is part of the name: "10_x" right
+ *   after "1_x" — the order the filesystem itself gives, and the one every file
+ *   explorer above it shows, so a human reading a directory finds it in the
+ *   order their editor already shows.
+ */
+const comparePathnames = (
+  leftPathame,
+  rightPathname,
+  { numeric = true } = {},
+) => {
   const leftPartArray = leftPathame.split("/");
   const rightPartArray = rightPathname.split("/");
 
@@ -2656,7 +2674,7 @@ const comparePathnames = (leftPathame, rightPathname) => {
     i++;
     // local comparison comes first
     const comparison = leftPart.localeCompare(rightPart, undefined, {
-      numeric: true,
+      numeric,
       sensitivity: "base",
     });
     if (comparison !== 0) {
@@ -2673,8 +2691,8 @@ const comparePathnames = (leftPathame, rightPathname) => {
   return 0;
 };
 
-const compareFileUrls = (a, b) => {
-  return comparePathnames(new URL(a).pathname, new URL(b).pathname);
+const compareFileUrls = (a, b, options) => {
+  return comparePathnames(new URL(a).pathname, new URL(b).pathname, options);
 };
 
 const isWindows$3 = process.platform === "win32";

package/dist/start_dev_server/jsenv_core_packages.js

@@ -1921,7 +1921,25 @@ const assertAndNormalizeFileUrl = (
   return value;
 };
 
-const comparePathnames = (leftPathame, rightPathname) => {
+/*
+ * Which of two pathnames comes first: directories before what is under them,
+ * deeper before shallower, then the names themselves.
+ *
+ * How a leading number reads is the caller's call, because the two readings are
+ * both right somewhere:
+ * - numeric (the default), where the number is a quantity: "9_x" then "10_x" —
+ *   what a generated list wants, so a story numbered by hand stays in the order
+ *   it happens;
+ * - { numeric: false }, where the number is part of the name: "10_x" right
+ *   after "1_x" — the order the filesystem itself gives, and the one every file
+ *   explorer above it shows, so a human reading a directory finds it in the
+ *   order their editor already shows.
+ */
+const comparePathnames = (
+  leftPathame,
+  rightPathname,
+  { numeric = true } = {},
+) => {
   const leftPartArray = leftPathame.split("/");
   const rightPartArray = rightPathname.split("/");
 
@@ -1957,7 +1975,7 @@ const comparePathnames = (leftPathame, rightPathname) => {
     i++;
     // local comparison comes first
     const comparison = leftPart.localeCompare(rightPart, undefined, {
-      numeric: true,
+      numeric,
       sensitivity: "base",
     });
     if (comparison !== 0) {
@@ -1974,8 +1992,8 @@ const comparePathnames = (leftPathame, rightPathname) => {
   return 0;
 };
 
-const compareFileUrls = (a, b) => {
-  return comparePathnames(new URL(a).pathname, new URL(b).pathname);
+const compareFileUrls = (a, b, options) => {
+  return comparePathnames(new URL(a).pathname, new URL(b).pathname, options);
 };
 
 const isWindows$3 = process.platform === "win32";

package/dist/start_dev_server/start_dev_server.js

@@ -4363,7 +4363,12 @@ const getDirectoryContentItems = ({
       fileUrls.push(fileUrlObject);
     }
   }
-  fileUrls.sort(compareFileUrls);
+  // Not the default numeric order: what is drawn here is a directory as a human
+  // reads it, so a leading number is part of the name ("10_a" right after
+  // "1_a") the way the filesystem and the editor next to this browser show it.
+  fileUrls.sort((leftUrl, rightUrl) =>
+    compareFileUrls(leftUrl, rightUrl, { numeric: false }),
+  );
 
   const items = [];
   for (const fileUrl of fileUrls) {
@@ -7165,6 +7170,7 @@ const jsenvPluginHotSearchParam = () => {
         modifiedTimestamp,
         descendantModifiedTimestamp,
         dereferencedTimestamp,
+        servedWithoutHotTimestamp,
       } = referencedUrlInfo;
       if (
         !modifiedTimestamp &&
@@ -7188,6 +7194,18 @@ const jsenvPluginHotSearchParam = () => {
         descendantModifiedTimestamp,
         dereferencedTimestamp,
       );
+      // These timestamps say "this url changed at some point", not "the client
+      // is running an outdated version of it": they are never cleared, so a
+      // file modified once keeps them for the rest of the dev server's life.
+      // A client that fetched this url after that modification (a page load:
+      // see rememberServedWithoutHot in the dev server) already runs the
+      // latest content. Sending it "?hot" then makes the browser evaluate a
+      // second, identical copy of a module it already has — a second module
+      // scope for a file that never changed, which breaks everything a module
+      // holds once (registries, contexts, singletons).
+      if (latestTimestamp <= servedWithoutHotTimestamp) {
+        return null;
+      }
       return {
         hot: latestTimestamp,
       };
@@ -9670,6 +9688,10 @@ const createUrlInfo = (url, context) => {
     modifiedTimestamp: 0,
     descendantModifiedTimestamp: 0,
     dereferencedTimestamp: 0,
+    // when a client last fetched this url outside a hot request; in other
+    // words the last time this url entered a fresh page (see
+    // jsenv_plugin_hot_search_param)
+    servedWithoutHotTimestamp: 0,
     originalContentEtag: null,
     contentEtag: null,
     isValid: () => false,
@@ -11917,7 +11939,20 @@ const devServerPluginServeSourceFiles = ({
             );
             return response;
           };
+          // What the client holds for this url is what we last sent it: a
+          // request without "?hot" is a page loading this url into an empty
+          // module registry, so from here on the client runs this exact
+          // content. Remembering when that happened is what allows
+          // jsenv_plugin_hot_search_param to tell a modification the client
+          // has already received from one it must re-execute to see.
+          const rememberServedWithoutHot = () => {
+            if (request.searchParams.has("hot")) {
+              return;
+            }
+            urlInfo.servedWithoutHotTimestamp = Date.now();
+          };
           const respondWithNotModified = () => {
+            rememberServedWithoutHot();
             const headers = {
               "cache-control": `private,max-age=0,must-revalidate`,
             };
@@ -12002,6 +12037,9 @@ const devServerPluginServeSourceFiles = ({
             ) {
               return respondWithNotModified();
             }
+            if (urlInfo.status === 200) {
+              rememberServedWithoutHot();
+            }
             response = {
               url: reference.url,
               // a plugin can cook a complete response body for an url that is

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "41.5.13",
+  "version": "41.5.15",
   "type": "module",
   "description": "Tool to develop, test and build js projects",
   "repository": {
@@ -75,7 +75,7 @@
   "dependencies": {
     "@jsenv/ast": "6.10.3",
     "@jsenv/js-module-fallback": "1.6.7",
-    "@jsenv/plugin-bundling": "2.10.26",
+    "@jsenv/plugin-bundling": "2.10.27",
     "@jsenv/plugin-minification": "1.7.20",
     "@jsenv/plugin-supervisor": "1.8.22",
     "@jsenv/plugin-transpilation": "1.7.7",

package/src/dev/dev_server_plugins/dev_server_plugin_serve_source_files.js

@@ -387,7 +387,20 @@ export const devServerPluginServeSourceFiles = ({
             );
             return response;
           };
+          // What the client holds for this url is what we last sent it: a
+          // request without "?hot" is a page loading this url into an empty
+          // module registry, so from here on the client runs this exact
+          // content. Remembering when that happened is what allows
+          // jsenv_plugin_hot_search_param to tell a modification the client
+          // has already received from one it must re-execute to see.
+          const rememberServedWithoutHot = () => {
+            if (request.searchParams.has("hot")) {
+              return;
+            }
+            urlInfo.servedWithoutHotTimestamp = Date.now();
+          };
           const respondWithNotModified = () => {
+            rememberServedWithoutHot();
             const headers = {
               "cache-control": `private,max-age=0,must-revalidate`,
             };
@@ -472,6 +485,9 @@ export const devServerPluginServeSourceFiles = ({
             ) {
               return respondWithNotModified();
             }
+            if (urlInfo.status === 200) {
+              rememberServedWithoutHot();
+            }
             response = {
               url: reference.url,
               // a plugin can cook a complete response body for an url that is

package/src/kitchen/url_graph/url_graph.js

@@ -183,6 +183,10 @@ const createUrlInfo = (url, context) => {
     modifiedTimestamp: 0,
     descendantModifiedTimestamp: 0,
     dereferencedTimestamp: 0,
+    // when a client last fetched this url outside a hot request; in other
+    // words the last time this url entered a fresh page (see
+    // jsenv_plugin_hot_search_param)
+    servedWithoutHotTimestamp: 0,
     originalContentEtag: null,
     contentEtag: null,
     isValid: () => false,

package/src/plugins/autoreload/jsenv_plugin_hot_search_param.js

@@ -48,6 +48,7 @@ export const jsenvPluginHotSearchParam = () => {
         modifiedTimestamp,
         descendantModifiedTimestamp,
         dereferencedTimestamp,
+        servedWithoutHotTimestamp,
       } = referencedUrlInfo;
       if (
         !modifiedTimestamp &&
@@ -71,6 +72,18 @@ export const jsenvPluginHotSearchParam = () => {
         descendantModifiedTimestamp,
         dereferencedTimestamp,
       );
+      // These timestamps say "this url changed at some point", not "the client
+      // is running an outdated version of it": they are never cleared, so a
+      // file modified once keeps them for the rest of the dev server's life.
+      // A client that fetched this url after that modification (a page load:
+      // see rememberServedWithoutHot in the dev server) already runs the
+      // latest content. Sending it "?hot" then makes the browser evaluate a
+      // second, identical copy of a module it already has — a second module
+      // scope for a file that never changed, which breaks everything a module
+      // holds once (registries, contexts, singletons).
+      if (latestTimestamp <= servedWithoutHotTimestamp) {
+        return null;
+      }
       return {
         hot: latestTimestamp,
       };

package/src/plugins/protocol_file/jsenv_plugin_directory_listing.js

@@ -456,7 +456,12 @@ const getDirectoryContentItems = ({
       fileUrls.push(fileUrlObject);
     }
   }
-  fileUrls.sort(compareFileUrls);
+  // Not the default numeric order: what is drawn here is a directory as a human
+  // reads it, so a leading number is part of the name ("10_a" right after
+  // "1_a") the way the filesystem and the editor next to this browser show it.
+  fileUrls.sort((leftUrl, rightUrl) =>
+    compareFileUrls(leftUrl, rightUrl, { numeric: false }),
+  );
 
   const items = [];
   for (const fileUrl of fileUrls) {