lib: disambiguate native module to builtin module

daeyeon · targos · commit 353339a55273 · 2022-12-13T09:42:42.000Z
Signed-off-by: Daeyeon Jeong <daeyeon.dev@gmail.com> PR-URL: #45673 Refs: #44135 Reviewed-By: Chengzhong Wu <legendecas@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
diff --git a/lib/internal/bootstrap/loaders.js b/lib/internal/bootstrap/loaders.js
@@ -144,7 +144,7 @@ const schemelessBlockList = new SafeSet([
 'DEP0111');
 }
 if (legacyWrapperList.has(module)) {
- return nativeModuleRequire('internal/legacy/processbinding')[module]();
+ return requireBuiltin('internal/legacy/processbinding')[module]();
 }
 return internalBinding(module);
 }
@@ -285,14 +285,14 @@ class BuiltinModule {
 // TODO(aduh95): move this to C++, alongside the initialization of the class.
 ObjectSetPrototypeOf(ModuleWrap.prototype, null);
 const url = `node:${this.id}`;
- const nativeModule = this;
+ const builtin = this;
 const exportsKeys = ArrayPrototypeSlice(this.exportKeys);
 ArrayPrototypePush(exportsKeys, 'default');
 this.module = new ModuleWrap(
 url, undefined, exportsKeys,
 function() {
- nativeModule.syncExports();
- this.setExport('default', nativeModule.exports);
+ builtin.syncExports();
+ this.setExport('default', builtin.exports);
 });
 // Ensure immediate sync execution to capture exports now
 this.module.instantiate();
@@ -326,7 +326,7 @@ class BuiltinModule {
 
 try {
 const requireFn = StringPrototypeStartsWith(this.id, 'internal/deps/') ?
- requireWithFallbackInDeps : nativeModuleRequire;
+ requireWithFallbackInDeps : requireBuiltin;
 
 const fn = compileFunction(id);
 // Arguments must match the parameters specified in
@@ -350,10 +350,10 @@ class BuiltinModule {
 const loaderExports = {
 internalBinding,
 BuiltinModule,
- require: nativeModuleRequire
+ require: requireBuiltin
 };
 
-function nativeModuleRequire(id) {
+function requireBuiltin(id) {
 if (id === loaderId) {
 return loaderExports;
 }
@@ -371,7 +371,7 @@ function requireWithFallbackInDeps(request) {
 if (!BuiltinModule.map.has(request)) {
 request = `internal/deps/${request}`;
 }
- return nativeModuleRequire(request);
+ return requireBuiltin(request);
 }
 
 // Pass the exports back to C++ land for C++ internals to use.

-Original file line number
+Diff line change
 'DEP0111');
+}
 if(legacyWrapperList.has(module)){
 -returnnativeModuleRequire('internal/legacy/processbinding')[module]();
 +returnrequireBuiltin('internal/legacy/processbinding')[module]();
+}
 returninternalBinding(module);
+}
 // TODO(aduh95): move this to C++, alongside the initialization of the class.
 ObjectSetPrototypeOf(ModuleWrap.prototype,null);
 consturl=`node:${this.id}`;
 -constnativeModule=this;
 +constbuiltin=this;
 constexportsKeys=ArrayPrototypeSlice(this.exportKeys);
 ArrayPrototypePush(exportsKeys,'default');
 this.module=newModuleWrap(
 url,undefined,exportsKeys,
 function(){
 -nativeModule.syncExports();
 -this.setExport('default',nativeModule.exports);
 +builtin.syncExports();
 +this.setExport('default',builtin.exports);
 });
 // Ensure immediate sync execution to capture exports now
 this.module.instantiate();
 try{
 constrequireFn=StringPrototypeStartsWith(this.id,'internal/deps/') ?
 -requireWithFallbackInDeps : nativeModuleRequire;
 +requireWithFallbackInDeps : requireBuiltin;
 constfn=compileFunction(id);
 // Arguments must match the parameters specified in
 constloaderExports={
  internalBinding,
  BuiltinModule,
 -require: nativeModuleRequire
 +require: requireBuiltin
 };
 -functionnativeModuleRequire(id){
 +functionrequireBuiltin(id){
 if(id===loaderId){
 returnloaderExports;
+}
 if(!BuiltinModule.map.has(request)){
 request=`internal/deps/${request}`;
+}
 -returnnativeModuleRequire(request);
 +returnrequireBuiltin(request);
+}
 // Pass the exports back to C++ land for C++ internals to use.