@@ -19,6 +19,7 @@ import * as TestClock from "effect/testing/TestClock";
1919import * as Tracer from "effect/Tracer" ;
2020import type {
2121 BackgroundScope ,
22+ VcsBranchStatus ,
2223 VcsStatusLocalResult ,
2324 VcsStatusRemoteResult ,
2425 VcsStatusResult ,
@@ -125,6 +126,7 @@ function layerTestFor(state: {
125126 Effect . as ( state . currentLocalStatus ) ,
126127 ) ;
127128 } ) ,
129+ repositoryRoot : ( ) => Effect . sync ( ( ) => ( state . currentLocalStatus . isRepo ? "/repo" : null ) ) ,
128130 currentBranch : ( ) =>
129131 state . branchRead
130132 ? state . branchRead ( )
@@ -257,14 +259,17 @@ describe("VcsStatusBroadcaster", () => {
257259 return Effect . gen ( function * ( ) {
258260 const broadcaster = yield * VcsStatusBroadcaster . VcsStatusBroadcaster ;
259261 const branches = yield * Stream . toPull ( broadcaster . streamBranchStatus ( { cwd : "/repo" } ) ) ;
260- assert . deepEqual ( yield * branches , [ { refName : baseLocalStatus . refName } ] ) ;
262+ assert . deepEqual ( yield * branches , [ { refName : baseLocalStatus . refName , isRepo : true } ] ) ;
261263 assert . equal ( state . localStatusCalls , 0 ) ;
262264 state . currentLocalStatus = { ...baseLocalStatus , refName : "external" } ;
263265 yield * broadcaster . refreshBranchStatus ( { cwd : "/repo" } ) ;
264- assert . deepEqual ( yield * branches , [ { refName : "external" } ] ) ;
266+ assert . deepEqual ( yield * branches , [ { refName : "external" , isRepo : true } ] ) ;
265267 state . currentLocalStatus = { ...baseLocalStatus , refName : null } ;
266268 yield * broadcaster . refreshBranchStatus ( { cwd : "/repo" } ) ;
267- assert . deepEqual ( yield * branches , [ { refName : null } ] ) ;
269+ assert . deepEqual ( yield * branches , [ { refName : null , isRepo : true } ] ) ;
270+ state . currentLocalStatus = { ...baseLocalStatus , isRepo : false , refName : null } ;
271+ yield * broadcaster . refreshBranchStatus ( { cwd : "/repo" } ) ;
272+ assert . deepEqual ( yield * branches , [ { refName : null , isRepo : false } ] ) ;
268273 assert . equal ( state . localStatusCalls , 0 ) ;
269274 const detailScope = yield * Scope . make ( ) ;
270275 const details = yield * Stream . toPull (
@@ -289,7 +294,7 @@ describe("VcsStatusBroadcaster", () => {
289294 assert . deepEqual ( yield * details , [
290295 { _tag : "localUpdated" , local : state . currentLocalStatus } ,
291296 ] ) ;
292- assert . deepEqual ( yield * branches , [ { refName : "changed" } ] ) ;
297+ assert . deepEqual ( yield * branches , [ { refName : "changed" , isRepo : true } ] ) ;
293298 const secondScope = yield * Scope . make ( ) ;
294299 const secondDetails = yield * Stream . toPull (
295300 broadcaster . streamStatus ( { cwd : "/alias" , includeRemote : false } ) ,
@@ -327,7 +332,7 @@ describe("VcsStatusBroadcaster", () => {
327332 assert . deepEqual ( yield * reopened , [
328333 { _tag : "localUpdated" , local : state . currentLocalStatus } ,
329334 ] ) ;
330- assert . deepEqual ( yield * branches , [ { refName : null } ] ) ;
335+ assert . deepEqual ( yield * branches , [ { refName : null , isRepo : false } ] ) ;
331336 assert . equal ( state . remoteStatusCalls , 0 ) ;
332337 } ) . pipe ( Effect . provide ( layerTestFor ( state ) ) , Effect . scoped ) ;
333338 } ,
@@ -1345,14 +1350,14 @@ describe("VcsStatusBroadcaster", () => {
13451350 yield * Effect . gen ( function * ( ) {
13461351 const broadcaster = yield * VcsStatusBroadcaster . VcsStatusBroadcaster ;
13471352 const branches = yield * Stream . toPull ( broadcaster . streamBranchStatus ( { cwd : "/repo" } ) ) ;
1348- assert . deepEqual ( yield * branches , [ { refName : "main" } ] ) ;
1353+ assert . deepEqual ( yield * branches , [ { refName : "main" , isRepo : true } ] ) ;
13491354
13501355 state . currentLocalStatus = { ...baseLocalStatus , refName : "repro" } ;
13511356 const lockPath = path . join ( gitDir , "HEAD.lock" ) ;
13521357 yield * fs . writeFileString ( lockPath , "ref: refs/heads/repro\n" ) ;
13531358 yield * fs . rename ( lockPath , headPath ) ;
13541359
1355- assert . deepEqual ( yield * branches , [ { refName : "repro" } ] ) ;
1360+ assert . deepEqual ( yield * branches , [ { refName : "repro" , isRepo : true } ] ) ;
13561361 assert . equal ( state . localStatusCalls , 0 ) ;
13571362 } ) . pipe ( Effect . provide ( layerTestFor ( state ) ) , Effect . scoped ) ;
13581363 } ) . pipe ( Effect . provide ( NodeServices . layer ) , Effect . scoped ) ,
@@ -1712,7 +1717,10 @@ it.effect("publishes overlapping branch reads in checkout order", () => {
17121717 yield * Deferred . succeed ( resume , undefined ) ;
17131718 yield * Fiber . join ( older ) ;
17141719 yield * Fiber . join ( newer ) ;
1715- assert . deepEqual ( yield * branches , [ { refName : "old" } , { refName : "new" } ] ) ;
1720+ assert . deepEqual ( yield * branches , [
1721+ { refName : "old" , isRepo : true } ,
1722+ { refName : "new" , isRepo : true } ,
1723+ ] ) ;
17161724 } ) . pipe ( Effect . provide ( layerTestFor ( state ) ) , Effect . scoped ) ;
17171725} ) ;
17181726
@@ -1722,7 +1730,7 @@ it.effect("does not replay older queued branches after a new subscriber snapshot
17221730 const b = yield * VcsStatusBroadcaster . VcsStatusBroadcaster ;
17231731 const entered = yield * Deferred . make < void > ( ) ;
17241732 const resume = yield * Deferred . make < void > ( ) ;
1725- const values = yield * Queue . unbounded < { readonly refName : string | null } > ( ) ;
1733+ const values = yield * Queue . unbounded < VcsBranchStatus > ( ) ;
17261734 let reads = 0 ;
17271735 state . branchRead = ( ) =>
17281736 ++ reads === 1
@@ -1741,10 +1749,10 @@ it.effect("does not replay older queued branches after a new subscriber snapshot
17411749 ) ;
17421750 yield * Deferred . succeed ( resume , undefined ) ;
17431751 yield * Fiber . join ( older ) ;
1744- assert . deepEqual ( yield * Queue . take ( values ) , { refName : "new" } ) ;
1752+ assert . deepEqual ( yield * Queue . take ( values ) , { refName : "new" , isRepo : true } ) ;
17451753 state . branchRead = ( ) => Effect . succeed ( "latest" ) ;
17461754 yield * b . refreshBranchStatus ( { cwd : "/repo" } ) ;
1747- assert . deepEqual ( yield * Queue . take ( values ) , { refName : "latest" } ) ;
1755+ assert . deepEqual ( yield * Queue . take ( values ) , { refName : "latest" , isRepo : true } ) ;
17481756 yield * Fiber . join ( subscriber ) ;
17491757 } ) . pipe ( Effect . provide ( layerTestFor ( state ) ) , Effect . scoped ) ;
17501758} ) ;
0 commit comments