Fixed issues when nested folders and added test for specifier and esm

import.

Author: pabloerhard

lib/get-exports.js

@@ -2,7 +2,7 @@
 
 const getEsmExports = require('./get-esm-exports.js')
 const { parse: parseCjs } = require('cjs-module-lexer')
-const { readFileSync, existsSync } = require('fs')
+const { readFileSync } = require('fs')
 const { builtinModules } = require('module')
 const { fileURLToPath, pathToFileURL } = require('url')
 const { dirname, join } = require('path')
@@ -30,8 +30,8 @@ const urlsBeingProcessed = new Set() // Guard against circular imports.
 /**
  * This function looks for the package.json which contains the specifier trying to resolve.
  * Once the package.json file has been found, we extract the file path from the specifier
- * @param {*} specifier The specifier that is being search for inside the imports object
- * @param {*} fromUrl The url from which the search starts from
+ * @param {string} specifier The specifier that is being search for inside the imports object
+ * @param {URL|string} fromUrl The url from which the search starts from
  * @returns file to url to file export
  */
 function resolvePackageImports (specifier, fromUrl) {
@@ -47,9 +47,18 @@ function resolvePackageImports (specifier, fromUrl) {
     while (currentDir !== dirname(currentDir)) {
       const packageJsonPath = join(currentDir, 'package.json')
 
-      if (existsSync(packageJsonPath)) {
-        const packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'))
+      let packageJson
+      try {
+        packageJson = JSON.parse(readFileSync(packageJsonPath, 'utf8'))
+      } catch (error) {
+        if (error.code === 'ENOENT') {
+          currentDir = dirname(currentDir)
+          continue
+        }
+        throw error
+      }
 
+      if (packageJson) {
         if (packageJson.imports && packageJson.imports[specifier]) {
           const imports = packageJson.imports[specifier]
 
@@ -70,13 +79,12 @@ function resolvePackageImports (specifier, fromUrl) {
           }
 
           if (resolvedPath) {
-            return resolvedPath
+            return pathToFileURL(require.resolve(resolvedPath, { paths: [currentDir] })).href
           }
         }
         // return if we find a package.json but did not find an import
         return null
       }
-      currentDir = dirname(currentDir)
     }
   } catch (error) {
     throw new Error(`Failed to find sub path export: ${specifier}`)
@@ -105,17 +113,18 @@ async function getCjsExports (url, context, parentLoad, source) {
           re = './'
         }
 
+        let newUrl
         // Entries in the import field should always start with #
         if (re.startsWith('#')) {
-          re = resolvePackageImports(re, url)
-          if (!re) {
+          newUrl = resolvePackageImports(re, url)
+          if (!newUrl) {
             // Unable to resolve specifier import
             return
           }
+        } else {
+          newUrl = pathToFileURL(require.resolve(re, { paths: [dirname(fileURLToPath(url))] })).href
         }
 
-        const newUrl = pathToFileURL(require.resolve(re, { paths: [dirname(fileURLToPath(url))] })).href
-
         if (newUrl.endsWith('.node') || newUrl.endsWith('.json')) {
           return
         }

test/fixtures/specifier.js renamed to test/fixtures/nested-folder/specifier.js

@@ -8,7 +8,7 @@
         },
         "import": {
           "node":"./something.mjs",
-          "default": "./something.js"
+          "default": "./something.mjs"
         }
       },
       "#main-entry-point-string" : "./something.js",

test/fixtures/package.json

@@ -0,0 +1 @@
+export * from '#main-entry-point'

test/fixtures/specifier.mjs

@@ -0,0 +1,10 @@
+import { foo } from '../fixtures/specifier.mjs'
+import Hook from '../../index.js'
+import { strictEqual } from 'assert'
+Hook((exports, name) => {
+  if (name.endsWith('fixtures/specifier.mjs')) {
+    exports.foo = 1
+  }
+})
+
+strictEqual(foo, 1)

test/hook/specifier-imports-mjs.mjs

@@ -1,9 +1,9 @@
-import { foo } from '../fixtures/specifier.js'
+import { foo } from '../fixtures/nested-folder/specifier.js'
 import Hook from '../../index.js'
 import { strictEqual } from 'assert'
 
 Hook((exports, name) => {
-  if (name.endsWith('fixtures/specifier.js')) {
+  if (name.endsWith('fixtures/nested-folder/specifier.js')) {
     exports.foo = 1
   }
 })