Fix code after linter changes

src/client/ui/expense/row/ExpenseRow.tsx

@@ -191,8 +191,8 @@ export class ExpenseRowImpl extends React.Component<ExpenseRowProps, ExpenseRowS
       background: !expense.confirmed
         ? colors.unconfirmedStripes
         : expense.type === 'income'
-        ? colors.income
-        : undefined,
+          ? colors.income
+          : undefined,
     };
     if (!expense.confirmed) {
       style.background = colors.unconfirmedStripes;

src/server/data/ExpenseSearch.ts

@@ -16,8 +16,8 @@ export async function getExpenseSearchQuery(
   const type = Array.isArray(query.type)
     ? query.type
     : isDefined(query.type)
-    ? [query.type]
-    : undefined;
+      ? [query.type]
+      : undefined;
   const inputCategoryIds =
     typeof query.categoryId === 'number' ? [query.categoryId] : query.categoryId || [];
   const categoryIds =

src/server/logging/TraceIdProvider.ts

@@ -40,23 +40,28 @@ type LogMethod = (typeof LogMethods)[number];
  * Instruments the Pino logger to automatically grab the request id from
  * the AsyncLocalStorage and add it to the log output.
  */
-export function instrumentLogger(logger: Logger): Logger {
+export function instrumentLogger<CustomLevels extends string = never>(
+  logger: Logger<CustomLevels>,
+): Logger<CustomLevels> {
   if (!config.logRequestId) {
     return logger;
   }
   // Replace each logger method an instrumented version
   LogMethods.forEach(m => transformLogFn(logger, m));
 
   // Auto-instrument all child loggers
-  const orgChild = logger.child;
+  const orgChild = logger.child<any>;
   logger.child = (bindings, options) => {
     const childLogger = orgChild.call(logger, bindings, options);
     return instrumentLogger(childLogger) as any;
   };
   return logger;
 }
 
-function transformLogFn(logger: Logger, method: LogMethod) {
+function transformLogFn<CustomLevels extends string = never>(
+  logger: Logger<CustomLevels>,
+  method: LogMethod,
+) {
   const orgImpl = logger[method];
   logger[method] = (...args: any[]) => {
     const state = getCurrentTraceState();

src/server/server/FileHandling.ts

@@ -4,7 +4,7 @@ import { writeFile } from 'fs/promises';
 import multipart from 'parse-multipart-data';
 import path from 'path';
 import { ITask } from 'pg-promise';
-import { promisify } from 'sys';
+import { promisify } from 'util';
 
 import { BkError, SessionBasicInfo } from 'shared/types';
 import { config } from 'server/Config';

src/server/server/ServerControl.ts

@@ -17,12 +17,11 @@ let runningServer: Server | undefined = undefined;
 function closeRunningServer() {
   const s = runningServer;
   if (!s) return Promise.resolve();
-  return new Promise(
-    (resolve, reject) =>
-      s?.close(err => {
-        if (err) reject(err);
-        else resolve(err);
-      }),
+  return new Promise((resolve, reject) =>
+    s?.close(err => {
+      if (err) reject(err);
+      else resolve(err);
+    }),
   );
 }
 

src/server/server/ValidatingRouter.ts

@@ -43,10 +43,10 @@ type ValidatorSpec<R, Q, B> = {
 type PathToParams<Path extends string> = Path extends `${infer Start}/${infer Rest}`
   ? PathToParams<Start> & PathToParams<Rest>
   : Path extends `:${infer Param}`
-  ? {
-      [k in Param]: k extends keyof KnownTypes ? KnownTypes[k] : unknown;
-    }
-  : unknown;
+    ? {
+        [k in Param]: k extends keyof KnownTypes ? KnownTypes[k] : unknown;
+      }
+    : unknown;
 
 type HandlerParams<Path extends string, Q, B> = {
   params: PathToParams<Path>;