JSONValue can not be used by custom defined interfaces (#201)

[poolifier.git] / src / utility-types.ts

diff --git a/src/utility-types.ts b/src/utility-types.ts
index aa4d058cce142ffa5214c8d2ce2965e428309d14..2403b8a257b0377e441a4dc2568b49571be4cdc2 100644 (file)
--- a/src/utility-types.ts
+++ b/src/utility-types.ts
@@ -1,30 +1,19 @@
-/**
- * Make all properties in T non-readonly
- */
-export type Draft<T> = { -readonly [P in keyof T]?: T[P] }
+import type { Worker } from 'cluster'
+import type { MessagePort } from 'worker_threads'
+import type { KillBehavior } from './worker/worker-options'
 
 /**
- * Serializable primitive JSON value.
- */
-export type JSONPrimitive = number | boolean | string | null
-/**
- * Serializable JSON value.
+ * Make all properties in T non-readonly.
  */
-// eslint-disable-next-line no-use-before-define
-export type JSONValue = JSONPrimitive | JSONArray | JSONObject
-/**
- * Serializable JSON object.
- */
-export type JSONObject = { [k: string]: JSONValue }
-/**
- * Serializable JSON array.
- */
-export type JSONArray = Array<JSONValue>
+export type Draft<T> = { -readonly [P in keyof T]?: T[P] }
 
 /**
  * Message object that is passed between worker and main worker.
  */
-export interface MessageValue<Data = unknown> {
+export interface MessageValue<
+  Data = unknown,
+  MainWorker extends Worker | MessagePort | unknown = unknown
+> {
   /**
    * Input data that will be passed to the worker.
    */
@@ -36,7 +25,7 @@ export interface MessageValue<Data = unknown> {
   /**
    * Kill code.
    */
-  readonly kill?: number
+  readonly kill?: KillBehavior | 1
   /**
    * Error.
    */
@@ -46,5 +35,5 @@ export interface MessageValue<Data = unknown> {
    *
    * _Only for internal use_
    */
-  readonly parent?: MessagePort
+  readonly parent?: MainWorker
 }