Fix folder squash bug

web/src/Explorer/FolderState.test.ts

@@ -28,6 +28,34 @@ describe('FolderState', () => {
  }
  );
 
+ it(
+ 'should work with squashed folders',
+ {
+ nodes: [
+ ['foo', 'bar', 'a.ts'],
+ ['foo', 'bar', 'b.ts'],
+ ['bar', 'c.ts'],
+ ['d.ts']
+ ],
+ squash: true,
+ modify: folderState => {
+ folderState.tagAllFolders('expanded', 'true')
+ }
+ },
+ {
+ render: `\
+> bar {"expanded":"true"}
+ c.ts undefined
+> foo/bar {"expanded":"true"}
+ a.ts undefined
+ b.ts undefined
+d.ts undefined`,
+ events: [
+ ['tagged', 'expanded', 'true']
+ ]
+ }
+ )
+
  it(
  'Multiple operations',
  {
@@ -86,11 +114,12 @@ function it (
  name: string,
  input: {
  nodes: string[][],
- modify: (folderState: FolderState<object>) => void
+ modify: (folderState: FolderState<object>) => void,
+ squash?: boolean
  },
  expected: {
  render: string,
- events: Message[]
+ events: Message[],
  }
 ) {
  let id = 0
@@ -104,6 +133,7 @@ function it (
  for (const node of input.nodes) {
  fileTree.pushNode(newNode(node))
  }
+ if (input.squash) fileTree.squash()
  const evs: Message[] = []
  const folderState = FolderState.fromFileTree(fileTree)
  folderState.registerListener('test', (m) => evs.push(m))

web/src/FileTree.test.ts

@@ -121,8 +121,9 @@ function it (
  }
  if (input.squash) fileTree.squash()
 
- // ensure children parent consistency
+ // ensure tree integrity
  ensureChildrenParents(fileTree)
+ ensureFolderNamesMatchKeys(fileTree)
 
  // expect the serialization to be equal
  expect(fileTree.toString()).to.equal(expected.render)
@@ -155,3 +156,10 @@ function ensureChildrenParents (tree: FileTree): void {
  if (child.__parent !== tree) throw new Error(`${name} is a child of ${tree.name}, but ${name}'s parent is ${child.__parent?.name}`)
  }
 }
+
+function ensureFolderNamesMatchKeys (tree: FileTree): void {
+ for (const [name, child] of tree.subTrees.entries()) {
+ if (child.name !== name) throw new Error(`sub-tree ${tree.name} has a child named ${child.name} under the key ${name}. They key should match the child's name`)
+ ensureFolderNamesMatchKeys(child)
+ }
+}

web/src/FileTree.ts

@@ -90,9 +90,12 @@ export class FileTree<T = object> {
  squash (): void {
  if (this.subTrees.size === 1 && this.leafs.size === 0) {
  const child = [...this.subTrees.values()][0]
+ const oldName = this.name
  this.name += '/' + child.name
  this.subTrees = child.subTrees
  this.leafs = child.leafs
+ this.__parent?.subTrees.delete(oldName)
+ this.__parent?.subTrees.set(this.name, this)
  this.squash()
  for (const tree of this.subTrees.values()) {
  tree.__parent = this