@jsenv/core 40.7.0 → 40.7.2

package/src/build/build.js

@@ -52,7 +52,7 @@ import {
   nodeDefaultRuntimeCompat,
 } from "@jsenv/runtime-compat";
 import {
-  urlIsInsideOf,
+  urlIsOrIsInsideOf,
   urlToBasename,
   urlToExtension,
   urlToFilename,
@@ -208,7 +208,7 @@ export const build = async ({
               );
             }
           }
-          if (!urlIsInsideOf(sourceUrl, sourceDirectoryUrl)) {
+          if (!urlIsOrIsInsideOf(sourceUrl, sourceDirectoryUrl)) {
             throw new Error(
               `The key "${key}" in "entryPoints" is invalid: it must be inside the source directory at ${sourceDirectoryUrl}.`,
             );
@@ -259,7 +259,7 @@ export const build = async ({
                 `The buildRelativeUrl "${buildRelativeUrl}"${forEntryPointOrEmpty} is invalid: it must be a relative url.`,
               );
             }
-            if (!urlIsInsideOf(buildUrl, buildDirectoryUrl)) {
+            if (!urlIsOrIsInsideOf(buildUrl, buildDirectoryUrl)) {
               throw new Error(
                 `The buildRelativeUrl "${buildRelativeUrl}"${forEntryPointOrEmpty} is invalid: it must be inside the build directory at ${buildDirectoryUrl}.`,
               );
@@ -552,7 +552,7 @@ export const build = async ({
     if (
       process.env.CAPTURING_SIDE_EFFECTS ||
       (!import.meta.build &&
-        urlIsInsideOf(sourceDirectoryUrl, jsenvCoreDirectoryUrl))
+        urlIsOrIsInsideOf(sourceDirectoryUrl, jsenvCoreDirectoryUrl))
     ) {
       outDirectoryUrl = new URL("../.jsenv_b/", sourceDirectoryUrl).href;
     } else if (packageDirectory.url) {
@@ -761,7 +761,7 @@ export const build = async ({
           let hasSomeOutdatedSideEffectUrl = false;
           for (const packageSideEffectUrl of packageSideEffectUrlSet) {
             if (
-              urlIsInsideOf(packageSideEffectUrl, buildDirectoryUrl) &&
+              urlIsOrIsInsideOf(packageSideEffectUrl, buildDirectoryUrl) &&
               !buildSideEffectUrlSet.has(packageSideEffectUrl)
             ) {
               hasSomeOutdatedSideEffectUrl = true;
@@ -1061,7 +1061,7 @@ const prepareEntryPointBuild = async (
   });
 
   let _getOtherEntryBuildInfo;
-  const rawPluginStore = createPluginStore([
+  const rawPluginStore = await createPluginStore([
     ...(mappings ? [jsenvPluginMappings(mappings)] : []),
     {
       name: "jsenv:other_entry_point_build_during_craft",
@@ -1106,7 +1106,7 @@ const prepareEntryPointBuild = async (
       packageSideEffects,
     }),
   ]);
-  const rawPluginController = createPluginController(
+  const rawPluginController = await createPluginController(
     rawPluginStore,
     rawKitchen,
   );
@@ -1177,7 +1177,7 @@ const prepareEntryPointBuild = async (
           rawKitchen.graph.getUrlInfo(entryReference.url).type === "html" &&
           rawKitchen.context.isSupportedOnCurrentClients("importmap"),
       });
-      const finalPluginStore = createPluginStore([
+      const finalPluginStore = await createPluginStore([
         jsenvPluginReferenceAnalysis({
           ...referenceAnalysis,
           fetchInlineUrls: false,
@@ -1210,7 +1210,7 @@ const prepareEntryPointBuild = async (
         },
         buildSpecifierManager.jsenvPluginMoveToBuildDirectory,
       ]);
-      const finalPluginController = createPluginController(
+      const finalPluginController = await createPluginController(
         finalPluginStore,
         finalKitchen,
         {

package/src/build/build_specifier_manager.js

@@ -16,7 +16,7 @@ import {
   ensurePathnameTrailingSlash,
   injectQueryParamIntoSpecifierWithoutEncoding,
   renderUrlOrRelativeUrlFilename,
-  urlIsInsideOf,
+  urlIsOrIsInsideOf,
   urlToRelativeUrl,
 } from "@jsenv/urls";
 import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js";
@@ -676,7 +676,7 @@ export const createBuildSpecifierManager = ({
         // const urlInfoInsideThisDirectorySet = new Set();
         const versionsInfluencingThisDirectorySet = new Set();
         for (const [url, urlInfo] of finalKitchen.graph.urlInfoMap) {
-          if (!urlIsInsideOf(url, directoryUrl)) {
+          if (!urlIsOrIsInsideOf(url, directoryUrl)) {
             continue;
           }
           // ideally we should exclude eventual directories as the are redundant
@@ -1075,7 +1075,7 @@ export const createBuildSpecifierManager = ({
           }
           if (
             urlInfo.type === "asset" &&
-            urlIsInsideOf(urlInfo.url, buildDirectoryUrl)
+            urlIsOrIsInsideOf(urlInfo.url, buildDirectoryUrl)
           ) {
             return;
           }

package/src/build/build_urls_generator.js

@@ -1,7 +1,7 @@
 // import { ANSI } from "@jsenv/humanize";
 import {
   injectQueryParams,
-  urlIsInsideOf,
+  urlIsOrIsInsideOf,
   urlToFilename,
   urlToRelativeUrl,
 } from "@jsenv/urls";
@@ -36,7 +36,7 @@ export const createBuildUrlsGenerator = ({
     if (buildUrlFromMap) {
       return buildUrlFromMap;
     }
-    if (urlIsInsideOf(url, buildDirectoryUrl)) {
+    if (urlIsOrIsInsideOf(url, buildDirectoryUrl)) {
       if (ownerUrlInfo.searchParams.has("dynamic_import_id")) {
         const ownerDirectoryPath = determineDirectoryPath({
           sourceDirectoryUrl,

package/src/dev/start_dev_server.js

@@ -15,7 +15,7 @@ import {
 } from "@jsenv/server";
 import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/internal/convertFileSystemErrorToResponseProperties.js";
 import { URL_META } from "@jsenv/url-meta";
-import { urlIsInsideOf, urlToRelativeUrl } from "@jsenv/urls";
+import { urlIsOrIsInsideOf, urlToRelativeUrl } from "@jsenv/urls";
 import { existsSync, readFileSync } from "node:fs";
 import { defaultRuntimeCompat } from "../build/build_params.js";
 import { createEventEmitter } from "../helpers/event_emitter.js";
@@ -131,7 +131,7 @@ export const startDevServer = async ({
       if (
         process.env.CAPTURING_SIDE_EFFECTS ||
         (!import.meta.build &&
-          urlIsInsideOf(sourceDirectoryUrl, jsenvCoreDirectoryUrl))
+          urlIsOrIsInsideOf(sourceDirectoryUrl, jsenvCoreDirectoryUrl))
       ) {
         outDirectoryUrl = new URL("../.jsenv/", sourceDirectoryUrl);
       } else {
@@ -248,7 +248,7 @@ export const startDevServer = async ({
       read: readPackageAtOrNull,
     };
 
-    const devServerPluginStore = createPluginStore([
+    const devServerPluginStore = await createPluginStore([
       jsenvPluginServerEvents({ clientAutoreload }),
       ...plugins,
       ...getCorePlugins({
@@ -274,7 +274,7 @@ export const startDevServer = async ({
         ribbon,
       }),
     ]);
-    const getOrCreateKitchen = (request) => {
+    const getOrCreateKitchen = async (request) => {
       const { runtimeName, runtimeVersion } = parseUserAgentHeader(
         request.headers["user-agent"] || "",
       );
@@ -397,7 +397,7 @@ export const startDevServer = async ({
           );
         },
       );
-      const devServerPluginController = createPluginController(
+      const devServerPluginController = await createPluginController(
         devServerPluginStore,
         kitchen,
       );
@@ -413,8 +413,8 @@ export const startDevServer = async ({
 
     finalServices.push({
       name: "jsenv:dev_server_routes",
-      augmentRouteFetchSecondArg: (request) => {
-        const kitchen = getOrCreateKitchen(request);
+      augmentRouteFetchSecondArg: async (request) => {
+        const kitchen = await getOrCreateKitchen(request);
         return { kitchen };
       },
       routes: [
@@ -617,6 +617,7 @@ export const startDevServer = async ({
         },
       ],
     });
+    finalServices.push(...devServerPluginStore.allDevServerServices);
   }
   // jsenv error handler service
   {

package/src/helpers/web_url_converter.js

@@ -1,9 +1,9 @@
 import { ensureWindowsDriveLetter } from "@jsenv/filesystem";
-import { moveUrl, urlIsInsideOf } from "@jsenv/urls";
+import { moveUrl, urlIsOrIsInsideOf } from "@jsenv/urls";
 
 export const WEB_URL_CONVERTER = {
   asWebUrl: (fileUrl, webServer) => {
-    if (urlIsInsideOf(fileUrl, webServer.rootDirectoryUrl)) {
+    if (urlIsOrIsInsideOf(fileUrl, webServer.rootDirectoryUrl)) {
       return moveUrl({
         url: fileUrl,
         from: webServer.rootDirectoryUrl,

package/src/kitchen/errors.js

@@ -73,6 +73,7 @@ export const createFetchUrlContentError = ({
   const createFailedToFetchUrlContentError = ({
     code = error.code || "FETCH_URL_CONTENT_ERROR",
     reason,
+    parseErrorSourceType,
     ...details
   }) => {
     const reference = urlInfo.firstReference;
@@ -93,6 +94,7 @@ ${reason}`,
       name: "FETCH_URL_CONTENT_ERROR",
       code,
       reason,
+      parseErrorSourceType,
       url: urlInfo.url,
       trace: code === "PARSE_ERROR" ? error.trace : reference.trace,
       asResponse: error.asResponse,
@@ -127,6 +129,7 @@ ${reason}`,
     return createFailedToFetchUrlContentError({
       "code": "PARSE_ERROR",
       "reason": error.reasonCode,
+      "parseErrorSourceType": error.parseErrorSourceType,
       ...(error.cause ? { "parse error message": error.cause.message } : {}),
       "parse error trace": error.trace?.message,
     });
@@ -176,7 +179,9 @@ ${error.message}`,
       name: "TRANSFORM_URL_CONTENT_ERROR",
       code: "PARSE_ERROR",
       reason: error.message,
-      stack: error.stack,
+      reasonCode: error.reasonCode,
+      parseErrorSourceType: error.parseErrorSourceType,
+      stack: transformError.stack,
       trace,
       asResponse: error.asResponse,
     });

package/src/kitchen/out_directory_url.js

@@ -1,6 +1,6 @@
 import { ensureWindowsDriveLetter } from "@jsenv/filesystem";
 import { generateSourcemapFileUrl } from "@jsenv/sourcemap";
-import { moveUrl, setUrlFilename, urlIsInsideOf } from "@jsenv/urls";
+import { moveUrl, setUrlFilename, urlIsOrIsInsideOf } from "@jsenv/urls";
 
 export const determineFileUrlForOutDirectory = (urlInfo) => {
   let { url, filenameHint } = urlInfo;
@@ -11,7 +11,7 @@ export const determineFileUrlForOutDirectory = (urlInfo) => {
   if (!url.startsWith("file:")) {
     return url;
   }
-  if (!urlIsInsideOf(url, rootDirectoryUrl)) {
+  if (!urlIsOrIsInsideOf(url, rootDirectoryUrl)) {
     const fsRootUrl = ensureWindowsDriveLetter("file:///", url);
     url = `${rootDirectoryUrl}@fs/${url.slice(fsRootUrl.length)}`;
   }

package/src/plugins/autoreload/jsenv_plugin_autoreload_server.js

@@ -1,4 +1,4 @@
-import { urlIsInsideOf, urlToRelativeUrl } from "@jsenv/urls";
+import { urlIsOrIsInsideOf, urlToRelativeUrl } from "@jsenv/urls";
 
 export const jsenvPluginAutoreloadServer = ({
   clientFileChangeEventEmitter,
@@ -10,7 +10,7 @@ export const jsenvPluginAutoreloadServer = ({
     serverEvents: {
       reload: (serverEventInfo) => {
         const formatUrlForClient = (url) => {
-          if (urlIsInsideOf(url, serverEventInfo.rootDirectoryUrl)) {
+          if (urlIsOrIsInsideOf(url, serverEventInfo.rootDirectoryUrl)) {
             return urlToRelativeUrl(url, serverEventInfo.rootDirectoryUrl);
           }
           if (url.startsWith("file:")) {

package/src/plugins/chrome_devtools_json/jsenv_plugin_chrome_devtools_json.js

@@ -28,6 +28,7 @@ export const jsenvPluginChromeDevtoolsJson = () => {
     devServerRoutes: [
       {
         endpoint: "GET /.well-known/appspecific/com.chrome.devtools.json",
+        declarationSource: import.meta.url,
         fetch: (request, { kitchen }) => {
           const { rootDirectoryUrl } = kitchen.context;
           return Response.json({

package/src/plugins/plugin_controller.js

@@ -1,10 +1,19 @@
 import { performance } from "node:perf_hooks";
 import { jsenvPluginHtmlSyntaxErrorFallback } from "./html_syntax_error_fallback/jsenv_plugin_html_syntax_error_fallback.js";
 
-export const createPluginStore = (plugins) => {
+export const createPluginStore = async (plugins) => {
   const allDevServerRoutes = [];
+  const allDevServerServices = [];
   const pluginArray = [];
-  const addPlugin = (plugin) => {
+
+  const pluginPromises = [];
+  const addPlugin = async (plugin) => {
+    if (plugin && typeof plugin.then === "function") {
+      pluginPromises.push(plugin);
+      const value = await plugin;
+      addPlugin(value);
+      return;
+    }
     if (Array.isArray(plugin)) {
       for (const subplugin of plugin) {
         addPlugin(subplugin);
@@ -23,21 +32,28 @@ export const createPluginStore = (plugins) => {
         allDevServerRoutes.push(devServerRoute);
       }
     }
+    if (plugin.devServerServices) {
+      const devServerServices = plugin.devServerServices;
+      for (const devServerService of devServerServices) {
+        allDevServerServices.push(devServerService);
+      }
+    }
     pluginArray.push(plugin);
   };
   addPlugin(jsenvPluginHtmlSyntaxErrorFallback());
   for (const plugin of plugins) {
     addPlugin(plugin);
   }
+  await Promise.all(pluginPromises);
 
   return {
     pluginArray,
-
     allDevServerRoutes,
+    allDevServerServices,
   };
 };
 
-export const createPluginController = (
+export const createPluginController = async (
   pluginStore,
   kitchen,
   { initialPuginsMeta = {} } = {},
@@ -60,7 +76,7 @@ export const createPluginController = (
       pluginCandidate.destroy?.();
       continue;
     }
-    const initPluginResult = initPlugin(pluginCandidate, kitchen);
+    const initPluginResult = await initPlugin(pluginCandidate, kitchen);
     if (!initPluginResult) {
       pluginCandidate.destroy?.();
       continue;
@@ -112,6 +128,7 @@ export const createPluginController = (
         key === "serverEvents" ||
         key === "mustStayFirst" ||
         key === "devServerRoutes" ||
+        key === "devServerServices" ||
         key === "effect"
       ) {
         continue;
@@ -285,6 +302,7 @@ export const createPluginController = (
 const HOOK_NAMES = [
   "init",
   "devServerRoutes", // is called only during dev/tests
+  "devServerServices", // is called only during dev/tests
   "resolveReference",
   "redirectReference",
   "transformReferenceSearchParams",
@@ -339,12 +357,12 @@ const testAppliesDuring = (plugin, kitchen) => {
     `"appliesDuring" must be an object or a string, got ${appliesDuring}`,
   );
 };
-const initPlugin = (plugin, kitchen) => {
+const initPlugin = async (plugin, kitchen) => {
   const { init } = plugin;
   if (!init) {
     return true;
   }
-  const initReturnValue = init(kitchen.context, { plugin });
+  const initReturnValue = await init(kitchen.context, { plugin });
   if (initReturnValue === false) {
     return false;
   }

package/src/plugins/protocol_file/client/directory_listing.jsx

@@ -6,7 +6,7 @@ const fileIconUrl = import.meta.resolve("./assets/file.png");
 const homeIconUrl = import.meta.resolve("./assets/home.svg#root");
 
 let {
-  navItems,
+  breadcrumb,
   mainFilePath,
   directoryContentItems,
   enoentDetails,
@@ -49,38 +49,51 @@ const DirectoryListing = () => {
   return (
     <>
       {enoentDetails ? <ErrorMessage /> : null}
-      <Nav />
+      <Breadcrumb items={breadcrumb} />
       <DirectoryContent items={directoryItems} />
     </>
   );
 };
 
 const ErrorMessage = () => {
-  const { fileUrl, filePathExisting, filePathNotFound } = enoentDetails;
+  const { filePathExisting, filePathNotFound } = enoentDetails;
+
+  let errorText;
+  let errorSuggestion;
+  errorText = (
+    <>
+      <strong>File not found:</strong>&nbsp;
+      <code>
+        <span className="file_path_good">{filePathExisting}</span>
+        <span className="file_path_bad">{filePathNotFound}</span>
+      </code>{" "}
+      does not exist on the server.
+    </>
+  );
+  errorSuggestion = (
+    <>
+      <span className="icon">🔍</span> Check available routes in{" "}
+      <a href="/.internal/route_inspector">route inspector</a>
+    </>
+  );
 
   return (
-    <p className="error_message">
-      <span className="error_text">
-        No filesystem entry at{" "}
-        <code title={fileUrl}>
-          <span className="file_path_good">{filePathExisting}</span>
-          <span className="file_path_bad">{filePathNotFound}</span>
-        </code>
-        .
-      </span>
-      <br />
-      <span className="error_text" style="font-size: 70%;">
-        See also available routes in the{" "}
-        <a href="/.internal/route_inspector">route inspector</a>.
-      </span>
-    </p>
+    <div className="error_message">
+      <p className="error_text">{errorText}</p>
+      <p
+        className="error_suggestion"
+        style="font-size: 0.8em; margin-top: 10px;"
+      >
+        {errorSuggestion}
+      </p>
+    </div>
   );
 };
 
-const Nav = () => {
+const Breadcrumb = ({ items }) => {
   return (
     <h1 className="nav">
-      {navItems.map((navItem) => {
+      {items.map((navItem) => {
         const {
           url,
           urlRelativeToServer,
@@ -91,7 +104,7 @@ const Nav = () => {
         const isDirectory = new URL(url).pathname.endsWith("/");
         return (
           <>
-            <NavItem
+            <BreadcrumbItem
               key={url}
               url={urlRelativeToServer}
               isCurrent={isCurrent}
@@ -99,7 +112,7 @@ const Nav = () => {
               iconLinkUrl={isServerRootDirectory ? `/${mainFilePath}` : ""}
             >
               {name}
-            </NavItem>
+            </BreadcrumbItem>
             {isDirectory ? (
               <span className="directory_separator">/</span>
             ) : null}
@@ -109,7 +122,13 @@ const Nav = () => {
     </h1>
   );
 };
-const NavItem = ({ url, iconImageUrl, iconLinkUrl, isCurrent, children }) => {
+const BreadcrumbItem = ({
+  url,
+  iconImageUrl,
+  iconLinkUrl,
+  isCurrent,
+  children,
+}) => {
   return (
     <span className="nav_item" data-current={isCurrent ? "" : undefined}>
       {iconLinkUrl ? (

package/src/plugins/protocol_file/file_and_server_urls_converter.js

@@ -1,11 +1,8 @@
-import { urlIsInsideOf, urlToRelativeUrl } from "@jsenv/urls";
+import { urlIsOrIsInsideOf, urlToRelativeUrl } from "@jsenv/urls";
 
 export const FILE_AND_SERVER_URLS_CONVERTER = {
   asServerUrl: (fileUrl, serverRootDirectoryUrl) => {
-    if (fileUrl === serverRootDirectoryUrl) {
-      return "/";
-    }
-    if (urlIsInsideOf(fileUrl, serverRootDirectoryUrl)) {
+    if (urlIsOrIsInsideOf(fileUrl, serverRootDirectoryUrl)) {
       const urlRelativeToServer = urlToRelativeUrl(
         fileUrl,
         serverRootDirectoryUrl,