fix: improve types

This change resolves some incorrect types, which don't trigger problems unless TypeScript is in a stricter mode.

Refs #398

src/backend/config.ts

@@ -2,9 +2,9 @@ import { Command } from 'commander';
 import dotenv from 'dotenv';
 import { from } from 'env-var';
 import { Joi } from 'koa-joi-router';
+import { isString } from 'lodash';
 import { ORCID as orcidUtils } from 'orcid-utils';
 import log4js from 'koa-log4';
-import { isString } from './utils/strings';
 import { ServerError } from './utils/http-errors';
 
 // Configure logging
@@ -29,9 +29,6 @@ const env = from(process.env, {}, (varname, str) =>
 );
 
 function getEnv(postfix: string, fallback?: string) {
-  if (!isString(postfix)) {
-    throw new ServerError('Must specify an environment variable to fetch.');
-  }
   if (fallback) {
     return env
       .get(
@@ -50,7 +47,7 @@ const defaultEnv = isString(process.env.NODE_ENV)
   : 'development';
 const defaultPort = isString(process.env.PORT) ? process.env.PORT : '3000';
 
-const defaults = {
+const defaults: Partial<Record<string, string>> = {
   admin_user: 'admin',
   db_name:
     defaultEnv !== 'production'
@@ -71,9 +68,6 @@ const defaults = {
 };
 
 function getEnvOrDefault(postfix: string) {
-  if (!isString(postfix)) {
-    throw new ServerError('Must specify an environment variable to fetch.');
-  }
   const defaultValue = defaults[postfix.toLowerCase()];
 
   if (defaultValue) {

src/backend/controllers/user.js

@@ -1,7 +1,7 @@
 import { v4 as uuidv4 } from 'uuid';
 import router from 'koa-joi-router';
+import { isString } from 'lodash';
 import { Key } from '../models/entities/index.ts';
-import { isString } from '../utils/strings';
 import { getLogger } from '../log.js';
 
 const log = getLogger('backend:controllers:user');

src/backend/middleware/auth.js

@@ -1,7 +1,7 @@
 import Roles from 'koa-roles';
+import { isString } from 'lodash';
 import { ORCID as orcidUtils } from 'orcid-utils';
 import config from '../config.ts';
-import { isString } from '../utils/strings';
 import { getLogger } from '../log.js';
 
 const log = getLogger('backend:middleware:auth');

src/backend/scripts/dbMigrations.ts

@@ -5,10 +5,12 @@ import { SearchPostgresql } from '../db/migrations/searchIndexes';
 
 async function main() {
   try {
-    const migrationsList = Object.keys(migrations).map(migrationName => ({
-      name: migrationName,
-      class: migrations[migrationName],
-    }));
+    const migrationsList = Object.entries(migrations).map(
+      ([migrationName, migrationClass]) => ({
+        name: migrationName,
+        class: migrationClass,
+      }),
+    );
 
     migrationsList.splice(1, 0, {
       name: 'SearchPostgresql',

src/backend/utils/getFields.ts

@@ -1,7 +1,11 @@
 import 'reflect-metadata';
 import * as entities from '../models/entities';
 
-export function getFields(type: string, includes?: string[], recurse = 2): any {
+export function getFields(
+  type: keyof typeof entities,
+  includes?: string[],
+  recurse = 2,
+): unknown {
   return Object.values(entities[type].prototype.__meta.properties).reduce(
     (props: any[], prop: any) => {
       if (!(prop.hidden === true)) {

src/backend/utils/resolve.ts

@@ -214,18 +214,6 @@ export async function resolvePreprint(
   const baseUrlArxivHtml = 'https://arxiv.org/abs/';
   const baseUrlDoi = 'https://doi.org/';
 
-  // checks if the publication is DOI or arXiv
-  let url: string, type: string;
-  if (isDoi) {
-    log.debug('Resolving preprint with a DOI');
-    url = `${baseUrlDoi}${handle}`;
-    type = 'doi';
-  } else if (isArxiv) {
-    log.debug('Resolving preprint with an arXivId');
-    url = `${baseUrlArxivHtml}${handle}`;
-    type = 'arxiv';
-  }
-
   // as a last resort check Google Scholar
   resolvers.push(
     searchGoogleScholar(handle).catch(err =>
@@ -244,6 +232,18 @@ export async function resolvePreprint(
 
   // fetch data based on publication type (DOI / arXiv)
   if (isDoi || isArxiv) {
+    // checks if the publication is DOI or arXiv
+    let url: string, type: string;
+    if (isDoi) {
+      log.debug('Resolving preprint with a DOI');
+      url = `${baseUrlDoi}${handle}`;
+      type = 'doi';
+    } else {
+      log.debug('Resolving preprint with an arXivId');
+      url = `${baseUrlArxivHtml}${handle}`;
+      type = 'arxiv';
+    }
+
     resolvers.push(
       scrapeUrl(url, handle, type).catch(err =>
         log.warn('No metadata found via scrape: ', err),