@jsenv/node-esm-resolution 0.0.1 → 0.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/node-esm-resolution",
-  "version": "0.0.1",
+  "version": "0.0.5",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -8,7 +8,8 @@
     "directory": "packages/node-esm-resolution"
   },
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
   },
   "type": "module",
   "exports": {
@@ -22,5 +23,8 @@
     "/dist/",
     "/src/",
     "/main.js"
-  ]
-}
+  ],
+  "scripts": {
+    "test": "node ./test/test.mjs"
+  }
+}

package/src/determine_module_system.js

@@ -26,7 +26,7 @@ export const determineModuleSystem = (
     return "commonjs"
   }
   if (extension === ".json") {
-    return "json"
+    return "url"
   }
   if (ambiguousExtensions.includes(extension)) {
     const packageUrl = lookupPackageScope(url)
@@ -39,7 +39,8 @@ export const determineModuleSystem = (
     }
     return "commonjs"
   }
-  throw new Error("unsupported file extension")
+  return "url"
+  // throw new Error(`unsupported file extension (${extension})`)
 }
 
 const extensionFromUrl = (url) => {

package/src/lookup_package_scope.js

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

package/src/node_esm_resolution.js

@@ -14,7 +14,7 @@ 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 { filesystemRootUrl, getParentUrl, isValidUrl } from "./url_utils.js"
+import { getParentUrl, isValidUrl } from "./url_utils.js"
 import {
   createInvalidModuleSpecifierError,
   createModuleNotFoundError,
@@ -104,7 +104,11 @@ const applyPackageSpecifierResolution = ({
   }
 }
 
-const applyBrowserFieldResolution = ({ conditions, parentUrl, specifier }) => {
+const applyBrowserFieldResolution = ({
+  conditions,
+  parentUrl,
+  packageSpecifier,
+}) => {
   const browserCondition = conditions.includes("browser")
   if (!browserCondition) {
     return null
@@ -125,22 +129,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) {
@@ -238,7 +244,7 @@ const applyPackageResolve = ({ conditions, parentUrl, packageSpecifier }) => {
     return selfResolution
   }
   let currentUrl = parentUrl
-  while (currentUrl !== filesystemRootUrl) {
+  while (currentUrl !== "file:///") {
     const packageUrl = new URL(`node_modules/${packageName}/`, currentUrl).href
     if (!existsSync(new URL(packageUrl))) {
       currentUrl = getParentUrl(currentUrl)

package/src/url_utils.js

@@ -1,6 +1,3 @@
-export const filesystemRootUrl =
-  process.platform === "win32" ? `file///${process.cwd()[0]}:/` : "file:///"
-
 export const asDirectoryUrl = (url) => {
   const { pathname } = new URL(url)
   if (pathname.endsWith("/")) {
@@ -10,6 +7,28 @@ export const asDirectoryUrl = (url) => {
 }
 
 export const getParentUrl = (url) => {
+  if (url.startsWith("file://")) {
+    // With node.js new URL('../', 'file:///C:/').href
+    // returns "file:///C:/" instead of "file:///"
+    const ressource = url.slice("file://".length)
+    const slashLastIndex = ressource.lastIndexOf("/")
+    if (slashLastIndex === -1) {
+      return url
+    }
+    const lastCharIndex = ressource.length - 1
+    if (slashLastIndex === lastCharIndex) {
+      const slashBeforeLastIndex = ressource.lastIndexOf(
+        "/",
+        slashLastIndex - 1,
+      )
+      if (slashBeforeLastIndex === -1) {
+        return url
+      }
+      return `file://${ressource.slice(0, slashBeforeLastIndex + 1)}`
+    }
+
+    return `file://${ressource.slice(0, slashLastIndex + 1)}`
+  }
   return new URL(url.endsWith("/") ? "../" : "./", url).href
 }