Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: better jsx workspace config resolution #28186

Merged
merged 2 commits into from
Feb 19, 2025
Merged

fix: better jsx workspace config resolution #28186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db3deb4
fix: better jsx workspace config resolution
dsherret Feb 19, 2025
f9919d0
update to published
dsherret Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ deno_ast = { version = "=0.44.0", features = ["transpiling"] }
deno_core = { version = "0.338.0" }

deno_bench_util = { version = "0.185.0", path = "./bench_util" }
deno_config = { version = "=0.48.1", features = ["workspace"] }
deno_config = { version = "=0.49.0", features = ["workspace"] }
deno_lockfile = "=0.24.0"
deno_media_type = { version = "=0.2.5", features = ["module_specifier"] }
deno_npm = "=0.27.2"
Expand Down
16 changes: 7 additions & 9 deletions cli/graph_util.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@ use std::sync::Arc;

use deno_config::deno_json;
use deno_config::deno_json::CompilerOptionTypesDeserializeError;
use deno_config::deno_json::JsxImportSourceConfig;
use deno_config::deno_json::NodeModulesDirMode;
use deno_config::workspace::JsrPackageConfig;
use deno_config::workspace::JsxImportSourceConfig;
use deno_config::workspace::ToMaybeJsxImportSourceConfigError;
use deno_core::error::AnyError;
use deno_core::parking_lot::Mutex;
use deno_core::serde_json;
Expand Down Expand Up @@ -568,9 +569,7 @@ pub enum BuildGraphWithNpmResolutionError {
SerdeJson(#[from] serde_json::Error),
#[class(inherit)]
#[error(transparent)]
ToMaybeJsxImportSourceConfig(
#[from] deno_json::ToMaybeJsxImportSourceConfigError,
),
ToMaybeJsxImportSourceConfig(#[from] ToMaybeJsxImportSourceConfigError),
#[class(inherit)]
#[error(transparent)]
NodeModulesDirParse(#[from] deno_json::NodeModulesDirParseError),
Expand Down Expand Up @@ -868,7 +867,7 @@ impl ModuleGraphBuilder {
&self,
graph: &mut ModuleGraph,
options: BuildFastCheckGraphOptions,
) -> Result<(), deno_json::ToMaybeJsxImportSourceConfigError> {
) -> Result<(), ToMaybeJsxImportSourceConfigError> {
if !graph.graph_kind().include_types() {
return Ok(());
}
Expand Down Expand Up @@ -958,8 +957,7 @@ impl ModuleGraphBuilder {

fn create_graph_resolver(
&self,
) -> Result<CliGraphResolver, deno_json::ToMaybeJsxImportSourceConfigError>
{
) -> Result<CliGraphResolver, ToMaybeJsxImportSourceConfigError> {
let jsx_import_source_config_unscoped = self
.cli_options
.start_dir
Expand Down Expand Up @@ -1368,7 +1366,7 @@ impl<'a> deno_graph::source::Resolver for CliGraphResolver<'a> {
) -> Option<String> {
self
.resolve_jsx_import_source_config(referrer)
.and_then(|c| c.default_specifier.clone())
.and_then(|c| c.import_source.as_ref().map(|s| s.specifier.clone()))
}

fn default_jsx_import_source_types(
Expand All @@ -1377,7 +1375,7 @@ impl<'a> deno_graph::source::Resolver for CliGraphResolver<'a> {
) -> Option<String> {
self
.resolve_jsx_import_source_config(referrer)
.and_then(|c| c.default_types_specifier.clone())
.and_then(|c| c.import_source_types.as_ref().map(|s| s.specifier.clone()))
}

fn jsx_import_source_module(&self, referrer: &ModuleSpecifier) -> &str {
Expand Down
2 changes: 1 addition & 1 deletion cli/lsp/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ use deno_ast::MediaType;
use deno_config::deno_json::DenoJsonCache;
use deno_config::deno_json::FmtConfig;
use deno_config::deno_json::FmtOptionsConfig;
use deno_config::deno_json::JsxImportSourceConfig;
use deno_config::deno_json::LintConfig;
use deno_config::deno_json::NodeModulesDirMode;
use deno_config::deno_json::TestConfig;
use deno_config::deno_json::TsConfig;
use deno_config::deno_json::TsConfigWithIgnoredOptions;
use deno_config::glob::FilePatterns;
use deno_config::glob::PathOrPatternSet;
use deno_config::workspace::JsxImportSourceConfig;
use deno_config::workspace::VendorEnablement;
use deno_config::workspace::Workspace;
use deno_config::workspace::WorkspaceCache;
Expand Down
16 changes: 8 additions & 8 deletions cli/lsp/documents.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1582,16 +1582,16 @@ impl Documents {
for (scope, config_data) in self.config.tree.data_by_scope().as_ref() {
let dep_info = dep_info_by_scope.entry(Some(scope.clone())).or_default();
(|| {
let config_file = config_data.maybe_deno_json()?;
let member_dir = &config_data.member_dir;
let jsx_config =
config_file.to_maybe_jsx_import_source_config().ok()??;
let type_specifier = jsx_config.default_types_specifier.as_ref()?;
let code_specifier = jsx_config.default_specifier.as_ref()?;
member_dir.to_maybe_jsx_import_source_config().ok()??;
let import_source_types = jsx_config.import_source_types.as_ref()?;
let import_source = jsx_config.import_source.as_ref()?;
let cli_resolver = self.resolver.as_cli_resolver(Some(scope));
let type_specifier = cli_resolver
.resolve(
type_specifier,
&jsx_config.base_url,
&import_source_types.specifier,
&import_source_types.base,
deno_graph::Position::zeroed(),
// todo(dsherret): this is wrong because it doesn't consider CJS referrers
ResolutionMode::Import,
Expand All @@ -1600,8 +1600,8 @@ impl Documents {
.ok()?;
let code_specifier = cli_resolver
.resolve(
code_specifier,
&jsx_config.base_url,
&import_source.specifier,
&import_source.base,
deno_graph::Position::zeroed(),
// todo(dsherret): this is wrong because it doesn't consider CJS referrers
ResolutionMode::Import,
Expand Down
6 changes: 3 additions & 3 deletions cli/lsp/resolver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use dashmap::DashMap;
use deno_ast::MediaType;
use deno_cache_dir::npm::NpmCacheDir;
use deno_cache_dir::HttpCache;
use deno_config::deno_json::JsxImportSourceConfig;
use deno_config::workspace::JsxImportSourceConfig;
use deno_core::parking_lot::Mutex;
use deno_core::url::Url;
use deno_graph::GraphImport;
Expand Down Expand Up @@ -997,7 +997,7 @@ impl<'a> deno_graph::source::Resolver for SingleReferrerGraphResolver<'a> {
) -> Option<String> {
self
.jsx_import_source_config
.and_then(|c| c.default_specifier.clone())
.and_then(|c| c.import_source.as_ref().map(|s| s.specifier.clone()))
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I kind of feel like we should be providing the base to deno_graph, but I guess people don't use jsxImportSource with relative urls.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, I don't think other transpilers support relative paths and just mindlessly insert the given string value. Would be kinda cool for prototyping if relative-style import source would be supported though.

}

fn default_jsx_import_source_types(
Expand All @@ -1006,7 +1006,7 @@ impl<'a> deno_graph::source::Resolver for SingleReferrerGraphResolver<'a> {
) -> Option<String> {
self
.jsx_import_source_config
.and_then(|c| c.default_types_specifier.clone())
.and_then(|c| c.import_source_types.as_ref().map(|s| s.specifier.clone()))
}

fn jsx_import_source_module(&self, _referrer: &ModuleSpecifier) -> &str {
Expand Down
2 changes: 1 addition & 1 deletion cli/tools/check.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ pub enum CheckError {
#[class(inherit)]
#[error(transparent)]
ToMaybeJsxImportSourceConfig(
#[from] deno_json::ToMaybeJsxImportSourceConfigError,
#[from] deno_config::workspace::ToMaybeJsxImportSourceConfigError,
),
#[class(inherit)]
#[error(transparent)]
Expand Down
Loading