mirror of
https://github.com/denoland/deno.git
synced 2024-12-12 02:27:46 -05:00
bd159b8bad
If "--lock-write" flag was present we never passed instance of the lockfile to the npm resolver, which made it skip adding discovered npm packages to the lockfile. This commit fixes that, by always passing lockfile to the npm resolver and only regenerating resolver snapshot is "--lock-write" is not present. Closes https://github.com/denoland/deno/issues/16666
368 lines
10 KiB
Rust
368 lines
10 KiB
Rust
// Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
|
|
|
|
mod common;
|
|
mod global;
|
|
mod local;
|
|
|
|
use deno_ast::ModuleSpecifier;
|
|
use deno_core::anyhow::bail;
|
|
use deno_core::anyhow::Context;
|
|
use deno_core::error::custom_error;
|
|
use deno_core::error::AnyError;
|
|
use deno_core::parking_lot::Mutex;
|
|
use deno_core::serde_json;
|
|
use deno_runtime::deno_node::PathClean;
|
|
use deno_runtime::deno_node::RequireNpmResolver;
|
|
use global::GlobalNpmPackageResolver;
|
|
use once_cell::sync::Lazy;
|
|
use serde::Deserialize;
|
|
use serde::Serialize;
|
|
use std::collections::HashSet;
|
|
use std::path::Path;
|
|
use std::path::PathBuf;
|
|
use std::sync::Arc;
|
|
|
|
use crate::fs_util;
|
|
use crate::lockfile::Lockfile;
|
|
|
|
use self::common::InnerNpmPackageResolver;
|
|
use self::local::LocalNpmPackageResolver;
|
|
use super::NpmCache;
|
|
use super::NpmPackageId;
|
|
use super::NpmPackageReq;
|
|
use super::NpmResolutionSnapshot;
|
|
use super::RealNpmRegistryApi;
|
|
|
|
const RESOLUTION_STATE_ENV_VAR_NAME: &str =
|
|
"DENO_DONT_USE_INTERNAL_NODE_COMPAT_STATE";
|
|
|
|
static IS_NPM_MAIN: Lazy<bool> =
|
|
Lazy::new(|| std::env::var(RESOLUTION_STATE_ENV_VAR_NAME).is_ok());
|
|
|
|
/// State provided to the process via an environment variable.
|
|
#[derive(Debug, Serialize, Deserialize)]
|
|
struct NpmProcessState {
|
|
snapshot: NpmResolutionSnapshot,
|
|
local_node_modules_path: Option<String>,
|
|
}
|
|
|
|
impl NpmProcessState {
|
|
pub fn was_set() -> bool {
|
|
*IS_NPM_MAIN
|
|
}
|
|
|
|
pub fn take() -> Option<NpmProcessState> {
|
|
// initialize the lazy before we remove the env var below
|
|
if !Self::was_set() {
|
|
return None;
|
|
}
|
|
|
|
let state = std::env::var(RESOLUTION_STATE_ENV_VAR_NAME).ok()?;
|
|
let state = serde_json::from_str(&state).ok()?;
|
|
// remove the environment variable so that sub processes
|
|
// that are spawned do not also use this.
|
|
std::env::remove_var(RESOLUTION_STATE_ENV_VAR_NAME);
|
|
Some(state)
|
|
}
|
|
}
|
|
|
|
#[derive(Clone)]
|
|
pub struct NpmPackageResolver {
|
|
no_npm: bool,
|
|
inner: Arc<dyn InnerNpmPackageResolver>,
|
|
local_node_modules_path: Option<PathBuf>,
|
|
api: RealNpmRegistryApi,
|
|
cache: NpmCache,
|
|
maybe_lockfile: Option<Arc<Mutex<Lockfile>>>,
|
|
}
|
|
|
|
impl std::fmt::Debug for NpmPackageResolver {
|
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
f.debug_struct("NpmPackageResolver")
|
|
.field("no_npm", &self.no_npm)
|
|
.field("inner", &"<omitted>")
|
|
.field("local_node_modules_path", &self.local_node_modules_path)
|
|
.finish()
|
|
}
|
|
}
|
|
|
|
impl NpmPackageResolver {
|
|
pub fn new(
|
|
cache: NpmCache,
|
|
api: RealNpmRegistryApi,
|
|
no_npm: bool,
|
|
local_node_modules_path: Option<PathBuf>,
|
|
) -> Self {
|
|
Self::new_with_maybe_snapshot(
|
|
cache,
|
|
api,
|
|
no_npm,
|
|
local_node_modules_path,
|
|
None,
|
|
)
|
|
}
|
|
|
|
/// This function will replace current resolver with a new one built from a
|
|
/// snapshot created out of the lockfile.
|
|
pub async fn add_lockfile_and_maybe_regenerate_snapshot(
|
|
&mut self,
|
|
lockfile: Arc<Mutex<Lockfile>>,
|
|
) -> Result<(), AnyError> {
|
|
self.maybe_lockfile = Some(lockfile.clone());
|
|
|
|
if lockfile.lock().overwrite {
|
|
return Ok(());
|
|
}
|
|
|
|
let snapshot =
|
|
NpmResolutionSnapshot::from_lockfile(lockfile.clone(), &self.api)
|
|
.await
|
|
.with_context(|| {
|
|
format!(
|
|
"failed reading lockfile '{}'",
|
|
lockfile.lock().filename.display()
|
|
)
|
|
})?;
|
|
if let Some(node_modules_folder) = &self.local_node_modules_path {
|
|
self.inner = Arc::new(LocalNpmPackageResolver::new(
|
|
self.cache.clone(),
|
|
self.api.clone(),
|
|
node_modules_folder.clone(),
|
|
Some(snapshot),
|
|
));
|
|
} else {
|
|
self.inner = Arc::new(GlobalNpmPackageResolver::new(
|
|
self.cache.clone(),
|
|
self.api.clone(),
|
|
Some(snapshot),
|
|
));
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
fn new_with_maybe_snapshot(
|
|
cache: NpmCache,
|
|
api: RealNpmRegistryApi,
|
|
no_npm: bool,
|
|
local_node_modules_path: Option<PathBuf>,
|
|
initial_snapshot: Option<NpmResolutionSnapshot>,
|
|
) -> Self {
|
|
let process_npm_state = NpmProcessState::take();
|
|
let local_node_modules_path = local_node_modules_path.or_else(|| {
|
|
process_npm_state
|
|
.as_ref()
|
|
.and_then(|s| s.local_node_modules_path.as_ref().map(PathBuf::from))
|
|
});
|
|
let maybe_snapshot =
|
|
initial_snapshot.or_else(|| process_npm_state.map(|s| s.snapshot));
|
|
let inner: Arc<dyn InnerNpmPackageResolver> = match &local_node_modules_path
|
|
{
|
|
Some(node_modules_folder) => Arc::new(LocalNpmPackageResolver::new(
|
|
cache.clone(),
|
|
api.clone(),
|
|
node_modules_folder.clone(),
|
|
maybe_snapshot,
|
|
)),
|
|
None => Arc::new(GlobalNpmPackageResolver::new(
|
|
cache.clone(),
|
|
api.clone(),
|
|
maybe_snapshot,
|
|
)),
|
|
};
|
|
Self {
|
|
no_npm,
|
|
inner,
|
|
local_node_modules_path,
|
|
api,
|
|
cache,
|
|
maybe_lockfile: None,
|
|
}
|
|
}
|
|
|
|
/// Resolves an npm package folder path from a Deno module.
|
|
pub fn resolve_package_folder_from_deno_module(
|
|
&self,
|
|
pkg_req: &NpmPackageReq,
|
|
) -> Result<PathBuf, AnyError> {
|
|
let path = self
|
|
.inner
|
|
.resolve_package_folder_from_deno_module(pkg_req)?;
|
|
let path = fs_util::canonicalize_path_maybe_not_exists(&path)?;
|
|
log::debug!("Resolved {} to {}", pkg_req, path.display());
|
|
Ok(path)
|
|
}
|
|
|
|
/// Resolves an npm package folder path from an npm package referrer.
|
|
pub fn resolve_package_folder_from_package(
|
|
&self,
|
|
name: &str,
|
|
referrer: &ModuleSpecifier,
|
|
conditions: &[&str],
|
|
) -> Result<PathBuf, AnyError> {
|
|
let path = self
|
|
.inner
|
|
.resolve_package_folder_from_package(name, referrer, conditions)?;
|
|
log::debug!("Resolved {} from {} to {}", name, referrer, path.display());
|
|
Ok(path)
|
|
}
|
|
|
|
/// Resolve the root folder of the package the provided specifier is in.
|
|
///
|
|
/// This will error when the provided specifier is not in an npm package.
|
|
pub fn resolve_package_folder_from_specifier(
|
|
&self,
|
|
specifier: &ModuleSpecifier,
|
|
) -> Result<PathBuf, AnyError> {
|
|
let path = self
|
|
.inner
|
|
.resolve_package_folder_from_specifier(specifier)?;
|
|
log::debug!("Resolved {} to {}", specifier, path.display());
|
|
Ok(path)
|
|
}
|
|
|
|
/// Attempts to get the package size in bytes.
|
|
pub fn package_size(
|
|
&self,
|
|
package_id: &NpmPackageId,
|
|
) -> Result<u64, AnyError> {
|
|
self.inner.package_size(package_id)
|
|
}
|
|
|
|
/// Gets if the provided specifier is in an npm package.
|
|
pub fn in_npm_package(&self, specifier: &ModuleSpecifier) -> bool {
|
|
self
|
|
.resolve_package_folder_from_specifier(specifier)
|
|
.is_ok()
|
|
}
|
|
|
|
/// If the resolver has resolved any npm packages.
|
|
pub fn has_packages(&self) -> bool {
|
|
self.inner.has_packages()
|
|
}
|
|
|
|
/// Adds package requirements to the resolver and ensures everything is setup.
|
|
pub async fn add_package_reqs(
|
|
&self,
|
|
packages: Vec<NpmPackageReq>,
|
|
) -> Result<(), AnyError> {
|
|
if packages.is_empty() {
|
|
return Ok(());
|
|
}
|
|
|
|
if self.no_npm {
|
|
let fmt_reqs = packages
|
|
.iter()
|
|
.collect::<HashSet<_>>() // prevent duplicates
|
|
.iter()
|
|
.map(|p| format!("\"{}\"", p))
|
|
.collect::<Vec<_>>()
|
|
.join(", ");
|
|
return Err(custom_error(
|
|
"NoNpm",
|
|
format!(
|
|
"Following npm specifiers were requested: {}; but --no-npm is specified.",
|
|
fmt_reqs
|
|
),
|
|
));
|
|
}
|
|
|
|
self.inner.add_package_reqs(packages).await?;
|
|
|
|
// If there's a lock file, update it with all discovered npm packages
|
|
if let Some(lockfile_mutex) = &self.maybe_lockfile {
|
|
let mut lockfile = lockfile_mutex.lock();
|
|
self.lock(&mut lockfile)?;
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/// Sets package requirements to the resolver, removing old requirements and adding new ones.
|
|
pub async fn set_package_reqs(
|
|
&self,
|
|
packages: HashSet<NpmPackageReq>,
|
|
) -> Result<(), AnyError> {
|
|
self.inner.set_package_reqs(packages).await
|
|
}
|
|
|
|
// If the main module should be treated as being in an npm package.
|
|
// This is triggered via a secret environment variable which is used
|
|
// for functionality like child_process.fork. Users should NOT depend
|
|
// on this functionality.
|
|
pub fn is_npm_main(&self) -> bool {
|
|
NpmProcessState::was_set()
|
|
}
|
|
|
|
/// Gets the state of npm for the process.
|
|
pub fn get_npm_process_state(&self) -> String {
|
|
serde_json::to_string(&NpmProcessState {
|
|
snapshot: self.inner.snapshot(),
|
|
local_node_modules_path: self
|
|
.local_node_modules_path
|
|
.as_ref()
|
|
.map(|p| p.to_string_lossy().to_string()),
|
|
})
|
|
.unwrap()
|
|
}
|
|
|
|
/// Gets a new resolver with a new snapshotted state.
|
|
pub fn snapshotted(&self) -> Self {
|
|
Self::new_with_maybe_snapshot(
|
|
self.cache.clone(),
|
|
self.api.clone(),
|
|
self.no_npm,
|
|
self.local_node_modules_path.clone(),
|
|
Some(self.snapshot()),
|
|
)
|
|
}
|
|
|
|
pub fn snapshot(&self) -> NpmResolutionSnapshot {
|
|
self.inner.snapshot()
|
|
}
|
|
|
|
pub fn lock(&self, lockfile: &mut Lockfile) -> Result<(), AnyError> {
|
|
self.inner.lock(lockfile)
|
|
}
|
|
}
|
|
|
|
impl RequireNpmResolver for NpmPackageResolver {
|
|
fn resolve_package_folder_from_package(
|
|
&self,
|
|
specifier: &str,
|
|
referrer: &std::path::Path,
|
|
conditions: &[&str],
|
|
) -> Result<PathBuf, AnyError> {
|
|
let referrer = path_to_specifier(referrer)?;
|
|
self.resolve_package_folder_from_package(specifier, &referrer, conditions)
|
|
}
|
|
|
|
fn resolve_package_folder_from_path(
|
|
&self,
|
|
path: &Path,
|
|
) -> Result<PathBuf, AnyError> {
|
|
let specifier = path_to_specifier(path)?;
|
|
self.resolve_package_folder_from_specifier(&specifier)
|
|
}
|
|
|
|
fn in_npm_package(&self, path: &Path) -> bool {
|
|
let specifier =
|
|
match ModuleSpecifier::from_file_path(&path.to_path_buf().clean()) {
|
|
Ok(p) => p,
|
|
Err(_) => return false,
|
|
};
|
|
self
|
|
.resolve_package_folder_from_specifier(&specifier)
|
|
.is_ok()
|
|
}
|
|
|
|
fn ensure_read_permission(&self, path: &Path) -> Result<(), AnyError> {
|
|
self.inner.ensure_read_permission(path)
|
|
}
|
|
}
|
|
|
|
fn path_to_specifier(path: &Path) -> Result<ModuleSpecifier, AnyError> {
|
|
match ModuleSpecifier::from_file_path(&path.to_path_buf().clean()) {
|
|
Ok(specifier) => Ok(specifier),
|
|
Err(()) => bail!("Could not convert '{}' to url.", path.display()),
|
|
}
|
|
}
|