Make id optional in type Stack

mtsgrd · mtsgrd · commit 2b8d543f7540 · 2025-08-13T01:24:29.000+02:00
diff --git a/apps/desktop/cypress/e2e/review.cy.ts b/apps/desktop/cypress/e2e/review.cy.ts
@@ -183,13 +183,13 @@ describe('Review', () => {
 				cy.getByTestId('create-review-box-title-input')
 					.should('be.visible')
 					.should('be.enabled')
-					.should('have.value', mockBackend.getCommitTitle(stack.id))
+					.should('have.value', mockBackend.getCommitTitle(stack.id!))
 					.clear()
 					.type(prTitle);
 
 				cy.getByTestId('create-review-box-description-input')
 					.should('be.visible')
-					.should('contain', mockBackend.getCommitMessage(stack.id))
+					.should('contain', mockBackend.getCommitMessage(stack.id!))
 					.click()
 					.clear()
 					.type(prDescription);
@@ -251,13 +251,13 @@ describe('Review', () => {
 					cy.getByTestId('create-review-box-title-input')
 						.should('be.visible')
 						.should('be.enabled')
-						.should('have.value', mockBackend.getCommitTitle(stack.id))
+						.should('have.value', mockBackend.getCommitTitle(stack.id!))
 						.clear()
 						.type(prTitle);
 
 					cy.getByTestId('create-review-box-description-input')
 						.should('be.visible')
-						.should('contain', mockBackend.getCommitMessage(stack.id))
+						.should('contain', mockBackend.getCommitMessage(stack.id!))
 						.click()
 						.clear()
 						.type(prDescription);
@@ -333,7 +333,7 @@ describe('Review', () => {
 						cy.getByTestId('create-review-box-title-input')
 							.should('be.visible')
 							.should('be.enabled')
-							.should('have.value', mockBackend.getCommitTitle(stack.id));
+							.should('have.value', mockBackend.getCommitTitle(stack.id!));
 
 						cy.getByTestId('create-review-box-template-toggle').click();
 						enabledTemplates = true;
@@ -343,7 +343,7 @@ describe('Review', () => {
 					cy.getByTestId('create-review-box-title-input')
 						.should('be.visible')
 						.should('be.enabled')
-						.should('have.value', mockBackend.getCommitTitle(stack.id))
+						.should('have.value', mockBackend.getCommitTitle(stack.id!))
 						.clear()
 						.type(prTitle);
 
diff --git a/apps/desktop/cypress/e2e/selection.cy.ts b/apps/desktop/cypress/e2e/selection.cy.ts
@@ -37,7 +37,7 @@ describe('Selection', () => {
 
 		for (const stack of stacks) {
 			const stackName = stack.heads[0]?.name;
-			const stackId = stack.id;
+			const stackId = stack.id!;
 			if (!stackName) continue;
 
 			cy.getByTestIdByValue('branch-header', stackName)
@@ -51,7 +51,7 @@ describe('Selection', () => {
 				.scrollIntoView()
 				.should('be.visible')
 				.within(() => {
-					const changedFileNames = mockBackend.getBranchChangesFileNames(stack.id, stackName);
+					const changedFileNames = mockBackend.getBranchChangesFileNames(stackId, stackName);
 					for (const fileName of changedFileNames) {
 						cy.getByTestId('file-list-item', fileName).should('be.visible');
 					}
@@ -71,7 +71,7 @@ describe('Selection', () => {
 		// Select the initial commit which should be local only
 		cy.getByTestId('commit-row', 'Initial commit').first().click();
 
-		cy.getByTestIdByValue('stack', stack.id)
+		cy.getByTestIdByValue('stack', stack.id!)
 			.should('be.visible')
 			.within(() => {
 				cy.getByTestId('commit-drawer-title').should('contain', 'Initial commit');
diff --git a/apps/desktop/cypress/e2e/unifiedDiffView.cy.ts b/apps/desktop/cypress/e2e/unifiedDiffView.cy.ts
@@ -54,11 +54,11 @@ describe('Unified Diff View', () => {
 			.should('contain', stackName)
 			.click()
 			.then(() => {
-				cy.getByTestIdByValue('stack', stack.id)
+				cy.getByTestIdByValue('stack', stack.id!)
 					.should('be.visible')
 					.within(() => {
 						// Check if the file list is updated
-						const changedFileNames = mockBackend.getBranchChangesFileNames(stack.id, stackName);
+						const changedFileNames = mockBackend.getBranchChangesFileNames(stack.id!, stackName);
 						for (const fileName of changedFileNames) {
 							cy.getByTestId('file-list-item', fileName).should('be.visible').click();
 						}
diff --git a/apps/desktop/src/components/IntegrateUpstreamModal.svelte b/apps/desktop/src/components/IntegrateUpstreamModal.svelte
@@ -2,7 +2,6 @@
 	import { writeClipboard } from '$lib/backend/clipboard';
 	import { BASE_BRANCH_SERVICE } from '$lib/baseBranch/baseBranchService.svelte';
 	import { DEFAULT_FORGE_FACTORY } from '$lib/forge/forgeFactory.svelte';
-	import { type Stack } from '$lib/stacks/stack';
 	import {
 		getBaseBranchResolution,
 		type BaseBranchResolutionApproach,
@@ -86,12 +85,14 @@
 			);
 			const forceIntegratedBranches = mergedAssociatedReviews.map((r) => r.sourceBranch);
 
-			results.set(status.stack.id, {
-				branchId: status.stack.id,
-				approach: getResolutionApproachV3(status),
-				deleteIntegratedBranches: true,
-				forceIntegratedBranches
-			});
+			if (status.stack.id) {
+				results.set(status.stack.id, {
+					branchId: status.stack.id,
+					approach: getResolutionApproachV3(status),
+					deleteIntegratedBranches: true,
+					forceIntegratedBranches
+				});
+			}
 		}
 
 		statuses = statusesTmp;
@@ -266,22 +267,22 @@
 	}
 </script>
 
-{#snippet stackStatus(stack: Stack, stackStatus: StackStatus)}
-	{@const branchShouldBeDeletedMap = getBranchShouldBeDeletedMap(stack.id, stackStatus)}
+{#snippet stackStatus(stackId: string, stackStatus: StackStatus)}
+	{@const branchShouldBeDeletedMap = getBranchShouldBeDeletedMap(stackId, stackStatus)}
 	<IntegrationSeriesRow
 		testId={TestId.IntegrateUpstreamSeriesRow}
 		series={integrationRowSeries(stackStatus)}
 		{branchShouldBeDeletedMap}
 		updateBranchShouldBeDeletedMap={(_, shouldBeDeleted) =>
-			updateBranchShouldBeDeletedMap(stack.id, shouldBeDeleted)}
+			updateBranchShouldBeDeletedMap(stackId, shouldBeDeleted)}
 	>
-		{#if !stackFullyIntegrated(stackStatus) && results.get(stack.id)}
+		{#if !stackFullyIntegrated(stackStatus) && results.get(stackId)}
 			<Select
-				value={results.get(stack.id)!.approach.type}
+				value={results.get(stackId)!.approach.type}
 				maxWidth={130}
 				onselect={(value) => {
-					const result = results.get(stack.id)!;
-					results.set(stack.id, { ...result, approach: { type: value as OperationType } });
+					const result = results.get(stackId)!;
+					results.set(stackId, { ...result, approach: { type: value as OperationType } });
 				}}
 				options={integrationOptions(stackStatus)}
 			>
@@ -397,7 +398,9 @@
 				<div class="scroll-wrap">
 					<ScrollableContainer maxHeight="15rem">
 						{#each statuses as { stack, status }}
-							{@render stackStatus(stack, status)}
+							{#if stack.id}
+								{@render stackStatus(stack.id, status)}
+							{/if}
 						{/each}
 					</ScrollableContainer>
 				</div>
diff --git a/apps/desktop/src/components/LineLocksWarning.svelte b/apps/desktop/src/components/LineLocksWarning.svelte
@@ -21,7 +21,9 @@
 
 <ReduxResult result={stacksResult.current} {projectId}>
 	{#snippet children(stacks)}
-		{@const lockedToStacks = stacks.filter((stack) => lockedToStackIds.includes(stack.id))}
+		{@const lockedToStacks = stacks.filter(
+			(stack) => stack.id && lockedToStackIds.includes(stack.id)
+		)}
 		{@const stackNames = lockedToStacks.map(getStackName)}
 		<div data-testid={TestId.UnifiedDiffViewLockWarning}>
 			{#if stackNames.length > 1}
diff --git a/apps/desktop/src/components/MultiStackCreateNew.svelte b/apps/desktop/src/components/MultiStackCreateNew.svelte
@@ -19,6 +19,7 @@
 		Textbox
 	} from '@gitbutler/ui';
 	import { slugify } from '@gitbutler/ui/utils/string';
+	import { isDefined } from '@gitbutler/ui/utils/typeguards';
 
 	type Props = {
 		el?: HTMLButtonElement;
@@ -46,13 +47,16 @@
 
 	// Create options for the selector (stack represented by first branch name)
 	const stackOptions = $derived(
-		allStacks.map((stack) => {
-			const firstBranchName = stack.heads[0]?.name ?? `Stack ${stack.id.slice(0, 8)}`;
-			return {
-				label: firstBranchName,
-				value: stack.id
-			};
-		})
+		allStacks
+			.map((stack) => {
+				if (!stack.id) return;
+				const firstBranchName = stack.heads[0]?.name ?? `Stack ${stack?.id.slice(0, 8)}`;
+				return {
+					label: firstBranchName,
+					value: stack.id
+				};
+			})
+			.filter(isDefined)
 	);
 
 	// Set default selected stack and handle if current selected stack is no longer available
diff --git a/apps/desktop/src/components/MultiStackView.svelte b/apps/desktop/src/components/MultiStackView.svelte
@@ -20,6 +20,7 @@
 	import { UI_STATE } from '$lib/state/uiState.svelte';
 	import { throttle } from '$lib/utils/misc';
 	import { inject } from '@gitbutler/shared/context';
+	import { isDefined } from '@gitbutler/ui/utils/typeguards';
 	import { flip } from 'svelte/animate';
 	import type { Stack } from '$lib/stacks/stack';
 
@@ -128,7 +129,9 @@
 	ondrop={() => {
 		stackService.updateStackOrder({
 			projectId,
-			stacks: mutableStacks.map((b, i) => ({ id: b.id, order: i }))
+			stacks: mutableStacks
+				.map((b, i) => (b.id ? { id: b.id, order: i } : undefined))
+				.filter(isDefined)
 		});
 	}}
 >
@@ -143,21 +146,25 @@
 	`StackView` instead of being set imperatively in the dragstart handler.
 	 -->
 		{#each mutableStacks as stack, i (stack.id)}
-			{@const laneState = uiState.lane(stack.id)}
+			<!-- TODO: What fallback id should we use? -->
+			{@const laneId = stack.id || 'fallback-id'}
+			{@const laneState = uiState.lane(laneId)}
 			{@const selection = laneState.selection}
 			<div
 				class="reorderable-stack"
 				role="presentation"
 				animate:flip={{ duration: 150 }}
 				onmousedown={onReorderMouseDown}
 				ondragstart={(e) => {
+					if (!stack.id) return;
 					onReorderStart(e, stack.id, () => {
 						draggingStack = true;
 						selection.set(undefined);
-						intelligentScrollingService.show(projectId, stack.id, 'stack');
+						intelligentScrollingService.show(projectId, laneId, 'stack');
 					});
 				}}
 				ondragover={(e) => {
+					if (!stack.id) return;
 					throttledDragOver(e, mutableStacks, stack.id);
 				}}
 				ondragend={() => {
diff --git a/apps/desktop/src/components/RulesList.svelte b/apps/desktop/src/components/RulesList.svelte
@@ -20,6 +20,7 @@
 	import { typedKeys } from '$lib/utils/object';
 	import { inject } from '@gitbutler/shared/context';
 	import { Button, chipToasts, Select, SelectItem, Icon } from '@gitbutler/ui';
+	import { isDefined } from '@gitbutler/ui/utils/typeguards';
 	import type { Snippet } from 'svelte';
 
 	type Props = {
@@ -271,10 +272,16 @@
 			<ReduxResult {projectId} result={stackEntries.current}>
 				{#snippet children(stacks)}
 					{@const stackOptions = [
-						...stacks.map((stack) => ({
-							label: getStackName(stack),
-							value: encodeStackTarget({ type: 'stackId', subject: stack.id })
-						})),
+						...stacks
+							.map((stack) =>
+								stack.id
+									? {
+											label: getStackName(stack),
+											value: encodeStackTarget({ type: 'stackId', subject: stack.id })
+										}
+									: undefined
+							)
+							.filter(isDefined),
 						{ separator: true } as const,
 						{
 							label: 'Leftmost stack',
diff --git a/apps/desktop/src/components/WorkspaceView.svelte b/apps/desktop/src/components/WorkspaceView.svelte
@@ -20,6 +20,7 @@
 	import { STACK_SERVICE } from '$lib/stacks/stackService.svelte';
 	import { UI_STATE, type ExclusiveAction } from '$lib/state/uiState.svelte';
 	import { inject } from '@gitbutler/shared/context';
+	import { isDefined } from '@gitbutler/ui/utils/typeguards';
 	import { setContext } from 'svelte';
 	import { writable } from 'svelte/store';
 
@@ -52,13 +53,17 @@
 
 	const stackFocusables = $derived(
 		stacksResult.current?.data
-			? stacksResult.current.data.map((stack) => stackFocusableId(stack.id))
+			? stacksResult.current.data
+					.map((stack) => (stack.id ? stackFocusableId(stack.id) : undefined))
+					.filter(isDefined)
 			: []
 	);
 
 	const uncommittedFocusables = $derived(
 		stacksResult.current?.data
-			? stacksResult.current.data.map((stack) => uncommittedFocusableId(stack.id))
+			? stacksResult.current.data
+					.map((stack) => (stack.id ? uncommittedFocusableId(stack.id) : undefined))
+					.filter(isDefined)
 			: []
 	);
 
diff --git a/apps/desktop/src/components/codegen/CodegenPage.svelte b/apps/desktop/src/components/codegen/CodegenPage.svelte
@@ -49,7 +49,7 @@
 
 		const firstStack = stacks.current.data[0];
 		const firstHead = firstStack?.heads[0];
-		if (firstHead) {
+		if (firstHead && firstStack.id) {
 			selectedBranch = {
 				stackId: firstStack.id,
 				head: firstHead.name
@@ -122,9 +122,11 @@
 	<ReduxResult result={stacks.current} {projectId}>
 		{#snippet children(stacks, { projectId })}
 			{#each stacks as stack}
-				{#each stack.heads as head}
-					{@render sidebarContentEntry(projectId, stack.id, head.name)}
-				{/each}
+				{#if stack.id}
+					{#each stack.heads as head}
+						{@render sidebarContentEntry(projectId, stack.id, head.name)}
+					{/each}
+				{/if}
 			{/each}
 		{/snippet}
 	</ReduxResult>
diff --git a/apps/desktop/src/lib/soup/commitAnalytics.ts b/apps/desktop/src/lib/soup/commitAnalytics.ts
@@ -136,7 +136,7 @@ export class CommitAnalytics {
 			.filter((assignment) => assignment.stackId !== null)
 			.forEach((assignment) => assignedStacks.add(assignment.stackId!));
 
-		return stacks.filter((stack) => assignedStacks.has(stack.id));
+		return stacks.filter((stack) => stack.id && assignedStacks.has(stack.id));
 	}
 
 	private getAssignedFiles(assignments: HunkAssignment[]): string[] {
diff --git a/apps/desktop/src/lib/stacks/dropHandler.ts b/apps/desktop/src/lib/stacks/dropHandler.ts
@@ -70,6 +70,9 @@ export class OutsideLaneDzHandler implements DropzoneHandler {
 			case 'commit': {
 				const { stack, outcome, branchName } = await this.macros.createNewStackAndCommit();
 
+				if (!stack.id) {
+					throw new Error('New stack has no stack id');
+				}
 				if (!outcome.newCommit) {
 					throw new Error('Failed to create a new commit');
 				}
@@ -97,13 +100,17 @@ export class OutsideLaneDzHandler implements DropzoneHandler {
 					projectId: this.projectId,
 					branch: { name: undefined }
 				});
+				const stackId = stack.id;
+				if (!stackId) {
+					throw new Error('New stack has no stack id');
+				}
 
 				const changes = await data.treeChanges();
 				const assignments = changes
 					.flatMap((c) =>
-						this.uncommittedService.getAssignmentsByPath(data.stackId || null, c.path)
+						this.uncommittedService.getAssignmentsByPath(data.stackId ?? null, c.path)
 					)
-					.map((h) => ({ ...h, stackId: stack.id }));
+					.map((h) => ({ ...h, stackId }));
 				await this.diffService.assignHunk({
 					projectId: this.projectId,
 					assignments
diff --git a/apps/desktop/src/lib/stacks/macros.ts b/apps/desktop/src/lib/stacks/macros.ts
@@ -35,7 +35,7 @@ export default class StackMacros {
 			params.branchName,
 			params.commitMessage
 		);
-
+		if (!stack.id) return;
 		if (outcome.newCommit) {
 			this.uiState.lane(stack.id).selection.set({
 				branchName,
@@ -58,6 +58,9 @@ export default class StackMacros {
 			projectId: this.projectId,
 			branch: { name }
 		});
+		if (!stack.id) {
+			throw new Error('New stack has no stack id');
+		}
 		const branchName = getStackName(stack);
 		const outcome = await this.stackService.createCommitMutation({
 			projectId: this.projectId,
diff --git a/apps/desktop/src/lib/stacks/stack.ts b/apps/desktop/src/lib/stacks/stack.ts
@@ -20,7 +20,7 @@ export type Stack = {
 	/**
 	 * The id of the stack.
 	 */
-	id: string;
+	id?: string;
 	/**
 	 * Information about the branches contained in the stack.
 	 */
diff --git a/apps/desktop/src/lib/stacks/stackService.svelte.ts b/apps/desktop/src/lib/stacks/stackService.svelte.ts
