chore(deps): bump eslint from 8.38.0 to 8.56.0

package.json

@@ -31,12 +31,12 @@
     "@types/npm-license-crawler": "0.2.3",
     "@typescript-eslint/eslint-plugin": "5.30.6",
     "@typescript-eslint/parser": "5.62.0",
-    "eslint": "8.38.0",
+    "eslint": "8.56.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-import-resolver-typescript": "3.6.1",
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-prettier": "5.1.2",
-    "eslint-plugin-unicorn": "43.0.2",
+    "eslint-plugin-unicorn": "50.0.1",
     "fs-extra": "11.2.0",
     "globby": "11.0.4",
     "graphql": "15.8.0",

packages/backend/package.json

@@ -101,7 +101,7 @@
     "@types/validator": "13.11.7",
     "@typescript-eslint/eslint-plugin": "5.30.6",
     "@typescript-eslint/parser": "5.62.0",
-    "eslint": "8.38.0",
+    "eslint": "8.56.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-import-resolver-typescript": "3.6.1",
     "eslint-plugin-import": "2.29.1",

packages/backend/src/controllers/webhook.v1.ts

@@ -58,15 +58,15 @@ export const hook = (req: Request, res: Response): void => {
   let insightSyncTask: InsightSyncTask | null = null;
   if (req.headers['x-github-event'] !== undefined) {
     insightSyncTask = handleGitHub(webhook);
-  } else if (webhook.path !== undefined) {
+  } else if (webhook.path === undefined) {
+    res.status(400).send('Not Recognized');
+    return;
+  } else {
     insightSyncTask = {
       repositoryType: RepositoryType.FILE,
       owner: 'local',
       repo: webhook.path
     };
-  } else {
-    res.status(400).send('Not Recognized');
-    return;
   }
 
   if (insightSyncTask == null) {

packages/backend/src/lib/backends/base.sync.ts

@@ -105,31 +105,13 @@ export abstract class BaseSync {
     // This key should be unchanging to avoid creating duplicates
     let existingDbInsight = await DbInsight.query().where('externalId', externalId).first();
 
-    if (existingDbInsight != undefined) {
-      logger.trace('Insight does exist in database');
-      await existingDbInsight.$query().patch({
-        insightName: insight.fullName,
-        itemType: insight.itemType,
-        deletedAt: null,
-        repositoryData
-      });
-    } else {
+    if (existingDbInsight == undefined) {
       logger.trace('Insight does not exist in database');
 
       // Check to see if the fullName already exists, but with a different externalID
       existingDbInsight = await DbInsight.query().where('insightName', insight.fullName).first();
 
-      if (existingDbInsight != undefined) {
-        // Assume the repo was deleted and recreated, and just update the external ID
-        // (We've already checked to ensure the external ID is unique)
-        logger.trace('Insight exists in database, but with a different externalId');
-        await existingDbInsight.$query().patch({
-          externalId,
-          itemType: insight.itemType,
-          deletedAt: null,
-          repositoryData
-        });
-      } else {
+      if (existingDbInsight == undefined) {
         logger.trace('Insight does not exist in database');
         existingDbInsight = await DbInsight.query().insert({
           externalId,
@@ -141,7 +123,25 @@ export abstract class BaseSync {
           repositoryData,
           itemType: insight.itemType
         });
+      } else {
+        // Assume the repo was deleted and recreated, and just update the external ID
+        // (We've already checked to ensure the external ID is unique)
+        logger.trace('Insight exists in database, but with a different externalId');
+        await existingDbInsight.$query().patch({
+          externalId,
+          itemType: insight.itemType,
+          deletedAt: null,
+          repositoryData
+        });
       }
+    } else {
+      logger.trace('Insight does exist in database');
+      await existingDbInsight.$query().patch({
+        insightName: insight.fullName,
+        itemType: insight.itemType,
+        deletedAt: null,
+        repositoryData
+      });
     }
 
     logger.trace(JSON.stringify(existingDbInsight, null, 2));

packages/backend/src/lib/backends/file-system.sync.ts

@@ -298,14 +298,15 @@ const getConversions = (insightFile: Omit<InsightFile, 'id'>): undefined | Insig
   switch (insightFile.mimeType) {
     case 'application/vnd.openxmlformats-officedocument.presentationml.presentation':
     case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
-    case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
+    case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': {
       return [
         {
           mimeType: 'application/pdf',
           path: `.converted/${insightFile.path}.pdf`
         }
       ];
-    case 'application/x-ipynb+json':
+    }
+    case 'application/x-ipynb+json': {
       return [
         {
           mimeType: 'application/pdf',
@@ -316,8 +317,10 @@ const getConversions = (insightFile: Omit<InsightFile, 'id'>): undefined | Insig
           path: `.converted/${insightFile.path}.html`
         }
       ];
-    default:
+    }
+    default: {
       return undefined;
+    }
   }
 };
 

packages/backend/src/lib/backends/github.sync.ts

@@ -426,14 +426,15 @@ const getConversions = (insightFile: Omit<InsightFile, 'id'>): undefined | Insig
   switch (insightFile.mimeType) {
     case 'application/vnd.openxmlformats-officedocument.presentationml.presentation':
     case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
-    case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
+    case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet': {
       return [
         {
           mimeType: 'application/pdf',
           path: `.converted/${insightFile.path}.pdf`
         }
       ];
-    case 'application/x-ipynb+json':
+    }
+    case 'application/x-ipynb+json': {
       return [
         {
           mimeType: 'application/pdf',
@@ -444,8 +445,10 @@ const getConversions = (insightFile: Omit<InsightFile, 'id'>): undefined | Insig
           path: `.converted/${insightFile.path}.html`
         }
       ];
-    default:
+    }
+    default: {
       return undefined;
+    }
   }
 };
 

packages/backend/src/lib/backends/github.ts

@@ -50,7 +50,7 @@ export function makeGraphql(token: string = process.env.GITHUB_ACCESS_TOKEN!): g
   }
 
   return GQ.defaults({
-    baseUrl: process.env.GITHUB_GRAPHQL_API_URL !== '' ? process.env.GITHUB_GRAPHQL_API_URL : undefined,
+    baseUrl: process.env.GITHUB_GRAPHQL_API_URL === '' ? undefined : process.env.GITHUB_GRAPHQL_API_URL,
     mediaType: {
       previews: ['bane']
     },
@@ -72,7 +72,7 @@ export function makeOctokit(token: string = process.env.GITHUB_ACCESS_TOKEN!): O
   return new Octokit({
     auth: token,
     userAgent: `iex ${process.env.IEX_VERSION || '0.0.0'}`,
-    baseUrl: process.env.GITHUB_REST_API_URL !== '' ? process.env.GITHUB_REST_API_URL : undefined,
+    baseUrl: process.env.GITHUB_REST_API_URL === '' ? undefined : process.env.GITHUB_REST_API_URL,
     log: {
       debug: logger.debug.bind(logger),
       info: logger.info.bind(logger),

packages/backend/src/lib/backends/sync.ts

@@ -31,14 +31,17 @@ export async function syncInsight(insightSyncTask: InsightSyncTask): Promise<Ind
 
   let syncer: BaseSync;
   switch (insightSyncTask.repositoryType) {
-    case RepositoryType.GITHUB:
+    case RepositoryType.GITHUB: {
       syncer = new GitHubRepositorySync();
       break;
-    case RepositoryType.FILE:
+    }
+    case RepositoryType.FILE: {
       syncer = new FileSystemSync();
       break;
-    default:
+    }
+    default: {
       throw new Error('Unknown Repository Type');
+    }
   }
 
   return syncer.sync(insightSyncTask);

packages/backend/src/lib/elasticsearch.ts

@@ -262,18 +262,24 @@ export async function getInsightByFullName(
  */
 function getSortField(field: string | undefined): string {
   switch (field) {
-    case undefined:
+    case undefined: {
       return defaultSort.field!;
-    case 'relevance':
+    }
+    case 'relevance': {
       return '_score';
-    case 'name':
+    }
+    case 'name': {
       return 'name.keyword';
-    case 'fullName':
+    }
+    case 'fullName': {
       return 'fullName.keyword';
-    case 'publishedDate':
+    }
+    case 'publishedDate': {
       return 'metadata.publishedDate';
-    default:
+    }
+    default: {
       return field;
+    }
   }
 }
 
@@ -544,7 +550,7 @@ export async function getInsightsByContributor(
       size: insights.length,
       total: elasticResponse.body.hits.total.value,
       startCursor: edges.length > 0 ? edges[0].cursor : undefined,
-      endCursor: edges.length > 0 ? edges[edges.length - 1].cursor : undefined,
+      endCursor: edges.length > 0 ? edges.at(-1)?.cursor : undefined,
       // Unable to determine this
       hasNextPage: true,
       // Backwards cursor isn't supported

packages/backend/src/lib/git-instance.ts

@@ -218,7 +218,7 @@ export class GitInstance {
 
   async retrieveFileUtf8(filePath: string): Promise<string | null> {
     const buffer = await this.retrieveFile(filePath);
-    return buffer != null ? buffer.toString('utf8') : null;
+    return buffer == null ? null : buffer.toString('utf8');
   }
 
   // TODO: Only works for UTF-8 based-files

packages/backend/src/lib/import.ts

@@ -184,7 +184,7 @@ export function convertToDraft(request: ImportRequest): DraftDataInput {
       `<!-- Please review it for any conversion errors. -->\n\n` +
       readmeFile.contents;
 
-    readmeFile.contents = readmeFile.contents.replace(/\u00A0/g, ' ');
+    readmeFile.contents = readmeFile.contents.replaceAll('\u00A0', ' ');
   }
 
   return combinedDraftData;

packages/backend/src/resolvers/autocomplete.resolver.ts

@@ -113,11 +113,7 @@ export class AutocompleteResolver {
 
       // Combine both teams on Insights and Users
       const combined = [...publishedTeams, ...userTeams].reduce<Record<string, number>>((acc, v) => {
-        if (acc[v.value]) {
-          acc[v.value] = acc[v.value] + v.occurrences;
-        } else {
-          acc[v.value] = v.occurrences;
-        }
+        acc[v.value] = acc[v.value] ? acc[v.value] + v.occurrences : v.occurrences;
         return acc;
       }, {});
 

packages/backend/src/server.ts

@@ -39,16 +39,19 @@ export async function createServer(): Promise<express.Express> {
 
   // Show routes called in console during development
   switch (process.env.NODE_ENV) {
-    case 'development':
+    case 'development': {
       logger.info('Loading development middleware');
       app.use(security);
       break;
-    case 'production':
+    }
+    case 'production': {
       logger.info('Loading production middleware');
       app.use(security);
       break;
-    default:
+    }
+    default: {
       logger.info('Actually ' + process.env.NODE_ENV);
+    }
   }
 
   app.use(compression());

packages/backend/src/services/activity.service.ts

@@ -234,11 +234,13 @@ export class ActivityService {
       const cursor = toElasticsearchCursor(
         ...sort!.map((s) => {
           switch (s.field) {
-            case 'occurredAt':
+            case 'occurredAt': {
               // Special date handling
               return new Date(activity.occurredAt).getTime();
-            case 'relevance':
+            }
+            case 'relevance': {
               return doc._score;
+            }
           }
         })
       );
@@ -256,7 +258,7 @@ export class ActivityService {
         size: edges.length,
         total: elasticResponse.body.hits.total.value,
         startCursor: edges.length > 0 ? edges[0].cursor : undefined,
-        endCursor: edges.length > 0 ? edges[edges.length - 1].cursor : undefined,
+        endCursor: edges.length > 0 ? edges.at(-1)?.cursor : undefined,
         // Unable to determine this
         hasNextPage: true,
         // Backwards cursor isn't supported
@@ -367,12 +369,15 @@ export class ActivityService {
    */
   getSortField(field: string | undefined): string {
     switch (field) {
-      case undefined:
+      case undefined: {
         return this.defaultSort.field!;
-      case 'relevance':
+      }
+      case 'relevance': {
         return '_score';
-      default:
+      }
+      default: {
         return field;
+      }
     }
   }
 }

packages/backend/src/services/draft.service.ts

@@ -103,15 +103,15 @@ export class DraftService {
       draftRemains.insightId = dbInsightId;
     }
 
-    if (existingDraft != undefined) {
-      logger.trace('Draft does exist in database');
-      return await existingDraft.$query().patchAndFetch(draftRemains);
-    } else {
+    if (existingDraft == undefined) {
       logger.trace('Draft does not exist in database');
       return await Draft.query().insert({
         ...draftRemains,
         createdByUserId: user?.userId
       });
+    } else {
+      logger.trace('Draft does exist in database');
+      return await existingDraft.$query().patchAndFetch(draftRemains);
     }
   }
 
@@ -124,7 +124,9 @@ export class DraftService {
   async deleteDraft(draftKey: DraftKey, user: User): Promise<Draft> {
     const existingDraft = await Draft.query().where('draftKey', draftKey).first();
 
-    if (existingDraft != undefined) {
+    if (existingDraft == undefined) {
+      throw new Error('Draft not found by key: ' + draftKey);
+    } else {
       if (existingDraft.createdByUserId != user.userId && existingDraft.createdByUserId != null) {
         throw new Error('Not allowed');
       }
@@ -135,8 +137,6 @@ export class DraftService {
         throw new Error('Unexpectedly, Draft not deleted');
       }
       return existingDraft;
-    } else {
-      throw new Error('Draft not found by key: ' + draftKey);
     }
   }