@jsenv/core 40.12.12 → 40.12.13

package/dist/start_build_server/jsenv_core_packages.js

@@ -1394,76 +1394,6 @@ const createTaskLog = (
   };
 };
 
-const pathnameToExtension = (pathname) => {
-  const slashLastIndex = pathname.lastIndexOf("/");
-  const filename =
-    slashLastIndex === -1 ? pathname : pathname.slice(slashLastIndex + 1);
-  if (filename.match(/@([0-9])+(\.[0-9]+)?(\.[0-9]+)?$/)) {
-    return "";
-  }
-  const dotLastIndex = filename.lastIndexOf(".");
-  if (dotLastIndex === -1) {
-    return "";
-  }
-  // if (dotLastIndex === pathname.length - 1) return ""
-  const extension = filename.slice(dotLastIndex);
-  return extension;
-};
-
-const resourceToPathname = (resource) => {
-  const searchSeparatorIndex = resource.indexOf("?");
-  if (searchSeparatorIndex > -1) {
-    return resource.slice(0, searchSeparatorIndex);
-  }
-  const hashIndex = resource.indexOf("#");
-  if (hashIndex > -1) {
-    return resource.slice(0, hashIndex);
-  }
-  return resource;
-};
-
-const urlToScheme = (url) => {
-  const urlString = String(url);
-  const colonIndex = urlString.indexOf(":");
-  if (colonIndex === -1) {
-    return "";
-  }
-
-  const scheme = urlString.slice(0, colonIndex);
-  return scheme;
-};
-
-const urlToResource = (url) => {
-  const scheme = urlToScheme(url);
-
-  if (scheme === "file") {
-    const urlAsStringWithoutFileProtocol = String(url).slice("file://".length);
-    return urlAsStringWithoutFileProtocol;
-  }
-
-  if (scheme === "https" || scheme === "http") {
-    // remove origin
-    const afterProtocol = String(url).slice(scheme.length + "://".length);
-    const pathnameSlashIndex = afterProtocol.indexOf("/", "://".length);
-    const urlAsStringWithoutOrigin = afterProtocol.slice(pathnameSlashIndex);
-    return urlAsStringWithoutOrigin;
-  }
-
-  const urlAsStringWithoutProtocol = String(url).slice(scheme.length + 1);
-  return urlAsStringWithoutProtocol;
-};
-
-const urlToPathname = (url) => {
-  const resource = urlToResource(url);
-  const pathname = resourceToPathname(resource);
-  return pathname;
-};
-
-const urlToExtension = (url) => {
-  const pathname = urlToPathname(url);
-  return pathnameToExtension(pathname);
-};
-
 const transformUrlPathname = (url, transformer) => {
   if (typeof url === "string") {
     const urlObject = new URL(url);
@@ -1576,4 +1506,4 @@ const assertAndNormalizeDirectoryUrl = (
   return value;
 };
 
-export { Abort, assertAndNormalizeDirectoryUrl, createLogger, createTaskLog, raceProcessTeardownEvents, urlToExtension, urlToPathname };
+export { Abort, assertAndNormalizeDirectoryUrl, createLogger, createTaskLog, raceProcessTeardownEvents };

package/dist/start_build_server/start_build_server.js

@@ -1,6 +1,6 @@
-import { startServer, jsenvServiceCORS, jsenvAccessControlAllowedHeaders, jsenvServiceErrorHandler, createFileSystemFetch } from "@jsenv/server";
+import { startServer, jsenvServiceCORS, jsenvAccessControlAllowedHeaders, jsenvServiceStaticFiles, jsenvServiceErrorHandler } from "@jsenv/server";
 import { existsSync } from "node:fs";
-import { assertAndNormalizeDirectoryUrl, createLogger, Abort, raceProcessTeardownEvents, createTaskLog, urlToExtension, urlToPathname } from "./jsenv_core_packages.js";
+import { assertAndNormalizeDirectoryUrl, createLogger, Abort, raceProcessTeardownEvents, createTaskLog } from "./jsenv_core_packages.js";
 import "./jsenv_core_node_modules.js";
 import "node:process";
 import "node:os";
@@ -129,12 +129,12 @@ const startBuildServer = async ({
         timingAllowOrigin: true,
       }),
       ...services,
-      jsenvBuildFileService({
-        buildDirectoryUrl,
-        buildMainFilePath,
+      jsenvServiceStaticFiles({
+        directoryUrl: buildDirectoryUrl,
+        mainFilePath: buildMainFilePath,
       }),
       jsenvServiceErrorHandler({
-        sendErrorDetails: true,
+        sendErrorDetails: false,
       }),
     ],
   });
@@ -156,49 +156,4 @@ const startBuildServer = async ({
   };
 };
 
-const jsenvBuildFileService = ({ buildDirectoryUrl, buildMainFilePath }) => {
-  return {
-    name: "jsenv:build_files",
-    routes: [
-      {
-        endpoint: "GET *",
-        description: "Serve static files.",
-        fetch: (request, helpers) => {
-          const urlIsVersioned = new URL(request.url).searchParams.has("v");
-          if (buildMainFilePath && request.resource === "/") {
-            request = {
-              ...request,
-              resource: `/${buildMainFilePath}`,
-            };
-          }
-          const urlObject = new URL(
-            request.resource.slice(1),
-            buildDirectoryUrl,
-          );
-          return createFileSystemFetch(buildDirectoryUrl, {
-            cacheControl: urlIsVersioned
-              ? `private,max-age=${SECONDS_IN_30_DAYS},immutable`
-              : "private,max-age=0,must-revalidate",
-            etagEnabled: true,
-            compressionEnabled: true,
-            rootDirectoryUrl: buildDirectoryUrl,
-            canReadDirectory: true,
-            ENOENTFallback: () => {
-              if (
-                !urlToExtension(urlObject) &&
-                !urlToPathname(urlObject).endsWith("/")
-              ) {
-                return new URL(buildMainFilePath, buildDirectoryUrl);
-              }
-              return null;
-            },
-          })(request, helpers);
-        },
-      },
-    ],
-  };
-};
-
-const SECONDS_IN_30_DAYS = 60 * 60 * 24 * 30;
-
 export { startBuildServer };

package/dist/start_dev_server/start_dev_server.js

@@ -1,5 +1,5 @@
 import { WebSocketResponse, pickContentType, ServerEvents, jsenvServiceCORS, jsenvAccessControlAllowedHeaders, composeTwoResponses, serveDirectory, jsenvServiceErrorHandler, startServer } from "@jsenv/server";
-import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/internal/convertFileSystemErrorToResponseProperties.js";
+import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/services/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";
 import { pathToFileURL } from "node:url";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "40.12.12",
+  "version": "40.12.13",
   "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": "16.3.6",
+    "@jsenv/server": "16.4.0",
     "@jsenv/sourcemap": "1.3.17",
     "react-table": "7.8.0"
   },

package/src/build/start_build_server.js

@@ -17,13 +17,12 @@ import { Abort, raceProcessTeardownEvents } from "@jsenv/abort";
 import { assertAndNormalizeDirectoryUrl } from "@jsenv/filesystem";
 import { createLogger, createTaskLog } from "@jsenv/humanize";
 import {
-  createFileSystemFetch,
   jsenvAccessControlAllowedHeaders,
   jsenvServiceCORS,
   jsenvServiceErrorHandler,
+  jsenvServiceStaticFiles,
   startServer,
 } from "@jsenv/server";
-import { urlToExtension, urlToPathname } from "@jsenv/urls";
 import { existsSync } from "node:fs";
 
 /**
@@ -132,12 +131,12 @@ export const startBuildServer = async ({
         timingAllowOrigin: true,
       }),
       ...services,
-      jsenvBuildFileService({
-        buildDirectoryUrl,
-        buildMainFilePath,
+      jsenvServiceStaticFiles({
+        directoryUrl: buildDirectoryUrl,
+        mainFilePath: buildMainFilePath,
       }),
       jsenvServiceErrorHandler({
-        sendErrorDetails: true,
+        sendErrorDetails: false,
       }),
     ],
   });
@@ -158,48 +157,3 @@ export const startBuildServer = async ({
     },
   };
 };
-
-const jsenvBuildFileService = ({ buildDirectoryUrl, buildMainFilePath }) => {
-  return {
-    name: "jsenv:build_files",
-    routes: [
-      {
-        endpoint: "GET *",
-        description: "Serve static files.",
-        fetch: (request, helpers) => {
-          const urlIsVersioned = new URL(request.url).searchParams.has("v");
-          if (buildMainFilePath && request.resource === "/") {
-            request = {
-              ...request,
-              resource: `/${buildMainFilePath}`,
-            };
-          }
-          const urlObject = new URL(
-            request.resource.slice(1),
-            buildDirectoryUrl,
-          );
-          return createFileSystemFetch(buildDirectoryUrl, {
-            cacheControl: urlIsVersioned
-              ? `private,max-age=${SECONDS_IN_30_DAYS},immutable`
-              : "private,max-age=0,must-revalidate",
-            etagEnabled: true,
-            compressionEnabled: true,
-            rootDirectoryUrl: buildDirectoryUrl,
-            canReadDirectory: true,
-            ENOENTFallback: () => {
-              if (
-                !urlToExtension(urlObject) &&
-                !urlToPathname(urlObject).endsWith("/")
-              ) {
-                return new URL(buildMainFilePath, buildDirectoryUrl);
-              }
-              return null;
-            },
-          })(request, helpers);
-        },
-      },
-    ],
-  };
-};
-
-const SECONDS_IN_30_DAYS = 60 * 60 * 24 * 30;

package/src/dev/start_dev_server.js

@@ -12,7 +12,7 @@ import {
   serveDirectory,
   startServer,
 } from "@jsenv/server";
-import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/internal/convertFileSystemErrorToResponseProperties.js";
+import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/services/filesystem/filesystem_error_to_response.js";
 import { URL_META } from "@jsenv/url-meta";
 import { urlIsOrIsInsideOf, urlToRelativeUrl } from "@jsenv/urls";
 import { existsSync, readFileSync } from "node:fs";