@marimo-team/islands 0.23.7-dev3 → 0.23.7-dev31

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

@@ -957,6 +957,77 @@ 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"]);

package/src/utils/__tests__/semaphore.test.ts

@@ -0,0 +1,218 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+import { describe, expect, it } from "vitest";
+import { Deferred } from "../Deferred";
+import { mapWithConcurrency, Semaphore } from "../semaphore";
+
+describe("Semaphore", () => {
+  it("rejects invalid permit counts", () => {
+    expect(() => new Semaphore(0)).toThrow();
+    expect(() => new Semaphore(-1)).toThrow();
+    expect(() => new Semaphore(1.5)).toThrow();
+  });
+
+  it("resolves run() with the function's value", async () => {
+    const sem = new Semaphore(1);
+    await expect(sem.run(async () => 42)).resolves.toBe(42);
+    expect(sem.available).toBe(1);
+    expect(sem.pending).toBe(0);
+  });
+
+  it("releases the permit when run() rejects", async () => {
+    const sem = new Semaphore(1);
+    await expect(
+      sem.run(async () => {
+        throw new Error("boom");
+      }),
+    ).rejects.toThrow("boom");
+    expect(sem.available).toBe(1);
+  });
+
+  it("caps concurrent in-flight tasks at `permits`", async () => {
+    const sem = new Semaphore(3);
+    let inFlight = 0;
+    let maxInFlight = 0;
+    const gates = Array.from({ length: 10 }, () => new Deferred<void>());
+
+    const tasks = gates.map((gate) =>
+      sem.run(async () => {
+        inFlight++;
+        maxInFlight = Math.max(maxInFlight, inFlight);
+        await gate.promise;
+        inFlight--;
+      }),
+    );
+
+    // Let microtasks run so the first batch is scheduled.
+    await Promise.resolve();
+    await Promise.resolve();
+
+    expect(maxInFlight).toBe(3);
+    expect(sem.available).toBe(0);
+    expect(sem.pending).toBe(7);
+
+    // Release them all and confirm everyone finishes.
+    for (const gate of gates) {
+      gate.resolve();
+    }
+    await Promise.all(tasks);
+    expect(maxInFlight).toBe(3);
+    expect(sem.available).toBe(3);
+    expect(sem.pending).toBe(0);
+  });
+
+  it("releases waiters in FIFO order", async () => {
+    const sem = new Semaphore(1);
+    const order: number[] = [];
+    const hold = new Deferred<void>();
+
+    // First holder takes the only permit and parks on `hold`.
+    const first = sem.run(async () => {
+      order.push(0);
+      await hold.promise;
+    });
+
+    // Queue three more in known order.
+    const rest = [1, 2, 3].map((i) =>
+      sem.run(async () => {
+        order.push(i);
+      }),
+    );
+
+    await Promise.resolve();
+    expect(order).toEqual([0]);
+    expect(sem.pending).toBe(3);
+
+    hold.resolve();
+    await Promise.all([first, ...rest]);
+    expect(order).toEqual([0, 1, 2, 3]);
+  });
+
+  it("throws on release() beyond initial permit count", () => {
+    const sem = new Semaphore(2);
+    expect(() => sem.release()).toThrow(/more times than acquire/);
+  });
+
+  it("supports manual acquire/release", async () => {
+    const sem = new Semaphore(2);
+    await sem.acquire();
+    await sem.acquire();
+    expect(sem.available).toBe(0);
+
+    let resolved = false;
+    const waiter = sem.acquire().then(() => {
+      resolved = true;
+    });
+    await Promise.resolve();
+    expect(resolved).toBe(false);
+
+    sem.release();
+    await waiter;
+    expect(resolved).toBe(true);
+
+    sem.release();
+    sem.release();
+    expect(sem.available).toBe(2);
+  });
+});
+
+describe("mapWithConcurrency", () => {
+  it("returns [] for empty input without invoking fn", async () => {
+    let called = 0;
+    const result = await mapWithConcurrency([], 5, async () => {
+      called++;
+      return 1;
+    });
+    expect(result).toEqual([]);
+    expect(called).toBe(0);
+  });
+
+  it("preserves input order in the result", async () => {
+    const input = [10, 20, 30, 40, 50];
+    const result = await mapWithConcurrency(input, 2, async (n) => {
+      // Reverse the natural completion order so we'd notice if order broke.
+      await new Promise((r) => setTimeout(r, input.length - input.indexOf(n)));
+      return n * 2;
+    });
+    expect(result).toEqual([20, 40, 60, 80, 100]);
+  });
+
+  it("respects the concurrency cap", async () => {
+    let inFlight = 0;
+    let maxInFlight = 0;
+    const items = Array.from({ length: 20 }, (_, i) => i);
+    const gates = items.map(() => new Deferred<void>());
+
+    const result = mapWithConcurrency(items, 4, async (i) => {
+      inFlight++;
+      maxInFlight = Math.max(maxInFlight, inFlight);
+      await gates[i].promise;
+      inFlight--;
+      return i;
+    });
+
+    // Flush microtasks so the first batch enters fn().
+    await Promise.resolve();
+    await Promise.resolve();
+    expect(maxInFlight).toBe(4);
+
+    // Releasing one gate should let exactly one queued task enter fn().
+    for (const gate of gates) {
+      gate.resolve();
+    }
+    await result;
+    expect(maxInFlight).toBe(4);
+  });
+
+  it("lets in-flight tasks complete after the first rejection", async () => {
+    const completed: number[] = [];
+    const gates = [0, 1, 2, 3, 4].map(() => new Deferred<void>());
+
+    const result = mapWithConcurrency([0, 1, 2, 3, 4], 5, async (i) => {
+      await gates[i].promise;
+      if (i === 0) {
+        throw new Error("first failed");
+      }
+      completed.push(i);
+      return i;
+    });
+
+    // Reject the first one; the other 4 are still gated.
+    gates[0].resolve();
+    // Drain the rejection (catch so it doesn't escape the test).
+    await expect(result).rejects.toThrow("first failed");
+
+    // The other tasks were already in-flight when the rejection happened;
+    // they should still resolve when their gates open.
+    for (let i = 1; i < gates.length; i++) {
+      gates[i].resolve();
+    }
+    // Yield so the remaining sem.run() finallys run.
+    await new Promise((r) => setTimeout(r, 0));
+    expect(completed.toSorted()).toEqual([1, 2, 3, 4]);
+  });
+
+  it("rejects on the first error", async () => {
+    await expect(
+      mapWithConcurrency([1, 2, 3], 2, async (n) => {
+        if (n === 2) {
+          throw new Error("nope");
+        }
+        return n;
+      }),
+    ).rejects.toThrow("nope");
+  });
+
+  it("throws on invalid concurrency, even for empty input", () => {
+    expect(() => mapWithConcurrency([1, 2, 3], 0, async (n) => n)).toThrow();
+    expect(() => mapWithConcurrency([], 0, async (n: number) => n)).toThrow();
+  });
+
+  it("passes the index to fn", async () => {
+    const result = await mapWithConcurrency(
+      ["a", "b", "c"],
+      2,
+      async (item, index) => `${index}:${item}`,
+    );
+    expect(result).toEqual(["0:a", "1:b", "2:c"]);
+  });
+});

package/src/utils/fileToBase64.ts

@@ -1,5 +1,9 @@
 /* Copyright 2026 Marimo. All rights reserved. */
 
+import { mapWithConcurrency } from "./semaphore";
+
+const FILE_READ_CONCURRENCY = 5;
+
 /**
  * Converts a Blob or File to either a base64-encoded string or a data URL.
  *
@@ -35,11 +39,8 @@ export function blobToString(
  * Returns a promised array of tuples [file name, file contents].
  */
 export function filesToBase64(files: File[]): Promise<[string, string][]> {
-  return Promise.all(
-    files.map((file) =>
-      blobToString(file, "base64").then(
-        (contents) => [file.name, contents] as [string, string],
-      ),
-    ),
-  );
+  return mapWithConcurrency(files, FILE_READ_CONCURRENCY, async (file) => {
+    const contents = await blobToString(file, "base64");
+    return [file.name, contents] as [string, string];
+  });
 }

package/src/utils/id-tree.tsx

@@ -861,6 +861,67 @@ export class MultiColumn<T> {
     return new MultiColumn(newColumns);
   }
 
+  /**
+   * Move multiple cells to be immediately before (or after) a target cell.
+   * Cells are inserted in their original order.
+   *
+   * @throws Error if any cellId is not found in any column.
+   * If targetId is among the moved cells, cells are inserted at the end of the target column.
+   */
+  moveCellsRelativeTo(
+    cellIds: T[],
+    targetId: T,
+    position: "before" | "after",
+  ): MultiColumn<T> {
+    if (cellIds.length === 0) {
+      return this;
+    }
+
+    const cellIdSet = new Set(cellIds);
+    const targetColumn = this.findWithId(targetId);
+    const targetColIndex = this.indexOfOrThrow(targetColumn.id);
+
+    // Collect nodes to move
+    const nodesToMove: TreeNode<T>[] = [];
+    for (const id of cellIds) {
+      const col = this.findWithId(id);
+      const node = col.nodes.find((n) => n.value === id);
+      if (!node) {
+        throw new Error(`Node ${id} not found in column ${col.id}`);
+      }
+      nodesToMove.push(node);
+    }
+
+    // Remove moved cells from all columns
+    const columnsWithRemovals = this.columns.map((col) =>
+      col.withNodes(col.nodes.filter((n) => !cellIdSet.has(n.value))),
+    );
+
+    // Find target index in the cleaned column
+    const cleanedTargetCol = columnsWithRemovals[targetColIndex];
+    let insertIndex = cleanedTargetCol.nodes.findIndex(
+      (n) => n.value === targetId,
+    );
+
+    // If target was one of the moved cells, insert at end
+    if (insertIndex === -1) {
+      insertIndex = cleanedTargetCol.nodes.length;
+    } else if (position === "after") {
+      insertIndex += 1;
+    }
+
+    // Insert all moved nodes at target position
+    const newTargetNodes = arrayInsertMany(
+      cleanedTargetCol.nodes,
+      insertIndex,
+      nodesToMove,
+    );
+    columnsWithRemovals[targetColIndex] =
+      cleanedTargetCol.withNodes(newTargetNodes);
+
+    return new MultiColumn(columnsWithRemovals);
+  }
+
   indexOfOrThrow(id: CellColumnId): number {
     const index = this.columns.findIndex((c) => c.id === id);
     if (index === -1) {
@@ -963,6 +1024,34 @@ export class MultiColumn<T> {
     return this.transformWithCellId(cellId, (c) => c.delete(cellId));
   }
 
+  /**
+   * Remove the given cells from the tree, then re-insert each at its
+   * (columnId, index). Used to undo a move (e.g. cut-paste) by restoring
+   * cells to their previous positions. Placements are sorted by
+   * (columnId, index) so insert order keeps indices valid.
+   */
+  placeCells(
+    placements: Array<{ id: T; columnId: CellColumnId; index: CellIndex }>,
+  ): MultiColumn<T> {
+    if (placements.length === 0) {
+      return this;
+    }
+    let result = this.deleteById(placements[0].id);
+    for (const { id } of placements.slice(1)) {
+      result = result.deleteById(id);
+    }
+    const sorted = [...placements].toSorted((a, b) => {
+      if (a.columnId !== b.columnId) {
+        return a.columnId.localeCompare(b.columnId);
+      }
+      return (a.index as number) - (b.index as number);
+    });
+    for (const { id, columnId, index } of sorted) {
+      result = result.insertId(id, columnId, index);
+    }
+    return result;
+  }
+
   compact(): MultiColumn<T> {
     // Don't compact if there's only one column
     if (this.columns.length === 1) {

package/src/utils/semaphore.ts

@@ -0,0 +1,88 @@
+/* Copyright 2026 Marimo. All rights reserved. */
+
+/**
+ * Counting semaphore that gates async work to at most `permits` in-flight
+ * tasks. Waiters are released in FIFO order.
+ */
+export class Semaphore {
+  private readonly maxPermits: number;
+  private permits: number;
+  private waiters: Array<() => void> = [];
+
+  constructor(permits: number) {
+    if (!Number.isInteger(permits) || permits < 1) {
+      throw new Error(
+        `Semaphore permits must be a positive integer, got ${permits}`,
+      );
+    }
+    this.maxPermits = permits;
+    this.permits = permits;
+  }
+
+  /** Permits currently available. */
+  get available(): number {
+    return this.permits;
+  }
+
+  /** Number of waiters queued for a permit. */
+  get pending(): number {
+    return this.waiters.length;
+  }
+
+  acquire(): Promise<void> {
+    if (this.permits > 0) {
+      this.permits--;
+      return Promise.resolve();
+    }
+    return new Promise<void>((resolve) => {
+      this.waiters.push(resolve);
+    });
+  }
+
+  release(): void {
+    const next = this.waiters.shift();
+    if (next) {
+      next();
+      return;
+    }
+    if (this.permits >= this.maxPermits) {
+      throw new Error(
+        "Semaphore.release() called more times than acquire() — refusing to exceed initial permit count",
+      );
+    }
+    this.permits++;
+  }
+
+  /** Acquire a permit, run `fn`, then release the permit. */
+  async run<T>(fn: () => Promise<T>): Promise<T> {
+    await this.acquire();
+    try {
+      return await fn();
+    } finally {
+      this.release();
+    }
+  }
+}
+
+/**
+ * Map over `items` with bounded parallelism. Preserves input order in the
+ * result. Rejects as soon as the first task rejects (like `Promise.all`);
+ * already-started tasks keep running to completion in the background but
+ * their results are dropped.
+ */
+// oxlint-disable-next-line marimo/prefer-object-params -- map-style helper, mirrors Array.prototype.map
+export function mapWithConcurrency<T, R>(
+  items: readonly T[],
+  concurrency: number,
+  fn: (item: T, index: number) => Promise<R>,
+): Promise<R[]> {
+  // Validate concurrency before the empty-input fast path so misconfiguration
+  // is never silently accepted.
+  const sem = new Semaphore(concurrency);
+  if (items.length === 0) {
+    return Promise.resolve([]);
+  }
+  return Promise.all(
+    items.map((item, index) => sem.run(() => fn(item, index))),
+  );
+}

package/dist/apl-BKoVld9y.js

@@ -1,4 +0,0 @@
-import { t as apl } from "./apl-Dt8GMXYg.js";
-export {
-  apl
-};

package/dist/asciiarmor-DQrKIjoo.js

@@ -1,4 +0,0 @@
-import { t as asciiArmor } from "./asciiarmor-CitDQ85h.js";
-export {
-  asciiArmor
-};

package/dist/asn1-BZvnj0dq.js

@@ -1,4 +0,0 @@
-import { t as asn1 } from "./asn1-abrf9SMK.js";
-export {
-  asn1
-};

package/dist/assets/__vite-browser-external-rrUYDKRl.js

@@ -1 +0,0 @@
-import{t as e}from"./worker-Bfy15ViQ.js";var t=e(((e,t)=>{t.exports={}}));export default t();