vfs: revert non-VFS changes in cjs/loader.js and esm/resolve.js

Revert changes to cjs/loader.js (extensionless file format detection)
and esm/resolve.js (refactoring, bug fix, circular dep changes) that
are not needed for VFS. Restore lazy loading of defaultResolve and
defaultLoadSync in esm/loader.js to avoid snapshot build failure since
the reverted resolve.js has top-level getOptionValue calls.

Author: mcollina

lib/internal/modules/cjs/loader.js

@@ -1931,15 +1931,6 @@ Module._extensions['.js'] = function(module, filename) {
     } else {
       format = 'typescript';
     }
-  } else if (path.extname(filename) === '') {
-    // Extensionless files skip the .js suffix check above. When type is explicit,
-    // follow it so ESM syntax surfaces as SyntaxError for commonjs instead of
-    // silently delegating to ESM.
-    pkg = packageJsonReader.getNearestParentPackageJSON(filename);
-    const typeFromPjson = pkg?.data?.type;
-    if (typeFromPjson === 'commonjs' || typeFromPjson === 'module') {
-      format = typeFromPjson;
-    }
   }
   const { source, format: loadedFormat } = loadSource(module, filename, format);
   // Function require shouldn't be used in ES modules when require(esm) is disabled.

lib/internal/modules/esm/loader.js

@@ -99,8 +99,8 @@ function newLoadCache() {
 }
 
 const { translators } = require('internal/modules/esm/translators');
-const { defaultResolve } = require('internal/modules/esm/resolve');
-const { defaultLoadSync, throwUnknownModuleFormat } = require('internal/modules/esm/load');
+
+let defaultResolve, defaultLoadSync;
 
 /**
  * Generate message about potential race condition caused by requiring a cached module that has started
@@ -694,6 +694,7 @@ class ModuleLoader {
       return cachedResult;
     }
 
+    defaultResolve ??= require('internal/modules/esm/resolve').defaultResolve;
     const result = defaultResolve(specifier, context);
     this.#resolveCache.set(requestKey, parentURL, result);
     return result;
@@ -770,6 +771,7 @@ class ModuleLoader {
     if (this.#asyncLoaderHooks?.loadSync) {
       return this.#asyncLoaderHooks.loadSync(url, context);
     }
+    defaultLoadSync ??= require('internal/modules/esm/load').defaultLoadSync;
     return defaultLoadSync(url, context);
   }
 
@@ -795,7 +797,7 @@ class ModuleLoader {
 
   validateLoadResult(url, format) {
     if (format == null) {
-      throwUnknownModuleFormat(url, format);
+      require('internal/modules/esm/load').throwUnknownModuleFormat(url, format);
     }
   }
 

lib/internal/modules/esm/resolve.js

@@ -9,6 +9,7 @@ const {
   ObjectPrototypeHasOwnProperty,
   RegExpPrototypeExec,
   RegExpPrototypeSymbolReplace,
+  SafeMap,
   SafeSet,
   String,
   StringPrototypeEndsWith,
@@ -22,12 +23,15 @@ const {
   encodeURIComponent,
 } = primordials;
 const assert = require('internal/assert');
+const internalFS = require('internal/fs/utils');
 const { BuiltinModule } = require('internal/bootstrap/realm');
-const { toRealPath } = require('internal/modules/helpers');
-const internalFsBinding = internalBinding('fs');
+const { realpathSync } = require('fs');
 const { getOptionValue } = require('internal/options');
 // Do not eagerly grab .manifest, it may be in TDZ
 const { sep, posix: { relative: relativePosixPath }, resolve } = require('path');
+const preserveSymlinks = getOptionValue('--preserve-symlinks');
+const preserveSymlinksMain = getOptionValue('--preserve-symlinks-main');
+const inputTypeFlag = getOptionValue('--input-type');
 const { URL, pathToFileURL, fileURLToPath, isURL, URLParse } = require('internal/url');
 const { getCWDURL, setOwnProperty } = require('internal/util');
 const { canParse: URLCanParse } = internalBinding('url');
@@ -45,9 +49,11 @@ const {
   ERR_UNSUPPORTED_DIR_IMPORT,
   ERR_UNSUPPORTED_RESOLVE_REQUEST,
 } = require('internal/errors').codes;
-const { defaultGetFormatWithoutErrors } = require('internal/modules/esm/get_format');
+
+const { Module: CJSModule } = require('internal/modules/cjs/loader');
 const { getConditionsSet } = require('internal/modules/esm/utils');
 const packageJsonReader = require('internal/modules/package_json_reader');
+const internalFsBinding = internalBinding('fs');
 
 /**
  * @typedef {import('internal/modules/esm/package_config.js').PackageConfig} PackageConfig
@@ -147,6 +153,8 @@ function emitLegacyIndexDeprecation(url, path, pkgPath, base, main) {
   }
 }
 
+const realpathCache = new SafeMap();
+
 const legacyMainResolveExtensions = [
   '',
   '.js',
@@ -241,7 +249,7 @@ function finalizeResolution(resolved, base, preserveSymlinks) {
   }
 
   const stats = internalFsBinding.internalModuleStat(
-    StringPrototypeEndsWith(path, '/') ? StringPrototypeSlice(path, -1) : path,
+    StringPrototypeEndsWith(internalFsBinding, path, '/') ? StringPrototypeSlice(path, -1) : path,
   );
 
   // Check for stats.isDirectory()
@@ -269,7 +277,9 @@ function finalizeResolution(resolved, base, preserveSymlinks) {
   }
 
   if (!preserveSymlinks) {
-    const real = toRealPath(path);
+    const real = realpathSync(path, {
+      [internalFS.realpathCacheKey]: realpathCache,
+    });
     const { search, hash } = resolved;
     resolved =
         pathToFileURL(real + (StringPrototypeEndsWith(path, sep) ? '/' : ''));
@@ -863,7 +873,6 @@ function moduleResolve(specifier, base, conditions, preserveSymlinks) {
  */
 function resolveAsCommonJS(specifier, parentURL) {
   try {
-    const { Module: CJSModule } = require('internal/modules/cjs/loader');
     const parent = fileURLToPath(parentURL);
     const tmpModule = new CJSModule(parent, null);
     tmpModule.paths = CJSModule._nodeModulePaths(parent);
@@ -973,7 +982,7 @@ function defaultResolve(specifier, context = {}) {
     // input, to avoid user confusion over how expansive the effect of the
     // flag should be (i.e. entry point only, package scope surrounding the
     // entry point, etc.).
-    if (getOptionValue('--input-type')) { throw new ERR_INPUT_TYPE_NOT_ALLOWED(); }
+    if (inputTypeFlag) { throw new ERR_INPUT_TYPE_NOT_ALLOWED(); }
   }
 
   conditions = getConditionsSet(conditions);
@@ -983,7 +992,7 @@ function defaultResolve(specifier, context = {}) {
       specifier,
       parentURL,
       conditions,
-      isMain ? getOptionValue('--preserve-symlinks-main') : getOptionValue('--preserve-symlinks'),
+      isMain ? preserveSymlinksMain : preserveSymlinks,
     );
   } catch (error) {
     // Try to give the user a hint of what would have been the
@@ -1037,3 +1046,8 @@ module.exports = {
   packageResolve,
   throwIfInvalidParentURL,
 };
+
+// cycle
+const {
+  defaultGetFormatWithoutErrors,
+} = require('internal/modules/esm/get_format');

test/es-module/test-extensionless-esm-type-commonjs.js

@@ -131,7 +131,6 @@ if (isMainThread) {
     'NativeModule internal/modules/esm/assert',
     'NativeModule internal/modules/esm/loader',
     'NativeModule internal/modules/esm/load',
-    'NativeModule internal/modules/esm/resolve',
     'NativeModule internal/modules/esm/translators',
     'NativeModule url',
   ].forEach(expected.beforePreExec.add.bind(expected.beforePreExec));