mirror of
https://github.com/denoland/deno.git
synced 2024-10-31 09:14:20 -04:00
33c4d45328
Previously `jsxImportSource` was resolved relative to the config file during graph building, and relative to the emitted module during runtime. This is now fixed so that the JSX import source is resolved relative to the module both during graph building and at runtime.
87 lines
2.3 KiB
Rust
87 lines
2.3 KiB
Rust
// Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
|
|
|
|
use deno_core::resolve_import;
|
|
use deno_core::ModuleSpecifier;
|
|
use deno_graph::source::ResolveResponse;
|
|
use deno_graph::source::Resolver;
|
|
use import_map::ImportMap;
|
|
use std::sync::Arc;
|
|
|
|
use crate::args::config_file::JsxImportSourceConfig;
|
|
|
|
/// Wraps an import map to be used when building a deno_graph module graph.
|
|
/// This is done to avoid having `import_map` be a direct dependency of
|
|
/// `deno_graph`.
|
|
#[derive(Debug, Clone)]
|
|
pub struct ImportMapResolver(Arc<ImportMap>);
|
|
|
|
impl ImportMapResolver {
|
|
pub fn new(import_map: Arc<ImportMap>) -> Self {
|
|
Self(import_map)
|
|
}
|
|
|
|
pub fn as_resolver(&self) -> &dyn Resolver {
|
|
self
|
|
}
|
|
}
|
|
|
|
impl Resolver for ImportMapResolver {
|
|
fn resolve(
|
|
&self,
|
|
specifier: &str,
|
|
referrer: &ModuleSpecifier,
|
|
) -> ResolveResponse {
|
|
match self.0.resolve(specifier, referrer) {
|
|
Ok(resolved_specifier) => ResolveResponse::Specifier(resolved_specifier),
|
|
Err(err) => ResolveResponse::Err(err.into()),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Default, Clone)]
|
|
pub struct JsxResolver {
|
|
default_jsx_import_source: Option<String>,
|
|
jsx_import_source_module: String,
|
|
maybe_import_map_resolver: Option<ImportMapResolver>,
|
|
}
|
|
|
|
impl JsxResolver {
|
|
pub fn new(
|
|
jsx_import_source_config: JsxImportSourceConfig,
|
|
maybe_import_map_resolver: Option<ImportMapResolver>,
|
|
) -> Self {
|
|
Self {
|
|
default_jsx_import_source: jsx_import_source_config.default_specifier,
|
|
jsx_import_source_module: jsx_import_source_config.module,
|
|
maybe_import_map_resolver,
|
|
}
|
|
}
|
|
|
|
pub fn as_resolver(&self) -> &dyn Resolver {
|
|
self
|
|
}
|
|
}
|
|
|
|
impl Resolver for JsxResolver {
|
|
fn default_jsx_import_source(&self) -> Option<String> {
|
|
self.default_jsx_import_source.clone()
|
|
}
|
|
|
|
fn jsx_import_source_module(&self) -> &str {
|
|
self.jsx_import_source_module.as_str()
|
|
}
|
|
|
|
fn resolve(
|
|
&self,
|
|
specifier: &str,
|
|
referrer: &ModuleSpecifier,
|
|
) -> ResolveResponse {
|
|
self.maybe_import_map_resolver.as_ref().map_or_else(
|
|
|| match resolve_import(specifier, referrer.as_str()) {
|
|
Ok(specifier) => ResolveResponse::Specifier(specifier),
|
|
Err(err) => ResolveResponse::Err(err.into()),
|
|
},
|
|
|r| r.resolve(specifier, referrer),
|
|
)
|
|
}
|
|
}
|