@jsenv/core 40.6.2 → 40.7.1

package/dist/build/jsenv_core_packages.js

@@ -516,79 +516,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 getCallerPosition = () => {
-  const { prepareStackTrace } = Error;
-  Error.prepareStackTrace = (error, stack) => {
-    Error.prepareStackTrace = prepareStackTrace;
-    return stack;
-  };
-  const { stack } = new Error();
-  const callerCallsite = stack[2];
-  const fileName = callerCallsite.getFileName();
-  return {
-    url:
-      fileName && isFileSystemPath(fileName)
-        ? fileSystemPathToUrl(fileName)
-        : fileName,
-    line: callerCallsite.getLineNumber(),
-    column: callerCallsite.getColumnNumber(),
-  };
-};
-
-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;
-};
-
 /*
  * data:[<mediatype>][;base64],<data>
  * https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs#syntax
@@ -2012,35 +1939,33 @@ const urlToExtension$1 = (url) => {
   return pathnameToExtension$1(pathname);
 };
 
-const urlToOrigin$1 = (url) => {
-  const urlString = String(url);
-  if (urlString.startsWith("file://")) {
-    return `file://`;
-  }
-  return new URL(urlString).origin;
-};
-
-const setUrlExtension = (url, extension) => {
-  const origin = urlToOrigin$1(url);
-  const currentExtension = urlToExtension$1(url);
-  if (typeof extension === "function") {
-    extension = extension(currentExtension);
-  }
-  const resource = urlToResource(url);
-  const [pathname, search] = resource.split("?");
-  const pathnameWithoutExtension = currentExtension
-    ? pathname.slice(0, -currentExtension.length)
-    : pathname;
-  let newPathname;
-  if (pathnameWithoutExtension.endsWith("/")) {
-    newPathname = pathnameWithoutExtension.slice(0, -1);
-    newPathname += extension;
-    newPathname += "/";
-  } else {
-    newPathname = pathnameWithoutExtension;
-    newPathname += extension;
-  }
-  return `${origin}${newPathname}${search ? `?${search}` : ""}`;
+const setUrlExtension = (
+  url,
+  extension,
+  { trailingSlash = "preserve" } = {},
+) => {
+  return transformUrlPathname(url, (pathname) => {
+    const currentExtension = urlToExtension$1(url);
+    if (typeof extension === "function") {
+      extension = extension(currentExtension);
+    }
+    const pathnameWithoutExtension = currentExtension
+      ? pathname.slice(0, -currentExtension.length)
+      : pathname;
+
+    if (pathnameWithoutExtension.endsWith("/")) {
+      let pathnameWithExtension;
+      pathnameWithExtension = pathnameWithoutExtension.slice(0, -1);
+      pathnameWithExtension += extension;
+      if (trailingSlash === "preserve") {
+        pathnameWithExtension += "/";
+      }
+      return pathnameWithExtension;
+    }
+    let pathnameWithExtension = pathnameWithoutExtension;
+    pathnameWithExtension += extension;
+    return pathnameWithExtension;
+  });
 };
 
 const setUrlFilename = (url, filename) => {
@@ -2350,6 +2275,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$1 = (specifier, baseUrl) => {
   if (typeof baseUrl === "undefined") {
     throw new TypeError(`baseUrl missing to resolve ${specifier}`);
@@ -2357,7 +2304,7 @@ const resolveUrl$1 = (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);
 
@@ -2368,13 +2315,64 @@ 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 getCallerPosition = () => {
+  const { prepareStackTrace } = Error;
+  Error.prepareStackTrace = (error, stack) => {
+    Error.prepareStackTrace = prepareStackTrace;
+    return stack;
+  };
+  const { stack } = new Error();
+  const callerCallsite = stack[2];
+  const fileName = callerCallsite.getFileName();
+  return {
+    url:
+      fileName && isFileSystemPath(fileName)
+        ? fileSystemPathToUrl(fileName)
+        : fileName,
+    line: callerCallsite.getLineNumber(),
+    column: callerCallsite.getColumnNumber(),
+  };
+};
+
+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;
 
@@ -10935,4 +10933,4 @@ const escapeRegexpSpecialChars = (string) => {
   });
 };
 
-export { ANSI, Abort, CONTENT_TYPE, DATA_URL, JS_QUOTES, RUNTIME_COMPAT, UNICODE, URL_META, applyFileSystemMagicResolution, applyNodeEsmResolution, asSpecifierWithoutSearch, asUrlWithoutSearch, assertAndNormalizeDirectoryUrl, browserDefaultRuntimeCompat, bufferToEtag, clearDirectorySync, compareFileUrls, comparePathnames, composeTwoImportMaps, createDetailedMessage$1 as createDetailedMessage, createDynamicLog, createLogger, createLookupPackageDirectory, createTaskLog, defaultLookupPackageScope, defaultReadPackageJson, distributePercentages, ensureEmptyDirectory, ensurePathnameTrailingSlash, ensureWindowsDriveLetter, errorToHTML, escapeRegexpSpecialChars, generateContentFrame, getCallerPosition, getExtensionsToTry, humanizeDuration, humanizeFileSize, humanizeMemory, inferRuntimeCompatFromClosestPackage, injectQueryParamIntoSpecifierWithoutEncoding, injectQueryParams, injectQueryParamsIntoSpecifier, isFileSystemPath, isSpecifierForNodeBuiltin, lookupPackageDirectory, moveUrl, nodeDefaultRuntimeCompat, normalizeImportMap, normalizeUrl, raceProcessTeardownEvents, readCustomConditionsFromProcessArgs, readEntryStatSync, readPackageAtOrNull, registerDirectoryLifecycle, renderBigSection, renderDetails, renderTable, renderUrlOrRelativeUrlFilename, resolveImport, setUrlBasename, setUrlExtension, setUrlFilename, startMonitoringCpuUsage, startMonitoringMemoryUsage, stringifyUrlSite, updateJsonFileSync, urlIsInsideOf, urlToBasename, urlToExtension$1 as urlToExtension, urlToFileSystemPath, urlToFilename$1 as urlToFilename, urlToPathname$1 as urlToPathname, urlToRelativeUrl, validateResponseIntegrity, writeFileSync };
+export { ANSI, Abort, CONTENT_TYPE, DATA_URL, JS_QUOTES, RUNTIME_COMPAT, UNICODE, URL_META, applyFileSystemMagicResolution, applyNodeEsmResolution, asSpecifierWithoutSearch, asUrlWithoutSearch, assertAndNormalizeDirectoryUrl, browserDefaultRuntimeCompat, bufferToEtag, clearDirectorySync, compareFileUrls, comparePathnames, composeTwoImportMaps, createDetailedMessage$1 as createDetailedMessage, createDynamicLog, createLogger, createLookupPackageDirectory, createTaskLog, defaultLookupPackageScope, defaultReadPackageJson, distributePercentages, ensureEmptyDirectory, ensurePathnameTrailingSlash, ensureWindowsDriveLetter, errorToHTML, escapeRegexpSpecialChars, generateContentFrame, getCallerPosition, getExtensionsToTry, humanizeDuration, humanizeFileSize, humanizeMemory, inferRuntimeCompatFromClosestPackage, injectQueryParamIntoSpecifierWithoutEncoding, injectQueryParams, injectQueryParamsIntoSpecifier, isFileSystemPath, isSpecifierForNodeBuiltin, lookupPackageDirectory, moveUrl, nodeDefaultRuntimeCompat, normalizeImportMap, normalizeUrl, raceProcessTeardownEvents, readCustomConditionsFromProcessArgs, readEntryStatSync, readPackageAtOrNull, registerDirectoryLifecycle, renderBigSection, renderDetails, renderTable, renderUrlOrRelativeUrlFilename, resolveImport, setUrlBasename, setUrlExtension, setUrlFilename, startMonitoringCpuUsage, startMonitoringMemoryUsage, stringifyUrlSite, updateJsonFileSync, urlIsOrIsInsideOf, urlToBasename, urlToExtension$1 as urlToExtension, urlToFileSystemPath, urlToFilename$1 as urlToFilename, urlToPathname$1 as urlToPathname, urlToRelativeUrl, validateResponseIntegrity, writeFileSync };

package/dist/client/directory_listing/js/directory_listing.js

@@ -4,7 +4,7 @@ const directoryIconUrl = new URL("../other/dir.png", import.meta.url).href;
 const fileIconUrl = new URL("../other/file.png", import.meta.url).href;
 const homeIconUrl = new URL("../other/home.svg#root", import.meta.url).href;
 let {
-  navItems,
+  breadcrumb,
   mainFilePath,
   directoryContentItems,
   enoentDetails,
@@ -36,45 +36,60 @@ const DirectoryListing = () => {
     return directoryContentItems;
   });
   return u(k, {
-    children: [enoentDetails ? u(ErrorMessage, {}) : null, u(Nav, {}), u(DirectoryContent, {
+    children: [enoentDetails ? u(ErrorMessage, {}) : null, u(Breadcrumb, {
+      items: breadcrumb
+    }), u(DirectoryContent, {
       items: directoryItems
     })]
   });
 };
 const ErrorMessage = () => {
   const {
-    fileUrl,
     filePathExisting,
     filePathNotFound
   } = enoentDetails;
-  return u("p", {
-    className: "error_message",
+  let errorText;
+  let errorSuggestion;
+  errorText = u(k, {
+    children: [u("strong", {
+      children: "File not found:"
+    }), "\xA0", u("code", {
+      children: [u("span", {
+        className: "file_path_good",
+        children: filePathExisting
+      }), u("span", {
+        className: "file_path_bad",
+        children: filePathNotFound
+      })]
+    }), " ", "does not exist on the server."]
+  });
+  errorSuggestion = u(k, {
     children: [u("span", {
+      className: "icon",
+      children: "\uD83D\uDD0D"
+    }), " Check available routes in", " ", u("a", {
+      href: "/.internal/route_inspector",
+      children: "route inspector"
+    })]
+  });
+  return u("div", {
+    className: "error_message",
+    children: [u("p", {
       className: "error_text",
-      children: ["No filesystem entry at", " ", u("code", {
-        title: fileUrl,
-        children: [u("span", {
-          className: "file_path_good",
-          children: filePathExisting
-        }), u("span", {
-          className: "file_path_bad",
-          children: filePathNotFound
-        })]
-      }), "."]
-    }), u("br", {}), u("span", {
-      className: "error_text",
-      style: "font-size: 70%;",
-      children: ["See also available routes in the", " ", u("a", {
-        href: "/.internal/route_inspector",
-        children: "route inspector"
-      }), "."]
+      children: errorText
+    }), u("p", {
+      className: "error_suggestion",
+      style: "font-size: 0.8em; margin-top: 10px;",
+      children: errorSuggestion
     })]
   });
 };
-const Nav = () => {
+const Breadcrumb = ({
+  items
+}) => {
   return u("h1", {
     className: "nav",
-    children: navItems.map(navItem => {
+    children: items.map(navItem => {
       const {
         url,
         urlRelativeToServer,
@@ -84,7 +99,7 @@ const Nav = () => {
       } = navItem;
       const isDirectory = new URL(url).pathname.endsWith("/");
       return u(k, {
-        children: [u(NavItem, {
+        children: [u(BreadcrumbItem, {
           url: urlRelativeToServer,
           isCurrent: isCurrent,
           iconImageUrl: isServerRootDirectory ? homeIconUrl : "",
@@ -98,7 +113,7 @@ const Nav = () => {
     })
   });
 };
-const NavItem = ({
+const BreadcrumbItem = ({
   url,
   iconImageUrl,
   iconLinkUrl,

package/dist/client/ribbon/ribbon.js

@@ -1,43 +1,46 @@
 const injectRibbon = ({ text }) => {
   const css = /* css */ `
-      #jsenv_ribbon_container {
-        position: fixed;
-        z-index: 1001;
-        top: 0;
-        right: 0;
-        width: 100px;
-        height: 100px;
-        overflow: hidden;
-        opacity: 0.5;
-        pointer-events: none;
-      }
-      #jsenv_ribbon {
-        position: absolute;
-        top: -10px;
-        right: -10px;
-        width: 100%;
-        height: 100%;
-      }
-      #jsenv_ribbon_text {
-        position: absolute;
-        left: 0px;
-        top: 20px;
-        transform: rotate(45deg);
-        display: block;
-        width: 125px;
-        line-height: 36px;
-        background-color: orange;
-        color: rgb(55, 7, 7);
-        box-shadow: 0 5px 10px rgba(0, 0, 0, 0.1);
-        font-weight: 700;
-        font-size: 16px;
-        font-family: "Lato", sans-serif;
-        text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
-        text-align: center;
-        user-select: none;
-      }`;
+    #jsenv_ribbon_container {
+      position: fixed;
+      z-index: 1001;
+      top: 0;
+      right: 0;
+      width: 100px;
+      height: 100px;
+      overflow: hidden;
+      opacity: 0.5;
+      pointer-events: none;
+    }
+    #jsenv_ribbon {
+      position: absolute;
+      top: -10px;
+      right: -10px;
+      width: 100%;
+      height: 100%;
+    }
+    #jsenv_ribbon_text {
+      position: absolute;
+      left: 0px;
+      top: 20px;
+      transform: rotate(45deg);
+      display: block;
+      width: 125px;
+      line-height: 36px;
+      background-color: orange;
+      color: rgb(55, 7, 7);
+      box-shadow: 0 5px 10px rgba(0, 0, 0, 0.1);
+      font-weight: 700;
+      font-size: 16px;
+      font-family: "Lato", sans-serif;
+      text-shadow: 0 1px 1px rgba(0, 0, 0, 0.2);
+      text-align: center;
+      user-select: none;
+    }
+  `;
   const html = /* html */ `<div id="jsenv_ribbon_container">
-      <style>${css}</style>
+      <style>
+        ${css}
+      </style>
       <div id="jsenv_ribbon">
         <div id="jsenv_ribbon_text">${text}</div>
       </div>

package/dist/jsenv_core.js

@@ -1,7 +1,11 @@
+import "@jsenv/ast";
 import "@jsenv/sourcemap";
 
 const injectionSymbol = Symbol.for("jsenv_injection");
 const INJECTIONS = {
+  global: (value) => {
+    return { [injectionSymbol]: "global", value };
+  },
   optional: (value) => {
     return { [injectionSymbol]: "optional", value };
   },

package/dist/start_build_server/jsenv_core_packages.js

@@ -511,35 +511,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));
-};
-
 // https://github.com/Marak/colors.js/blob/master/lib/styles.js
 // https://stackoverflow.com/a/75985833/2634179
 const RESET = "\x1b[0m";
@@ -1491,6 +1462,35 @@ const ensurePathnameTrailingSlash = (url) => {
   });
 };
 
+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 validateDirectoryUrl = (value) => {
   let urlString;