@jsenv/node-esm-resolution 1.0.1 → 1.0.2

package/main.js

@@ -1,9 +1,9 @@
-export { applyNodeEsmResolution } from "./src/node_esm_resolution.js"
-export { determineModuleSystem } from "./src/determine_module_system.js"
+export { applyNodeEsmResolution } from "./src/node_esm_resolution.js";
+export { determineModuleSystem } from "./src/determine_module_system.js";
 export {
   applyFileSystemMagicResolution,
   getExtensionsToTry,
-} from "./src/filesystem_magic_resolution.js"
-export { defaultLookupPackageScope } from "./src/default_lookup_package_scope.js"
-export { defaultReadPackageJson } from "./src/default_read_package_json.js"
-export { readCustomConditionsFromProcessArgs } from "./src/custom_conditions.js"
+} from "./src/filesystem_magic_resolution.js";
+export { defaultLookupPackageScope } from "./src/default_lookup_package_scope.js";
+export { defaultReadPackageJson } from "./src/default_read_package_json.js";
+export { readCustomConditionsFromProcessArgs } from "./src/custom_conditions.js";

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@jsenv/node-esm-resolution",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/jsenv/jsenv-core",
-    "directory": "packages/node-esm-resolution"
+    "url": "https://github.com/jsenv/core",
+    "directory": "packages/independent/node-esm-resolution"
   },
   "publishConfig": {
     "access": "public"

package/src/custom_conditions.js

@@ -1,15 +1,15 @@
 // https://nodejs.org/api/packages.html#resolving-user-conditions
 export const readCustomConditionsFromProcessArgs = () => {
-  const packageConditions = []
+  const packageConditions = [];
   process.execArgv.forEach((arg) => {
     if (arg.includes("-C=")) {
-      const packageCondition = arg.slice(0, "-C=".length)
-      packageConditions.push(packageCondition)
+      const packageCondition = arg.slice(0, "-C=".length);
+      packageConditions.push(packageCondition);
     }
     if (arg.includes("--conditions=")) {
-      const packageCondition = arg.slice("--conditions=".length)
-      packageConditions.push(packageCondition)
+      const packageCondition = arg.slice("--conditions=".length);
+      packageConditions.push(packageCondition);
     }
-  })
-  return packageConditions
-}
+  });
+  return packageConditions;
+};

package/src/default_lookup_package_scope.js

@@ -1,18 +1,18 @@
-import { existsSync } from "node:fs"
+import { existsSync } from "node:fs";
 
-import { getParentUrl, asDirectoryUrl } from "./url_utils.js"
+import { getParentUrl, asDirectoryUrl } from "./url_utils.js";
 
 export const defaultLookupPackageScope = (url) => {
-  let scopeUrl = asDirectoryUrl(url)
+  let scopeUrl = asDirectoryUrl(url);
   while (scopeUrl !== "file:///") {
     if (scopeUrl.endsWith("node_modules/")) {
-      return null
+      return null;
     }
-    const packageJsonUrlObject = new URL("package.json", scopeUrl)
+    const packageJsonUrlObject = new URL("package.json", scopeUrl);
     if (existsSync(packageJsonUrlObject)) {
-      return scopeUrl
+      return scopeUrl;
     }
-    scopeUrl = getParentUrl(scopeUrl)
+    scopeUrl = getParentUrl(scopeUrl);
   }
-  return null
-}
+  return null;
+};

package/src/default_read_package_json.js

@@ -1,12 +1,12 @@
-import { readFileSync } from "node:fs"
+import { readFileSync } from "node:fs";
 
 export const defaultReadPackageJson = (packageUrl) => {
-  const packageJsonUrl = new URL("package.json", packageUrl)
-  const buffer = readFileSync(packageJsonUrl)
-  const string = String(buffer)
+  const packageJsonUrl = new URL("package.json", packageUrl);
+  const buffer = readFileSync(packageJsonUrl);
+  const string = String(buffer);
   try {
-    return JSON.parse(string)
+    return JSON.parse(string);
   } catch (e) {
-    throw new Error(`Invalid package configuration`)
+    throw new Error(`Invalid package configuration`);
   }
-}
+};

package/src/determine_module_system.js

@@ -1,5 +1,5 @@
-import { defaultLookupPackageScope } from "./default_lookup_package_scope.js"
-import { defaultReadPackageJson } from "./default_read_package_json.js"
+import { defaultLookupPackageScope } from "./default_lookup_package_scope.js";
+import { defaultReadPackageJson } from "./default_read_package_json.js";
 
 // https://nodejs.org/dist/latest-v16.x/docs/api/packages.html#packages_determining_module_system)
 export const determineModuleSystem = (
@@ -8,49 +8,49 @@ export const determineModuleSystem = (
 ) => {
   const inputTypeArgv = process.execArgv.find((argv) =>
     argv.startsWith("--input-type="),
-  )
+  );
   if (inputTypeArgv) {
-    const value = inputTypeArgv.slice("--input-type=".length)
+    const value = inputTypeArgv.slice("--input-type=".length);
     if (value === "module") {
-      return "module"
+      return "module";
     }
     if (value === "commonjs") {
-      return "commonjs"
+      return "commonjs";
     }
   }
-  const extension = extensionFromUrl(url)
+  const extension = extensionFromUrl(url);
   if (extension === ".mjs") {
-    return "module"
+    return "module";
   }
   if (extension === ".cjs") {
-    return "commonjs"
+    return "commonjs";
   }
   if (extension === ".json") {
-    return "url"
+    return "url";
   }
   if (ambiguousExtensions.includes(extension)) {
-    const packageDirectoryUrl = defaultLookupPackageScope(url)
+    const packageDirectoryUrl = defaultLookupPackageScope(url);
     if (!packageDirectoryUrl) {
-      return "commonjs"
+      return "commonjs";
     }
-    const packageJson = defaultReadPackageJson(packageDirectoryUrl)
+    const packageJson = defaultReadPackageJson(packageDirectoryUrl);
     if (packageJson.type === "module") {
-      return "module"
+      return "module";
     }
-    return "commonjs"
+    return "commonjs";
   }
-  return "url"
+  return "url";
   // throw new Error(`unsupported file extension (${extension})`)
-}
+};
 
 const extensionFromUrl = (url) => {
-  const { pathname } = new URL(url)
-  const slashLastIndex = pathname.lastIndexOf("/")
+  const { pathname } = new URL(url);
+  const slashLastIndex = pathname.lastIndexOf("/");
   const filename =
-    slashLastIndex === -1 ? pathname : pathname.slice(slashLastIndex + 1)
-  const dotLastIndex = filename.lastIndexOf(".")
-  if (dotLastIndex === -1) return ""
+    slashLastIndex === -1 ? pathname : pathname.slice(slashLastIndex + 1);
+  const dotLastIndex = filename.lastIndexOf(".");
+  if (dotLastIndex === -1) return "";
   // if (dotLastIndex === pathname.length - 1) return ""
-  const extension = filename.slice(dotLastIndex)
-  return extension
-}
+  const extension = filename.slice(dotLastIndex);
+  return extension;
+};

package/src/errors.js

@@ -1,5 +1,5 @@
 // https://github.com/nodejs/node/blob/0367b5c35ea0f98b323175a4aaa8e651af7a91e7/tools/node_modules/eslint/node_modules/%40babel/core/lib/vendor/import-meta-resolve.js#L2473
-import { fileURLToPath } from "node:url"
+import { fileURLToPath } from "node:url";
 
 export const createInvalidModuleSpecifierError = (
   reason,
@@ -10,59 +10,59 @@ export const createInvalidModuleSpecifierError = (
     `Invalid module "${specifier}" ${reason} imported from ${fileURLToPath(
       parentUrl,
     )}`,
-  )
-  error.code = "INVALID_MODULE_SPECIFIER"
-  return error
-}
+  );
+  error.code = "INVALID_MODULE_SPECIFIER";
+  return error;
+};
 
 export const createInvalidPackageTargetError = (
   reason,
   target,
   { parentUrl, packageDirectoryUrl, key, isImport },
 ) => {
-  let message
+  let message;
   if (key === ".") {
     message = `Invalid "exports" main target defined in ${fileURLToPath(
       packageDirectoryUrl,
-    )}package.json imported from ${fileURLToPath(parentUrl)}; ${reason}`
+    )}package.json imported from ${fileURLToPath(parentUrl)}; ${reason}`;
   } else {
     message = `Invalid "${
       isImport ? "imports" : "exports"
     }" target ${JSON.stringify(target)} defined for "${key}" in ${fileURLToPath(
       packageDirectoryUrl,
-    )}package.json imported from ${fileURLToPath(parentUrl)}; ${reason}`
+    )}package.json imported from ${fileURLToPath(parentUrl)}; ${reason}`;
   }
-  const error = new Error(message)
-  error.code = "INVALID_PACKAGE_TARGET"
-  return error
-}
+  const error = new Error(message);
+  error.code = "INVALID_PACKAGE_TARGET";
+  return error;
+};
 
 export const createPackagePathNotExportedError = (
   subpath,
   { parentUrl, packageDirectoryUrl },
 ) => {
-  let message
+  let message;
   if (subpath === ".") {
     message = `No "exports" main defined in ${fileURLToPath(
       packageDirectoryUrl,
-    )}package.json imported from ${fileURLToPath(parentUrl)}`
+    )}package.json imported from ${fileURLToPath(parentUrl)}`;
   } else {
     message = `Package subpath "${subpath}" is not defined by "exports" in ${fileURLToPath(
       packageDirectoryUrl,
-    )}package.json imported from ${fileURLToPath(parentUrl)}`
+    )}package.json imported from ${fileURLToPath(parentUrl)}`;
   }
-  const error = new Error(message)
-  error.code = "PACKAGE_PATH_NOT_EXPORTED"
-  return error
-}
+  const error = new Error(message);
+  error.code = "PACKAGE_PATH_NOT_EXPORTED";
+  return error;
+};
 
 export const createModuleNotFoundError = (specifier, { parentUrl }) => {
   const error = new Error(
     `Cannot find "${specifier}" imported from ${fileURLToPath(parentUrl)}`,
-  )
-  error.code = "MODULE_NOT_FOUND"
-  return error
-}
+  );
+  error.code = "MODULE_NOT_FOUND";
+  return error;
+};
 
 export const createPackageImportNotDefinedError = (
   specifier,
@@ -72,7 +72,7 @@ export const createPackageImportNotDefinedError = (
     `Package import specifier "${specifier}" is not defined in ${fileURLToPath(
       packageDirectoryUrl,
     )}package.json imported from ${fileURLToPath(parentUrl)}`,
-  )
-  error.code = "PACKAGE_IMPORT_NOT_DEFINED"
-  return error
-}
+  );
+  error.code = "PACKAGE_IMPORT_NOT_DEFINED";
+  return error;
+};

package/src/filesystem_magic_resolution.js

@@ -1,87 +1,95 @@
-import { statSync } from "node:fs"
+import { statSync } from "node:fs";
 
-import { urlToFilename, urlToExtension } from "./url_utils.js"
+import { urlToFilename, urlToExtension } from "./url_utils.js";
 
 export const applyFileSystemMagicResolution = (
   fileUrl,
   { fileStat, magicDirectoryIndex, magicExtensions },
 ) => {
-  let lastENOENTError = null
-  const fileStatOrNull = (url) => {
+  const result = {
+    stat: null,
+    url: fileUrl,
+    magicExtension: "",
+    magicDirectoryIndex: false,
+    lastENOENTError: null,
+  };
+
+  if (fileStat === undefined) {
     try {
-      return statSync(new URL(url))
+      fileStat = statSync(new URL(fileUrl));
     } catch (e) {
       if (e.code === "ENOENT") {
-        lastENOENTError = e
-        return null
+        result.lastENOENTError = e;
+        fileStat = null;
+      } else {
+        throw e;
       }
-      throw e
     }
   }
-  fileStat = fileStat === undefined ? fileStatOrNull(fileUrl) : fileStat
 
   if (fileStat && fileStat.isFile()) {
-    return {
-      found: true,
-      url: fileUrl,
-    }
+    result.stat = fileStat;
+    result.url = fileUrl;
+    return result;
   }
   if (fileStat && fileStat.isDirectory()) {
     if (magicDirectoryIndex) {
-      const indexFileSuffix = fileUrl.endsWith("/") ? "index" : "/index"
-      const indexFileUrl = `${fileUrl}${indexFileSuffix}`
-      const result = applyFileSystemMagicResolution(indexFileUrl, {
+      const indexFileSuffix = fileUrl.endsWith("/") ? "index" : "/index";
+      const indexFileUrl = `${fileUrl}${indexFileSuffix}`;
+      const subResult = applyFileSystemMagicResolution(indexFileUrl, {
         magicDirectoryIndex: false,
         magicExtensions,
-      })
+      });
       return {
         ...result,
+        ...subResult,
         magicDirectoryIndex: true,
-      }
-    }
-    return {
-      found: true,
-      url: fileUrl,
-      isDirectory: true,
+      };
     }
+    result.stat = fileStat;
+    result.url = fileUrl;
+    return result;
   }
+
   if (magicExtensions && magicExtensions.length) {
-    const parentUrl = new URL("./", fileUrl).href
-    const urlFilename = urlToFilename(fileUrl)
-    const extensionLeadingToFile = magicExtensions.find((extensionToTry) => {
-      const urlCandidate = `${parentUrl}${urlFilename}${extensionToTry}`
-      const stat = fileStatOrNull(urlCandidate)
-      return stat
-    })
-    if (extensionLeadingToFile) {
-      // magic extension worked
-      return {
-        found: true,
-        url: `${fileUrl}${extensionLeadingToFile}`,
-        magicExtension: extensionLeadingToFile,
+    const parentUrl = new URL("./", fileUrl).href;
+    const urlFilename = urlToFilename(fileUrl);
+    for (const extensionToTry of magicExtensions) {
+      const urlCandidate = `${parentUrl}${urlFilename}${extensionToTry}`;
+      let stat;
+      try {
+        stat = statSync(new URL(urlCandidate));
+      } catch (e) {
+        if (e.code === "ENOENT") {
+          stat = null;
+        } else {
+          throw e;
+        }
+      }
+      if (stat) {
+        result.stat = stat;
+        result.url = `${fileUrl}${extensionToTry}`;
+        result.magicExtension = extensionToTry;
+        return result;
       }
     }
   }
   // magic extension not found
-  return {
-    found: false,
-    url: fileUrl,
-    lastENOENTError,
-  }
-}
+  return result;
+};
 
 export const getExtensionsToTry = (magicExtensions, importer) => {
   if (!magicExtensions) {
-    return []
+    return [];
   }
-  const extensionsSet = new Set()
+  const extensionsSet = new Set();
   magicExtensions.forEach((magicExtension) => {
     if (magicExtension === "inherit") {
-      const importerExtension = urlToExtension(importer)
-      extensionsSet.add(importerExtension)
+      const importerExtension = urlToExtension(importer);
+      extensionsSet.add(importerExtension);
     } else {
-      extensionsSet.add(magicExtension)
+      extensionsSet.add(magicExtension);
     }
-  })
-  return Array.from(extensionsSet.values())
-}
+  });
+  return Array.from(extensionsSet.values());
+};

package/src/node_builtin_specifiers.js

@@ -2,8 +2,8 @@ export const isSpecifierForNodeBuiltin = (specifier) => {
   return (
     specifier.startsWith("node:") ||
     NODE_BUILTIN_MODULE_SPECIFIERS.includes(specifier)
-  )
-}
+  );
+};
 
 const NODE_BUILTIN_MODULE_SPECIFIERS = [
   "assert",
@@ -81,4 +81,4 @@ const NODE_BUILTIN_MODULE_SPECIFIERS = [
   "zlib",
   // global is special
   "global",
-]
+];