Refactor input/output classes to avoid naming conflicts in the genera…

…ted types

OpenVR2WS/Input/DataRemoteSetting.cs

@@ -8,5 +8,5 @@ internal class DataRemoteSetting
     public string Section = "";
     public string Setting = "";
     public string Value = "";
-    public TypeEnum Type = TypeEnum.None;
+    public InputMessageTypeEnum Type = InputMessageTypeEnum.None;
 }

OpenVR2WS/Input/DataSetting.cs

@@ -7,5 +7,5 @@ internal class DataSetting
 {
     public string Section = "";
     public string Setting = "";
-    public Output.TypeEnum Type = Output.TypeEnum.None;
+    public Output.OuputTypeEnum Type = Output.OuputTypeEnum.None;
 }

OpenVR2WS/Input/Request.cs → OpenVR2WS/Input/InputMessage.cs

@@ -6,9 +6,9 @@
 namespace OpenVR2WS.Input;
 
 [ExportTsClass]
-internal class Request
+internal class InputMessage
 {
-    public RequestKeyEnum Key = RequestKeyEnum.None;
+    public InputMessageKeyEnum Key = InputMessageKeyEnum.None;
     public dynamic? Data;
     public string? Password = null;
     public string? Nonce = null;

OpenVR2WS/Input/RequestKeyEnum.cs → OpenVR2WS/Input/InputMessageKeyEnum.cs

@@ -1,6 +1,6 @@
 namespace OpenVR2WS.Input;
 
-internal enum RequestKeyEnum
+internal enum InputMessageKeyEnum
 {
     None,
     CumulativeStats,

OpenVR2WS/Input/TypeEnum.cs → OpenVR2WS/Input/InputMessageTypeEnum.cs

@@ -1,6 +1,6 @@
 namespace OpenVR2WS.Input;
 
-internal enum TypeEnum
+internal enum InputMessageTypeEnum
 {
     None,
     String,

OpenVR2WS/Output/TypeEnum.cs → OpenVR2WS/Output/OuputTypeEnum.cs

@@ -1,6 +1,6 @@
 namespace OpenVR2WS.Output;
 
-internal enum TypeEnum
+internal enum OuputTypeEnum
 {
     None,
     String,

OpenVR2WS/Output/OutputMessage.cs

@@ -0,0 +1,65 @@
+using OpenVR2WS.Input;
+using TypeGen.Core.TypeAnnotations;
+
+namespace OpenVR2WS.Output;
+
+[ExportTsInterface]
+internal class OutputMessage
+{
+    public OutputMessageTypeEnum Type = OutputMessageTypeEnum.Undefined;
+    public InputMessageKeyEnum Key = InputMessageKeyEnum.None;
+    public string Message = "";
+    public dynamic? Data = null;
+    public string? Nonce = null;
+
+    public static OutputMessage CreateError(string message, dynamic? shape = null, string? nonce = null)
+    {
+        return new OutputMessage
+        {
+            Type = OutputMessageTypeEnum.Error,
+            Message = message,
+            Data = shape,
+            Nonce = nonce
+        };
+    }
+
+    public static OutputMessage CreateMessage(string message, string? nonce = null)
+    {
+        return new OutputMessage
+        {
+            Type = OutputMessageTypeEnum.Message,
+            Message = message,
+            Nonce = nonce
+        };
+    }
+
+    public static OutputMessage CreateCommand(InputMessageKeyEnum inputMessageKey, dynamic data, string? nonce = null)
+    {
+        return new OutputMessage
+        {
+            Type = OutputMessageTypeEnum.Result,
+            Key = inputMessageKey,
+            Data = data,
+            Nonce = nonce
+        };
+    }
+
+    public static OutputMessage CreateVREvent(dynamic data)
+    {
+        return new OutputMessage
+        {
+            Type = OutputMessageTypeEnum.VREvent,
+            Data = data
+        };
+    }
+
+    public static OutputMessage Create(OutputMessageTypeEnum type, dynamic data, string? nonce = null)
+    {
+        return new OutputMessage
+        {
+            Type = type,
+            Data = data,
+            Nonce = nonce
+        };
+    }
+}

OpenVR2WS/Output/ResponseTypeEnum.cs → OpenVR2WS/Output/OutputMessageTypeEnum.cs

@@ -1,6 +1,6 @@
 namespace OpenVR2WS.Output;
 
-public enum ResponseTypeEnum
+public enum OutputMessageTypeEnum
 {
     Undefined,
     Error,

OpenVR2WS/Properties/Resources.resx

@@ -125,6 +125,6 @@
     <value>..\resources\Logo.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Version" xml:space="preserve">
-    <value>v2.4.2</value>
+    <value>v2.4.3</value>
   </data>
 </root>

OpenVR2WS/tgconfig.json

@@ -8,5 +8,6 @@
   "generateFromAssemblies": true,
   "clearOutputDirectory": true,
   "csNullableTranslation": "null",
-  "singleQuotes": true
+  "singleQuotes": true,
+  "explicitPublicAccessor": true
 }

Types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openvr2ws-types",
-  "version": "2.4.2",
+  "version": "2.4.3",
   "description": "TypeScript type definitions for the input and output of OpenVR2WS.",
   "types": "types/index.d.ts",
   "repository": {