@jsenv/core 40.0.7 → 40.0.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "40.0.7",
+  "version": "40.0.9",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -78,22 +78,22 @@
   "dependencies": {
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
     "@jsenv/abort": "4.3.1",
-    "@jsenv/ast": "6.6.5",
-    "@jsenv/filesystem": "4.14.3",
+    "@jsenv/ast": "6.6.6",
+    "@jsenv/filesystem": "4.14.5",
     "@jsenv/humanize": "1.3.1",
     "@jsenv/importmap": "1.2.2",
     "@jsenv/integrity": "0.0.2",
-    "@jsenv/js-module-fallback": "1.4.3",
+    "@jsenv/js-module-fallback": "1.4.4",
     "@jsenv/node-esm-resolution": "1.1.0",
-    "@jsenv/plugin-bundling": "2.8.4",
+    "@jsenv/plugin-bundling": "2.8.6",
     "@jsenv/plugin-minification": "1.6.2",
-    "@jsenv/plugin-supervisor": "1.6.10",
-    "@jsenv/plugin-transpilation": "1.5.6",
+    "@jsenv/plugin-supervisor": "1.6.11",
+    "@jsenv/plugin-transpilation": "1.5.7",
     "@jsenv/runtime-compat": "1.3.4",
-    "@jsenv/server": "16.0.4",
-    "@jsenv/sourcemap": "1.3.2",
-    "@jsenv/url-meta": "8.5.5",
-    "@jsenv/urls": "2.6.3",
+    "@jsenv/server": "16.0.5",
+    "@jsenv/sourcemap": "1.3.3",
+    "@jsenv/url-meta": "8.5.6",
+    "@jsenv/urls": "2.7.0",
     "@jsenv/utils": "2.2.1",
     "string-width": "7.2.0"
   },

package/src/build/build.js

@@ -50,6 +50,7 @@ import {
 } from "./build_params.js";
 import { createBuildSpecifierManager } from "./build_specifier_manager.js";
 import { jsenvPluginLineBreakNormalization } from "./jsenv_plugin_line_break_normalization.js";
+import { jsenvPluginMappings } from "./jsenv_plugin_mappings.js";
 import { jsenvPluginSubbuilds } from "./jsenv_plugin_subbuilds.js";
 
 /**
@@ -99,6 +100,7 @@ export const build = async ({
   base = getDefaultBase(runtimeCompat),
   ignore,
 
+  mappings,
   subbuilds = [],
   plugins = [],
   referenceAnalysis = {},
@@ -179,7 +181,7 @@ export const build = async ({
           outDirectoryUrl = `${packageDirectoryUrl}.jsenv/`;
         }
       }
-    } else if (outDirectoryUrl !== null && outDirectoryUrl !== false) {
+    } else if (outDirectoryUrl) {
       outDirectoryUrl = assertAndNormalizeDirectoryUrl(
         outDirectoryUrl,
         "outDirectoryUrl",
@@ -298,6 +300,7 @@ build ${entryPointKeys.length} entry points`);
     let subbuildResults = [];
 
     const rawPluginStore = createPluginStore([
+      ...(mappings ? [jsenvPluginMappings(mappings)] : []),
       ...jsenvPluginSubbuilds(subbuilds, {
         parentBuildParams: {
           sourceDirectoryUrl,
@@ -307,6 +310,7 @@ build ${entryPointKeys.length} entry points`);
           minification,
           versioning,
           versioningMethod,
+          outDirectoryUrl,
         },
         onCustomBuildDirectory: (subBuildRelativeUrl) => {
           buildDirectoryCleanPatterns = {
@@ -528,30 +532,27 @@ build ${entryPointKeys.length} entry points`);
               }
               const referencedUrlInfo = referenceToOther.urlInfo;
               if (referencedUrlInfo.isInline) {
-                if (referencedUrlInfo.type === "js_module") {
-                  // bundle inline script type module deps
-                  referencedUrlInfo.referenceToOthersSet.forEach(
-                    (jsModuleReferenceToOther) => {
-                      if (jsModuleReferenceToOther.type === "js_import") {
-                        const inlineUrlInfo = jsModuleReferenceToOther.urlInfo;
-                        addToBundlerIfAny(inlineUrlInfo);
-                      }
-                    },
-                  );
+                if (referencedUrlInfo.type !== "js_module") {
+                  continue;
                 }
-                // inline content cannot be bundled
+                addToBundlerIfAny(referencedUrlInfo);
                 continue;
               }
               addToBundlerIfAny(referencedUrlInfo);
             }
             return;
           }
-          // File referenced with new URL('./file.js', import.meta.url)
+          // File referenced with
+          // - new URL("./file.js", import.meta.url)
+          // - import.meta.resolve("./file.js")
           // are entry points that should be bundled
           // For instance we will bundle service worker/workers detected like this
           if (rawUrlInfo.type === "js_module") {
             for (const referenceToOther of rawUrlInfo.referenceToOthersSet) {
-              if (referenceToOther.type === "js_url") {
+              if (
+                referenceToOther.type === "js_url" ||
+                referenceToOther.subtype === "import_meta_resolve"
+              ) {
                 const referencedUrlInfo = referenceToOther.urlInfo;
                 let isAlreadyBundled = false;
                 for (const referenceFromOther of referencedUrlInfo.referenceFromOthersSet) {

package/src/build/build_specifier_manager.js

@@ -238,6 +238,7 @@ export const createBuildSpecifierManager = ({
         js_classic: undefined, // TODO: add comment to explain who is using this
         entry_point: undefined,
         dynamic_import: undefined,
+        dynamic_import_id: undefined,
       };
     },
     formatReference: (reference) => {
@@ -276,6 +277,9 @@ export const createBuildSpecifierManager = ({
       const bundleInfo = bundleInfoMap.get(rawUrl);
       if (bundleInfo) {
         finalUrlInfo.remapReference = bundleInfo.remapReference;
+        if (!finalUrlInfo.filenameHint && bundleInfo.data.bundleRelativeUrl) {
+          finalUrlInfo.filenameHint = bundleInfo.data.bundleRelativeUrl;
+        }
         return {
           // url: bundleInfo.url,
           originalUrl: bundleInfo.originalUrl,

package/src/build/build_urls_generator.js

@@ -131,6 +131,10 @@ const determineDirectoryPath = ({
     });
     return parentDirectoryPath;
   }
+  const dynamicImportId = urlInfo.searchParams.get("dynamic_import_id");
+  if (dynamicImportId) {
+    return `${assetsDirectory}${dynamicImportId}/`;
+  }
   if (urlInfo.isEntryPoint && !urlInfo.isDynamicEntryPoint) {
     return "";
   }

package/src/build/jsenv_plugin_mappings.js

@@ -0,0 +1,69 @@
+import { URL_META } from "@jsenv/url-meta";
+
+export const jsenvPluginMappings = (mappings) => {
+  if (!mappings || Object.keys(mappings).length === 0) {
+    return [];
+  }
+
+  const mappingResolvedMap = new Map();
+  return {
+    name: "jsenv:mappings",
+    appliesDuring: "build",
+    init: (context) => {
+      const kitchen = context.kitchen;
+      const sourceDirectoryUrl = context.rootDirectoryUrl;
+      for (const key of Object.keys(mappings)) {
+        const value = mappings[key];
+        const keyResolved = kitchen.resolve(key, sourceDirectoryUrl);
+        const valueResolved = kitchen.resolve(value, sourceDirectoryUrl);
+        mappingResolvedMap.set(keyResolved.url, valueResolved.url);
+      }
+    },
+    redirectReference: (reference) => {
+      for (const [key, value] of mappingResolvedMap) {
+        const matchResult = URL_META.applyPatternMatching({
+          pattern: key,
+          url: reference.url,
+        });
+        if (!matchResult.matched) {
+          continue;
+        }
+        if (!value.includes("*")) {
+          return value;
+        }
+        const { matchGroups } = matchResult;
+        const parts = value.split("*");
+        let newUrl = "";
+        let index = 0;
+        for (const part of parts) {
+          newUrl += `${part}`;
+          if (index < parts.length - 1) {
+            newUrl += matchGroups[index];
+          }
+          index++;
+        }
+        return newUrl;
+      }
+      return null;
+    },
+  };
+};
+
+// import { applyNodeEsmResolution } from "@jsenv/node-esm-resolution";
+// const plugin = jsenvPluginMappings({
+//   "emoji-regex/index.js": "emoji-regex/index.mjs",
+// });
+// plugin.init({
+//   rootDirectoryUrl: import.meta.resolve("./"),
+//   kitchen: {
+//     resolve: (specifier, importer) => {
+//       return applyNodeEsmResolution({
+//         parentUrl: importer,
+//         specifier,
+//       });
+//     },
+//   },
+// });
+// plugin.redirectReference({
+//   url: import.meta.resolve("emoji-regex/index.js"),
+// });

package/src/build/jsenv_plugin_subbuilds.js

@@ -18,6 +18,10 @@ export const jsenvPluginSubbuilds = (
       },
       ...defaultChildBuildParams,
       ...subBuildParams,
+      outDirectoryUrl: new URL(
+        `./subbuild_${index}/`,
+        parentBuildParams.outDirectoryUrl,
+      ),
     };
     const subBuildDirectoryUrl = subBuildParams.buildDirectoryUrl;
     if (subBuildDirectoryUrl) {

package/src/kitchen/kitchen.js

@@ -1,4 +1,5 @@
 import { ANSI, createDetailedMessage, createLogger } from "@jsenv/humanize";
+import { applyNodeEsmResolution } from "@jsenv/node-esm-resolution";
 import { RUNTIME_COMPAT } from "@jsenv/runtime-compat";
 import { URL_META } from "@jsenv/url-meta";
 import { normalizeUrl } from "@jsenv/urls";
@@ -51,6 +52,9 @@ export const createKitchen = ({
 }) => {
   const logger = createLogger({ logLevel });
 
+  const nodeRuntimeEnabled = Object.keys(runtimeCompat).includes("node");
+  const packageConditions = [nodeRuntimeEnabled ? "node" : "browser", "import"];
+
   const kitchen = {
     context: {
       ...initialContext,
@@ -70,6 +74,14 @@ export const createKitchen = ({
       sourcemaps,
       outDirectoryUrl,
     },
+    resolve: (specifier, importer) => {
+      const { url, packageDirectoryUrl, packageJson } = applyNodeEsmResolution({
+        conditions: packageConditions,
+        parentUrl: importer,
+        specifier,
+      });
+      return { url, packageDirectoryUrl, packageJson };
+    },
     graph: null,
     urlInfoTransformer: null,
     pluginController: null,

package/src/kitchen/out_directory_url.js

@@ -40,6 +40,7 @@ export const determineSourcemapFileUrl = (urlInfo) => {
   generatedUrlObject.searchParams.delete("as_json_module");
   generatedUrlObject.searchParams.delete("as_text_module");
   generatedUrlObject.searchParams.delete("dynamic_import");
+  generatedUrlObject.searchParams.delete("dynamic_import_id");
   generatedUrlObject.searchParams.delete("cjs_as_js_module");
   const urlForSourcemap = generatedUrlObject.href;
   return generateSourcemapFileUrl(urlForSourcemap);

package/src/plugins/protocol_http/jsenv_plugin_protocol_http.js

@@ -36,6 +36,12 @@ export const jsenvPluginProtocolHttp = ({ include }) => {
     //   }
     //   return null;
     // },
+    init: (context) => {
+      const outDirectoryUrl = context.outDirectoryUrl;
+      if (!outDirectoryUrl) {
+        throw new Error(`need outDirectoryUrl to write http files`);
+      }
+    },
     redirectReference: (reference) => {
       if (!reference.url.startsWith("http")) {
         return null;

package/src/plugins/reference_analysis/html/jsenv_plugin_html_reference_analysis.js

@@ -315,7 +315,12 @@ export const jsenvPluginHtmlReferenceAnalysis = ({
                   });
                 } else {
                   setHtmlNodeText(node, inlineUrlInfo.content, {
-                    indentation: false, // indentation would decrease stack trace precision
+                    indentation:
+                      inlineUrlInfo.type === "js_classic" ||
+                      inlineUrlInfo.type === "js_module"
+                        ? // indentation would mess with stack trace and sourcemap
+                          false
+                        : "auto",
                   });
                   setHtmlNodeAttributes(node, {
                     "jsenv-cooked-by": "jsenv:html_inline_content_analysis",