@@ -65,27 +65,21 @@ use crate::sync::new_rc;
65
65
use crate :: UrlToFilePathError ;
66
66
67
67
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 ;
83
68
84
69
#[ allow( clippy:: disallowed_types) ]
85
70
type UrlRc = crate :: sync:: MaybeArc < Url > ;
86
71
#[ allow( clippy:: disallowed_types) ]
87
72
type WorkspaceRc = crate :: sync:: MaybeArc < Workspace > ;
88
73
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
+
89
83
#[ derive( Debug , Clone ) ]
90
84
pub struct JsrPackageConfig {
91
85
/// The package name.
@@ -560,14 +554,6 @@ impl Workspace {
560
554
} )
561
555
}
562
556
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
-
571
557
/// Resolves a workspace directory, which can be used for deriving
572
558
/// configuration specific to a member.
573
559
pub fn resolve_member_dir (
@@ -2733,32 +2719,6 @@ pub mod test {
2733
2719
. unwrap( ) ,
2734
2720
} ]
2735
2721
) ;
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
- ) ;
2762
2722
}
2763
2723
2764
2724
#[ test]
0 commit comments