@jsenv/node-esm-resolution 0.0.6 → 0.0.10

package/main.js

@@ -3,3 +3,4 @@ export { determineModuleSystem } from "./src/determine_module_system.js"
 export { applyFileSystemMagicResolution } from "./src/filesystem_magic_resolution.js"
 export { defaultLookupPackageScope } from "./src/default_lookup_package_scope.js"
 export { defaultReadPackageJson } from "./src/default_read_package_json.js"
+export { readCustomConditionsFromProcessArgs } from "./src/custom_conditions.js"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/node-esm-resolution",
-  "version": "0.0.6",
+  "version": "0.0.10",
   "license": "MIT",
   "repository": {
     "type": "git",

package/src/custom_conditions.js

@@ -0,0 +1,15 @@
+// https://nodejs.org/api/packages.html#resolving-user-conditions
+export const readCustomConditionsFromProcessArgs = () => {
+  const packageConditions = []
+  process.execArgv.forEach((arg) => {
+    if (arg.includes("-C=")) {
+      const packageCondition = arg.slice(0, "-C=".length)
+      packageConditions.push(packageCondition)
+    }
+    if (arg.includes("--conditions=")) {
+      const packageCondition = arg.slice(0, "--conditions=".length)
+      packageConditions.push(packageCondition)
+    }
+  })
+  return packageConditions
+}

package/src/filesystem_magic_resolution.js

@@ -4,7 +4,7 @@ import { urlToFilename } from "./url_utils.js"
 
 export const applyFileSystemMagicResolution = (
   fileUrl,
-  { magicDirectoryIndex, magicExtensions },
+  { fileStat, magicDirectoryIndex, magicExtensions },
 ) => {
   let lastENOENTError = null
   const fileStatOrNull = (url) => {
@@ -18,8 +18,8 @@ export const applyFileSystemMagicResolution = (
       throw e
     }
   }
+  fileStat = fileStat === undefined ? fileStatOrNull(fileUrl) : fileStat
 
-  const fileStat = fileStatOrNull(fileUrl)
   if (fileStat && fileStat.isFile()) {
     return {
       found: true,
@@ -35,14 +35,14 @@ export const applyFileSystemMagicResolution = (
         magicExtensions,
       })
       return {
-        magicDirectoryIndex: true,
         ...result,
+        magicDirectoryIndex: true,
       }
     }
     return {
-      isDirectory: true,
       found: true,
       url: fileUrl,
+      isDirectory: true,
     }
   }
   if (magicExtensions && magicExtensions.length) {
@@ -56,9 +56,9 @@ export const applyFileSystemMagicResolution = (
     if (extensionLeadingToFile) {
       // magic extension worked
       return {
-        magicExtension: extensionLeadingToFile,
         found: true,
         url: `${fileUrl}${extensionLeadingToFile}`,
+        magicExtension: extensionLeadingToFile,
       }
     }
   }

package/src/node_esm_resolution.js

@@ -22,9 +22,10 @@ import {
   createPackagePathNotExportedError,
   createInvalidPackageTargetError,
 } from "./errors.js"
+import { readCustomConditionsFromProcessArgs } from "./custom_conditions.js"
 
 export const applyNodeEsmResolution = ({
-  conditions = ["node", "import"],
+  conditions = [...readCustomConditionsFromProcessArgs(), "node", "import"],
   parentUrl,
   specifier,
   lookupPackageScope = defaultLookupPackageScope,
@@ -92,6 +93,12 @@ const applyPackageSpecifierResolution = ({
   }
   try {
     const urlObject = new URL(specifier)
+    if (specifier.startsWith("node:")) {
+      return {
+        type: "node_builtin_specifier",
+        url: specifier,
+      }
+    }
     return {
       type: "absolute_specifier",
       url: urlObject.href,
@@ -746,7 +753,11 @@ const applyLegacySubpathResolution = ({
 
 const applyLegacyMainResolution = ({ conditions, packageUrl, packageJson }) => {
   for (const condition of conditions) {
-    const resolved = mainLegacyResolvers[condition](packageJson, packageUrl)
+    const conditionResolver = mainLegacyResolvers[condition]
+    if (!conditionResolver) {
+      continue
+    }
+    const resolved = conditionResolver(packageJson, packageUrl)
     if (resolved) {
       return {
         type: resolved.type,
@@ -764,26 +775,39 @@ const applyLegacyMainResolution = ({ conditions, packageUrl, packageJson }) => {
   }
 }
 const mainLegacyResolvers = {
-  import: ({ module, jsnext }) => {
-    if (typeof module === "string") {
-      return { type: "module", path: module }
+  import: (packageJson) => {
+    if (typeof packageJson.module === "string") {
+      return { type: "module", path: packageJson.module }
     }
-    if (typeof jsnext === "string") {
-      return { type: "jsnext", path: jsnext }
+    if (typeof packageJson.jsnext === "string") {
+      return { type: "jsnext", path: packageJson.jsnext }
+    }
+    if (typeof packageJson.main === "string") {
+      return { type: "main", path: packageJson.main }
     }
     return null
   },
-  browser: ({ browser, module }, packageUrl) => {
+  browser: (packageJson, packageUrl) => {
     const browserMain =
-      typeof browser === "string"
-        ? browser
-        : typeof browser === "object" && browser !== null
-        ? browser["."]
+      typeof packageJson.browser === "string"
+        ? packageJson.browser
+        : typeof packageJson.browser === "object" &&
+          packageJson.browser !== null
+        ? packageJson.browser["."]
         : ""
     if (!browserMain) {
+      if (typeof packageJson.module === "string") {
+        return {
+          type: "module",
+          path: packageJson.module,
+        }
+      }
       return null
     }
-    if (typeof module !== "string" || module === browserMain) {
+    if (
+      typeof packageJson.module !== "string" ||
+      packageJson.module === browserMain
+    ) {
       return {
         type: "browser",
         path: browserMain,
@@ -798,7 +822,7 @@ const mainLegacyResolvers = {
     ) {
       return {
         type: "module",
-        path: module,
+        path: packageJson.module,
       }
     }
     return {
@@ -806,11 +830,11 @@ const mainLegacyResolvers = {
       path: browserMain,
     }
   },
-  node: ({ main }) => {
-    if (typeof main === "string") {
+  node: (packageJson) => {
+    if (typeof packageJson.main === "string") {
       return {
         type: "main",
-        path: main,
+        path: packageJson.main,
       }
     }
     return null