Skip to content

Commit 3b6c3e3

Browse files
nilptrnilptr
committed
chore: cargo fmt
1 parent c2b7bf3 commit 3b6c3e3

File tree

8 files changed

+101
-86
lines changed

8 files changed

+101
-86
lines changed

‎napi/src/lib.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ extern crate napi;
22
extern crate napi_derive;
33
extern crate oxc_resolver;
44

5+
use napi::tokio::runtime;
6+
use napi_derive::napi;
7+
use oxc_resolver::{ResolveOptions, Resolver};
58
use std::{
69
path::{Path, PathBuf},
710
sync::Arc,
811
};
9-
use napi::tokio::runtime;
10-
use napi_derive::napi;
11-
use oxc_resolver::{ResolveOptions, Resolver};
1212

1313
use self::{
1414
options::{NapiResolveOptions, StrOrStrList},

‎src/lib.rs‎

Lines changed: 75 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1172,75 +1172,77 @@ impl<Fs: FileSystem + Send + Sync> ResolverGeneric<Fs> {
11721172
) -> BoxFuture<'a, Result<Arc<TsConfig>, ResolveError>> {
11731173
let fut = async move {
11741174
self.cache
1175-
.tsconfig(root, path, |mut tsconfig| async move {
1176-
let directory = self.cache.value(tsconfig.directory());
1177-
tracing::trace!(tsconfig = ?tsconfig, "load_tsconfig");
1178-
1179-
// Extend tsconfig
1180-
if let Some(extends) = &tsconfig.extends {
1181-
let extended_tsconfig_paths = match extends {
1182-
ExtendsField::Single(s) => {
1183-
vec![self.get_extended_tsconfig_path(&directory, &tsconfig, s).await?]
1184-
}
1185-
ExtendsField::Multiple(specifiers) => {
1186-
try_join_all(
1187-
specifiers.iter().map(|s| {
1175+
.tsconfig(root, path, |mut tsconfig| async move {
1176+
let directory = self.cache.value(tsconfig.directory());
1177+
tracing::trace!(tsconfig = ?tsconfig, "load_tsconfig");
1178+
1179+
// Extend tsconfig
1180+
if let Some(extends) = &tsconfig.extends {
1181+
let extended_tsconfig_paths = match extends {
1182+
ExtendsField::Single(s) => {
1183+
vec![
11881184
self.get_extended_tsconfig_path(&directory, &tsconfig, s)
1189-
}),
1190-
)
1191-
.await?
1185+
.await?,
1186+
]
1187+
}
1188+
ExtendsField::Multiple(specifiers) => {
1189+
try_join_all(specifiers.iter().map(|s| {
1190+
self.get_extended_tsconfig_path(&directory, &tsconfig, s)
1191+
}))
1192+
.await?
1193+
}
1194+
};
1195+
for extended_tsconfig_path in extended_tsconfig_paths {
1196+
let extended_tsconfig = self
1197+
.load_tsconfig(
1198+
/* root */ false,
1199+
&extended_tsconfig_path,
1200+
&TsconfigReferences::Disabled,
1201+
)
1202+
.await?;
1203+
tsconfig.extend_tsconfig(&extended_tsconfig);
11921204
}
1193-
};
1194-
for extended_tsconfig_path in extended_tsconfig_paths {
1195-
let extended_tsconfig = self
1196-
.load_tsconfig(
1197-
/* root */ false,
1198-
&extended_tsconfig_path,
1199-
&TsconfigReferences::Disabled,
1200-
)
1201-
.await?;
1202-
tsconfig.extend_tsconfig(&extended_tsconfig);
12031205
}
1204-
}
12051206

1206-
// Load project references
1207-
match references {
1208-
TsconfigReferences::Disabled => {
1209-
tsconfig.references.drain(..);
1210-
}
1211-
TsconfigReferences::Auto => {}
1212-
TsconfigReferences::Paths(paths) => {
1213-
tsconfig.references = paths
1214-
.iter()
1215-
.map(|path| ProjectReference { path: path.clone(), tsconfig: None })
1216-
.collect();
1207+
// Load project references
1208+
match references {
1209+
TsconfigReferences::Disabled => {
1210+
tsconfig.references.drain(..);
1211+
}
1212+
TsconfigReferences::Auto => {}
1213+
TsconfigReferences::Paths(paths) => {
1214+
tsconfig.references = paths
1215+
.iter()
1216+
.map(|path| ProjectReference { path: path.clone(), tsconfig: None })
1217+
.collect();
1218+
}
12171219
}
1218-
}
1219-
if !tsconfig.references.is_empty() {
1220-
let directory = tsconfig.directory().to_path_buf();
1221-
for reference in &mut tsconfig.references {
1222-
let reference_tsconfig_path = directory.normalize_with(&reference.path);
1223-
let tsconfig = self
1224-
.cache
1225-
.tsconfig(
1226-
/* root */ true,
1227-
&reference_tsconfig_path,
1228-
|reference_tsconfig| async {
1229-
if reference_tsconfig.path == tsconfig.path {
1230-
return Err(ResolveError::TsconfigSelfReference(
1231-
reference_tsconfig.path.clone(),
1232-
));
1233-
}
1234-
Ok(reference_tsconfig)
1235-
},
1236-
)
1237-
.await?;
1238-
reference.tsconfig.replace(tsconfig);
1220+
if !tsconfig.references.is_empty() {
1221+
let directory = tsconfig.directory().to_path_buf();
1222+
for reference in &mut tsconfig.references {
1223+
let reference_tsconfig_path = directory.normalize_with(&reference.path);
1224+
let tsconfig = self
1225+
.cache
1226+
.tsconfig(
1227+
/* root */ true,
1228+
&reference_tsconfig_path,
1229+
|reference_tsconfig| async {
1230+
if reference_tsconfig.path == tsconfig.path {
1231+
return Err(ResolveError::TsconfigSelfReference(
1232+
reference_tsconfig.path.clone(),
1233+
));
1234+
}
1235+
Ok(reference_tsconfig)
1236+
},
1237+
)
1238+
.await?;
1239+
reference.tsconfig.replace(tsconfig);
1240+
}
12391241
}
1240-
}
12411242

1242-
Ok(tsconfig)
1243-
}).await
1243+
Ok(tsconfig)
1244+
})
1245+
.await
12441246
};
12451247
Box::pin(fut)
12461248
}
@@ -1614,7 +1616,7 @@ impl<Fs: FileSystem + Send + Sync> ResolverGeneric<Fs> {
16141616
target: &'a JSONValue,
16151617
pattern_match: Option<&'a str>,
16161618
is_imports: bool,
1617-
conditions: &'a[String],
1619+
conditions: &'a [String],
16181620
ctx: &'a mut Ctx,
16191621
) -> BoxFuture<'a, ResolveResult> {
16201622
let fut = async move {
@@ -1643,7 +1645,7 @@ impl<Fs: FileSystem + Send + Sync> ResolverGeneric<Fs> {
16431645
};
16441646
Ok(target)
16451647
}
1646-
1648+
16471649
match target {
16481650
// 1. If target is a String, then
16491651
JSONValue::String(target) => {
@@ -1660,13 +1662,17 @@ impl<Fs: FileSystem + Send + Sync> ResolverGeneric<Fs> {
16601662
}
16611663
// 2. If patternMatch is a String, then
16621664
// 1. Return PACKAGE_RESOLVE(target with every instance of "*" replaced by patternMatch, packageURL + "/").
1663-
let target =
1664-
normalize_string_target(target_key, target, pattern_match, package_url)?;
1665+
let target = normalize_string_target(
1666+
target_key,
1667+
target,
1668+
pattern_match,
1669+
package_url,
1670+
)?;
16651671
let package_url = self.cache.value(package_url);
16661672
// // 3. Return PACKAGE_RESOLVE(target, packageURL + "/").
16671673
return self.package_resolve(&package_url, &target, ctx).await;
16681674
}
1669-
1675+
16701676
// 2. If target split on "/" or "\" contains any "", ".", "..", or "node_modules" segments after the first "." segment, case insensitive and including percent encoded variants, throw an Invalid Package Target error.
16711677
// 3. Let resolvedTarget be the URL resolution of the concatenation of packageURL and target.
16721678
// 4. Assert: resolvedTarget is contained in packageURL.
@@ -1740,11 +1746,11 @@ impl<Fs: FileSystem + Send + Sync> ResolverGeneric<Fs> {
17401746
ctx,
17411747
)
17421748
.await;
1743-
1749+
17441750
if resolved.is_err() && i == targets.len() {
17451751
return resolved;
17461752
}
1747-
1753+
17481754
// 2. If resolved is undefined, continue the loop.
17491755
if let Ok(Some(path)) = resolved {
17501756
// 3. Return resolved.

‎src/tests/browser_field.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,8 @@ async fn crypto_js() {
148148
..ResolveOptions::default()
149149
});
150150

151-
let resolved_path = resolver.resolve(f.join("crypto-js"), "crypto").await.map(|r| r.full_path());
151+
let resolved_path =
152+
resolver.resolve(f.join("crypto-js"), "crypto").await.map(|r| r.full_path());
152153
assert_eq!(resolved_path, Err(ResolveError::Ignored(f.join("crypto-js"))));
153154
}
154155

‎src/tests/exports_field.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ async fn exports_not_browser_field1() {
9393
..ResolveOptions::default()
9494
});
9595

96-
let resolved_path = resolver.resolve(&f, "exports-field/dist/main.js").await.map(|r| r.full_path());
96+
let resolved_path =
97+
resolver.resolve(&f, "exports-field/dist/main.js").await.map(|r| r.full_path());
9798
assert_eq!(resolved_path, Ok(f.join("node_modules/exports-field/lib/lib2/main.js")));
9899
}
99100

@@ -109,7 +110,8 @@ async fn exports_not_browser_field2() {
109110
..ResolveOptions::default()
110111
});
111112

112-
let resolved_path = resolver.resolve(&f2, "exports-field/dist/main.js").await.map(|r| r.full_path());
113+
let resolved_path =
114+
resolver.resolve(&f2, "exports-field/dist/main.js").await.map(|r| r.full_path());
113115
assert_eq!(resolved_path, Ok(f2.join("node_modules/exports-field/lib/browser.js")));
114116
}
115117

‎src/tests/extensions.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ async fn respect_enforce_extension() {
7272
extensions: vec![".ts".into(), String::new(), ".js".into()],
7373
..ResolveOptions::default()
7474
})
75-
.resolve_with_context(&f, "./foo", &mut ctx).await;
75+
.resolve_with_context(&f, "./foo", &mut ctx)
76+
.await;
7677

7778
assert_eq!(resolved.map(Resolution::into_path_buf), Ok(f.join("foo.ts")));
7879
assert_eq!(

‎src/tests/roots.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ async fn roots_fall_through() {
8484
let f = super::fixture();
8585
let absolute_path = f.join("roots_fall_through/index.js");
8686
let specifier = absolute_path.to_string_lossy();
87-
let resolution = Resolver::new(ResolveOptions::default().with_root(&f)).resolve(&f, &specifier).await;
87+
let resolution =
88+
Resolver::new(ResolveOptions::default().with_root(&f)).resolve(&f, &specifier).await;
8889
assert_eq!(
8990
resolution.map(super::super::resolution::Resolution::into_path_buf),
9091
Ok(absolute_path)

‎src/tests/tsconfig_paths.rs‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -488,8 +488,11 @@ OneTest {
488488
let root = PathBuf::from("/root");
489489

490490
for test in pass {
491-
let resolved_path =
492-
test.resolver(&root).resolve(&root, test.requested_module).await.map(|f| f.full_path());
491+
let resolved_path = test
492+
.resolver(&root)
493+
.resolve(&root, test.requested_module)
494+
.await
495+
.map(|f| f.full_path());
493496
assert_eq!(resolved_path, Ok(PathBuf::from(test.expected_path)), "{}", test.name);
494497
}
495498

@@ -517,8 +520,11 @@ OneTest {
517520
];
518521

519522
for test in fail {
520-
let resolved_path =
521-
test.resolver(&root).resolve(&root, test.requested_module).await.map(|f| f.full_path());
523+
let resolved_path = test
524+
.resolver(&root)
525+
.resolve(&root, test.requested_module)
526+
.await
527+
.map(|f| f.full_path());
522528
assert_eq!(
523529
resolved_path,
524530
Err(ResolveError::NotFound(test.requested_module.into())),

‎tests/integration_test.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,9 @@ async fn debug_resolver() {
7676
async fn dependencies() {
7777
let path = dir();
7878
let mut ctx = ResolveContext::default();
79-
let _ = Resolver::new(ResolveOptions::default()).resolve_with_context(
80-
path,
81-
"./tests/package.json",
82-
&mut ctx,
83-
).await;
79+
let _ = Resolver::new(ResolveOptions::default())
80+
.resolve_with_context(path, "./tests/package.json", &mut ctx)
81+
.await;
8482
assert!(!ctx.file_dependencies.is_empty());
8583
assert!(ctx.missing_dependencies.is_empty());
8684
}

0 commit comments

Comments
 (0)