summaryrefslogtreecommitdiff
path: root/cli/tools
diff options
context:
space:
mode:
Diffstat (limited to 'cli/tools')
-rw-r--r--cli/tools/bundle.rs9
-rw-r--r--cli/tools/compile.rs13
-rw-r--r--cli/tools/doc.rs14
-rw-r--r--cli/tools/registry/graph.rs2
-rw-r--r--cli/tools/registry/unfurl.rs4
-rw-r--r--cli/tools/repl/session.rs46
-rw-r--r--cli/tools/vendor/test.rs5
7 files changed, 60 insertions, 33 deletions
diff --git a/cli/tools/bundle.rs b/cli/tools/bundle.rs
index 23d5aacb1..e8b9076ea 100644
--- a/cli/tools/bundle.rs
+++ b/cli/tools/bundle.rs
@@ -144,15 +144,18 @@ fn bundle_module_graph(
}
}
+ let (transpile_options, emit_options) =
+ crate::args::ts_config_to_transpile_and_emit_options(
+ ts_config_result.ts_config,
+ );
deno_emit::bundle_graph(
graph,
deno_emit::BundleOptions {
minify: false,
bundle_type: deno_emit::BundleType::Module,
- emit_options: crate::args::ts_config_to_emit_options(
- ts_config_result.ts_config,
- ),
+ emit_options,
emit_ignore_directives: true,
+ transpile_options,
},
)
}
diff --git a/cli/tools/compile.rs b/cli/tools/compile.rs
index 2825c92c7..75572cd42 100644
--- a/cli/tools/compile.rs
+++ b/cli/tools/compile.rs
@@ -73,10 +73,17 @@ pub async fn compile(
let ts_config_for_emit =
cli_options.resolve_ts_config_for_emit(deno_config::TsConfigType::Emit)?;
- let emit_options =
- crate::args::ts_config_to_emit_options(ts_config_for_emit.ts_config);
+ let (transpile_options, emit_options) =
+ crate::args::ts_config_to_transpile_and_emit_options(
+ ts_config_for_emit.ts_config,
+ );
let parser = parsed_source_cache.as_capturing_parser();
- let eszip = eszip::EszipV2::from_graph(graph, &parser, emit_options)?;
+ let eszip = eszip::EszipV2::from_graph(
+ graph,
+ &parser,
+ transpile_options,
+ emit_options,
+ )?;
log::info!(
"{} {} to {}",
diff --git a/cli/tools/doc.rs b/cli/tools/doc.rs
index 91cede879..ac568ada4 100644
--- a/cli/tools/doc.rs
+++ b/cli/tools/doc.rs
@@ -18,6 +18,7 @@ use deno_core::anyhow::bail;
use deno_core::anyhow::Context;
use deno_core::error::AnyError;
use deno_doc as doc;
+use deno_graph::source::NullFileSystem;
use deno_graph::GraphKind;
use deno_graph::ModuleAnalyzer;
use deno_graph::ModuleParser;
@@ -53,8 +54,16 @@ async fn generate_doc_nodes_for_builtin_types(
vec![source_file_specifier.clone()],
&mut loader,
deno_graph::BuildOptions {
- module_analyzer: Some(analyzer),
- ..Default::default()
+ module_analyzer: analyzer,
+ file_system: &NullFileSystem,
+ is_dynamic: false,
+ imports: Vec::new(),
+ executor: Default::default(),
+ jsr_url_provider: Default::default(),
+ npm_resolver: None,
+ reporter: None,
+ resolver: None,
+ workspace_members: &[],
},
)
.await;
@@ -159,6 +168,7 @@ pub async fn doc(flags: Flags, doc_flags: DocFlags) -> Result<(), AnyError> {
kind_with_drilldown:
deno_doc::html::DocNodeKindWithDrilldown::Other(node.kind),
inner: std::sync::Arc::new(node),
+ drilldown_parent_kind: None,
})
.collect(),
&[],
diff --git a/cli/tools/registry/graph.rs b/cli/tools/registry/graph.rs
index 0310a97c6..001f85e76 100644
--- a/cli/tools/registry/graph.rs
+++ b/cli/tools/registry/graph.rs
@@ -59,6 +59,8 @@ pub fn collect_invalid_external_imports(
let options = WalkOptions {
check_js: true,
follow_dynamic: true,
+ // this being disabled will cause it to follow everything in the graph
+ prefer_fast_check_graph: false,
follow_type_only: true,
};
let mut iter = graph.walk(&graph.roots, options);
diff --git a/cli/tools/registry/unfurl.rs b/cli/tools/registry/unfurl.rs
index 2224d0870..f45b6ffc3 100644
--- a/cli/tools/registry/unfurl.rs
+++ b/cli/tools/registry/unfurl.rs
@@ -4,9 +4,9 @@ use deno_ast::ParsedSource;
use deno_ast::SourceRange;
use deno_ast::SourceTextInfo;
use deno_core::ModuleSpecifier;
-use deno_graph::DefaultModuleAnalyzer;
use deno_graph::DependencyDescriptor;
use deno_graph::DynamicTemplatePart;
+use deno_graph::ParserModuleAnalyzer;
use deno_graph::TypeScriptReference;
use deno_runtime::deno_node::is_builtin_node_module;
@@ -192,7 +192,7 @@ impl<'a> SpecifierUnfurler<'a> {
diagnostic_reporter: &mut dyn FnMut(SpecifierUnfurlerDiagnostic),
) -> String {
let mut text_changes = Vec::new();
- let module_info = DefaultModuleAnalyzer::module_info(parsed_source);
+ let module_info = ParserModuleAnalyzer::module_info(parsed_source);
let analyze_specifier =
|specifier: &str,
range: &deno_graph::PositionRange,
diff --git a/cli/tools/repl/session.rs b/cli/tools/repl/session.rs
index 48614cfe5..e5f70df15 100644
--- a/cli/tools/repl/session.rs
+++ b/cli/tools/repl/session.rs
@@ -254,9 +254,11 @@ impl ReplSession {
})?;
let ts_config_for_emit = cli_options
.resolve_ts_config_for_emit(deno_config::TsConfigType::Emit)?;
- let emit_options =
- crate::args::ts_config_to_emit_options(ts_config_for_emit.ts_config);
- let experimental_decorators = emit_options.use_ts_decorators;
+ let (transpile_options, _) =
+ crate::args::ts_config_to_transpile_and_emit_options(
+ ts_config_for_emit.ts_config,
+ );
+ let experimental_decorators = transpile_options.use_ts_decorators;
let mut repl_session = ReplSession {
npm_resolver,
resolver,
@@ -619,23 +621,27 @@ impl ReplSession {
self.analyze_and_handle_jsx(&parsed_source);
let transpiled_src = parsed_source
- .transpile(&deno_ast::EmitOptions {
- use_ts_decorators: self.experimental_decorators,
- use_decorators_proposal: !self.experimental_decorators,
- emit_metadata: false,
- source_map: false,
- inline_source_map: false,
- inline_sources: false,
- imports_not_used_as_values: ImportsNotUsedAsValues::Preserve,
- transform_jsx: true,
- precompile_jsx: false,
- jsx_automatic: self.jsx.import_source.is_some(),
- jsx_development: false,
- jsx_factory: self.jsx.factory.clone(),
- jsx_fragment_factory: self.jsx.frag_factory.clone(),
- jsx_import_source: self.jsx.import_source.clone(),
- var_decl_imports: true,
- })?
+ .transpile(
+ &deno_ast::TranspileOptions {
+ use_ts_decorators: self.experimental_decorators,
+ use_decorators_proposal: !self.experimental_decorators,
+ emit_metadata: false,
+ imports_not_used_as_values: ImportsNotUsedAsValues::Preserve,
+ transform_jsx: true,
+ precompile_jsx: false,
+ jsx_automatic: self.jsx.import_source.is_some(),
+ jsx_development: false,
+ jsx_factory: self.jsx.factory.clone(),
+ jsx_fragment_factory: self.jsx.frag_factory.clone(),
+ jsx_import_source: self.jsx.import_source.clone(),
+ var_decl_imports: true,
+ },
+ &deno_ast::EmitOptions {
+ source_map: deno_ast::SourceMapOption::None,
+ inline_sources: false,
+ keep_comments: false,
+ },
+ )?
.text;
let value = self
diff --git a/cli/tools/vendor/test.rs b/cli/tools/vendor/test.rs
index d54bf5dc5..09e911277 100644
--- a/cli/tools/vendor/test.rs
+++ b/cli/tools/vendor/test.rs
@@ -236,13 +236,12 @@ impl VendorTestBuilder {
let resolver = resolver.clone();
move |entry_points| {
async move {
- let analyzer = DefaultModuleAnalyzer::default();
Ok(
build_test_graph(
entry_points,
loader,
resolver.as_graph_resolver(),
- &analyzer,
+ &DefaultModuleAnalyzer,
)
.await,
)
@@ -310,7 +309,7 @@ async fn build_test_graph(
&mut loader,
deno_graph::BuildOptions {
resolver: Some(resolver),
- module_analyzer: Some(analyzer),
+ module_analyzer: analyzer,
..Default::default()
},
)
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-24 10:42:22 +0000