@jsenv/core 39.14.2 → 40.0.0

package/src/build/build_specifier_manager.js

@@ -28,9 +28,9 @@ import { GRAPH_VISITOR } from "../kitchen/url_graph/url_graph_visitor.js";
 import { isWebWorkerUrlInfo } from "../kitchen/web_workers.js";
 import { createBuildUrlsGenerator } from "./build_urls_generator.js";
 import {
-  injectVersionMappingsAsGlobal,
-  injectVersionMappingsAsImportmap,
-} from "./version_mappings_injection.js";
+  injectGlobalMappings,
+  injectImportmapMappings,
+} from "./mappings_injection.js";
 
 export const createBuildSpecifierManager = ({
   rawKitchen,
@@ -131,18 +131,18 @@ export const createBuildSpecifierManager = ({
       },
       urlInfosToBundle,
     );
-    Object.keys(urlInfosBundled).forEach((url) => {
+    for (const url of Object.keys(urlInfosBundled)) {
       const urlInfoBundled = urlInfosBundled[url];
       if (urlInfoBundled.sourceUrls) {
-        urlInfoBundled.sourceUrls.forEach((sourceUrl) => {
+        for (const sourceUrl of urlInfoBundled.sourceUrls) {
           const sourceRawUrlInfo = rawKitchen.graph.getUrlInfo(sourceUrl);
           if (sourceRawUrlInfo) {
             sourceRawUrlInfo.data.bundled = true;
           }
-        });
+        }
       }
       bundleInfoMap.set(url, urlInfoBundled);
-    });
+    }
   };
 
   const jsenvPluginMoveToBuildDirectory = {
@@ -338,7 +338,7 @@ export const createBuildSpecifierManager = ({
 
   const versionMap = new Map();
 
-  const workerReferenceSet = new Set();
+  const referenceInSeparateContextSet = new Set();
   const referenceVersioningInfoMap = new Map();
   const _getReferenceVersioningInfo = (reference) => {
     if (!shouldApplyVersioningOnReference(reference)) {
@@ -395,7 +395,7 @@ export const createBuildSpecifierManager = ({
           },
         };
       }
-      if (canUseImportmap && !isInsideWorker(reference)) {
+      if (canUseImportmap && !isInsideSeparateContext(reference)) {
         return {
           type: "importmap",
           render: (buildSpecifier) => {
@@ -422,8 +422,8 @@ export const createBuildSpecifierManager = ({
     referenceVersioningInfoMap.set(reference, info);
     return info;
   };
-  const isInsideWorker = (reference) => {
-    if (workerReferenceSet.has(reference)) {
+  const isInsideSeparateContext = (reference) => {
+    if (referenceInSeparateContextSet.has(reference)) {
       return true;
     }
     const referenceOwnerUrllInfo = reference.ownerUrlInfo;
@@ -443,7 +443,7 @@ export const createBuildSpecifierManager = ({
       );
     }
     if (is) {
-      workerReferenceSet.add(reference);
+      referenceInSeparateContextSet.add(reference);
       return true;
     }
     return false;
@@ -646,6 +646,9 @@ export const createBuildSpecifierManager = ({
     }
   };
 
+  const importMappings = {};
+  const globalMappings = {};
+
   const applyVersioningOnBuildSpecifier = (buildSpecifier, reference) => {
     if (!versioning) {
       return buildSpecifier;
@@ -671,10 +674,6 @@ export const createBuildSpecifierManager = ({
   };
   const finishVersioning = async () => {
     inject_global_registry_and_importmap: {
-      const actions = [];
-      const visitors = [];
-      const globalMappings = {};
-      const importmapMappings = {};
       for (const [reference, versioningInfo] of referenceVersioningInfoMap) {
         if (versioningInfo.type === "global") {
           const urlInfo = reference.urlInfo;
@@ -690,37 +689,7 @@ export const createBuildSpecifierManager = ({
           const buildSpecifier = buildUrlToBuildSpecifierMap.get(buildUrl);
           const buildSpecifierVersioned =
             buildSpecifierToBuildSpecifierVersionedMap.get(buildSpecifier);
-          importmapMappings[buildSpecifier] = buildSpecifierVersioned;
-        }
-      }
-      if (Object.keys(globalMappings).length > 0) {
-        visitors.push((urlInfo) => {
-          if (urlInfo.isEntryPoint) {
-            actions.push(async () => {
-              await injectVersionMappingsAsGlobal(urlInfo, globalMappings);
-            });
-          }
-        });
-      }
-      if (Object.keys(importmapMappings).length > 0) {
-        visitors.push((urlInfo) => {
-          if (urlInfo.type === "html" && urlInfo.isEntryPoint) {
-            actions.push(async () => {
-              await injectVersionMappingsAsImportmap(
-                urlInfo,
-                importmapMappings,
-              );
-            });
-          }
-        });
-      }
-      if (visitors.length) {
-        GRAPH_VISITOR.forEach(finalKitchen.graph, (urlInfo) => {
-          if (urlInfo.isRoot) return;
-          visitors.forEach((visitor) => visitor(urlInfo));
-        });
-        if (actions.length) {
-          await Promise.all(actions.map((action) => action()));
+          importMappings[buildSpecifier] = buildSpecifierVersioned;
         }
       }
     }
@@ -751,7 +720,6 @@ export const createBuildSpecifierManager = ({
       if (versioning) {
         prepareVersioning();
       }
-
       const urlInfoSet = new Set();
       GRAPH_VISITOR.forEachUrlInfoStronglyReferenced(
         finalKitchen.graph.rootUrlInfo,
@@ -788,11 +756,73 @@ export const createBuildSpecifierManager = ({
           }
         },
       );
-
-      workerReferenceSet.clear();
+      referenceInSeparateContextSet.clear();
       if (versioning) {
         await finishVersioning();
       }
+      const actions = [];
+      const visitors = [];
+      if (Object.keys(globalMappings).length > 0) {
+        visitors.push((urlInfo) => {
+          if (urlInfo.isRoot) {
+            return;
+          }
+          if (!urlInfo.isEntryPoint) {
+            return;
+          }
+          actions.push(async () => {
+            await injectGlobalMappings(urlInfo, globalMappings);
+          });
+        });
+      }
+      sync_importmap: {
+        visitors.push((urlInfo) => {
+          if (urlInfo.isRoot) {
+            return;
+          }
+          if (!urlInfo.isEntryPoint) {
+            return;
+          }
+          if (urlInfo.type !== "html") {
+            return;
+          }
+
+          actions.push(async () => {
+            await injectImportmapMappings(urlInfo, (topLevelMappings) => {
+              if (!topLevelMappings) {
+                return importMappings;
+              }
+              const topLevelMappingsToKeep = {};
+              for (const topLevelMappingKey of Object.keys(topLevelMappings)) {
+                const topLevelMappingValue =
+                  topLevelMappings[topLevelMappingKey];
+                const urlInfo = finalKitchen.graph.getUrlInfo(
+                  `ignore:${topLevelMappingKey}`,
+                );
+                if (urlInfo) {
+                  topLevelMappingsToKeep[topLevelMappingKey] =
+                    topLevelMappingValue;
+                }
+              }
+              return {
+                ...topLevelMappingsToKeep,
+                ...importMappings,
+              };
+            });
+          });
+        });
+      }
+
+      if (visitors.length) {
+        GRAPH_VISITOR.forEach(finalKitchen.graph, (urlInfo) => {
+          for (const visitor of visitors) {
+            visitor(urlInfo);
+          }
+        });
+        if (actions.length) {
+          await Promise.all(actions.map((action) => action()));
+        }
+      }
 
       for (const urlInfo of urlInfoSet) {
         urlInfo.kitchen.urlInfoTransformer.applySourcemapOnContent(
@@ -809,19 +839,9 @@ export const createBuildSpecifierManager = ({
       urlInfoSet.clear();
     },
 
-    prepareResyncResourceHints: () => {
-      const actions = [];
-      GRAPH_VISITOR.forEach(finalKitchen.graph, (urlInfo) => {
-        if (urlInfo.type !== "html") {
-          return;
-        }
-        const htmlAst = parseHtml({
-          html: urlInfo.content,
-          url: urlInfo.url,
-          storeOriginalPositions: false,
-        });
-        const mutations = [];
-        const hintToInjectMap = new Map();
+    prepareResyncResourceHints: ({ registerHtmlRefine }) => {
+      const hintToInjectMap = new Map();
+      registerHtmlRefine((htmlAst, { registerHtmlMutation }) => {
         visitHtmlNodes(htmlAst, {
           link: (node) => {
             const href = getHtmlNodeAttribute(node, "href");
@@ -846,7 +866,7 @@ export const createBuildSpecifierManager = ({
               logger.warn(
                 `${UNICODE.WARNING} remove resource hint because cannot find "${href}" in the graph`,
               );
-              mutations.push(() => {
+              registerHtmlMutation(() => {
                 removeHtmlNode(node);
               });
               return;
@@ -857,7 +877,7 @@ export const createBuildSpecifierManager = ({
                 logger.warn(
                   `${UNICODE.WARNING} remove resource hint on "${href}" because it was bundled`,
                 );
-                mutations.push(() => {
+                registerHtmlMutation(() => {
                   removeHtmlNode(node);
                 });
                 return;
@@ -865,13 +885,13 @@ export const createBuildSpecifierManager = ({
               logger.warn(
                 `${UNICODE.WARNING} remove resource hint on "${href}" because it is not used anymore`,
               );
-              mutations.push(() => {
+              registerHtmlMutation(() => {
                 removeHtmlNode(node);
               });
               return;
             }
             const buildGeneratedSpecifier = getBuildGeneratedSpecifier(urlInfo);
-            mutations.push(() => {
+            registerHtmlMutation(() => {
               setHtmlNodeAttributes(node, {
                 href: buildGeneratedSpecifier,
                 ...(urlInfo.type === "js_classic"
@@ -890,43 +910,31 @@ export const createBuildSpecifierManager = ({
             }
           },
         });
-        hintToInjectMap.forEach(({ node }, urlInfo) => {
-          const buildGeneratedSpecifier = getBuildGeneratedSpecifier(urlInfo);
+        for (const [referencedUrlInfo, { node }] of hintToInjectMap) {
+          const buildGeneratedSpecifier =
+            getBuildGeneratedSpecifier(referencedUrlInfo);
           const found = findHtmlNode(htmlAst, (htmlNode) => {
             return (
               htmlNode.nodeName === "link" &&
               getHtmlNodeAttribute(htmlNode, "href") === buildGeneratedSpecifier
             );
           });
-          if (!found) {
-            mutations.push(() => {
-              const nodeToInsert = createHtmlNode({
-                tagName: "link",
-                rel: getHtmlNodeAttribute(node, "rel"),
-                href: buildGeneratedSpecifier,
-                as: getHtmlNodeAttribute(node, "as"),
-                type: getHtmlNodeAttribute(node, "type"),
-                crossorigin: getHtmlNodeAttribute(node, "crossorigin"),
-              });
-              insertHtmlNodeAfter(nodeToInsert, node);
-            });
+          if (found) {
+            continue;
           }
-        });
-        if (mutations.length > 0) {
-          actions.push(() => {
-            mutations.forEach((mutation) => mutation());
-            urlInfo.mutateContent({
-              content: stringifyHtmlAst(htmlAst),
+          registerHtmlMutation(() => {
+            const nodeToInsert = createHtmlNode({
+              tagName: "link",
+              rel: getHtmlNodeAttribute(node, "rel"),
+              href: buildGeneratedSpecifier,
+              as: getHtmlNodeAttribute(node, "as"),
+              type: getHtmlNodeAttribute(node, "type"),
+              crossorigin: getHtmlNodeAttribute(node, "crossorigin"),
             });
+            insertHtmlNodeAfter(nodeToInsert, node);
           });
         }
       });
-      if (actions.length === 0) {
-        return null;
-      }
-      return () => {
-        actions.map((resourceHintAction) => resourceHintAction());
-      };
     },
 
     prepareServiceWorkerUrlInjection: () => {
@@ -1071,7 +1079,8 @@ const findRawUrlInfoWhenInline = (reference, rawKitchen) => {
       if (
         inlineUrlSite.url === reference.ownerUrlInfo.url &&
         inlineUrlSite.line === reference.specifierLine &&
-        inlineUrlSite.column === reference.specifierColumn
+        inlineUrlSite.column === reference.specifierColumn &&
+        rawUrlInfoCandidate.contentType === reference.contentType
       ) {
         return true;
       }

package/src/build/build_urls_generator.js

@@ -127,7 +127,7 @@ const determineDirectoryPath = ({
     });
     return parentDirectoryPath;
   }
-  if (urlInfo.isEntryPoint) {
+  if (urlInfo.isEntryPoint && !urlInfo.isDynamicEntryPoint) {
     return "";
   }
   if (urlInfo.type === "importmap") {

package/src/build/{version_mappings_injection.js → mappings_injection.js}

@@ -2,23 +2,25 @@
 
 import {
   createHtmlNode,
+  findHtmlNode,
+  getHtmlNodeAttribute,
+  getHtmlNodeText,
   injectHtmlNodeAsEarlyAsPossible,
   parseHtml,
+  removeHtmlNode,
+  setHtmlNodeText,
   stringifyHtmlAst,
 } from "@jsenv/ast";
 
 import { isWebWorkerUrlInfo } from "@jsenv/core/src/kitchen/web_workers.js";
 import { prependContent } from "../kitchen/prepend_content.js";
 
-export const injectVersionMappingsAsGlobal = async (
-  urlInfo,
-  versionMappings,
-) => {
+export const injectGlobalMappings = async (urlInfo, mappings) => {
   if (urlInfo.type === "html") {
     const minification = Boolean(
       urlInfo.context.getPluginMeta("willMinifyJsClassic"),
     );
-    const content = generateClientCodeForVersionMappings(versionMappings, {
+    const content = generateClientCodeForMappings(mappings, {
       globalName: "window",
       minification,
     });
@@ -29,7 +31,7 @@ export const injectVersionMappingsAsGlobal = async (
     const minification = Boolean(
       urlInfo.context.getPluginMeta("willMinifyJsClassic"),
     );
-    const content = generateClientCodeForVersionMappings(versionMappings, {
+    const content = generateClientCodeForMappings(mappings, {
       globalName: isWebWorkerUrlInfo(urlInfo) ? "self" : "window",
       minification,
     });
@@ -38,7 +40,7 @@ export const injectVersionMappingsAsGlobal = async (
   }
 };
 
-const generateClientCodeForVersionMappings = (
+const generateClientCodeForMappings = (
   versionMappings,
   { globalName, minification },
 ) => {
@@ -57,7 +59,7 @@ const generateClientCodeForVersionMappings = (
 })();`;
 };
 
-export const injectVersionMappingsAsImportmap = (urlInfo, versionMappings) => {
+export const injectImportmapMappings = (urlInfo, getMappings) => {
   const htmlAst = parseHtml({
     html: urlInfo.content,
     url: urlInfo.url,
@@ -69,20 +71,59 @@ export const injectVersionMappingsAsImportmap = (urlInfo, versionMappings) => {
   const importmapMinification = Boolean(
     urlInfo.context.getPluginMeta("willMinifyJson"),
   );
-  injectHtmlNodeAsEarlyAsPossible(
-    htmlAst,
-    createHtmlNode({
-      tagName: "script",
-      type: "importmap",
-      children: importmapMinification
-        ? JSON.stringify({ imports: versionMappings })
-        : JSON.stringify({ imports: versionMappings }, null, "  "),
-    }),
-    "jsenv:versioning",
-  );
-  urlInfo.mutateContent({
-    content: stringifyHtmlAst(htmlAst),
+  const importmapNode = findHtmlNode(htmlAst, (node) => {
+    return (
+      node.tagName === "script" &&
+      getHtmlNodeAttribute(node, "type") === "importmap"
+    );
+  });
+  const generateMappingText = (mappings) => {
+    if (importmapMinification) {
+      return JSON.stringify({ imports: mappings });
+    }
+    return JSON.stringify({ imports: mappings }, null, "  ");
+  };
+
+  const mutate = (mutation) => {
+    mutation();
+    urlInfo.mutateContent({
+      content: stringifyHtmlAst(htmlAst),
+    });
+  };
+
+  if (importmapNode) {
+    // we want to remove some mappings, override others, add eventually add new
+    const currentMappings = JSON.parse(getHtmlNodeText(importmapNode));
+    const mappings = getMappings(currentMappings.imports);
+    if (!mappings || Object.keys(mappings).length === 0) {
+      mutate(() => {
+        removeHtmlNode(importmapNode);
+      });
+      return;
+    }
+    mutate(() => {
+      setHtmlNodeText(importmapNode, generateMappingText(mappings), {
+        indentation: "auto",
+      });
+    });
+    return;
+  }
+  const mappings = getMappings(null);
+  if (!mappings || Object.keys(mappings).length === 0) {
+    return;
+  }
+  mutate(() => {
+    injectHtmlNodeAsEarlyAsPossible(
+      htmlAst,
+      createHtmlNode({
+        tagName: "script",
+        type: "importmap",
+        children: generateMappingText(getMappings(null)),
+      }),
+      "jsenv:versioning",
+    );
   });
+  return;
 };
 
 const stringifyParams = (params, prefix = "") => {

package/src/build/start_build_server.js

@@ -17,7 +17,7 @@ import { Abort, raceProcessTeardownEvents } from "@jsenv/abort";
 import { assertAndNormalizeDirectoryUrl } from "@jsenv/filesystem";
 import { createLogger, createTaskLog } from "@jsenv/humanize";
 import {
-  fetchFileSystem,
+  createFileSystemFetch,
   jsenvAccessControlAllowedHeaders,
   jsenvServiceCORS,
   jsenvServiceErrorHandler,
@@ -36,6 +36,7 @@ export const startBuildServer = async ({
   buildDirectoryUrl,
   buildMainFilePath = "index.html",
   port = 9779,
+  routes,
   services = [],
   acceptAnyIp,
   hostname,
@@ -120,6 +121,7 @@ export const startBuildServer = async ({
     port,
     serverTiming: true,
     requestWaitingMs: 60_000,
+    routes,
     services: [
       jsenvServiceCORS({
         accessControlAllowRequestOrigin: true,
@@ -130,13 +132,10 @@ export const startBuildServer = async ({
         timingAllowOrigin: true,
       }),
       ...services,
-      {
-        name: "jsenv:build_files_service",
-        handleRequest: createBuildFilesService({
-          buildDirectoryUrl,
-          buildMainFilePath,
-        }),
-      },
+      jsenvBuildFileService({
+        buildDirectoryUrl,
+        buildMainFilePath,
+      }),
       jsenvServiceErrorHandler({
         sendErrorDetails: true,
       }),
@@ -160,35 +159,46 @@ export const startBuildServer = async ({
   };
 };
 
-const createBuildFilesService = ({ buildDirectoryUrl, buildMainFilePath }) => {
-  return (request) => {
-    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 fetchFileSystem(urlObject, {
-      headers: request.headers,
-      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;
+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);
+        },
       },
-    });
+    ],
   };
 };