diff options
Diffstat (limited to 'cli/tools')
-rw-r--r-- | cli/tools/registry/mod.rs | 1 | ||||
-rw-r--r-- | cli/tools/registry/unfurl.rs | 49 |
2 files changed, 0 insertions, 50 deletions
diff --git a/cli/tools/registry/mod.rs b/cli/tools/registry/mod.rs index dcfde2297..4af0f73b9 100644 --- a/cli/tools/registry/mod.rs +++ b/cli/tools/registry/mod.rs @@ -59,7 +59,6 @@ use auth::get_auth_method; use auth::AuthMethod; pub use pm::add; use publish_order::PublishOrderGraph; -pub use unfurl::deno_json_deps; use unfurl::SpecifierUnfurler; use super::check::TypeChecker; diff --git a/cli/tools/registry/unfurl.rs b/cli/tools/registry/unfurl.rs index 3207bbd55..ac270346c 100644 --- a/cli/tools/registry/unfurl.rs +++ b/cli/tools/registry/unfurl.rs @@ -1,67 +1,18 @@ // Copyright 2018-2024 the Deno authors. All rights reserved. MIT license. -use std::collections::HashSet; - use deno_ast::ParsedSource; use deno_ast::SourceRange; use deno_ast::SourceTextInfo; -use deno_core::serde_json; use deno_core::ModuleSpecifier; use deno_graph::DefaultModuleAnalyzer; use deno_graph::DependencyDescriptor; use deno_graph::DynamicTemplatePart; use deno_graph::TypeScriptReference; use deno_runtime::deno_node::is_builtin_node_module; -use deno_semver::jsr::JsrDepPackageReq; -use deno_semver::jsr::JsrPackageReqReference; -use deno_semver::npm::NpmPackageReqReference; use crate::resolver::MappedSpecifierResolver; use crate::resolver::SloppyImportsResolver; -pub fn deno_json_deps( - config: &deno_config::ConfigFile, -) -> HashSet<JsrDepPackageReq> { - let values = imports_values(config.json.imports.as_ref()) - .into_iter() - .chain(scope_values(config.json.scopes.as_ref())); - values_to_set(values) -} - -fn imports_values(value: Option<&serde_json::Value>) -> Vec<&String> { - let Some(obj) = value.and_then(|v| v.as_object()) else { - return Vec::new(); - }; - let mut items = Vec::with_capacity(obj.len()); - for value in obj.values() { - if let serde_json::Value::String(value) = value { - items.push(value); - } - } - items -} - -fn scope_values(value: Option<&serde_json::Value>) -> Vec<&String> { - let Some(obj) = value.and_then(|v| v.as_object()) else { - return Vec::new(); - }; - obj.values().flat_map(|v| imports_values(Some(v))).collect() -} - -fn values_to_set<'a>( - values: impl Iterator<Item = &'a String>, -) -> HashSet<JsrDepPackageReq> { - let mut entries = HashSet::new(); - for value in values { - if let Ok(req_ref) = JsrPackageReqReference::from_str(value) { - entries.insert(JsrDepPackageReq::jsr(req_ref.into_inner().req)); - } else if let Ok(req_ref) = NpmPackageReqReference::from_str(value) { - entries.insert(JsrDepPackageReq::npm(req_ref.into_inner().req)); - } - } - entries -} - #[derive(Debug, Clone)] pub enum SpecifierUnfurlerDiagnostic { UnanalyzableDynamicImport { |