@jsenv/core 40.3.3 → 40.5.0

package/dist/start_dev_server/start_dev_server.js

@@ -1,6 +1,6 @@
 import { WebSocketResponse, pickContentType, ServerEvents, jsenvServiceCORS, jsenvAccessControlAllowedHeaders, composeTwoResponses, serveDirectory, jsenvServiceErrorHandler, startServer } from "@jsenv/server";
 import { convertFileSystemErrorToResponseProperties } from "@jsenv/server/src/internal/convertFileSystemErrorToResponseProperties.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, RUNTIME_COMPAT, normalizeUrl, ANSI, CONTENT_TYPE, errorToHTML, DATA_URL, normalizeImportMap, composeTwoImportMaps, resolveImport, JS_QUOTES, defaultLookupPackageScope, defaultReadPackageJson, readCustomConditionsFromProcessArgs, readEntryStatSync, urlToFilename, ensurePathnameTrailingSlash, compareFileUrls, applyFileSystemMagicResolution, getExtensionsToTry, setUrlExtension, isSpecifierForNodeBuiltin, memoizeByFirstArgument, assertAndNormalizeDirectoryUrl, createTaskLog, readPackageAtOrNull } 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, RUNTIME_COMPAT, normalizeUrl, ANSI, CONTENT_TYPE, errorToHTML, DATA_URL, normalizeImportMap, composeTwoImportMaps, resolveImport, JS_QUOTES, defaultLookupPackageScope, defaultReadPackageJson, readCustomConditionsFromProcessArgs, readEntryStatSync, urlToFilename, ensurePathnameTrailingSlash, compareFileUrls, applyFileSystemMagicResolution, getExtensionsToTry, setUrlExtension, isSpecifierForNodeBuiltin, memoizeByFirstArgument, assertAndNormalizeDirectoryUrl, createTaskLog, readPackageAtOrNull } from "./jsenv_core_packages.js";
 import { readFileSync, existsSync, readdirSync, lstatSync, realpathSync } from "node:fs";
 import { pathToFileURL } from "node:url";
 import { generateSourcemapFileUrl, createMagicSource, composeTwoSourcemaps, generateSourcemapDataUrl, SOURCEMAP } from "@jsenv/sourcemap";
@@ -10,7 +10,7 @@ import { jsenvPluginSupervisor } from "@jsenv/plugin-supervisor";
 import { jsenvPluginTranspilation } from "@jsenv/plugin-transpilation";
 import { randomUUID } from "node:crypto";
 import { createRequire } from "node:module";
-import "../jsenv_core_node_modules.js";
+import "./jsenv_core_node_modules.js";
 import "node:process";
 import "node:os";
 import "node:tty";
@@ -5374,28 +5374,63 @@ const createBuildPackageConditions = (
   const nodeRuntimeEnabled = Object.keys(runtimeCompat).includes("node");
   // https://nodejs.org/api/esm.html#resolver-algorithm-specification
   const processArgConditions = readCustomConditionsFromProcessArgs();
-  const packageConditionsDefaultResolvers = {};
-  for (const processArgCondition of processArgConditions) {
-    packageConditionsDefaultResolvers[processArgCondition] = true;
-  }
-  const packageConditionResolvers = {
-    ...packageConditionsDefaultResolvers,
-    development: (specifier, importer) => {
-      if (isBareSpecifier(specifier)) {
-        const { url } = applyNodeEsmResolution({
-          specifier,
-          parentUrl: importer,
-        });
-        return !url.includes("/node_modules/");
+  const devResolver = (specifier, importer) => {
+    if (isBareSpecifier(specifier)) {
+      const { url } = applyNodeEsmResolution({
+        specifier,
+        parentUrl: importer,
+      });
+      return !url.includes("/node_modules/");
+    }
+    return !importer.includes("/node_modules/");
+  };
+
+  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,
+          );
+          return;
+        }
       }
-      return !importer.includes("/node_modules/");
-    },
-    node: nodeRuntimeEnabled,
-    browser: !nodeRuntimeEnabled,
-    import: true,
+    }
+    const existingResolver = conditionDefaultResolvers[condition];
+    if (existingResolver) {
+      conditionResolvers[condition] = combineTwoPackageConditionResolvers(
+        existingResolver,
+        customResolver,
+      );
+      return;
+    }
+    conditionResolvers[condition] = customResolver;
   };
-  for (const condition of Object.keys(packageConditions)) {
-    const value = packageConditions[condition];
+
+  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(
@@ -5438,29 +5473,25 @@ const createBuildPackageConditions = (
     } else if (typeof value === "function") {
       customResolver = value;
     } else {
-      customResolver = () => value;
-    }
-    const existing = packageConditionResolvers[condition];
-    if (existing) {
-      packageConditionResolvers[condition] = (...args) => {
-        const customResult = customResolver(...args);
-        return customResult === undefined ? existing(...args) : customResult;
-      };
-    } else {
-      packageConditionResolvers[condition] = customResolver;
+      customResolver = value;
     }
+    addCustomResolver(customCondition, customResolver);
   }
 
+  for (const wildcardToRemove of wildcardToRemoveSet) {
+    delete conditionResolvers[wildcardToRemove];
+  }
+
+  const conditionCandidateArray = Object.keys(conditionResolvers);
   return (specifier, importer) => {
     const conditions = [];
-    for (const conditionCandidate of Object.keys(packageConditionResolvers)) {
-      const packageConditionResolver =
-        packageConditionResolvers[conditionCandidate];
-      if (typeof packageConditionResolver === "function") {
-        if (packageConditionResolver(specifier, importer)) {
+    for (const conditionCandidate of conditionCandidateArray) {
+      const conditionResolver = conditionResolvers[conditionCandidate];
+      if (typeof conditionResolver === "function") {
+        if (conditionResolver(specifier, importer)) {
           conditions.push(conditionCandidate);
         }
-      } else if (packageConditionResolver) {
+      } else if (conditionResolver) {
         conditions.push(conditionCandidate);
       }
     }
@@ -5468,6 +5499,22 @@ const createBuildPackageConditions = (
   };
 };
 
+const combineTwoPackageConditionResolvers = (first, second) => {
+  if (typeof second !== "function") {
+    return second;
+  }
+  return (...args) => {
+    const secondResult = second(...args);
+    if (secondResult !== undefined) {
+      return secondResult;
+    }
+    if (typeof first === "function") {
+      return first(...args);
+    }
+    return first;
+  };
+};
+
 const addRelationshipWithPackageJson = ({
   reference,
   packageJsonUrl,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/core",
-  "version": "40.3.3",
+  "version": "40.5.0",
   "description": "Tool to develop, test and build js projects",
   "license": "MIT",
   "author": {
@@ -22,7 +22,7 @@
   "exports": {
     ".": {
       "import": {
-        "development": "./src/main.js",
+        "dev:jsenv": "./src/main.js",
         "default": "./dist/jsenv_core.js"
       }
     },
@@ -51,14 +51,13 @@
     "./src/kitchen/client/inline_content.js",
     "./dist/client/new_stylesheet/new_stylesheet.js",
     "./dist/client/inline_content/inline_content.js",
-    "./dist/client/directory_listing/jsenv_core_node_modules.js",
-    "./dist/jsenv_core_node_modules.js"
+    "./dist/client/directory_listing/jsenv_core_node_modules.js"
   ],
   "scripts": {
     "eslint": "npx eslint .",
-    "test": "node --conditions=development ./scripts/test/test.mjs",
+    "test": "node --conditions=dev:jsenv ./scripts/test/test.mjs",
     "test:packages": "npm run test -- ./packages/",
-    "build": "node --conditions=development ./scripts/build/build.mjs",
+    "build": "node --conditions=dev:jsenv ./scripts/build/build.mjs",
     "build:packages": "npm run build --workspaces --if-present --conditions=developement",
     "monorepo:sync_packages_versions": "node ./scripts/monorepo/sync_packages_versions.mjs",
     "monorepo:publish": "node ./scripts/monorepo/publish_packages.mjs",
@@ -71,23 +70,23 @@
     "test:snapshot_clear": "npx @jsenv/filesystem clear **/tests/**/side_effects/",
     "test:ci": "CI=1 npm run test",
     "test:packages:ci": "CI=1 npm run workspace:test",
-    "test:only_dev_server_errors": "node --conditions=development ./tests/dev_server/errors/dev_errors_snapshots.test.mjs",
-    "dev": "node --watch --conditions=development ./scripts/dev/dev.mjs",
-    "dev:route-inspector": "node --watch --conditions=development ./packages/independent/backend/server/tests/route_inspector/start_server.js",
+    "test:only_dev_server_errors": "node --conditions=dev:jsenv ./tests/dev_server/errors/dev_errors_snapshots.test.mjs",
+    "dev": "node --watch --conditions=dev:jsenv ./scripts/dev/dev.mjs",
+    "dev:route-inspector": "node --watch --conditions=dev:jsenv ./packages/independent/backend/server/tests/route_inspector/start_server.js",
     "playwright:install": "npx playwright install-deps && npx playwright install",
     "https:setup": "npx @jsenv/https-local setup",
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
     "@financial-times/polyfill-useragent-normaliser": "1.10.2",
-    "@jsenv/ast": "6.6.10",
-    "@jsenv/js-module-fallback": "1.4.8",
-    "@jsenv/plugin-bundling": "2.9.4",
+    "@jsenv/ast": "6.6.11",
+    "@jsenv/js-module-fallback": "1.4.9",
+    "@jsenv/plugin-bundling": "2.9.5",
     "@jsenv/plugin-minification": "1.6.3",
-    "@jsenv/plugin-supervisor": "1.6.14",
-    "@jsenv/plugin-transpilation": "1.5.15",
-    "@jsenv/sourcemap": "1.3.6",
-    "@jsenv/server": "16.1.1"
+    "@jsenv/plugin-supervisor": "1.6.15",
+    "@jsenv/plugin-transpilation": "1.5.16",
+    "@jsenv/sourcemap": "1.3.7",
+    "@jsenv/server": "16.1.2"
   },
   "devDependencies": {
     "@babel/plugin-syntax-decorators": "7.25.9",
@@ -129,4 +128,4 @@
     "prettier-plugin-organize-imports": "4.1.0",
     "strip-ansi": "7.1.0"
   }
-}
+}

package/src/build/build.js

@@ -55,6 +55,7 @@ import {
   urlIsInsideOf,
   urlToBasename,
   urlToExtension,
+  urlToFilename,
   urlToRelativeUrl,
 } from "@jsenv/urls";
 import { memoryUsage as processMemoryUsage } from "node:process";
@@ -170,7 +171,12 @@ export const build = async ({
         let runtimeType;
         {
           if (isBareSpecifier(key)) {
-            const packageConditions = ["development", "node", "import"];
+            const packageConditions = [
+              "development",
+              "dev:*",
+              "node",
+              "import",
+            ];
             try {
               const { url, type } = applyNodeEsmResolution({
                 conditions: packageConditions,
@@ -347,7 +353,42 @@ export const build = async ({
     { sourceUrlToLog, buildUrlToLog },
   ) => {
     let content = "";
-    content += `${UNICODE.OK} ${ANSI.color(sourceUrlToLog, ANSI.GREY)} ${ANSI.color("->", ANSI.GREY)} ${ANSI.color(buildUrlToLog, "")}`;
+
+    const applyColorOnFileRelativeUrl = (fileRelativeUrl, color) => {
+      const fileUrl = new URL(fileRelativeUrl, rootPackageDirectoryUrl);
+      const packageDirectoryUrl = lookupPackageDirectory(fileUrl);
+      if (
+        !packageDirectoryUrl ||
+        packageDirectoryUrl === rootPackageDirectoryUrl
+      ) {
+        return ANSI.color(fileRelativeUrl, color);
+      }
+      const parentDirectoryUrl = new URL("../", packageDirectoryUrl).href;
+      const beforePackageDirectoryName = urlToRelativeUrl(
+        parentDirectoryUrl,
+        rootPackageDirectoryUrl,
+      );
+      const packageDirectoryName = urlToFilename(packageDirectoryUrl);
+      const afterPackageDirectoryUrl = urlToRelativeUrl(
+        fileUrl,
+        packageDirectoryUrl,
+      );
+      const beforePackageNameStylized = ANSI.color(
+        beforePackageDirectoryName,
+        color,
+      );
+      const packageNameStylized = ANSI.color(
+        ANSI.effect(packageDirectoryName, ANSI.UNDERLINE),
+        color,
+      );
+      const afterPackageNameStylized = ANSI.color(
+        `/${afterPackageDirectoryUrl}`,
+        color,
+      );
+      return `${beforePackageNameStylized}${packageNameStylized}${afterPackageNameStylized}`;
+    };
+
+    content += `${UNICODE.OK} ${applyColorOnFileRelativeUrl(sourceUrlToLog, ANSI.GREY)} ${ANSI.color("->", ANSI.GREY)} ${applyColorOnFileRelativeUrl(buildUrlToLog, "")}`;
     // content += " ";
     // content += ANSI.color("(", ANSI.GREY);
     // content += ANSI.color(

package/src/build/build_specifier_manager.js

@@ -62,7 +62,6 @@ export const createBuildSpecifierManager = ({
       buildUrl = generateSourcemapFileUrl(parentBuildUrl);
       reference.generatedSpecifier = buildUrl;
     } else {
-      const url = reference.generatedUrl;
       const rawUrlInfo = rawKitchen.graph.getUrlInfo(reference.url);
       let urlInfo;
       if (rawUrlInfo) {
@@ -72,6 +71,7 @@ export const createBuildSpecifierManager = ({
         buildUrlInfo.subtype = reference.expectedSubtype;
         urlInfo = buildUrlInfo;
       }
+      const url = reference.generatedUrl;
       buildUrl = buildUrlsGenerator.generate(url, {
         urlInfo,
         ownerUrlInfo: reference.ownerUrlInfo,
@@ -249,7 +249,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,
+        // dynamic_import_id: undefined,
       };
     },
     formatReference: (reference) => {

package/src/build/build_urls_generator.js

@@ -1,5 +1,10 @@
 // import { ANSI } from "@jsenv/humanize";
-import { urlIsInsideOf, urlToFilename, urlToRelativeUrl } from "@jsenv/urls";
+import {
+  injectQueryParams,
+  urlIsInsideOf,
+  urlToFilename,
+  urlToRelativeUrl,
+} from "@jsenv/urls";
 
 export const createBuildUrlsGenerator = ({
   // logger,
@@ -32,6 +37,20 @@ export const createBuildUrlsGenerator = ({
       return buildUrlFromMap;
     }
     if (urlIsInsideOf(url, buildDirectoryUrl)) {
+      if (ownerUrlInfo.searchParams.has("dynamic_import_id")) {
+        const ownerDirectoryPath = determineDirectoryPath({
+          sourceDirectoryUrl,
+          assetsDirectory,
+          urlInfo: ownerUrlInfo,
+        });
+        const buildRelativeUrl = urlToRelativeUrl(url, buildDirectoryUrl);
+        let buildUrl = `${buildDirectoryUrl}${ownerDirectoryPath}${buildRelativeUrl}`;
+        buildUrl = injectQueryParams(buildUrl, {
+          dynamic_import_id: undefined,
+        });
+        associateBuildUrl(url, buildUrl);
+        return buildUrl;
+      }
       associateBuildUrl(url, url);
       return url;
     }
@@ -52,7 +71,8 @@ export const createBuildUrlsGenerator = ({
       } else {
         directoryPath = urlToRelativeUrl(url, sourceDirectoryUrl);
       }
-      const { search } = new URL(url);
+      const urlObject = new URL(url);
+      const { search } = urlObject;
       const buildUrl = `${buildDirectoryUrl}${directoryPath}${search}`;
       associateBuildUrl(url, buildUrl);
       return buildUrl;
@@ -70,6 +90,7 @@ export const createBuildUrlsGenerator = ({
       nameSetPerDirectoryMap.set(directoryPath, nameSet);
     }
     const urlObject = new URL(url);
+    injectQueryParams(urlObject, { dynamic_import_id: undefined });
     let { search, hash } = urlObject;
     let urlName = getUrlName(url, urlInfo);
     let [basename, extension] = splitFileExtension(urlName);
@@ -116,7 +137,7 @@ const determineDirectoryPath = ({
   sourceDirectoryUrl,
   assetsDirectory,
   urlInfo,
-  ownerUrlInfo,
+  ownerUrlInfo = urlInfo.firstReference.ownerUrlInfo,
 }) => {
   if (urlInfo.dirnameHint) {
     return urlInfo.dirnameHint;
@@ -128,13 +149,29 @@ const determineDirectoryPath = ({
     const parentDirectoryPath = determineDirectoryPath({
       sourceDirectoryUrl,
       assetsDirectory,
-      urlInfo: ownerUrlInfo || urlInfo.firstReference.ownerUrlInfo,
+      urlInfo: ownerUrlInfo,
     });
     return parentDirectoryPath;
   }
   const dynamicImportId = urlInfo.searchParams.get("dynamic_import_id");
   if (dynamicImportId) {
-    return `${assetsDirectory}${dynamicImportId}/`;
+    const ancestorImportIds = [];
+    let ancestorUrlInfo = ownerUrlInfo;
+    let currentImportId = dynamicImportId;
+    while (ancestorUrlInfo) {
+      const ancestorDynamicImportId =
+        ancestorUrlInfo.searchParams.get("dynamic_import_id");
+      if (!ancestorDynamicImportId) {
+        break;
+      }
+      if (ancestorDynamicImportId !== currentImportId) {
+        ancestorImportIds.push(ancestorDynamicImportId);
+        currentImportId = ancestorDynamicImportId;
+      }
+      ancestorUrlInfo = ancestorUrlInfo.firstReference?.ownerUrlInfo;
+    }
+    const importIdPath = [...ancestorImportIds, dynamicImportId].join("/");
+    return `${assetsDirectory}${importIdPath}/`;
   }
   if (urlInfo.isEntryPoint && !urlInfo.isDynamicEntryPoint) {
     return "";

package/src/plugins/resolution_node_esm/node_esm_resolver.js

@@ -126,28 +126,63 @@ const createBuildPackageConditions = (
   const nodeRuntimeEnabled = Object.keys(runtimeCompat).includes("node");
   // https://nodejs.org/api/esm.html#resolver-algorithm-specification
   const processArgConditions = readCustomConditionsFromProcessArgs();
-  const packageConditionsDefaultResolvers = {};
-  for (const processArgCondition of processArgConditions) {
-    packageConditionsDefaultResolvers[processArgCondition] = true;
-  }
-  const packageConditionResolvers = {
-    ...packageConditionsDefaultResolvers,
-    development: (specifier, importer) => {
-      if (isBareSpecifier(specifier)) {
-        const { url } = applyNodeEsmResolution({
-          specifier,
-          parentUrl: importer,
-        });
-        return !url.includes("/node_modules/");
+  const devResolver = (specifier, importer) => {
+    if (isBareSpecifier(specifier)) {
+      const { url } = applyNodeEsmResolution({
+        specifier,
+        parentUrl: importer,
+      });
+      return !url.includes("/node_modules/");
+    }
+    return !importer.includes("/node_modules/");
+  };
+
+  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,
+          );
+          return;
+        }
       }
-      return !importer.includes("/node_modules/");
-    },
-    node: nodeRuntimeEnabled,
-    browser: !nodeRuntimeEnabled,
-    import: true,
+    }
+    const existingResolver = conditionDefaultResolvers[condition];
+    if (existingResolver) {
+      conditionResolvers[condition] = combineTwoPackageConditionResolvers(
+        existingResolver,
+        customResolver,
+      );
+      return;
+    }
+    conditionResolvers[condition] = customResolver;
   };
-  for (const condition of Object.keys(packageConditions)) {
-    const value = packageConditions[condition];
+
+  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(
@@ -190,29 +225,25 @@ const createBuildPackageConditions = (
     } else if (typeof value === "function") {
       customResolver = value;
     } else {
-      customResolver = () => value;
-    }
-    const existing = packageConditionResolvers[condition];
-    if (existing) {
-      packageConditionResolvers[condition] = (...args) => {
-        const customResult = customResolver(...args);
-        return customResult === undefined ? existing(...args) : customResult;
-      };
-    } else {
-      packageConditionResolvers[condition] = customResolver;
+      customResolver = value;
     }
+    addCustomResolver(customCondition, customResolver);
   }
 
+  for (const wildcardToRemove of wildcardToRemoveSet) {
+    delete conditionResolvers[wildcardToRemove];
+  }
+
+  const conditionCandidateArray = Object.keys(conditionResolvers);
   return (specifier, importer) => {
     const conditions = [];
-    for (const conditionCandidate of Object.keys(packageConditionResolvers)) {
-      const packageConditionResolver =
-        packageConditionResolvers[conditionCandidate];
-      if (typeof packageConditionResolver === "function") {
-        if (packageConditionResolver(specifier, importer)) {
+    for (const conditionCandidate of conditionCandidateArray) {
+      const conditionResolver = conditionResolvers[conditionCandidate];
+      if (typeof conditionResolver === "function") {
+        if (conditionResolver(specifier, importer)) {
           conditions.push(conditionCandidate);
         }
-      } else if (packageConditionResolver) {
+      } else if (conditionResolver) {
         conditions.push(conditionCandidate);
       }
     }
@@ -220,6 +251,22 @@ const createBuildPackageConditions = (
   };
 };
 
+const combineTwoPackageConditionResolvers = (first, second) => {
+  if (typeof second !== "function") {
+    return second;
+  }
+  return (...args) => {
+    const secondResult = second(...args);
+    if (secondResult !== undefined) {
+      return secondResult;
+    }
+    if (typeof first === "function") {
+      return first(...args);
+    }
+    return first;
+  };
+};
+
 const addRelationshipWithPackageJson = ({
   reference,
   packageJsonUrl,