History

Refresh local git status on turn completion (#1821)

Julius Marminge committed 7 months ago

Commit 2aa73981 parent 5b3b31b6 files · +131 −4Browse files

Showing the changes to apps/server/src/git (3 of 6 files). Show all

Unified · Split

3 files
  1. apps/server/src/git/Layers/GitStatusBroadcaster.test.ts +36 −0
  2. apps/server/src/git/Layers/GitStatusBroadcaster.ts +8 −4
  3. apps/server/src/git/Services/GitStatusBroadcaster.ts +4 −0
apps/server/src/git/Layers/GitStatusBroadcaster.test.ts+36−0
@@ -143,6 +143,42 @@ describe("GitStatusBroadcasterLive", () => { · 142 unmodified lines
143143 }).pipe(Effect.provide(makeTestLayer(state)));
144144 });
145145
146+ it.effect("refreshes only the cached local snapshot when requested", () => {
147+ const state = {
148+ currentLocalStatus: baseLocalStatus,
149+ currentRemoteStatus: baseRemoteStatus,
150+ localStatusCalls: 0,
151+ remoteStatusCalls: 0,
152+ localInvalidationCalls: 0,
153+ remoteInvalidationCalls: 0,
154+ };
155+
156+ return Effect.gen(function* () {
157+ const broadcaster = yield* GitStatusBroadcaster;
158+ const initial = yield* broadcaster.getStatus({ cwd: "/repo" });
159+
160+ state.currentLocalStatus = {
161+ ...baseLocalStatus,
162+ branch: "feature/local-only-refresh",
163+ hasWorkingTreeChanges: true,
164+ };
165+
166+ const refreshedLocal = yield* broadcaster.refreshLocalStatus("/repo");
167+ const cached = yield* broadcaster.getStatus({ cwd: "/repo" });
168+
169+ assert.deepStrictEqual(initial, baseStatus);
170+ assert.deepStrictEqual(refreshedLocal, state.currentLocalStatus);
171+ assert.deepStrictEqual(cached, {
172+ ...state.currentLocalStatus,
173+ ...baseRemoteStatus,
174+ });
175+ assert.equal(state.localStatusCalls, 2);
176+ assert.equal(state.remoteStatusCalls, 1);
177+ assert.equal(state.localInvalidationCalls, 1);
178+ assert.equal(state.remoteInvalidationCalls, 0);
179+ }).pipe(Effect.provide(makeTestLayer(state)));
180+ });
181+
146182 it.effect("streams a local snapshot first and remote updates later", () => {
147183 const state = {
148184 currentLocalStatus: baseLocalStatus,
apps/server/src/git/Layers/GitStatusBroadcaster.ts+8−4
@@ -179,10 +179,13 @@ export const GitStatusBroadcasterLive = Layer.effect( · 178 unmodified lines
179179 return mergeGitStatusParts(local, remote);
180180 });
181181
182− const refreshLocalStatus = Effect.fn("refreshLocalStatus")(function* (cwd: string) {
183− yield* gitManager.invalidateLocalStatus(cwd);
184− const local = yield* gitManager.localStatus({ cwd });
185− return yield* updateCachedLocalStatus(cwd, local, { publish: true });
182+ const refreshLocalStatus: GitStatusBroadcasterShape["refreshLocalStatus"] = Effect.fn(
183+ "refreshLocalStatus",
184+ )(function* (cwd) {
185+ const normalizedCwd = normalizeCwd(cwd);
186+ yield* gitManager.invalidateLocalStatus(normalizedCwd);
187+ const local = yield* gitManager.localStatus({ cwd: normalizedCwd });
188+ return yield* updateCachedLocalStatus(normalizedCwd, local, { publish: true });
186189 });
187190
188191 const refreshRemoteStatus = Effect.fn("refreshRemoteStatus")(function* (cwd: string) {
@@ -300,6 +303,7 @@ export const GitStatusBroadcasterLive = Layer.effect( · 111 unmodified lines
300303
301304 return {
302305 getStatus,
306+ refreshLocalStatus,
303307 refreshStatus,
304308 streamStatus,
305309 } satisfies GitStatusBroadcasterShape;
apps/server/src/git/Services/GitStatusBroadcaster.ts+4−0
@@ -3,6 +3,7 @@ import type { Effect, Stream } from "effect"; · 2 unmodified lines
33 import type {
44 GitManagerServiceError,
55 GitStatusInput,
6+ GitStatusLocalResult,
67 GitStatusResult,
78 GitStatusStreamEvent,
89 } from "@t3tools/contracts";
@@ -11,6 +12,9 @@ export interface GitStatusBroadcasterShape { · 2 unmodified lines
1112 readonly getStatus: (
1213 input: GitStatusInput,
1314 ) => Effect.Effect<GitStatusResult, GitManagerServiceError>;
15+ readonly refreshLocalStatus: (
16+ cwd: string,
17+ ) => Effect.Effect<GitStatusLocalResult, GitManagerServiceError>;
1418 readonly refreshStatus: (cwd: string) => Effect.Effect<GitStatusResult, GitManagerServiceError>;
1519 readonly streamStatus: (
1620 input: GitStatusInput,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t