@jsenv/core 40.2.0 → 40.3.1

package/src/build/build.js

@@ -22,6 +22,7 @@ import {
   assertAndNormalizeDirectoryUrl,
   clearDirectorySync,
   compareFileUrls,
+  createLookupPackageDirectory,
   ensureEmptyDirectory,
   lookupPackageDirectory,
   readPackageAtOrNull,
@@ -490,7 +491,21 @@ export const build = async ({
     return compareFileUrls(a.sourceUrl, b.sourceUrl);
   });
 
-  const packageDirectoryUrl = lookupPackageDirectory(sourceDirectoryUrl);
+  const lookupPackageDirectoryUrl = createLookupPackageDirectory();
+  const packageDirectoryCache = new Map();
+  const readPackageDirectory = (url) => {
+    const fromCache = packageDirectoryCache.get(url);
+    if (fromCache !== undefined) {
+      return fromCache;
+    }
+    return readPackageAtOrNull(url);
+  };
+  const packageDirectory = {
+    url: lookupPackageDirectory(sourceDirectoryUrl),
+    find: lookupPackageDirectoryUrl,
+    read: readPackageDirectory,
+  };
+
   if (outDirectoryUrl === undefined) {
     if (
       process.env.CAPTURING_SIDE_EFFECTS ||
@@ -498,85 +513,24 @@ export const build = async ({
         urlIsInsideOf(sourceDirectoryUrl, jsenvCoreDirectoryUrl))
     ) {
       outDirectoryUrl = new URL("../.jsenv_b/", sourceDirectoryUrl).href;
-    } else if (packageDirectoryUrl) {
-      outDirectoryUrl = `${packageDirectoryUrl}.jsenv/`;
+    } else if (packageDirectory.url) {
+      outDirectoryUrl = `${packageDirectory.url}.jsenv/`;
     }
   }
-  let rootPackageDirectoryUrl = packageDirectoryUrl;
-  if (packageDirectoryUrl) {
-    const parentPackageDirectoryUrl = lookupPackageDirectory(
-      new URL("../", packageDirectoryUrl),
+  let rootPackageDirectoryUrl;
+  if (packageDirectory.url) {
+    const parentPackageDirectoryUrl = packageDirectory.find(
+      new URL("../", packageDirectory.url),
     );
-    if (parentPackageDirectoryUrl) {
-      rootPackageDirectoryUrl = parentPackageDirectoryUrl;
-    }
+    rootPackageDirectoryUrl = parentPackageDirectoryUrl || packageDirectory.url;
+  } else {
+    rootPackageDirectoryUrl = packageDirectory.url;
   }
 
   const runBuild = async ({ signal }) => {
     const startDate = Date.now();
     const { onBuildEnd, onEntryPointBuildStart } = startBuildLogs();
 
-    const sourceFileBuildCallbackMap = new Map();
-    const registerSourceFileBuildEffect = (url, callback) => {
-      const buildCallbackSet = sourceFileBuildCallbackMap.get(url);
-      if (buildCallbackSet) {
-        buildCallbackSet.add(callback);
-      } else {
-        const set = new Set();
-        set.add(callback);
-        sourceFileBuildCallbackMap.set(url, set);
-      }
-    };
-    const onSourceFileBuild = ({ sourceFileUrl, buildFileUrl }) => {
-      const buildCallbackSet = sourceFileBuildCallbackMap.get(sourceFileUrl);
-      if (buildCallbackSet) {
-        for (const buildCallback of buildCallbackSet) {
-          buildCallback({ buildFileUrl });
-        }
-      }
-    };
-    sync_package_side_effects: {
-      if (!packageDirectoryUrl) {
-        break sync_package_side_effects;
-      }
-      const packageJson = readPackageAtOrNull(packageDirectoryUrl);
-      if (!packageJson) {
-        break sync_package_side_effects;
-      }
-      const { sideEffects } = packageJson;
-      if (!sideEffects || !Array.isArray(sideEffects)) {
-        break sync_package_side_effects;
-      }
-      const sideEffectFileUrlSet = new Set();
-      const packageJsonFileUrl = new URL("./package.json", packageDirectoryUrl)
-        .href;
-      for (const sideEffectFileRelativeUrl of sideEffects) {
-        const sideEffectFileUrl = new URL(
-          sideEffectFileRelativeUrl,
-          packageDirectoryUrl,
-        ).href;
-        sideEffectFileUrlSet.add(sideEffectFileUrl);
-        registerSourceFileBuildEffect(sideEffectFileUrl, ({ buildFileUrl }) => {
-          const urlRelativeToPackage = urlToRelativeUrl(
-            buildFileUrl,
-            packageDirectoryUrl,
-          );
-          if (sideEffectFileUrlSet.has(buildFileUrl)) {
-            return;
-          }
-          sideEffects.push(
-            urlRelativeToPackage[0] === "."
-              ? urlRelativeToPackage
-              : `./${urlRelativeToPackage}`,
-          );
-          writeFileSync(
-            packageJsonFileUrl,
-            JSON.stringify(packageJson, null, "  "),
-          );
-        });
-      }
-    }
-
     const buildUrlsGenerator = createBuildUrlsGenerator({
       sourceDirectoryUrl,
       buildDirectoryUrl,
@@ -627,9 +581,9 @@ export const build = async ({
           buildDirectoryUrl,
           outDirectoryUrl: entryOutDirectoryUrl,
           sourceRelativeUrl: entryPoint.sourceRelativeUrl,
+          packageDirectory,
           buildUrlsGenerator,
           someEntryPointUseNode,
-          onSourceFileBuild,
         },
         entryPoint.params,
       );
@@ -841,6 +795,7 @@ const entryPointDefaultParams = {
   sourcemapsSourcesContent: undefined,
   assetManifest: false,
   assetManifestFileRelativeUrl: "asset-manifest.json",
+  packageSideEffects: true,
 };
 
 const prepareEntryPointBuild = async (
@@ -848,11 +803,11 @@ const prepareEntryPointBuild = async (
     signal,
     sourceDirectoryUrl,
     buildDirectoryUrl,
-    sourceRelativeUrl,
     outDirectoryUrl,
+    sourceRelativeUrl,
+    packageDirectory,
     buildUrlsGenerator,
     someEntryPointUseNode,
-    onSourceFileBuild,
   },
   entryPointParams,
 ) => {
@@ -890,6 +845,7 @@ const prepareEntryPointBuild = async (
     sourcemapsSourcesContent,
     assetManifest,
     assetManifestFileRelativeUrl,
+    packageSideEffects,
   } = {
     ...entryPointDefaultParams,
     ...entryPointParams,
@@ -982,6 +938,7 @@ const prepareEntryPointBuild = async (
     outDirectoryUrl: outDirectoryUrl
       ? new URL("craft/", outDirectoryUrl)
       : undefined,
+    packageDirectory,
   });
 
   let _getOtherEntryBuildInfo;
@@ -1009,6 +966,7 @@ const prepareEntryPointBuild = async (
     ...(bundling ? [jsenvPluginBundling(bundling)] : []),
     ...(minification ? [jsenvPluginMinification(minification)] : []),
     ...getCorePlugins({
+      packageDirectory,
       rootDirectoryUrl: sourceDirectoryUrl,
       runtimeCompat,
       referenceAnalysis,
@@ -1026,6 +984,7 @@ const prepareEntryPointBuild = async (
       inlining: false,
       http,
       scenarioPlaceholders,
+      packageSideEffects,
     }),
   ]);
   const rawPluginController = createPluginController(
@@ -1078,6 +1037,7 @@ const prepareEntryPointBuild = async (
         outDirectoryUrl: outDirectoryUrl
           ? new URL("shape/", outDirectoryUrl)
           : undefined,
+        packageDirectory,
       });
       const buildSpecifierManager = createBuildSpecifierManager({
         rawKitchen,
@@ -1096,7 +1056,6 @@ const prepareEntryPointBuild = async (
           versioningViaImportmap &&
           rawKitchen.graph.getUrlInfo(entryReference.url).type === "html" &&
           rawKitchen.context.isSupportedOnCurrentClients("importmap"),
-        onSourceFileBuild,
       });
       const finalPluginStore = createPluginStore([
         jsenvPluginReferenceAnalysis({
@@ -1121,7 +1080,7 @@ const prepareEntryPointBuild = async (
           appliesDuring: "build",
           transformUrlContent: async (urlInfo) => {
             await rawKitchen.pluginController.callAsyncHooks(
-              "optimizeUrlContent",
+              "optimizeBuildUrlContent",
               urlInfo,
               (optimizeReturnValue) => {
                 urlInfo.mutateContent(optimizeReturnValue);
@@ -1349,6 +1308,41 @@ const prepareEntryPointBuild = async (
             buildOperation.throwIfAborted();
           }
         }
+
+        refine_hook: {
+          const refineBuildUrlContentCallbackSet = new Set();
+          const refineBuildCallbackSet = new Set();
+          for (const plugin of rawKitchen.pluginController.activePlugins) {
+            const refineBuildUrlContent = plugin.refineBuildUrlContent;
+            if (refineBuildUrlContent) {
+              refineBuildUrlContentCallbackSet.add(refineBuildUrlContent);
+            }
+            const refineBuild = plugin.refineBuild;
+            if (refineBuild) {
+              refineBuildCallbackSet.add(refineBuild);
+            }
+          }
+          if (refineBuildUrlContentCallbackSet.size) {
+            GRAPH_VISITOR.forEachUrlInfoStronglyReferenced(
+              finalKitchen.graph.rootUrlInfo,
+              (buildUrlInfo) => {
+                if (!buildUrlInfo.url.startsWith("file:")) {
+                  return;
+                }
+                for (const refineBuildUrlContentCallback of refineBuildUrlContentCallbackSet) {
+                  refineBuildUrlContentCallback(buildUrlInfo, {
+                    buildUrl: buildSpecifierManager.getBuildUrl(buildUrlInfo),
+                  });
+                }
+              },
+            );
+          }
+          if (refineBuildCallbackSet.size) {
+            for (const refineBuildCallback of refineBuildCallbackSet) {
+              refineBuildCallback(finalKitchen.graph);
+            }
+          }
+        }
       }
       const {
         buildFileContents,

package/src/build/build_specifier_manager.js

@@ -45,7 +45,6 @@ export const createBuildSpecifierManager = ({
   versioningMethod,
   versionLength,
   canUseImportmap,
-  onSourceFileBuild,
 }) => {
   const placeholderAPI = createPlaceholderAPI({
     length,
@@ -112,31 +111,6 @@ export const createBuildSpecifierManager = ({
       buildSpecifier,
       reference,
     );
-
-    if (buildUrlInfo.sourceUrls) {
-      for (const sourceUrl of buildUrlInfo.sourceUrls) {
-        const rawUrlInfo = rawKitchen.graph.getUrlInfo(sourceUrl);
-        if (rawUrlInfo) {
-          onSourceFileBuild({
-            sourceUrlInfo: rawUrlInfo,
-            buildUrlInfo,
-            sourceFileUrl: rawUrlInfo.url,
-            buildFileUrl: buildUrl,
-          });
-        }
-      }
-    } else if (buildUrlInfo.originalUrl) {
-      const rawUrlInfo = rawKitchen.graph.getUrlInfo(buildUrlInfo.originalUrl);
-      if (rawUrlInfo) {
-        onSourceFileBuild({
-          sourceUrlInfo: rawUrlInfo,
-          buildUrlInfo,
-          sourceFileUrl: rawUrlInfo.url,
-          buildFileUrl: buildUrl,
-        });
-      }
-    }
-
     return buildGeneratedSpecifier;
   };
   const internalRedirections = new Map();
@@ -153,14 +127,17 @@ export const createBuildSpecifierManager = ({
     );
     for (const url of Object.keys(urlInfosBundled)) {
       const urlInfoBundled = urlInfosBundled[url];
+      const contentSideEffects = [];
       if (urlInfoBundled.sourceUrls) {
         for (const sourceUrl of urlInfoBundled.sourceUrls) {
-          const sourceRawUrlInfo = rawKitchen.graph.getUrlInfo(sourceUrl);
-          if (sourceRawUrlInfo) {
-            sourceRawUrlInfo.data.bundled = true;
+          const rawUrlInfo = rawKitchen.graph.getUrlInfo(sourceUrl);
+          if (rawUrlInfo) {
+            rawUrlInfo.data.bundled = true;
+            contentSideEffects.push(...rawUrlInfo.contentSideEffects);
           }
         }
       }
+      urlInfoBundled.contentSideEffects = contentSideEffects;
       bundleInfoMap.set(url, urlInfoBundled);
     }
   };
@@ -322,6 +299,7 @@ export const createBuildSpecifierManager = ({
           contentType: bundleInfo.contentType,
           sourcemap: bundleInfo.sourcemap,
           data: bundleInfo.data,
+          contentSideEffects: bundleInfo.contentSideEffects,
         };
       }
       const rawUrlInfo = rawKitchen.graph.getUrlInfo(rawUrl);
@@ -370,6 +348,7 @@ export const createBuildSpecifierManager = ({
           originalContent: rawUrlInfo.originalContent,
           originalUrl: rawUrlInfo.originalUrl,
           sourcemap: rawUrlInfo.sourcemap,
+          contentSideEffects: rawUrlInfo.contentSideEffects,
         };
       }
       if (firstReference.isInline) {
@@ -1080,6 +1059,8 @@ export const createBuildSpecifierManager = ({
       };
     },
 
+    getBuildUrl: (urlInfo) => urlInfoToBuildUrlMap.get(urlInfo),
+
     getBuildInfo: () => {
       const buildManifest = {};
       const buildContents = {};

package/src/dev/start_dev_server.js

@@ -2,6 +2,7 @@ import {
   assertAndNormalizeDirectoryUrl,
   bufferToEtag,
   lookupPackageDirectory,
+  readPackageAtOrNull,
 } from "@jsenv/filesystem";
 import { createLogger, createTaskLog } from "@jsenv/humanize";
 import {
@@ -240,10 +241,17 @@ export const startDevServer = async ({
     );
     serverStopCallbackSet.add(stopWatchingSourceFiles);
 
+    const packageDirectory = {
+      url: lookupPackageDirectory(sourceDirectoryUrl),
+      find: lookupPackageDirectory,
+      read: readPackageAtOrNull,
+    };
+
     const devServerPluginStore = createPluginStore([
       jsenvPluginServerEvents({ clientAutoreload }),
       ...plugins,
       ...getCorePlugins({
+        packageDirectory,
         rootDirectoryUrl: sourceDirectoryUrl,
         mainFilePath: sourceMainFilePath,
         runtimeCompat,
@@ -307,6 +315,7 @@ export const startDevServer = async ({
         outDirectoryUrl: outDirectoryUrl
           ? new URL(`${runtimeName}@${runtimeVersion}/`, outDirectoryUrl)
           : undefined,
+        packageDirectory,
       });
       kitchen.graph.urlInfoCreatedEventEmitter.on((urlInfoCreated) => {
         const { watch } = URL_META.applyAssociations({

package/src/kitchen/kitchen.js

@@ -49,6 +49,7 @@ export const createKitchen = ({
   sourcemapsSourcesContent,
   outDirectoryUrl,
   initialContext = {},
+  packageDirectory,
 }) => {
   const logger = createLogger({ logLevel });
 
@@ -63,6 +64,7 @@ export const createKitchen = ({
       logger,
       rootDirectoryUrl,
       mainFilePath,
+      packageDirectory,
       dev,
       build,
       runtimeCompat,
@@ -79,6 +81,8 @@ export const createKitchen = ({
         conditions: packageConditions,
         parentUrl: importer,
         specifier,
+        lookupPackageScope: packageDirectory.find,
+        readPackageJson: packageDirectory.read,
       });
       return { url, packageDirectoryUrl, packageJson };
     },
@@ -99,6 +103,9 @@ export const createKitchen = ({
     rootDirectoryUrl,
     kitchen,
   });
+  graph.urlInfoCreatedEventEmitter.on((urlInfoCreated) => {
+    pluginController.callHooks("urlInfoCreated", urlInfoCreated, () => {});
+  });
   kitchen.graph = graph;
 
   const urlInfoTransformer = createUrlInfoTransformer({
@@ -351,6 +358,7 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
         isEntryPoint,
         isDynamicEntryPoint,
         filenameHint,
+        contentSideEffects,
       } = fetchUrlContentReturnValue;
       if (content === undefined) {
         content = body;
@@ -383,6 +391,9 @@ ${ANSI.color(normalizedReturnValue, ANSI.YELLOW)}
       if (typeof isDynamicEntryPoint === "boolean") {
         urlInfo.isDynamicEntryPoint = isDynamicEntryPoint;
       }
+      if (contentSideEffects) {
+        urlInfo.contentSideEffects = contentSideEffects;
+      }
       assertFetchedContentCompliance({
         urlInfo,
         content,

package/src/kitchen/url_graph/references.js

@@ -7,7 +7,6 @@ import {
   urlToBasename,
   urlToExtension,
 } from "@jsenv/urls";
-
 import { prependContent } from "../prepend_content.js";
 
 let referenceId = 0;
@@ -40,7 +39,14 @@ export const createDependencies = (ownerUrlInfo) => {
       ...props,
     });
     const reference = originalReference.resolve();
-    reference.finalize();
+    if (reference.urlInfo) {
+      return reference;
+    }
+    const kitchen = ownerUrlInfo.kitchen;
+    const urlInfo = kitchen.graph.reuseOrCreateUrlInfo(reference);
+    reference.urlInfo = urlInfo;
+    addDependency(reference);
+    ownerUrlInfo.context.finalizeReference(reference);
     return reference;
   };
 
@@ -356,6 +362,7 @@ const createReference = ({
     implicitReferenceSet: new Set(),
     isWeak,
     hasVersioningEffect,
+    urlInfoEffectSet: new Set(),
     version,
     injected,
     timing: {},
@@ -389,17 +396,6 @@ const createReference = ({
     return referenceRedirected;
   };
 
-  reference.finalize = () => {
-    if (reference.urlInfo) {
-      return;
-    }
-    const kitchen = ownerUrlInfo.kitchen;
-    const urlInfo = kitchen.graph.reuseOrCreateUrlInfo(reference);
-    reference.urlInfo = urlInfo;
-    addDependency(reference);
-    ownerUrlInfo.context.finalizeReference(reference);
-  };
-
   // "formatReference" can be async BUT this is an exception
   // for most cases it will be sync. We want to favor the sync signature to keep things simpler
   // The only case where it needs to be async is when
@@ -762,4 +758,8 @@ const applyReferenceEffectsOnUrlInfo = (reference) => {
   referencedUrlInfo.entryUrlInfo = reference.isEntryPoint
     ? referencedUrlInfo
     : reference.ownerUrlInfo.entryUrlInfo;
+
+  for (const urlInfoEffect of reference.urlInfoEffectSet) {
+    urlInfoEffect(referencedUrlInfo);
+  }
 };

package/src/kitchen/url_graph/url_graph.js

@@ -3,7 +3,6 @@ import {
   injectQueryParamsIntoSpecifier,
   urlToRelativeUrl,
 } from "@jsenv/urls";
-
 import { createEventEmitter } from "../../helpers/event_emitter.js";
 import { createDependencies } from "./references.js";
 import { GRAPH_VISITOR } from "./url_graph_visitor.js";
@@ -213,6 +212,7 @@ const createUrlInfo = (url, context) => {
     contentAst: undefined,
     contentLength: undefined,
     contentFinalized: false,
+    contentSideEffects: [],
 
     sourcemap: null,
     sourcemapIsWrong: false,
@@ -242,6 +242,26 @@ const createUrlInfo = (url, context) => {
   urlInfo.pathname = new URL(url).pathname;
   urlInfo.searchParams = new URL(url).searchParams;
 
+  Object.defineProperty(urlInfo, "packageDirectoryUrl", {
+    enumerable: true,
+    configurable: true,
+    get: () => context.packageDirectory.find(url),
+  });
+  Object.defineProperty(urlInfo, "packageJSON", {
+    enumerable: true,
+    configurable: true,
+    get: () => {
+      const packageDirectoryUrl = context.packageDirectory.find(url);
+      return packageDirectoryUrl
+        ? context.packageDirectory.read(packageDirectoryUrl)
+        : null;
+    },
+  });
+  Object.defineProperty(urlInfo, "packageName", {
+    enumerable: true,
+    configurable: true,
+    get: () => urlInfo.packageJSON?.name,
+  });
   urlInfo.dependencies = createDependencies(urlInfo);
   urlInfo.isUsed = () => {
     if (urlInfo.isRoot) {

package/src/plugins/html_syntax_error_fallback/client/html_syntax_error.html

@@ -9,6 +9,6 @@
   <body>
     <p>Syntax error: <strong>${reasonCode}</strong></p>
     <a jsenv-ignore href="${errorLinkHref}">${errorLinkText}</a>
-    <pre>${syntaxError}</pre>
+    ${syntaxErrorHTML}
   </body>
 </html>

package/src/plugins/html_syntax_error_fallback/jsenv_plugin_html_syntax_error_fallback.js

@@ -1,5 +1,5 @@
 import { parseHtml } from "@jsenv/ast";
-import { generateContentFrame } from "@jsenv/humanize";
+import { errorToHTML, generateContentFrame } from "@jsenv/humanize";
 import { urlToRelativeUrl } from "@jsenv/urls";
 import { readFileSync } from "node:fs";
 import { jsenvCoreDirectoryUrl } from "../../jsenv_core_directory_url.js";
@@ -71,19 +71,11 @@ const generateHtmlForSyntaxError = (
       urlWithLineAndColumn,
     )}')`,
     errorLinkText: `${htmlRelativeUrl}:${line}:${column}`,
-    syntaxError: escapeHtml(htmlErrorContentFrame),
+    syntaxErrorHTML: errorToHTML(htmlErrorContentFrame),
   };
   const html = replacePlaceholders(htmlForSyntaxError, replacers);
   return html;
 };
-const escapeHtml = (string) => {
-  return string
-    .replace(/&/g, "&")
-    .replace(/</g, "&lt;")
-    .replace(/>/g, "&gt;")
-    .replace(/"/g, "&quot;")
-    .replace(/'/g, "&#039;");
-};
 const replacePlaceholders = (html, replacers) => {
   return html.replace(/\$\{(\w+)\}/g, (match, name) => {
     const replacer = replacers[name];