Merge pull request #2195 from skaut/exact-property-types

Fixed optional property types

Author: marekdedic

src/backend/move.ts

@@ -65,16 +65,16 @@ export function move(
     return { response: { errors }, status: "success" };
   } catch (e: unknown) {
     return {
-      detail:
-        typeof e === "object" &&
+      ...(typeof e === "object" &&
         e !== null &&
         "message" in e &&
-        typeof e.message === "string"
-          ? e.message +
+        typeof e.message === "string" && {
+          detail:
+            e.message +
             ("stack" in e && typeof e.stack === "string"
               ? `\n\nStack trace:\n${e.stack}`
-              : "")
-          : undefined,
+              : ""),
+        }),
       status: "error",
       type: "DriveAPIError",
     };

src/backend/utils/SafeDriveService/SafeCommentsCollection.ts

@@ -18,7 +18,7 @@ export interface SafeComment {
 
 export interface SafeCommentList<F extends DeepKeyof<SafeComment>> {
   comments: Array<DeepPick<SafeComment, F>>;
-  nextPageToken?: string | undefined;
+  nextPageToken?: string;
 }
 
 interface SafeReply {

src/backend/utils/SafeDriveService/SafeFilesCollection.ts

@@ -39,7 +39,7 @@ const safeFileKeys: DeepKeyof<SafeFile> = {
 
 export interface SafeFileList<F extends DeepKeyof<SafeFile>> {
   files: Array<DeepPick<SafeFile, F>>;
-  nextPageToken?: string | undefined;
+  nextPageToken?: string;
 }
 interface GetArg {
   alt?: string;

tests/backend/listFolders.test.ts

@@ -21,7 +21,6 @@ test("listFolders works correctly", () => {
       { id: "ID1", name: "FOLDER1" },
       { id: "ID2", name: "FOLDER2" },
     ],
-    nextPageToken: undefined,
   };
   const driveServiceMock = mockedSafeDriveService();
   vi.mocked(driveServiceMock.Files.list).mockReturnValueOnce(rawResponse);
@@ -87,7 +86,6 @@ test("listFolders works correctly with shortcuts", () => {
       },
       { id: "ID2", name: "FOLDER2" },
     ],
-    nextPageToken: undefined,
   };
   const driveServiceMock = mockedSafeDriveService();
   vi.mocked(driveServiceMock.Files.list).mockReturnValueOnce(rawResponse);

tests/backend/move/copyFileComments.test.ts

@@ -25,7 +25,6 @@ test("copyFileComments works correctly", () => {
         replies: [],
       },
     ],
-    nextPageToken: undefined,
   };
   const driveServiceMock = mockedSafeDriveService();
   vi.mocked(driveServiceMock.Comments.create)
@@ -125,7 +124,6 @@ test("copyFileComments works correctly with replies", () => {
         ],
       },
     ],
-    nextPageToken: undefined,
   };
   const driveServiceMock = mockedSafeDriveService();
   vi.mocked(driveServiceMock.Comments.create).mockReturnValueOnce({

tests/backend/move/folderManagement.test.ts

@@ -31,7 +31,6 @@ test("listFilesInFolder works correctly", () => {
   ];
   const rawResponse = {
     files,
-    nextPageToken: undefined,
   };
   const driveServiceMock = mockedSafeDriveService();
   vi.mocked(driveServiceMock.Files.list).mockReturnValueOnce(rawResponse);
@@ -104,7 +103,6 @@ test("listFoldersInFolder works correctly", () => {
   ];
   const rawResponse = {
     files,
-    nextPageToken: undefined,
   };
   const driveServiceMock = mockedSafeDriveService();
   vi.mocked(driveServiceMock.Files.list).mockReturnValueOnce(rawResponse);
@@ -244,7 +242,6 @@ test("deleteFolderIfEmpty works correctly", () => {
   };
   const listResponse = {
     files: [],
-    nextPageToken: undefined,
   };
   const driveServiceMock = mockedSafeDriveService();
   vi.mocked(driveServiceMock.Files.get).mockReturnValueOnce(getResponse);
@@ -297,7 +294,6 @@ test("deleteFolderIfEmpty doesn't delete a non-empty folder", () => {
 
   const listResponse = {
     files: [{ userPermission: { role: "reader" } }],
-    nextPageToken: undefined,
   };
   const driveServiceMock = mockedSafeDriveService();
   vi.mocked(driveServiceMock.Files.list).mockReturnValueOnce(listResponse);
@@ -344,7 +340,6 @@ test("deleteFolderIfEmpty doesn't try to delete a folder without permissions", (
   };
   const listResponse = {
     files: [],
-    nextPageToken: undefined,
   };
   const driveServiceMock = mockedSafeDriveService();
   vi.mocked(driveServiceMock.Files.get).mockReturnValueOnce(getResponse);