diff options
Diffstat (limited to 'cli/tools')
| -rw-r--r-- | cli/tools/lint/rules/no_sloppy_imports.rs | 28 | ||||
| -rw-r--r-- | cli/tools/registry/unfurl.rs | 5 |
2 files changed, 18 insertions, 15 deletions
diff --git a/cli/tools/lint/rules/no_sloppy_imports.rs b/cli/tools/lint/rules/no_sloppy_imports.rs index 1ae792e08..4180be5be 100644 --- a/cli/tools/lint/rules/no_sloppy_imports.rs +++ b/cli/tools/lint/rules/no_sloppy_imports.rs @@ -189,20 +189,22 @@ impl<'a> deno_graph::source::Resolver for SloppyImportCaptureResolver<'a> { .map_err(|err| ResolveError::Other(err.into()))?; match resolution { - deno_config::workspace::MappedResolution::Normal(specifier) - | deno_config::workspace::MappedResolution::ImportMap(specifier) => { - match self.sloppy_imports_resolver.resolve(&specifier, mode) { - Some(res) => { - self - .captures - .borrow_mut() - .entry(referrer_range.clone()) - .or_insert_with(|| res.clone()); - Ok(res.into_specifier()) - } - None => Ok(specifier), - } + deno_config::workspace::MappedResolution::Normal { + specifier, .. } + | deno_config::workspace::MappedResolution::ImportMap { + specifier, .. + } => match self.sloppy_imports_resolver.resolve(&specifier, mode) { + Some(res) => { + self + .captures + .borrow_mut() + .entry(referrer_range.clone()) + .or_insert_with(|| res.clone()); + Ok(res.into_specifier()) + } + None => Ok(specifier), + }, deno_config::workspace::MappedResolution::WorkspaceJsrPackage { .. } diff --git a/cli/tools/registry/unfurl.rs b/cli/tools/registry/unfurl.rs index 489c9a1be..2babedb36 100644 --- a/cli/tools/registry/unfurl.rs +++ b/cli/tools/registry/unfurl.rs @@ -73,8 +73,8 @@ impl SpecifierUnfurler { self.workspace_resolver.resolve(specifier, referrer) { match resolved { - MappedResolution::Normal(specifier) - | MappedResolution::ImportMap(specifier) => Some(specifier), + MappedResolution::Normal { specifier, .. } + | MappedResolution::ImportMap { specifier, .. } => Some(specifier), MappedResolution::WorkspaceJsrPackage { pkg_req_ref, .. } => { Some(ModuleSpecifier::parse(&pkg_req_ref.to_string()).unwrap()) } @@ -443,6 +443,7 @@ mod tests { Arc::new(ModuleSpecifier::from_directory_path(&cwd).unwrap()), Some(import_map), vec![ResolverWorkspaceJsrPackage { + is_patch: false, base: ModuleSpecifier::from_directory_path(cwd.join("jsr-package")) .unwrap(), name: "@denotest/example".to_string(), |