@@ -21,6 +21,7 @@ import {
2121 makeTargetedProviderUpdateAction ,
2222 enrichProviderSnapshotWithVersionAdvisory ,
2323 homebrewOwnershipFromCommandPath ,
24+ invalidateLatestProviderVersion ,
2425 makeCachedProviderMaintenanceResolution ,
2526 makePackageManagedProviderMaintenanceResolver ,
2627 makeProviderMaintenanceCapabilities ,
@@ -1064,14 +1065,9 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
10641065 ) ,
10651066 ) ;
10661067
1067- expect ( spawned ) . toEqual ( [
1068- [ brewPath , "--prefix" ] ,
1069- [ brewPath , "info" , "--json=v2" , fixture . name ] ,
1070- ] ) ;
1071- expect ( capabilities ) . toEqual ( {
1068+ expect ( capabilities ) . toMatchObject ( {
10721069 provider : driver ( "packageTool" ) ,
10731070 packageName : "@example/package-tool" ,
1074- latestVersion : fixture . latestVersion ,
10751071 update : {
10761072 command :
10771073 fixture . kind === "cask"
@@ -1086,29 +1082,129 @@ it.layer(NodeServices.layer)("providerMaintenance", (it) => {
10861082 } ,
10871083 } ) ;
10881084
1089- const provider = yield * enrichProviderSnapshotWithVersionAdvisory (
1090- { ...installedPackageToolProvider , version : "0.148.0" } ,
1091- capabilities ,
1092- ) . pipe (
1093- Effect . provide ( ProviderLatestVersions . layer ) ,
1094- Effect . provideService (
1095- HttpClient . HttpClient ,
1096- HttpClient . make ( ( ) =>
1097- Effect . die ( "Homebrew version checks should not fall back to npm" ) ,
1085+ const enrich = ( enableProviderUpdateChecks : boolean ) =>
1086+ enrichProviderSnapshotWithVersionAdvisory (
1087+ { ...installedPackageToolProvider , version : "0.148.0" } ,
1088+ capabilities ,
1089+ { enableProviderUpdateChecks } ,
1090+ ) . pipe (
1091+ Effect . provide ( ProviderLatestVersions . layer ) ,
1092+ Effect . provideService (
1093+ HttpClient . HttpClient ,
1094+ HttpClient . make ( ( ) =>
1095+ Effect . die ( "Homebrew version checks should not fall back to npm" ) ,
1096+ ) ,
10981097 ) ,
1099- ) ,
1100- ) ;
1098+ ) ;
11011099
1102- expect ( provider . versionAdvisory ) . toMatchObject ( {
1100+ expect ( ( yield * enrich ( false ) ) . versionAdvisory ) . toMatchObject ( {
1101+ status : "unknown" ,
1102+ latestVersion : null ,
1103+ } ) ;
1104+ expect ( spawned ) . toEqual ( [ [ brewPath , "--prefix" ] ] ) ;
1105+
1106+ expect ( ( yield * enrich ( true ) ) . versionAdvisory ) . toMatchObject ( {
11031107 status : fixture . latestVersion === null ? "unknown" : "current" ,
11041108 latestVersion : fixture . latestVersion ,
11051109 canUpdate : true ,
11061110 message : null ,
11071111 } ) ;
1112+ expect ( spawned ) . toEqual ( [
1113+ [ brewPath , "--prefix" ] ,
1114+ [ brewPath , "info" , "--json=v2" , fixture . name ] ,
1115+ ] ) ;
11081116 } ) ,
11091117 { skip : ! symlinksSupported } ,
11101118 ) ;
11111119
1120+ it . effect ( "shares installer lookups only for the same executable and update target" , ( ) =>
1121+ Effect . gen ( function * ( ) {
1122+ let lookups = 0 ;
1123+ const capabilities = ( executable : string , args : ReadonlyArray < string > , version : string ) =>
1124+ makeProviderMaintenanceCapabilities ( {
1125+ provider : driver ( "packageTool" ) ,
1126+ packageName : "@example/package-tool" ,
1127+ updateExecutable : executable ,
1128+ updateArgs : args ,
1129+ updateLockKey : "homebrew" ,
1130+ latestVersion : null ,
1131+ lookupLatestVersion : Effect . sync ( ( ) => {
1132+ lookups += 1 ;
1133+ return version ;
1134+ } ) ,
1135+ } ) ;
1136+
1137+ const formula = capabilities ( "/opt/homebrew/bin/brew" , [ "upgrade" , "package-tool" ] , "2.0.0" ) ;
1138+ const cask = capabilities (
1139+ "/opt/homebrew/bin/brew" ,
1140+ [ "upgrade" , "--cask" , "package-tool" ] ,
1141+ "3.0.0" ,
1142+ ) ;
1143+ const otherBrew = capabilities ( "/usr/local/bin/brew" , [ "upgrade" , "package-tool" ] , "4.0.0" ) ;
1144+
1145+ expect ( yield * resolveLatestProviderVersion ( formula ) ) . toBe ( "2.0.0" ) ;
1146+ expect ( yield * resolveLatestProviderVersion ( cask ) ) . toBe ( "3.0.0" ) ;
1147+ expect ( yield * resolveLatestProviderVersion ( otherBrew ) ) . toBe ( "4.0.0" ) ;
1148+ const refreshed = capabilities (
1149+ "/opt/homebrew/bin/brew" ,
1150+ [ "upgrade" , "package-tool" ] ,
1151+ "5.0.0" ,
1152+ ) ;
1153+ expect ( yield * resolveLatestProviderVersion ( refreshed ) ) . toBe ( "2.0.0" ) ;
1154+ expect ( lookups ) . toBe ( 3 ) ;
1155+
1156+ yield * invalidateLatestProviderVersion ( refreshed ) ;
1157+ expect ( yield * resolveLatestProviderVersion ( refreshed ) ) . toBe ( "5.0.0" ) ;
1158+ expect ( yield * resolveLatestProviderVersion ( cask ) ) . toBe ( "3.0.0" ) ;
1159+ expect ( yield * resolveLatestProviderVersion ( otherBrew ) ) . toBe ( "4.0.0" ) ;
1160+ expect ( lookups ) . toBe ( 4 ) ;
1161+ } ) . pipe (
1162+ Effect . provide ( ProviderLatestVersions . layer ) ,
1163+ Effect . provideService (
1164+ HttpClient . HttpClient ,
1165+ HttpClient . make ( ( ) => Effect . die ( "Homebrew's latest should not come from npm" ) ) ,
1166+ ) ,
1167+ ) ,
1168+ ) ;
1169+
1170+ it . effect (
1171+ "refreshes installer versions without letting an older lookup overwrite the result" ,
1172+ ( ) =>
1173+ Effect . gen ( function * ( ) {
1174+ const started = yield * Deferred . make < void > ( ) ;
1175+ const release = yield * Deferred . make < string > ( ) ;
1176+ let lookups = 0 ;
1177+ const capabilities = makeProviderMaintenanceCapabilities ( {
1178+ provider : driver ( "packageTool" ) ,
1179+ packageName : "@example/package-tool" ,
1180+ updateExecutable : "/opt/homebrew/bin/brew" ,
1181+ updateArgs : [ "upgrade" , "package-tool" ] ,
1182+ updateLockKey : "homebrew" ,
1183+ latestVersion : null ,
1184+ lookupLatestVersion : Effect . suspend ( ( ) =>
1185+ ++ lookups === 1
1186+ ? Deferred . succeed ( started , undefined ) . pipe ( Effect . andThen ( Deferred . await ( release ) ) )
1187+ : Effect . succeed ( "2.0.0" ) ,
1188+ ) ,
1189+ } ) ;
1190+ const pending = yield * resolveLatestProviderVersion ( capabilities ) . pipe ( Effect . forkChild ) ;
1191+ yield * Deferred . await ( started ) ;
1192+ yield * invalidateLatestProviderVersion ( capabilities ) ;
1193+ expect ( yield * resolveLatestProviderVersion ( capabilities ) ) . toBe ( "2.0.0" ) ;
1194+
1195+ yield * Deferred . succeed ( release , "1.0.0" ) ;
1196+ expect ( yield * Fiber . join ( pending ) ) . toBe ( "1.0.0" ) ;
1197+ expect ( yield * resolveLatestProviderVersion ( capabilities ) ) . toBe ( "2.0.0" ) ;
1198+ expect ( lookups ) . toBe ( 2 ) ;
1199+ } ) . pipe (
1200+ Effect . provide ( ProviderLatestVersions . layer ) ,
1201+ Effect . provideService (
1202+ HttpClient . HttpClient ,
1203+ HttpClient . make ( ( ) => Effect . die ( "Homebrew's latest should not come from npm" ) ) ,
1204+ ) ,
1205+ ) ,
1206+ ) ;
1207+
11121208 it . effect . skipIf ( windowsHost ) (
11131209 "stays manual-only when the keg is not under the resolved brew's prefix" ,
11141210 ( ) =>
0 commit comments