@marimo-team/islands 0.23.2-dev40 → 0.23.2-dev42

package/dist/main.js

@@ -69021,7 +69021,7 @@ ${c}
       return Logger.warn("Failed to get version from mount config"), null;
     }
   }
-  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.23.2-dev40"), showCodeInRunModeAtom = atom(true);
+  const marimoVersionAtom = atom(getVersionFromMountConfig() || "0.23.2-dev42"), showCodeInRunModeAtom = atom(true);
   atom(null);
   var VIRTUAL_FILE_REGEX = /\/@file\/([^\s"&'/]+)\.([\dA-Za-z]+)/g, VirtualFileTracker = class e {
     constructor() {
@@ -70412,6 +70412,7 @@ ${r}
       __publicField(this, "sendPdb", throwNotImplemented);
       __publicField(this, "sendCreateFileOrFolder", throwNotImplemented);
       __publicField(this, "sendDeleteFileOrFolder", throwNotImplemented);
+      __publicField(this, "sendCopyFileOrFolder", throwNotImplemented);
       __publicField(this, "sendRenameFileOrFolder", throwNotImplemented);
       __publicField(this, "sendUpdateFile", throwNotImplemented);
       __publicField(this, "sendFileDetails", throwNotImplemented);

package/package.json

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

package/src/__mocks__/requests.ts

@@ -51,6 +51,7 @@ export const MockRequestClient = {
         .mockResolvedValue({ files: [], query: "", total_found: 0 }),
       sendCreateFileOrFolder: vi.fn().mockResolvedValue({}),
       sendDeleteFileOrFolder: vi.fn().mockResolvedValue({}),
+      sendCopyFileOrFolder: vi.fn().mockResolvedValue({}),
       sendRenameFileOrFolder: vi.fn().mockResolvedValue({}),
       sendUpdateFile: vi.fn().mockResolvedValue({}),
       sendFileDetails: vi.fn().mockResolvedValue({}),

package/src/components/editor/file-tree/__tests__/requesting-tree.test.ts

@@ -8,6 +8,7 @@ import { RequestingTree } from "../requesting-tree";
 const sendListFiles = vi.fn();
 const sendCreateFileOrFolder = vi.fn();
 const sendDeleteFileOrFolder = vi.fn();
+const sendCopyFileOrFolder = vi.fn();
 const sendRenameFileOrFolder = vi.fn();
 
 vi.mock("@/components/ui/use-toast", () => MockModules.toast());
@@ -21,6 +22,7 @@ describe("RequestingTree", () => {
       listFiles: sendListFiles,
       createFileOrFolder: sendCreateFileOrFolder,
       deleteFileOrFolder: sendDeleteFileOrFolder,
+      copyFileOrFolder: sendCopyFileOrFolder,
       renameFileOrFolder: sendRenameFileOrFolder,
     });
     sendListFiles.mockResolvedValue({
@@ -169,6 +171,17 @@ describe("RequestingTree", () => {
     `);
   });
 
+  test("copy should duplicate a file", async () => {
+    sendCopyFileOrFolder.mockResolvedValue({ success: true });
+
+    await requestingTree.copy("1.1", "file1_copy");
+    expect(sendCopyFileOrFolder).toHaveBeenCalledWith({
+      path: "/root/file1",
+      newPath: "/root/file1_copy",
+    });
+    expect(mockOnChange).toHaveBeenCalled();
+  });
+
   test("createFile should create a new file", async () => {
     sendCreateFileOrFolder.mockResolvedValue({ success: true });
 
@@ -236,6 +249,7 @@ describe("RequestingTree", () => {
         listFiles: sendListFiles,
         createFileOrFolder: sendCreateFileOrFolder,
         deleteFileOrFolder: sendDeleteFileOrFolder,
+        copyFileOrFolder: sendCopyFileOrFolder,
         renameFileOrFolder: sendRenameFileOrFolder,
       });
       sendListFiles.mockRejectedValue(new Error("Network error"));
@@ -263,6 +277,23 @@ describe("RequestingTree", () => {
       });
     });
 
+    test("copy should handle API failure", async () => {
+      sendCopyFileOrFolder.mockResolvedValue({
+        success: false,
+        message: "Error duplicating",
+      });
+
+      await requestingTree.copy("1.1", "file1_copy");
+      expect(sendCopyFileOrFolder).toHaveBeenCalledWith({
+        path: "/root/file1",
+        newPath: "/root/file1_copy",
+      });
+      expect(toast).toHaveBeenCalledWith({
+        title: "Failed",
+        description: "Error duplicating",
+      });
+    });
+
     test("move should handle missing parent node gracefully", async () => {
       await requestingTree.move(["1.x"], "2");
       expect(sendRenameFileOrFolder).not.toHaveBeenCalled();
@@ -284,6 +315,7 @@ describe("RequestingTree", () => {
         listFiles: sendListFiles,
         createFileOrFolder: sendCreateFileOrFolder,
         deleteFileOrFolder: sendDeleteFileOrFolder,
+        copyFileOrFolder: sendCopyFileOrFolder,
         renameFileOrFolder: sendRenameFileOrFolder,
       });
 
@@ -305,6 +337,7 @@ describe("RequestingTree", () => {
         listFiles: sendListFiles,
         createFileOrFolder: sendCreateFileOrFolder,
         deleteFileOrFolder: sendDeleteFileOrFolder,
+        copyFileOrFolder: sendCopyFileOrFolder,
         renameFileOrFolder: sendRenameFileOrFolder,
       });
 

package/src/components/editor/file-tree/file-explorer.tsx

@@ -419,8 +419,7 @@ const Edit = ({ node }: { node: NodeApi<FileInfo> }) => {
 };
 
 const Node = ({ node, style, dragHandle }: NodeRendererProps<FileInfo>) => {
-  const { openFile, sendCreateFileOrFolder, sendFileDetails } =
-    useRequestClient();
+  const { openFile, sendFileDetails } = useRequestClient();
   const disableFileDownloads = useAtomValue(disableFileDownloadsAtom);
 
   const fileType: FileIconType = node.data.isDirectory
@@ -502,37 +501,14 @@ const Node = ({ node, style, dragHandle }: NodeRendererProps<FileInfo>) => {
   });
 
   const handleDuplicate = useEvent(async () => {
-    if (!tree || node.data.isDirectory) {
+    if (!tree) {
       return;
     }
 
     const [name, extension] = fileSplit(node.data.name);
     const duplicateName = `${name}_copy${extension}`;
 
-    try {
-      // First get the file contents
-      const details = await sendFileDetails({ path: node.data.path });
-
-      // Get the parent directory path
-      const parentPath = node.parent?.data.path || "";
-
-      // Create the duplicate file by creating a new file with the same contents
-      await sendCreateFileOrFolder({
-        path: parentPath,
-        type: "file",
-        name: duplicateName,
-        contents: details.contents ? btoa(details.contents) : undefined,
-      });
-
-      // Refresh the parent folder to show the new file
-      await tree.refreshAll([parentPath]);
-    } catch {
-      toast({
-        title: "Failed to duplicate file",
-        description: "Unable to create a duplicate of the file",
-        variant: "danger",
-      });
-    }
+    await tree.copy(node.id, duplicateName);
   });
 
   const renderActions = () => {
@@ -581,12 +557,10 @@ const Node = ({ node, style, dragHandle }: NodeRendererProps<FileInfo>) => {
           <Edit3Icon className={ic} />
           Rename
         </DropdownMenuItem>
-        {!node.data.isDirectory && (
-          <DropdownMenuItem onSelect={handleDuplicate}>
-            <CopyIcon className={ic} />
-            Duplicate
-          </DropdownMenuItem>
-        )}
+        <DropdownMenuItem onSelect={handleDuplicate}>
+          <CopyIcon className={ic} />
+          Duplicate
+        </DropdownMenuItem>
         <DropdownMenuItem
           onSelect={async () => {
             await copyToClipboard(node.data.path);

package/src/components/editor/file-tree/requesting-tree.tsx

@@ -17,6 +17,7 @@ export class RequestingTree {
     listFiles: EditRequests["sendListFiles"];
     createFileOrFolder: EditRequests["sendCreateFileOrFolder"];
     deleteFileOrFolder: EditRequests["sendDeleteFileOrFolder"];
+    copyFileOrFolder: EditRequests["sendCopyFileOrFolder"];
     renameFileOrFolder: EditRequests["sendRenameFileOrFolder"];
   };
 
@@ -24,6 +25,7 @@ export class RequestingTree {
     listFiles: EditRequests["sendListFiles"];
     createFileOrFolder: EditRequests["sendCreateFileOrFolder"];
     deleteFileOrFolder: EditRequests["sendDeleteFileOrFolder"];
+    copyFileOrFolder: EditRequests["sendCopyFileOrFolder"];
     renameFileOrFolder: EditRequests["sendRenameFileOrFolder"];
   }) {
     this.callbacks = callbacks;
@@ -74,9 +76,44 @@ export class RequestingTree {
     return true;
   }
 
+  async copy(id: string, newName: string): Promise<void> {
+    const node = this.delegate.find(id);
+    if (!node) {
+      toast({
+        title: "Failed",
+        description: `Node with id ${id} not found in the tree`,
+      });
+      return;
+    }
+    const currentPath = node.data.path as FilePath;
+    const parentPath = this.path.dirname(currentPath);
+    const newPath = this.path.join(parentPath, newName);
+    const newFile = await this.callbacks
+      .copyFileOrFolder({
+        path: currentPath,
+        newPath: newPath,
+      })
+      .then(this.handleResponse);
+    if (!newFile?.info) {
+      return;
+    }
+    this.delegate.create({
+      parentId: node.parent?.id ?? null,
+      index: 0,
+      data: newFile.info,
+    });
+    this.onChange(this.delegate.data);
+    // Refresh the parent folder
+    await this.refreshAll([parentPath]);
+  }
+
   async rename(id: string, name: string): Promise<void> {
     const node = this.delegate.find(id);
     if (!node) {
+      toast({
+        title: "Failed",
+        description: `Node with id ${id} not found in the tree`,
+      });
       return;
     }
     const currentPath = node.data.path as FilePath;
@@ -172,6 +209,10 @@ export class RequestingTree {
   async delete(id: string): Promise<void> {
     const node = this.delegate.find(id);
     if (!node) {
+      toast({
+        title: "Failed",
+        description: `Node with id ${id} not found in the tree`,
+      });
       return;
     }
 

package/src/components/editor/file-tree/state.tsx

@@ -15,6 +15,7 @@ export const treeAtom = atom<RequestingTree>((get) => {
     listFiles: client.sendListFiles,
     createFileOrFolder: client.sendCreateFileOrFolder,
     deleteFileOrFolder: client.sendDeleteFileOrFolder,
+    copyFileOrFolder: client.sendCopyFileOrFolder,
     renameFileOrFolder: client.sendRenameFileOrFolder,
   });
 });

package/src/core/islands/bridge.ts

@@ -237,6 +237,7 @@ export class IslandsPyodideBridge implements RunRequests, EditRequests {
   sendPdb = throwNotImplemented;
   sendCreateFileOrFolder = throwNotImplemented;
   sendDeleteFileOrFolder = throwNotImplemented;
+  sendCopyFileOrFolder = throwNotImplemented;
   sendRenameFileOrFolder = throwNotImplemented;
   sendUpdateFile = throwNotImplemented;
   sendFileDetails = throwNotImplemented;

package/src/core/network/requests-lazy.ts

@@ -90,6 +90,7 @@ const ACTIONS: Record<keyof AllRequests, Action> = {
   sendSearchFiles: "startConnection",
   sendCreateFileOrFolder: "throwError",
   sendDeleteFileOrFolder: "throwError",
+  sendCopyFileOrFolder: "throwError",
   sendRenameFileOrFolder: "throwError",
   sendUpdateFile: "throwError",
   sendFileDetails: "throwError",

package/src/core/network/requests-network.ts

@@ -312,6 +312,14 @@ export function createNetworkRequests(): EditRequests & RunRequests {
         })
         .then(handleResponse);
     },
+    sendCopyFileOrFolder: async (request) => {
+      await waitForConnectionOpen();
+      return getClient()
+        .POST("/api/files/copy", {
+          body: request,
+        })
+        .then(handleResponse);
+    },
     sendRenameFileOrFolder: async (request) => {
       await waitForConnectionOpen();
       return getClient()

package/src/core/network/requests-static.ts

@@ -66,6 +66,7 @@ export function createStaticRequests(): EditRequests & RunRequests {
     sendPdb: throwNotInEditMode,
     sendCreateFileOrFolder: throwNotInEditMode,
     sendDeleteFileOrFolder: throwNotInEditMode,
+    sendCopyFileOrFolder: throwNotInEditMode,
     sendRenameFileOrFolder: throwNotInEditMode,
     sendUpdateFile: throwNotInEditMode,
     sendFileDetails: throwNotInEditMode,

package/src/core/network/requests-toasting.tsx

@@ -51,6 +51,7 @@ export function createErrorToastingRequests(
     sendPdb: "Failed to start debug session",
     sendCreateFileOrFolder: "Failed to create file or folder",
     sendDeleteFileOrFolder: "Failed to delete file or folder",
+    sendCopyFileOrFolder: "Failed to duplicate file or folder",
     sendRenameFileOrFolder: "Failed to rename file or folder",
     sendUpdateFile: "Failed to update file",
     sendFileDetails: "Failed to get file details",

package/src/core/network/types.ts

@@ -23,6 +23,8 @@ export type ExportAsIPYNBRequest = schemas["ExportAsIPYNBRequest"];
 export type ExportAsScriptRequest = schemas["ExportAsScriptRequest"];
 export type ExportAsPDFRequest = schemas["ExportAsPDFRequest"];
 export type UpdateCellOutputsRequest = schemas["UpdateCellOutputsRequest"];
+export type FileCopyRequest = schemas["FileCopyRequest"];
+export type FileCopyResponse = schemas["FileCopyResponse"];
 export type FileCreateRequest = schemas["FileCreateRequest"];
 export type FileCreateResponse = schemas["FileCreateResponse"];
 export type FileDeleteRequest = schemas["FileDeleteRequest"];
@@ -168,6 +170,7 @@ export interface EditRequests {
   sendDeleteFileOrFolder: (
     request: FileDeleteRequest,
   ) => Promise<FileDeleteResponse>;
+  sendCopyFileOrFolder: (request: FileCopyRequest) => Promise<FileCopyResponse>;
   sendRenameFileOrFolder: (
     request: FileMoveRequest,
   ) => Promise<FileMoveResponse>;

package/src/core/wasm/bridge.ts

@@ -17,6 +17,7 @@ import type {
   EditRequests,
   ExportAsHTMLRequest,
   ExportAsMarkdownRequest,
+  FileCopyResponse,
   FileCreateResponse,
   FileDeleteResponse,
   FileDetailsResponse,
@@ -443,6 +444,16 @@ export class PyodideBridge implements RunRequests, EditRequests {
     return response as FileDeleteResponse;
   };
 
+  sendCopyFileOrFolder: EditRequests["sendCopyFileOrFolder"] = async (
+    request,
+  ) => {
+    const response = await this.rpc.proxy.request.bridge({
+      functionName: "copy_file_or_directory",
+      payload: request,
+    });
+    return response as FileCopyResponse;
+  };
+
   sendRenameFileOrFolder: EditRequests["sendRenameFileOrFolder"] = async (
     request,
   ) => {

package/src/core/wasm/worker/types.ts

@@ -11,6 +11,8 @@ import type {
   CopyNotebookRequest,
   ExportAsHTMLRequest,
   ExportAsMarkdownRequest,
+  FileCopyRequest,
+  FileCopyResponse,
   FileCreateRequest,
   FileCreateResponse,
   FileDeleteRequest,
@@ -86,6 +88,7 @@ export interface RawBridge {
   delete_file_or_directory(
     request: FileDeleteRequest,
   ): Promise<FileDeleteResponse>;
+  copy_file_or_directory(request: FileCopyRequest): Promise<FileCopyResponse>;
   move_file_or_directory(request: FileMoveRequest): Promise<FileMoveResponse>;
   update_file(request: FileUpdateRequest): Promise<FileUpdateResponse>;
   load_packages(request: string): Promise<string>;

package/src/core/wasm/worker/worker.ts

@@ -369,6 +369,7 @@ const namesThatRequireSync = new Set<keyof RawBridge>([
   "rename_file",
   "create_file_or_directory",
   "delete_file_or_directory",
+  "copy_file_or_directory",
   "move_file_or_directory",
   "update_file",
 ]);