feat: simplify LogWriter interface

gajus · Nov 6, 2021 · 935c12a · 935c12a
1 parent 0f76d74
commit 935c12a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/factories/createNodeWriter.ts b/src/factories/createNodeWriter.ts
@@ -3,10 +3,8 @@ import type {
 } from '../types';
 
 const createBlockingWriter = (stream: NodeJS.WritableStream): LogWriter => {
-  return {
-    write: (message: string) => {
-      stream.write(message + '\n');
-    },
+  return (message: string) => {
+    stream.write(message + '\n');
   };
 };
 

diff --git a/src/factories/createRoarrInitialGlobalState.ts b/src/factories/createRoarrInitialGlobalState.ts
@@ -39,7 +39,9 @@ export const createRoarrInitialGlobalState = (currentState: any): RoarrGlobalSta
 
       newState = {
         ...newState,
-        ...createNodeWriter(),
+        ...{
+          write: createNodeWriter(),
+        },
         asyncLocalStorage,
       };
       // eslint-disable-next-line no-empty

diff --git a/src/types.ts b/src/types.ts
@@ -2,16 +2,15 @@ import type {
   AsyncLocalStorage,
 } from 'async_hooks';
 
-export type LogWriter = {
-  write: (message: string) => void,
-};
+export type LogWriter = (message: string) => void;
 
 export type MessageContext = any;
 
-export type RoarrGlobalState = LogWriter & {
+export type RoarrGlobalState = {
   asyncLocalStorage?: AsyncLocalStorage<MessageContext>,
   sequence: number,
   versions: readonly string[],
+  write: LogWriter,
 };
 
 export type SprintfArgument = boolean | number | string | null;