chore: More typescript FIXME's removed

server/commands/collectionImporter.ts

@@ -45,18 +45,9 @@ export default async function collectionImporter({
   }
 
   // store progress and pointers
-  // @ts-expect-error ts-migrate(2741) FIXME: Property 'string' is missing in type '{}' but requ... Remove this comment to see the full error message
-  const collections: {
-    string: Collection;
-  } = {};
-  // @ts-expect-error ts-migrate(2741) FIXME: Property 'string' is missing in type '{}' but requ... Remove this comment to see the full error message
-  const documents: {
-    string: Document;
-  } = {};
-  // @ts-expect-error ts-migrate(2741) FIXME: Property 'string' is missing in type '{}' but requ... Remove this comment to see the full error message
-  const attachments: {
-    string: Attachment;
-  } = {};
+  const collections: Record<string, Collection> = {};
+  const documents: Record<string, Document> = {};
+  const attachments: Record<string, Attachment> = {};
 
   for (const item of items) {
     if (item.type === "collection") {
@@ -113,6 +104,7 @@ export default async function collectionImporter({
       const tmpDir = os.tmpdir();
       const tmpFilePath = `${tmpDir}/upload-${uuidv4()}`;
       await fs.promises.writeFile(tmpFilePath, content);
+
       const file = new File({
         name,
         type: "text/markdown",
@@ -123,6 +115,7 @@ export default async function collectionImporter({
         user,
         ip,
       });
+
       await fs.promises.unlink(tmpFilePath);
       // must be a nested document, find and reference the parent document
       let parentDocumentId;
@@ -142,10 +135,8 @@ export default async function collectionImporter({
         collectionId: collection.id,
         createdAt: item.metadata.createdAt
           ? new Date(item.metadata.createdAt)
-          : // @ts-expect-error ts-migrate(2339) FIXME: Property 'date' does not exist on type 'Item'.
-            item.date,
-        // @ts-expect-error ts-migrate(2339) FIXME: Property 'date' does not exist on type 'Item'.
-        updatedAt: item.date,
+          : item.item.date,
+        updatedAt: item.item.date,
         parentDocumentId,
         user,
         ip,

server/commands/documentImporter.ts

@@ -1,7 +1,5 @@
 import fs from "fs";
 import path from "path";
-import File from "formidable/lib/file";
-// @ts-expect-error ts-migrate(7016) FIXME: Could not find a declaration file for module 'jopl... Remove this comment to see the full error message
 import { strikethrough, tables } from "joplin-turndown-plugin-gfm";
 import mammoth from "mammoth";
 import quotedPrintable from "quoted-printable";
@@ -21,6 +19,7 @@ const turndownService = new TurndownService({
   bulletListMarker: "-",
   headingStyle: "atx",
 });
+
 // Use the GitHub-flavored markdown plugin to parse
 // strikethoughs and tables
 turndownService
@@ -32,6 +31,7 @@ turndownService
       return "\n";
     },
   });
+
 interface ImportableFile {
   type: string;
   getMarkdown: (file: any) => Promise<string>;

server/commands/teamPermanentDeleter.ts

@@ -1,3 +1,4 @@
+import { Transaction } from "sequelize";
 import { sequelize } from "@server/database/sequelize";
 import Logger from "@server/logging/logger";
 import {
@@ -31,8 +32,7 @@ export default async function teamPermanentDeleter(team: Team) {
     `Permanently deleting team ${team.name} (${team.id})`
   );
   const teamId = team.id;
-  // @ts-expect-error ts-migrate(7034) FIXME: Variable 'transaction' implicitly has type 'any' i... Remove this comment to see the full error message
-  let transaction;
+  let transaction!: Transaction;
 
   try {
     transaction = await sequelize.transaction();
@@ -54,7 +54,6 @@ export default async function teamPermanentDeleter(team: Team) {
         await Promise.all(
           attachments.map((attachment) =>
             attachment.destroy({
-              // @ts-expect-error ts-migrate(7005) FIXME: Variable 'transaction' implicitly has an 'any' typ... Remove this comment to see the full error message
               transaction,
             })
           )
@@ -78,7 +77,6 @@ export default async function teamPermanentDeleter(team: Team) {
             userId: userIds,
           },
           force: true,
-          // @ts-expect-error ts-migrate(7005) FIXME: Variable 'transaction' implicitly has an 'any' typ... Remove this comment to see the full error message
           transaction,
         });
         await ApiKey.destroy({
@@ -86,7 +84,6 @@ export default async function teamPermanentDeleter(team: Team) {
             userId: userIds,
           },
           force: true,
-          // @ts-expect-error ts-migrate(7005) FIXME: Variable 'transaction' implicitly has an 'any' typ... Remove this comment to see the full error message
           transaction,
         });
       }