Clean up

package.json

@@ -1,6 +1,6 @@
 {
   "name": "extensionless",
-  "version": "1.9.7",
+  "version": "1.9.9",
   "type": "module",
   "exports": {
     ".": "./src/index.js",

src/config.js

@@ -5,12 +5,12 @@ import {cwd} from 'process'
 let warn = (field, desc) => console.warn('⚠️ \x1b[33m%s\x1b[0m',
   `Warning: The package.json field 'extensionless.${field}' must be ${desc}! Using the default value instead...`)
 
-let getPkgJson = async argv1 => {
-  let path, dirPath = isAbsolute(argv1 ?? '') ? argv1 : cwd()
-
+let getPkgJson = async dirPath => {
   do {
+    let path = join(dirPath, 'package.json')
+
     try {
-      return {body: JSON.parse(await readFile(path = join(dirPath, 'package.json'), 'utf8')), path}
+      return {body: JSON.parse(await readFile(path, 'utf8')), path}
     } catch (e) {
       if (!['ENOTDIR', 'ENOENT', 'EISDIR'].includes(e.code)) {
         throw new Error('Cannot retrieve package.json', {cause: e})
@@ -19,16 +19,16 @@ let getPkgJson = async argv1 => {
   } while (dirPath !== (dirPath = dirname(dirPath)))
 }
 
-export async function getConfig({argv1} = {}) {
+export async function getConfig({argv1 = ''} = {}) {
   let defaults = {
     lookFor: ['js']
-  }, pkgJson = await getPkgJson(argv1), {
+  }, dirPath = isAbsolute(argv1) ? argv1 : cwd(), {
     lookFor
-  } = {...defaults, ...pkgJson?.body.extensionless}
+  } = {...defaults, ...(await getPkgJson(dirPath))?.body.extensionless}
 
   Array.isArray(lookFor) && lookFor.length && lookFor.every(a => typeof a === 'string' && /^[a-z]\w*$/i.test(a)) || (
     lookFor = defaults.lookFor, warn('lookFor', 'an array of alphanumeric strings')
   )
 
-  return {lookFor, pkgJsonPath: pkgJson?.path}
+  return {lookFor}
 }

src/index.js

@@ -27,8 +27,8 @@ export async function resolve(specifier, context, nextResolve) {
     try {return await nextResolve(specifier)} catch (e) {error = e}
   }
 
-  let trySpec = error ? specifier : new URL(prefix + specifier, context.parentURL).href
   let {type} = context.importAttributes ?? context.importAssertions
+  let trySpec = error ? specifier : new URL(prefix + specifier, context.parentURL).href
   let postfixes = (await initPromise, trySpec.endsWith('/') ? indexFiles : knownExts.includes(extname(trySpec)) ? empty : candidates)
 
   for (let postfix of postfixes[+(type === 'json')]) {