@jsenv/node-esm-resolution 0.0.6 → 0.0.7

package/package.json

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

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

@@ -764,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,
@@ -798,7 +808,7 @@ const mainLegacyResolvers = {
     ) {
       return {
         type: "module",
-        path: module,
+        path: packageJson.module,
       }
     }
     return {
@@ -806,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