@jsenv/core 40.8.1 → 40.8.3

package/dist/start_dev_server/start_dev_server.js

@@ -5552,11 +5552,13 @@ const createNodeEsmResolver = ({
   runtimeCompat,
   rootDirectoryUrl,
   packageConditions = {},
+  packageConditionsConfig,
   preservesSymlink,
 }) => {
   const buildPackageConditions = createBuildPackageConditions(
     packageConditions,
     {
+      packageConditionsConfig,
       rootDirectoryUrl,
       runtimeCompat,
     },
@@ -5588,26 +5590,43 @@ const createNodeEsmResolver = ({
     const webResolutionFallback =
       ownerUrlInfo.type !== "js_module" ||
       reference.type === "sourcemap_comment";
+
+    const resolveNodeEsmFallbackOnWeb = createResolverWithFallbackOnError(
+      applyNodeEsmResolution,
+      ({ specifier, parentUrl }) => {
+        const url = new URL(specifier, parentUrl).href;
+        return { url };
+      },
+    );
+    const DELEGATE_TO_WEB_RESOLUTION_PLUGIN = {};
+    const resolveNodeEsmFallbackNullToDelegateToWebPlugin =
+      createResolverWithFallbackOnError(
+        applyNodeEsmResolution,
+
+        () => DELEGATE_TO_WEB_RESOLUTION_PLUGIN,
+      );
+
     const conditions = buildPackageConditions(specifier, parentUrl, {
       webResolutionFallback,
+      resolver: webResolutionFallback
+        ? resolveNodeEsmFallbackOnWeb
+        : applyNodeEsmResolution,
     });
-    let resolution;
-    const nodeEsmResolutionParams = {
+    const resolver = webResolutionFallback
+      ? resolveNodeEsmFallbackNullToDelegateToWebPlugin
+      : applyNodeEsmResolution;
+
+    const result = resolver({
       conditions,
       parentUrl,
       specifier,
       preservesSymlink,
-    };
-    if (webResolutionFallback) {
-      try {
-        resolution = applyNodeEsmResolution(nodeEsmResolutionParams);
-      } catch {
-        return null; // delegate to web_resolution plugin
-      }
-    } else {
-      resolution = applyNodeEsmResolution(nodeEsmResolutionParams);
+    });
+    if (result === DELEGATE_TO_WEB_RESOLUTION_PLUGIN) {
+      return null;
     }
-    const { url, type, isMain, packageDirectoryUrl } = resolution;
+
+    const { url, type, isMain, packageDirectoryUrl } = result;
     // try to give a more meaningful filename after build
     if (isMain && packageDirectoryUrl) {
       const basename = urlToBasename(url);
@@ -5671,147 +5690,232 @@ const createNodeEsmResolver = ({
 
 const createBuildPackageConditions = (
   packageConditions,
-  { rootDirectoryUrl, runtimeCompat },
+  { packageConditionsConfig, rootDirectoryUrl, runtimeCompat },
 ) => {
-  const nodeRuntimeEnabled = Object.keys(runtimeCompat).includes("node");
-  // https://nodejs.org/api/esm.html#resolver-algorithm-specification
-  const processArgConditions = readCustomConditionsFromProcessArgs();
-  const devResolver = (specifier, importer, { webResolutionFallback }) => {
-    if (isBareSpecifier(specifier)) {
-      let url;
-      if (webResolutionFallback) {
-        try {
-          const resolution = applyNodeEsmResolution({
-            specifier,
-            parentUrl: importer,
+  let resolveConditionsFromSpecifier = () => null;
+  let resolveConditionsFromContext = () => [];
+  from_specifier: {
+    if (!packageConditionsConfig) {
+      break from_specifier;
+    }
+    const keys = Object.keys(packageConditionsConfig);
+    if (keys.length === 0) {
+      break from_specifier;
+    }
+
+    const associationsRaw = {};
+    for (const key of keys) {
+      const associatedValue = packageConditionsConfig[key];
+
+      if (!isBareSpecifier(key)) {
+        const url = new URL(key, rootDirectoryUrl);
+        associationsRaw[url] = associatedValue;
+        continue;
+      }
+      try {
+        if (key.endsWith("/")) {
+          const { packageDirectoryUrl } = applyNodeEsmResolution({
+            specifier: key.slice(0, -1), // avoid package path not exported
+            parentUrl: rootDirectoryUrl,
           });
-          url = resolution.url;
-        } catch {
-          url = new URL(specifier, importer).href;
+          const url = packageDirectoryUrl;
+          associationsRaw[url] = associatedValue;
+          continue;
         }
+        const { url } = applyNodeEsmResolution({
+          specifier: key,
+          parentUrl: rootDirectoryUrl,
+        });
+        associationsRaw[url] = associatedValue;
+      } catch {
+        const url = new URL(key, rootDirectoryUrl);
+        associationsRaw[url] = associatedValue;
+      }
+    }
+    const associations = URL_META.resolveAssociations(
+      {
+        conditions: associationsRaw,
+      },
+      rootDirectoryUrl,
+    );
+    resolveConditionsFromSpecifier = (specifier, importer, { resolver }) => {
+      let associatedValue;
+      if (isBareSpecifier(specifier)) {
+        const { url } = resolver({
+          specifier,
+          parentUrl: importer,
+        });
+        associatedValue = URL_META.applyAssociations({ url, associations });
       } else {
-        const resolution = applyNodeEsmResolution({
+        associatedValue = URL_META.applyAssociations({
+          url: importer,
+          associations,
+        });
+      }
+      if (!associatedValue) {
+        return undefined;
+      }
+      if (associatedValue.conditions) {
+        return associatedValue.conditions;
+      }
+      return undefined;
+    };
+  }
+  {
+    const nodeRuntimeEnabled = Object.keys(runtimeCompat).includes("node");
+    // https://nodejs.org/api/esm.html#resolver-algorithm-specification
+    const devResolver = (specifier, importer, { resolver }) => {
+      if (isBareSpecifier(specifier)) {
+        const { url } = resolver({
           specifier,
           parentUrl: importer,
         });
-        url = resolution.url;
+        return !url.includes("/node_modules/");
       }
-      return !url.includes("/node_modules/");
-    }
-    return !importer.includes("/node_modules/");
-  };
+      return !importer.includes("/node_modules/");
+    };
 
-  const conditionDefaultResolvers = {
-    "dev:*": devResolver,
-    "development": devResolver,
-    "node": nodeRuntimeEnabled,
-    "browser": !nodeRuntimeEnabled,
-    "import": true,
-  };
-  const conditionResolvers = {
-    ...conditionDefaultResolvers,
-  };
+    const conditionDefaultResolvers = {
+      "dev:*": devResolver,
+      "development": devResolver,
+      "node": nodeRuntimeEnabled,
+      "browser": !nodeRuntimeEnabled,
+      "import": true,
+    };
+    const conditionResolvers = {
+      ...conditionDefaultResolvers,
+    };
 
-  let wildcardToRemoveSet = new Set();
-  const addCustomResolver = (condition, customResolver) => {
-    for (const conditionCandidate of Object.keys(conditionDefaultResolvers)) {
-      if (conditionCandidate.includes("*")) {
-        const conditionRegex = new RegExp(
-          `^${conditionCandidate.replace(/\*/g, "(.*)")}$`,
-        );
-        if (conditionRegex.test(condition)) {
-          const existingResolver =
-            conditionDefaultResolvers[conditionCandidate];
-          wildcardToRemoveSet.add(conditionCandidate);
-          conditionResolvers[condition] = combineTwoPackageConditionResolvers(
-            existingResolver,
-            customResolver,
+    let wildcardToRemoveSet = new Set();
+    const addCustomResolver = (condition, customResolver) => {
+      for (const conditionCandidate of Object.keys(conditionDefaultResolvers)) {
+        if (conditionCandidate.includes("*")) {
+          const conditionRegex = new RegExp(
+            `^${conditionCandidate.replace(/\*/g, "(.*)")}$`,
           );
-          return;
+          if (conditionRegex.test(condition)) {
+            const existingResolver =
+              conditionDefaultResolvers[conditionCandidate];
+            wildcardToRemoveSet.add(conditionCandidate);
+            conditionResolvers[condition] = combineTwoPackageConditionResolvers(
+              existingResolver,
+              customResolver,
+            );
+            return;
+          }
         }
       }
+      const existingResolver = conditionDefaultResolvers[condition];
+      if (existingResolver) {
+        conditionResolvers[condition] = combineTwoPackageConditionResolvers(
+          existingResolver,
+          customResolver,
+        );
+        return;
+      }
+      conditionResolvers[condition] = customResolver;
+    };
+    {
+      const processArgConditions = readCustomConditionsFromProcessArgs();
+      for (const processArgCondition of processArgConditions) {
+        addCustomResolver(processArgCondition, true);
+      }
     }
-    const existingResolver = conditionDefaultResolvers[condition];
-    if (existingResolver) {
-      conditionResolvers[condition] = combineTwoPackageConditionResolvers(
-        existingResolver,
-        customResolver,
-      );
-      return;
-    }
-    conditionResolvers[condition] = customResolver;
-  };
-
-  for (const processArgCondition of processArgConditions) {
-    addCustomResolver(processArgCondition, true);
-  }
-  for (const customCondition of Object.keys(packageConditions)) {
-    const value = packageConditions[customCondition];
-    let customResolver;
-    if (typeof value === "object") {
-      const associations = URL_META.resolveAssociations(
-        { applies: value },
-        (pattern) => {
-          if (isBareSpecifier(pattern)) {
-            try {
-              if (pattern.endsWith("/")) {
-                // avoid package path not exported
-                const { packageDirectoryUrl } = applyNodeEsmResolution({
-                  specifier: pattern.slice(0, -1),
-                  parentUrl: rootDirectoryUrl,
-                });
-                return packageDirectoryUrl;
+    {
+      for (const key of Object.keys(packageConditions)) {
+        const value = packageConditions[key];
+        let customResolver;
+        if (typeof value === "object") {
+          const associations = URL_META.resolveAssociations(
+            { applies: value },
+            (pattern) => {
+              if (isBareSpecifier(pattern)) {
+                try {
+                  if (pattern.endsWith("/")) {
+                    // avoid package path not exported
+                    const { packageDirectoryUrl } = applyNodeEsmResolution({
+                      specifier: pattern.slice(0, -1),
+                      parentUrl: rootDirectoryUrl,
+                    });
+                    return packageDirectoryUrl;
+                  }
+                  const { url } = applyNodeEsmResolution({
+                    specifier: pattern,
+                    parentUrl: rootDirectoryUrl,
+                  });
+                  return url;
+                } catch {
+                  return new URL(pattern, rootDirectoryUrl);
+                }
               }
-              const { url } = applyNodeEsmResolution({
-                specifier: pattern,
-                parentUrl: rootDirectoryUrl,
-              });
-              return url;
-            } catch {
               return new URL(pattern, rootDirectoryUrl);
+            },
+          );
+          customResolver = (specifier, importer, { resolver }) => {
+            if (isBareSpecifier(specifier)) {
+              const { url } = resolver({
+                specifier,
+                parentUrl: importer,
+              });
+              const { applies } = URL_META.applyAssociations({
+                url,
+                associations,
+              });
+              return applies;
             }
-          }
-          return new URL(pattern, rootDirectoryUrl);
-        },
-      );
-      customResolver = (specifier, importer) => {
-        if (isBareSpecifier(specifier)) {
-          const { url } = applyNodeEsmResolution({
-            specifier,
-            parentUrl: importer,
-          });
-          const { applies } = URL_META.applyAssociations({ url, associations });
-          return applies;
+            const { applies } = URL_META.applyAssociations({
+              url: importer,
+              associations,
+            });
+            return applies;
+          };
+        } else if (typeof value === "function") {
+          customResolver = value;
+        } else {
+          customResolver = value;
         }
-        return URL_META.applyAssociations({ url: importer, associations })
-          .applies;
-      };
-    } else if (typeof value === "function") {
-      customResolver = value;
-    } else {
-      customResolver = value;
+        addCustomResolver(key, customResolver);
+      }
+    }
+    for (const wildcardToRemove of wildcardToRemoveSet) {
+      delete conditionResolvers[wildcardToRemove];
     }
-    addCustomResolver(customCondition, customResolver);
-  }
-
-  for (const wildcardToRemove of wildcardToRemoveSet) {
-    delete conditionResolvers[wildcardToRemove];
-  }
 
-  const conditionCandidateArray = Object.keys(conditionResolvers);
-  return (specifier, importer, params) => {
-    const conditions = [];
-    for (const conditionCandidate of conditionCandidateArray) {
-      const conditionResolver = conditionResolvers[conditionCandidate];
-      if (typeof conditionResolver === "function") {
-        if (conditionResolver(specifier, importer, params)) {
+    const conditionCandidateArray = Object.keys(conditionResolvers);
+    resolveConditionsFromContext = (specifier, importer, params) => {
+      const conditions = [];
+      for (const conditionCandidate of conditionCandidateArray) {
+        const conditionResolver = conditionResolvers[conditionCandidate];
+        if (typeof conditionResolver === "function") {
+          if (conditionResolver(specifier, importer, params)) {
+            conditions.push(conditionCandidate);
+          }
+        } else if (conditionResolver) {
           conditions.push(conditionCandidate);
         }
-      } else if (conditionResolver) {
-        conditions.push(conditionCandidate);
       }
+      return conditions;
+    };
+  }
+
+  return (specifier, importer, params) => {
+    const conditionsForThisSpecifier = resolveConditionsFromSpecifier(
+      specifier,
+      importer,
+      params,
+    );
+    if (conditionsForThisSpecifier) {
+      return conditionsForThisSpecifier;
     }
-    return conditions;
+    const conditionsFromContext = resolveConditionsFromContext(
+      specifier,
+      importer,
+      params,
+    );
+    if (conditionsFromContext) {
+      return conditionsFromContext;
+    }
+    return [];
   };
 };
 
@@ -5865,6 +5969,16 @@ const addRelationshipWithPackageJson = ({
   }
 };
 
+const createResolverWithFallbackOnError = (mainResolver, fallbackResolver) => {
+  return (params) => {
+    try {
+      return mainResolver(params);
+    } catch {
+      return fallbackResolver(params);
+    }
+  };
+};
+
 const isBareSpecifier = (specifier) => {
   if (
     specifier[0] === "/" ||
@@ -5885,6 +5999,7 @@ const isBareSpecifier = (specifier) => {
 const jsenvPluginNodeEsmResolution = (
   resolutionConfig = {},
   packageConditions,
+  packageConditionsConfig = {},
 ) => {
   let nodeEsmResolverDefault;
   const resolverMap = new Map();
@@ -5907,6 +6022,10 @@ const jsenvPluginNodeEsmResolution = (
       runtimeCompat: kitchenContext.runtimeCompat,
       rootDirectoryUrl: kitchenContext.rootDirectoryUrl,
       packageConditions,
+      packageConditionsConfig: {
+        ...kitchenContext.packageConditionsConfig,
+        ...packageConditionsConfig,
+      },
       preservesSymlink,
     });
   };
@@ -5921,6 +6040,10 @@ const jsenvPluginNodeEsmResolution = (
         rootDirectoryUrl: kitchenContext.rootDirectoryUrl,
         preservesSymlink: true,
         packageConditions,
+        packageConditionsConfig: {
+          ...kitchenContext.packageConditionsConfig,
+          ...packageConditionsConfig,
+        },
       });
       for (const urlType of Object.keys(resolutionConfig)) {
         let resolver;
@@ -9007,6 +9130,7 @@ const getCorePlugins = ({
   referenceAnalysis = {},
   nodeEsmResolution = {},
   packageConditions,
+  packageConditionsConfig,
   magicExtensions,
   magicDirectoryIndex,
   directoryListing = true,
@@ -9082,7 +9206,13 @@ const getCorePlugins = ({
       },
     },
     ...(nodeEsmResolution
-      ? [jsenvPluginNodeEsmResolution(nodeEsmResolution, packageConditions)]
+      ? [
+          jsenvPluginNodeEsmResolution(
+            nodeEsmResolution,
+            packageConditions,
+            packageConditionsConfig,
+          ),
+        ]
       : []),
     jsenvPluginWebResolution(),
     jsenvPluginDirectoryReferenceEffect(directoryReferenceEffect, {
@@ -9293,6 +9423,8 @@ const startDevServer = async ({
   plugins = [],
   referenceAnalysis = {},
   nodeEsmResolution,
+  packageConditions,
+  packageConditionsConfig,
   supervisor = true,
   magicExtensions,
   magicDirectoryIndex,
@@ -9466,6 +9598,8 @@ const startDevServer = async ({
 
         referenceAnalysis,
         nodeEsmResolution,
+        packageConditions,
+        packageConditionsConfig,
         magicExtensions,
         magicDirectoryIndex,
         directoryListing,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "40.8.1",
+  "version": "40.8.3",
   "description": "Tool to develop, test and build js projects",
   "repository": {
     "type": "git",
@@ -75,14 +75,14 @@
   },
   "dependencies": {
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
-    "@jsenv/ast": "6.7.7",
-    "@jsenv/js-module-fallback": "1.4.19",
-    "@jsenv/plugin-bundling": "2.9.9",
+    "@jsenv/ast": "6.7.8",
+    "@jsenv/js-module-fallback": "1.4.20",
+    "@jsenv/plugin-bundling": "2.9.10",
     "@jsenv/plugin-minification": "1.7.0",
-    "@jsenv/plugin-supervisor": "1.7.4",
-    "@jsenv/plugin-transpilation": "1.5.51",
-    "@jsenv/server": "16.1.2",
-    "@jsenv/sourcemap": "1.3.9",
+    "@jsenv/plugin-supervisor": "1.7.5",
+    "@jsenv/plugin-transpilation": "1.5.52",
+    "@jsenv/server": "16.2.0",
+    "@jsenv/sourcemap": "1.3.10",
     "react-table": "7.8.0"
   },
   "devDependencies": {

package/src/build/build.js

@@ -888,6 +888,7 @@ const entryPointDefaultParams = {
   referenceAnalysis: {},
   nodeEsmResolution: undefined,
   packageConditions: undefined,
+  packageConditionsConfig: undefined,
   magicExtensions: undefined,
   magicDirectoryIndex: undefined,
   directoryReferenceEffect: undefined,
@@ -940,6 +941,7 @@ const prepareEntryPointBuild = async (
     referenceAnalysis,
     nodeEsmResolution,
     packageConditions,
+    packageConditionsConfig,
     magicExtensions,
     magicDirectoryIndex,
     directoryReferenceEffect,
@@ -1091,6 +1093,7 @@ const prepareEntryPointBuild = async (
       referenceAnalysis,
       nodeEsmResolution,
       packageConditions,
+      packageConditionsConfig,
       magicExtensions,
       magicDirectoryIndex,
       directoryReferenceEffect,

package/src/dev/start_dev_server.js

@@ -86,6 +86,8 @@ export const startDevServer = async ({
   plugins = [],
   referenceAnalysis = {},
   nodeEsmResolution,
+  packageConditions,
+  packageConditionsConfig,
   supervisor = true,
   magicExtensions,
   magicDirectoryIndex,
@@ -260,6 +262,8 @@ export const startDevServer = async ({
 
         referenceAnalysis,
         nodeEsmResolution,
+        packageConditions,
+        packageConditionsConfig,
         magicExtensions,
         magicDirectoryIndex,
         directoryListing,

package/src/plugins/plugins.js

@@ -38,6 +38,7 @@ export const getCorePlugins = ({
   referenceAnalysis = {},
   nodeEsmResolution = {},
   packageConditions,
+  packageConditionsConfig,
   magicExtensions,
   magicDirectoryIndex,
   directoryListing = true,
@@ -113,7 +114,13 @@ export const getCorePlugins = ({
       },
     },
     ...(nodeEsmResolution
-      ? [jsenvPluginNodeEsmResolution(nodeEsmResolution, packageConditions)]
+      ? [
+          jsenvPluginNodeEsmResolution(
+            nodeEsmResolution,
+            packageConditions,
+            packageConditionsConfig,
+          ),
+        ]
       : []),
     jsenvPluginWebResolution(),
     jsenvPluginDirectoryReferenceEffect(directoryReferenceEffect, {

package/src/plugins/resolution_node_esm/jsenv_plugin_node_esm_resolution.js

@@ -3,6 +3,7 @@ import { createNodeEsmResolver } from "./node_esm_resolver.js";
 export const jsenvPluginNodeEsmResolution = (
   resolutionConfig = {},
   packageConditions,
+  packageConditionsConfig = {},
 ) => {
   let nodeEsmResolverDefault;
   const resolverMap = new Map();
@@ -25,6 +26,10 @@ export const jsenvPluginNodeEsmResolution = (
       runtimeCompat: kitchenContext.runtimeCompat,
       rootDirectoryUrl: kitchenContext.rootDirectoryUrl,
       packageConditions,
+      packageConditionsConfig: {
+        ...kitchenContext.packageConditionsConfig,
+        ...packageConditionsConfig,
+      },
       preservesSymlink,
     });
   };
@@ -39,6 +44,10 @@ export const jsenvPluginNodeEsmResolution = (
         rootDirectoryUrl: kitchenContext.rootDirectoryUrl,
         preservesSymlink: true,
         packageConditions,
+        packageConditionsConfig: {
+          ...kitchenContext.packageConditionsConfig,
+          ...packageConditionsConfig,
+        },
       });
       for (const urlType of Object.keys(resolutionConfig)) {
         let resolver;