@jsenv/core 34.1.0 → 34.1.1

package/dist/jsenv.js

@@ -22633,6 +22633,35 @@ const canUseVersionedUrl = urlInfo => {
   return urlInfo.type !== "webmanifest";
 };
 
+const WEB_URL_CONVERTER = {
+  asWebUrl: (fileUrl, webServer) => {
+    if (urlIsInsideOf(fileUrl, webServer.rootDirectoryUrl)) {
+      return moveUrl({
+        url: fileUrl,
+        from: webServer.rootDirectoryUrl,
+        to: `${webServer.origin}/`
+      });
+    }
+    const fsRootUrl = ensureWindowsDriveLetter("file:///", fileUrl);
+    return `${webServer.origin}/@fs/${fileUrl.slice(fsRootUrl.length)}`;
+  },
+  asFileUrl: (webUrl, webServer) => {
+    const {
+      pathname,
+      search
+    } = new URL(webUrl);
+    if (pathname.startsWith("/@fs/")) {
+      const fsRootRelativeUrl = pathname.slice("/@fs/".length);
+      return `file:///${fsRootRelativeUrl}${search}`;
+    }
+    return moveUrl({
+      url: webUrl,
+      from: `${webServer.origin}/`,
+      to: webServer.rootDirectoryUrl
+    });
+  }
+};
+
 /*
  * This plugin is very special because it is here
  * to provide "serverEvents" used by other plugins
@@ -23082,18 +23111,9 @@ const inferParentFromRequest = (request, sourceDirectoryUrl) => {
   const refererUrlObject = new URL(referer);
   refererUrlObject.searchParams.delete("hmr");
   refererUrlObject.searchParams.delete("v");
-  const {
-    pathname,
-    search
-  } = refererUrlObject;
-  if (pathname.startsWith("/@fs/")) {
-    const fsRootRelativeUrl = pathname.slice("/@fs/".length);
-    return `file:///${fsRootRelativeUrl}${search}`;
-  }
-  return moveUrl({
-    url: referer,
-    from: `${request.origin}/`,
-    to: sourceDirectoryUrl
+  return WEB_URL_CONVERTER.asFileUrl(referer, {
+    origin: request.origin,
+    rootDirectoryUrl: sourceDirectoryUrl
   });
 };
 
@@ -25090,9 +25110,9 @@ const executeTestPlan = async ({
   gcBetweenExecutions = logMemoryHeapUsage,
   coverageEnabled = process.argv.includes("--coverage"),
   coverageConfig = {
-    "file:///**/.*": false,
-    "file:///**/.*/": false,
     "file:///**/node_modules/": false,
+    "./**/.*": false,
+    "./**/.*/": false,
     "./**/src/**/*.js": true,
     "./**/src/**/*.ts": true,
     "./**/src/**/*.jsx": true,
@@ -25443,11 +25463,7 @@ const initIstanbulMiddleware = async (page, {
   await page.route("**", async route => {
     const request = route.request();
     const url = request.url(); // transform into a local url
-    const fileUrl = moveUrl({
-      url,
-      from: `${webServer.origin}/`,
-      to: rootDirectoryUrl
-    });
+    const fileUrl = WEB_URL_CONVERTER.asFileUrl(url, webServer);
     const needsInstrumentation = URL_META.applyAssociations({
       url: fileUrl,
       associations
@@ -25544,11 +25560,7 @@ ${fileUrl}
 --- web server root directory url ---
 ${webServer.rootDirectoryUrl}`);
     }
-    const fileServerUrl = moveUrl({
-      url: fileUrl,
-      from: webServer.rootDirectoryUrl,
-      to: `${webServer.origin}/`
-    });
+    const fileServerUrl = WEB_URL_CONVERTER.asWebUrl(fileUrl, webServer);
     const cleanupCallbackList = createCallbackListNotifiedOnce();
     const cleanup = memoize(async reason => {
       await cleanupCallbackList.notify({
@@ -25646,11 +25658,7 @@ ${webServer.rootDirectoryUrl}`);
           // we convert urls starting with http:// to file:// because we later
           // convert the url to filesystem path in istanbulCoverageFromV8Coverage function
           const v8CoveragesWithFsUrls = v8CoveragesWithWebUrls.map(v8CoveragesWithWebUrl => {
-            const fsUrl = moveUrl({
-              url: v8CoveragesWithWebUrl.url,
-              from: `${webServer.origin}/`,
-              to: webServer.rootDirectoryUrl
-            });
+            const fsUrl = WEB_URL_CONVERTER.asFileUrl(v8CoveragesWithWebUrl.url, webServer);
             return {
               ...v8CoveragesWithWebUrl,
               url: fsUrl

package/package.json

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

package/src/dev/file_service.js

@@ -1,9 +1,10 @@
 import { readFileSync } from "node:fs"
 import { serveDirectory, composeTwoResponses } from "@jsenv/server"
 import { bufferToEtag } from "@jsenv/filesystem"
-import { moveUrl, asUrlWithoutSearch } from "@jsenv/urls"
+import { asUrlWithoutSearch } from "@jsenv/urls"
 import { URL_META } from "@jsenv/url-meta"
 
+import { WEB_URL_CONVERTER } from "../web_url_converter.js"
 import { watchSourceFiles } from "../watch_source_files.js"
 import { explorerHtmlFileUrl } from "@jsenv/core/src/plugins/explorer/jsenv_plugin_explorer.js"
 import { createUrlGraph } from "@jsenv/core/src/kitchen/url_graph.js"
@@ -437,14 +438,8 @@ const inferParentFromRequest = (request, sourceDirectoryUrl) => {
   const refererUrlObject = new URL(referer)
   refererUrlObject.searchParams.delete("hmr")
   refererUrlObject.searchParams.delete("v")
-  const { pathname, search } = refererUrlObject
-  if (pathname.startsWith("/@fs/")) {
-    const fsRootRelativeUrl = pathname.slice("/@fs/".length)
-    return `file:///${fsRootRelativeUrl}${search}`
-  }
-  return moveUrl({
-    url: referer,
-    from: `${request.origin}/`,
-    to: sourceDirectoryUrl,
+  return WEB_URL_CONVERTER.asFileUrl(referer, {
+    origin: request.origin,
+    rootDirectoryUrl: sourceDirectoryUrl,
   })
 }

package/src/execute/runtimes/browsers/from_playwright.js

@@ -6,9 +6,10 @@ import {
   raceProcessTeardownEvents,
   raceCallbacks,
 } from "@jsenv/abort"
-import { moveUrl, urlIsInsideOf } from "@jsenv/urls"
+import { urlIsInsideOf } from "@jsenv/urls"
 import { memoize } from "@jsenv/utils/src/memoize/memoize.js"
 
+import { WEB_URL_CONVERTER } from "../../../web_url_converter.js"
 import { initJsSupervisorMiddleware } from "./middleware_js_supervisor.js"
 import { initIstanbulMiddleware } from "./middleware_istanbul.js"
 import { filterV8Coverage } from "@jsenv/core/src/test/coverage/v8_coverage.js"
@@ -62,12 +63,7 @@ ${fileUrl}
 --- web server root directory url ---
 ${webServer.rootDirectoryUrl}`)
     }
-    const fileServerUrl = moveUrl({
-      url: fileUrl,
-      from: webServer.rootDirectoryUrl,
-      to: `${webServer.origin}/`,
-    })
-
+    const fileServerUrl = WEB_URL_CONVERTER.asWebUrl(fileUrl, webServer)
     const cleanupCallbackList = createCallbackListNotifiedOnce()
     const cleanup = memoize(async (reason) => {
       await cleanupCallbackList.notify({ reason })
@@ -168,11 +164,10 @@ ${webServer.rootDirectoryUrl}`)
           // convert the url to filesystem path in istanbulCoverageFromV8Coverage function
           const v8CoveragesWithFsUrls = v8CoveragesWithWebUrls.map(
             (v8CoveragesWithWebUrl) => {
-              const fsUrl = moveUrl({
-                url: v8CoveragesWithWebUrl.url,
-                from: `${webServer.origin}/`,
-                to: webServer.rootDirectoryUrl,
-              })
+              const fsUrl = WEB_URL_CONVERTER.asFileUrl(
+                v8CoveragesWithWebUrl.url,
+                webServer,
+              )
               return {
                 ...v8CoveragesWithWebUrl,
                 url: fsUrl,

package/src/execute/runtimes/browsers/middleware_istanbul.js

@@ -1,8 +1,8 @@
 import { URL_META } from "@jsenv/url-meta"
-import { moveUrl } from "@jsenv/urls"
 import { applyBabelPlugins } from "@jsenv/ast"
 import { SOURCEMAP, generateSourcemapDataUrl } from "@jsenv/sourcemap"
 
+import { WEB_URL_CONVERTER } from "../../../web_url_converter.js"
 import { babelPluginInstrument } from "../../../test/coverage/babel_plugin_instrument.js"
 
 export const initIstanbulMiddleware = async (
@@ -16,11 +16,7 @@ export const initIstanbulMiddleware = async (
   await page.route("**", async (route) => {
     const request = route.request()
     const url = request.url() // transform into a local url
-    const fileUrl = moveUrl({
-      url,
-      from: `${webServer.origin}/`,
-      to: rootDirectoryUrl,
-    })
+    const fileUrl = WEB_URL_CONVERTER.asFileUrl(url, webServer)
     const needsInstrumentation = URL_META.applyAssociations({
       url: fileUrl,
       associations,

package/src/test/execute_test_plan.js

@@ -64,9 +64,9 @@ export const executeTestPlan = async ({
 
   coverageEnabled = process.argv.includes("--coverage"),
   coverageConfig = {
-    "file:///**/.*": false,
-    "file:///**/.*/": false,
     "file:///**/node_modules/": false,
+    "./**/.*": false,
+    "./**/.*/": false,
     "./**/src/**/*.js": true,
     "./**/src/**/*.ts": true,
     "./**/src/**/*.jsx": true,

package/src/web_url_converter.js

@@ -0,0 +1,28 @@
+import { ensureWindowsDriveLetter } from "@jsenv/filesystem"
+import { urlIsInsideOf, moveUrl } from "@jsenv/urls"
+
+export const WEB_URL_CONVERTER = {
+  asWebUrl: (fileUrl, webServer) => {
+    if (urlIsInsideOf(fileUrl, webServer.rootDirectoryUrl)) {
+      return moveUrl({
+        url: fileUrl,
+        from: webServer.rootDirectoryUrl,
+        to: `${webServer.origin}/`,
+      })
+    }
+    const fsRootUrl = ensureWindowsDriveLetter("file:///", fileUrl)
+    return `${webServer.origin}/@fs/${fileUrl.slice(fsRootUrl.length)}`
+  },
+  asFileUrl: (webUrl, webServer) => {
+    const { pathname, search } = new URL(webUrl)
+    if (pathname.startsWith("/@fs/")) {
+      const fsRootRelativeUrl = pathname.slice("/@fs/".length)
+      return `file:///${fsRootRelativeUrl}${search}`
+    }
+    return moveUrl({
+      url: webUrl,
+      from: `${webServer.origin}/`,
+      to: webServer.rootDirectoryUrl,
+    })
+  },
+}