@jsenv/core 39.9.0 → 39.9.2

package/dist/jsenv_core.js

@@ -11516,44 +11516,94 @@ const watchSourceFiles = (
   // But some project might want to use their root directory as source directory
   // 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 = {
-    "**/*": 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
-    "**/.*": false, // file starting with a dot -> do not watch
-    "**/.*/": false, // directory starting with a dot -> do not watch
-    "**/node_modules/": false, // node_modules directory -> do not watch
-    ...sourceFileConfig,
-  };
-  const stopWatchingSourceFiles = registerDirectoryLifecycle(
-    sourceDirectoryUrl,
-    {
-      watchPatterns,
-      cooldownBetweenFileEvents,
-      keepProcessAlive,
-      recursive: true,
-      added: ({ relativeUrl }) => {
-        callback({
-          url: new URL(relativeUrl, sourceDirectoryUrl).href,
-          event: "added",
-        });
-      },
-      updated: ({ relativeUrl }) => {
-        callback({
-          url: new URL(relativeUrl, sourceDirectoryUrl).href,
-          event: "modified",
-        });
-      },
-      removed: ({ relativeUrl }) => {
-        callback({
-          url: new URL(relativeUrl, sourceDirectoryUrl).href,
-          event: "removed",
-        });
+  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];
+    }
+  };
+  const watch = (rootDirectoryUrl) => {
+    const stopWatchingSourceFiles = registerDirectoryLifecycle(
+      rootDirectoryUrl,
+      {
+        watchPatterns,
+        cooldownBetweenFileEvents,
+        keepProcessAlive,
+        recursive: true,
+        added: ({ relativeUrl }) => {
+          callback({
+            url: new URL(relativeUrl, rootDirectoryUrl).href,
+            event: "added",
+          });
+        },
+        updated: ({ relativeUrl }) => {
+          callback({
+            url: new URL(relativeUrl, rootDirectoryUrl).href,
+            event: "modified",
+          });
+        },
+        removed: ({ relativeUrl }) => {
+          callback({
+            url: new URL(relativeUrl, rootDirectoryUrl).href,
+            event: "removed",
+          });
+        },
       },
-    },
-  );
-  stopWatchingSourceFiles.watchPatterns = watchPatterns;
-  return stopWatchingSourceFiles;
+    );
+    stopWatchingSourceFiles.watchPatterns = watchPatterns;
+    return stopWatchingSourceFiles;
+  };
+
+  npm_workspaces: {
+    const packageDirectoryUrl = lookupPackageDirectory(sourceDirectoryUrl);
+    let packageContent;
+    try {
+      packageContent = JSON.parse(
+        readFileSync(new URL("package.json", packageDirectoryUrl), "utf8"),
+      );
+    } catch {
+      break npm_workspaces;
+    }
+    const { workspaces } = packageContent;
+    if (!workspaces || !Array.isArray(workspaces) || workspaces.length === 0) {
+      break npm_workspaces;
+    }
+    for (const workspace of workspaces) {
+      if (workspace.endsWith("*")) {
+        const workspaceRelativeUrl = urlToRelativeUrl(
+          new URL(workspace.slice(0, -1), packageDirectoryUrl),
+          packageDirectoryUrl,
+        );
+        addDirectoryToWatch(workspaceRelativeUrl);
+      } else {
+        const workspaceRelativeUrl = urlToRelativeUrl(
+          new URL(workspace, packageDirectoryUrl),
+          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("");
+  return watch(sourceDirectoryUrl);
 };
 
 const jsenvCoreDirectoryUrl = new URL("../", import.meta.url);
@@ -17634,10 +17684,17 @@ const jsenvPluginInlineContentFetcher = () => {
       }
       let isDirectRequestToFile;
       if (urlInfo.context.request) {
-        const requestedUrl = new URL(
-          urlInfo.context.request.resource.slice(1),
-          urlInfo.context.rootDirectoryUrl,
-        ).href;
+        let requestResource = urlInfo.context.request.resource;
+        let requestedUrl;
+        if (requestResource.startsWith("/@fs/")) {
+          const fsRootRelativeUrl = requestResource.slice("/@fs/".length);
+          requestedUrl = `file:///${fsRootRelativeUrl}`;
+        } else {
+          requestedUrl = new URL(
+            requestResource.slice(1),
+            urlInfo.context.rootDirectoryUrl,
+          ).href;
+        }
         isDirectRequestToFile = requestedUrl === urlInfo.url;
       }
       /*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "39.9.0",
+  "version": "39.9.2",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {

package/src/helpers/watch_source_files.js

@@ -1,4 +1,7 @@
 import { registerDirectoryLifecycle } from "@jsenv/filesystem";
+import { urlToRelativeUrl } from "@jsenv/urls";
+import { readFileSync } from "node:fs";
+import { lookupPackageDirectory } from "./lookup_package_directory.js";
 
 export const watchSourceFiles = (
   sourceDirectoryUrl,
@@ -11,42 +14,92 @@ export const watchSourceFiles = (
   // But some project might want to use their root directory as source directory
   // 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 = {
-    "**/*": 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
-    "**/.*": false, // file starting with a dot -> do not watch
-    "**/.*/": false, // directory starting with a dot -> do not watch
-    "**/node_modules/": false, // node_modules directory -> do not watch
-    ...sourceFileConfig,
+  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];
+    }
   };
-  const stopWatchingSourceFiles = registerDirectoryLifecycle(
-    sourceDirectoryUrl,
-    {
-      watchPatterns,
-      cooldownBetweenFileEvents,
-      keepProcessAlive,
-      recursive: true,
-      added: ({ relativeUrl }) => {
-        callback({
-          url: new URL(relativeUrl, sourceDirectoryUrl).href,
-          event: "added",
-        });
+  const watch = (rootDirectoryUrl) => {
+    const stopWatchingSourceFiles = registerDirectoryLifecycle(
+      rootDirectoryUrl,
+      {
+        watchPatterns,
+        cooldownBetweenFileEvents,
+        keepProcessAlive,
+        recursive: true,
+        added: ({ relativeUrl }) => {
+          callback({
+            url: new URL(relativeUrl, rootDirectoryUrl).href,
+            event: "added",
+          });
+        },
+        updated: ({ relativeUrl }) => {
+          callback({
+            url: new URL(relativeUrl, rootDirectoryUrl).href,
+            event: "modified",
+          });
+        },
+        removed: ({ relativeUrl }) => {
+          callback({
+            url: new URL(relativeUrl, rootDirectoryUrl).href,
+            event: "removed",
+          });
+        },
       },
-      updated: ({ relativeUrl }) => {
-        callback({
-          url: new URL(relativeUrl, sourceDirectoryUrl).href,
-          event: "modified",
-        });
-      },
-      removed: ({ relativeUrl }) => {
-        callback({
-          url: new URL(relativeUrl, sourceDirectoryUrl).href,
-          event: "removed",
-        });
-      },
-    },
-  );
-  stopWatchingSourceFiles.watchPatterns = watchPatterns;
-  return stopWatchingSourceFiles;
+    );
+    stopWatchingSourceFiles.watchPatterns = watchPatterns;
+    return stopWatchingSourceFiles;
+  };
+
+  npm_workspaces: {
+    const packageDirectoryUrl = lookupPackageDirectory(sourceDirectoryUrl);
+    let packageContent;
+    try {
+      packageContent = JSON.parse(
+        readFileSync(new URL("package.json", packageDirectoryUrl), "utf8"),
+      );
+    } catch {
+      break npm_workspaces;
+    }
+    const { workspaces } = packageContent;
+    if (!workspaces || !Array.isArray(workspaces) || workspaces.length === 0) {
+      break npm_workspaces;
+    }
+    for (const workspace of workspaces) {
+      if (workspace.endsWith("*")) {
+        const workspaceRelativeUrl = urlToRelativeUrl(
+          new URL(workspace.slice(0, -1), packageDirectoryUrl),
+          packageDirectoryUrl,
+        );
+        addDirectoryToWatch(workspaceRelativeUrl);
+      } else {
+        const workspaceRelativeUrl = urlToRelativeUrl(
+          new URL(workspace, packageDirectoryUrl),
+          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("");
+  return watch(sourceDirectoryUrl);
 };

package/src/plugins/reference_analysis/jsenv_plugin_reference_analysis.js

@@ -43,10 +43,17 @@ const jsenvPluginInlineContentFetcher = () => {
       }
       let isDirectRequestToFile;
       if (urlInfo.context.request) {
-        const requestedUrl = new URL(
-          urlInfo.context.request.resource.slice(1),
-          urlInfo.context.rootDirectoryUrl,
-        ).href;
+        let requestResource = urlInfo.context.request.resource;
+        let requestedUrl;
+        if (requestResource.startsWith("/@fs/")) {
+          const fsRootRelativeUrl = requestResource.slice("/@fs/".length);
+          requestedUrl = `file:///${fsRootRelativeUrl}`;
+        } else {
+          requestedUrl = new URL(
+            requestResource.slice(1),
+            urlInfo.context.rootDirectoryUrl,
+          ).href;
+        }
         isDirectRequestToFile = requestedUrl === urlInfo.url;
       }
       /*