@marimo-team/islands 0.25.3-dev191 → 0.25.3-dev193

package/src/utils/__tests__/id-tree.test.ts

@@ -25,240 +25,6 @@ describe("CollapsibleTree", () => {
 		`);
   });
 
-  it("collapses nodes correctly with no end", () => {
-    const collapsedTree = tree.collapse("two", undefined);
-    expect(collapsedTree.nodes[1].isCollapsed).toBe(true);
-    expect(collapsedTree.isCollapsed("two")).toBe(true);
-    expect(collapsedTree.toString()).toMatchInlineSnapshot(`
-			"one
-			two (collapsed)
-			  three
-			  four
-			"
-		`);
-  });
-
-  it("collapses nodes correctly with an 'until' in the middle", () => {
-    const collapsedTree = tree.collapse("two", "three");
-    expect(collapsedTree.nodes[1].isCollapsed).toBe(true);
-    expect(collapsedTree.toString()).toMatchInlineSnapshot(`
-			"one
-			two (collapsed)
-			  three
-			four
-			"
-		`);
-  });
-
-  it("collapses nodes correctly with an 'until' at the end", () => {
-    const collapsedTree = tree.collapse("two", "four");
-    expect(collapsedTree.nodes[1].isCollapsed).toBe(true);
-    expect(collapsedTree.toString()).toMatchInlineSnapshot(`
-			"one
-			two (collapsed)
-			  three
-			  four
-			"
-		`);
-  });
-
-  it("collapses nodes correctly if just the last node", () => {
-    const collapsedTree = tree.collapse("four", undefined);
-    expect(collapsedTree.nodes[3].isCollapsed).toBe(true);
-    expect(collapsedTree.toString()).toMatchInlineSnapshot(`
-			"one
-			two
-			three
-			four (collapsed)
-			"
-		`);
-  });
-
-  it("collapses nodes correctly if just the first node", () => {
-    const collapsedTree = tree.collapse("one", undefined);
-    expect(collapsedTree.nodes[0].isCollapsed).toBe(true);
-    expect(collapsedTree.toString()).toMatchInlineSnapshot(`
-			"one (collapsed)
-			  two
-			  three
-			  four
-			"
-		`);
-  });
-
-  it("can double collapse", () => {
-    const collapsedTree = tree
-      .collapse("three", undefined)
-      .collapse("two", undefined);
-    expect(collapsedTree.toString()).toMatchInlineSnapshot(`
-			"one
-			two (collapsed)
-			  three (collapsed)
-			    four
-			"
-		`);
-  });
-
-  it("failures to collapse", () => {
-    expect(() =>
-      tree.collapse("five", undefined),
-    ).toThrowErrorMatchingInlineSnapshot(
-      "[Error: Node five not found in tree. Valid ids: one,two,three,four]",
-    );
-    expect(() =>
-      tree.collapse("one", "five"),
-    ).toThrowErrorMatchingInlineSnapshot(
-      "[Error: Node five not found in tree]",
-    );
-    expect(() =>
-      tree.collapse("two", "one"),
-    ).toThrowErrorMatchingInlineSnapshot(
-      "[Error: Node one is before node two]",
-    );
-    expect(() => {
-      tree = tree.collapse("two", undefined);
-      tree = tree.collapse("two", undefined);
-    }).toThrowErrorMatchingInlineSnapshot(
-      "[Error: Node two is already collapsed]",
-    );
-  });
-
-  it("collapses all nodes from leaves to root in one call", () => {
-    const collapsedTree = tree.collapseAll([
-      { id: "one", until: undefined },
-      { id: "two", until: undefined },
-      { id: "three", until: undefined },
-      { id: "four", until: undefined },
-    ]);
-    expect(collapsedTree.toString()).toMatchInlineSnapshot(`
-      "one (collapsed)
-        two (collapsed)
-          three (collapsed)
-            four (collapsed)
-      "
-    `);
-  });
-
-  it("collapses some nodes from leaves to root in one call", () => {
-    const collapsedTree = tree.collapseAll([
-      { id: "one", until: undefined },
-      null,
-      { id: "three", until: "four" },
-      null,
-    ]);
-    expect(collapsedTree.toString()).toMatchInlineSnapshot(`
-      "one (collapsed)
-        two
-        three (collapsed)
-          four
-      "
-    `);
-  });
-
-  it("failures to collapse all", () => {
-    expect(() => tree.collapseAll([])).toThrowErrorMatchingInlineSnapshot(
-      "[Error: No collapse ranges provided]",
-    );
-    expect(() =>
-      tree.collapseAll([
-        { id: "one", until: undefined },
-        { id: "two", until: undefined },
-      ]),
-    ).toThrowErrorMatchingInlineSnapshot(
-      "[Error: Collapse ranges length 2 does not match tree length 4]",
-    );
-    expect(() =>
-      tree.collapseAll([null, { id: "one", until: undefined }, null, null]),
-    ).toThrowErrorMatchingInlineSnapshot(
-      "[Error: Node two does not match collapse range id one]",
-    );
-    expect(() =>
-      tree.collapseAll([{ id: "one", until: "five" }, null, null, null]),
-    ).toThrowErrorMatchingInlineSnapshot(
-      "[Error: Node five not found in tree]",
-    );
-    expect(() =>
-      tree.collapseAll([null, { id: "two", until: "one" }, null, null]),
-    ).toThrowErrorMatchingInlineSnapshot(
-      "[Error: Node one is before node two]",
-    );
-  });
-
-  it("expands nodes correctly", () => {
-    const collapsed = tree.collapse("two", undefined);
-    expect(collapsed.nodes[1].isCollapsed).toBe(true);
-    const expandedTree = collapsed.expand("two");
-    expect(expandedTree.nodes[1].isCollapsed).toBe(false);
-    expect(expandedTree.toString()).toMatchInlineSnapshot(`
-			"one
-			two
-			three
-			four
-			"
-		`);
-  });
-
-  it("expands all nested collapsed nodes correctly in one call", () => {
-    let collapsed = tree.collapse("three", undefined);
-    expect(collapsed.nodes[2].isCollapsed).toBe(true);
-    collapsed = collapsed.collapse("two", undefined);
-    expect(collapsed.nodes[1].isCollapsed).toBe(true);
-    const expandedTree = collapsed.expandAll();
-    expect(expandedTree.nodes[1].isCollapsed).toBe(false);
-    expect(expandedTree.toString()).toMatchInlineSnapshot(`
-      "one
-      two
-      three
-      four
-      "
-    `);
-  });
-
-  it("fails to expand when node not found", () => {
-    expect(() => tree.expand("five")).toThrowErrorMatchingInlineSnapshot(
-      "[Error: Node five not found in tree. Valid ids: one,two,three,four]",
-    );
-  });
-
-  it("expand on already expanded node is a no-op", () => {
-    // Expanding an already expanded node should return the same tree (no-op)
-    const result = tree.expand("one");
-    expect(result).toBe(tree);
-    // Can call multiple times without error
-    const result2 = tree.expand("one");
-    expect(result2).toBe(tree);
-  });
-
-  it("moves nodes correctly", () => {
-    const movedTree = tree.move(0, 1);
-    expect(movedTree.toString()).toMatchInlineSnapshot(`
-      "two
-      one
-      three
-      four
-      "
-    `);
-  });
-
-  it("moves a collapsed node correctly", () => {
-    const collapsed = tree.collapse("two", "three");
-    expect(collapsed.toString()).toMatchInlineSnapshot(`
-			"one
-			two (collapsed)
-			  three
-			four
-			"
-		`);
-    const movedTree = collapsed.move(1, 2);
-    expect(movedTree.toString()).toMatchInlineSnapshot(`
-			"one
-			four
-			two (collapsed)
-			  three
-			"
-		`);
-  });
-
   it("inserts nodes correctly", () => {
     tree = tree.insert("newNode", 1);
     expect(tree.toString()).toMatchInlineSnapshot(`
@@ -294,93 +60,6 @@ describe("CollapsibleTree", () => {
     `);
   });
 
-  it("counts children correctly", () => {
-    expect(tree.getCount("who")).toBe(0);
-    expect(tree.getCount("one")).toBe(0);
-    // Collapse three and get count
-    tree = tree.collapse("three", undefined);
-    expect(tree.getCount("three")).toBe(1);
-    // Collapse two and get count
-    tree = tree.collapse("two", undefined);
-    expect(tree.getCount("two")).toBe(2);
-  });
-
-  it("finds deep correctly", () => {
-    expect(tree.find("three")).toEqual(["three"]);
-    tree = tree.collapse("three", undefined).collapse("two", undefined);
-    expect(tree.find("three")).toEqual(["two", "three"]);
-    expect(tree.find("four")).toEqual(["two", "three", "four"]);
-    expect(tree.toString()).toMatchInlineSnapshot(`
-			"one
-			two (collapsed)
-			  three (collapsed)
-			    four
-			"
-		`);
-  });
-
-  it("finds and expands correctly at a leaf", () => {
-    tree = tree.collapse("three", undefined).collapse("two", undefined);
-    expect(tree.toString()).toMatchInlineSnapshot(`
-			"one
-			two (collapsed)
-			  three (collapsed)
-			    four
-			"
-		`);
-    const prevTree = tree;
-    tree = tree.findAndExpandDeep("four");
-    expect(tree.toString()).toMatchInlineSnapshot(`
-      "one
-      two
-      three
-      four
-      "
-    `);
-    // doesn't mutate
-    expect(prevTree.toString()).not.toEqual(tree.toString());
-  });
-
-  it("finds and expands correctly at a non-leaf", () => {
-    tree = tree.collapse("three", undefined).collapse("two", undefined);
-    expect(tree.toString()).toMatchInlineSnapshot(`
-			"one
-			two (collapsed)
-			  three (collapsed)
-			    four
-			"
-		`);
-    const prevTree = tree;
-    tree = tree.findAndExpandDeep("three");
-    expect(tree.toString()).toMatchInlineSnapshot(`
-      "one
-      two
-      three
-      four
-      "
-    `);
-    // doesn't mutate
-    expect(prevTree.toString()).not.toEqual(tree.toString());
-  });
-
-  it("can delete nodes", () => {
-    tree = tree.collapse("three", undefined).collapse("two", undefined);
-    expect(tree.toString()).toMatchInlineSnapshot(`
-			"one
-			two (collapsed)
-			  three (collapsed)
-			    four
-			"
-		`);
-    tree = tree.deleteAtIndex(1);
-    expect(tree.toString()).toMatchInlineSnapshot(`
-      "one
-      three (collapsed)
-        four
-      "
-    `);
-  });
-
   it("can delete non-collapsed nodes without throwing", () => {
     // Deleting a non-collapsed node should not throw
     // (previously this would throw "Node is already expanded" internally)
@@ -399,50 +78,6 @@ describe("CollapsibleTree", () => {
     );
   });
 
-  it("top-level ids are correct", () => {
-    expect(tree.topLevelIds).toMatchInlineSnapshot(`
-			[
-			  "one",
-			  "two",
-			  "three",
-			  "four",
-			]
-		`);
-
-    const collapsed = tree.collapse("two", undefined);
-    expect(collapsed.topLevelIds).toMatchInlineSnapshot(`
-			[
-			  "one",
-			  "two",
-			]
-		`);
-  });
-
-  it("in order ids are correct", () => {
-    expect(tree.inOrderIds).toMatchInlineSnapshot(`
-      [
-        "one",
-        "two",
-        "three",
-        "four",
-      ]
-    `);
-
-    const collapsed = tree.collapse("two", undefined);
-
-    // Not mutable
-    expect(tree.inOrderIds).toEqual(tree.inOrderIds);
-
-    expect(collapsed.inOrderIds).toMatchInlineSnapshot(`
-      [
-        "one",
-        "two",
-        "three",
-        "four",
-      ]
-    `);
-  });
-
   it("atOrThrow throws if not found", () => {
     expect(() => tree.atOrThrow(5)).toThrowErrorMatchingInlineSnapshot(
       "[Error: Node at index 5 not found in tree]",
@@ -454,49 +89,6 @@ describe("CollapsibleTree", () => {
     expect(tree.last()).toBe("four");
   });
 
-  it("length is correct", () => {
-    expect(tree.length).toBe(4);
-
-    const collapsed = tree.collapse("two", undefined);
-    expect(collapsed.length).toBe(2);
-  });
-
-  it("moves to front and back correctly", () => {
-    tree = tree.collapse("three", undefined).moveToBack("three");
-    expect(tree.toString()).toMatchInlineSnapshot(`
-      "one
-      two
-      three (collapsed)
-        four
-      "
-    `);
-
-    tree = tree.moveToFront("two");
-    expect(tree.toString()).toMatchInlineSnapshot(`
-      "two
-      one
-      three (collapsed)
-        four
-      "
-    `);
-  });
-
-  it("getDescendants correctly", () => {
-    expect(tree.getDescendants("two")).toEqual([]);
-    expect(tree.getDescendants("who")).toEqual([]);
-
-    tree = tree.collapse("three", undefined).collapse("two", undefined);
-    expect(tree.getDescendants("two")).toMatchInlineSnapshot(`
-      [
-        "three",
-        "four",
-      ]
-    `);
-
-    // We only get descendants of the top level
-    expect(tree.getDescendants("three")).toMatchInlineSnapshot("[]");
-  });
-
   it("handles slice correctly", () => {
     // Normal slice in middle
     expect(tree.slice(1, 3)).toEqual(["two", "three"]);
@@ -526,14 +118,6 @@ describe("CollapsibleTree", () => {
     expect(tree.slice(1, 2)).toEqual(["two"]);
   });
 
-  it("handles slice with collapsed nodes", () => {
-    const collapsed = tree.collapse("two", "three");
-
-    // Should only return top-level nodes, not descendants
-    expect(collapsed.slice(0, 2)).toEqual(["one", "two"]);
-    expect(collapsed.slice(1, 3)).toEqual(["two", "four"]);
-  });
-
   it("handles after correctly", () => {
     // Normal case - get next node
     expect(tree.after("one")).toBe("two");
@@ -549,20 +133,6 @@ describe("CollapsibleTree", () => {
     );
   });
 
-  it("handles after with collapsed nodes", () => {
-    const collapsed = tree.collapse("two", "three");
-
-    // Should return next top-level node
-    expect(collapsed.after("one")).toBe("two");
-    expect(collapsed.after("two")).toBe("four");
-    expect(collapsed.after("four")).toBeUndefined();
-
-    // Should throw for collapsed children that aren't top-level
-    expect(() => collapsed.after("three")).toThrow(
-      "Node three not found in tree. Valid ids: one,two,four",
-    );
-  });
-
   it("handles before correctly", () => {
     // Normal case - get previous node
     expect(tree.before("two")).toBe("one");
@@ -578,20 +148,6 @@ describe("CollapsibleTree", () => {
     );
   });
 
-  it("handles before with collapsed nodes", () => {
-    const collapsed = tree.collapse("two", "three");
-
-    // Should return previous top-level node
-    expect(collapsed.before("two")).toBe("one");
-    expect(collapsed.before("four")).toBe("two");
-    expect(collapsed.before("one")).toBeUndefined();
-
-    // Should throw for collapsed children that aren't top-level
-    expect(() => collapsed.before("three")).toThrow(
-      "Node three not found in tree. Valid ids: one,two,four",
-    );
-  });
-
   it("handles slice on empty tree", () => {
     const emptyTree = CollapsibleTree.from([]);
     expect(emptyTree.slice(0, 1)).toEqual([]);
@@ -665,45 +221,6 @@ describe("CollapsibleTree edge cases", () => {
     expect(tree.topLevelIds).toEqual(["Z", "A", "B", "C", "D", "Y"]);
   });
 
-  it("handles delete with expand", () => {
-    tree = tree.collapse("B", "D");
-    tree = tree.deleteAtIndex(1);
-    expect(tree.topLevelIds).toEqual(["A", "C", "D"]);
-  });
-
-  it("finds nodes correctly", () => {
-    tree = tree.collapse("B", "D");
-    expect(tree.find("C")).toEqual(["B", "C"]);
-    expect(tree.find("E")).toEqual([]);
-  });
-
-  it("handles equality check", () => {
-    const tree2 = CollapsibleTree.from(["A", "B", "C", "D"]);
-    expect(tree.equals(tree2)).toBe(true);
-    tree2.collapse("B", "C");
-    expect(tree.equals(tree2)).toBe(true);
-  });
-
-  it("handles getCount correctly", () => {
-    tree = tree.collapse("B", "D");
-    expect(tree.getCount("A")).toBe(0);
-    expect(tree.getCount("B")).toBe(2);
-    expect(tree.getCount("C")).toBe(0);
-  });
-
-  it("handles findAndExpandDeep", () => {
-    tree = tree.collapse("B", "D");
-    tree = tree.findAndExpandDeep("C");
-    expect(tree.topLevelIds).toEqual(["A", "B", "C", "D"]);
-  });
-
-  it("handles multiple collapses and expands", () => {
-    tree = tree.collapse("B", "C").collapse("A", "D");
-    expect(tree.topLevelIds).toEqual(["A"]);
-    tree = tree.expand("A").expand("B");
-    expect(tree.topLevelIds).toEqual(["A", "B", "C", "D"]);
-  });
-
   it("handles edge cases for first and last", () => {
     expect(tree.first()).toBe("A");
     expect(tree.last()).toBe("D");
@@ -711,21 +228,6 @@ describe("CollapsibleTree edge cases", () => {
     expect(() => tree.first()).toThrow("Node at index 0 not found in tree");
     expect(() => tree.last()).toThrow("Node at index -1 not found in tree");
   });
-
-  it("handles inOrderIds with nested structure", () => {
-    tree = tree.collapse("B", "C");
-    expect(tree.inOrderIds).toEqual(["A", "B", "C", "D"]);
-  });
-
-  it("handles moving within bounds", () => {
-    tree = tree.move(0, 2);
-    expect(tree.topLevelIds).toEqual(["B", "C", "A", "D"]);
-  });
-
-  it("handles moving out of bounds", () => {
-    tree = tree.move(0, 10);
-    expect(tree.topLevelIds).toEqual(["B", "C", "D", "A"]);
-  });
 });
 
 describe("MultiColumn", () => {
@@ -862,29 +364,6 @@ describe("MultiColumn", () => {
     ]);
   });
 
-  it("moves within a column", () => {
-    const moved = multiColumn.moveWithinColumn(
-      columnIds[0],
-      0 as CellIndex,
-      2 as CellIndex,
-    );
-    expect(moved.topLevelIds[0]).toEqual(["A2", "A3", "A1"]);
-  });
-
-  it("moves across columns", () => {
-    const moved = multiColumn.moveAcrossColumns(
-      columnIds[0],
-      "A1",
-      columnIds[1],
-      "B1",
-    );
-    expect(moved.topLevelIds).toEqual([
-      ["A2", "A3"],
-      ["A1", "B1", "B2"],
-      ["C1", "C2", "C3", "C4"],
-    ]);
-  });
-
   it("moves a column", () => {
     const moved = multiColumn.moveColumn(columnIds[0], columnIds[2]);
     expect(moved.topLevelIds).toEqual([
@@ -921,17 +400,6 @@ describe("MultiColumn", () => {
     ]);
   });
 
-  it("moves to a new column", () => {
-    const newColumn = multiColumn.moveToNewColumn("B1");
-    expect(newColumn.colLength).toBe(4);
-    expect(newColumn.topLevelIds).toEqual([
-      ["A1", "A2", "A3"],
-      ["B2"],
-      ["C1", "C2", "C3", "C4"],
-      ["B1"],
-    ]);
-  });
-
   it("gets column with id", () => {
     const column = multiColumn.findWithId("B2");
     expect(multiColumn.indexOf(column)).toBe(1);
@@ -940,9 +408,9 @@ describe("MultiColumn", () => {
 
   it("transforms by id", () => {
     const transformed = multiColumn.transformWithCellId("B1", (tree) =>
-      tree.moveToFront("B2"),
+      tree.delete("B1"),
     );
-    expect(transformed.topLevelIds[1]).toEqual(["B2", "B1"]);
+    expect(transformed.topLevelIds[1]).toEqual(["B2"]);
   });
 
   it("transforms all columns", () => {
@@ -961,82 +429,6 @@ describe("MultiColumn", () => {
     expect(inserted.topLevelIds[1]).toEqual(["B1", "D1", "B2"]);
   });
 
-  describe("moveCellsRelativeTo", () => {
-    it("moves a single cell before target in same column", () => {
-      const moved = multiColumn.moveCellsRelativeTo(["A3"], "A1", "before");
-      expect(moved.topLevelIds).toEqual([
-        ["A3", "A1", "A2"],
-        ["B1", "B2"],
-        ["C1", "C2", "C3", "C4"],
-      ]);
-    });
-
-    it("moves a single cell after target in same column", () => {
-      const moved = multiColumn.moveCellsRelativeTo(["A1"], "A3", "after");
-      expect(moved.topLevelIds).toEqual([
-        ["A2", "A3", "A1"],
-        ["B1", "B2"],
-        ["C1", "C2", "C3", "C4"],
-      ]);
-    });
-
-    it("moves multiple cells before target", () => {
-      const moved = multiColumn.moveCellsRelativeTo(
-        ["A1", "A2"],
-        "B2",
-        "before",
-      );
-      expect(moved.topLevelIds).toEqual([
-        ["A3"],
-        ["B1", "A1", "A2", "B2"],
-        ["C1", "C2", "C3", "C4"],
-      ]);
-    });
-
-    it("moves multiple cells after target", () => {
-      const moved = multiColumn.moveCellsRelativeTo(
-        ["A2", "A3"],
-        "B1",
-        "after",
-      );
-      expect(moved.topLevelIds).toEqual([
-        ["A1"],
-        ["B1", "A2", "A3", "B2"],
-        ["C1", "C2", "C3", "C4"],
-      ]);
-    });
-
-    it("returns same MultiColumn when cellIds is empty", () => {
-      const moved = multiColumn.moveCellsRelativeTo([], "A1", "before");
-      expect(moved).toBe(multiColumn);
-    });
-
-    it("inserts at end when target is among moved cells", () => {
-      const moved = multiColumn.moveCellsRelativeTo(
-        ["A1", "A2"],
-        "A2",
-        "after",
-      );
-      // Target A2 was removed; insert at end of column 0
-      expect(moved.topLevelIds).toEqual([
-        ["A3", "A1", "A2"],
-        ["B1", "B2"],
-        ["C1", "C2", "C3", "C4"],
-      ]);
-    });
-
-    it("throws when node not found", () => {
-      expect(() =>
-        multiColumn.moveCellsRelativeTo(["Z1"], "A1", "before"),
-      ).toThrow("Cell Z1 not found in any column");
-    });
-  });
-
-  it("deletes by id", () => {
-    const deleted = multiColumn.deleteById("B1");
-    expect(deleted.topLevelIds[1]).toEqual(["B2"]);
-  });
-
   it("compacts", () => {
     const withEmpty = MultiColumn.from([["A1"], [], ["C1"], []]);
     const compacted = withEmpty.compact();
@@ -1079,36 +471,6 @@ describe("MultiColumn", () => {
     expect(() => multiColumn.atOrThrow(5)).toThrow("Column 5 not found");
   });
 
-  it("handles moving the last item in a column", () => {
-    const multiColumn = MultiColumn.from([["A1", "A2"], ["B1"]]);
-    const columnIds = multiColumn.getColumns().map((c) => c.id);
-    const moved = multiColumn.moveAcrossColumns(
-      columnIds[1],
-      "B1",
-      columnIds[0],
-      "A2",
-    );
-    expect(moved.topLevelIds).toEqual([["A1", "B1", "A2"], []]);
-    expect(moved.colLength).toBe(2);
-  });
-
-  it("handles moving all items from a column", () => {
-    const multiColumn = MultiColumn.from([
-      ["A1", "A2"],
-      ["B1", "B2"],
-    ]);
-    const columnIds = multiColumn.getColumns().map((c) => c.id);
-    let moved = multiColumn.moveAcrossColumns(
-      columnIds[1],
-      "B1",
-      columnIds[0],
-      "A2",
-    );
-    moved = moved.moveAcrossColumns(columnIds[1], "B2", columnIds[0], "A2");
-    expect(moved.topLevelIds).toEqual([["A1", "B1", "B2", "A2"], []]);
-    expect(moved.colLength).toBe(2);
-  });
-
   it("handles inserting at out-of-bounds indices", () => {
     const multiColumn = MultiColumn.from([["A1"], ["B1"]]);
     const columnId = multiColumn.atOrThrow(1).id;
@@ -1116,24 +478,6 @@ describe("MultiColumn", () => {
     expect(inserted.topLevelIds).toEqual([["A1"], ["B1", "C1"]]);
   });
 
-  it("handles collapsing and expanding in multi-column setup", () => {
-    let multiColumn = MultiColumn.from([
-      ["A1", "A2", "A3"],
-      ["B1", "B2"],
-    ]);
-    multiColumn = multiColumn.transformWithCellId("A1", (tree) =>
-      tree.collapse("A1", "A3"),
-    );
-    expect(multiColumn.topLevelIds).toEqual([["A1"], ["B1", "B2"]]);
-    multiColumn = multiColumn.transformWithCellId("A1", (tree) =>
-      tree.expand("A1"),
-    );
-    expect(multiColumn.topLevelIds).toEqual([
-      ["A1", "A2", "A3"],
-      ["B1", "B2"],
-    ]);
-  });
-
   it("handles moving a column to its own position", () => {
     const multiColumn = MultiColumn.from([["A1"], ["B1"], ["C1"]]);
     const moved = multiColumn.moveColumn(columnIds[1], columnIds[1]);
@@ -1155,39 +499,6 @@ describe("MultiColumn", () => {
     expect(transformed).toBe(multiColumn);
   });
 
-  it("handles nested collapses and expands", () => {
-    let multiColumn = MultiColumn.from([["A1", "A2", "A3", "A4", "A5"]]);
-    multiColumn = multiColumn.transformWithCellId("A1", (tree) =>
-      tree.collapse("A2", "A4"),
-    );
-    multiColumn = multiColumn.transformWithCellId("A1", (tree) =>
-      tree.collapse("A1", undefined),
-    );
-    expect(multiColumn.topLevelIds).toEqual([["A1"]]);
-    multiColumn = multiColumn.transformWithCellId("A1", (tree) =>
-      tree.expand("A1"),
-    );
-    expect(multiColumn.topLevelIds).toEqual([["A1", "A2", "A5"]]);
-    multiColumn = multiColumn.transformWithCellId("A1", (tree) =>
-      tree.expand("A2"),
-    );
-    expect(multiColumn.topLevelIds).toEqual([["A1", "A2", "A3", "A4", "A5"]]);
-  });
-
-  it("handles moving to a new column when it's the last item", () => {
-    let multiColumn = MultiColumn.from([["A1"], ["B1"]]);
-    multiColumn = multiColumn.moveToNewColumn("B1");
-    expect(multiColumn.colLength).toBe(3);
-    expect(multiColumn.topLevelIds).toEqual([["A1"], [], ["B1"]]);
-  });
-
-  it("handles deleting the last item in a column", () => {
-    let multiColumn = MultiColumn.from([["A1"], ["B1"], ["C1"]]);
-    multiColumn = multiColumn.deleteById("B1");
-    expect(multiColumn.colLength).toBe(3);
-    expect(multiColumn.topLevelIds).toEqual([["A1"], [], ["C1"]]);
-  });
-
   it("handles multiple operations in sequence", () => {
     let multiColumn = MultiColumn.from([
       ["A1", "A2"],
@@ -1195,40 +506,31 @@ describe("MultiColumn", () => {
       ["C1", "C2"],
     ]);
     const columnIds = multiColumn.getColumns().map((c) => c.id);
-    multiColumn = multiColumn.moveAcrossColumns(
-      columnIds[0],
-      "A2",
-      columnIds[1],
-      "B1",
-    );
-    expect(multiColumn.topLevelIds).toEqual([
-      ["A1"],
-      ["A2", "B1", "B2"],
-      ["C1", "C2"],
-    ]);
     multiColumn = multiColumn.insertId("D1", columnIds[2], 1 as CellIndex);
     expect(multiColumn.topLevelIds).toEqual([
-      ["A1"],
-      ["A2", "B1", "B2"],
+      ["A1", "A2"],
+      ["B1", "B2"],
       ["C1", "D1", "C2"],
     ]);
-    multiColumn = multiColumn.deleteById("B1");
+    multiColumn = multiColumn.transformWithCellId("B1", (tree) =>
+      tree.delete("B1"),
+    );
     expect(multiColumn.topLevelIds).toEqual([
-      ["A1"],
-      ["A2", "B2"],
+      ["A1", "A2"],
+      ["B2"],
       ["C1", "D1", "C2"],
     ]);
     multiColumn = multiColumn.moveColumn(columnIds[0], columnIds[2]);
     expect(multiColumn.topLevelIds).toEqual([
-      ["A2", "B2"],
+      ["B2"],
       ["C1", "D1", "C2"],
-      ["A1"],
+      ["A1", "A2"],
     ]);
     multiColumn = multiColumn.compact();
     expect(multiColumn.topLevelIds).toEqual([
-      ["A2", "B2"],
+      ["B2"],
       ["C1", "D1", "C2"],
-      ["A1"],
+      ["A1", "A2"],
     ]);
   });
 
@@ -1238,7 +540,10 @@ describe("MultiColumn", () => {
     expect(multiColumn.setupCellExists()).toBe(false);
     const multiColumn2 = multiColumn.insertId(SETUP_CELL_ID, columnIds[0], 0);
     expect(multiColumn2.setupCellExists()).toBe(true);
-    const multiColumn3 = multiColumn2.deleteById(SETUP_CELL_ID);
+    const multiColumn3 = multiColumn2.transformWithCellId(
+      SETUP_CELL_ID,
+      (tree) => tree.delete(SETUP_CELL_ID),
+    );
     expect(multiColumn3.setupCellExists()).toBe(false);
   });
 
@@ -1264,15 +569,15 @@ describe("MultiColumn", () => {
 
   it("handles transform method", () => {
     const transformed = multiColumn.transform(columnIds[1], (tree) =>
-      tree.moveToFront("B2"),
+      tree.delete("B1"),
     );
-    expect(transformed.topLevelIds[1]).toEqual(["B2", "B1"]);
+    expect(transformed.topLevelIds[1]).toEqual(["B2"]);
   });
 
   it("handles transform method with non-existent column id", () => {
     const transformed = multiColumn.transform(
       "non-existent-id" as CellColumnId,
-      (tree) => tree.moveToFront("B2"),
+      (tree) => tree.delete("B2"),
     );
     const columns1 = multiColumn.getColumns();
     const columns2 = transformed.getColumns();
@@ -1281,37 +586,6 @@ describe("MultiColumn", () => {
     expect(transformed).toBe(multiColumn);
   });
 
-  it("handles moving across columns with undefined toId", () => {
-    const moved = multiColumn.moveAcrossColumns(
-      columnIds[0],
-      "A1",
-      columnIds[1],
-      undefined,
-    );
-    expect(moved.topLevelIds).toEqual([
-      ["A2", "A3"],
-      ["A1", "B1", "B2"],
-      ["C1", "C2", "C3", "C4"],
-    ]);
-  });
-
-  it("handles moving across columns to an empty column", () => {
-    const emptyColumnMultiColumn = multiColumn
-      .deleteById("B1")
-      .deleteById("B2");
-    const moved = emptyColumnMultiColumn.moveAcrossColumns(
-      columnIds[0],
-      "A1",
-      columnIds[1],
-      undefined,
-    );
-    expect(moved.topLevelIds).toEqual([
-      ["A2", "A3"],
-      ["A1"],
-      ["C1", "C2", "C3", "C4"],
-    ]);
-  });
-
   it("handles inserting a breakpoint at the start of a column", () => {
     const withBreakpoint = multiColumn.insertBreakpoint("A1");
     expect(withBreakpoint.colLength).toBe(4);
@@ -1341,805 +615,3 @@ describe("MultiColumn", () => {
     expect(withBreakpoint.topLevelIds).toEqual([["A1"], [], ["B1"], ["C1"]]);
   });
 });
-
-describe("MultiColumn.fromWithPreviousShape", () => {
-  it("creates a new MultiColumn with a single column when no previous shape is provided", () => {
-    const ids = ["A1", "A2", "A3"];
-    const multiColumn = MultiColumn.fromWithPreviousShape(
-      ids,
-      MultiColumn.from([]),
-    );
-
-    expect(multiColumn.colLength).toBe(1);
-    expect(multiColumn.topLevelIds).toEqual([ids]);
-    expect(multiColumn.inOrderIds).toEqual(ids);
-  });
-
-  it("preserves column structure when ids exist in previous columns", () => {
-    const previousMultiColumn = MultiColumn.from([
-      ["A1", "A2"],
-      ["B1", "B2"],
-      ["C1", "C2"],
-    ]);
-
-    // Subset of ids from different columns
-    const ids = ["A1", "B2", "C1"];
-    const multiColumn = MultiColumn.fromWithPreviousShape(
-      ids,
-      previousMultiColumn,
-    );
-
-    expect(multiColumn.colLength).toBe(3);
-    expect(multiColumn.topLevelIds).toEqual([["A1"], ["B2"], ["C1"]]);
-  });
-
-  it("preserves column structure with different ordering", () => {
-    const previousMultiColumn = MultiColumn.from([
-      ["A1", "A2", "A3"],
-      ["B1", "B2", "B3"],
-    ]);
-
-    // Same ids but different order
-    const ids = ["A3", "B1", "A1", "B3"];
-    const multiColumn = MultiColumn.fromWithPreviousShape(
-      ids,
-      previousMultiColumn,
-    );
-
-    expect(multiColumn.colLength).toBe(2);
-    expect(multiColumn.topLevelIds).toEqual([
-      ["A3", "A1"],
-      ["B1", "B3"],
-    ]);
-  });
-
-  it("handles ids not present in previous shape", () => {
-    const previousMultiColumn = MultiColumn.from([
-      ["A1", "A2"],
-      ["B1", "B2"],
-    ]);
-
-    // Include new ids not in previous shape
-    const ids = ["A1", "B1", "C1", "D1"];
-    const multiColumn = MultiColumn.fromWithPreviousShape(
-      ids,
-      previousMultiColumn,
-    );
-
-    // New ids should be added to the last column
-    expect(multiColumn.colLength).toBe(2);
-    expect(multiColumn.topLevelIds).toEqual([["A1"], ["B1", "C1", "D1"]]);
-    expect(multiColumn.inOrderIds).toEqual(["A1", "B1", "C1", "D1"]);
-  });
-
-  it("preserves collapsed state from previous shape", () => {
-    // Create a previous shape with collapsed nodes
-    let previousMultiColumn = MultiColumn.from([
-      ["A1", "A2", "A3"],
-      ["B1", "B2", "B3"],
-    ]);
-
-    // Collapse A1 to include A2
-    const columnIds = previousMultiColumn.getColumnIds();
-    previousMultiColumn = previousMultiColumn.transform(columnIds[0], (tree) =>
-      tree.collapse("A1", "A2"),
-    );
-
-    // Create new shape with same ids
-    const ids = ["A1", "A2", "A3", "B1", "B2", "B3"];
-    const multiColumn = MultiColumn.fromWithPreviousShape(
-      ids,
-      previousMultiColumn,
-    );
-
-    // Check that A1 is still collapsed
-    const column = multiColumn.atOrThrow(0);
-    expect(column.isCollapsed("A1")).toBe(true);
-
-    // Check that the structure is preserved
-    expect(multiColumn.colLength).toBe(2);
-    expect(multiColumn.topLevelIds).toEqual([
-      ["A1", "A3"],
-      ["B1", "B2", "B3"],
-    ]);
-  });
-
-  it("handles empty columns in previous shape", () => {
-    // Create a previous shape with an empty column
-    const previousMultiColumn = MultiColumn.from([
-      ["A1", "A2"],
-      [],
-      ["C1", "C2"],
-    ]);
-
-    const ids = ["A1", "C2"];
-    const multiColumn = MultiColumn.fromWithPreviousShape(
-      ids,
-      previousMultiColumn,
-    );
-
-    // Should preserve the column structure
-    expect(multiColumn.colLength).toBe(3);
-    expect(multiColumn.topLevelIds).toEqual([["A1"], [], ["C2"]]);
-  });
-
-  it("handles subset of ids with nested collapsed structure", () => {
-    // Create a previous shape with nested collapsed structure
-    let previousMultiColumn = MultiColumn.from([
-      ["A1", "A2", "A3", "A4", "A5"],
-      ["B1", "B2", "B3"],
-    ]);
-
-    // Collapse A1 to include A2, A3
-    const columnIds = previousMultiColumn.getColumnIds();
-    previousMultiColumn = previousMultiColumn.transform(columnIds[0], (tree) =>
-      tree.collapse("A1", "A3"),
-    );
-
-    // Create new shape with subset of ids
-    const ids = ["A1", "A2", "A3", "A4", "B1"];
-    const multiColumn = MultiColumn.fromWithPreviousShape(
-      ids,
-      previousMultiColumn,
-    );
-
-    // Check that collapsed state is preserved
-    const column = multiColumn.atOrThrow(0);
-    expect(column.isCollapsed("A1")).toBe(true);
-
-    // Check that the structure is preserved
-    expect(multiColumn.colLength).toBe(2);
-    expect(multiColumn.topLevelIds).toEqual([["A1", "A4"], ["B1"]]);
-    expect(multiColumn.inOrderIds).toEqual(["A1", "A2", "A3", "A4", "B1"]);
-  });
-
-  it("handles reordering of columns", () => {
-    // Create a previous shape with specific column order
-    const previousMultiColumn = MultiColumn.from([
-      ["A1", "A2"],
-      ["B1", "B2"],
-      ["C1", "C2"],
-    ]);
-
-    // Create new shape with ids in different order
-    const ids = ["C1", "A1", "B1"];
-    const multiColumn = MultiColumn.fromWithPreviousShape(
-      ids,
-      previousMultiColumn,
-    );
-
-    // Column order should be preserved
-    expect(multiColumn.colLength).toBe(3);
-    expect(multiColumn.topLevelIds).toEqual([["A1"], ["B1"], ["C1"]]);
-  });
-
-  it("handles completely different set of ids", () => {
-    const previousMultiColumn = MultiColumn.from([
-      ["A1", "A2"],
-      ["B1", "B2"],
-    ]);
-
-    // Completely different set of ids
-    const ids = ["X1", "X2", "X3"];
-    const multiColumn = MultiColumn.fromWithPreviousShape(
-      ids,
-      previousMultiColumn,
-    );
-
-    // New ids should be added to the last column
-    expect(multiColumn.colLength).toBe(2);
-    expect(multiColumn.topLevelIds).toEqual([["X1", "X2", "X3"], []]);
-    expect(multiColumn.inOrderIds).toEqual(["X1", "X2", "X3"]);
-  });
-
-  it("preserves tree structure within columns", () => {
-    // Create a previous shape with complex tree structure
-    let previousMultiColumn = MultiColumn.from([
-      ["A1", "A2", "A3", "A4"],
-      ["B1", "B2", "B3"],
-    ]);
-
-    // Create complex tree structure by collapsing nodes
-    const columnIds = previousMultiColumn.getColumnIds();
-    previousMultiColumn = previousMultiColumn.transform(columnIds[0], (tree) =>
-      tree.collapse("A1", "A2"),
-    );
-    previousMultiColumn = previousMultiColumn.transform(columnIds[1], (tree) =>
-      tree.collapse("B1", "B2"),
-    );
-
-    // Create new shape with same ids
-    const ids = ["A1", "A2", "A3", "A4", "B1", "B2", "B3"];
-    const multiColumn = MultiColumn.fromWithPreviousShape(
-      ids,
-      previousMultiColumn,
-    );
-
-    // Check that collapsed state is preserved in both columns
-    expect(multiColumn.atOrThrow(0).isCollapsed("A1")).toBe(true);
-    expect(multiColumn.atOrThrow(1).isCollapsed("B1")).toBe(true);
-
-    // Check that the structure is preserved
-    expect(multiColumn.colLength).toBe(2);
-    expect(multiColumn.topLevelIds).toEqual([
-      ["A1", "A3", "A4"],
-      ["B1", "B3"],
-    ]);
-  });
-
-  it("handles empty array of ids", () => {
-    const previousMultiColumn = MultiColumn.from([
-      ["A1", "A2"],
-      ["B1", "B2"],
-    ]);
-
-    const multiColumn = MultiColumn.fromWithPreviousShape(
-      [],
-      previousMultiColumn,
-    );
-
-    expect(multiColumn.colLength).toBe(2);
-    expect(multiColumn.topLevelIds).toEqual([[], []]);
-    expect(multiColumn.inOrderIds).toEqual([]);
-  });
-
-  it("handles single id", () => {
-    const previousMultiColumn = MultiColumn.from([
-      ["A1", "A2"],
-      ["B1", "B2"],
-    ]);
-
-    const multiColumn = MultiColumn.fromWithPreviousShape(
-      ["A1"],
-      previousMultiColumn,
-    );
-
-    expect(multiColumn.colLength).toBe(2);
-    expect(multiColumn.topLevelIds).toEqual([["A1"], []]);
-    expect(multiColumn.inOrderIds).toEqual(["A1"]);
-  });
-
-  it("preserves complex nested structure across multiple columns", () => {
-    // Create a complex structure with multiple columns and nested collapsed nodes
-    let previousMultiColumn = MultiColumn.from([
-      ["A1", "A2", "A3", "A4", "A5"],
-      ["B1", "B2", "B3", "B4"],
-      ["C1", "C2", "C3"],
-    ]);
-
-    // Create complex nested structure
-    const columnIds = previousMultiColumn.getColumnIds();
-
-    // Collapse in first column
-    previousMultiColumn = previousMultiColumn.transform(columnIds[0], (tree) =>
-      tree.collapse("A1", "A2"),
-    );
-    previousMultiColumn = previousMultiColumn.transform(columnIds[0], (tree) =>
-      tree.collapse("A3", "A4"),
-    );
-
-    // Collapse in second column
-    previousMultiColumn = previousMultiColumn.transform(columnIds[1], (tree) =>
-      tree.collapse("B1", "B2"),
-    );
-
-    // Collapse in third column
-    previousMultiColumn = previousMultiColumn.transform(columnIds[2], (tree) =>
-      tree.collapse("C1", "C2"),
-    );
-
-    // Create new shape with all ids
-    const ids = [
-      "A1",
-      "A2",
-      "A3",
-      "A4",
-      "A5",
-      "B1",
-      "B2",
-      "B3",
-      "B4",
-      "C1",
-      "C2",
-      "C3",
-    ];
-
-    const multiColumn = MultiColumn.fromWithPreviousShape(
-      ids,
-      previousMultiColumn,
-    );
-
-    // Check that all collapsed states are preserved
-    expect(multiColumn.atOrThrow(0).isCollapsed("A1")).toBe(true);
-    expect(multiColumn.atOrThrow(0).isCollapsed("A3")).toBe(true);
-    expect(multiColumn.atOrThrow(1).isCollapsed("B1")).toBe(true);
-    expect(multiColumn.atOrThrow(2).isCollapsed("C1")).toBe(true);
-
-    // Check that the structure is preserved
-    expect(multiColumn.colLength).toBe(3);
-    expect(multiColumn.topLevelIds).toEqual([
-      ["A1", "A3", "A5"],
-      ["B1", "B3", "B4"],
-      ["C1", "C3"],
-    ]);
-  });
-
-  it("handles case where ids are distributed differently than in previous shape", () => {
-    const previousMultiColumn = MultiColumn.from([
-      ["A1", "A2"],
-      ["B1", "B2"],
-      ["C1", "C2"],
-    ]);
-
-    // Create new shape with ids from different columns grouped together
-    const ids = ["A1", "B1", "C1", "A2", "B2", "C2"];
-    const multiColumn = MultiColumn.fromWithPreviousShape(
-      ids,
-      previousMultiColumn,
-    );
-
-    // Should preserve the original column structure
-    expect(multiColumn.colLength).toBe(3);
-    expect(multiColumn.topLevelIds).toEqual([
-      ["A1", "A2"],
-      ["B1", "B2"],
-      ["C1", "C2"],
-    ]);
-  });
-
-  it("handles case where previous shape has collapsed nodes but new ids don't include children", () => {
-    // Create a previous shape with collapsed nodes
-    let previousMultiColumn = MultiColumn.from([
-      ["A1", "A2", "A3"],
-      ["B1", "B2", "B3"],
-    ]);
-
-    // Collapse nodes in both columns
-    const columnIds = previousMultiColumn.getColumnIds();
-    previousMultiColumn = previousMultiColumn.transform(columnIds[0], (tree) =>
-      tree.collapse("A1", "A2"),
-    );
-    previousMultiColumn = previousMultiColumn.transform(columnIds[1], (tree) =>
-      tree.collapse("B1", "B2"),
-    );
-
-    // Create new shape without the collapsed children
-    const ids = ["A1", "A3", "B1", "B3"];
-    const multiColumn = MultiColumn.fromWithPreviousShape(
-      ids,
-      previousMultiColumn,
-    );
-
-    // Nodes should not be collapsed since children are missing
-    expect(multiColumn.atOrThrow(0).isCollapsed("A1")).toBe(false);
-    expect(multiColumn.atOrThrow(1).isCollapsed("B1")).toBe(false);
-
-    // Check that the structure is preserved
-    expect(multiColumn.colLength).toBe(2);
-    expect(multiColumn.topLevelIds).toEqual([
-      ["A1", "A3"],
-      ["B1", "B3"],
-    ]);
-  });
-
-  it("handles deeply nested collapsed structure", () => {
-    // Create a tree with deeply nested collapsed structure
-    let previousTree = CollapsibleTree.from([
-      "one",
-      "two",
-      "three",
-      "four",
-      "five",
-      "six",
-      "seven",
-      "eight",
-    ]);
-
-    // Create nested collapses
-    previousTree = previousTree.collapse("one", "two");
-
-    // Get the collapsed node and collapse its children
-    const oneNode = previousTree._nodeMap.get("one");
-    expect(oneNode).toBeDefined();
-
-    // Create a new tree with the same structure
-    const tree = CollapsibleTree.fromWithPreviousShape(
-      ["one", "two", "three", "four", "five", "six", "seven", "eight"],
-      previousTree,
-    );
-
-    // Check that collapsed state is preserved
-    expect(tree.isCollapsed("one")).toBe(true);
-    expect(tree.topLevelIds).toEqual([
-      "one",
-      "three",
-      "four",
-      "five",
-      "six",
-      "seven",
-      "eight",
-    ]);
-  });
-
-  it("handles case where collapsed node is at the end", () => {
-    // Create a tree with collapsed node at the end
-    let previousTree = CollapsibleTree.from([
-      "one",
-      "two",
-      "three",
-      "four",
-      "five",
-    ]);
-    previousTree = previousTree.collapse("four", "five");
-
-    // Create new tree with same ids
-    const tree = CollapsibleTree.fromWithPreviousShape(
-      ["one", "two", "three", "four", "five"],
-      previousTree,
-    );
-
-    // Check that collapsed state is preserved
-    expect(tree.isCollapsed("four")).toBe(true);
-    expect(tree.topLevelIds).toEqual(["one", "two", "three", "four"]);
-  });
-
-  it("handles case with multiple collapsed nodes in the same column", () => {
-    // Create a previous shape with multiple collapsed nodes in the same column
-    let previousMultiColumn = MultiColumn.from([
-      ["A1", "A2", "A3", "A4", "A5", "A6"],
-      ["B1", "B2"],
-    ]);
-
-    // Collapse multiple nodes in the first column
-    const columnIds = previousMultiColumn.getColumnIds();
-    previousMultiColumn = previousMultiColumn.transform(columnIds[0], (tree) =>
-      tree.collapse("A1", "A2"),
-    );
-    previousMultiColumn = previousMultiColumn.transform(columnIds[0], (tree) =>
-      tree.collapse("A3", "A4"),
-    );
-    previousMultiColumn = previousMultiColumn.transform(columnIds[0], (tree) =>
-      tree.collapse("A5", "A6"),
-    );
-
-    // Create new shape with same ids
-    const ids = ["A1", "A2", "A3", "A4", "A5", "A6", "B1", "B2"];
-    const multiColumn = MultiColumn.fromWithPreviousShape(
-      ids,
-      previousMultiColumn,
-    );
-
-    // Check that all collapsed states are preserved
-    expect(multiColumn.atOrThrow(0).isCollapsed("A1")).toBe(true);
-    expect(multiColumn.atOrThrow(0).isCollapsed("A3")).toBe(true);
-    expect(multiColumn.atOrThrow(0).isCollapsed("A5")).toBe(true);
-
-    // Check that the structure is preserved
-    expect(multiColumn.colLength).toBe(2);
-    expect(multiColumn.topLevelIds).toEqual([
-      ["A1", "A3", "A5"],
-      ["B1", "B2"],
-    ]);
-  });
-
-  it("handles case where all columns are empty in previous shape", () => {
-    // Create a previous shape with all empty columns
-    const previousMultiColumn = MultiColumn.from([[], [], []]);
-
-    // Create new shape with new ids
-    const ids = ["A1", "B1", "C1"];
-    const multiColumn = MultiColumn.fromWithPreviousShape(
-      ids,
-      previousMultiColumn,
-    );
-
-    // New ids should be added to the last column
-    expect(multiColumn.colLength).toBe(3);
-    expect(multiColumn.topLevelIds).toEqual([["A1", "B1", "C1"], [], []]);
-    expect(multiColumn.inOrderIds).toEqual(["A1", "B1", "C1"]);
-  });
-
-  it("handles case with very large number of ids", () => {
-    // Create a previous shape with a reasonable number of ids
-    const previousIds1 = Array.from({ length: 50 }, (_, i) => `A${i}`);
-    const previousIds2 = Array.from({ length: 50 }, (_, i) => `B${i}`);
-    const previousMultiColumn = MultiColumn.from([previousIds1, previousIds2]);
-
-    // Create a large set of ids
-    const ids = [
-      ...Array.from({ length: 50 }, (_, i) => `A${i}`),
-      ...Array.from({ length: 50 }, (_, i) => `B${i}`),
-      ...Array.from({ length: 50 }, (_, i) => `C${i}`),
-    ];
-
-    const multiColumn = MultiColumn.fromWithPreviousShape(
-      ids,
-      previousMultiColumn,
-    );
-
-    // Should preserve the column structure for existing ids and add new ids to last column
-    expect(multiColumn.colLength).toBe(2);
-    expect(multiColumn.topLevelIds[0].length).toBe(50);
-    expect(multiColumn.topLevelIds[1].length).toBe(100); // 50 B ids + 50 C ids
-    expect(multiColumn.inOrderIds.length).toBe(150); // All ids should be included
-  });
-});
-
-describe("CollapsibleTree.fromWithPreviousShape", () => {
-  it("creates a new tree when no previous tree is provided", () => {
-    const ids = ["one", "two", "three"];
-    const tree = CollapsibleTree.fromWithPreviousShape(ids);
-
-    expect(tree.topLevelIds).toEqual(ids);
-    expect(tree.inOrderIds).toEqual(ids);
-    expect(tree.nodes.length).toBe(3);
-    expect(tree.nodes.every((node) => !node.isCollapsed)).toBe(true);
-  });
-
-  it("preserves the tree ID when previous tree is provided", () => {
-    const previousTree = CollapsibleTree.from(["one", "two", "three"]);
-    const tree = CollapsibleTree.fromWithPreviousShape(
-      ["one", "two"],
-      previousTree,
-    );
-
-    expect(tree.id).toBe(previousTree.id);
-  });
-
-  it("preserves collapsed state from previous tree", () => {
-    // Create a tree with collapsed nodes
-    let previousTree = CollapsibleTree.from(["one", "two", "three", "four"]);
-    previousTree = previousTree.collapse("one", "two");
-
-    // Create new tree with same ids
-    const tree = CollapsibleTree.fromWithPreviousShape(
-      ["one", "two", "three", "four"],
-      previousTree,
-    );
-
-    // Check that one is still collapsed
-    expect(tree.isCollapsed("one")).toBe(true);
-    expect(tree.topLevelIds).toEqual(["one", "three", "four"]);
-  });
-
-  it("handles subset of ids from previous tree", () => {
-    // Create a tree with collapsed nodes
-    let previousTree = CollapsibleTree.from([
-      "one",
-      "two",
-      "three",
-      "four",
-      "five",
-    ]);
-    previousTree = previousTree.collapse("one", "two");
-    previousTree = previousTree.collapse("three", "four");
-
-    // Create new tree with subset of ids
-    const tree = CollapsibleTree.fromWithPreviousShape(
-      ["one", "two", "three"],
-      previousTree,
-    );
-
-    // Check that collapsed state is preserved for existing nodes
-    expect(tree.isCollapsed("one")).toBe(true);
-    expect(tree.topLevelIds).toEqual(["one", "three"]);
-  });
-
-  it("handles different ordering of ids", () => {
-    // Create a tree with collapsed nodes
-    let previousTree = CollapsibleTree.from(["one", "two", "three", "four"]);
-    previousTree = previousTree.collapse("one", "two");
-
-    // Create new tree with different order
-    const tree = CollapsibleTree.fromWithPreviousShape(
-      ["three", "one", "two", "four"],
-      previousTree,
-    );
-
-    // Check that collapsed state is preserved
-    expect(tree.isCollapsed("one")).toBe(true);
-    expect(tree.topLevelIds).toEqual(["three", "one", "four"]);
-  });
-
-  it("handles new ids not in previous tree", () => {
-    // Create a tree with collapsed nodes
-    let previousTree = CollapsibleTree.from(["one", "two", "three"]);
-    previousTree = previousTree.collapse("one", "two");
-
-    // Create new tree with new ids
-    const tree = CollapsibleTree.fromWithPreviousShape(
-      ["one", "two", "three", "four", "five"],
-      previousTree,
-    );
-
-    // Check that collapsed state is preserved for existing nodes
-    expect(tree.isCollapsed("one")).toBe(true);
-    expect(tree.topLevelIds).toEqual(["one", "three", "four", "five"]);
-  });
-
-  it("handles completely different set of ids", () => {
-    // Create a tree with collapsed nodes
-    let previousTree = CollapsibleTree.from(["one", "two", "three"]);
-    previousTree = previousTree.collapse("one", "two");
-
-    // Create new tree with completely different ids
-    const tree = CollapsibleTree.fromWithPreviousShape(
-      ["four", "five", "six"],
-      previousTree,
-    );
-
-    // Should have no collapsed nodes
-    expect(tree.nodes.every((node) => !node.isCollapsed)).toBe(true);
-    expect(tree.topLevelIds).toEqual(["four", "five", "six"]);
-  });
-
-  it("preserves nested collapsed structure", () => {
-    // Create a tree with nested collapsed structure
-    let previousTree = CollapsibleTree.from([
-      "one",
-      "two",
-      "three",
-      "four",
-      "five",
-      "six",
-    ]);
-    previousTree = previousTree.collapse("one", "two");
-
-    // Collapse the node that contains the collapsed children
-    const oneNode = previousTree.nodes.find((n) => n.value === "one");
-    expect(oneNode).toBeDefined();
-    expect(oneNode?.children.length).toBeGreaterThan(0);
-
-    // Create a new tree with the same structure
-    const tree = CollapsibleTree.fromWithPreviousShape(
-      ["one", "two", "three", "four", "five", "six"],
-      previousTree,
-    );
-
-    // Check that collapsed state is preserved
-    expect(tree.isCollapsed("one")).toBe(true);
-    expect(tree.topLevelIds).toEqual(["one", "three", "four", "five", "six"]);
-  });
-
-  it("collapses using the last available child when some children are missing", () => {
-    // Create a tree with collapsed nodes
-    let previousTree = CollapsibleTree.from(["one", "two", "three", "four"]);
-    previousTree = previousTree.collapse("one", "three");
-
-    // Create new tree without "two" but with "three"
-    const tree = CollapsibleTree.fromWithPreviousShape(
-      ["one", "three", "four"],
-      previousTree,
-    );
-
-    // Should still collapse "one" with "three" as the child
-    expect(tree.isCollapsed("one")).toBe(true);
-    expect(tree.topLevelIds).toEqual(["one", "four"]);
-  });
-
-  it("preserves collapse state when children order changes", () => {
-    // Create a tree with collapsed nodes
-    let previousTree = CollapsibleTree.from(["one", "two", "three", "four"]);
-    previousTree = previousTree.collapse("one", "two");
-
-    // Create new tree with children in different order
-    const tree = CollapsibleTree.fromWithPreviousShape(
-      ["one", "three", "two", "four"],
-      previousTree,
-    );
-
-    // Should still be collapsed
-    expect(tree.isCollapsed("one")).toBe(true);
-    // But the topLevelIds will be different because the children order changed
-    expect(tree.topLevelIds).toEqual(["one", "four"]);
-  });
-
-  it("handles empty arrays correctly", () => {
-    const previousTree = CollapsibleTree.from(["one", "two", "three"]);
-    const tree = CollapsibleTree.fromWithPreviousShape([], previousTree);
-
-    expect(tree.nodes.length).toBe(0);
-    expect(tree.topLevelIds).toEqual([]);
-    expect(tree.inOrderIds).toEqual([]);
-  });
-
-  it("handles single item arrays correctly", () => {
-    let previousTree = CollapsibleTree.from(["one", "two", "three"]);
-    previousTree = previousTree.collapse("one", "two");
-
-    const tree = CollapsibleTree.fromWithPreviousShape(["one"], previousTree);
-
-    expect(tree.nodes.length).toBe(1);
-    expect(tree.topLevelIds).toEqual(["one"]);
-    expect(tree.inOrderIds).toEqual(["one"]);
-    // Should not be collapsed since there are no children
-    expect(tree.isCollapsed("one")).toBe(false);
-  });
-
-  it("handles multiple collapsed nodes in sequence", () => {
-    let previousTree = CollapsibleTree.from([
-      "one",
-      "two",
-      "three",
-      "four",
-      "five",
-      "six",
-    ]);
-    previousTree = previousTree.collapse("one", "two");
-    previousTree = previousTree.collapse("three", "four");
-    previousTree = previousTree.collapse("five", "six");
-
-    const tree = CollapsibleTree.fromWithPreviousShape(
-      ["one", "two", "three", "four", "five", "six"],
-      previousTree,
-    );
-
-    expect(tree.isCollapsed("one")).toBe(true);
-    expect(tree.isCollapsed("three")).toBe(true);
-    expect(tree.isCollapsed("five")).toBe(true);
-    expect(tree.topLevelIds).toEqual(["one", "three", "five"]);
-  });
-
-  it("handles case where collapsed node's children are not in new ids", () => {
-    let previousTree = CollapsibleTree.from(["one", "two", "three", "four"]);
-    previousTree = previousTree.collapse("one", "two");
-
-    // Create new tree without the collapsed child
-    const tree = CollapsibleTree.fromWithPreviousShape(
-      ["one", "three", "four"],
-      previousTree,
-    );
-
-    // Should not be collapsed since the child is missing
-    expect(tree.isCollapsed("one")).toBe(false);
-    expect(tree.topLevelIds).toEqual(["one", "three", "four"]);
-  });
-
-  it("reproduces GitHub issue #6188: inOrderIds with nested collapses", () => {
-    // Simplified reproduction case:
-    // Cell A (markdown): # Section 1 Header
-    // Cell B (markdown): ## Subsection 1.1 Header
-    // Cell C (python): print("This cell should be in Subsection 1.1")
-    // Cell D (python): print("This cell should also be in Subsection 1.1")
-    // Cell E (markdown): ## Subsection 1.2 Header
-    // Cell F (python): print("This cell should be in Subsection 1.2")
-
-    const originalOrder = [
-      "CellA", // # Section 1 Header
-      "CellB", // ## Subsection 1.1 Header
-      "CellC", // print("This cell should be in Subsection 1.1")
-      "CellD", // print("This cell should also be in Subsection 1.1")
-      "CellE", // ## Subsection 1.2 Header
-      "CellF", // print("This cell should be in Subsection 1.2")
-    ];
-
-    // Create notebook with one column
-    let notebook = MultiColumn.from([originalOrder]);
-
-    // Before collapsing, order should be correct
-    expect(notebook.inOrderIds).toEqual(originalOrder);
-
-    const columnId = notebook.getColumnIds()[0];
-
-    // Follow the exact reproduction steps from the GitHub issue:
-    // 1. Collapse B (subsection 1.1) - includes C, D (stops before E)
-    notebook = notebook.transform(columnId, (tree) =>
-      tree.collapse("CellB", "CellD"),
-    );
-
-    // 2. Collapse E (subsection 1.2) - includes F (to end)
-    notebook = notebook.transform(columnId, (tree) =>
-      tree.collapse("CellE", undefined),
-    );
-
-    // 3. Collapse A (section 1) - includes all the rest (B, E and their children)
-    notebook = notebook.transform(columnId, (tree) =>
-      tree.collapse("CellA", undefined),
-    );
-
-    const finalOrder = notebook.inOrderIds;
-
-    // inOrderIds now correctly preserves logical order even with nested collapses
-    expect(finalOrder).toEqual(originalOrder);
-  });
-});