@marimo-team/islands 0.19.8-dev37 → 0.19.8-dev38

package/dist/main.js

@@ -12022,8 +12022,7 @@ ${d.join("\n")}`;
       let c = [
         ...this.nodes
       ], d = c[r];
-      if (!d.isCollapsed) throw Error(`Node ${e2} is already expanded`);
-      return c[r] = new TreeNode(d.value, false, []), c = arrayInsertMany(c, r + 1, d.children), this.withNodes(c);
+      return d.isCollapsed ? (c[r] = new TreeNode(d.value, false, []), c = arrayInsertMany(c, r + 1, d.children), this.withNodes(c)) : this;
     }
     expandAll() {
       let e2 = [
@@ -12071,12 +12070,8 @@ ${d.join("\n")}`;
       return this.insert(e2, 0);
     }
     deleteAtIndex(e2) {
-      let r = this.atOrThrow(e2), c = this.withNodes(this.nodes);
-      try {
-        c = c.expand(r);
-      } catch {
-      }
-      return this.withNodes(arrayDelete(c.nodes, e2));
+      let r = this.atOrThrow(e2), c = this.expand(r);
+      return c.withNodes(arrayDelete(c.nodes, e2));
     }
     delete(e2) {
       let r = this.indexOfOrThrow(e2);
@@ -12088,13 +12083,7 @@ ${d.join("\n")}`;
     }
     findAndExpandDeep(e2) {
       let r = this.find(e2);
-      if (r.length === 0) return this;
-      let c = this.withNodes(this.nodes);
-      for (let e3 of r) try {
-        c = c.expand(e3);
-      } catch {
-      }
-      return c;
+      return r.length === 0 ? this : r.reduce((e3, r2) => e3.expand(r2), this);
     }
     find(e2) {
       function r(c, d) {
@@ -73203,7 +73192,7 @@ Image URL: ${r.imageUrl}`)), contextToXml({
       return Logger.warn("Failed to get version from mount config"), null;
     }
   }
-  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.19.8-dev37"), showCodeInRunModeAtom = atom(true);
+  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.19.8-dev38"), showCodeInRunModeAtom = atom(true);
   atom(null);
   var import_compiler_runtime$88 = require_compiler_runtime();
   function useKeydownOnElement(e, r) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marimo-team/islands",
-  "version": "0.19.8-dev37",
+  "version": "0.19.8-dev38",
   "main": "dist/main.js",
   "types": "dist/index.d.ts",
   "type": "module",

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

@@ -214,16 +214,19 @@ describe("CollapsibleTree", () => {
     `);
   });
 
-  it("fails to expand", () => {
+  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]",
     );
-    expect(() => {
-      tree.expand("one");
-      tree.expand("one");
-    }).toThrowErrorMatchingInlineSnapshot(
-      "[Error: Node one is already expanded]",
-    );
+  });
+
+  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", () => {
@@ -378,6 +381,18 @@ describe("CollapsibleTree", () => {
     `);
   });
 
+  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)
+    const result = tree.deleteAtIndex(1);
+    expect(result.toString()).toMatchInlineSnapshot(`
+      "one
+      three
+      four
+      "
+    `);
+  });
+
   it("fails to delete nodes", () => {
     expect(() => tree.deleteAtIndex(5)).toThrowErrorMatchingInlineSnapshot(
       "[Error: Node at index 5 not found in tree]",

package/src/utils/id-tree.tsx

@@ -360,7 +360,8 @@ export class CollapsibleTree<T> {
   }
 
   /**
-   * Expand a node and all of its children
+   * Expand a node and all of its children.
+   * If the node is already expanded, returns the same tree (no-op).
    */
   expand(id: T): CollapsibleTree<T> {
     const nodeIndex = this.nodes.findIndex((n) => n.value === id);
@@ -373,7 +374,8 @@ export class CollapsibleTree<T> {
     let nodes = [...this.nodes];
     const node = nodes[nodeIndex];
     if (!node.isCollapsed) {
-      throw new Error(`Node ${id} is already expanded`);
+      // Already expanded, no-op
+      return this;
     }
 
     nodes[nodeIndex] = new TreeNode(node.value, false, []);
@@ -495,13 +497,9 @@ export class CollapsibleTree<T> {
    */
   deleteAtIndex(idx: number): CollapsibleTree<T> {
     const id = this.atOrThrow(idx);
-    let tree = this.withNodes(this.nodes);
-    try {
-      tree = tree.expand(id);
-    } catch {
-      // Don't care if its not expanded
-    }
-    return this.withNodes(arrayDelete(tree.nodes, idx));
+    // Expand the node first (if collapsed) to bring children back to top level
+    const tree = this.expand(id);
+    return tree.withNodes(arrayDelete(tree.nodes, idx));
   }
 
   delete(id: T): CollapsibleTree<T> {
@@ -524,16 +522,10 @@ export class CollapsibleTree<T> {
     if (found.length === 0) {
       return this;
     }
-    let result = this.withNodes(this.nodes);
-    for (const node of found) {
-      try {
-        result = result.expand(node);
-      } catch {
-        // Don't care if its the last node and its not expanded
-      }
-    }
-
-    return result;
+    return found.reduce<CollapsibleTree<T>>(
+      (acc, node) => acc.expand(node),
+      this,
+    );
   }
 
   /**