@jsenv/core 39.14.2 → 40.0.0

package/src/helpers/watch_source_files.js

@@ -1,12 +1,36 @@
-import { registerDirectoryLifecycle } from "@jsenv/filesystem";
+import {
+  lookupPackageDirectory,
+  registerDirectoryLifecycle,
+} from "@jsenv/filesystem";
 import { urlToRelativeUrl } from "@jsenv/urls";
 import { readFileSync } from "node:fs";
-import { lookupPackageDirectory } from "./lookup_package_directory.js";
+
+export const getDirectoryWatchPatterns = (
+  directoryUrl,
+  watchedDirectoryUrl,
+  { sourceFilesConfig },
+) => {
+  const directoryUrlRelativeToWatchedDirectory = urlToRelativeUrl(
+    directoryUrl,
+    watchedDirectoryUrl,
+  );
+  const watchPatterns = {
+    [`${directoryUrlRelativeToWatchedDirectory}**/*`]: true, // by default watch everything inside the source directory
+    [`${directoryUrlRelativeToWatchedDirectory}**/.*`]: false, // file starting with a dot -> do not watch
+    [`${directoryUrlRelativeToWatchedDirectory}**/.*/`]: false, // directory starting with a dot -> do not watch
+    [`${directoryUrlRelativeToWatchedDirectory}**/node_modules/`]: false, // node_modules directory -> do not watch
+  };
+  for (const key of Object.keys(sourceFilesConfig)) {
+    watchPatterns[`${directoryUrlRelativeToWatchedDirectory}${key}`] =
+      sourceFilesConfig[key];
+  }
+  return watchPatterns;
+};
 
 export const watchSourceFiles = (
   sourceDirectoryUrl,
   callback,
-  { sourceFileConfig = {}, keepProcessAlive, cooldownBetweenFileEvents },
+  { sourceFilesConfig = {}, keepProcessAlive, cooldownBetweenFileEvents },
 ) => {
   // Project should use a dedicated directory (usually "src/")
   // passed to the dev server via "sourceDirectoryUrl" param
@@ -15,23 +39,18 @@ export const watchSourceFiles = (
   // In that case source directory might contain files matching "node_modules/*" or ".git/*"
   // And jsenv should not consider these as source files and watch them (to not hurt performances)
   const watchPatterns = {};
-  const addDirectoryToWatch = (directoryUrlRelativeToRoot) => {
-    Object.assign(watchPatterns, {
-      [`${directoryUrlRelativeToRoot}**/*`]: true, // by default watch everything inside the source directory
-      // line below is commented until @jsenv/url-meta fixes the fact that is matches
-      // any file with an extension
-      [`${directoryUrlRelativeToRoot}**/.*`]: false, // file starting with a dot -> do not watch
-      [`${directoryUrlRelativeToRoot}**/.*/`]: false, // directory starting with a dot -> do not watch
-      [`${directoryUrlRelativeToRoot}**/node_modules/`]: false, // node_modules directory -> do not watch
-    });
-    for (const key of Object.keys(sourceFileConfig)) {
-      watchPatterns[`${directoryUrlRelativeToRoot}${key}`] =
-        sourceFileConfig[key];
-    }
+  let watchedDirectoryUrl = "";
+  const addDirectoryToWatch = (directoryUrl) => {
+    Object.assign(
+      watchPatterns,
+      getDirectoryWatchPatterns(directoryUrl, watchedDirectoryUrl, {
+        sourceFilesConfig,
+      }),
+    );
   };
-  const watch = (rootDirectoryUrl) => {
+  const watch = () => {
     const stopWatchingSourceFiles = registerDirectoryLifecycle(
-      rootDirectoryUrl,
+      watchedDirectoryUrl,
       {
         watchPatterns,
         cooldownBetweenFileEvents,
@@ -39,19 +58,19 @@ export const watchSourceFiles = (
         recursive: true,
         added: ({ relativeUrl }) => {
           callback({
-            url: new URL(relativeUrl, rootDirectoryUrl).href,
+            url: new URL(relativeUrl, watchedDirectoryUrl).href,
             event: "added",
           });
         },
         updated: ({ relativeUrl }) => {
           callback({
-            url: new URL(relativeUrl, rootDirectoryUrl).href,
+            url: new URL(relativeUrl, watchedDirectoryUrl).href,
             event: "modified",
           });
         },
         removed: ({ relativeUrl }) => {
           callback({
-            url: new URL(relativeUrl, rootDirectoryUrl).href,
+            url: new URL(relativeUrl, watchedDirectoryUrl).href,
             event: "removed",
           });
         },
@@ -75,31 +94,26 @@ export const watchSourceFiles = (
     if (!workspaces || !Array.isArray(workspaces) || workspaces.length === 0) {
       break npm_workspaces;
     }
+    watchedDirectoryUrl = packageDirectoryUrl;
     for (const workspace of workspaces) {
       if (workspace.endsWith("*")) {
-        const workspaceRelativeUrl = urlToRelativeUrl(
-          new URL(workspace.slice(0, -1), packageDirectoryUrl),
+        const workspaceDirectoryUrl = new URL(
+          workspace.slice(0, -1),
           packageDirectoryUrl,
         );
-        addDirectoryToWatch(workspaceRelativeUrl);
+        addDirectoryToWatch(workspaceDirectoryUrl);
       } else {
-        const workspaceRelativeUrl = urlToRelativeUrl(
-          new URL(workspace, packageDirectoryUrl),
-          packageDirectoryUrl,
-        );
+        const workspaceRelativeUrl = new URL(workspace, packageDirectoryUrl);
         addDirectoryToWatch(workspaceRelativeUrl);
       }
     }
     // we are updating the root directory
     // we must make the patterns relative to source directory relative to the new root directory
-    const sourceRelativeToPackage = urlToRelativeUrl(
-      sourceDirectoryUrl,
-      packageDirectoryUrl,
-    );
-    addDirectoryToWatch(sourceRelativeToPackage);
-    return watch(packageDirectoryUrl);
+    addDirectoryToWatch(sourceDirectoryUrl);
+    return watch();
   }
 
-  addDirectoryToWatch("");
-  return watch(sourceDirectoryUrl);
+  watchedDirectoryUrl = sourceDirectoryUrl;
+  addDirectoryToWatch(sourceDirectoryUrl);
+  return watch();
 };

package/src/kitchen/fetched_content_compliance.js

@@ -7,12 +7,14 @@ export const assertFetchedContentCompliance = ({ urlInfo, content }) => {
   const { expectedContentType } = urlInfo.firstReference;
   if (expectedContentType && urlInfo.contentType !== expectedContentType) {
     throw new Error(
-      `content-type must be "${expectedContentType}", got "${urlInfo.contentType}`,
+      `content-type must be "${expectedContentType}", got "${urlInfo.contentType} on ${urlInfo.url}`,
     );
   }
   const { expectedType } = urlInfo.firstReference;
   if (expectedType && urlInfo.type !== expectedType) {
-    throw new Error(`type must be "${expectedType}", got "${urlInfo.type}"`);
+    throw new Error(
+      `type must be "${expectedType}", got "${urlInfo.type}" on ${urlInfo.url}`,
+    );
   }
   const { integrity } = urlInfo.firstReference;
   if (integrity) {

package/src/kitchen/kitchen.js

@@ -3,8 +3,6 @@ import { RUNTIME_COMPAT } from "@jsenv/runtime-compat";
 import { URL_META } from "@jsenv/url-meta";
 import { normalizeUrl } from "@jsenv/urls";
 import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js";
-import { jsenvPluginHtmlSyntaxErrorFallback } from "../plugins/html_syntax_error_fallback/jsenv_plugin_html_syntax_error_fallback.js";
-import { createPluginController } from "../plugins/plugin_controller.js";
 import {
   createFetchUrlContentError,
   createFinalizeUrlContentError,
@@ -42,7 +40,6 @@ export const createKitchen = ({
   // during dev/test clientRuntimeCompat is a single runtime
   // during build clientRuntimeCompat is runtimeCompat
   clientRuntimeCompat = runtimeCompat,
-  plugins,
   supervisor,
   sourcemaps = dev ? "inline" : "none", // "programmatic" and "file" also allowed
   sourcemapsComment,
@@ -51,9 +48,9 @@ export const createKitchen = ({
   sourcemapsSourcesContent,
   outDirectoryUrl,
   initialContext = {},
-  initialPluginsMeta = {},
 }) => {
   const logger = createLogger({ logLevel });
+
   const kitchen = {
     context: {
       ...initialContext,
@@ -74,12 +71,17 @@ export const createKitchen = ({
       outDirectoryUrl,
     },
     graph: null,
-    pluginController: null,
     urlInfoTransformer: null,
+    pluginController: null,
   };
   const kitchenContext = kitchen.context;
   kitchenContext.kitchen = kitchen;
 
+  let pluginController;
+  kitchen.setPluginController = (value) => {
+    pluginController = kitchen.pluginController = value;
+  };
+
   const graph = createUrlGraph({
     name,
     rootDirectoryUrl,
@@ -87,13 +89,6 @@ export const createKitchen = ({
   });
   kitchen.graph = graph;
 
-  const pluginController = createPluginController(
-    kitchenContext,
-    initialPluginsMeta,
-  );
-  kitchen.pluginController = pluginController;
-  pluginController.pushPlugin(jsenvPluginHtmlSyntaxErrorFallback(), ...plugins);
-
   const urlInfoTransformer = createUrlInfoTransformer({
     logger,
     sourcemaps,
@@ -108,9 +103,7 @@ export const createKitchen = ({
 
   const isIgnoredByProtocol = (url) => {
     const { protocol } = new URL(url);
-    const protocolIsSupported = supportedProtocols.some(
-      (supportedProtocol) => protocol === supportedProtocol,
-    );
+    const protocolIsSupported = supportedProtocols.includes(protocol);
     return !protocolIsSupported;
   };
   let isIgnoredByParam = () => false;
@@ -153,6 +146,12 @@ export const createKitchen = ({
           ? isIgnored(reference.original.url)
           : isIgnored(referenceUrl)
       ) {
+        if (
+          referenceUrl.startsWith("node:") &&
+          !reference.specifier.startsWith("node:")
+        ) {
+          reference.specifier = `node:${reference.specifier}`;
+        }
         referenceUrl = `ignore:${referenceUrl}`;
       }
 
@@ -338,6 +337,8 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
         headers = {},
         body,
         isEntryPoint,
+        isDynamicEntryPoint,
+        filenameHint,
       } = fetchUrlContentReturnValue;
       if (content === undefined) {
         content = body;
@@ -345,6 +346,9 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
       if (contentType === undefined) {
         contentType = headers["content-type"] || "application/octet-stream";
       }
+      if (filenameHint) {
+        urlInfo.filenameHint = filenameHint;
+      }
       urlInfo.status = status;
       urlInfo.contentType = contentType;
       urlInfo.headers = headers;
@@ -364,6 +368,9 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
       if (typeof isEntryPoint === "boolean") {
         urlInfo.isEntryPoint = isEntryPoint;
       }
+      if (typeof isDynamicEntryPoint === "boolean") {
+        urlInfo.isDynamicEntryPoint = isDynamicEntryPoint;
+      }
       assertFetchedContentCompliance({
         urlInfo,
         content,
@@ -672,18 +679,18 @@ const memoizeIsSupported = (runtimeCompat) => {
 
 const inferUrlInfoType = (urlInfo) => {
   const { type, typeHint } = urlInfo;
-  const { contentType } = urlInfo;
+  const mediaType = CONTENT_TYPE.asMediaType(urlInfo.contentType);
   const { expectedType } = urlInfo.firstReference;
   if (type === "sourcemap" || typeHint === "sourcemap") {
     return "sourcemap";
   }
-  if (contentType === "text/html") {
+  if (mediaType === "text/html") {
     return "html";
   }
-  if (contentType === "text/css") {
+  if (mediaType === "text/css") {
     return "css";
   }
-  if (contentType === "text/javascript") {
+  if (mediaType === "text/javascript") {
     if (expectedType === "js_classic") {
       return "js_classic";
     }
@@ -692,19 +699,19 @@ const inferUrlInfoType = (urlInfo) => {
     }
     return "js_module";
   }
-  if (contentType === "application/importmap+json") {
+  if (mediaType === "application/importmap+json") {
     return "importmap";
   }
-  if (contentType === "application/manifest+json") {
+  if (mediaType === "application/manifest+json") {
     return "webmanifest";
   }
-  if (contentType === "image/svg+xml") {
+  if (mediaType === "image/svg+xml") {
     return "svg";
   }
-  if (CONTENT_TYPE.isJson(contentType)) {
+  if (CONTENT_TYPE.isJson(mediaType)) {
     return "json";
   }
-  if (CONTENT_TYPE.isTextual(contentType)) {
+  if (CONTENT_TYPE.isTextual(mediaType)) {
     return "text";
   }
   return expectedType || "other";

package/src/kitchen/url_graph/references.js

@@ -9,7 +9,6 @@ import {
 } from "@jsenv/urls";
 
 import { prependContent } from "../prepend_content.js";
-import { isWebWorkerEntryPointReference } from "../web_workers.js";
 
 let referenceId = 0;
 
@@ -275,6 +274,7 @@ const createReference = ({
   baseUrl,
   isOriginalPosition,
   isEntryPoint = false,
+  isDynamicEntryPoint = false,
   isResourceHint = false,
   // implicit references are not real references
   // they represent an abstract relationship
@@ -350,6 +350,7 @@ const createReference = ({
     isOriginalPosition,
     baseUrl,
     isEntryPoint,
+    isDynamicEntryPoint,
     isResourceHint,
     isImplicit,
     implicitReferenceSet: new Set(),
@@ -731,9 +732,12 @@ const applyReferenceEffectsOnUrlInfo = (reference) => {
   referencedUrlInfo.originalUrl =
     referencedUrlInfo.originalUrl || (reference.original || reference).url;
 
-  if (reference.isEntryPoint || isWebWorkerEntryPointReference(reference)) {
+  if (reference.isEntryPoint) {
     referencedUrlInfo.isEntryPoint = true;
   }
+  if (reference.isDynamicEntryPoint) {
+    referencedUrlInfo.isDynamicEntryPoint = true;
+  }
   Object.assign(referencedUrlInfo.data, reference.data);
   Object.assign(referencedUrlInfo.timing, reference.timing);
   if (reference.injected) {
@@ -754,4 +758,8 @@ const applyReferenceEffectsOnUrlInfo = (reference) => {
   if (reference.expectedSubtype) {
     referencedUrlInfo.subtypeHint = reference.expectedSubtype;
   }
+
+  referencedUrlInfo.entryUrlInfo = reference.isEntryPoint
+    ? referencedUrlInfo
+    : reference.ownerUrlInfo.entryUrlInfo;
 };

package/src/kitchen/url_graph/url_graph.js

@@ -129,6 +129,7 @@ export const createUrlGraph = ({
 
   const rootUrlInfo = createUrlInfo(rootDirectoryUrl, kitchen.context);
   rootUrlInfo.isRoot = true;
+  rootUrlInfo.entryUrlInfo = rootUrlInfo;
   addUrlInfo(rootUrlInfo);
 
   Object.assign(urlGraph, {
@@ -204,6 +205,8 @@ const createUrlInfo = (url, context) => {
     url: null,
     originalUrl: undefined,
     isEntryPoint: false,
+    isDynamicEntryPoint: false,
+    entryUrlInfo: null,
     originalContent: undefined,
     originalContentAst: undefined,
     content: undefined,

package/src/kitchen/url_graph/url_graph_visitor.js

@@ -118,6 +118,9 @@ GRAPH_VISITOR.forEachUrlInfoStronglyReferenced = (
       if (referenceToOther.gotInlined()) {
         continue;
       }
+      if (referenceToOther.url.startsWith("ignore:")) {
+        continue;
+      }
       const referencedUrlInfo = referenceToOther.urlInfo;
       if (
         directoryUrlInfoSet &&

package/src/plugins/autoreload/jsenv_plugin_autoreload_server.js

@@ -243,6 +243,13 @@ export const jsenvPluginAutoreloadServer = ({
                 // happens when reloading the current html page for instance
                 continue;
               }
+              if (
+                lastReferenceFromOther.injected &&
+                lastReferenceFromOther.isWeak &&
+                lastReferenceFromOther.isImplicit
+              ) {
+                continue;
+              }
               const { ownerUrlInfo } = lastReferenceFromOther;
               if (!ownerUrlInfo.isUsed()) {
                 continue;
@@ -326,21 +333,27 @@ export const jsenvPluginAutoreloadServer = ({
         );
       },
     },
-    serve: (serveInfo) => {
-      if (serveInfo.request.pathname === "/__graph__") {
-        const graphJson = JSON.stringify(
-          serveInfo.kitchen.graph.toJSON(serveInfo.rootDirectoryUrl),
-        );
-        return {
-          status: 200,
-          headers: {
-            "content-type": "application/json",
-            "content-length": Buffer.byteLength(graphJson),
-          },
-          body: graphJson,
-        };
-      }
-      return null;
-    },
+    devServerRoutes: [
+      {
+        endpoint: "GET /.internal/graph.json",
+        description:
+          "Return a url graph of the project as a JSON file. This is useful to debug the project graph.",
+        availableMediaTypes: ["application/json"],
+        declarationSource: import.meta.url,
+        fetch: (request, { kitchen }) => {
+          const graphJson = JSON.stringify(
+            kitchen.graph.toJSON(kitchen.context.rootDirectoryUrl),
+          );
+          return {
+            status: 200,
+            headers: {
+              "content-type": "application/json",
+              "content-length": Buffer.byteLength(graphJson),
+            },
+            body: graphJson,
+          };
+        },
+      },
+    ],
   };
 };

package/src/plugins/html_syntax_error_fallback/jsenv_plugin_html_syntax_error_fallback.js

@@ -66,7 +66,7 @@ const generateHtmlForSyntaxError = (
   const replacers = {
     fileRelativeUrl: htmlRelativeUrl,
     reasonCode: htmlSyntaxError.reasonCode,
-    errorLinkHref: `javascript:window.fetch('/__open_in_editor__/${encodeURIComponent(
+    errorLinkHref: `javascript:window.fetch('/.internal/open_file/${encodeURIComponent(
       urlWithLineAndColumn,
     )}')`,
     errorLinkText: `${htmlRelativeUrl}:${line}:${column}`,