@jsenv/node-esm-resolution 0.1.0 → 0.1.1

package/README.md

@@ -1,4 +1,4 @@
 TODO:
 
-- add more unit tests
+- add more tests
 - improve error messages

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/node-esm-resolution",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -8,8 +8,7 @@
     "directory": "packages/node-esm-resolution"
   },
   "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org"
+    "access": "public"
   },
   "type": "module",
   "exports": {
@@ -25,6 +24,6 @@
     "/main.js"
   ],
   "scripts": {
-    "test": "node --conditions=development ./test/test.mjs"
+    "test": "node --conditions=development ./tests/test.mjs"
   }
-}
+}

package/src/custom_conditions.js

@@ -7,7 +7,7 @@ export const readCustomConditionsFromProcessArgs = () => {
       packageConditions.push(packageCondition)
     }
     if (arg.includes("--conditions=")) {
-      const packageCondition = arg.slice(0, "--conditions=".length)
+      const packageCondition = arg.slice("--conditions=".length)
       packageConditions.push(packageCondition)
     }
   })

package/src/node_esm_resolution.js

@@ -174,7 +174,7 @@ const applyBrowserFieldResolution = ({
   }
   if (url) {
     return {
-      type: "browser",
+      type: "field:browser",
       packageUrl,
       packageJson,
       url,
@@ -515,7 +515,7 @@ const applyPackageTargetResolution = ({
         })
       }
       return {
-        type: internal ? "imports_subpath" : "exports_subpath",
+        type: internal ? "field:imports" : "field:exports",
         packageUrl,
         packageJson,
         url: pattern
@@ -768,7 +768,7 @@ const applyLegacyMainResolution = ({ conditions, packageUrl, packageJson }) => {
     }
   }
   return {
-    type: "default",
+    type: "field:main", // the absence of "main" field
     packageUrl,
     packageJson,
     url: new URL("index.js", packageUrl).href,
@@ -777,28 +777,34 @@ const applyLegacyMainResolution = ({ conditions, packageUrl, packageJson }) => {
 const mainLegacyResolvers = {
   import: (packageJson) => {
     if (typeof packageJson.module === "string") {
-      return { type: "module", path: packageJson.module }
+      return { type: "field:module", path: packageJson.module }
     }
     if (typeof packageJson.jsnext === "string") {
-      return { type: "jsnext", path: packageJson.jsnext }
+      return { type: "field:jsnext", path: packageJson.jsnext }
     }
     if (typeof packageJson.main === "string") {
-      return { type: "main", path: packageJson.main }
+      return { type: "field:main", path: packageJson.main }
     }
     return null
   },
   browser: (packageJson, packageUrl) => {
-    const browserMain =
-      typeof packageJson.browser === "string"
-        ? packageJson.browser
-        : typeof packageJson.browser === "object" &&
-          packageJson.browser !== null
-        ? packageJson.browser["."]
-        : ""
+    const browserMain = (() => {
+      if (typeof packageJson.browser === "string") {
+        return packageJson.browser
+      }
+      if (
+        typeof packageJson.browser === "object" &&
+        packageJson.browser !== null
+      ) {
+        return packageJson.browser["."]
+      }
+      return ""
+    })()
+
     if (!browserMain) {
       if (typeof packageJson.module === "string") {
         return {
-          type: "module",
+          type: "field:module",
           path: packageJson.module,
         }
       }
@@ -809,7 +815,7 @@ const mainLegacyResolvers = {
       packageJson.module === browserMain
     ) {
       return {
-        type: "browser",
+        type: "field:browser",
         path: browserMain,
       }
     }
@@ -821,19 +827,19 @@ const mainLegacyResolvers = {
       /module\.exports\s*=/.test(content)
     ) {
       return {
-        type: "module",
+        type: "field:module",
         path: packageJson.module,
       }
     }
     return {
-      type: "browser",
+      type: "field:browser",
       path: browserMain,
     }
   },
   node: (packageJson) => {
     if (typeof packageJson.main === "string") {
       return {
-        type: "main",
+        type: "field:main",
         path: packageJson.main,
       }
     }
@@ -842,10 +848,10 @@ const mainLegacyResolvers = {
 }
 
 const comparePatternKeys = (keyA, keyB) => {
-  if (!keyA.endsWith("/") && !keyA.contains("*")) {
+  if (!keyA.endsWith("/") && !keyA.includes("*")) {
     throw new Error("Invalid package configuration")
   }
-  if (!keyB.endsWith("/") && !keyB.contains("*")) {
+  if (!keyB.endsWith("/") && !keyB.includes("*")) {
     throw new Error("Invalid package configuration")
   }
   const aStarIndex = keyA.indexOf("*")

package/src/url_utils.js

@@ -10,24 +10,21 @@ 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("/")
+    const resource = url.slice("file://".length)
+    const slashLastIndex = resource.lastIndexOf("/")
     if (slashLastIndex === -1) {
       return url
     }
-    const lastCharIndex = ressource.length - 1
+    const lastCharIndex = resource.length - 1
     if (slashLastIndex === lastCharIndex) {
-      const slashBeforeLastIndex = ressource.lastIndexOf(
-        "/",
-        slashLastIndex - 1,
-      )
+      const slashBeforeLastIndex = resource.lastIndexOf("/", slashLastIndex - 1)
       if (slashBeforeLastIndex === -1) {
         return url
       }
-      return `file://${ressource.slice(0, slashBeforeLastIndex + 1)}`
+      return `file://${resource.slice(0, slashBeforeLastIndex + 1)}`
     }
 
-    return `file://${ressource.slice(0, slashLastIndex + 1)}`
+    return `file://${resource.slice(0, slashLastIndex + 1)}`
   }
   return new URL(url.endsWith("/") ? "../" : "./", url).href
 }