@jsenv/core 39.14.3 → 40.0.1

package/src/plugins/protocol_file/jsenv_plugin_directory_listing.js

@@ -24,10 +24,11 @@
 
 import {
   comparePathnames,
+  lookupPackageDirectory,
   readEntryStatSync,
   registerDirectoryLifecycle,
 } from "@jsenv/filesystem";
-import { pickContentType } from "@jsenv/server";
+import { pickContentType, WebSocketResponse } from "@jsenv/server";
 import {
   asUrlWithoutSearch,
   ensurePathnameTrailingSlash,
@@ -36,7 +37,7 @@ import {
   urlToRelativeUrl,
 } from "@jsenv/urls";
 import { existsSync, lstatSync, readdirSync } from "node:fs";
-import { lookupPackageDirectory } from "../../helpers/lookup_package_directory.js";
+import { getDirectoryWatchPatterns } from "../../helpers/watch_source_files.js";
 import { replacePlaceholders } from "../injections/jsenv_plugin_injections.js";
 import { FILE_AND_SERVER_URLS_CONVERTER } from "./file_and_server_urls_converter.js";
 
@@ -49,6 +50,9 @@ export const jsenvPluginDirectoryListing = ({
   urlMocks = false,
   autoreload = true,
   directoryContentMagicName,
+  rootDirectoryUrl,
+  mainFilePath,
+  sourceFilesConfig,
 }) => {
   return {
     name: "jsenv:directory_listing",
@@ -66,16 +70,24 @@ export const jsenvPluginDirectoryListing = ({
         fsStat = readEntryStatSync(url, { nullIfNotFound: true });
         reference.fsStat = fsStat;
       }
-      const { request, requestedUrl } = reference.ownerUrlInfo.context;
+      const { request, requestedUrl, mainFilePath, rootDirectoryUrl } =
+        reference.ownerUrlInfo.context;
       if (!fsStat) {
-        if (
-          requestedUrl === url &&
-          request &&
-          request.headers["sec-fetch-dest"] === "document"
-        ) {
-          return `${htmlFileUrlForDirectory}?url=${encodeURIComponent(url)}&enoent`;
+        if (!request || request.headers["sec-fetch-dest"] !== "document") {
+          return null;
         }
-        return null;
+        if (url !== requestedUrl) {
+          const mainFileUrl = new URL(mainFilePath, rootDirectoryUrl);
+          mainFileUrl.search = "";
+          mainFileUrl.hash = "";
+          const referenceUrl = new URL(url);
+          referenceUrl.search = "";
+          referenceUrl.hash = "";
+          if (mainFileUrl.href !== referenceUrl.href) {
+            return null;
+          }
+        }
+        return `${htmlFileUrlForDirectory}?url=${encodeURIComponent(url)}&enoent`;
       }
       const isDirectory = fsStat?.isDirectory();
       if (!isDirectory) {
@@ -130,65 +142,78 @@ export const jsenvPluginDirectoryListing = ({
         );
       },
     },
-    serveWebsocket: ({ websocket, request, context }) => {
-      if (!autoreload) {
-        return false;
-      }
-      const secProtocol = request.headers["sec-websocket-protocol"];
-      if (secProtocol !== "watch-directory") {
-        return false;
-      }
-      const { rootDirectoryUrl, mainFilePath } = context;
-      const requestedUrl = FILE_AND_SERVER_URLS_CONVERTER.asFileUrl(
-        request.pathname,
-        rootDirectoryUrl,
-      );
-      const closestDirectoryUrl = getFirstExistingDirectoryUrl(requestedUrl);
-      const sendMessage = (message) => {
-        websocket.send(JSON.stringify(message));
-      };
-      const generateItems = () => {
-        const firstExistingDirectoryUrl = getFirstExistingDirectoryUrl(
-          requestedUrl,
-          rootDirectoryUrl,
-        );
-        const items = getDirectoryContentItems({
-          serverRootDirectoryUrl: rootDirectoryUrl,
-          mainFilePath,
-          requestedUrl,
-          firstExistingDirectoryUrl,
-        });
-        return items;
-      };
+    devServerRoutes: [
+      {
+        endpoint:
+          "GET /.internal/directory_content.websocket?directory=:directory",
+        description: "Emit events when a directory content changes.",
+        declarationSource: import.meta.url,
+        fetch: (request) => {
+          if (!autoreload) {
+            return null;
+          }
+          return new WebSocketResponse((websocket) => {
+            const directoryRelativeUrl = request.params.directory;
+            const requestedUrl = FILE_AND_SERVER_URLS_CONVERTER.asFileUrl(
+              directoryRelativeUrl,
+              rootDirectoryUrl,
+            );
+            const closestDirectoryUrl =
+              getFirstExistingDirectoryUrl(requestedUrl);
+            const sendMessage = (message) => {
+              websocket.send(JSON.stringify(message));
+            };
+            const generateItems = () => {
+              const firstExistingDirectoryUrl = getFirstExistingDirectoryUrl(
+                requestedUrl,
+                rootDirectoryUrl,
+              );
+              const items = getDirectoryContentItems({
+                serverRootDirectoryUrl: rootDirectoryUrl,
+                mainFilePath,
+                requestedUrl,
+                firstExistingDirectoryUrl,
+              });
+              return items;
+            };
 
-      const unwatch = registerDirectoryLifecycle(closestDirectoryUrl, {
-        added: ({ relativeUrl }) => {
-          sendMessage({
-            type: "change",
-            reason: `${relativeUrl} added`,
-            items: generateItems(),
+            const unwatch = registerDirectoryLifecycle(closestDirectoryUrl, {
+              added: ({ relativeUrl }) => {
+                sendMessage({
+                  type: "change",
+                  reason: `${relativeUrl} added`,
+                  items: generateItems(),
+                });
+              },
+              updated: ({ relativeUrl }) => {
+                sendMessage({
+                  type: "change",
+                  reason: `${relativeUrl} updated`,
+                  items: generateItems(),
+                });
+              },
+              removed: ({ relativeUrl }) => {
+                sendMessage({
+                  type: "change",
+                  reason: `${relativeUrl} removed`,
+                  items: generateItems(),
+                });
+              },
+              watchPatterns: getDirectoryWatchPatterns(
+                closestDirectoryUrl,
+                closestDirectoryUrl,
+                {
+                  sourceFilesConfig,
+                },
+              ),
+            });
+            return () => {
+              unwatch();
+            };
           });
         },
-        updated: ({ relativeUrl }) => {
-          sendMessage({
-            type: "change",
-            reason: `${relativeUrl} updated`,
-            items: generateItems(),
-          });
-        },
-        removed: ({ relativeUrl }) => {
-          sendMessage({
-            type: "change",
-            reason: `${relativeUrl} removed`,
-            items: generateItems(),
-          });
-        },
-      });
-      websocket.signal.addEventListener("abort", () => {
-        unwatch();
-      });
-      return true;
-    },
+      },
+    ],
   };
 };
 
@@ -257,7 +282,7 @@ const generateDirectoryListingInjection = (
     );
   const websocketScheme = request.protocol === "https" ? "wss" : "ws";
   const { host } = new URL(request.url);
-  const websocketUrl = `${websocketScheme}://${host}${directoryUrlRelativeToServer}`;
+  const websocketUrl = `${websocketScheme}://${host}/.internal/directory_content.websocket?directory=${encodeURIComponent(directoryUrlRelativeToServer)}`;
 
   const navItems = [];
   nav_items: {

package/src/plugins/protocol_file/jsenv_plugin_fs_redirection.js

@@ -17,20 +17,30 @@ export const jsenvPluginFsRedirection = ({
     name: "jsenv:fs_redirection",
     appliesDuring: "*",
     redirectReference: (reference) => {
+      if (reference.url === "file:///") {
+        return `ignore:file:///`;
+      }
+      if (reference.url === "file://") {
+        return `ignore:file://`;
+      }
+      // ignore all new URL second arg
+      if (reference.subtype === "new_url_second_arg") {
+        if (reference.original) {
+          return `ignore:${reference.original.specifier}`;
+        }
+        return `ignore:${reference.specifier}`;
+      }
       // http, https, data, about, ...
       if (!reference.url.startsWith("file:")) {
         return null;
       }
-      if (reference.isInline) {
+      if (reference.original && !reference.original.url.startsWith("file:")) {
         return null;
       }
-      if (reference.url === "file:///" || reference.url === "file://") {
-        return `ignore:file:///`;
-      }
-      // ignore all new URL second arg
-      if (reference.subtype === "new_url_second_arg") {
-        return `ignore:${reference.url}`;
+      if (reference.isInline) {
+        return null;
       }
+
       if (
         reference.specifierPathname.endsWith(`/${directoryContentMagicName}`)
       ) {

package/src/plugins/protocol_file/jsenv_plugin_protocol_file.js

@@ -13,6 +13,9 @@ export const jsenvPluginProtocolFile = ({
   magicDirectoryIndex,
   preserveSymlinks,
   directoryListing,
+  rootDirectoryUrl,
+  mainFilePath,
+  sourceFilesConfig,
 }) => {
   return [
     jsenvPluginFsRedirection({
@@ -73,6 +76,9 @@ export const jsenvPluginProtocolFile = ({
           jsenvPluginDirectoryListing({
             ...directoryListing,
             directoryContentMagicName,
+            rootDirectoryUrl,
+            mainFilePath,
+            sourceFilesConfig,
           }),
         ]
       : []),

package/src/plugins/protocol_http/jsenv_plugin_protocol_http.js

@@ -1,7 +1,15 @@
 import { URL_META } from "@jsenv/url-meta";
+import { setUrlExtension, urlToExtension, urlToFilename } from "@jsenv/urls";
 import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js";
 
 export const jsenvPluginProtocolHttp = ({ include }) => {
+  const prependIgnore = (reference) => {
+    if (reference.original) {
+      return `ignore:${reference.original.specifier}`;
+    }
+    return `ignore:${reference.specifier}`;
+  };
+
   if (include === false) {
     return {
       name: "jsenv:protocol_http",
@@ -10,7 +18,7 @@ export const jsenvPluginProtocolHttp = ({ include }) => {
         if (!reference.url.startsWith("http")) {
           return null;
         }
-        return `ignore:${reference.url}`;
+        return prependIgnore(reference);
       },
     };
   }
@@ -33,7 +41,7 @@ export const jsenvPluginProtocolHttp = ({ include }) => {
         return null;
       }
       if (!shouldInclude(reference.url)) {
-        return `ignore:${reference.url}`;
+        return prependIgnore(reference);
       }
       const outDirectoryUrl = reference.ownerUrlInfo.context.outDirectoryUrl;
       const urlObject = new URL(reference.url);
@@ -72,12 +80,34 @@ export const jsenvPluginProtocolHttp = ({ include }) => {
       if (isTextual) {
         content = await response.text();
       } else {
-        content = await response.buffer;
+        content = Buffer.from(await response.arrayBuffer());
       }
+      // When fetching content from http it's possible to request something like
+      // "https://esm.sh/preact@10.23.1
+      // and receive content-type "application/javascript"
+      // if we do nothing, after build there will be a "preact@10.23.1" file without ".js" extension
+      // and the build server will serve this as "application/octet-stream".
+      // We want to build files to be compatible with any server and keep build server logic simple.
+      // -> We auto-append the extension corresponding to the content-type
+      let filenameHint;
+      const extension = urlToExtension(originalUrl);
+      if (extension === "") {
+        const wellKnownExtensionForThisContentType =
+          CONTENT_TYPE.toUrlExtension(contentType);
+        if (wellKnownExtensionForThisContentType) {
+          const urlWithExtension = setUrlExtension(
+            originalUrl,
+            wellKnownExtensionForThisContentType,
+          );
+          filenameHint = urlToFilename(urlWithExtension);
+        }
+      }
+
       return {
         content,
         contentType,
         contentLength: responseHeaders.get("content-length") || undefined,
+        filenameHint,
       };
     },
   };

package/src/plugins/reference_analysis/html/jsenv_plugin_html_reference_analysis.js

@@ -7,7 +7,6 @@ import {
   getUrlForContentInsideHtml,
   parseHtml,
   parseSrcSet,
-  removeHtmlNode,
   removeHtmlNodeText,
   setHtmlNodeAttributes,
   setHtmlNodeText,
@@ -63,22 +62,25 @@ export const jsenvPluginHtmlReferenceAnalysis = ({
         // no importmap in this HTML file
         importmaps[htmlUrl] = null;
       }
-      globalImportmap = Object.keys(importmaps).reduce((previous, url) => {
+      let importmapFinal = null;
+      for (const url of Object.keys(importmaps)) {
         const importmap = importmaps[url];
-        if (!previous) {
-          return importmap;
-        }
         if (!importmap) {
-          return previous;
+          continue;
         }
-        return composeTwoImportMaps(previous, importmap);
-      }, null);
+        if (!importmapFinal) {
+          importmapFinal = importmap;
+          continue;
+        }
+        importmapFinal = composeTwoImportMaps(importmapFinal, importmap);
+      }
+      globalImportmap = importmapFinal;
 
       importmapLoadingCount--;
       if (importmapLoadingCount === 0) {
-        allImportmapLoadedCallbackSet.forEach((callback) => {
-          callback();
-        });
+        for (const allImportmapLoadedCallback of allImportmapLoadedCallbackSet) {
+          allImportmapLoadedCallback();
+        }
         allImportmapLoadedCallbackSet.clear();
       }
     };
@@ -103,6 +105,7 @@ export const jsenvPluginHtmlReferenceAnalysis = ({
             },
           });
           if (fromMapping) {
+            reference.data.fromMapping = true;
             return result;
           }
           return null;
@@ -433,7 +436,7 @@ export const jsenvPluginHtmlReferenceAnalysis = ({
                       setHtmlNodeAttributes(scriptNode, {
                         "src": undefined,
                         "jsenv-inlined-by": "jsenv:html_reference_analysis",
-                        "inlined-from-src": src,
+                        "inlined-from-src": importmapReference.url,
                       });
                     });
                   });
@@ -471,16 +474,6 @@ export const jsenvPluginHtmlReferenceAnalysis = ({
                     });
                   }
                 }
-                // once this plugin knows the importmap, it will use it
-                // to map imports. These import specifiers will be normalized
-                // by "formatReference" making the importmap presence useless.
-                // In dev/test we keep importmap into the HTML to see it even if useless
-                // Duing build we get rid of it
-                if (urlInfo.context.build) {
-                  mutations.push(() => {
-                    removeHtmlNode(scriptNode);
-                  });
-                }
                 return;
               }
               const externalRef = visitSrc(scriptNode, {

package/src/plugins/reference_analysis/js/jsenv_plugin_js_reference_analysis.js

@@ -1,10 +1,12 @@
 import { getUrlForContentInsideJs, parseJsUrls } from "@jsenv/ast";
+import {
+  isWebWorkerEntryPointReference,
+  isWebWorkerUrlInfo,
+} from "@jsenv/core/src/kitchen/web_workers.js";
 import { createMagicSource } from "@jsenv/sourcemap";
 import { urlToExtension } from "@jsenv/urls";
 import { JS_QUOTES } from "@jsenv/utils/src/string/js_quotes.js";
 
-import { isWebWorkerUrlInfo } from "@jsenv/core/src/kitchen/web_workers.js";
-
 export const jsenvPluginJsReferenceAnalysis = ({ inlineContent }) => {
   return [
     {
@@ -97,6 +99,34 @@ const parseAndTransformJsReferences = async (
     ) {
       externalReferenceInfo.expectedType = "js_module";
     }
+
+    let filenameHint;
+    if (
+      externalReferenceInfo.subtype === "import_dynamic" &&
+      isBareSpecifier(externalReferenceInfo.specifier)
+    ) {
+      filenameHint = `${externalReferenceInfo.specifier}.js`;
+    }
+
+    let isEntryPoint;
+    let isDynamicEntryPoint;
+    if (
+      isNodeJs &&
+      (externalReferenceInfo.type === "js_url" ||
+        externalReferenceInfo.subtype === "import_meta_resolve")
+    ) {
+      isEntryPoint = true;
+      isDynamicEntryPoint = true;
+    } else if (
+      isWebWorkerEntryPointReference({
+        subtype: externalReferenceInfo.subtype,
+        expectedSubtype: externalReferenceInfo.expectedSubtype,
+      })
+    ) {
+      isEntryPoint = true;
+    } else {
+      isEntryPoint = false;
+    }
     const reference = urlInfo.dependencies.found({
       type: externalReferenceInfo.type,
       subtype: externalReferenceInfo.subtype,
@@ -119,7 +149,11 @@ const parseAndTransformJsReferences = async (
       importAttributes: externalReferenceInfo.importAttributes,
       isSideEffectImport: externalReferenceInfo.isSideEffectImport,
       astInfo: externalReferenceInfo.astInfo,
+      isEntryPoint,
+      isDynamicEntryPoint,
+      filenameHint,
     });
+
     parallelActions.push(async () => {
       await reference.readGeneratedSpecifier();
       const replacement = reference.generatedSpecifier;
@@ -158,3 +192,20 @@ const parseAndTransformJsReferences = async (
   const { content, sourcemap } = magicSource.toContentAndSourcemap();
   return { content, sourcemap };
 };
+
+const isBareSpecifier = (specifier) => {
+  if (
+    specifier[0] === "/" ||
+    specifier.startsWith("./") ||
+    specifier.startsWith("../")
+  ) {
+    return false;
+  }
+  try {
+    // eslint-disable-next-line no-new
+    new URL(specifier);
+    return false;
+  } catch {
+    return true;
+  }
+};

package/src/plugins/resolution_node_esm/jsenv_plugin_node_esm_resolution.js

@@ -3,43 +3,50 @@ import { createNodeEsmResolver } from "./node_esm_resolver.js";
 export const jsenvPluginNodeEsmResolution = (resolutionConfig = {}) => {
   let nodeEsmResolverDefault;
   const resolvers = {};
-  Object.keys(resolutionConfig).forEach((urlType) => {
-    const config = resolutionConfig[urlType];
-    if (config === true) {
-      resolvers[urlType] = (...args) => nodeEsmResolverDefault(...args);
-    } else if (config === false) {
-      resolvers[urlType] = () => null;
-    } else if (typeof config === "object") {
-      const { runtimeCompat, packageConditions, preservesSymlink, ...rest } =
-        config;
-      const unexpectedKeys = Object.keys(rest);
-      if (unexpectedKeys.length) {
-        throw new TypeError(
-          `${unexpectedKeys.join(
-            ",",
-          )}: there is no such configuration on "${urlType}"`,
-        );
-      }
-      resolvers[urlType] = createNodeEsmResolver({
-        runtimeCompat,
-        packageConditions,
-        preservesSymlink,
-      });
-    } else {
-      throw new TypeError(
-        `config must be true, false or an object, got ${config} on "${urlType}"`,
-      );
-    }
-  });
 
   return {
     name: "jsenv:node_esm_resolution",
     appliesDuring: "*",
-    init: ({ runtimeCompat }) => {
+    init: (kitchenContext) => {
       nodeEsmResolverDefault = createNodeEsmResolver({
-        runtimeCompat,
+        build: kitchenContext.build,
+        runtimeCompat: kitchenContext.runtimeCompat,
         preservesSymlink: true,
       });
+      Object.keys(resolutionConfig).forEach((urlType) => {
+        const config = resolutionConfig[urlType];
+        if (config === true) {
+          resolvers[urlType] = (...args) => nodeEsmResolverDefault(...args);
+        } else if (config === false) {
+          resolvers[urlType] = () => null;
+        } else if (typeof config === "object") {
+          const {
+            runtimeCompat,
+            packageConditions,
+            preservesSymlink,
+            ...rest
+          } = config;
+          const unexpectedKeys = Object.keys(rest);
+          if (unexpectedKeys.length) {
+            throw new TypeError(
+              `${unexpectedKeys.join(
+                ",",
+              )}: there is no such configuration on "${urlType}"`,
+            );
+          }
+          resolvers[urlType] = createNodeEsmResolver({
+            build: kitchenContext.build,
+            runtimeCompat,
+            packageConditions,
+            preservesSymlink,
+          });
+        } else {
+          throw new TypeError(
+            `config must be true, false or an object, got ${config} on "${urlType}"`,
+          );
+        }
+      });
+
       if (resolvers.js_module === undefined) {
         resolvers.js_module = nodeEsmResolverDefault;
       }

package/src/plugins/resolution_node_esm/node_esm_resolver.js

@@ -16,6 +16,7 @@ import {
 import { readFileSync } from "node:fs";
 
 export const createNodeEsmResolver = ({
+  build,
   runtimeCompat,
   packageConditions,
   preservesSymlink,
@@ -23,7 +24,7 @@ export const createNodeEsmResolver = ({
   const nodeRuntimeEnabled = Object.keys(runtimeCompat).includes("node");
   // https://nodejs.org/api/esm.html#resolver-algorithm-specification
   packageConditions = packageConditions || [
-    ...readCustomConditionsFromProcessArgs(),
+    ...(build ? [] : readCustomConditionsFromProcessArgs()),
     nodeRuntimeEnabled ? "node" : "browser",
     "import",
   ];
@@ -34,11 +35,7 @@ export const createNodeEsmResolver = ({
     }
     const { ownerUrlInfo } = reference;
     if (reference.specifierPathname[0] === "/") {
-      const url = new URL(
-        reference.specifier.slice(1),
-        ownerUrlInfo.context.rootDirectoryUrl,
-      );
-      return url;
+      return null; // let it to jsenv_web_resolution
     }
     let parentUrl;
     if (reference.baseUrl) {
@@ -49,8 +46,7 @@ export const createNodeEsmResolver = ({
       parentUrl = ownerUrlInfo.url;
     }
     if (!parentUrl.startsWith("file:")) {
-      const url = new URL(reference.specifier, parentUrl);
-      return url;
+      return null; // let it to jsenv_web_resolution
     }
     const { url, type, packageDirectoryUrl } = applyNodeEsmResolution({
       conditions: packageConditions,

package/src/plugins/resolution_web/jsenv_plugin_web_resolution.js

@@ -5,18 +5,20 @@ export const jsenvPluginWebResolution = () => {
     resolveReference: (reference) => {
       const { ownerUrlInfo } = reference;
       if (reference.specifierPathname[0] === "/") {
-        const url = new URL(
-          reference.specifier.slice(1),
-          ownerUrlInfo.context.rootDirectoryUrl,
-        );
+        const resource = reference.specifier;
+        if (ownerUrlInfo.originalUrl?.startsWith("http")) {
+          return new URL(resource, ownerUrlInfo.originalUrl);
+        }
+        const url = new URL(resource.slice(1), ownerUrlInfo.entryUrlInfo.url);
         return url;
       }
       // baseUrl happens second argument to new URL() is different from
       // import.meta.url or document.currentScript.src
       const parentUrl =
-        reference.baseUrl || ownerUrlInfo.context.dev
+        reference.baseUrl ||
+        (ownerUrlInfo.context.dev
           ? ownerUrlInfo.url
-          : ownerUrlInfo.originalUrl || ownerUrlInfo.url;
+          : ownerUrlInfo.originalUrl || ownerUrlInfo.url);
       const url = new URL(reference.specifier, parentUrl);
       return url;
     },

package/src/plugins/server_events/client/server_events_client.js

@@ -271,7 +271,7 @@ connection_using_websocket: {
     websocketUrl,
     {
       logs,
-      protocols = ["jsenv"],
+      protocols = [],
       useEventsToManageConnection = true,
       retry = false,
       retryAfter = 1000,
@@ -439,7 +439,7 @@ const serverEventsInterface = {
   listenEvents: () => {},
   setup: ({ logs }) => {
     const websocketScheme = self.location.protocol === "https:" ? "wss" : "ws";
-    const websocketUrl = `${websocketScheme}://${self.location.host}${self.location.pathname}${self.location.search}`;
+    const websocketUrl = `${websocketScheme}://${self.location.host}/.internal/events.websocket`;
     const websocketConnection = createWebSocketConnection(websocketUrl, {
       logs,
       retry: true,