.

src/api/client/directory-api.ts

@@ -12,10 +12,13 @@ export class DirectoryApi extends MetaDataApi {
     return this.getRootDirectory();
   }
 
-  public async createDirectory(where: { name: string; under: TGFSDirectory }) {
+  public async createDirectory(
+    where: { name: string; under: TGFSDirectory },
+    dir?: TGFSDirectory,
+  ) {
     validateName(where.name);
 
-    const newDirectory = where.under.createDir(where.name);
+    const newDirectory = where.under.createDir(where.name, dir);
     await this.syncMetadata();
 
     return newDirectory;

src/api/client/file-api.ts

@@ -6,6 +6,16 @@ import { DirectoryApi } from './directory-api';
 import { GeneralFileMessage } from './message-api/types';
 
 export class FileApi extends DirectoryApi {
+  public async copyFile(
+    where: TGFSDirectory,
+    fr: TGFSFileRef,
+    name?: string,
+  ): Promise<TGFSFileRef> {
+    const copiedFR = where.createFileRef(name ?? fr.name, fr.getMessageId());
+    await this.syncMetadata();
+    return copiedFR;
+  }
+
   private async createFile(where: TGFSDirectory, fileMsg: GeneralFileMessage) {
     validateName(fileMsg.name);
 

src/api/ops/copy-dir.ts

@@ -0,0 +1,41 @@
+import { Client } from 'src/api';
+import { FileOrDirectoryDoesNotExistError } from 'src/errors/path';
+import { TGFSDirectory } from 'src/model/directory';
+
+import { navigateToDir } from './navigate-to-dir';
+import { splitPath } from './utils';
+
+export const copyDir =
+  (client: Client) =>
+  async (
+    pathFrom: string,
+    pathTo: string,
+  ): Promise<{
+    from: TGFSDirectory;
+    to: TGFSDirectory;
+  }> => {
+    const [basePathFrom, nameFrom] = splitPath(pathFrom);
+    if (nameFrom === '') {
+      return;
+    }
+
+    const dir = navigateToDir(client)(basePathFrom);
+    const dirToCopy = dir.findChildren([nameFrom])[0];
+
+    if (!dirToCopy) {
+      throw new FileOrDirectoryDoesNotExistError(
+        pathFrom,
+        `move directory from ${pathFrom} to ${pathTo}`,
+      );
+    }
+
+    const [basePathTo, nameTo] = splitPath(pathTo);
+    const dir2 = navigateToDir(client)(basePathTo);
+
+    const res = await client.createDirectory(
+      { name: nameTo ?? nameFrom, under: dir2 },
+      dirToCopy,
+    );
+
+    return { from: dirToCopy, to: res };
+  };

src/api/ops/copy-file.ts

@@ -0,0 +1,33 @@
+import { Client } from 'src/api';
+import { FileOrDirectoryDoesNotExistError } from 'src/errors/path';
+import { TGFSFileRef } from 'src/model/directory';
+
+import { navigateToDir } from './navigate-to-dir';
+import { splitPath } from './utils';
+
+export const copyFile =
+  (client: Client) =>
+  async (
+    pathFrom: string,
+    pathTo: string,
+  ): Promise<{
+    from: TGFSFileRef;
+    to: TGFSFileRef;
+  }> => {
+    const [basePathFrom, nameFrom] = splitPath(pathFrom);
+    const dir = navigateToDir(client)(basePathFrom);
+    const frToCopy = dir.findFiles([nameFrom])[0];
+
+    if (!frToCopy) {
+      throw new FileOrDirectoryDoesNotExistError(
+        pathFrom,
+        `move file from ${pathFrom} to ${pathTo}`,
+      );
+    }
+
+    const [basePathTo, nameTo] = splitPath(pathTo);
+    const dir2 = navigateToDir(client)(basePathTo);
+
+    const res = await client.copyFile(dir2, frToCopy, nameTo ?? nameFrom);
+    return { from: frToCopy, to: res };
+  };

src/api/ops/move-dir.ts

@@ -0,0 +1,10 @@
+import { Client } from 'src/api';
+
+import { copyDir } from './copy-dir';
+
+export const moveDir =
+  (client: Client) => async (pathFrom: string, pathTo: string) => {
+    const { from, to } = await copyDir(client)(pathFrom, pathTo);
+
+    await client.dangerouslyDeleteDirectory(from);
+  };

src/api/ops/move-file.ts

@@ -1,32 +1,9 @@
 import { Client } from 'src/api';
-import { FileOrDirectoryDoesNotExistError } from 'src/errors/path';
 
-import { navigateToDir } from './navigate-to-dir';
-import { splitPath } from './utils';
+import { copyFile } from './copy-file';
 
 export const moveFile =
   (client: Client) => async (pathFrom: string, pathTo: string) => {
-    const [dirFrom, nameFrom] = splitPath(pathFrom);
-    const dir = navigateToDir(client)(dirFrom);
-    const fileRef = dir.findFiles([nameFrom])[0];
-
-    if (!fileRef) {
-      throw new FileOrDirectoryDoesNotExistError(
-        pathFrom,
-        `move file from ${pathFrom} to ${pathTo}`,
-      );
-    }
-
-    const [dirTo, nameTo] = splitPath(pathTo);
-
-    try {
-      const dir2 = navigateToDir(client)(dirTo);
-      dir2.createFileRef(nameTo, fileRef.getMessageId());
-      await client.deleteFile(fileRef);
-    } catch (err) {
-      throw new FileOrDirectoryDoesNotExistError(
-        dirTo,
-        `move file from ${pathFrom} to ${pathTo}`,
-      );
-    }
+    const { from, to } = await copyFile(client)(pathFrom, pathTo);
+    await client.deleteFile(from);
   };

src/model/directory.ts

@@ -74,11 +74,13 @@ export class TGFSDirectory {
     return dir;
   }
 
-  public createDir(name: string) {
+  public createDir(name: string, dir?: TGFSDirectory) {
     if (this.findChildren([name]).length) {
       throw new FileOrDirectoryAlreadyExistsError(name);
     }
-    const child = new TGFSDirectory(name, this);
+    const child = dir
+      ? new TGFSDirectory(name, this, dir.children, dir.files)
+      : new TGFSDirectory(name, this);
     this.children.push(child);
     return child;
   }