@jsenv/core 38.4.16 → 38.4.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "38.4.16",
+  "version": "38.4.18",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -48,7 +48,6 @@
     "dev": "node --conditions=development ./scripts/dev/dev.mjs",
     "test": "node --conditions=development ./scripts/test/test.mjs",
     "test:workspace": "npm run test --workspaces --if-present -- --workspace",
-    "test:snapshots_clear": "npx @jsenv/snapshot clear **/tests/**/snapshots/",
     "test:only_dev_server_errors": "node --conditions=development ./tests/dev_server/errors/dev_errors_snapshots.test.mjs",
     "build": "node --conditions=development ./scripts/build/build.mjs",
     "build:file_size": "node ./scripts/build/build_file_size.mjs --log",
@@ -66,20 +65,20 @@
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
     "@jsenv/abort": "4.3.0",
     "@jsenv/ast": "6.0.7",
-    "@jsenv/filesystem": "4.6.9",
+    "@jsenv/filesystem": "4.7.1",
     "@jsenv/humanize": "1.1.3",
     "@jsenv/importmap": "1.2.1",
     "@jsenv/integrity": "0.0.1",
     "@jsenv/js-module-fallback": "1.3.16",
     "@jsenv/node-esm-resolution": "1.0.2",
-    "@jsenv/plugin-bundling": "2.6.10",
+    "@jsenv/plugin-bundling": "2.6.11",
     "@jsenv/plugin-minification": "1.5.4",
-    "@jsenv/plugin-supervisor": "1.4.10",
+    "@jsenv/plugin-supervisor": "1.4.11",
     "@jsenv/plugin-transpilation": "1.3.16",
     "@jsenv/runtime-compat": "1.3.0",
-    "@jsenv/server": "15.2.6",
+    "@jsenv/server": "15.2.7",
     "@jsenv/sourcemap": "1.2.10",
-    "@jsenv/url-meta": "8.4.0",
+    "@jsenv/url-meta": "8.4.1",
     "@jsenv/urls": "2.2.7",
     "@jsenv/utils": "2.1.1"
   },

package/src/dev/start_dev_server.js

@@ -1,10 +1,11 @@
-import { readFileSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import { URL_META } from "@jsenv/url-meta";
 import {
   assertAndNormalizeDirectoryUrl,
   bufferToEtag,
 } from "@jsenv/filesystem";
 import { createLogger, createTaskLog } from "@jsenv/humanize";
+import { urlToRelativeUrl } from "@jsenv/urls";
 import {
   jsenvAccessControlAllowedHeaders,
   startServer,
@@ -91,11 +92,18 @@ export const startDevServer = async ({
       sourceDirectoryUrl,
       "sourceDirectoryUrl",
     );
+    if (!existsSync(new URL(sourceDirectoryUrl))) {
+      throw new Error(`ENOENT on sourceDirectoryUrl at ${sourceDirectoryUrl}`);
+    }
     if (typeof sourceMainFilePath !== "string") {
       throw new TypeError(
         `sourceMainFilePath must be a string, got ${sourceMainFilePath}`,
       );
     }
+    sourceMainFilePath = urlToRelativeUrl(
+      new URL(sourceMainFilePath, sourceDirectoryUrl),
+      sourceDirectoryUrl,
+    );
     if (outDirectoryUrl === undefined) {
       if (!process.env.CI) {
         const packageDirectoryUrl = lookupPackageDirectory(sourceDirectoryUrl);

package/src/kitchen/errors.js

@@ -148,9 +148,12 @@ export const createTransformUrlContentError = ({
     if (code === "PARSE_ERROR") {
       transformError.reason = `parse error on ${urlInfo.type}`;
       transformError.cause = error;
+      let line = error.line;
+      if (urlInfo.type === "js_module") {
+        line = line - 1;
+      }
       if (urlInfo.isInline) {
-        transformError.trace.line =
-          urlInfo.firstReference.trace.line + error.line - 1;
+        transformError.trace.line = urlInfo.firstReference.trace.line + line;
         transformError.trace.column =
           urlInfo.firstReference.trace.column + error.column;
         transformError.trace.codeFrame = generateContentFrame({
@@ -167,16 +170,16 @@ export const createTransformUrlContentError = ({
       } else {
         transformError.trace = {
           url: urlInfo.url,
-          line: error.line,
+          line,
           column: error.column,
           codeFrame: generateContentFrame({
-            line: error.line - 1,
+            line,
             column: error.column,
             content: urlInfo.content,
           }),
           message: stringifyUrlSite({
             url: urlInfo.url,
-            line: error.line - 1,
+            line,
             column: error.column,
             content: urlInfo.content,
           }),

package/src/kitchen/url_graph/references.js

@@ -72,13 +72,14 @@ export const createDependencies = (ownerUrlInfo) => {
     const parentContent = isOriginalPosition
       ? ownerUrlInfo.originalContent
       : ownerUrlInfo.content;
+    const trace = traceFromUrlSite({
+      url: parentUrl,
+      content: parentContent,
+      line: specifierLine,
+      column: specifierColumn,
+    });
     const reference = createResolveAndFinalize({
-      trace: traceFromUrlSite({
-        url: parentUrl,
-        content: parentContent,
-        line: specifierLine,
-        column: specifierColumn,
-      }),
+      trace,
       isOriginalPosition,
       specifierLine,
       specifierColumn,

package/src/plugins/autoreload/client/autoreload.js

@@ -6,134 +6,134 @@ import {
   getDOMNodesUsingUrl,
 } from "./reload.js";
 
-let debug = false;
-const reloader = {
-  urlHotMetas,
-  status: {
-    value: "idle",
-    onchange: () => {},
-    goTo: (value) => {
-      reloader.status.value = value;
-      reloader.status.onchange();
+export const initAutoreload = ({ mainFilePath }) => {
+  let debug = false;
+  const reloader = {
+    urlHotMetas,
+    status: {
+      value: "idle",
+      onchange: () => {},
+      goTo: (value) => {
+        reloader.status.value = value;
+        reloader.status.onchange();
+      },
     },
-  },
-  autoreload: {
-    enabled: ["1", null].includes(window.localStorage.getItem("autoreload")),
-    onchange: () => {},
-    enable: () => {
-      reloader.autoreload.enabled = true;
-      window.localStorage.setItem("autoreload", "1");
-      reloader.autoreload.onchange();
+    autoreload: {
+      enabled: ["1", null].includes(window.localStorage.getItem("autoreload")),
+      onchange: () => {},
+      enable: () => {
+        reloader.autoreload.enabled = true;
+        window.localStorage.setItem("autoreload", "1");
+        reloader.autoreload.onchange();
+      },
+      disable: () => {
+        reloader.autoreload.enabled = false;
+        window.localStorage.setItem("autoreload", "0");
+        reloader.autoreload.onchange();
+      },
     },
-    disable: () => {
-      reloader.autoreload.enabled = false;
-      window.localStorage.setItem("autoreload", "0");
-      reloader.autoreload.onchange();
-    },
-  },
-  changes: {
-    value: [],
-    onchange: () => {},
-    add: (reloadMessage) => {
-      if (debug) {
-        console.debug("received reload message", reloadMessage);
-      }
-      reloader.changes.value.push(reloadMessage);
-      reloader.changes.onchange();
-      if (reloader.autoreload.enabled) {
-        reloader.reload();
-      } else {
-        reloader.status.goTo("can_reload");
-      }
-    },
-    remove: (reloadMessage) => {
-      const index = reloader.changes.value.indexOf(reloadMessage);
-      if (index > -1) {
-        reloader.changes.value.splice(index, 1);
-        if (reloader.changes.value.length === 0) {
-          reloader.status.goTo("idle");
+    changes: {
+      value: [],
+      onchange: () => {},
+      add: (reloadMessage) => {
+        if (debug) {
+          console.debug("received reload message", reloadMessage);
         }
+        reloader.changes.value.push(reloadMessage);
         reloader.changes.onchange();
+        if (reloader.autoreload.enabled) {
+          reloader.reload();
+        } else {
+          reloader.status.goTo("can_reload");
+        }
+      },
+      remove: (reloadMessage) => {
+        const index = reloader.changes.value.indexOf(reloadMessage);
+        if (index > -1) {
+          reloader.changes.value.splice(index, 1);
+          if (reloader.changes.value.length === 0) {
+            reloader.status.goTo("idle");
+          }
+          reloader.changes.onchange();
+        }
+      },
+    },
+    currentExecution: null,
+    reload: () => {
+      const someEffectIsFullReload = reloader.changes.value.some(
+        (reloadMessage) => reloadMessage.type === "full",
+      );
+      if (someEffectIsFullReload) {
+        reloadHtmlPage();
+        return;
       }
+      reloader.status.goTo("reloading");
+      const onApplied = (reloadMessage) => {
+        reloader.changes.remove(reloadMessage);
+      };
+      const setReloadMessagePromise = (reloadMessage, promise) => {
+        promise.then(
+          () => {
+            onApplied(reloadMessage);
+            reloader.currentExecution = null;
+          },
+          (e) => {
+            reloader.status.goTo("failed");
+            if (typeof window.reportError === "function") {
+              window.reportError(e);
+            } else {
+              console.error(e);
+            }
+            console.error(
+              `[jsenv] Hot reload failed after ${reloadMessage.reason}.
+This could be due to syntax errors or importing non-existent modules (see errors in console)`,
+            );
+            reloader.currentExecution = null;
+          },
+        );
+      };
+      reloader.changes.value.forEach((reloadMessage) => {
+        if (reloadMessage.type === "hot") {
+          const promise = addToHotQueue(() => {
+            return applyHotReload(reloadMessage);
+          });
+          setReloadMessagePromise(reloadMessage, promise);
+        } else {
+          setReloadMessagePromise(reloadMessage, Promise.resolve());
+        }
+      });
     },
-  },
-  currentExecution: null,
-  reload: () => {
-    const someEffectIsFullReload = reloader.changes.value.some(
-      (reloadMessage) => reloadMessage.type === "full",
-    );
-    if (someEffectIsFullReload) {
-      reloadHtmlPage();
+  };
+
+  let pendingCallbacks = [];
+  let running = false;
+  const addToHotQueue = async (callback) => {
+    pendingCallbacks.push(callback);
+    dequeue();
+  };
+  const dequeue = async () => {
+    if (running) {
       return;
     }
-    reloader.status.goTo("reloading");
-    const onApplied = (reloadMessage) => {
-      reloader.changes.remove(reloadMessage);
-    };
-    const setReloadMessagePromise = (reloadMessage, promise) => {
-      promise.then(
-        () => {
-          onApplied(reloadMessage);
-          reloader.currentExecution = null;
-        },
-        (e) => {
-          reloader.status.goTo("failed");
-          if (typeof window.reportError === "function") {
-            window.reportError(e);
-          } else {
-            console.error(e);
-          }
-          console.error(
-            `[jsenv] Hot reload failed after ${reloadMessage.reason}.
-This could be due to syntax errors or importing non-existent modules (see errors in console)`,
-          );
-          reloader.currentExecution = null;
-        },
-      );
-    };
-    reloader.changes.value.forEach((reloadMessage) => {
-      if (reloadMessage.type === "hot") {
-        const promise = addToHotQueue(() => {
-          return applyHotReload(reloadMessage);
-        });
-        setReloadMessagePromise(reloadMessage, promise);
-      } else {
-        setReloadMessagePromise(reloadMessage, Promise.resolve());
+    const callbacks = pendingCallbacks.slice();
+    pendingCallbacks = [];
+    running = true;
+    try {
+      await callbacks.reduce(async (previous, callback) => {
+        await previous;
+        await callback();
+      }, Promise.resolve());
+    } finally {
+      running = false;
+      if (pendingCallbacks.length) {
+        dequeue();
       }
-    });
-  },
-};
-
-let pendingCallbacks = [];
-let running = false;
-const addToHotQueue = async (callback) => {
-  pendingCallbacks.push(callback);
-  dequeue();
-};
-const dequeue = async () => {
-  if (running) {
-    return;
-  }
-  const callbacks = pendingCallbacks.slice();
-  pendingCallbacks = [];
-  running = true;
-  try {
-    await callbacks.reduce(async (previous, callback) => {
-      await previous;
-      await callback();
-    }, Promise.resolve());
-  } finally {
-    running = false;
-    if (pendingCallbacks.length) {
-      dequeue();
     }
-  }
-};
+  };
 
-const applyHotReload = async ({ cause, hotInstructions }) => {
-  await hotInstructions.reduce(
-    async (previous, { type, boundary, acceptedBy }) => {
-      await previous;
+  const applyHotReload = async ({ cause, hotInstructions }) => {
+    for (const instruction of hotInstructions) {
+      const { type, boundary, acceptedBy } = instruction;
 
       const hot = Date.now();
       const urlToFetch = new URL(boundary, `${window.location.origin}/`).href;
@@ -141,7 +141,6 @@ const applyHotReload = async ({ cause, hotInstructions }) => {
       // there is no url hot meta when:
       // - code was not executed (code splitting with dynamic import)
       // - import.meta.hot.accept() is not called (happens for HTML and CSS)
-
       if (type === "prune") {
         if (urlHotMeta) {
           delete urlHotMetas[urlToFetch];
@@ -154,9 +153,8 @@ const applyHotReload = async ({ cause, hotInstructions }) => {
             console.groupEnd();
           }
         }
-        return null;
+        continue;
       }
-
       if (acceptedBy === boundary) {
         console.groupCollapsed(`[jsenv] hot reloading ${boundary} (${cause})`);
       } else {
@@ -167,7 +165,7 @@ const applyHotReload = async ({ cause, hotInstructions }) => {
       if (type === "js_module") {
         if (!urlHotMeta) {
           // code was not executed, no need to re-execute it
-          return null;
+          continue;
         }
         if (urlHotMeta.disposeCallback) {
           console.log(`call dispose callback`);
@@ -184,18 +182,23 @@ const applyHotReload = async ({ cause, hotInstructions }) => {
         }
         console.log(`js module import done`);
         console.groupEnd();
-        return namespace;
+        continue;
       }
       if (type === "html") {
-        const isRootHtmlFile =
-          window.location.pathname === "/" &&
-          new URL(urlToFetch).pathname.slice(1).indexOf("/") === -1;
+        let isRootHtmlFile;
+        if (window.location.pathname === "/") {
+          if (new URL(urlToFetch).pathname.slice(1).indexOf("/") === -1) {
+            isRootHtmlFile = true;
+          } else if (new URL(urlToFetch).pathname === mainFilePath) {
+            isRootHtmlFile = true;
+          }
+        }
         if (
           !isRootHtmlFile &&
           !compareTwoUrlPaths(urlToFetch, window.location.href)
         ) {
           // we are not in that HTML page
-          return null;
+          continue;
         }
         const urlToReload = new URL(acceptedBy, `${window.location.origin}/`)
           .href;
@@ -213,18 +216,16 @@ const applyHotReload = async ({ cause, hotInstructions }) => {
           });
         }
         console.groupEnd();
-        return null;
+        continue;
       }
       console.warn(`unknown update type: "${type}"`);
-      return null;
+    }
+  };
+
+  window.__reloader__ = reloader;
+  window.__server_events__.listenEvents({
+    reload: (reloadServerEvent) => {
+      reloader.changes.add(reloadServerEvent.data);
     },
-    Promise.resolve(),
-  );
+  });
 };
-
-window.__reloader__ = reloader;
-window.__server_events__.listenEvents({
-  reload: (reloadServerEvent) => {
-    reloader.changes.add(reloadServerEvent.data);
-  },
-});

package/src/plugins/autoreload/jsenv_plugin_autoreload_client.js

@@ -26,12 +26,21 @@ export const jsenvPluginAutoreloadClient = () => {
           expectedType: "js_module",
           specifier: autoreloadClientFileUrl,
         });
+        const paramsJson = JSON.stringify(
+          {
+            mainFilePath: `/${htmlUrlInfo.kitchen.context.mainFilePath}`,
+          },
+          null,
+          "  ",
+        );
         injectHtmlNodeAsEarlyAsPossible(
           htmlAst,
           createHtmlNode({
             tagName: "script",
             type: "module",
-            src: autoreloadClientReference.generatedSpecifier,
+            textContent: `import { initAutoreload } from "${autoreloadClientReference.generatedSpecifier}";
+
+initAutoreload(${paramsJson});`,
           }),
           "jsenv:autoreload_client",
         );

package/src/plugins/autoreload/jsenv_plugin_autoreload_server.js

@@ -38,7 +38,10 @@ export const jsenvPluginAutoreloadServer = ({
                       : `a dependent file accepts hot reload`,
                 };
               }
-              if (urlInfo.data.hotDecline) {
+              if (
+                urlInfo.data.hotDecline ||
+                urlInfo.firstReference?.type === "http_request"
+              ) {
                 return {
                   declined: true,
                   reason: `file declines hot reload`,

package/src/plugins/protocol_file/directory.html

@@ -0,0 +1,20 @@
+<!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

@@ -0,0 +1,21 @@
+<!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

@@ -0,0 +1,18 @@
+<!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>