Reconfigure ESLint to work well with prettier

convert/convertAbout.ts

@@ -12,8 +12,12 @@ export function convertAbout(dataDir: string, verbose: number) {
     const srcFile = path.join(dataDir, 'about.partial.html');
     const dstFile = path.join('src/gen-assets', 'about.partial.html');
     copyFile(srcFile, dstFile, function (err: any) {
-        if (err) throw err;
-        if (verbose) console.log(`copied ${srcFile} to ${dstFile}`);
+        if (err) {
+            throw err;
+        }
+        if (verbose) {
+            console.log(`copied ${srcFile} to ${dstFile}`);
+        }
     });
 }
 export class ConvertAbout extends Task {

convert/convertBadges.ts

@@ -30,8 +30,12 @@ export async function convertBadges(
         if (existsSync(srcFile)) {
             foundLanguages.push(language);
             copyFile(srcFile, dstFile, function (err: any) {
-                if (err) throw err;
-                if (verbose) console.log(`copied ${srcFile} to ${dstFile}`);
+                if (err) {
+                    throw err;
+                }
+                if (verbose) {
+                    console.log(`copied ${srcFile} to ${dstFile}`);
+                }
             });
         }
     }

convert/convertBooks.ts

@@ -180,7 +180,7 @@ function handleNoCaptionFigures(
         const parts = figContent.split('|');
 
         // Extract the image caption
-        let imageCaption = parts[0];
+        const imageCaption = parts[0];
 
         // Check if the image caption is missing
         if (!imageCaption) {
@@ -302,7 +302,7 @@ function moveFigureToNextNonVerseMarker(
     const eol = text.includes('\r\n') ? '\r\n' : '\n';
 
     const lines = text.split(/\r?\n/);
-    for (let line of lines) {
+    for (const line of lines) {
         // Add any figures that were carried over from the previous lines
         if (carryOverFigures.length > 0) {
             if (!line.startsWith('\\v ') && !line.startsWith('\\fig')) {
@@ -445,10 +445,11 @@ export async function convertBooks(
             );
         }
         usedLangs.add(context.lang);
-        if (verbose)
+        if (verbose) {
             console.log(
                 'converting collection: ' + collection.id + ' to docSet: ' + context.docSet
             );
+        }
         /**array of promises of Proskomma mutations*/
         const inputFiles = await fs.promises.readdir(
             path.join(context.dataDir, 'books', context.bcId)
@@ -503,7 +504,7 @@ export async function convertBooks(
                         convertScriptureBook(pk, context, book, bcGlossary, docs, inputFiles);
                     }
                     if (book.bookTabs) {
-                        for (const bookTab of book.bookTabs?.tabs) {
+                        for (const bookTab of book.bookTabs.tabs) {
                             convertScriptureBook(
                                 pk,
                                 context,
@@ -523,14 +524,18 @@ export async function convertBooks(
                 continue;
             }
         }
-        if (verbose) console.time('convert ' + collection.id);
+        if (verbose) {
+            console.time('convert ' + collection.id);
+        }
         //wait for documents to finish being added to Proskomma
         await Promise.all(docs);
         if (ignoredBooks.length > 0) {
             process.stdout.write(` -- Not Supported: ${ignoredBooks.join(' ')}`);
         }
         process.stdout.write('\n');
-        if (verbose) console.timeEnd('convert ' + collection.id);
+        if (verbose) {
+            console.timeEnd('convert ' + collection.id);
+        }
         //start freezing process and map promise to docSet name
 
         const frozen = freeze(pk);
@@ -556,7 +561,9 @@ export async function convertBooks(
             JSON.stringify(transformCatalogEntry(entry, quizzes, htmlBooks))
         );
     });
-    if (verbose) console.time('freeze');
+    if (verbose) {
+        console.time('freeze');
+    }
     //write frozen archives for import
     //const vals = await Promise.all(freezer.values());
     //write frozen archives
@@ -583,7 +590,9 @@ export async function convertBooks(
             return s;
         })()}]`
     );
-    if (verbose) console.timeEnd('freeze');
+    if (verbose) {
+        console.timeEnd('freeze');
+    }
     return {
         files,
         taskName: 'ConvertBooks'
@@ -789,7 +798,9 @@ function convertScriptureBook(
     const id = bookTab ? book.id + bookTab.bookTabID : book.id; //Book tab ID is derived from the book ID because book tabs don't have distinct IDs.
     function processBookContent(resolve: () => void, err: any, content: string) {
         //process.stdout.write(`processBookContent: bookId:${book.id}, error:${err}\n`);
-        if (err) throw err;
+        if (err) {
+            throw err;
+        }
         content = applyFilters(content, usfmFilterFunctions, context.bcId, id, context);
         if (bookTab) {
             //The book tab ID in the sfm file gets cut off, which results in it having the same ID as the book. Generate a new ID based on the book ID and book tab ID.
@@ -860,7 +871,9 @@ function convertScriptureBook(
                     const filenameWithoutExt = basename(file, ext).normalize('NFC');
 
                     // Check if the filename starts with baseFilename
-                    if (!filenameWithoutExt.startsWith(baseFilename)) return false;
+                    if (!filenameWithoutExt.startsWith(baseFilename)) {
+                        return false;
+                    }
 
                     // Get the part after baseFilename
                     const suffix = filenameWithoutExt.slice(baseFilename.length);
@@ -933,17 +946,25 @@ export class ConvertBooks extends Task {
  * recursively deep-compares two objects based on properties passed in include.
  */
 function deepCompareObjects(obj1: any, obj2: any, include: Set<string> = new Set()): boolean {
-    if (typeof obj1 !== typeof obj2) return false;
+    if (typeof obj1 !== typeof obj2) {
+        return false;
+    }
     if (typeof obj1 === 'object') {
         if (Array.isArray(obj1)) {
-            if (obj1.length !== obj2.length) return false;
+            if (obj1.length !== obj2.length) {
+                return false;
+            }
             for (let i = 0; i < obj1.length; i++) {
-                if (!deepCompareObjects(obj1[i], obj2[i])) return false;
+                if (!deepCompareObjects(obj1[i], obj2[i])) {
+                    return false;
+                }
             }
         } else {
             for (const k in obj1) {
                 if (include.has(k)) {
-                    if (!deepCompareObjects(obj1[k], obj2[k])) return false;
+                    if (!deepCompareObjects(obj1[k], obj2[k])) {
+                        return false;
+                    }
                 }
             }
         }