Skip to content

Commit

Permalink
fix(node): support wildcards in package.json imports (#24794)
Browse files Browse the repository at this point in the history
  • Loading branch information
dsherret authored Jul 30, 2024
1 parent 1ba88a7 commit 7a38101
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 4 deletions.
7 changes: 3 additions & 4 deletions ext/node_resolver/resolution.rs
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ impl<TEnv: NodeResolverEnv> NodeResolver<TEnv> {
for key in imports.keys() {
let pattern_index = key.find('*');
if let Some(pattern_index) = pattern_index {
let key_sub = &key[0..=pattern_index];
let key_sub = &key[0..pattern_index];
if name.starts_with(key_sub) {
let pattern_trailer = &key[pattern_index + 1..];
if name.len() > key.len()
Expand All @@ -607,8 +607,7 @@ impl<TEnv: NodeResolverEnv> NodeResolver<TEnv> {
{
best_match = key;
best_match_subpath = Some(
name[pattern_index..=(name.len() - pattern_trailer.len())]
.to_string(),
&name[pattern_index..(name.len() - pattern_trailer.len())],
);
}
}
Expand All @@ -620,7 +619,7 @@ impl<TEnv: NodeResolverEnv> NodeResolver<TEnv> {
let maybe_resolved = self.resolve_package_target(
package_json_path.as_ref().unwrap(),
target,
&best_match_subpath.unwrap(),
best_match_subpath.unwrap(),
best_match,
maybe_referrer,
referrer_kind,
Expand Down
7 changes: 7 additions & 0 deletions tests/specs/node/imports_wildcard/__test__.jsonc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"envs": {
"DENO_FUTURE": "1"
},
"args": "run main.mjs",
"output": "main.out"
}
4 changes: 4 additions & 0 deletions tests/specs/node/imports_wildcard/main.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
import { add, subtract } from "package";

console.log(add(1, 2));
console.log(subtract(4, 2));
2 changes: 2 additions & 0 deletions tests/specs/node/imports_wildcard/main.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
3
2

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

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

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

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

2 changes: 2 additions & 0 deletions tests/specs/node/imports_wildcard/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
{
}

0 comments on commit 7a38101

Please # to comment.