2023-01-02 16:00:42 -05:00
|
|
|
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
2022-02-16 13:14:19 -05:00
|
|
|
|
|
|
|
use std::cell::RefCell;
|
|
|
|
use std::collections::HashMap;
|
|
|
|
use std::collections::HashSet;
|
|
|
|
use std::path::Path;
|
|
|
|
use std::path::PathBuf;
|
2022-06-14 10:05:37 -04:00
|
|
|
use std::sync::Arc;
|
2022-02-16 13:14:19 -05:00
|
|
|
|
|
|
|
use deno_ast::ModuleSpecifier;
|
|
|
|
use deno_core::anyhow::anyhow;
|
|
|
|
use deno_core::anyhow::bail;
|
|
|
|
use deno_core::error::AnyError;
|
|
|
|
use deno_core::futures;
|
|
|
|
use deno_core::serde_json;
|
|
|
|
use deno_graph::source::LoadFuture;
|
|
|
|
use deno_graph::source::LoadResponse;
|
|
|
|
use deno_graph::source::Loader;
|
|
|
|
use deno_graph::ModuleGraph;
|
2022-06-14 10:05:37 -04:00
|
|
|
use import_map::ImportMap;
|
|
|
|
|
2022-08-22 12:14:59 -04:00
|
|
|
use crate::cache::ParsedSourceCache;
|
2023-04-12 08:36:11 -04:00
|
|
|
use crate::npm::CliNpmRegistryApi;
|
2023-02-22 14:15:25 -05:00
|
|
|
use crate::npm::NpmResolution;
|
2023-02-24 19:35:43 -05:00
|
|
|
use crate::npm::PackageJsonDepsInstaller;
|
2023-02-15 11:30:54 -05:00
|
|
|
use crate::resolver::CliGraphResolver;
|
2022-02-16 13:14:19 -05:00
|
|
|
|
|
|
|
use super::build::VendorEnvironment;
|
|
|
|
|
|
|
|
// Utilities that help `deno vendor` get tested in memory.
|
|
|
|
|
|
|
|
type RemoteFileText = String;
|
|
|
|
type RemoteFileHeaders = Option<HashMap<String, String>>;
|
|
|
|
type RemoteFileResult = Result<(RemoteFileText, RemoteFileHeaders), String>;
|
|
|
|
|
|
|
|
#[derive(Clone, Default)]
|
|
|
|
pub struct TestLoader {
|
|
|
|
files: HashMap<ModuleSpecifier, RemoteFileResult>,
|
|
|
|
redirects: HashMap<ModuleSpecifier, ModuleSpecifier>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl TestLoader {
|
|
|
|
pub fn add(
|
|
|
|
&mut self,
|
|
|
|
path_or_specifier: impl AsRef<str>,
|
|
|
|
text: impl AsRef<str>,
|
2022-08-03 21:23:45 -04:00
|
|
|
) -> &mut Self {
|
|
|
|
self.add_result(path_or_specifier, Ok((text.as_ref().to_string(), None)))
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn add_failure(
|
|
|
|
&mut self,
|
|
|
|
path_or_specifier: impl AsRef<str>,
|
|
|
|
message: impl AsRef<str>,
|
|
|
|
) -> &mut Self {
|
|
|
|
self.add_result(path_or_specifier, Err(message.as_ref().to_string()))
|
|
|
|
}
|
|
|
|
|
|
|
|
fn add_result(
|
|
|
|
&mut self,
|
|
|
|
path_or_specifier: impl AsRef<str>,
|
|
|
|
result: RemoteFileResult,
|
2022-02-16 13:14:19 -05:00
|
|
|
) -> &mut Self {
|
|
|
|
if path_or_specifier
|
|
|
|
.as_ref()
|
|
|
|
.to_lowercase()
|
|
|
|
.starts_with("http")
|
|
|
|
{
|
|
|
|
self.files.insert(
|
|
|
|
ModuleSpecifier::parse(path_or_specifier.as_ref()).unwrap(),
|
2022-08-03 21:23:45 -04:00
|
|
|
result,
|
2022-02-16 13:14:19 -05:00
|
|
|
);
|
|
|
|
} else {
|
|
|
|
let path = make_path(path_or_specifier.as_ref());
|
|
|
|
let specifier = ModuleSpecifier::from_file_path(path).unwrap();
|
2022-08-03 21:23:45 -04:00
|
|
|
self.files.insert(specifier, result);
|
2022-02-16 13:14:19 -05:00
|
|
|
}
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn add_with_headers(
|
|
|
|
&mut self,
|
|
|
|
specifier: impl AsRef<str>,
|
|
|
|
text: impl AsRef<str>,
|
|
|
|
headers: &[(&str, &str)],
|
|
|
|
) -> &mut Self {
|
|
|
|
let headers = headers
|
|
|
|
.iter()
|
|
|
|
.map(|(key, value)| (key.to_string(), value.to_string()))
|
|
|
|
.collect();
|
|
|
|
self.files.insert(
|
|
|
|
ModuleSpecifier::parse(specifier.as_ref()).unwrap(),
|
|
|
|
Ok((text.as_ref().to_string(), Some(headers))),
|
|
|
|
);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn add_redirect(
|
|
|
|
&mut self,
|
|
|
|
from: impl AsRef<str>,
|
|
|
|
to: impl AsRef<str>,
|
|
|
|
) -> &mut Self {
|
|
|
|
self.redirects.insert(
|
|
|
|
ModuleSpecifier::parse(from.as_ref()).unwrap(),
|
|
|
|
ModuleSpecifier::parse(to.as_ref()).unwrap(),
|
|
|
|
);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl Loader for TestLoader {
|
|
|
|
fn load(
|
|
|
|
&mut self,
|
|
|
|
specifier: &ModuleSpecifier,
|
|
|
|
_is_dynamic: bool,
|
|
|
|
) -> LoadFuture {
|
|
|
|
let specifier = self.redirects.get(specifier).unwrap_or(specifier);
|
|
|
|
let result = self.files.get(specifier).map(|result| match result {
|
|
|
|
Ok(result) => Ok(LoadResponse::Module {
|
|
|
|
specifier: specifier.clone(),
|
2022-05-20 16:40:55 -04:00
|
|
|
content: result.0.clone().into(),
|
2022-02-16 13:14:19 -05:00
|
|
|
maybe_headers: result.1.clone(),
|
|
|
|
}),
|
|
|
|
Err(err) => Err(err),
|
|
|
|
});
|
|
|
|
let result = match result {
|
|
|
|
Some(Ok(result)) => Ok(Some(result)),
|
|
|
|
Some(Err(err)) => Err(anyhow!("{}", err)),
|
|
|
|
None if specifier.scheme() == "data" => {
|
|
|
|
deno_graph::source::load_data_url(specifier)
|
|
|
|
}
|
|
|
|
None => Ok(None),
|
|
|
|
};
|
|
|
|
Box::pin(futures::future::ready(result))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Default)]
|
|
|
|
struct TestVendorEnvironment {
|
|
|
|
directories: RefCell<HashSet<PathBuf>>,
|
|
|
|
files: RefCell<HashMap<PathBuf, String>>,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl VendorEnvironment for TestVendorEnvironment {
|
2022-06-14 10:05:37 -04:00
|
|
|
fn cwd(&self) -> Result<PathBuf, AnyError> {
|
|
|
|
Ok(make_path("/"))
|
|
|
|
}
|
|
|
|
|
2022-02-16 13:14:19 -05:00
|
|
|
fn create_dir_all(&self, dir_path: &Path) -> Result<(), AnyError> {
|
|
|
|
let mut directories = self.directories.borrow_mut();
|
|
|
|
for path in dir_path.ancestors() {
|
|
|
|
if !directories.insert(path.to_path_buf()) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
|
|
|
|
fn write_file(&self, file_path: &Path, text: &str) -> Result<(), AnyError> {
|
|
|
|
let parent = file_path.parent().unwrap();
|
|
|
|
if !self.directories.borrow().contains(parent) {
|
|
|
|
bail!("Directory not found: {}", parent.display());
|
|
|
|
}
|
|
|
|
self
|
|
|
|
.files
|
|
|
|
.borrow_mut()
|
|
|
|
.insert(file_path.to_path_buf(), text.to_string());
|
|
|
|
Ok(())
|
|
|
|
}
|
2022-06-14 10:05:37 -04:00
|
|
|
|
|
|
|
fn path_exists(&self, path: &Path) -> bool {
|
|
|
|
self.files.borrow().contains_key(&path.to_path_buf())
|
|
|
|
}
|
2022-02-16 13:14:19 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
pub struct VendorOutput {
|
|
|
|
pub files: Vec<(String, String)>,
|
|
|
|
pub import_map: Option<serde_json::Value>,
|
|
|
|
}
|
|
|
|
|
|
|
|
#[derive(Default)]
|
|
|
|
pub struct VendorTestBuilder {
|
|
|
|
entry_points: Vec<ModuleSpecifier>,
|
|
|
|
loader: TestLoader,
|
2022-06-14 10:05:37 -04:00
|
|
|
original_import_map: Option<ImportMap>,
|
|
|
|
environment: TestVendorEnvironment,
|
2022-02-16 13:14:19 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
impl VendorTestBuilder {
|
|
|
|
pub fn with_default_setup() -> Self {
|
|
|
|
let mut builder = VendorTestBuilder::default();
|
|
|
|
builder.add_entry_point("/mod.ts");
|
|
|
|
builder
|
|
|
|
}
|
|
|
|
|
2022-06-14 10:05:37 -04:00
|
|
|
pub fn new_import_map(&self, base_path: &str) -> ImportMap {
|
2022-12-17 17:20:15 -05:00
|
|
|
let base = ModuleSpecifier::from_file_path(make_path(base_path)).unwrap();
|
2022-06-14 10:05:37 -04:00
|
|
|
ImportMap::new(base)
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn set_original_import_map(
|
|
|
|
&mut self,
|
|
|
|
import_map: ImportMap,
|
|
|
|
) -> &mut Self {
|
|
|
|
self.original_import_map = Some(import_map);
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
2022-02-16 13:14:19 -05:00
|
|
|
pub fn add_entry_point(&mut self, entry_point: impl AsRef<str>) -> &mut Self {
|
|
|
|
let entry_point = make_path(entry_point.as_ref());
|
|
|
|
self
|
|
|
|
.entry_points
|
|
|
|
.push(ModuleSpecifier::from_file_path(entry_point).unwrap());
|
|
|
|
self
|
|
|
|
}
|
|
|
|
|
|
|
|
pub async fn build(&mut self) -> Result<VendorOutput, AnyError> {
|
|
|
|
let output_dir = make_path("/vendor");
|
2023-01-24 08:23:19 -05:00
|
|
|
let roots = self.entry_points.clone();
|
2022-06-14 10:05:37 -04:00
|
|
|
let loader = self.loader.clone();
|
feat(core): initialize SQLite off-main-thread (#18401)
This gets SQLite off the flamegraph and reduces initialization time by
somewhere between 0.2ms and 0.5ms. In addition, I took the opportunity
to move all the cache management code to a single place and reduce
duplication. While the PR has a net gain of lines, much of that is just
being a bit more deliberate with how we're recovering from errors.
The existing caches had various policies for dealing with cache
corruption, so I've unified them and tried to isolate the decisions we
make for recovery in a single place (see `open_connection` in
`CacheDB`). The policy I chose was:
1. Retry twice to open on-disk caches
2. If that fails, try to delete the file and recreate it on-disk
3. If we fail to delete the file or re-create a new cache, use a
fallback strategy that can be chosen per-cache: InMemory (temporary
cache for the process run), BlackHole (ignore writes, return empty
reads), or Error (fail on every operation).
The caches all use the same general code now, and share the cache
failure recovery policy.
In addition, it cleans up a TODO in the `NodeAnalysisCache`.
2023-03-27 18:01:52 -04:00
|
|
|
let parsed_source_cache = ParsedSourceCache::new_in_memory();
|
2022-08-22 12:14:59 -04:00
|
|
|
let analyzer = parsed_source_cache.as_analyzer();
|
|
|
|
let graph = build_test_graph(
|
|
|
|
roots,
|
|
|
|
self.original_import_map.clone(),
|
2023-01-13 16:39:19 -05:00
|
|
|
loader,
|
2022-08-22 12:14:59 -04:00
|
|
|
&*analyzer,
|
|
|
|
)
|
|
|
|
.await;
|
2022-06-14 10:05:37 -04:00
|
|
|
super::build::build(
|
|
|
|
graph,
|
2022-08-22 12:14:59 -04:00
|
|
|
&parsed_source_cache,
|
2022-06-14 10:05:37 -04:00
|
|
|
&output_dir,
|
|
|
|
self.original_import_map.as_ref(),
|
2022-12-06 14:12:51 -05:00
|
|
|
None,
|
2022-06-14 10:05:37 -04:00
|
|
|
&self.environment,
|
|
|
|
)?;
|
|
|
|
|
|
|
|
let mut files = self.environment.files.borrow_mut();
|
2022-02-16 13:14:19 -05:00
|
|
|
let import_map = files.remove(&output_dir.join("import_map.json"));
|
|
|
|
let mut files = files
|
|
|
|
.iter()
|
2023-01-05 14:29:50 -05:00
|
|
|
.map(|(path, text)| (path_to_string(path), text.to_string()))
|
2022-02-16 13:14:19 -05:00
|
|
|
.collect::<Vec<_>>();
|
|
|
|
|
|
|
|
files.sort_by(|a, b| a.0.cmp(&b.0));
|
|
|
|
|
|
|
|
Ok(VendorOutput {
|
|
|
|
import_map: import_map.map(|text| serde_json::from_str(&text).unwrap()),
|
|
|
|
files,
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn with_loader(&mut self, action: impl Fn(&mut TestLoader)) -> &mut Self {
|
|
|
|
action(&mut self.loader);
|
|
|
|
self
|
|
|
|
}
|
2022-06-14 10:05:37 -04:00
|
|
|
}
|
2022-02-16 13:14:19 -05:00
|
|
|
|
2022-06-14 10:05:37 -04:00
|
|
|
async fn build_test_graph(
|
2023-01-24 08:23:19 -05:00
|
|
|
roots: Vec<ModuleSpecifier>,
|
2022-06-14 10:05:37 -04:00
|
|
|
original_import_map: Option<ImportMap>,
|
|
|
|
mut loader: TestLoader,
|
2022-08-22 12:14:59 -04:00
|
|
|
analyzer: &dyn deno_graph::ModuleAnalyzer,
|
2022-06-14 10:05:37 -04:00
|
|
|
) -> ModuleGraph {
|
2023-04-14 16:22:33 -04:00
|
|
|
let resolver = original_import_map.map(|original_import_map| {
|
|
|
|
let npm_registry_api = Arc::new(CliNpmRegistryApi::new_uninitialized());
|
|
|
|
let npm_resolution = Arc::new(NpmResolution::from_serialized(
|
|
|
|
npm_registry_api.clone(),
|
|
|
|
None,
|
|
|
|
None,
|
|
|
|
));
|
|
|
|
let deps_installer = Arc::new(PackageJsonDepsInstaller::new(
|
2023-02-24 19:35:43 -05:00
|
|
|
npm_registry_api.clone(),
|
|
|
|
npm_resolution.clone(),
|
|
|
|
None,
|
2023-04-14 16:22:33 -04:00
|
|
|
));
|
2023-02-22 14:15:25 -05:00
|
|
|
CliGraphResolver::new(
|
|
|
|
None,
|
2023-04-14 16:22:33 -04:00
|
|
|
Some(Arc::new(original_import_map)),
|
2023-02-22 14:15:25 -05:00
|
|
|
false,
|
|
|
|
npm_registry_api,
|
|
|
|
npm_resolution,
|
2023-02-24 19:35:43 -05:00
|
|
|
deps_installer,
|
2023-02-22 14:15:25 -05:00
|
|
|
)
|
|
|
|
});
|
2023-02-09 22:00:23 -05:00
|
|
|
let mut graph = ModuleGraph::default();
|
|
|
|
graph
|
|
|
|
.build(
|
|
|
|
roots,
|
|
|
|
&mut loader,
|
|
|
|
deno_graph::BuildOptions {
|
|
|
|
resolver: resolver.as_ref().map(|r| r.as_graph_resolver()),
|
|
|
|
module_analyzer: Some(analyzer),
|
|
|
|
..Default::default()
|
|
|
|
},
|
|
|
|
)
|
|
|
|
.await;
|
|
|
|
graph
|
2022-02-16 13:14:19 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
fn make_path(text: &str) -> PathBuf {
|
|
|
|
// This should work all in memory. We're waiting on
|
|
|
|
// https://github.com/servo/rust-url/issues/730 to provide
|
|
|
|
// a cross platform path here
|
|
|
|
assert!(text.starts_with('/'));
|
|
|
|
if cfg!(windows) {
|
2022-02-24 20:03:12 -05:00
|
|
|
PathBuf::from(format!("C:{}", text.replace('/', "\\")))
|
2022-02-16 13:14:19 -05:00
|
|
|
} else {
|
|
|
|
PathBuf::from(text)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-01-05 14:29:50 -05:00
|
|
|
fn path_to_string<P>(path: P) -> String
|
|
|
|
where
|
|
|
|
P: AsRef<Path>,
|
|
|
|
{
|
|
|
|
let path = path.as_ref();
|
2022-02-16 13:14:19 -05:00
|
|
|
// inverse of the function above
|
|
|
|
let path = path.to_string_lossy();
|
|
|
|
if cfg!(windows) {
|
|
|
|
path.replace("C:\\", "\\").replace('\\', "/")
|
|
|
|
} else {
|
|
|
|
path.to_string()
|
|
|
|
}
|
|
|
|
}
|