diff options
author | David Sherret <dsherret@users.noreply.github.com> | 2024-07-03 20:54:33 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-07-04 00:54:33 +0000 |
commit | 147411e64b22fe74cb258125acab83f9182c9f81 (patch) | |
tree | a1f63dcbf0404c20534986b10f02b649df5a3ad5 /cli/args/import_map.rs | |
parent | dd6d19e12051fac2ea5639f621501f4710a1b8e1 (diff) |
feat: npm workspace and better Deno workspace support (#24334)
Adds much better support for the unstable Deno workspaces as well as
support for npm workspaces. npm workspaces is still lacking in that we
only install packages into the root node_modules folder. We'll make it
smarter over time in order for it to figure out when to add node_modules
folders within packages.
This includes a breaking change in config file resolution where we stop
searching for config files on the first found package.json unless it's
in a workspace. For the previous behaviour, the root deno.json needs to
be updated to be a workspace by adding `"workspace":
["./path-to-pkg-json-folder-goes-here"]`. See details in
https://github.com/denoland/deno_config/pull/66
Closes #24340
Closes #24159
Closes #24161
Closes #22020
Closes #18546
Closes #16106
Closes #24160
Diffstat (limited to 'cli/args/import_map.rs')
-rw-r--r-- | cli/args/import_map.rs | 118 |
1 files changed, 8 insertions, 110 deletions
diff --git a/cli/args/import_map.rs b/cli/args/import_map.rs index 2dc5a21d1..7a16ab215 100644 --- a/cli/args/import_map.rs +++ b/cli/args/import_map.rs @@ -1,127 +1,25 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -use deno_core::anyhow::Context; use deno_core::error::AnyError; use deno_core::serde_json; use deno_core::url::Url; use deno_runtime::deno_permissions::PermissionsContainer; -use import_map::ImportMap; -use import_map::ImportMapDiagnostic; -use log::warn; -use super::ConfigFile; use crate::file_fetcher::FileFetcher; -pub async fn resolve_import_map( - specified_specifier: Option<&Url>, - maybe_config_file: Option<&ConfigFile>, +pub async fn resolve_import_map_value_from_specifier( + specifier: &Url, file_fetcher: &FileFetcher, -) -> Result<Option<ImportMap>, AnyError> { - if let Some(specifier) = specified_specifier { - resolve_import_map_from_specifier(specifier.clone(), file_fetcher) - .await - .with_context(|| format!("Unable to load '{}' import map", specifier)) - .map(Some) - } else if let Some(config_file) = maybe_config_file { - let maybe_url_and_value = config_file - .to_import_map_value(|specifier| { - let specifier = specifier.clone(); - async move { - let file = file_fetcher - .fetch(&specifier, &PermissionsContainer::allow_all()) - .await? - .into_text_decoded()?; - Ok(file.source.to_string()) - } - }) - .await - .with_context(|| { - format!( - "Unable to resolve import map in '{}'", - config_file.specifier - ) - })?; - match maybe_url_and_value { - Some((url, value)) => { - import_map_from_value(url.into_owned(), value).map(Some) - } - None => Ok(None), - } - } else { - Ok(None) - } -} - -async fn resolve_import_map_from_specifier( - specifier: Url, - file_fetcher: &FileFetcher, -) -> Result<ImportMap, AnyError> { - let value: serde_json::Value = if specifier.scheme() == "data" { +) -> Result<serde_json::Value, AnyError> { + if specifier.scheme() == "data" { let data_url_text = - deno_graph::source::RawDataUrl::parse(&specifier)?.decode()?; - serde_json::from_str(&data_url_text)? + deno_graph::source::RawDataUrl::parse(specifier)?.decode()?; + Ok(serde_json::from_str(&data_url_text)?) } else { let file = file_fetcher - .fetch(&specifier, &PermissionsContainer::allow_all()) + .fetch(specifier, &PermissionsContainer::allow_all()) .await? .into_text_decoded()?; - serde_json::from_str(&file.source)? - }; - import_map_from_value(specifier, value) -} - -pub fn import_map_from_value( - specifier: Url, - json_value: serde_json::Value, -) -> Result<ImportMap, AnyError> { - debug_assert!( - !specifier.as_str().contains("../"), - "Import map specifier incorrectly contained ../: {}", - specifier.as_str() - ); - let result = import_map::parse_from_value(specifier, json_value)?; - print_import_map_diagnostics(&result.diagnostics); - Ok(result.import_map) -} - -fn print_import_map_diagnostics(diagnostics: &[ImportMapDiagnostic]) { - if !diagnostics.is_empty() { - warn!( - "Import map diagnostics:\n{}", - diagnostics - .iter() - .map(|d| format!(" - {d}")) - .collect::<Vec<_>>() - .join("\n") - ); + Ok(serde_json::from_str(&file.source)?) } } - -pub fn enhance_import_map_value_with_workspace_members( - mut import_map_value: serde_json::Value, - workspace_members: &[deno_config::WorkspaceMemberConfig], -) -> serde_json::Value { - let mut imports = - if let Some(imports) = import_map_value.get("imports").as_ref() { - imports.as_object().unwrap().clone() - } else { - serde_json::Map::new() - }; - - for workspace_member in workspace_members { - let name = &workspace_member.package_name; - let version = &workspace_member.package_version; - // Don't override existings, explicit imports - if imports.contains_key(name) { - continue; - } - - imports.insert( - name.to_string(), - serde_json::Value::String(format!("jsr:{}@^{}", name, version)), - ); - } - - import_map_value["imports"] = serde_json::Value::Object(imports); - ::import_map::ext::expand_import_map_value(import_map_value) -} |