@jsenv/core 40.12.12 → 40.12.14

package/package.json

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

package/src/build/build.js

@@ -66,9 +66,9 @@ import { GRAPH_VISITOR } from "../kitchen/url_graph/url_graph_visitor.js";
 import { jsenvPluginDirectoryReferenceEffect } from "../plugins/directory_reference_effect/jsenv_plugin_directory_reference_effect.js";
 import { jsenvPluginInlining } from "../plugins/inlining/jsenv_plugin_inlining.js";
 import {
-  createPluginController,
-  createPluginStore,
-} from "../plugins/plugin_controller.js";
+  createJsenvPluginsController,
+  createJsenvPluginStore,
+} from "../plugins/jsenv_plugins_controller.js";
 import { getCorePlugins } from "../plugins/plugins.js";
 import { jsenvPluginReferenceAnalysis } from "../plugins/reference_analysis/jsenv_plugin_reference_analysis.js";
 import { renderBuildDoneLog } from "./build_content_report.js";
@@ -1109,7 +1109,7 @@ const prepareEntryPointBuild = async (
   });
 
   let _getOtherEntryBuildInfo;
-  const rawPluginStore = await createPluginStore([
+  const rawJsenvPluginStore = await createJsenvPluginStore([
     ...(mappings ? [jsenvPluginMappings(mappings)] : []),
     {
       name: "jsenv:other_entry_point_build_during_craft",
@@ -1155,11 +1155,11 @@ const prepareEntryPointBuild = async (
       packageSideEffects,
     }),
   ]);
-  const rawPluginController = await createPluginController(
-    rawPluginStore,
+  const rawJsenvPluginsController = await createJsenvPluginsController(
+    rawJsenvPluginStore,
     rawKitchen,
   );
-  rawKitchen.setPluginController(rawPluginController);
+  rawKitchen.setJsenvPluginsController(rawJsenvPluginsController);
 
   const rawRootUrlInfo = rawKitchen.graph.rootUrlInfo;
   let entryReference;
@@ -1227,7 +1227,7 @@ const prepareEntryPointBuild = async (
           rawKitchen.graph.getUrlInfo(entryReference.url).type === "html" &&
           rawKitchen.context.isSupportedOnCurrentClients("importmap"),
       });
-      const finalPluginStore = await createPluginStore([
+      const finalJsenvPluginStore = await createJsenvPluginStore([
         jsenvPluginReferenceAnalysis({
           ...referenceAnalysis,
           fetchInlineUrls: false,
@@ -1249,7 +1249,7 @@ const prepareEntryPointBuild = async (
           name: "jsenv:optimize",
           appliesDuring: "build",
           transformUrlContent: async (urlInfo) => {
-            await rawKitchen.pluginController.callAsyncHooks(
+            await rawKitchen.jsenvPluginsController.callAsyncHooks(
               "optimizeBuildUrlContent",
               urlInfo,
               (optimizeReturnValue) => {
@@ -1260,18 +1260,18 @@ const prepareEntryPointBuild = async (
         },
         buildSpecifierManager.jsenvPluginMoveToBuildDirectory,
       ]);
-      const finalPluginController = await createPluginController(
-        finalPluginStore,
+      const finalJsenvPluginsController = await createJsenvPluginsController(
+        finalJsenvPluginStore,
         finalKitchen,
         {
-          initialPuginsMeta: rawKitchen.pluginController.pluginsMeta,
+          meta: rawKitchen.jsenvPluginsController.getMeta(),
         },
       );
-      finalKitchen.setPluginController(finalPluginController);
+      finalKitchen.setJsenvPluginsController(finalJsenvPluginsController);
 
       bundle: {
         const bundlerMap = new Map();
-        for (const plugin of rawKitchen.pluginController.activePlugins) {
+        for (const plugin of rawKitchen.jsenvPluginsController.activePlugins) {
           const bundle = plugin.bundle;
           if (!bundle) {
             continue;
@@ -1483,7 +1483,8 @@ const prepareEntryPointBuild = async (
         refine_hook: {
           const refineBuildUrlContentCallbackSet = new Set();
           const refineBuildCallbackSet = new Set();
-          for (const plugin of rawKitchen.pluginController.activePlugins) {
+          for (const plugin of rawKitchen.jsenvPluginsController
+            .activePlugins) {
             const refineBuildUrlContent = plugin.refineBuildUrlContent;
             if (refineBuildUrlContent) {
               refineBuildUrlContentCallbackSet.add(refineBuildUrlContent);

package/src/build/build_specifier_manager.js

@@ -117,14 +117,15 @@ export const createBuildSpecifierManager = ({
   const bundleInfoMap = new Map();
 
   const applyBundling = async ({ bundler, urlInfosToBundle }) => {
-    const urlInfosBundled = await rawKitchen.pluginController.callAsyncHook(
-      {
-        plugin: bundler.plugin,
-        hookName: "bundle",
-        value: bundler.bundleFunction,
-      },
-      urlInfosToBundle,
-    );
+    const urlInfosBundled =
+      await rawKitchen.jsenvPluginsController.callAsyncHook(
+        {
+          plugin: bundler.plugin,
+          hookName: "bundle",
+          value: bundler.bundleFunction,
+        },
+        urlInfosToBundle,
+      );
     for (const url of Object.keys(urlInfosBundled)) {
       const urlInfoBundled = urlInfosBundled[url];
       const contentSideEffects = [];
@@ -1315,9 +1316,9 @@ const isWrappedByQuote = (content, start, end) => {
 // https://github.com/rollup/rollup/blob/5a5391971d695c808eed0c5d7d2c6ccb594fc689/src/Chunk.ts#L870
 const generateVersion = (parts, length) => {
   const hash = createHash("sha256");
-  parts.forEach((part) => {
+  for (const part of parts) {
     hash.update(part);
-  });
+  }
   return hash.digest("hex").slice(0, length);
 };
 

package/src/build/mappings_injection.js

@@ -15,25 +15,27 @@ import {
 import { isWebWorkerUrlInfo } from "@jsenv/core/src/kitchen/web_workers.js";
 import { prependContent } from "../kitchen/prepend_content.js";
 
+// we nevery minify those because they are already very small
+// and would hurt the readability of something that can be critical to debug
 export const injectGlobalMappings = async (urlInfo, mappings) => {
   if (urlInfo.type === "html") {
-    const minification = Boolean(
-      urlInfo.context.getPluginMeta("willMinifyJsClassic"),
-    );
+    // const minification = Boolean(
+    //   urlInfo.context.getPluginMeta("willMinifyJsClassic"),
+    // );
     const content = generateClientCodeForMappings(mappings, {
       globalName: "window",
-      minification,
+      minification: false,
     });
     await prependContent(urlInfo, { type: "js_classic", content });
     return;
   }
   if (urlInfo.type === "js_classic" || urlInfo.type === "js_module") {
-    const minification = Boolean(
-      urlInfo.context.getPluginMeta("willMinifyJsClassic"),
-    );
+    // const minification = Boolean(
+    //   urlInfo.context.getPluginMeta("willMinifyJsClassic"),
+    // );
     const content = generateClientCodeForMappings(mappings, {
       globalName: isWebWorkerUrlInfo(urlInfo) ? "self" : "window",
-      minification,
+      minification: false,
     });
     await prependContent(urlInfo, { type: "js_classic", content });
     return;
@@ -68,9 +70,8 @@ export const injectImportmapMappings = (urlInfo, getMappings) => {
   // jsenv_plugin_importmap.js is removing importmap during build
   // it means at this point we know HTML has no importmap in it
   // we can safely inject one
-  const importmapMinification = Boolean(
-    urlInfo.context.getPluginMeta("willMinifyJson"),
-  );
+  const importmapMinification = false;
+  // Boolean(urlInfo.context.getPluginMeta("willMinifyJson"));
   const importmapNode = findHtmlNode(htmlAst, (node) => {
     return (
       node.tagName === "script" &&

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,
+  serverPluginCORS,
+  serverPluginErrorHandler,
+  serverPluginStaticFiles,
   startServer,
 } from "@jsenv/server";
-import { urlToExtension, urlToPathname } from "@jsenv/urls";
 import { existsSync } from "node:fs";
 
 /**
@@ -37,7 +36,7 @@ export const startBuildServer = async ({
   buildMainFilePath = "index.html",
   port = 9779,
   routes,
-  services = [],
+  serverPlugins = [],
   acceptAnyIp,
   hostname,
   https,
@@ -122,8 +121,8 @@ export const startBuildServer = async ({
     serverTiming: true,
     requestWaitingMs: 60_000,
     routes,
-    services: [
-      jsenvServiceCORS({
+    plugins: [
+      serverPluginCORS({
         accessControlAllowRequestOrigin: true,
         accessControlAllowRequestMethod: true,
         accessControlAllowRequestHeaders: true,
@@ -131,13 +130,13 @@ export const startBuildServer = async ({
         accessControlAllowCredentials: true,
         timingAllowOrigin: true,
       }),
-      ...services,
-      jsenvBuildFileService({
-        buildDirectoryUrl,
-        buildMainFilePath,
+      ...serverPlugins,
+      serverPluginStaticFiles({
+        directoryUrl: buildDirectoryUrl,
+        mainFilePath: buildMainFilePath,
       }),
-      jsenvServiceErrorHandler({
-        sendErrorDetails: true,
+      serverPluginErrorHandler({
+        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

@@ -7,12 +7,12 @@ import { createLogger, createTaskLog, formatError } from "@jsenv/humanize";
 import {
   composeTwoResponses,
   jsenvAccessControlAllowedHeaders,
-  jsenvServiceCORS,
-  jsenvServiceErrorHandler,
   serveDirectory,
+  serverPluginCORS,
+  serverPluginErrorHandler,
   startServer,
 } from "@jsenv/server";
-import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/internal/convertFileSystemErrorToResponseProperties.js";
+import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/plugins/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";
@@ -24,9 +24,9 @@ import { jsenvCoreDirectoryUrl } from "../jsenv_core_directory_url.js";
 import { createKitchen } from "../kitchen/kitchen.js";
 import { createPackageDirectory } from "../kitchen/package_directory.js";
 import {
-  createPluginController,
-  createPluginStore,
-} from "../plugins/plugin_controller.js";
+  createJsenvPluginsController,
+  createJsenvPluginStore,
+} from "../plugins/jsenv_plugins_controller.js";
 import { getCorePlugins } from "../plugins/plugins.js";
 import { jsenvPluginServerEvents } from "../plugins/server_events/jsenv_plugin_server_events.js";
 import { parseUserAgentHeader } from "./user_agent.js";
@@ -69,7 +69,7 @@ export const startDevServer = async ({
   logLevel = EXECUTED_BY_TEST_PLAN ? "warn" : "info",
   serverLogLevel = "warn",
   serverRouterLogLevel = "warn",
-  services = [],
+  serverPlugins = [],
 
   signal = new AbortController().signal,
   handleSIGINT = true,
@@ -176,10 +176,10 @@ export const startDevServer = async ({
   const serverStopAbortSignal = serverStopAbortController.signal;
   const kitchenCache = new Map();
 
-  const finalServices = [];
+  const finalServerPlugins = [];
   // x-server-inspect service
   {
-    finalServices.push({
+    finalServerPlugins.push({
       name: "jsenv:server_header",
       routes: [
         {
@@ -205,8 +205,8 @@ export const startDevServer = async ({
   }
   // cors service
   {
-    finalServices.push(
-      jsenvServiceCORS({
+    finalServerPlugins.push(
+      serverPluginCORS({
         accessControlAllowRequestOrigin: true,
         accessControlAllowRequestMethod: true,
         accessControlAllowRequestHeaders: true,
@@ -219,9 +219,9 @@ export const startDevServer = async ({
       }),
     );
   }
-  // custom services
+  // custom server plugins
   {
-    finalServices.push(...services);
+    finalServerPlugins.push(...serverPlugins);
   }
   // file_service
   {
@@ -251,7 +251,7 @@ export const startDevServer = async ({
       sourceDirectoryUrl,
     });
 
-    const devServerPluginStore = await createPluginStore([
+    const devServerJsenvPluginStore = await createJsenvPluginStore([
       jsenvPluginServerEvents({ clientAutoreload }),
       ...plugins,
       ...getCorePlugins({
@@ -411,28 +411,28 @@ export const startDevServer = async ({
           );
         },
       );
-      const devServerPluginController = await createPluginController(
-        devServerPluginStore,
+      const devServerJsenvPluginController = await createJsenvPluginsController(
+        devServerJsenvPluginStore,
         kitchen,
       );
-      kitchen.setPluginController(devServerPluginController);
+      kitchen.setJsenvPluginsController(devServerJsenvPluginController);
 
       serverStopCallbackSet.add(() => {
-        devServerPluginController.callHooks("destroy", kitchen.context);
+        devServerJsenvPluginController.callHooks("destroy", kitchen.context);
       });
       kitchenCache.set(runtimeId, kitchen);
       onKitchenCreated(kitchen);
       return kitchen;
     };
 
-    finalServices.push({
+    finalServerPlugins.push({
       name: "jsenv:dev_server_routes",
       augmentRouteFetchSecondArg: async (request) => {
         const kitchen = await getOrCreateKitchen(request);
         return { kitchen };
       },
       routes: [
-        ...devServerPluginStore.allDevServerRoutes,
+        ...devServerJsenvPluginStore.allServerRoutes,
         {
           endpoint: "GET *",
           description: "Serve project files.",
@@ -545,7 +545,7 @@ export const startDevServer = async ({
                 reference,
                 urlInfo,
               };
-              kitchen.pluginController.callHooks(
+              kitchen.jsenvPluginsController.callHooks(
                 "augmentResponse",
                 augmentResponseInfo,
                 (returnValue) => {
@@ -632,11 +632,11 @@ export const startDevServer = async ({
         },
       ],
     });
-    finalServices.push(...devServerPluginStore.allDevServerServices);
+    finalServerPlugins.push(...devServerJsenvPluginStore.allServerPlugins);
   }
   // jsenv error handler service
   {
-    finalServices.push({
+    finalServerPlugins.push({
       name: "jsenv:omega_error_handler",
       handleError: (error) => {
         const getResponseForError = () => {
@@ -673,8 +673,8 @@ export const startDevServer = async ({
   }
   // default error handler
   {
-    finalServices.push(
-      jsenvServiceErrorHandler({
+    finalServerPlugins.push(
+      serverPluginErrorHandler({
         sendErrorDetails: true,
       }),
     );
@@ -696,7 +696,7 @@ export const startDevServer = async ({
     hostname,
     port,
     requestWaitingMs: 60_000,
-    services: finalServices,
+    plugins: finalServerPlugins,
   });
   server.stoppedPromise.then((reason) => {
     onStop();

package/src/kitchen/errors.js

@@ -3,7 +3,7 @@ import { stringifyUrlSite } from "@jsenv/urls";
 import { pathToFileURL } from "node:url";
 
 export const createResolveUrlError = ({
-  pluginController,
+  jsenvPluginsController,
   reference,
   error,
 }) => {
@@ -21,7 +21,7 @@ ${reason}`,
         {
           ...detailsFromFirstReference(reference),
           ...details,
-          ...detailsFromPluginController(pluginController),
+          ...detailsFromPluginController(jsenvPluginsController),
         },
       ),
     );
@@ -66,7 +66,7 @@ ${reason}`,
 };
 
 export const createFetchUrlContentError = ({
-  pluginController,
+  jsenvPluginsController,
   urlInfo,
   error,
 }) => {
@@ -85,7 +85,7 @@ ${reason}`,
         {
           ...detailsFromFirstReference(reference),
           ...details,
-          ...detailsFromPluginController(pluginController),
+          ...detailsFromPluginController(jsenvPluginsController),
         },
       ),
     );
@@ -141,7 +141,7 @@ ${reason}`,
 };
 
 export const createTransformUrlContentError = ({
-  pluginController,
+  jsenvPluginsController,
   urlInfo,
   error,
 }) => {
@@ -170,7 +170,7 @@ ${error.message}`,
             ? `${reference.trace.url}:${reference.trace.line}:${reference.trace.column}`
             : reference.trace.message,
           ...detailsFromFirstReference(reference),
-          ...detailsFromPluginController(pluginController),
+          ...detailsFromPluginController(jsenvPluginsController),
         },
       ),
     );
@@ -202,7 +202,7 @@ ${reason}`,
         {
           ...detailsFromFirstReference(reference),
           ...details,
-          ...detailsFromPluginController(pluginController),
+          ...detailsFromPluginController(jsenvPluginsController),
         },
       ),
     );
@@ -226,7 +226,7 @@ ${reason}`,
 };
 
 export const createFinalizeUrlContentError = ({
-  pluginController,
+  jsenvPluginsController,
   urlInfo,
   error,
 }) => {
@@ -238,7 +238,7 @@ ${reference.trace.message}`,
       {
         ...detailsFromFirstReference(reference),
         ...detailsFromValueThrown(error),
-        ...detailsFromPluginController(pluginController),
+        ...detailsFromPluginController(jsenvPluginsController),
       },
     ),
   );
@@ -328,8 +328,8 @@ const getFirstReferenceInProject = (reference) => {
   return getFirstReferenceInProject(firstReference);
 };
 
-const detailsFromPluginController = (pluginController) => {
-  const currentPlugin = pluginController.getCurrentPlugin();
+const detailsFromPluginController = (jsenvPluginsController) => {
+  const currentPlugin = jsenvPluginsController.getCurrentPlugin();
   if (!currentPlugin) {
     return null;
   }