perf: negative cache package.json

Author: lucacasonato

src/rs_lib/Cargo.lock

@@ -52,6 +52,11 @@ path = "../../deno/libs/npm_cache"
 path = "../../deno/libs/npm_installer"
 default-features = false
 
+[dependencies.deno_package_json]
+path = "../../deno/libs/package_json"
+features = ["sync"]
+
+
 [dependencies.deno_resolver]
 path = "../../deno/libs/resolver"
 features = ["deno_ast","graph","sync"]
@@ -76,4 +81,4 @@ features = ["real","wasm"]
 codegen-units = 1
 incremental = true
 lto = true
-opt-level = "z"
+opt-level = 3

src/rs_lib/Cargo.toml

@@ -7,6 +7,7 @@ use std::path::Path;
 use std::path::PathBuf;
 use std::rc::Rc;
 use std::sync::Arc;
+use std::sync::Mutex;
 use std::sync::OnceLock;
 
 use anyhow::Context;
@@ -31,6 +32,8 @@ use deno_npm_installer::NpmInstallerFactory;
 use deno_npm_installer::NpmInstallerFactoryOptions;
 use deno_npm_installer::Reporter;
 use deno_npm_installer::lifecycle_scripts::NullLifecycleScriptsExecutor;
+use deno_package_json::PackageJsonCacheResult;
+use deno_package_json::PackageJsonRc;
 use deno_resolver::DenoResolveError;
 use deno_resolver::DenoResolveErrorKind;
 use deno_resolver::cache::ParsedSourceCache;
@@ -71,7 +74,6 @@ use log::Metadata;
 use log::Record;
 use node_resolver::NodeConditionOptions;
 use node_resolver::NodeResolverOptions;
-use node_resolver::PackageJsonThreadLocalCache;
 use node_resolver::analyze::NodeCodeTranslatorMode;
 use node_resolver::cache::NodeResolutionThreadLocalCache;
 use node_resolver::errors::NodeJsErrorCode;
@@ -186,9 +188,29 @@ pub struct DenoWorkspace {
   workspace_factory: Arc<WorkspaceFactory<RealSys>>,
 }
 
-impl Drop for DenoWorkspace {
-  fn drop(&mut self) {
-    PackageJsonThreadLocalCache::clear();
+#[derive(Debug)]
+pub struct PackageJsonOwnedCache {
+  map: Mutex<std::collections::HashMap<PathBuf, Option<PackageJsonRc>>>,
+}
+
+impl PackageJsonOwnedCache {
+  pub fn new() -> Self {
+    Self {
+      map: Mutex::new(std::collections::HashMap::new()),
+    }
+  }
+}
+
+impl deno_package_json::PackageJsonCache for PackageJsonOwnedCache {
+  fn get(&self, path: &Path) -> PackageJsonCacheResult {
+    self.map.lock().unwrap().get(path).cloned().map_or_else(
+      || PackageJsonCacheResult::NotCached,
+      |value| PackageJsonCacheResult::Hit(value),
+    )
+  }
+
+  fn set(&self, path: PathBuf, package_json: Option<PackageJsonRc>) {
+    self.map.lock().unwrap().insert(path, package_json);
   }
 }
 
@@ -299,7 +321,7 @@ impl DenoWorkspace {
         node_analysis_cache: None,
         node_code_translator_mode: NodeCodeTranslatorMode::Disabled,
         node_resolution_cache: Some(Arc::new(NodeResolutionThreadLocalCache)),
-        package_json_cache: Some(Arc::new(PackageJsonThreadLocalCache)),
+        package_json_cache: Some(Arc::new(PackageJsonOwnedCache::new())),
         package_json_dep_resolution: None,
         specified_import_map: None,
         bare_node_builtins: true,