mirror of
https://github.com/denoland/deno.git
synced 2024-12-22 23:34:47 -05:00
136dce67ce
1. Breaks up functionality within `ProcState` into several other structs to break out the responsibilities (`ProcState` is only a data struct now). 2. Moves towards being able to inject dependencies more easily and have functionality only require what it needs. 3. Exposes `Arc<T>` around the "service structs" instead of it being embedded within them. The idea behind embedding them was to reduce the verbosity of needing to pass around `Arc<...>`, but I don't think it was exactly working and as we move more of these structs to be more injectable I don't think the extra verbosity will be a big deal.
114 lines
3.2 KiB
Rust
114 lines
3.2 KiB
Rust
// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
|
|
|
|
use std::future::Future;
|
|
use std::sync::Arc;
|
|
|
|
use deno_core::error::AnyError;
|
|
use deno_core::futures::stream::FuturesOrdered;
|
|
use deno_core::futures::StreamExt;
|
|
use deno_npm::registry::NpmRegistryApi;
|
|
use deno_npm::registry::NpmRegistryPackageInfoLoadError;
|
|
use deno_semver::npm::NpmPackageReq;
|
|
|
|
use crate::args::package_json::PackageJsonDeps;
|
|
use crate::util::sync::AtomicFlag;
|
|
|
|
use super::CliNpmRegistryApi;
|
|
use super::NpmResolution;
|
|
|
|
#[derive(Debug)]
|
|
struct PackageJsonDepsInstallerInner {
|
|
has_installed_flag: AtomicFlag,
|
|
npm_registry_api: Arc<CliNpmRegistryApi>,
|
|
npm_resolution: Arc<NpmResolution>,
|
|
package_deps: PackageJsonDeps,
|
|
}
|
|
|
|
impl PackageJsonDepsInstallerInner {
|
|
pub fn reqs(&self) -> Vec<&NpmPackageReq> {
|
|
let mut package_reqs = self
|
|
.package_deps
|
|
.values()
|
|
.filter_map(|r| r.as_ref().ok())
|
|
.collect::<Vec<_>>();
|
|
package_reqs.sort(); // deterministic resolution
|
|
package_reqs
|
|
}
|
|
|
|
pub fn reqs_with_info_futures(
|
|
&self,
|
|
) -> FuturesOrdered<
|
|
impl Future<
|
|
Output = Result<
|
|
(&NpmPackageReq, Arc<deno_npm::registry::NpmPackageInfo>),
|
|
NpmRegistryPackageInfoLoadError,
|
|
>,
|
|
>,
|
|
> {
|
|
let package_reqs = self.reqs();
|
|
|
|
FuturesOrdered::from_iter(package_reqs.into_iter().map(|req| {
|
|
let api = self.npm_registry_api.clone();
|
|
async move {
|
|
let info = api.package_info(&req.name).await?;
|
|
Ok::<_, NpmRegistryPackageInfoLoadError>((req, info))
|
|
}
|
|
}))
|
|
}
|
|
}
|
|
|
|
/// Holds and controls installing dependencies from package.json.
|
|
#[derive(Debug, Default)]
|
|
pub struct PackageJsonDepsInstaller(Option<PackageJsonDepsInstallerInner>);
|
|
|
|
impl PackageJsonDepsInstaller {
|
|
pub fn new(
|
|
npm_registry_api: Arc<CliNpmRegistryApi>,
|
|
npm_resolution: Arc<NpmResolution>,
|
|
deps: Option<PackageJsonDeps>,
|
|
) -> Self {
|
|
Self(deps.map(|package_deps| PackageJsonDepsInstallerInner {
|
|
has_installed_flag: Default::default(),
|
|
npm_registry_api,
|
|
npm_resolution,
|
|
package_deps,
|
|
}))
|
|
}
|
|
|
|
pub fn package_deps(&self) -> Option<&PackageJsonDeps> {
|
|
self.0.as_ref().map(|inner| &inner.package_deps)
|
|
}
|
|
|
|
/// Installs the top level dependencies in the package.json file
|
|
/// without going through and resolving the descendant dependencies yet.
|
|
pub async fn ensure_top_level_install(&self) -> Result<(), AnyError> {
|
|
let inner = match &self.0 {
|
|
Some(inner) => inner,
|
|
None => return Ok(()),
|
|
};
|
|
|
|
if !inner.has_installed_flag.raise() {
|
|
return Ok(()); // already installed by something else
|
|
}
|
|
|
|
let mut reqs_with_info_futures = inner.reqs_with_info_futures();
|
|
|
|
while let Some(result) = reqs_with_info_futures.next().await {
|
|
let (req, info) = result?;
|
|
let result = inner
|
|
.npm_resolution
|
|
.resolve_package_req_as_pending_with_info(req, &info);
|
|
if let Err(err) = result {
|
|
if inner.npm_registry_api.mark_force_reload() {
|
|
log::debug!("Failed to resolve package. Retrying. Error: {err:#}");
|
|
// re-initialize
|
|
reqs_with_info_futures = inner.reqs_with_info_futures();
|
|
} else {
|
|
return Err(err.into());
|
|
}
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
}
|