Fixes hierarchical compaction

 - Previously given `test` & `test/foo`, `test` would disappear

Author: eamodio

src/system/array.ts

@@ -95,12 +95,7 @@ export function makeHierarchical<T>(
 	compact: boolean = false,
 	canCompact?: (i: T) => boolean,
 ): HierarchicalItem<T> {
-	const seed = {
-		name: '',
-		relativePath: '',
-		children: new Map(),
-		descendants: [],
-	};
+	const seed = { name: '', relativePath: '', children: new Map(), descendants: [] };
 
 	let hierarchy = values.reduce((root: HierarchicalItem<T>, value) => {
 		let folder = root;
@@ -109,12 +104,9 @@ export function makeHierarchical<T>(
 		for (const folderName of splitPath(value)) {
 			relativePath = joinPath(relativePath, folderName);
 
-			if (folder.children === undefined) {
-				folder.children = new Map();
-			}
-
+			folder.children ??= new Map();
 			let f = folder.children.get(folderName);
-			if (f === undefined) {
+			if (f == null) {
 				f = {
 					name: folderName,
 					relativePath: relativePath,
@@ -125,9 +117,7 @@ export function makeHierarchical<T>(
 				folder.children.set(folderName, f);
 			}
 
-			if (folder.descendants === undefined) {
-				folder.descendants = [];
-			}
+			folder.descendants ??= [];
 			folder.descendants.push(value);
 			folder = f;
 		}
@@ -150,21 +140,28 @@ export function compactHierarchy<T>(
 	isRoot: boolean = true,
 	canCompact?: (i: T) => boolean,
 ): HierarchicalItem<T> {
-	if (root.children === undefined) return root;
+	if (root.children == null) return root;
 
 	const children = [...root.children.values()];
 	for (const child of children) {
 		compactHierarchy(child, joinPath, false, canCompact);
 	}
 
-	if (!isRoot && children.length === 1) {
+	if (!isRoot && root.value == null && children.length === 1) {
 		const child = children[0];
-		if (child.value === undefined || canCompact?.(child.value)) {
+		if (child.value == null || canCompact?.(child.value)) {
 			root.name = joinPath(root.name, child.name);
 			root.relativePath = child.relativePath;
 			root.children = child.children;
 			root.descendants = child.descendants;
 			root.value = child.value;
+
+			// Update the parent pointer for the new children if they exist
+			if (root.children != null) {
+				for (const grandChild of root.children.values()) {
+					grandChild.parent = root;
+				}
+			}
 		}
 	}
 

src/views/nodes/branchOrTagFolderNode.ts

@@ -1,6 +1,7 @@
 import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { GitUri } from '../../git/gitUri';
 import type { HierarchicalItem } from '../../system/array';
+import { first } from '../../system/iterable';
 import type { View } from '../viewBase';
 import { ContextValues, getViewNodeId, ViewNode } from './abstract/viewNode';
 import type { BranchNode } from './branchNode';
@@ -32,12 +33,29 @@ export class BranchOrTagFolderNode extends ViewNode<'branch-tag-folder'> {
 	}
 
 	getChildren(): ViewNode[] {
-		if (this.root.descendants === undefined || this.root.children === undefined) return [];
+		if (this.root.descendants == null || this.root.children == null) return [];
 
 		const children: (BranchOrTagFolderNode | BranchNode | TagNode | WorktreeNode)[] = [];
 
 		for (const folder of this.root.children.values()) {
-			if (folder.value === undefined) {
+			if (folder.value != null) {
+				// Make sure to set the parent
+				folder.value.parent = this.folderName ? this : this.parent;
+				children.push(folder.value);
+			}
+
+			if (!folder.children?.size) continue;
+			if (folder.children.size === 1) {
+				const child = first(folder.children.values());
+				if (child?.value != null) {
+					// Make sure to set the parent
+					child.value.parent = this.folderName ? this : this.parent;
+					if ('compacted' in child.value && typeof child.value.compacted === 'boolean') {
+						child.value.compacted = true;
+					}
+					children.push(child.value);
+				}
+			} else {
 				// If the folder contains the current branch or an active worktree, expand it by default
 				const expand = folder.descendants?.some(
 					n =>
@@ -56,12 +74,7 @@ export class BranchOrTagFolderNode extends ViewNode<'branch-tag-folder'> {
 						expand,
 					),
 				);
-				continue;
 			}
-
-			// Make sure to set the parent
-			folder.value.parent = this.folderName ? this : this.parent;
-			children.push(folder.value);
 		}
 
 		return children;

src/views/nodes/folderNode.ts

@@ -2,6 +2,7 @@ import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode';
 import type { ViewFilesLayout, ViewsFilesConfig } from '../../config';
 import { GitUri } from '../../git/gitUri';
 import type { HierarchicalItem } from '../../system/array';
+import { first } from '../../system/iterable';
 import { sortCompare } from '../../system/string';
 import type { StashesView } from '../stashesView';
 import type { ViewsWithCommits } from '../viewBase';
@@ -44,22 +45,38 @@ export class FolderNode extends ViewNode<'folder', ViewsWithCommits | StashesVie
 	}
 
 	getChildren(): (FolderNode | FileNode)[] {
-		if (this.root.descendants === undefined || this.root.children === undefined) return [];
+		if (this.root.descendants == null || this.root.children == null) return [];
 
 		let children: (FolderNode | FileNode)[];
 
 		const nesting = FolderNode.getFileNesting(
 			this.view.config.files,
 			this.root.descendants,
-			this.relativePath === undefined,
+			this.relativePath == null,
 		);
 		if (nesting === 'list') {
 			this.root.descendants.forEach(n => (n.relativePath = this.root.relativePath));
 			children = this.root.descendants;
 		} else {
 			children = [];
 			for (const folder of this.root.children.values()) {
-				if (folder.value === undefined) {
+				if (folder.value != null) {
+					// Make sure to set the parent
+					folder.value.parent = this.folderName ? this : this.parent;
+					folder.value.relativePath = this.root.relativePath;
+					children.push(folder.value);
+				}
+
+				if (!folder.children?.size) continue;
+				if (folder.children.size === 1) {
+					const child = first(folder.children.values());
+					if (child?.value != null) {
+						// Make sure to set the parent
+						child.value.parent = this.folderName ? this : this.parent;
+						child.value.relativePath = this.root.relativePath;
+						children.push(child.value);
+					}
+				} else {
 					children.push(
 						new FolderNode(
 							this.view,
@@ -71,13 +88,7 @@ export class FolderNode extends ViewNode<'folder', ViewsWithCommits | StashesVie
 							this.containsWorkingFiles,
 						),
 					);
-					continue;
 				}
-
-				// Make sure to set the parent
-				folder.value.parent = this.folderName ? this : this.parent;
-				folder.value.relativePath = this.root.relativePath;
-				children.push(folder.value);
 			}
 		}