foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-03 17:34:47 -05:00
Code Issues Packages 1 Wiki Activity

fix(publish): reduce warnings about dynamic imports (#22636)

Browse source
This commit is contained in:
David Sherret 2024-02-29 11:34:07 -05:00 • committed by GitHub
parent 9ffc34c159
commit 8d9a54ca18
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 28 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
cli/tools/registry/unfurl.rs
View file

@ -157,7 +157,12 @@ impl<'a> SpecifierUnfurler<'a> {
} else { } else {
resolved resolved
}; };
relative_url(&resolved, referrer, specifier) let relative_resolved = relative_url(&resolved, referrer);
if relative_resolved == specifier {
None // nothing to unfurl
} else {
Some(relative_resolved)
}
} }
/// Attempts to unfurl the dynamic dependency returning `true` on success /// Attempts to unfurl the dynamic dependency returning `true` on success
@ -172,20 +177,20 @@ impl<'a> SpecifierUnfurler<'a> {
match &dep.argument { match &dep.argument {
deno_graph::DynamicArgument::String(specifier) => { deno_graph::DynamicArgument::String(specifier) => {
let range = to_range(parsed_source, &dep.argument_range); let range = to_range(parsed_source, &dep.argument_range);
let maybe_relative_index = let maybe_relative_index = parsed_source.text_info().text_str()
parsed_source.text_info().text_str()[range.start..].find(specifier); [range.start..range.end]
.find(specifier);
let Some(relative_index) = maybe_relative_index else { let Some(relative_index) = maybe_relative_index else {
return false; return true; // always say it's analyzable for a string
}; };
let unfurled = self.unfurl_specifier(module_url, specifier); let unfurled = self.unfurl_specifier(module_url, specifier);
let Some(unfurled) = unfurled else { if let Some(unfurled) = unfurled {
return false;
};
let start = range.start + relative_index; let start = range.start + relative_index;
text_changes.push(deno_ast::TextChange { text_changes.push(deno_ast::TextChange {
range: start..start + specifier.len(), range: start..start + specifier.len(),
new_text: unfurled, new_text: unfurled,
}); });
}
true true
} }
deno_graph::DynamicArgument::Template(parts) => match parts.first() { deno_graph::DynamicArgument::Template(parts) => match parts.first() {
@ -201,7 +206,7 @@ impl<'a> SpecifierUnfurler<'a> {
} }
let unfurled = self.unfurl_specifier(module_url, specifier); let unfurled = self.unfurl_specifier(module_url, specifier);
let Some(unfurled) = unfurled else { let Some(unfurled) = unfurled else {
return false; return true; // nothing to unfurl
}; };
let range = to_range(parsed_source, &dep.argument_range); let range = to_range(parsed_source, &dep.argument_range);
let maybe_relative_index = let maybe_relative_index =
@ -322,17 +327,12 @@ impl<'a> SpecifierUnfurler<'a> {
fn relative_url( fn relative_url(
resolved: &ModuleSpecifier, resolved: &ModuleSpecifier,
referrer: &ModuleSpecifier, referrer: &ModuleSpecifier,
specifier: &str, ) -> String {
) -> Option<String> { if resolved.scheme() == "file" {
let new_specifier = if resolved.scheme() == "file" {
format!("./{}", referrer.make_relative(resolved).unwrap()) format!("./{}", referrer.make_relative(resolved).unwrap())
} else { } else {
resolved.to_string() resolved.to_string()
};
if new_specifier == specifier {
return None;
} }
Some(new_specifier)
} }
fn to_range( fn to_range(
@ -440,9 +440,11 @@ const test1 = await import("lib/foo.ts");
const test2 = await import(`lib/foo.ts`); const test2 = await import(`lib/foo.ts`);
const test3 = await import(`lib/${expr}`); const test3 = await import(`lib/${expr}`);
const test4 = await import(`./lib/${expr}`); const test4 = await import(`./lib/${expr}`);
const test5 = await import("./lib/something.ts");
const test6 = await import(`./lib/something.ts`);
// will warn // will warn
const test5 = await import(`lib${expr}`); const warn1 = await import(`lib${expr}`);
const test6 = await import(`${expr}`); const warn2 = await import(`${expr}`);
"#; "#;
let specifier = let specifier =
ModuleSpecifier::from_file_path(cwd.join("mod.ts")).unwrap(); ModuleSpecifier::from_file_path(cwd.join("mod.ts")).unwrap();
@ -486,9 +488,11 @@ const test1 = await import("./lib/foo.ts");
const test2 = await import(`./lib/foo.ts`); const test2 = await import(`./lib/foo.ts`);
const test3 = await import(`./lib/${expr}`); const test3 = await import(`./lib/${expr}`);
const test4 = await import(`./lib/${expr}`); const test4 = await import(`./lib/${expr}`);
const test5 = await import("./lib/something.ts");
const test6 = await import(`./lib/something.ts`);
// will warn // will warn
const test5 = await import(`lib${expr}`); const warn1 = await import(`lib${expr}`);
const test6 = await import(`${expr}`); const warn2 = await import(`${expr}`);
"#; "#;
assert_eq!(unfurled_source, expected_source); assert_eq!(unfurled_source, expected_source);
} }