@jsenv/node-esm-resolution 1.1.0 → 1.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsenv/node-esm-resolution",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -22,5 +22,6 @@
     "/dist/",
     "/src/",
     "/main.js"
-  ]
+  ],
+  "sideEffects": false
 }

package/src/node_esm_resolution.js

@@ -154,6 +154,7 @@ const applyBrowserFieldResolution = (specifier, resolutionContext) => {
   if (url) {
     return {
       type: "field:browser",
+      isMain: true,
       packageDirectoryUrl,
       packageJson,
       url,
@@ -197,7 +198,7 @@ const applyPackageImportsResolution = (
 };
 
 const applyPackageResolve = (packageSpecifier, resolutionContext) => {
-  const { parentUrl, conditions, readPackageJson, preservesSymlink } =
+  const { parentUrl, conditions, readPackageJson, preservesSymlink, isImport } =
     resolutionContext;
   if (packageSpecifier === "") {
     throw new Error("invalid module specifier");
@@ -223,7 +224,7 @@ const applyPackageResolve = (packageSpecifier, resolutionContext) => {
       resolutionContext,
     );
   }
-  if (packageSubpath.endsWith("/")) {
+  if (isImport && packageSubpath.endsWith("/")) {
     throw new Error("invalid module specifier");
   }
   const questionCharIndex = packageName.indexOf("?");
@@ -404,6 +405,7 @@ const applyPackageTargetResolution = (target, resolutionContext) => {
       }
       return {
         type: isImport ? "field:imports" : "field:exports",
+        isMain: subpath === "" || subpath === ".",
         packageDirectoryUrl,
         packageJson,
         url: pattern
@@ -566,6 +568,12 @@ const parsePackageSpecifier = (packageSpecifier) => {
   }
   const packageName = packageSpecifier.slice(0, firstSlashIndex);
   const afterFirstSlash = packageSpecifier.slice(firstSlashIndex + 1);
+  if (afterFirstSlash === "") {
+    return {
+      packageName,
+      packageSubpath: "/",
+    };
+  }
   const packageSubpath = `./${afterFirstSlash}`;
   return {
     packageName,
@@ -606,6 +614,7 @@ const applyLegacySubpathResolution = (packageSubpath, resolutionContext) => {
   }
   return {
     type: "subpath",
+    isMain: packageSubpath === ".",
     packageDirectoryUrl,
     packageJson,
     url: new URL(packageSubpath, packageDirectoryUrl).href,
@@ -623,6 +632,7 @@ const applyLegacyMainResolution = (packageSubpath, resolutionContext) => {
     if (resolved) {
       return {
         type: resolved.type,
+        isMain: resolved.isMain,
         packageDirectoryUrl,
         packageJson,
         url: new URL(resolved.path, packageDirectoryUrl).href,
@@ -631,6 +641,7 @@ const applyLegacyMainResolution = (packageSubpath, resolutionContext) => {
   }
   return {
     type: "field:main", // the absence of "main" field
+    isMain: true,
     packageDirectoryUrl,
     packageJson,
     url: new URL("index.js", packageDirectoryUrl).href,
@@ -639,13 +650,13 @@ const applyLegacyMainResolution = (packageSubpath, resolutionContext) => {
 const mainLegacyResolvers = {
   import: ({ packageJson }) => {
     if (typeof packageJson.module === "string") {
-      return { type: "field:module", path: packageJson.module };
+      return { type: "field:module", isMain: true, path: packageJson.module };
     }
     if (typeof packageJson.jsnext === "string") {
-      return { type: "field:jsnext", path: packageJson.jsnext };
+      return { type: "field:jsnext", isMain: true, path: packageJson.jsnext };
     }
     if (typeof packageJson.main === "string") {
-      return { type: "field:main", path: packageJson.main };
+      return { type: "field:main", isMain: true, path: packageJson.main };
     }
     return null;
   },
@@ -667,6 +678,7 @@ const mainLegacyResolvers = {
       if (typeof packageJson.module === "string") {
         return {
           type: "field:module",
+          isMain: true,
           path: packageJson.module,
         };
       }
@@ -678,6 +690,7 @@ const mainLegacyResolvers = {
     ) {
       return {
         type: "field:browser",
+        isMain: true,
         path: browserMain,
       };
     }
@@ -690,20 +703,27 @@ const mainLegacyResolvers = {
     ) {
       return {
         type: "field:module",
+        isMain: true,
         path: packageJson.module,
       };
     }
     return {
       type: "field:browser",
+      isMain: true,
       path: browserMain,
     };
   },
-  node: ({ packageJson }) => {
+  node: ({ packageJson, conditions }) => {
+    if (conditions.includes("import")) {
+      if (typeof packageJson.module === "string") {
+        return { type: "field:module", isMain: true, path: packageJson.module };
+      }
+      if (typeof packageJson.jsnext === "string") {
+        return { type: "field:jsnext", isMain: true, path: packageJson.jsnext };
+      }
+    }
     if (typeof packageJson.main === "string") {
-      return {
-        type: "field:main",
-        path: packageJson.main,
-      };
+      return { type: "field:main", isMain: true, path: packageJson.main };
     }
     return null;
   },