Skip to content

Commit 8d3851d

Browse files
authored
feat: remove WorkspaceResolver (#156)
1 parent 8f14012 commit 8d3851d

File tree

2 files changed

+9
-2101
lines changed

2 files changed

+9
-2101
lines changed

src/workspace/mod.rs

+9-49
Original file line numberDiff line numberDiff line change
@@ -65,27 +65,21 @@ use crate::sync::new_rc;
6565
use crate::UrlToFilePathError;
6666

6767
mod discovery;
68-
mod resolver;
69-
70-
pub use resolver::CreateResolverOptions;
71-
pub use resolver::MappedResolution;
72-
pub use resolver::MappedResolutionDiagnostic;
73-
pub use resolver::MappedResolutionError;
74-
pub use resolver::PackageJsonDepResolution;
75-
pub use resolver::ResolutionKind;
76-
pub use resolver::ResolverWorkspaceJsrPackage;
77-
pub use resolver::SpecifiedImportMap;
78-
pub use resolver::WorkspaceResolvePkgJsonFolderError;
79-
pub use resolver::WorkspaceResolvePkgJsonFolderErrorKind;
80-
pub use resolver::WorkspaceResolver;
81-
pub use resolver::WorkspaceResolverCreateError;
82-
pub use resolver::WorkspaceResolverDiagnostic;
8368

8469
#[allow(clippy::disallowed_types)]
8570
type UrlRc = crate::sync::MaybeArc<Url>;
8671
#[allow(clippy::disallowed_types)]
8772
type WorkspaceRc = crate::sync::MaybeArc<Workspace>;
8873

74+
#[derive(Debug, Clone, PartialEq, Eq)]
75+
pub struct ResolverWorkspaceJsrPackage {
76+
pub base: Url,
77+
pub name: String,
78+
pub version: Option<Version>,
79+
pub exports: IndexMap<String, String>,
80+
pub is_patch: bool,
81+
}
82+
8983
#[derive(Debug, Clone)]
9084
pub struct JsrPackageConfig {
9185
/// The package name.
@@ -560,14 +554,6 @@ impl Workspace {
560554
})
561555
}
562556

563-
pub fn create_resolver<TSys: FsMetadata + FsRead>(
564-
&self,
565-
sys: TSys,
566-
options: CreateResolverOptions,
567-
) -> Result<WorkspaceResolver<TSys>, WorkspaceResolverCreateError> {
568-
WorkspaceResolver::from_workspace(self, sys, options)
569-
}
570-
571557
/// Resolves a workspace directory, which can be used for deriving
572558
/// configuration specific to a member.
573559
pub fn resolve_member_dir(
@@ -2733,32 +2719,6 @@ pub mod test {
27332719
.unwrap(),
27342720
}]
27352721
);
2736-
let resolver = workspace_dir
2737-
.workspace
2738-
.create_resolver(UnreachableSys, Default::default())
2739-
.unwrap();
2740-
assert_eq!(
2741-
serde_json::from_str::<serde_json::Value>(
2742-
&resolver.maybe_import_map().unwrap().to_json()
2743-
)
2744-
.unwrap(),
2745-
json!({
2746-
"imports": {
2747-
"@scope/pkg": "jsr:@scope/pkg@1",
2748-
"@scope/pkg/": "jsr:/@scope/pkg@1/"
2749-
},
2750-
"scopes": {
2751-
"https://deno.land/x/": {
2752-
"@scope/pkg": "jsr:@scope/pkg@2",
2753-
"@scope/pkg/": "jsr:/@scope/pkg@2/"
2754-
},
2755-
"./member/": {
2756-
"@scope/pkg": "jsr:@scope/pkg@3",
2757-
"@scope/pkg/": "jsr:/@scope/pkg@3/"
2758-
}
2759-
}
2760-
})
2761-
);
27622722
}
27632723

27642724
#[test]

0 commit comments

Comments
 (0)