vfs: align lib/internal/modules/ with upstream main

Restore all files under lib/internal/modules/ to match upstream/main
exactly. VFS module loading is fully handled by Module.registerHooks()
without any patches to the module loader internals.

Author: mcollina

lib/internal/modules/esm/load.js

@@ -9,7 +9,7 @@ const {
 
 const { defaultGetFormat } = require('internal/modules/esm/get_format');
 const { validateAttributes, emitImportAssertionWarning } = require('internal/modules/esm/assert');
-const { readFileSync } = require('internal/modules/helpers');
+const { readFileSync } = require('fs');
 
 const { Buffer: { from: BufferFrom } } = require('buffer');
 

lib/internal/modules/esm/loader.js

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

lib/internal/modules/esm/resolve.js

@@ -29,9 +29,6 @@ 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');
@@ -49,8 +46,7 @@ const {
   ERR_UNSUPPORTED_DIR_IMPORT,
   ERR_UNSUPPORTED_RESOLVE_REQUEST,
 } = require('internal/errors').codes;
-
-const { Module: CJSModule } = require('internal/modules/cjs/loader');
+const { defaultGetFormatWithoutErrors } = require('internal/modules/esm/get_format');
 const { getConditionsSet } = require('internal/modules/esm/utils');
 const packageJsonReader = require('internal/modules/package_json_reader');
 const internalFsBinding = internalBinding('fs');
@@ -873,6 +869,7 @@ 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);
@@ -982,7 +979,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 (inputTypeFlag) { throw new ERR_INPUT_TYPE_NOT_ALLOWED(); }
+    if (getOptionValue('--input-type')) { throw new ERR_INPUT_TYPE_NOT_ALLOWED(); }
   }
 
   conditions = getConditionsSet(conditions);
@@ -992,7 +989,7 @@ function defaultResolve(specifier, context = {}) {
       specifier,
       parentURL,
       conditions,
-      isMain ? preserveSymlinksMain : preserveSymlinks,
+      isMain ? getOptionValue('--preserve-symlinks-main') : getOptionValue('--preserve-symlinks'),
     );
   } catch (error) {
     // Try to give the user a hint of what would have been the
@@ -1046,8 +1043,3 @@ module.exports = {
   packageResolve,
   throwIfInvalidParentURL,
 };
-
-// cycle
-const {
-  defaultGetFormatWithoutErrors,
-} = require('internal/modules/esm/get_format');

lib/internal/modules/esm/translators.js

@@ -22,11 +22,11 @@ const {
 
 const { BuiltinModule } = require('internal/bootstrap/realm');
 const assert = require('internal/assert');
+const { readFileSync } = require('fs');
 const { dirname, extname } = require('path');
 const {
   assertBufferSource,
   loadBuiltinModule,
-  readFileSync,
   stringify,
   stripBOM,
   urlToFilename,

lib/internal/modules/helpers.js

@@ -55,7 +55,6 @@ let debug = require('internal/util/debuglog').debuglog('module', (fn) => {
  * @type {Map<string, string>}
  */
 const realpathCache = new SafeMap();
-
 /**
  * Resolves the path of a given `require` specifier, following symlinks.
  * @param {string} requestPath The `require` specifier
@@ -67,17 +66,6 @@ function toRealPath(requestPath) {
   });
 }
 
-/**
- * Reads a file from disk via the `fs` module reference, which may be
- * monkey-patched by VFS to intercept reads for virtual paths.
- * @param {string} path The file path
- * @param {string|object} options Read options
- * @returns {string|Buffer}
- */
-function readFileSync(path, options) {
-  return fs.readFileSync(path, options);
-}
-
 /** @type {Set<string>} */
 let cjsConditions;
 /** @type {string[]} */
@@ -144,7 +132,7 @@ let isSEABuiltinWarningNeeded_;
 function isSEABuiltinWarningNeeded() {
   if (isSEABuiltinWarningNeeded_ === undefined) {
     const { isExperimentalSeaWarningNeeded, isSea } = internalBinding('sea');
-    isSEABuiltinWarningNeeded_ = isSea && isExperimentalSeaWarningNeeded();
+    isSEABuiltinWarningNeeded_ = isSea() && isExperimentalSeaWarningNeeded();
   }
   return isSEABuiltinWarningNeeded_;
 }
@@ -523,7 +511,6 @@ module.exports = {
   loadBuiltinModule,
   makeRequireFunction,
   normalizeReferrerURL,
-  readFileSync,
   stringify,
   stripBOM,
   toRealPath,

lib/internal/modules/package_json_reader.js

@@ -25,9 +25,9 @@ const {
 } = require('internal/errors');
 const { kEmptyObject } = require('internal/util');
 const modulesBinding = internalBinding('modules');
-const internalFsBinding = internalBinding('fs');
 const path = require('path');
 const { validateString } = require('internal/validators');
+const internalFsBinding = internalBinding('fs');
 
 
 /**

lib/internal/modules/typescript.js

@@ -4,7 +4,6 @@ const {
   ObjectPrototypeHasOwnProperty,
 } = primordials;
 const {
-  validateBoolean,
   validateOneOf,
   validateObject,
   validateString,
@@ -25,17 +24,9 @@ const { Buffer } = require('buffer');
 const {
   getCompileCacheEntry,
   saveCompileCacheEntry,
-  cachedCodeTypes: { kStrippedTypeScript, kTransformedTypeScript, kTransformedTypeScriptWithSourceMaps },
+  cachedCodeTypes: { kStrippedTypeScript },
 } = internalBinding('modules');
 
-/**
- * The TypeScript parsing mode, either 'strip-only' or 'transform'.
- * @type {function(): TypeScriptMode}
- */
-const getTypeScriptParsingMode = getLazy(() =>
-  (getOptionValue('--experimental-transform-types') ?
-    (emitExperimentalWarning('Transform Types'), 'transform') : 'strip-only'),
-);
 
 /**
  * Load the TypeScript parser.
@@ -109,8 +100,7 @@ function stripTypeScriptTypes(code, options = kEmptyObject) {
     sourceUrl = '',
   } = options;
   let { mode = 'strip' } = options;
-  validateOneOf(mode, 'options.mode', ['strip', 'transform']);
-  validateBoolean(sourceMap, 'options.sourceMap');
+  validateOneOf(mode, 'options.mode', ['strip']);
   validateString(sourceUrl, 'options.sourceUrl');
   if (mode === 'strip') {
     validateOneOf(sourceMap, 'options.sourceMap', [false, undefined]);
@@ -122,7 +112,6 @@ function stripTypeScriptTypes(code, options = kEmptyObject) {
 
   return processTypeScriptCode(code, {
     mode,
-    sourceMap,
     filename: sourceUrl,
   });
 }
@@ -156,19 +145,6 @@ function processTypeScriptCode(code, options) {
   return transformedCode;
 }
 
-/**
- * Get the type enum used for compile cache.
- * @param {TypeScriptMode} mode Mode of transpilation.
- * @param {boolean} sourceMap Whether source maps are enabled.
- * @returns {number}
- */
-function getCachedCodeType(mode, sourceMap) {
-  if (mode === 'transform') {
-    if (sourceMap) { return kTransformedTypeScriptWithSourceMaps; }
-    return kTransformedTypeScript;
-  }
-  return kStrippedTypeScript;
-}
 
 /**
  * Performs type-stripping to TypeScript source code internally.
@@ -184,24 +160,18 @@ function stripTypeScriptModuleTypes(source, filename) {
   }
   const sourceMap = getOptionValue('--enable-source-maps');
 
-  const mode = getTypeScriptParsingMode();
-
-  // Instead of caching the compile cache status, just go into C++ to fetch it,
-  // as checking process.env equally involves calling into C++ anyway, and
-  // the compile cache can be enabled dynamically.
-  const type = getCachedCodeType(mode, sourceMap);
   // Get a compile cache entry into the native compile cache store,
   // keyed by the filename. If the cache can already be loaded on disk,
   // cached.transpiled contains the cached string. Otherwise we should do
   // the transpilation and save it in the native store later using
   // saveCompileCacheEntry().
-  const cached = (filename ? getCompileCacheEntry(source, filename, type) : undefined);
+  const cached = (filename ? getCompileCacheEntry(source, filename, kStrippedTypeScript) : undefined);
   if (cached?.transpiled) {  // TODO(joyeecheung): return Buffer here.
     return cached.transpiled;
   }
 
   const options = {
-    mode,
+    mode: 'strip-only',
     sourceMap,
     filename,
   };

test/parallel/test-bootstrap-modules.js

@@ -131,6 +131,7 @@ 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));