From a37e0950f5278c8345d9c2c7d966febbd0f937a8 Mon Sep 17 00:00:00 2001
From: Sam Lee <32639580+Sam-Lee-17@users.noreply.github.com>
Date: Thu, 6 Jun 2024 00:00:20 +0100
Subject: [PATCH] Added backwards compatible type supporting for events to have
 multiple values

---
 src/CogsConnection.ts           | 15 ++++++++++++---
 src/types/CogsPluginManifest.ts |  2 +-
 src/types/ManifestTypes.ts      | 16 ++++++++++++++--
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/src/CogsConnection.ts b/src/CogsConnection.ts
index cf5671f..5a2fae0 100644
--- a/src/CogsConnection.ts
+++ b/src/CogsConnection.ts
@@ -5,9 +5,9 @@ import CogsClientMessage from './types/CogsClientMessage';
 import { COGS_SERVER_PORT, assetUrl } from './helpers/urls';
 import MediaClipStateMessage from './types/MediaClipStateMessage';
 import AllMediaClipStatesMessage from './types/AllMediaClipStatesMessage';
-import { CogsPluginManifest, PluginManifestEventJson } from './types/CogsPluginManifest';
+import { CogsPluginManifest, CogsValueType, PluginManifestEventJson } from './types/CogsPluginManifest';
 import * as ManifestTypes from './types/ManifestTypes';
-import { DeepReadonly } from './types/utils';
+import { DeepReadonly, DistributeObject } from './types/utils';
 
 export default class CogsConnection<Manifest extends CogsPluginManifest> {
   private websocket: WebSocket | ReconnectingWebSocket;
@@ -358,7 +358,16 @@ export class CogsStateChangedEvent<CogsState> extends Event {
 
 export class CogsIncomingEvent<CogsEvent extends DeepReadonly<PluginManifestEventJson> | PluginManifestEventJson> extends Event {
   public readonly _cogsConnectionEventType = 'event';
-  constructor(public readonly name: CogsEvent['name'], public readonly value: ManifestTypes.TypeFromCogsValueType<CogsEvent['value']>) {
+  constructor(
+    public readonly name: CogsEvent['name'],
+    public readonly value: CogsEvent extends { name: string; value: CogsValueType }
+      ? ManifestTypes.TypeFromCogsValueType<CogsEvent['value']>
+      : CogsEvent extends { name: string; value: { name: string; value: CogsValueType }[] }
+      ? DistributeObject<
+          { [ValueName in CogsEvent['value'][number]['name']]: ManifestTypes.TypeFromCogsValueType<CogsEvent['value'][number]['value']> }
+        >
+      : undefined
+  ) {
     super('event');
   }
 }
diff --git a/src/types/CogsPluginManifest.ts b/src/types/CogsPluginManifest.ts
index f0b2476..d64b90e 100644
--- a/src/types/CogsPluginManifest.ts
+++ b/src/types/CogsPluginManifest.ts
@@ -38,7 +38,7 @@ export type PluginManifestConfigJson = {
 
 export type PluginManifestEventJson = {
   name: string;
-  value?: CogsValueType;
+  value?: CogsValueType | { name: string; value: CogsValueType }[];
 };
 
 export type PluginManifestStateJson = {
diff --git a/src/types/ManifestTypes.ts b/src/types/ManifestTypes.ts
index fdd8b3e..6af7e87 100644
--- a/src/types/ManifestTypes.ts
+++ b/src/types/ManifestTypes.ts
@@ -51,7 +51,13 @@ export type EventFromCogs<Manifest extends CogsPluginManifest> = NonNullable<Non
 
 export type EventFromCogsAsObject<Manifest extends CogsPluginManifest> = DistributeObject<
   {
-    [Name in EventNameFromCogs<Manifest>]: TypeFromCogsValueType<Extract<DeepMutable<EventFromCogs<Manifest>>, { name: Name }>['value']>;
+    [Name in EventNameFromCogs<Manifest>]: 
+      Extract<DeepMutable<EventFromCogs<Manifest>>, { name: Name }> extends { name: Name; value: infer V extends CogsValueType } ? TypeFromCogsValueType<V> :
+      Extract<DeepMutable<EventFromCogs<Manifest>>, { name: Name }> extends { name: Name; value: infer V extends { name: string; value: CogsValueType }[] } ? DistributeObject<
+        {
+          [ValueName in V[number]['name']]: TypeFromCogsValueType<V[number]['value']>
+        }
+      > : undefined;
   }
 >;
 
@@ -61,6 +67,12 @@ export type EventToCogs<Manifest extends CogsPluginManifest> = NonNullable<NonNu
 
 export type EventToCogsAsObject<Manifest extends CogsPluginManifest> = DistributeObject<
   {
-    [Name in EventNameToCogs<Manifest>]: TypeFromCogsValueType<Extract<DeepMutable<EventToCogs<Manifest>>, { name: Name }>['value']>;
+    [Name in EventNameToCogs<Manifest>]: 
+      Extract<DeepMutable<EventToCogs<Manifest>>, { name: Name }> extends { name: Name; value: infer V extends CogsValueType } ? TypeFromCogsValueType<V> :
+      Extract<DeepMutable<EventToCogs<Manifest>>, { name: Name }> extends { name: Name; value: infer V extends { name: string; value: CogsValueType }[] } ? DistributeObject<
+        {
+          [ValueName in V[number]['name']]: TypeFromCogsValueType<V[number]['value']>
+        }
+      > : undefined;
   }
 >;