lib: merge cjs and esm package json reader caches

PR-URL: #48477 Reviewed-By: Jacob Smith <[email protected]> Reviewed-By: Geoffrey Booth <[email protected]> Reviewed-By: Mohammed Keyvanzadeh <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: Matteo Collina <[email protected]>

Author: anonrig

lib/internal/modules/cjs/loader.js

@@ -82,7 +82,6 @@ const{
  pendingDeprecate,
  emitExperimentalWarning,
  kEmptyObject,
- filterOwnProperties,
  setOwnProperty,
  getLazy,
 }=require('internal/util');
@@ -355,36 +354,12 @@ function initializeCJS(){
 // -> a.<ext>
 // -> a/index.<ext>
 
-constpackageJsonCache=newSafeMap();
-
+/**
+ * @param{string} requestPath
+ * @return{PackageConfig}
+ */
 functionreadPackage(requestPath){
-constjsonPath=path.resolve(requestPath,'package.json');
-
-constexisting=packageJsonCache.get(jsonPath);
-if(existing!==undefined)returnexisting;
-
-constresult=packageJsonReader.read(jsonPath);
-constjson=result.containsKeys===false ? '{}' : result.string;
-if(json===undefined){
-packageJsonCache.set(jsonPath,false);
-returnfalse;
-}
-
-try{
-constfiltered=filterOwnProperties(JSONParse(json),[
-'name',
-'main',
-'exports',
-'imports',
-'type',
-]);
-packageJsonCache.set(jsonPath,filtered);
-returnfiltered;
-}catch(e){
-e.path=jsonPath;
-e.message='Error parsing '+jsonPath+': '+e.message;
-throwe;
-}
+returnpackageJsonReader.read(path.resolve(requestPath,'package.json'));
 }
 
 let_readPackage=readPackage;
@@ -414,7 +389,7 @@ function readPackageScope(checkPath){
 if(StringPrototypeEndsWith(checkPath,sep+'node_modules'))
 returnfalse;
 constpjson=_readPackage(checkPath+sep);
-if(pjson)return{
+if(pjson.exists)return{
 data: pjson,
 path: checkPath,
 };
@@ -423,7 +398,7 @@ function readPackageScope(checkPath){
 }
 
 functiontryPackage(requestPath,exts,isMain,originalPath){
-constpkg=_readPackage(requestPath)?.main;
+constpkg=_readPackage(requestPath).main;
 
 if(!pkg){
 returntryExtensions(path.resolve(requestPath,'index'),exts,isMain);
@@ -528,9 +503,10 @@ function trySelfParentPath(parent){
 functiontrySelf(parentPath,request){
 if(!parentPath)returnfalse;
 
-const{data: pkg,path: pkgPath}=readPackageScope(parentPath)||{};
-if(!pkg||pkg.exports===undefined)returnfalse;
-if(typeofpkg.name!=='string')returnfalse;
+const{data: pkg,path: pkgPath}=readPackageScope(parentPath);
+if(!pkg||pkg.exports==null||pkg.name===undefined){
+returnfalse;
+}
 
 letexpansion;
 if(request===pkg.name){
@@ -565,7 +541,7 @@ function resolveExports(nmPath, request){
 return;
 constpkgPath=path.resolve(nmPath,name);
 constpkg=_readPackage(pkgPath);
-if(pkg?.exports!=null){
+if(pkg.exists&&pkg.exports!=null){
 try{
 const{ packageExportsResolve }=require('internal/modules/esm/resolve');
 returnfinalizeEsmResolution(packageExportsResolve(
@@ -1028,7 +1004,7 @@ Module._resolveFilename = function(request, parent, isMain, options){
 
 if(request[0]==='#'&&(parent?.filename||parent?.id==='<repl>')){
 constparentPath=parent?.filename??process.cwd()+path.sep;
-constpkg=readPackageScope(parentPath)||{};
+constpkg=readPackageScope(parentPath)||{__proto__: null};
 if(pkg.data?.imports!=null){
 try{
 const{ packageImportsResolve }=require('internal/modules/esm/resolve');
@@ -1274,9 +1250,9 @@ Module._extensions['.js'] = function(module, filename){
 content=fs.readFileSync(filename,'utf8');
 }
 if(StringPrototypeEndsWith(filename,'.js')){
-constpkg=readPackageScope(filename);
+constpkg=readPackageScope(filename)||{__proto__: null};
 // Function require shouldn't be used in ES modules.
-if(pkg?.data?.type==='module'){
+if(pkg.data?.type==='module'){
 constparent=moduleParentCache.get(module);
 constparentPath=parent?.filename;
 constpackageJsonPath=path.resolve(pkg.path,'package.json');

lib/internal/modules/esm/package_config.js

@@ -1,102 +1,10 @@
 'use strict';
 
 const{
- JSONParse,
- ObjectPrototypeHasOwnProperty,
- SafeMap,
  StringPrototypeEndsWith,
 }=primordials;
 const{URL, fileURLToPath }=require('internal/url');
-const{
-ERR_INVALID_PACKAGE_CONFIG,
-}=require('internal/errors').codes;
-
-const{ filterOwnProperties }=require('internal/util');
-
-
-/**
- * @typedef{string | string[] | Record<string, unknown>} Exports
- * @typedef{'module' | 'commonjs'} PackageType
- * @typedef{{
- * pjsonPath: string,
- * exports?: ExportConfig,
- * name?: string,
- * main?: string,
- * type?: PackageType,
- * }} PackageConfig
- */
-
-/** @type{Map<string, PackageConfig>} */
-constpackageJSONCache=newSafeMap();
-
-
-/**
- * @param{string} path
- * @param{string} specifier
- * @param{string | URL | undefined} base
- * @returns{PackageConfig}
- */
-functiongetPackageConfig(path,specifier,base){
-constexisting=packageJSONCache.get(path);
-if(existing!==undefined){
-returnexisting;
-}
-constpackageJsonReader=require('internal/modules/package_json_reader');
-constsource=packageJsonReader.read(path).string;
-if(source===undefined){
-constpackageConfig={
-pjsonPath: path,
-exists: false,
-main: undefined,
-name: undefined,
-type: 'none',
-exports: undefined,
-imports: undefined,
-};
-packageJSONCache.set(path,packageConfig);
-returnpackageConfig;
-}
-
-letpackageJSON;
-try{
-packageJSON=JSONParse(source);
-}catch(error){
-thrownewERR_INVALID_PACKAGE_CONFIG(
-path,
-(base ? `"${specifier}" from ` : '')+fileURLToPath(base||specifier),
-error.message,
-);
-}
-
-let{ imports, main, name, type }=filterOwnProperties(packageJSON,['imports','main','name','type']);
-constexports=ObjectPrototypeHasOwnProperty(packageJSON,'exports') ? packageJSON.exports : undefined;
-if(typeofimports!=='object'||imports===null){
-imports=undefined;
-}
-if(typeofmain!=='string'){
-main=undefined;
-}
-if(typeofname!=='string'){
-name=undefined;
-}
-// Ignore unknown types for forwards compatibility
-if(type!=='module'&&type!=='commonjs'){
-type='none';
-}
-
-constpackageConfig={
-pjsonPath: path,
-exists: true,
- main,
- name,
- type,
- exports,
- imports,
-};
-packageJSONCache.set(path,packageConfig);
-returnpackageConfig;
-}
-
+constpackageJsonReader=require('internal/modules/package_json_reader');
 
 /**
  * @param{URL | string} resolved
@@ -109,7 +17,11 @@ function getPackageScopeConfig(resolved){
 if(StringPrototypeEndsWith(packageJSONPath,'node_modules/package.json')){
 break;
 }
-constpackageConfig=getPackageConfig(fileURLToPath(packageJSONUrl),resolved);
+constpackageConfig=packageJsonReader.read(fileURLToPath(packageJSONUrl),{
+__proto__: null,
+specifier: resolved,
+isESM: true,
+});
 if(packageConfig.exists){
 returnpackageConfig;
 }
@@ -124,7 +36,8 @@ function getPackageScopeConfig(resolved){
 }
 }
 constpackageJSONPath=fileURLToPath(packageJSONUrl);
-constpackageConfig={
+return{
+__proto__: null,
 pjsonPath: packageJSONPath,
 exists: false,
 main: undefined,
@@ -133,12 +46,9 @@ function getPackageScopeConfig(resolved){
 exports: undefined,
 imports: undefined,
 };
-packageJSONCache.set(packageJSONPath,packageConfig);
-returnpackageConfig;
 }
 
 
 module.exports={
- getPackageConfig,
  getPackageScopeConfig,
 };

lib/internal/modules/esm/resolve.js

@@ -53,8 +53,9 @@ const{
 }=require('internal/errors').codes;
 
 const{Module: CJSModule}=require('internal/modules/cjs/loader');
-const{getPackageConfig,getPackageScopeConfig }=require('internal/modules/esm/package_config');
+const{ getPackageScopeConfig }=require('internal/modules/esm/package_config');
 const{ getConditionsSet }=require('internal/modules/esm/utils');
+constpackageJsonReader=require('internal/modules/package_json_reader');
 const{ internalModuleStat }=internalBinding('fs');
 
 /**
@@ -734,8 +735,7 @@ function packageResolve(specifier, base, conditions){
 constpackageConfig=getPackageScopeConfig(base);
 if(packageConfig.exists){
 constpackageJSONUrl=pathToFileURL(packageConfig.pjsonPath);
-if(packageConfig.name===packageName&&
-packageConfig.exports!==undefined&&packageConfig.exports!==null){
+if(packageConfig.exports!=null&&packageConfig.name===packageName){
 returnpackageExportsResolve(
 packageJSONUrl,packageSubpath,packageConfig,base,conditions);
 }
@@ -759,8 +759,8 @@ function packageResolve(specifier, base, conditions){
 }
 
 // Package match.
-constpackageConfig=getPackageConfig(packageJSONPath,specifier,base);
-if(packageConfig.exports!==undefined&&packageConfig.exports!==null){
+constpackageConfig=packageJsonReader.read(packageJSONPath,{__proto__: null,specifier, base,isESM: true});
+if(packageConfig.exports!=null){
 returnpackageExportsResolve(
 packageJSONUrl,packageSubpath,packageConfig,base,conditions);
 }