Fixed generating classes in CS script

Author: trueromanus

src/FlowBridger/EmbeddedScripts/Embedded.CSharp.Import.js

@@ -188,35 +188,41 @@ function defineDelegate(method) {
 }
 
 function defineEventClassProperties(event) {
+    const lines = []
 
+    for (const method of event.Parameters) {
+        lines.push(`            public ${getInternalDataType(method.ParameterType)} ${method.Name} { get; set; }`);
+    }
+
+    return lines.join('\n');
 }
 
 function defineEventClass(event) {
     return `
-    public class Event${event.Name} {
+        public class Event${event.Name} {
 
-        private static int m_iterator = 0;
+            private static int m_iterator = 0;
 
-        private static ConcurrentDictionary<int, EventClick1> m_notCompletedEvents = new ConcurrentDictionary<int, EventClick1> ();
+            private static System.Collections.Concurrent.ConcurrentDictionary<int, Event${event.Name}> m_notCompletedEvents = new System.Collections.Concurrent.ConcurrentDictionary<int, Event${event.Name}> ();
 
-        ${defineEventClassProperties(event)}
+${defineEventClassProperties(event)}
 
-        public static Event${event.Name} CreateEvent () {
-            var newEvent = new Event${event.Name} ();
-            var index = Interlocked.Increment ( ref m_iterator );
-            var completed = m_notCompletedEvents.TryAdd ( index, newEvent );
-            if ( completed ) throw new Exception ( "Can't add new event to not completed list!" );
+            public static Event${event.Name} CreateEvent () {
+                var newEvent = new Event${event.Name} ();
+                var index = Interlocked.Increment ( ref m_iterator );
+                var completed = m_notCompletedEvents.TryAdd ( index, newEvent );
+                if ( completed ) throw new Exception ( "Can't add new event to not completed list!" );
 
-            return newEvent;
-        }
+                return newEvent;
+            }
 
-        public static void CompleteEvent ( int index ) {
-            if ( !m_notCompletedEvents.ContainsKey ( index ) ) return;
+            public static void CompleteEvent ( int index ) {
+                if ( !m_notCompletedEvents.ContainsKey ( index ) ) return;
 
-            m_notCompletedEvents.TryRemove ( index, out var _ );
-        }
+                m_notCompletedEvents.TryRemove ( index, out var _ );
+            }
 
-    }
+        }
     `;
 }
 
@@ -248,8 +254,10 @@ function defineFile(schema) {
         result += defineMethod(globalMethod);
     }
 
-    var eventClasses = schema.GlobalOptions["CsEventClass"] === "enabled";
-    if (eventClasses) defineEventClasses(schema.Events);
+    if (schema.GlobalOptions["CsEventClass"]) {
+        var eventClasses = schema.GlobalOptions["CsEventClass"] === "enabled";
+        if (eventClasses) result += defineEventClasses(schema.Events);
+    }
 
     result += defineEndFile();
 

src/FlowBridgerTestLibrary/FlowBridger.cs

@@ -185,5 +185,83 @@ public static void EventClick3CompleteGet ( int eventId ) {
 
         public static partial void EventClick3CompleteGetInternal ( int eventId );
 
+        public class EventClick1 {
+
+            private static int m_iterator = 0;
+
+            private static System.Collections.Concurrent.ConcurrentDictionary<int, EventClick1> m_notCompletedEvents = new System.Collections.Concurrent.ConcurrentDictionary<int, EventClick1> ();
+
+            public int Order { get; set; }
+            public string Name { get; set; }
+
+            public static EventClick1 CreateEvent () {
+                var newEvent = new EventClick1 ();
+                var index = Interlocked.Increment ( ref m_iterator );
+                var completed = m_notCompletedEvents.TryAdd ( index, newEvent );
+                if ( completed ) throw new Exception ( "Can't add new event to not completed list!" );
+
+                return newEvent;
+            }
+
+            public static void CompleteEvent ( int index ) {
+                if ( !m_notCompletedEvents.ContainsKey ( index ) ) return;
+
+                m_notCompletedEvents.TryRemove ( index, out var _ );
+            }
+
+        }
+    
+        public class EventClick2 {
+
+            private static int m_iterator = 0;
+
+            private static System.Collections.Concurrent.ConcurrentDictionary<int, EventClick2> m_notCompletedEvents = new System.Collections.Concurrent.ConcurrentDictionary<int, EventClick2> ();
+
+            public int Order { get; set; }
+            public int Items { get; set; }
+
+            public static EventClick2 CreateEvent () {
+                var newEvent = new EventClick2 ();
+                var index = Interlocked.Increment ( ref m_iterator );
+                var completed = m_notCompletedEvents.TryAdd ( index, newEvent );
+                if ( completed ) throw new Exception ( "Can't add new event to not completed list!" );
+
+                return newEvent;
+            }
+
+            public static void CompleteEvent ( int index ) {
+                if ( !m_notCompletedEvents.ContainsKey ( index ) ) return;
+
+                m_notCompletedEvents.TryRemove ( index, out var _ );
+            }
+
+        }
+    
+        public class EventClick3 {
+
+            private static int m_iterator = 0;
+
+            private static System.Collections.Concurrent.ConcurrentDictionary<int, EventClick3> m_notCompletedEvents = new System.Collections.Concurrent.ConcurrentDictionary<int, EventClick3> ();
+
+            public int Order { get; set; }
+            public int Items { get; set; }
+
+            public static EventClick3 CreateEvent () {
+                var newEvent = new EventClick3 ();
+                var index = Interlocked.Increment ( ref m_iterator );
+                var completed = m_notCompletedEvents.TryAdd ( index, newEvent );
+                if ( completed ) throw new Exception ( "Can't add new event to not completed list!" );
+
+                return newEvent;
+            }
+
+            public static void CompleteEvent ( int index ) {
+                if ( !m_notCompletedEvents.ContainsKey ( index ) ) return;
+
+                m_notCompletedEvents.TryRemove ( index, out var _ );
+            }
+
+        }
+    
     }
 }

src/FlowBridgerTestLibrary/FlowBridgerExportsHelpers.cs

@@ -49,7 +49,7 @@ public static partial nint CallbackReturnMethodInternal () {
                     delegate* unmanaged[Cdecl]< int, void > fp = &MyManagedCallback;
                     return (nint) fp;
                 }
-            } catch(Exception e) {
+            } catch ( Exception e ) {
                 Console.WriteLine ( e.Message );
                 return 0;
             }
@@ -72,7 +72,7 @@ public static partial void EventClick1CompleteSetInternal ( int eventId ) {
         }
 
         public static partial int EventClick1GetOrderInternal ( int eventId ) {
-            return 0; 
+            return 0;
         }
 
         public static partial string EventClick1GetNameInternal ( int eventId ) {