@jsenv/node-esm-resolution 0.0.4 → 0.0.7

package/main.js

@@ -1,5 +1,5 @@
 export { applyNodeEsmResolution } from "./src/node_esm_resolution.js"
 export { determineModuleSystem } from "./src/determine_module_system.js"
 export { applyFileSystemMagicResolution } from "./src/filesystem_magic_resolution.js"
-export { lookupPackageScope } from "./src/lookup_package_scope.js"
-export { readPackageJson } from "./src/read_package_json.js"
+export { defaultLookupPackageScope } from "./src/default_lookup_package_scope.js"
+export { defaultReadPackageJson } from "./src/default_read_package_json.js"

package/package.json

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

package/src/{lookup_package_scope.js → default_lookup_package_scope.js}

@@ -2,7 +2,7 @@ import { existsSync } from "node:fs"
 
 import { getParentUrl, asDirectoryUrl } from "./url_utils.js"
 
-export const lookupPackageScope = (url) => {
+export const defaultLookupPackageScope = (url) => {
   let scopeUrl = asDirectoryUrl(url)
   while (scopeUrl !== "file:///") {
     if (scopeUrl.endsWith("node_modules/")) {

package/src/{read_package_json.js → default_read_package_json.js}

@@ -1,6 +1,6 @@
 import { readFileSync } from "node:fs"
 
-export const readPackageJson = (packageUrl) => {
+export const defaultReadPackageJson = (packageUrl) => {
   const packageJsonUrl = new URL("package.json", packageUrl)
   const buffer = readFileSync(packageJsonUrl)
   const string = String(buffer)

package/src/determine_module_system.js

@@ -1,5 +1,5 @@
-import { lookupPackageScope } from "./lookup_package_scope.js"
-import { readPackageJson } from "./read_package_json.js"
+import { defaultLookupPackageScope } from "./default_lookup_package_scope.js"
+import { defaultReadPackageJson } from "./default_read_package_json.js"
 
 // https://nodejs.org/dist/latest-v16.x/docs/api/packages.html#packages_determining_module_system)
 export const determineModuleSystem = (
@@ -29,11 +29,11 @@ export const determineModuleSystem = (
     return "url"
   }
   if (ambiguousExtensions.includes(extension)) {
-    const packageUrl = lookupPackageScope(url)
+    const packageUrl = defaultLookupPackageScope(url)
     if (!packageUrl) {
       return "commonjs"
     }
-    const packageJson = readPackageJson(packageUrl)
+    const packageJson = defaultReadPackageJson(packageUrl)
     if (packageJson.type === "module") {
       return "module"
     }

package/src/filesystem_magic_resolution.js

@@ -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

@@ -12,8 +12,8 @@
 import { existsSync, readFileSync } from "node:fs"
 
 import { isSpecifierForNodeBuiltin } from "./node_builtin_specifiers.js"
-import { lookupPackageScope } from "./lookup_package_scope.js"
-import { readPackageJson } from "./read_package_json.js"
+import { defaultLookupPackageScope } from "./default_lookup_package_scope.js"
+import { defaultReadPackageJson } from "./default_read_package_json.js"
 import { getParentUrl, isValidUrl } from "./url_utils.js"
 import {
   createInvalidModuleSpecifierError,
@@ -27,11 +27,15 @@ export const applyNodeEsmResolution = ({
   conditions = ["node", "import"],
   parentUrl,
   specifier,
+  lookupPackageScope = defaultLookupPackageScope,
+  readPackageJson = defaultReadPackageJson,
 }) => {
   const resolution = applyPackageSpecifierResolution({
     conditions,
     parentUrl: String(parentUrl),
     specifier,
+    lookupPackageScope,
+    readPackageJson,
   })
   const { url } = resolution
   if (url.startsWith("file:")) {
@@ -51,6 +55,8 @@ const applyPackageSpecifierResolution = ({
   conditions,
   parentUrl,
   specifier,
+  lookupPackageScope,
+  readPackageJson,
 }) => {
   // relative specifier
   if (
@@ -63,6 +69,8 @@ const applyPackageSpecifierResolution = ({
         conditions,
         parentUrl,
         specifier,
+        lookupPackageScope,
+        readPackageJson,
       })
       if (browserFieldResolution) {
         return browserFieldResolution
@@ -78,6 +86,8 @@ const applyPackageSpecifierResolution = ({
       conditions,
       parentUrl,
       specifier,
+      lookupPackageScope,
+      readPackageJson,
     })
   }
   try {
@@ -92,6 +102,8 @@ const applyPackageSpecifierResolution = ({
       conditions,
       parentUrl,
       packageSpecifier: specifier,
+      lookupPackageScope,
+      readPackageJson,
     })
     if (browserFieldResolution) {
       return browserFieldResolution
@@ -100,11 +112,19 @@ const applyPackageSpecifierResolution = ({
       conditions,
       parentUrl,
       packageSpecifier: specifier,
+      lookupPackageScope,
+      readPackageJson,
     })
   }
 }
 
-const applyBrowserFieldResolution = ({ conditions, parentUrl, specifier }) => {
+const applyBrowserFieldResolution = ({
+  conditions,
+  parentUrl,
+  packageSpecifier,
+  lookupPackageScope,
+  readPackageJson,
+}) => {
   const browserCondition = conditions.includes("browser")
   if (!browserCondition) {
     return null
@@ -125,22 +145,24 @@ const applyBrowserFieldResolution = ({ conditions, parentUrl, specifier }) => {
     return null
   }
   let url
-  if (specifier.startsWith(".")) {
-    const specifierUrl = new URL(specifier, parentUrl).href
-    const specifierRelativeToPackage = specifierUrl.slice(packageUrl.length)
-    const specifierRelativeNotation = `./${specifierRelativeToPackage}`
-    const browserMapping = browser[specifierRelativeNotation]
+  if (packageSpecifier.startsWith(".")) {
+    const packageSpecifierUrl = new URL(packageSpecifier, parentUrl).href
+    const packageSpecifierRelativeUrl = packageSpecifierUrl.slice(
+      packageUrl.length,
+    )
+    const packageSpecifierRelativeNotation = `./${packageSpecifierRelativeUrl}`
+    const browserMapping = browser[packageSpecifierRelativeNotation]
     if (typeof browserMapping === "string") {
       url = new URL(browserMapping, packageUrl).href
     } else if (browserMapping === false) {
-      url = `file:///@ignore/${specifierUrl.slice("file:///")}`
+      url = `file:///@ignore/${packageSpecifierUrl.slice("file:///")}`
     }
   } else {
-    const browserMapping = browser[specifier]
+    const browserMapping = browser[packageSpecifier]
     if (typeof browserMapping === "string") {
       url = new URL(browserMapping, packageUrl).href
     } else if (browserMapping === false) {
-      url = `file:///@ignore/${specifier}`
+      url = `file:///@ignore/${packageSpecifier}`
     }
   }
   if (url) {
@@ -158,6 +180,8 @@ const applyPackageImportsResolution = ({
   conditions,
   parentUrl,
   specifier,
+  lookupPackageScope,
+  readPackageJson,
 }) => {
   if (!specifier.startsWith("#")) {
     throw createInvalidModuleSpecifierError({
@@ -186,6 +210,8 @@ const applyPackageImportsResolution = ({
         matchObject: imports,
         matchKey: specifier,
         isImports: true,
+        lookupPackageScope,
+        readPackageJson,
       })
       if (resolved) {
         return resolved
@@ -199,7 +225,13 @@ const applyPackageImportsResolution = ({
   })
 }
 
-const applyPackageResolve = ({ conditions, parentUrl, packageSpecifier }) => {
+const applyPackageResolve = ({
+  conditions,
+  parentUrl,
+  packageSpecifier,
+  lookupPackageScope,
+  readPackageJson,
+}) => {
   if (packageSpecifier === "") {
     throw new Error("invalid module specifier")
   }
@@ -233,6 +265,8 @@ const applyPackageResolve = ({ conditions, parentUrl, packageSpecifier }) => {
     parentUrl,
     packageName,
     packageSubpath,
+    lookupPackageScope,
+    readPackageJson,
   })
   if (selfResolution) {
     return selfResolution
@@ -255,6 +289,8 @@ const applyPackageResolve = ({ conditions, parentUrl, packageSpecifier }) => {
           packageJson,
           packageSubpath,
           exports,
+          lookupPackageScope,
+          readPackageJson,
         })
       }
     }
@@ -264,6 +300,8 @@ const applyPackageResolve = ({ conditions, parentUrl, packageSpecifier }) => {
       packageUrl,
       packageJson,
       packageSubpath,
+      lookupPackageScope,
+      readPackageJson,
     })
   }
   throw createModuleNotFoundError({
@@ -277,6 +315,8 @@ const applyPackageSelfResolution = ({
   parentUrl,
   packageName,
   packageSubpath,
+  lookupPackageScope,
+  readPackageJson,
 }) => {
   const packageUrl = lookupPackageScope(parentUrl)
   if (!packageUrl) {
@@ -297,6 +337,8 @@ const applyPackageSelfResolution = ({
       packageUrl,
       packageJson,
       packageSubpath,
+      lookupPackageScope,
+      readPackageJson,
     })
     if (subpathResolution && subpathResolution.type !== "subpath") {
       return subpathResolution
@@ -310,6 +352,8 @@ const applyPackageSelfResolution = ({
     packageJson,
     packageSubpath,
     exports,
+    lookupPackageScope,
+    readPackageJson,
   })
 }
 
@@ -321,6 +365,8 @@ const applyPackageExportsResolution = ({
   packageJson,
   packageSubpath,
   exports,
+  lookupPackageScope,
+  readPackageJson,
 }) => {
   const exportsInfo = readExports({ exports, packageUrl })
   if (packageSubpath === ".") {
@@ -339,6 +385,8 @@ const applyPackageExportsResolution = ({
       packageJson,
       key: ".",
       target: mainExport,
+      lookupPackageScope,
+      readPackageJson,
     })
     if (resolved) {
       return resolved
@@ -358,6 +406,8 @@ const applyPackageExportsResolution = ({
       matchObject: exports,
       matchKey: packageSubpath,
       isImports: false,
+      lookupPackageScope,
+      readPackageJson,
     })
     if (resolved) {
       return resolved
@@ -378,6 +428,8 @@ const applyPackageImportsExportsResolution = ({
   matchObject,
   matchKey,
   isImports,
+  lookupPackageScope,
+  readPackageJson,
 }) => {
   if (!matchKey.includes("*") && matchObject.hasOwnProperty(matchKey)) {
     const target = matchObject[matchKey]
@@ -389,6 +441,8 @@ const applyPackageImportsExportsResolution = ({
       key: matchKey,
       target,
       internal: isImports,
+      lookupPackageScope,
+      readPackageJson,
     })
   }
   const expansionKeys = Object.keys(matchObject)
@@ -417,6 +471,8 @@ const applyPackageImportsExportsResolution = ({
       subpath,
       pattern: true,
       internal: isImports,
+      lookupPackageScope,
+      readPackageJson,
     })
   }
   return null
@@ -432,6 +488,8 @@ const applyPackageTargetResolution = ({
   subpath = "",
   pattern = false,
   internal = false,
+  lookupPackageScope,
+  readPackageJson,
 }) => {
   if (typeof target === "string") {
     if (pattern === false && subpath !== "" && !target.endsWith("/")) {
@@ -474,6 +532,8 @@ const applyPackageTargetResolution = ({
       packageSpecifier: pattern
         ? target.replaceAll("*", subpath)
         : `${target}${subpath}`,
+      lookupPackageScope,
+      readPackageJson,
     })
   }
   if (Array.isArray(target)) {
@@ -496,6 +556,8 @@ const applyPackageTargetResolution = ({
           subpath,
           pattern,
           internal,
+          lookupPackageScope,
+          readPackageJson,
         })
         if (resolved) {
           return resolved
@@ -534,6 +596,8 @@ const applyPackageTargetResolution = ({
           subpath,
           pattern,
           internal,
+          lookupPackageScope,
+          readPackageJson,
         })
         if (resolved) {
           return resolved
@@ -652,6 +716,8 @@ const applyLegacySubpathResolution = ({
   packageUrl,
   packageJson,
   packageSubpath,
+  lookupPackageScope,
+  readPackageJson,
 }) => {
   if (packageSubpath === ".") {
     return applyLegacyMainResolution({
@@ -664,6 +730,8 @@ const applyLegacySubpathResolution = ({
     conditions,
     parentUrl,
     specifier: packageSubpath,
+    lookupPackageScope,
+    readPackageJson,
   })
   if (browserFieldResolution) {
     return browserFieldResolution
@@ -696,26 +764,36 @@ 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 }
     }
     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,
@@ -730,7 +808,7 @@ const mainLegacyResolvers = {
     ) {
       return {
         type: "module",
-        path: module,
+        path: packageJson.module,
       }
     }
     return {
@@ -738,11 +816,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