@@ -24,6 +24,19 @@ pub trait PackageChangeMapper {
2424 fn detect_package ( & self , file : & AnchoredSystemPath ) -> PackageMapping ;
2525}
2626
27+ impl < L , R > PackageChangeMapper for either:: Either < L , R >
28+ where
29+ L : PackageChangeMapper ,
30+ R : PackageChangeMapper ,
31+ {
32+ fn detect_package ( & self , file : & AnchoredSystemPath ) -> PackageMapping {
33+ match self {
34+ either:: Either :: Left ( l) => l. detect_package ( file) ,
35+ either:: Either :: Right ( r) => r. detect_package ( file) ,
36+ }
37+ }
38+ }
39+
2740/// Detects package by checking if the file is inside the package.
2841///
2942/// Does *not* use the `globalDependencies` in turbo.json.
@@ -73,6 +86,43 @@ impl PackageChangeMapper for DefaultPackageChangeMapper<'_> {
7386 }
7487}
7588
89+ pub struct DefaultPackageChangeMapperWithLockfile < ' a > {
90+ base : DefaultPackageChangeMapper < ' a > ,
91+ }
92+
93+ impl < ' a > DefaultPackageChangeMapperWithLockfile < ' a > {
94+ pub fn new ( pkg_dep_graph : & ' a PackageGraph ) -> Self {
95+ Self {
96+ base : DefaultPackageChangeMapper :: new ( pkg_dep_graph) ,
97+ }
98+ }
99+ }
100+
101+ impl PackageChangeMapper for DefaultPackageChangeMapperWithLockfile < ' _ > {
102+ fn detect_package ( & self , path : & AnchoredSystemPath ) -> PackageMapping {
103+ // If we have a lockfile change, we consider this as a root package change,
104+ // since there's a chance that the root package uses a workspace package
105+ // dependency (this is cursed behavior but sadly possible). There's a chance
106+ // that we can make this more accurate by checking which package
107+ // manager, since not all package managers may permit root pulling from
108+ // workspace package dependencies
109+ if PackageManager :: supported_managers ( )
110+ . iter ( )
111+ . any ( |pm| pm. lockfile_name ( ) == path. as_str ( ) )
112+ {
113+ PackageMapping :: Package ( (
114+ WorkspacePackage {
115+ name : PackageName :: Root ,
116+ path : AnchoredSystemPathBuf :: from_raw ( "" ) . unwrap ( ) ,
117+ } ,
118+ PackageInclusionReason :: ConservativeRootLockfileChanged ,
119+ ) )
120+ } else {
121+ self . base . detect_package ( path)
122+ }
123+ }
124+ }
125+
76126#[ derive( Error , Debug ) ]
77127pub enum Error {
78128 #[ error( transparent) ]
@@ -88,7 +138,7 @@ pub enum Error {
88138/// changes all packages. Since we have a list of global deps,
89139/// we can check against that and avoid invalidating in unnecessary cases.
90140pub struct GlobalDepsPackageChangeMapper < ' a > {
91- pkg_dep_graph : & ' a PackageGraph ,
141+ base : DefaultPackageChangeMapperWithLockfile < ' a > ,
92142 global_deps_matcher : wax:: Any < ' a > ,
93143}
94144
@@ -97,36 +147,19 @@ impl<'a> GlobalDepsPackageChangeMapper<'a> {
97147 pkg_dep_graph : & ' a PackageGraph ,
98148 global_deps : I ,
99149 ) -> Result < Self , Error > {
150+ let base = DefaultPackageChangeMapperWithLockfile :: new ( pkg_dep_graph) ;
100151 let global_deps_matcher = wax:: any ( global_deps) ?;
101152
102153 Ok ( Self {
103- pkg_dep_graph ,
154+ base ,
104155 global_deps_matcher,
105156 } )
106157 }
107158}
108159
109160impl PackageChangeMapper for GlobalDepsPackageChangeMapper < ' _ > {
110161 fn detect_package ( & self , path : & AnchoredSystemPath ) -> PackageMapping {
111- // If we have a lockfile change, we consider this as a root package change,
112- // since there's a chance that the root package uses a workspace package
113- // dependency (this is cursed behavior but sadly possible). There's a chance
114- // that we can make this more accurate by checking which package
115- // manager, since not all package managers may permit root pulling from
116- // workspace package dependencies
117- if PackageManager :: supported_managers ( )
118- . iter ( )
119- . any ( |pm| pm. lockfile_name ( ) == path. as_str ( ) )
120- {
121- return PackageMapping :: Package ( (
122- WorkspacePackage {
123- name : PackageName :: Root ,
124- path : AnchoredSystemPathBuf :: from_raw ( "" ) . unwrap ( ) ,
125- } ,
126- PackageInclusionReason :: ConservativeRootLockfileChanged ,
127- ) ) ;
128- }
129- match DefaultPackageChangeMapper :: new ( self . pkg_dep_graph ) . detect_package ( path) {
162+ match self . base . detect_package ( path) {
130163 // Since `DefaultPackageChangeMapper` is overly conservative, we can check here if
131164 // the path is actually in globalDeps and if not, return it as
132165 // PackageDetection::Package(WorkspacePackage::root()).
@@ -160,7 +193,8 @@ mod tests {
160193 use super :: { DefaultPackageChangeMapper , GlobalDepsPackageChangeMapper } ;
161194 use crate :: {
162195 change_mapper:: {
163- AllPackageChangeReason , ChangeMapper , PackageChanges , PackageInclusionReason ,
196+ AllPackageChangeReason , ChangeMapper , LockfileContents , PackageChanges ,
197+ PackageInclusionReason ,
164198 } ,
165199 discovery:: { self , PackageDiscovery } ,
166200 package_graph:: { PackageGraphBuilder , WorkspacePackage } ,
@@ -208,7 +242,7 @@ mod tests {
208242 [ AnchoredSystemPathBuf :: from_raw ( "README.md" ) ?]
209243 . into_iter ( )
210244 . collect ( ) ,
211- None ,
245+ LockfileContents :: Unchanged ,
212246 ) ?;
213247
214248 // We should return All because we don't have global deps and
@@ -228,7 +262,7 @@ mod tests {
228262 [ AnchoredSystemPathBuf :: from_raw ( "README.md" ) ?]
229263 . into_iter ( )
230264 . collect ( ) ,
231- None ,
265+ LockfileContents :: Unchanged ,
232266 ) ?;
233267
234268 // We only get a root workspace change since we have global deps specified and
0 commit comments