lib: load internal/fs/watchers and internal/fs/read_file_context early

joyeecheung · danielleadams · commit 5d9442a02462 · 2021-05-31T15:34:56.000-04:00
So that they are included in the builtin snapshot PR-URL: #38737 Refs: #35711 Reviewed-By: Anna Henningsen <anna@addaleax.net>
diff --git a/lib/fs.js b/lib/fs.js
@@ -138,13 +138,14 @@ const {
 validateInteger,
 } = require('internal/validators');
 
+const watchers = require('internal/fs/watchers');
+const ReadFileContext = require('internal/fs/read_file_context');
+
 let truncateWarn = true;
 let fs;
 
 // Lazy loaded
 let promises = null;
-let watchers;
-let ReadFileContext;
 let ReadStream;
 let WriteStream;
 let rimraf;
@@ -369,8 +370,6 @@ function checkAborted(signal, callback) {
 function readFile(path, options, callback) {
 callback = maybeCallback(callback || options);
 options = getOptions(options, { flag: 'r' });
- if (!ReadFileContext)
- ReadFileContext = require('internal/fs/read_file_context');
 const context = new ReadFileContext(callback, options.encoding);
 context.isUserFd = isFd(path); // File descriptor ownership
 
@@ -2234,8 +2233,6 @@ function watch(filename, options, listener) {
 if (options.recursive === undefined) options.recursive = false;
 if (options.recursive && !(isOSX || isWindows))
 throw new ERR_FEATURE_UNAVAILABLE_ON_PLATFORM('watch recursively');
- if (!watchers)
- watchers = require('internal/fs/watchers');
 const watcher = new watchers.FSWatcher();
 watcher[watchers.kFSWatchStart](filename,
 options.persistent,
@@ -2301,8 +2298,6 @@ function watchFile(filename, options, listener) {
 stat = statWatchers.get(filename);
 
 if (stat === undefined) {
- if (!watchers)
- watchers = require('internal/fs/watchers');
 stat = new watchers.StatWatcher(options.bigint);
 stat[watchers.kFSStatWatcherStart](filename,
 options.persistent, options.interval);
diff --git a/test/parallel/test-bootstrap-modules.js b/test/parallel/test-bootstrap-modules.js
@@ -56,6 +56,7 @@ const expectedModules = new Set([
 'NativeModule internal/fs/dir',
 'NativeModule internal/fs/utils',
 'NativeModule internal/fs/promises',
+ 'NativeModule internal/fs/read_file_context',
 'NativeModule internal/fs/rimraf',
 'NativeModule internal/fs/watchers',
 'NativeModule internal/heap_utils',

-Original file line number
+Diff line change
  validateInteger,
 }=require('internal/validators');
 +constwatchers=require('internal/fs/watchers');
 +constReadFileContext=require('internal/fs/read_file_context');
++
 lettruncateWarn=true;
 letfs;
 // Lazy loaded
 letpromises=null;
 -letwatchers;
 -letReadFileContext;
 letReadStream;
 letWriteStream;
 letrimraf;
 functionreadFile(path,options,callback){
 callback=maybeCallback(callback||options);
 options=getOptions(options,{flag: 'r'});
 -if(!ReadFileContext)
 -ReadFileContext=require('internal/fs/read_file_context');
 constcontext=newReadFileContext(callback,options.encoding);
 context.isUserFd=isFd(path);// File descriptor ownership
 if(options.recursive===undefined)options.recursive=false;
 if(options.recursive&&!(isOSX||isWindows))
 thrownewERR_FEATURE_UNAVAILABLE_ON_PLATFORM('watch recursively');
 -if(!watchers)
 -watchers=require('internal/fs/watchers');
 constwatcher=newwatchers.FSWatcher();
 watcher[watchers.kFSWatchStart](filename,
 options.persistent,
 stat=statWatchers.get(filename);
 if(stat===undefined){
 -if(!watchers)
 -watchers=require('internal/fs/watchers');
 stat=newwatchers.StatWatcher(options.bigint);
 stat[watchers.kFSStatWatcherStart](filename,
 options.persistent,options.interval);