@jsenv/core 40.0.8 → 40.0.10

package/dist/start_build_server/start_build_server.js

@@ -1,15 +1,15 @@
 import { assertAndNormalizeDirectoryUrl$2 as assertAndNormalizeDirectoryUrl, createLogger$2 as createLogger, Abort$1 as Abort, raceProcessTeardownEvents$1 as raceProcessTeardownEvents, createTaskLog$2 as createTaskLog, urlToExtension$2 as urlToExtension, urlToPathname$2 as urlToPathname } from "../jsenv_core_packages.js";
 import { startServer, jsenvServiceCORS, jsenvServiceErrorHandler, jsenvAccessControlAllowedHeaders, createFileSystemFetch } from "@jsenv/server";
 import { existsSync } from "node:fs";
+import "string-width";
 import "node:process";
 import "node:os";
 import "node:tty";
-import "string-width";
 import "node:path";
 import "node:crypto";
+import "node:url";
 import "@jsenv/ast";
 import "@jsenv/sourcemap";
-import "node:url";
 import "node:module";
 import "@jsenv/js-module-fallback";
 

package/dist/start_dev_server/start_dev_server.js

@@ -1,4 +1,4 @@
-import { lookupPackageDirectory, registerDirectoryLifecycle, urlToRelativeUrl, moveUrl, urlIsInsideOf, ensureWindowsDriveLetter, createDetailedMessage, stringifyUrlSite, generateContentFrame, validateResponseIntegrity, setUrlFilename, getCallerPosition, urlToBasename, urlToExtension, asSpecifierWithoutSearch, asUrlWithoutSearch, injectQueryParamsIntoSpecifier, bufferToEtag, isFileSystemPath, urlToPathname, setUrlBasename, urlToFileSystemPath, writeFileSync, createLogger, URL_META, normalizeUrl, ANSI, CONTENT_TYPE, DATA_URL, normalizeImportMap, composeTwoImportMaps, resolveImport, JS_QUOTES, readCustomConditionsFromProcessArgs, applyNodeEsmResolution, defaultLookupPackageScope, defaultReadPackageJson, readEntryStatSync, urlToFilename, ensurePathnameTrailingSlash, comparePathnames, applyFileSystemMagicResolution, getExtensionsToTry, setUrlExtension, jsenvPluginTranspilation, memoizeByFirstArgument, assertAndNormalizeDirectoryUrl, createTaskLog } from "../jsenv_core_packages.js";
+import { lookupPackageDirectory, registerDirectoryLifecycle, urlToRelativeUrl, moveUrl, urlIsInsideOf, ensureWindowsDriveLetter, createDetailedMessage, stringifyUrlSite, generateContentFrame, validateResponseIntegrity, setUrlFilename, getCallerPosition, urlToBasename, urlToExtension, asSpecifierWithoutSearch, asUrlWithoutSearch, injectQueryParamsIntoSpecifier, bufferToEtag, isFileSystemPath, urlToPathname, setUrlBasename, urlToFileSystemPath, writeFileSync, createLogger, URL_META, applyNodeEsmResolution, normalizeUrl, ANSI, CONTENT_TYPE, DATA_URL, normalizeImportMap, composeTwoImportMaps, resolveImport, JS_QUOTES, readCustomConditionsFromProcessArgs, defaultLookupPackageScope, defaultReadPackageJson, readEntryStatSync, urlToFilename, ensurePathnameTrailingSlash, comparePathnames, applyFileSystemMagicResolution, getExtensionsToTry, setUrlExtension, jsenvPluginTranspilation, memoizeByFirstArgument, assertAndNormalizeDirectoryUrl, createTaskLog } from "../jsenv_core_packages.js";
 import { WebSocketResponse, pickContentType, ServerEvents, jsenvServiceCORS, jsenvAccessControlAllowedHeaders, composeTwoResponses, serveDirectory, jsenvServiceErrorHandler, startServer } from "@jsenv/server";
 import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/internal/convertFileSystemErrorToResponseProperties.js";
 import { readFileSync, existsSync, readdirSync, lstatSync, realpathSync } from "node:fs";
@@ -9,10 +9,10 @@ import { parseHtml, injectHtmlNodeAsEarlyAsPossible, createHtmlNode, stringifyHt
 import { performance } from "node:perf_hooks";
 import { jsenvPluginSupervisor } from "@jsenv/plugin-supervisor";
 import { createRequire } from "node:module";
+import "string-width";
 import "node:process";
 import "node:os";
 import "node:tty";
-import "string-width";
 import "node:path";
 import "node:crypto";
 import "@jsenv/js-module-fallback";
@@ -2696,6 +2696,9 @@ const createKitchen = ({
 }) => {
   const logger = createLogger({ logLevel });
 
+  const nodeRuntimeEnabled = Object.keys(runtimeCompat).includes("node");
+  const packageConditions = [nodeRuntimeEnabled ? "node" : "browser", "import"];
+
   const kitchen = {
     context: {
       ...initialContext,
@@ -2715,6 +2718,14 @@ 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "40.0.8",
+  "version": "40.0.10",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -79,20 +79,20 @@
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
     "@jsenv/abort": "4.3.1",
     "@jsenv/ast": "6.6.6",
-    "@jsenv/filesystem": "4.14.4",
+    "@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.4",
     "@jsenv/node-esm-resolution": "1.1.0",
-    "@jsenv/plugin-bundling": "2.8.5",
+    "@jsenv/plugin-bundling": "2.8.6",
     "@jsenv/plugin-minification": "1.6.2",
     "@jsenv/plugin-supervisor": "1.6.11",
     "@jsenv/plugin-transpilation": "1.5.7",
     "@jsenv/runtime-compat": "1.3.4",
-    "@jsenv/server": "16.0.4",
+    "@jsenv/server": "16.0.5",
     "@jsenv/sourcemap": "1.3.3",
-    "@jsenv/url-meta": "8.5.5",
+    "@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 = {},
@@ -298,6 +300,7 @@ build ${entryPointKeys.length} entry points`);
     let subbuildResults = [];
 
     const rawPluginStore = createPluginStore([
+      ...(mappings ? [jsenvPluginMappings(mappings)] : []),
       ...jsenvPluginSubbuilds(subbuilds, {
         parentBuildParams: {
           sourceDirectoryUrl,
@@ -308,6 +311,7 @@ build ${entryPointKeys.length} entry points`);
           versioning,
           versioningMethod,
           outDirectoryUrl,
+          base,
         },
         onCustomBuildDirectory: (subBuildRelativeUrl) => {
           buildDirectoryCleanPatterns = {

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

@@ -29,11 +29,13 @@ export const jsenvPluginSubbuilds = (
         subBuildDirectoryUrl,
         parentBuildParams.buildDirectoryUrl,
       );
-      const subbuildRuntimeCompat =
-        childBuildParams.runtimeCompat || defaultRuntimeCompat;
-      const subbuildBase =
-        subBuildParams.base || getDefaultBase(subbuildRuntimeCompat);
-      childBuildParams.base = `${subbuildBase}${subBuildRelativeUrl}`;
+      childBuildParams.base =
+        parentBuildParams.base === "./"
+          ? `./`
+          : subBuildParams.base ||
+            getDefaultBase(
+              childBuildParams.runtimeCompat || defaultRuntimeCompat,
+            );
       onCustomBuildDirectory(subBuildRelativeUrl);
     }
     const buildPromise = buildStart(childBuildParams, index);

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,