@jsenv/test 3.7.5 → 3.7.7

package/dist/jsenv_test.js

@@ -527,60 +527,6 @@ const SIGINT_CALLBACK = {
   },
 };
 
-const isFileSystemPath = (value) => {
-  if (typeof value !== "string") {
-    throw new TypeError(
-      `isFileSystemPath first arg must be a string, got ${value}`,
-    );
-  }
-  if (value[0] === "/") {
-    return true;
-  }
-  return startsWithWindowsDriveLetter(value);
-};
-
-const startsWithWindowsDriveLetter = (string) => {
-  const firstChar = string[0];
-  if (!/[a-zA-Z]/.test(firstChar)) return false;
-
-  const secondChar = string[1];
-  if (secondChar !== ":") return false;
-
-  return true;
-};
-
-const fileSystemPathToUrl = (value) => {
-  if (!isFileSystemPath(value)) {
-    throw new Error(`value must be a filesystem path, got ${value}`);
-  }
-  return String(pathToFileURL(value));
-};
-
-const urlToFileSystemPath = (url) => {
-  const urlObject = new URL(url);
-  let { origin, pathname, hash } = urlObject;
-  if (urlObject.protocol === "file:") {
-    origin = "file://";
-  }
-  pathname = pathname
-    .split("/")
-    .map((part) => {
-      return part.replace(/%(?![0-9A-F][0-9A-F])/g, "%25");
-    })
-    .join("/");
-  if (hash) {
-    pathname += `%23${encodeURIComponent(hash.slice(1))}`;
-  }
-  const urlString = `${origin}${pathname}`;
-  const fileSystemPath = fileURLToPath(urlString);
-  if (fileSystemPath[fileSystemPath.length - 1] === "/") {
-    // remove trailing / so that nodejs path becomes predictable otherwise it logs
-    // the trailing slash on linux but does not on windows
-    return fileSystemPath.slice(0, -1);
-  }
-  return fileSystemPath;
-};
-
 const createDetailedMessage = (message, details = {}) => {
   let text = `${message}`;
   const namedSectionsText = renderNamedSections(details);
@@ -1869,6 +1815,28 @@ const moveUrl = ({ url, from, to, preferRelative }) => {
   return absoluteUrl;
 };
 
+const isFileSystemPath = (value) => {
+  if (typeof value !== "string") {
+    throw new TypeError(
+      `isFileSystemPath first arg must be a string, got ${value}`,
+    );
+  }
+  if (value[0] === "/") {
+    return true;
+  }
+  return startsWithWindowsDriveLetter(value);
+};
+
+const startsWithWindowsDriveLetter = (string) => {
+  const firstChar = string[0];
+  if (!/[a-zA-Z]/.test(firstChar)) return false;
+
+  const secondChar = string[1];
+  if (secondChar !== ":") return false;
+
+  return true;
+};
+
 const resolveUrl = (specifier, baseUrl) => {
   if (typeof baseUrl === "undefined") {
     throw new TypeError(`baseUrl missing to resolve ${specifier}`);
@@ -1876,7 +1844,7 @@ const resolveUrl = (specifier, baseUrl) => {
   return String(new URL(specifier, baseUrl));
 };
 
-const urlIsInsideOf = (url, otherUrl) => {
+const urlIsOrIsInsideOf = (url, otherUrl) => {
   const urlObject = new URL(url);
   const otherUrlObject = new URL(otherUrl);
 
@@ -1887,13 +1855,45 @@ const urlIsInsideOf = (url, otherUrl) => {
   const urlPathname = urlObject.pathname;
   const otherUrlPathname = otherUrlObject.pathname;
   if (urlPathname === otherUrlPathname) {
-    return false;
+    return true;
   }
 
   const isInside = urlPathname.startsWith(otherUrlPathname);
   return isInside;
 };
 
+const fileSystemPathToUrl = (value) => {
+  if (!isFileSystemPath(value)) {
+    throw new Error(`value must be a filesystem path, got ${value}`);
+  }
+  return String(pathToFileURL(value));
+};
+
+const urlToFileSystemPath = (url) => {
+  const urlObject = new URL(url);
+  let { origin, pathname, hash } = urlObject;
+  if (urlObject.protocol === "file:") {
+    origin = "file://";
+  }
+  pathname = pathname
+    .split("/")
+    .map((part) => {
+      return part.replace(/%(?![0-9A-F][0-9A-F])/g, "%25");
+    })
+    .join("/");
+  if (hash) {
+    pathname += `%23${encodeURIComponent(hash.slice(1))}`;
+  }
+  const urlString = `${origin}${pathname}`;
+  const fileSystemPath = fileURLToPath(urlString);
+  if (fileSystemPath[fileSystemPath.length - 1] === "/") {
+    // remove trailing / so that nodejs path becomes predictable otherwise it logs
+    // the trailing slash on linux but does not on windows
+    return fileSystemPath.slice(0, -1);
+  }
+  return fileSystemPath;
+};
+
 const validateDirectoryUrl = (value) => {
   let urlString;
 
@@ -5549,7 +5549,7 @@ const asException = (error, { rootDirectoryUrl }) => {
       exception.stack = replaceUrls$1(
         error.stack,
         ({ match, url, line = 1, column = 1 }) => {
-          if (urlIsInsideOf(url, rootDirectoryUrl)) {
+          if (urlIsOrIsInsideOf(url, rootDirectoryUrl)) {
             const relativeUrl = urlToRelativeUrl(url, rootDirectoryUrl);
             match = stringifyUrlSite({ url: relativeUrl, line, column });
           }
@@ -5561,7 +5561,7 @@ const asException = (error, { rootDirectoryUrl }) => {
       exception.stack = replaceUrls$1(
         error.stack,
         ({ match, url, line = 1, column = 1 }) => {
-          if (urlIsInsideOf(url, rootDirectoryUrl)) {
+          if (urlIsOrIsInsideOf(url, rootDirectoryUrl)) {
             const relativeUrl = urlToRelativeUrl(url, rootDirectoryUrl);
             match = stringifyUrlSite({ url: relativeUrl, line, column });
           }
@@ -8021,7 +8021,7 @@ To fix this warning:
       for (const { relativeUrl, meta } of fileResultArray) {
         if (onlyWithinUrl) {
           const fileUrl = new URL(relativeUrl, rootDirectoryUrl).href;
-          if (!urlIsInsideOf(fileUrl, onlyWithinUrl)) {
+          if (!urlIsOrIsInsideOf(fileUrl, onlyWithinUrl)) {
             continue;
           }
         }
@@ -8545,7 +8545,7 @@ const memoize = (compute) => {
 
 const WEB_URL_CONVERTER = {
   asWebUrl: (fileUrl, webServer) => {
-    if (urlIsInsideOf(fileUrl, webServer.rootDirectoryUrl)) {
+    if (urlIsOrIsInsideOf(fileUrl, webServer.rootDirectoryUrl)) {
       return moveUrl({
         url: fileUrl,
         from: webServer.rootDirectoryUrl,
@@ -8763,7 +8763,7 @@ const createRuntimeUsingPlaywright = ({
     coverageFileUrl,
   }) => {
     const fileUrl = new URL(fileRelativeUrl, rootDirectoryUrl).href;
-    if (!urlIsInsideOf(fileUrl, webServer.rootDirectoryUrl)) {
+    if (!urlIsOrIsInsideOf(fileUrl, webServer.rootDirectoryUrl)) {
       throw new Error(`Cannot execute file that is outside web server root directory
 --- file --- 
 ${fileUrl}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/test",
-  "version": "3.7.5",
+  "version": "3.7.7",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -45,9 +45,9 @@
   },
   "dependencies": {
     "@c88/v8-coverage": "0.1.1",
-    "@jsenv/ast": "6.7.3",
-    "@jsenv/plugin-supervisor": "1.7.1",
-    "@jsenv/sourcemap": "1.3.8",
+    "@jsenv/ast": "6.7.6",
+    "@jsenv/plugin-supervisor": "1.7.3",
+    "@jsenv/sourcemap": "1.3.9",
     "he": "1.2.0",
     "istanbul-lib-coverage": "3.2.2",
     "istanbul-lib-instrument": "6.0.3",

package/src/execution/execute_test_plan.js

@@ -27,7 +27,7 @@ import {
   startMonitoringMemoryUsage,
 } from "@jsenv/os-metrics";
 import { URL_META } from "@jsenv/url-meta";
-import { urlIsInsideOf } from "@jsenv/urls";
+import { urlIsOrIsInsideOf } from "@jsenv/urls";
 import { existsSync } from "node:fs";
 import { takeCoverage } from "node:v8";
 import stripAnsi from "strip-ansi";
@@ -683,7 +683,7 @@ To fix this warning:
       for (const { relativeUrl, meta } of fileResultArray) {
         if (onlyWithinUrl) {
           const fileUrl = new URL(relativeUrl, rootDirectoryUrl).href;
-          if (!urlIsInsideOf(fileUrl, onlyWithinUrl)) {
+          if (!urlIsOrIsInsideOf(fileUrl, onlyWithinUrl)) {
             continue;
           }
         }

package/src/execution/github_annotation_from_error.js

@@ -1,4 +1,4 @@
-import { urlIsInsideOf, urlToRelativeUrl } from "@jsenv/urls";
+import { urlIsOrIsInsideOf, urlToRelativeUrl } from "@jsenv/urls";
 
 export const githubAnnotationFromError = (
   error,
@@ -40,7 +40,7 @@ const asException = (error, { rootDirectoryUrl }) => {
       exception.stack = replaceUrls(
         error.stack,
         ({ match, url, line = 1, column = 1 }) => {
-          if (urlIsInsideOf(url, rootDirectoryUrl)) {
+          if (urlIsOrIsInsideOf(url, rootDirectoryUrl)) {
             const relativeUrl = urlToRelativeUrl(url, rootDirectoryUrl);
             match = stringifyUrlSite({ url: relativeUrl, line, column });
           }
@@ -52,7 +52,7 @@ const asException = (error, { rootDirectoryUrl }) => {
       exception.stack = replaceUrls(
         error.stack,
         ({ match, url, line = 1, column = 1 }) => {
-          if (urlIsInsideOf(url, rootDirectoryUrl)) {
+          if (urlIsOrIsInsideOf(url, rootDirectoryUrl)) {
             const relativeUrl = urlToRelativeUrl(url, rootDirectoryUrl);
             match = stringifyUrlSite({ url: relativeUrl, line, column });
           }

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/runtime_browsers/using_playwright.js

@@ -1,6 +1,6 @@
 import { Abort, raceCallbacks } from "@jsenv/abort";
 import { createDetailedMessage } from "@jsenv/humanize";
-import { urlIsInsideOf } from "@jsenv/urls";
+import { urlIsOrIsInsideOf } from "@jsenv/urls";
 import { memoize } from "@jsenv/utils/src/memoize/memoize.js";
 import { readFileSync, writeFileSync } from "node:fs";
 import { composeTwoFileByFileIstanbulCoverages } from "../coverage/istanbul_coverage_composition.js";
@@ -57,7 +57,7 @@ export const createRuntimeUsingPlaywright = ({
     coverageFileUrl,
   }) => {
     const fileUrl = new URL(fileRelativeUrl, rootDirectoryUrl).href;
-    if (!urlIsInsideOf(fileUrl, webServer.rootDirectoryUrl)) {
+    if (!urlIsOrIsInsideOf(fileUrl, webServer.rootDirectoryUrl)) {
       throw new Error(`Cannot execute file that is outside web server root directory
 --- file --- 
 ${fileUrl}