@jsenv/core 41.0.2 → 41.0.3

package/dist/start_build_server/jsenv_core_packages.js

@@ -1,6 +1,5 @@
 import { createSupportsColor, isUnicodeSupported, emojiRegex, eastAsianWidth, clearTerminal, eraseLines } from "./jsenv_core_node_modules.js";
 import { stripVTControlCharacters } from "node:util";
-import { pathToFileURL } from "node:url";
 
 const createCallbackListNotifiedOnce = () => {
   let callbacks = [];
@@ -1394,116 +1393,4 @@ const createTaskLog = (
   };
 };
 
-const transformUrlPathname = (url, transformer) => {
-  if (typeof url === "string") {
-    const urlObject = new URL(url);
-    const { pathname } = urlObject;
-    const pathnameTransformed = transformer(pathname);
-    if (pathnameTransformed === pathname) {
-      return url;
-    }
-    let { origin } = urlObject;
-    // origin is "null" for "file://" urls with Node.js
-    if (origin === "null" && urlObject.href.startsWith("file:")) {
-      origin = "file://";
-    }
-    const { search, hash } = urlObject;
-    const urlWithPathnameTransformed = `${origin}${pathnameTransformed}${search}${hash}`;
-    return urlWithPathnameTransformed;
-  }
-  const pathnameTransformed = transformer(url.pathname);
-  url.pathname = pathnameTransformed;
-  return url;
-};
-const ensurePathnameTrailingSlash = (url) => {
-  return transformUrlPathname(url, (pathname) => {
-    return pathname.endsWith("/") ? pathname : `${pathname}/`;
-  });
-};
-
-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;
-
-  if (value instanceof URL) {
-    urlString = value.href;
-  } else if (typeof value === "string") {
-    if (isFileSystemPath(value)) {
-      urlString = fileSystemPathToUrl(value);
-    } else {
-      try {
-        urlString = String(new URL(value));
-      } catch {
-        return {
-          valid: false,
-          value,
-          message: `must be a valid url`,
-        };
-      }
-    }
-  } else if (
-    value &&
-    typeof value === "object" &&
-    typeof value.href === "string"
-  ) {
-    value = value.href;
-  } else {
-    return {
-      valid: false,
-      value,
-      message: `must be a string or an url`,
-    };
-  }
-  if (!urlString.startsWith("file://")) {
-    return {
-      valid: false,
-      value,
-      message: 'must start with "file://"',
-    };
-  }
-  return {
-    valid: true,
-    value: ensurePathnameTrailingSlash(urlString),
-  };
-};
-
-const assertAndNormalizeDirectoryUrl = (
-  directoryUrl,
-  name = "directoryUrl",
-) => {
-  const { valid, message, value } = validateDirectoryUrl(directoryUrl);
-  if (!valid) {
-    throw new TypeError(`${name} ${message}, got ${value}`);
-  }
-  return value;
-};
-
-export { Abort, assertAndNormalizeDirectoryUrl, createLogger, createTaskLog, raceProcessTeardownEvents };
+export { Abort, createLogger, createTaskLog, raceProcessTeardownEvents };

package/dist/start_build_server/start_build_server.js

@@ -1,12 +1,10 @@
-import { startServer, serverPluginCORS, jsenvAccessControlAllowedHeaders, serverPluginStaticFiles, serverPluginErrorHandler } from "@jsenv/server";
-import { existsSync } from "node:fs";
-import { assertAndNormalizeDirectoryUrl, createLogger, Abort, raceProcessTeardownEvents, createTaskLog } from "./jsenv_core_packages.js";
+import { startServer, createFileSystemFetch, serverPluginCORS, jsenvAccessControlAllowedHeaders, serverPluginErrorHandler } from "@jsenv/server";
+import { createLogger, Abort, raceProcessTeardownEvents, createTaskLog } from "./jsenv_core_packages.js";
 import "./jsenv_core_node_modules.js";
 import "node:process";
 import "node:os";
 import "node:tty";
 import "node:util";
-import "node:url";
 
 /*
  * startBuildServer is mean to interact with the build files;
@@ -34,7 +32,7 @@ const startBuildServer = async ({
   buildDirectoryUrl,
   buildDirectoryMainFileRelativeUrl = "index.html",
   port = 9779,
-  routes,
+  routes = [],
   serverPlugins = [],
   acceptAnyIp,
   hostname,
@@ -46,55 +44,7 @@ const startBuildServer = async ({
   signal = new AbortController().signal,
   handleSIGINT = true,
   keepProcessAlive = true,
-
-  ...rest
 }) => {
-  // params validation
-  {
-    const unexpectedParamNames = Object.keys(rest);
-    if (unexpectedParamNames.length > 0) {
-      throw new TypeError(
-        `${unexpectedParamNames.join(",")}: there is no such param`,
-      );
-    }
-    buildDirectoryUrl = assertAndNormalizeDirectoryUrl(
-      buildDirectoryUrl,
-      "buildDirectoryUrl",
-    );
-
-    if (buildDirectoryMainFileRelativeUrl) {
-      if (typeof buildDirectoryMainFileRelativeUrl !== "string") {
-        throw new TypeError(
-          `buildDirectoryMainFileRelativeUrl must be a string, got ${buildDirectoryMainFileRelativeUrl}`,
-        );
-      }
-      if (buildDirectoryMainFileRelativeUrl[0] === "/") {
-        buildDirectoryMainFileRelativeUrl =
-          buildDirectoryMainFileRelativeUrl.slice(1);
-      } else {
-        const buildMainFileUrl = new URL(
-          buildDirectoryMainFileRelativeUrl,
-          buildDirectoryUrl,
-        ).href;
-        if (!buildMainFileUrl.startsWith(buildDirectoryUrl)) {
-          throw new Error(
-            `buildDirectoryMainFileRelativeUrl must be relative, got ${buildDirectoryMainFileRelativeUrl}`,
-          );
-        }
-        buildDirectoryMainFileRelativeUrl = buildMainFileUrl.slice(
-          buildDirectoryUrl.length,
-        );
-      }
-      if (
-        !existsSync(
-          new URL(buildDirectoryMainFileRelativeUrl, buildDirectoryUrl),
-        )
-      ) {
-        buildDirectoryMainFileRelativeUrl = null;
-      }
-    }
-  }
-
   const logger = createLogger({ logLevel });
   const operation = Abort.startOperation();
   operation.addAbortSignal(signal);
@@ -127,7 +77,6 @@ const startBuildServer = async ({
     port,
     serverTiming: true,
     requestWaitingMs: 60_000,
-    routes,
     plugins: [
       serverPluginCORS({
         accessControlAllowRequestOrigin: true,
@@ -138,15 +87,20 @@ const startBuildServer = async ({
         timingAllowOrigin: true,
       }),
       ...serverPlugins,
-      serverPluginStaticFiles({
-        serverRelativeUrl: "/",
-        directoryUrl: buildDirectoryUrl,
-        directoryMainFileRelativeUrl: buildDirectoryMainFileRelativeUrl,
-      }),
       serverPluginErrorHandler({
         sendErrorDetails: false,
       }),
     ],
+    routes: [
+      ...routes,
+      {
+        endpoint: "GET /",
+        description: "Serve build files",
+        fetch: createFileSystemFetch(buildDirectoryUrl, {
+          mainFileRelativeUrl: buildDirectoryMainFileRelativeUrl,
+        }),
+      },
+    ],
   });
   startBuildServerTask.done();
   if (hostname) {

package/dist/start_dev_server/start_dev_server.js

@@ -1,4 +1,4 @@
-import { WebSocketResponse, pickContentType, ServerEvents, serverPluginCORS, jsenvAccessControlAllowedHeaders, composeTwoResponses, serveDirectory, serverPluginErrorHandler, startServer } from "@jsenv/server";
+import { WebSocketResponse, pickContentType, ServerEvents, serverPluginCORS, jsenvAccessControlAllowedHeaders, composeTwoResponses, fetchDirectory, serverPluginErrorHandler, startServer } from "@jsenv/server";
 import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/plugins/filesystem/filesystem_error_to_response.js";
 import { lookupPackageDirectory, registerDirectoryLifecycle, urlToRelativeUrl, moveUrl, urlIsOrIsInsideOf, ensureWindowsDriveLetter, createDetailedMessage, stringifyUrlSite, generateContentFrame, validateResponseIntegrity, setUrlFilename, getCallerPosition, urlToBasename, urlToExtension, asSpecifierWithoutSearch, asUrlWithoutSearch, injectQueryParamsIntoSpecifier, bufferToEtag, isFileSystemPath, urlToPathname, setUrlBasename, urlToFileSystemPath, writeFileSync, createLogger, URL_META, applyNodeEsmResolution, normalizeUrl, ANSI, RUNTIME_COMPAT, CONTENT_TYPE, readPackageAtOrNull, errorToHTML, DATA_URL, normalizeImportMap, composeTwoImportMaps, resolveImport, JS_QUOTES, readCustomConditionsFromProcessArgs, readEntryStatSync, ensurePathnameTrailingSlash, compareFileUrls, urlToFilename, applyFileSystemMagicResolution, getExtensionsToTry, setUrlExtension, isSpecifierForNodeBuiltin, injectQueryParams, memoizeByFirstArgument, assertAndNormalizeDirectoryUrl, createTaskLog, formatError } from "./jsenv_core_packages.js";
 import { readFileSync, existsSync, readdirSync, lstatSync, realpathSync } from "node:fs";
@@ -10041,7 +10041,7 @@ const startDevServer = async ({
                 };
               }
               if (code === "DIRECTORY_REFERENCE_NOT_ALLOWED") {
-                return serveDirectory(reference.url, {
+                return fetchDirectory(reference.url, {
                   headers: {
                     accept: "text/html",
                   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "41.0.2",
+  "version": "41.0.3",
   "description": "Tool to develop, test and build js projects",
   "repository": {
     "type": "git",
@@ -81,7 +81,7 @@
     "@jsenv/plugin-minification": "1.7.3",
     "@jsenv/plugin-supervisor": "1.7.15",
     "@jsenv/plugin-transpilation": "1.5.70",
-    "@jsenv/server": "17.0.1",
+    "@jsenv/server": "17.0.2",
     "@jsenv/sourcemap": "1.3.17",
     "react-table": "7.8.0"
   },

package/src/build/start_build_server.js

@@ -14,16 +14,14 @@
  */
 
 import { Abort, raceProcessTeardownEvents } from "@jsenv/abort";
-import { assertAndNormalizeDirectoryUrl } from "@jsenv/filesystem";
 import { createLogger, createTaskLog } from "@jsenv/humanize";
 import {
+  createFileSystemFetch,
   jsenvAccessControlAllowedHeaders,
   serverPluginCORS,
   serverPluginErrorHandler,
-  serverPluginStaticFiles,
   startServer,
 } from "@jsenv/server";
-import { existsSync } from "node:fs";
 
 /**
  * Start a server for build files.
@@ -35,7 +33,7 @@ export const startBuildServer = async ({
   buildDirectoryUrl,
   buildDirectoryMainFileRelativeUrl = "index.html",
   port = 9779,
-  routes,
+  routes = [],
   serverPlugins = [],
   acceptAnyIp,
   hostname,
@@ -47,55 +45,7 @@ export const startBuildServer = async ({
   signal = new AbortController().signal,
   handleSIGINT = true,
   keepProcessAlive = true,
-
-  ...rest
 }) => {
-  // params validation
-  {
-    const unexpectedParamNames = Object.keys(rest);
-    if (unexpectedParamNames.length > 0) {
-      throw new TypeError(
-        `${unexpectedParamNames.join(",")}: there is no such param`,
-      );
-    }
-    buildDirectoryUrl = assertAndNormalizeDirectoryUrl(
-      buildDirectoryUrl,
-      "buildDirectoryUrl",
-    );
-
-    if (buildDirectoryMainFileRelativeUrl) {
-      if (typeof buildDirectoryMainFileRelativeUrl !== "string") {
-        throw new TypeError(
-          `buildDirectoryMainFileRelativeUrl must be a string, got ${buildDirectoryMainFileRelativeUrl}`,
-        );
-      }
-      if (buildDirectoryMainFileRelativeUrl[0] === "/") {
-        buildDirectoryMainFileRelativeUrl =
-          buildDirectoryMainFileRelativeUrl.slice(1);
-      } else {
-        const buildMainFileUrl = new URL(
-          buildDirectoryMainFileRelativeUrl,
-          buildDirectoryUrl,
-        ).href;
-        if (!buildMainFileUrl.startsWith(buildDirectoryUrl)) {
-          throw new Error(
-            `buildDirectoryMainFileRelativeUrl must be relative, got ${buildDirectoryMainFileRelativeUrl}`,
-          );
-        }
-        buildDirectoryMainFileRelativeUrl = buildMainFileUrl.slice(
-          buildDirectoryUrl.length,
-        );
-      }
-      if (
-        !existsSync(
-          new URL(buildDirectoryMainFileRelativeUrl, buildDirectoryUrl),
-        )
-      ) {
-        buildDirectoryMainFileRelativeUrl = null;
-      }
-    }
-  }
-
   const logger = createLogger({ logLevel });
   const operation = Abort.startOperation();
   operation.addAbortSignal(signal);
@@ -129,7 +79,6 @@ export const startBuildServer = async ({
     port,
     serverTiming: true,
     requestWaitingMs: 60_000,
-    routes,
     plugins: [
       serverPluginCORS({
         accessControlAllowRequestOrigin: true,
@@ -140,15 +89,20 @@ export const startBuildServer = async ({
         timingAllowOrigin: true,
       }),
       ...serverPlugins,
-      serverPluginStaticFiles({
-        serverRelativeUrl: "/",
-        directoryUrl: buildDirectoryUrl,
-        directoryMainFileRelativeUrl: buildDirectoryMainFileRelativeUrl,
-      }),
       serverPluginErrorHandler({
         sendErrorDetails: false,
       }),
     ],
+    routes: [
+      ...routes,
+      {
+        endpoint: "GET /",
+        description: "Serve build files",
+        fetch: createFileSystemFetch(buildDirectoryUrl, {
+          mainFileRelativeUrl: buildDirectoryMainFileRelativeUrl,
+        }),
+      },
+    ],
   });
   startBuildServerTask.done();
   if (hostname) {

package/src/dev/start_dev_server.js

@@ -6,8 +6,8 @@ import {
 import { createLogger, createTaskLog, formatError } from "@jsenv/humanize";
 import {
   composeTwoResponses,
+  fetchDirectory,
   jsenvAccessControlAllowedHeaders,
-  serveDirectory,
   serverPluginCORS,
   serverPluginErrorHandler,
   startServer,
@@ -595,7 +595,7 @@ export const startDevServer = async ({
                 };
               }
               if (code === "DIRECTORY_REFERENCE_NOT_ALLOWED") {
-                return serveDirectory(reference.url, {
+                return fetchDirectory(reference.url, {
                   headers: {
                     accept: "text/html",
                   },