lib: improve esm resolve performance

PR-URL: nodejs/node#46652 Refs: nodejs/performance#39 Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Michaël Zasso <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Rafael Gonzaga <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Erick Wendel <[email protected]> Reviewed-By: Geoffrey Booth <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]>
sercher · Apr 24, 2024 · 3fe9d3f · 3fe9d3f
1 parent 6e13d32
commit 3fe9d3f
Showing 1 changed file with 16 additions and 22 deletions.
diff --git a/graal-nodejs/lib/internal/modules/esm/resolve.js b/graal-nodejs/lib/internal/modules/esm/resolve.js
@@ -25,24 +25,20 @@ const {
 } = primordials;
 const internalFS = require('internal/fs/utils');
 const { BuiltinModule } = require('internal/bootstrap/realm');
-const {
-  realpathSync,
-  statSync,
-  Stats,
-} = require('fs');
+const { realpathSync } = require('fs');
 const { getOptionValue } = require('internal/options');
 const pendingDeprecation = getOptionValue('--pending-deprecation');
 // Do not eagerly grab .manifest, it may be in TDZ
 const policy = getOptionValue('--experimental-policy') ?
   require('internal/process/policy') :
   null;
-const { sep, relative, resolve } = require('path');
+const { sep, relative, resolve, toNamespacedPath } = require('path');
 const preserveSymlinks = getOptionValue('--preserve-symlinks');
 const preserveSymlinksMain = getOptionValue('--preserve-symlinks-main');
 const experimentalNetworkImports =
   getOptionValue('--experimental-network-imports');
 const typeFlag = getOptionValue('--input-type');
-const { URL, pathToFileURL, fileURLToPath } = require('internal/url');
+const { URL, pathToFileURL, fileURLToPath, toPathIfFileURL } = require('internal/url');
 const {
   ERR_INPUT_TYPE_NOT_ALLOWED,
   ERR_INVALID_MODULE_SPECIFIER,
@@ -60,6 +56,7 @@ const { Module: CJSModule } = require('internal/modules/cjs/loader');
 const packageJsonReader = require('internal/modules/package_json_reader');
 const { getPackageConfig, getPackageScopeConfig } = require('internal/modules/esm/package_config');
 const { getConditionsSet } = require('internal/modules/esm/utils');
+const { internalModuleStat } = internalBinding('fs');
 
 /**
  * @typedef {import('internal/modules/esm/package_config.js').PackageConfig} PackageConfig
@@ -138,19 +135,12 @@ function emitLegacyIndexDeprecation(url, packageJSONUrl, base, main) {
 
 const realpathCache = new SafeMap();
 
-/**
- * @param {string | URL} path
- * @returns {import('fs').Stats}
- */
-const tryStatSync =
-  (path) => statSync(path, { throwIfNoEntry: false }) ?? new Stats();
-
 /**
  * @param {string | URL} url
  * @returns {boolean}
  */
 function fileExists(url) {
-  return statSync(url, { throwIfNoEntry: false })?.isFile() ?? false;
+  return internalModuleStat(toNamespacedPath(toPathIfFileURL(url))) === 0;
 }
 
 /**
@@ -285,13 +275,16 @@ function finalizeResolution(resolved, base, preserveSymlinks) {
     path = fileURLToPath(resolved);
   }
 
-  const stats = tryStatSync(StringPrototypeEndsWith(path, '/') ?
-    StringPrototypeSlice(path, -1) : path);
-  if (stats.isDirectory()) {
+  const stats = internalModuleStat(toNamespacedPath(StringPrototypeEndsWith(path, '/') ?
+    StringPrototypeSlice(path, -1) : path));
+
+  // Check for stats.isDirectory()
+  if (stats === 1) {
     const err = new ERR_UNSUPPORTED_DIR_IMPORT(path, fileURLToPath(base));
     err.url = String(resolved);
     throw err;
-  } else if (!stats.isFile()) {
+  } else if (stats !== 0) {
+    // Check for !stats.isFile()
     if (process.env.WATCH_REPORT_DEPENDENCIES && process.send) {
       process.send({ 'watch:require': [path || resolved.pathname] });
     }
@@ -826,9 +819,10 @@ function packageResolve(specifier, base, conditions) {
   let packageJSONPath = fileURLToPath(packageJSONUrl);
   let lastPath;
   do {
-    const stat = tryStatSync(StringPrototypeSlice(packageJSONPath, 0,
-                                                  packageJSONPath.length - 13));
-    if (!stat.isDirectory()) {
+    const stat = internalModuleStat(toNamespacedPath(StringPrototypeSlice(packageJSONPath, 0,
+                                                                          packageJSONPath.length - 13)));
+    // Check for !stat.isDirectory()
+    if (stat !== 1) {
       lastPath = packageJSONPath;
       packageJSONUrl = new URL((isScoped ?
         '../../../../node_modules/' : '../../../node_modules/') +