module: merge config with package_json_reader

PR-URL: #50322 Reviewed-By: Jacob Smith <[email protected]> Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Antoine du Hamel <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Geoffrey Booth <[email protected]>

Author: anonrig

lib/internal/modules/esm/get_format.js

@@ -19,7 +19,7 @@ const{
 constexperimentalNetworkImports=
 getOptionValue('--experimental-network-imports');
 const{ containsModuleSyntax }=internalBinding('contextify');
-const{ getPackageType }=require('internal/modules/esm/package_config');
+const{ getPackageType }=require('internal/modules/package_json_reader');
 const{ fileURLToPath }=require('internal/url');
 const{ERR_UNKNOWN_FILE_EXTENSION}=require('internal/errors').codes;
 

lib/internal/modules/esm/module_job.js

@@ -228,7 +228,7 @@ class ModuleJob{
 constpackageConfig=
 StringPrototypeStartsWith(this.module.url,'file://')&&
 RegExpPrototypeExec(/\.js(\?[^#]*)?(#.*)?$/,this.module.url)!==null&&
-require('internal/modules/esm/package_config')
+require('internal/modules/package_json_reader')
 .getPackageScopeConfig(this.module.url);
 if(packageConfig.type==='module'){
 e.message+=

lib/internal/modules/esm/package_config.js

@@ -55,7 +55,6 @@ const{
 }=require('internal/errors').codes;
 
 const{Module: CJSModule}=require('internal/modules/cjs/loader');
-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');
@@ -687,7 +686,7 @@ function packageImportsResolve(name, base, conditions){
 thrownewERR_INVALID_MODULE_SPECIFIER(name,reason,fileURLToPath(base));
 }
 letpackageJSONUrl;
-constpackageConfig=getPackageScopeConfig(base);
+constpackageConfig=packageJsonReader.getPackageScopeConfig(base);
 if(packageConfig.exists){
 packageJSONUrl=pathToFileURL(packageConfig.pjsonPath);
 constimports=packageConfig.imports;
@@ -796,7 +795,7 @@ function packageResolve(specifier, base, conditions){
 parsePackageName(specifier,base);
 
 // ResolveSelf
-constpackageConfig=getPackageScopeConfig(base);
+constpackageConfig=packageJsonReader.getPackageScopeConfig(base);
 if(packageConfig.exists){
 constpackageJSONUrl=pathToFileURL(packageConfig.pjsonPath);
 if(packageConfig.exports!=null&&packageConfig.name===packageName){

lib/internal/modules/esm/resolve.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const{
+ ArrayIsArray,
  JSONParse,
  StringPrototypeSlice,
  StringPrototypeLastIndexOf,
@@ -149,11 +150,42 @@ function getNearestParentPackageJSON(checkPath){
 return{ data, path };
 }
 
+/**
+ * Returns the package configuration for the given resolved URL.
+ * @param{URL | string} resolved - The resolved URL.
+ * @returns{import('typings/internalBinding/modules').PackageConfig} - The package configuration.
+ */
+functiongetPackageScopeConfig(resolved){
+constresult=modulesBinding.getPackageScopeConfig(`${resolved}`);
+
+if(ArrayIsArray(result)){
+returndeserializePackageJSON(`${resolved}`,result,false/* checkIntegrity */);
+}
+
+// This means that the response is a string
+// and it is the path to the package.json file
+return{
+__proto__: null,
+pjsonPath: result,
+exists: false,
+type: 'none',
+};
+}
+
+/**
+ * Returns the package type for a given URL.
+ * @param{URL} url - The URL to get the package type for.
+ */
+functiongetPackageType(url){
+// TODO(@anonrig): Write a C++ function that returns only "type".
+returngetPackageScopeConfig(url).type;
+}
+
 module.exports={
  checkPackageJSONIntegrity,
  read,
  readPackage,
  getNearestParentPackageJSON,
-
-deserializePackageJSON,
+ getPackageScopeConfig,
+getPackageType,
 };