module: use optional chaining in cjs/loader.js

RaisinTen · danielleadams · commit a693baa0cb25 · 2021-02-16T09:12:52.000-05:00
PR-URL: #37238 Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Zijian Liu <lxxyxzj@gmail.com> Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -153,7 +153,7 @@ function stat(filename) {
 }
 
 function updateChildren(parent, child, scan) {
- const children = parent && parent.children;
+ const children = parent?.children;
 if (children && !(scan && ArrayPrototypeIncludes(children, child)))
 ArrayPrototypePush(children, child);
 }
@@ -467,7 +467,7 @@ function resolveExports(nmPath, request) {
 return;
 const pkgPath = path.resolve(nmPath, name);
 const pkg = readPackage(pkgPath);
- if (pkg && pkg.exports !== null && pkg.exports !== undefined) {
+ if (pkg?.exports != null) {
 try {
 return finalizeEsmResolution(packageExportsResolve(
 pathToFileURL(pkgPath + '/package.json'), '.' + expansion, pkg, null,
@@ -668,7 +668,7 @@ Module._resolveLookupPaths = function(request, parent) {
 (!isWindows || StringPrototypeCharAt(request, 1) !== '\\'))) {
 
 let paths = modulePaths;
- if (parent != null && parent.paths && parent.paths.length) {
+ if (parent?.paths?.length) {
 paths = ArrayPrototypeConcat(parent.paths, paths);
 }
 
@@ -781,7 +781,7 @@ Module._load = function(request, parent, isMain) {
 }
 
 const mod = loadNativeModule(filename, request);
- if (mod && mod.canBeRequiredByUsers) return mod.exports;
+ if (mod?.canBeRequiredByUsers) return mod.exports;
 
 // Don't call updateChildren(), Module constructor already does.
 const module = cachedModule || new Module(filename, parent);
@@ -817,7 +817,7 @@ Module._load = function(request, parent, isMain) {
 delete Module._cache[filename];
 if (parent !== undefined) {
 delete relativeResolveCache[relResolveCacheIdentifier];
- const children = parent && parent.children;
+ const children = parent?.children;
 if (ArrayIsArray(children)) {
 const index = ArrayPrototypeIndexOf(children, module);
 if (index !== -1) {
@@ -877,11 +877,10 @@ Module._resolveFilename = function(request, parent, isMain, options) {
 paths = Module._resolveLookupPaths(request, parent);
 }
 
- if (parent && parent.filename) {
+ if (parent?.filename) {
 if (request[0] === '#') {
 const pkg = readPackageScope(parent.filename) || {};
- if (pkg.data && pkg.data.imports !== null &&
- pkg.data.imports !== undefined) {
+ if (pkg.data?.imports != null) {
 try {
 return finalizeEsmResolution(
 packageImportsResolve(request, pathToFileURL(parent.filename),
@@ -1102,17 +1101,17 @@ Module._extensions['.js'] = function(module, filename) {
 if (StringPrototypeEndsWith(filename, '.js')) {
 const pkg = readPackageScope(filename);
 // Function require shouldn't be used in ES modules.
- if (pkg && pkg.data && pkg.data.type === 'module') {
+ if (pkg?.data?.type === 'module') {
 const parent = moduleParentCache.get(module);
- const parentPath = parent && parent.filename;
+ const parentPath = parent?.filename;
 const packageJsonPath = path.resolve(pkg.path, 'package.json');
 throw new ERR_REQUIRE_ESM(filename, parentPath, packageJsonPath);
 }
 }
 // If already analyzed the source, then it will be cached.
 const cached = cjsParseCache.get(module);
 let content;
- if (cached && cached.source) {
+ if (cached?.source) {
 content = cached.source;
 cached.source = undefined;
 } else {

-Original file line number
+Diff line change
+}
 functionupdateChildren(parent,child,scan){
 -constchildren=parent&&parent.children;
 +constchildren=parent?.children;
 if(children&&!(scan&&ArrayPrototypeIncludes(children,child)))
 ArrayPrototypePush(children,child);
+}
 return;
 constpkgPath=path.resolve(nmPath,name);
 constpkg=readPackage(pkgPath);
 -if(pkg&&pkg.exports!==null&&pkg.exports!==undefined){
 +if(pkg?.exports!=null){
 try{
 returnfinalizeEsmResolution(packageExportsResolve(
 pathToFileURL(pkgPath+'/package.json'),'.'+expansion,pkg,null,
 (!isWindows||StringPrototypeCharAt(request,1)!=='\\'))){
 letpaths=modulePaths;
 -if(parent!=null&&parent.paths&&parent.paths.length){
 +if(parent?.paths?.length){
 paths=ArrayPrototypeConcat(parent.paths,paths);
+}
+}
 constmod=loadNativeModule(filename,request);
 -if(mod&&mod.canBeRequiredByUsers)returnmod.exports;
 +if(mod?.canBeRequiredByUsers)returnmod.exports;
 // Don't call updateChildren(), Module constructor already does.
 constmodule=cachedModule||newModule(filename,parent);
 deleteModule._cache[filename];
 if(parent!==undefined){
 deleterelativeResolveCache[relResolveCacheIdentifier];
 -constchildren=parent&&parent.children;
 +constchildren=parent?.children;
 if(ArrayIsArray(children)){
 constindex=ArrayPrototypeIndexOf(children,module);
 if(index!==-1){
 paths=Module._resolveLookupPaths(request,parent);
+}
 -if(parent&&parent.filename){
 +if(parent?.filename){
 if(request[0]==='#'){
 constpkg=readPackageScope(parent.filename)||{};
 -if(pkg.data&&pkg.data.imports!==null&&
 -pkg.data.imports!==undefined){
 +if(pkg.data?.imports!=null){
 try{
 returnfinalizeEsmResolution(
 packageImportsResolve(request,pathToFileURL(parent.filename),
 if(StringPrototypeEndsWith(filename,'.js')){
 constpkg=readPackageScope(filename);
 // Function require shouldn't be used in ES modules.
 -if(pkg&&pkg.data&&pkg.data.type==='module'){
 +if(pkg?.data?.type==='module'){
 constparent=moduleParentCache.get(module);
 -constparentPath=parent&&parent.filename;
 +constparentPath=parent?.filename;
 constpackageJsonPath=path.resolve(pkg.path,'package.json');
 thrownewERR_REQUIRE_ESM(filename,parentPath,packageJsonPath);
+}
+}
 // If already analyzed the source, then it will be cached.
 constcached=cjsParseCache.get(module);
 letcontent;
 -if(cached&&cached.source){
 +if(cached?.source){
 content=cached.source;
 cached.source=undefined;
 }else{