@jsenv/core 39.7.7 → 39.8.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "39.7.7",
+  "version": "39.8.1",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -70,19 +70,19 @@
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
     "@jsenv/abort": "4.3.0",
     "@jsenv/ast": "6.4.1",
-    "@jsenv/filesystem": "4.11.0",
+    "@jsenv/filesystem": "4.12.0",
     "@jsenv/humanize": "1.2.8",
     "@jsenv/importmap": "1.2.1",
     "@jsenv/integrity": "0.0.2",
-    "@jsenv/js-module-fallback": "1.3.53",
+    "@jsenv/js-module-fallback": "1.3.54",
     "@jsenv/node-esm-resolution": "1.0.6",
-    "@jsenv/plugin-bundling": "2.7.20",
+    "@jsenv/plugin-bundling": "2.7.21",
     "@jsenv/plugin-minification": "1.5.12",
-    "@jsenv/plugin-supervisor": "1.6.0",
-    "@jsenv/plugin-transpilation": "1.4.88",
+    "@jsenv/plugin-supervisor": "1.6.1",
+    "@jsenv/plugin-transpilation": "1.4.89",
     "@jsenv/runtime-compat": "1.3.1",
     "@jsenv/server": "15.3.3",
-    "@jsenv/sourcemap": "1.2.28",
+    "@jsenv/sourcemap": "1.2.29",
     "@jsenv/url-meta": "8.5.2",
     "@jsenv/urls": "2.5.4",
     "@jsenv/utils": "2.1.2",
@@ -108,7 +108,7 @@
     "@playwright/browser-firefox": "1.49.1",
     "@playwright/browser-webkit": "1.49.1",
     "babel-plugin-transform-async-to-promises": "0.8.18",
-    "eslint": "9.16.0",
+    "eslint": "9.17.0",
     "open": "10.1.0",
     "playwright": "1.49.1",
     "prettier": "3.4.2",

package/src/helpers/lookup_package_directory.js

@@ -1,37 +1,9 @@
+import { findAncestorDirectoryUrl } from "@jsenv/filesystem";
 import { existsSync } from "node:fs";
 
 export const lookupPackageDirectory = (currentUrl) => {
-  if (currentUrl === "file:///") {
-    return null;
-  }
-  const packageJsonFileUrl = `${currentUrl}package.json`;
-  if (existsSync(new URL(packageJsonFileUrl))) {
-    return currentUrl;
-  }
-  return lookupPackageDirectory(getParentUrl(currentUrl));
-};
-
-const getParentUrl = (url) => {
-  if (url.startsWith("file://")) {
-    // With node.js new URL('../', 'file:///C:/').href
-    // returns "file:///C:/" instead of "file:///"
-    const resource = url.slice("file://".length);
-    const slashLastIndex = resource.lastIndexOf("/");
-    if (slashLastIndex === -1) {
-      return url;
-    }
-    const lastCharIndex = resource.length - 1;
-    if (slashLastIndex === lastCharIndex) {
-      const slashBeforeLastIndex = resource.lastIndexOf(
-        "/",
-        slashLastIndex - 1,
-      );
-      if (slashBeforeLastIndex === -1) {
-        return url;
-      }
-      return `file://${resource.slice(0, slashBeforeLastIndex + 1)}`;
-    }
-    return `file://${resource.slice(0, slashLastIndex + 1)}`;
-  }
-  return new URL(url.endsWith("/") ? "../" : "./", url).href;
+  return findAncestorDirectoryUrl(currentUrl, (ancestorDirectoryUrl) => {
+    const potentialPackageJsonFileUrl = `${ancestorDirectoryUrl}package.json`;
+    return existsSync(new URL(potentialPackageJsonFileUrl));
+  });
 };

package/src/kitchen/url_graph/url_info_transformations.js

@@ -1,4 +1,4 @@
-import { removeDirectorySync, writeFileSync } from "@jsenv/filesystem";
+import { writeFileSync } from "@jsenv/filesystem";
 import {
   composeTwoSourcemaps,
   generateSourcemapDataUrl,
@@ -275,18 +275,7 @@ export const createUrlInfoTransformer = ({
       contentIsInlined = false;
     }
     if (!contentIsInlined) {
-      try {
-        writeFileSync(new URL(generatedUrl), urlInfo.content);
-      } catch (e) {
-        if (e.code === "EISDIR") {
-          // happens when directory existed but got delete
-          // we can safely remove that directory and write the new file
-          removeDirectorySync(new URL(generatedUrl));
-          writeFileSync(new URL(generatedUrl), urlInfo.content);
-        } else {
-          throw e;
-        }
-      }
+      writeFileSync(new URL(generatedUrl), urlInfo.content, { force: true });
     }
     const { sourcemapGeneratedUrl, sourcemapReference } = urlInfo;
     if (sourcemapGeneratedUrl && sourcemapReference) {

package/src/plugins/protocol_file/jsenv_plugin_protocol_file.js

@@ -11,6 +11,7 @@ import {
 } from "@jsenv/urls";
 import { CONTENT_TYPE } from "@jsenv/utils/src/content_type/content_type.js";
 import { existsSync, lstatSync, readdirSync, readFileSync } from "node:fs";
+import { lookupPackageDirectory } from "../../helpers/lookup_package_directory.js";
 import { jsenvCoreDirectoryUrl } from "../../jsenv_core_directory_url.js";
 import { jsenvPluginFsRedirection } from "./jsenv_plugin_fs_redirection.js";
 
@@ -83,6 +84,7 @@ export const jsenvPluginProtocolFile = ({
         if (!urlInfo.url.startsWith("file:")) {
           return null;
         }
+        const { rootDirectoryUrl } = urlInfo.context;
         const generateContent = () => {
           const urlObject = new URL(urlInfo.url);
           const { firstReference } = urlInfo;
@@ -101,11 +103,12 @@ export const jsenvPluginProtocolFile = ({
               : false;
             if (acceptsHtml) {
               firstReference.expectedType = "html";
-              const html = generateHtmlForDirectory(
-                urlObject.href,
-                directoryContentArray,
-                urlInfo.context.rootDirectoryUrl,
+              const directoryUrl = urlObject.href;
+              const directoryContentItems = generateDirectoryContentItems(
+                directoryUrl,
+                rootDirectoryUrl,
               );
+              const html = generateHtmlForDirectory(directoryContentItems);
               return {
                 type: "html",
                 contentType: "text/html",
@@ -138,32 +141,13 @@ export const jsenvPluginProtocolFile = ({
             if (e.code !== "ENOENT") {
               throw e;
             }
-            const rootDirectoryUrl = urlInfo.context.rootDirectoryUrl;
-            let firstExistingAncestorDirectoryUrl = new URL("./", urlInfo.url);
-            while (!existsSync(firstExistingAncestorDirectoryUrl)) {
-              firstExistingAncestorDirectoryUrl = new URL(
-                "../",
-                firstExistingAncestorDirectoryUrl,
-              );
-              if (
-                !urlIsInsideOf(
-                  firstExistingAncestorDirectoryUrl,
-                  rootDirectoryUrl,
-                )
-              ) {
-                firstExistingAncestorDirectoryUrl = rootDirectoryUrl;
-                break;
-              }
-            }
-
-            const firstExistingAncestorDirectoryContent = readdirSync(
-              new URL(firstExistingAncestorDirectoryUrl),
+            const directoryContentItems = generateDirectoryContentItems(
+              urlInfo.url,
+              rootDirectoryUrl,
             );
             const html = generateHtmlForENOENT(
               urlInfo.url,
-              firstExistingAncestorDirectoryContent,
-              firstExistingAncestorDirectoryUrl,
-              urlInfo.context.rootDirectoryUrl,
+              directoryContentItems,
               directoryListingUrlMocks,
             );
             return {
@@ -182,11 +166,9 @@ export const jsenvPluginProtocolFile = ({
   ];
 };
 
-const generateHtmlForDirectory = (
-  directoryUrl,
-  directoryContentArray,
-  rootDirectoryUrl,
-) => {
+const generateHtmlForDirectory = (directoryContentItems) => {
+  let directoryUrl = directoryContentItems.firstExistingDirectoryUrl;
+  const rootDirectoryUrl = directoryContentItems.rootDirectoryUrl;
   directoryUrl = assertAndNormalizeDirectoryUrl(directoryUrl);
 
   const htmlForDirectory = String(readFileSync(htmlFileUrlForDirectory));
@@ -195,23 +177,19 @@ const generateHtmlForDirectory = (
     directoryUrl,
     directoryNav: () =>
       generateDirectoryNav(directoryRelativeUrl, rootDirectoryUrl),
-    directoryContent: () =>
-      generateDirectoryContent(
-        directoryContentArray,
-        directoryUrl,
-        rootDirectoryUrl,
-      ),
+    directoryContent: () => generateDirectoryContent(directoryContentItems),
   };
   const html = replacePlaceholders(htmlForDirectory, replacers);
   return html;
 };
 const generateHtmlForENOENT = (
   url,
-  ancestorDirectoryContentArray,
-  ancestorDirectoryUrl,
-  rootDirectoryUrl,
+  directoryContentItems,
   directoryListingUrlMocks,
 ) => {
+  const ancestorDirectoryUrl = directoryContentItems.firstExistingDirectoryUrl;
+  const rootDirectoryUrl = directoryContentItems.rootDirectoryUrl;
+
   const htmlFor404AndAncestorDir = String(
     readFileSync(html404AndAncestorDirFileUrl),
   );
@@ -230,11 +208,7 @@ const generateHtmlForENOENT = (
     ancestorDirectoryNav: () =>
       generateDirectoryNav(ancestorDirectoryRelativeUrl, rootDirectoryUrl),
     ancestorDirectoryContent: () =>
-      generateDirectoryContent(
-        ancestorDirectoryContentArray,
-        ancestorDirectoryUrl,
-        rootDirectoryUrl,
-      ),
+      generateDirectoryContent(directoryContentItems),
   };
   const html = replacePlaceholders(htmlFor404AndAncestorDir, replacers);
   return html;
@@ -276,31 +250,95 @@ const generateDirectoryNav = (relativeUrl, rootDirectoryUrl) => {
   }
   return dirPartsHtml;
 };
-const generateDirectoryContent = (
-  directoryContentArray,
-  directoryUrl,
-  rootDirectoryUrl,
-) => {
-  if (directoryContentArray.length === 0) {
-    return `<p>Directory is empty</p>`;
+const generateDirectoryContentItems = (directoryUrl, rootDirectoryUrl) => {
+  let firstExistingDirectoryUrl = new URL("./", directoryUrl);
+  while (!existsSync(firstExistingDirectoryUrl)) {
+    firstExistingDirectoryUrl = new URL("../", firstExistingDirectoryUrl);
+    if (!urlIsInsideOf(firstExistingDirectoryUrl, rootDirectoryUrl)) {
+      firstExistingDirectoryUrl = new URL(rootDirectoryUrl);
+      break;
+    }
   }
-  const sortedNames = [];
+  const directoryContentArray = readdirSync(firstExistingDirectoryUrl);
+  const fileUrls = [];
   for (const filename of directoryContentArray) {
-    const fileUrlObject = new URL(filename, directoryUrl);
-    if (lstatSync(fileUrlObject).isDirectory()) {
-      sortedNames.push(`${filename}/`);
+    const fileUrlObject = new URL(filename, firstExistingDirectoryUrl);
+    fileUrls.push(fileUrlObject);
+  }
+  package_workspaces: {
+    if (String(firstExistingDirectoryUrl) !== String(rootDirectoryUrl)) {
+      break package_workspaces;
+    }
+    const packageDirectoryUrl = lookupPackageDirectory(rootDirectoryUrl);
+    if (!packageDirectoryUrl) {
+      break package_workspaces;
+    }
+    if (String(packageDirectoryUrl) === String(rootDirectoryUrl)) {
+      break package_workspaces;
+    }
+    let packageContent;
+    try {
+      packageContent = JSON.parse(
+        readFileSync(new URL("package.json", packageDirectoryUrl), "utf8"),
+      );
+    } catch {
+      break package_workspaces;
+    }
+    const { workspaces } = packageContent;
+    if (Array.isArray(workspaces)) {
+      for (const workspace of workspaces) {
+        const workspaceUrlObject = new URL(workspace, packageDirectoryUrl);
+        const workspaceUrl = workspaceUrlObject.href;
+        if (workspaceUrl.endsWith("*")) {
+          const directoryUrl = ensurePathnameTrailingSlash(
+            workspaceUrl.slice(0, -1),
+          );
+          fileUrls.push(new URL(directoryUrl));
+        } else {
+          fileUrls.push(ensurePathnameTrailingSlash(workspaceUrlObject));
+        }
+      }
+    }
+  }
+
+  const sortedUrls = [];
+  for (let fileUrl of fileUrls) {
+    if (lstatSync(fileUrl).isDirectory()) {
+      sortedUrls.push(ensurePathnameTrailingSlash(fileUrl));
     } else {
-      sortedNames.push(filename);
+      sortedUrls.push(fileUrl);
     }
   }
-  sortedNames.sort(comparePathnames);
-  let html = `<ul class="directory_content">`;
-  for (const filename of sortedNames) {
-    const fileUrlObject = new URL(filename, directoryUrl);
-    const fileUrl = String(fileUrlObject);
-    const fileUrlRelativeToParent = urlToRelativeUrl(fileUrl, directoryUrl);
-    const fileUrlRelativeToRoot = urlToRelativeUrl(fileUrl, rootDirectoryUrl);
+  sortedUrls.sort((a, b) => {
+    return comparePathnames(a.pathname, b.pathname);
+  });
+
+  const items = [];
+  for (const sortedUrl of sortedUrls) {
+    const fileUrlRelativeToParent = urlToRelativeUrl(
+      sortedUrl,
+      firstExistingDirectoryUrl,
+    );
+    const fileUrlRelativeToRoot = urlToRelativeUrl(sortedUrl, rootDirectoryUrl);
     const type = fileUrlRelativeToParent.endsWith("/") ? "dir" : "file";
+    items.push({
+      type,
+      fileUrlRelativeToParent,
+      fileUrlRelativeToRoot,
+    });
+  }
+  items.rootDirectoryUrl = rootDirectoryUrl;
+  items.firstExistingDirectoryUrl = firstExistingDirectoryUrl;
+  return items;
+};
+const generateDirectoryContent = (directoryContentItems) => {
+  if (directoryContentItems.length === 0) {
+    return `<p>Directory is empty</p>`;
+  }
+  let html = `<ul class="directory_content">`;
+  for (const directoryContentItem of directoryContentItems) {
+    const { type, fileUrlRelativeToParent, fileUrlRelativeToRoot } =
+      directoryContentItem;
     html += `
       <li class="directory_child" data-type="${type}">
         <a href="/${fileUrlRelativeToRoot}">${fileUrlRelativeToParent}</a>