SKA-778: multidimensional arrays (#188)

* SKA-778: add multidimensional array ser/des

* SKA-778: handle optional nested arrays

Author: KyllianAubry

.github/workflows/build-test-internal.yaml

@@ -99,6 +99,6 @@ jobs:
     uses: pnd/sil-kit-fmu-importer-supplements/.github/workflows/testAutomation.yaml@main
     with:
       fmu-importer-version: 1.5.0
-      branch-name: ${{ github.ref_name }}
+      branch-name: ${{ github.head_ref }}
       commit-full-sha: ${{ github.sha }}
     secrets: inherit

FmuImporter/FmiBridge/Binding/Helper/ReturnVariable.cs

@@ -14,6 +14,7 @@ public struct Variable
     public IntPtr[] ValueSizes;
     public bool IsScalar;
     public VariableTypes Type;
+    public ulong[]? Dimensions;
   }
 
   public Variable[] ResultArray;
@@ -47,7 +48,8 @@ public static ReturnVariable CreateReturnVariable<T>(
         ValueSizes = Array.Empty<IntPtr>(),
         Values = new object[arrayLength],
         Type = modelVar.VariableType,
-        IsScalar = modelVar.IsScalar
+        IsScalar = modelVar.IsScalar,
+        Dimensions = modelVar.Dimensions
       };
       for (ulong j = 0; j < arrayLength; j++)
       {
@@ -88,7 +90,8 @@ public static ReturnVariable CreateReturnVariable<T>(
         // T ~ Array of Binaries -> IntPtr[]
         Values = new object[arrayLength],
         Type = modelVar.VariableType,
-        IsScalar = modelVar.IsScalar
+        IsScalar = modelVar.IsScalar,
+        Dimensions = modelVar.Dimensions
       };
       for (ulong j = 0; j < arrayLength; j++)
       {

FmuImporter/FmiBridge/Supplements/Serializer.cs

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) Vector Informatik GmbH. All rights reserved.
 
+using System.Collections;
 using System.Text;
 using Fmi.Exceptions;
 using Fmi.FmiModel.Internal;
@@ -11,6 +12,18 @@ public class Serializer
 {
   public static byte[] Serialize(object data, Variable variable, List<int> binSizes)
   {
+    // handle nested lists recursively
+    if (data is IList and not Array)
+    {
+      var nestedList = (IList)data;
+      var result = new List<byte>();
+      foreach (var entry in nestedList)
+      {
+        result.AddRange(Serialize(entry!, variable, binSizes));
+      }
+      return result.ToArray();
+    }
+
     // there are no binSizes by default
     switch (variable.VariableType)
     {

FmuImporter/FmuImporter/Config/ParserExtensions/ParameterValueTypeConverter.cs

@@ -27,7 +27,7 @@ public object ReadYaml(IParser parser, Type type)
       return new ParameterValue(ParseScalar(scalar));
     }
 
-    throw new NotSupportedException("A parameter's \"Value\" attribute supports scalars or list of scalars only.");
+    throw new NotSupportedException("A parameter's \"Value\" attribute supports scalars or arrays only.");
   }
 
   private static object ParseScalar(Scalar scalar)
@@ -63,22 +63,34 @@ private static object ParseScalar(Scalar scalar)
   }
 
   private static ParameterValue StartParsingSequence(IParser parser)
+  {
+    return new ParameterValue(ParseSequence(parser));
+  }
+
+  private static List<object> ParseSequence(IParser parser)
   {
     var resultList = new List<object>();
     while (!parser.Accept<SequenceEnd>(out _))
     {
-      if (parser.TryConsume<Scalar>(out var scalar))
+      if (parser.TryConsume<SequenceStart>(out _))
+      {
+        resultList.Add(ParseSequence(parser));
+      }
+      else if (parser.TryConsume<Scalar>(out var scalar))
       {
         resultList.Add(ParseScalar(scalar));
       }
       else
       {
-        throw new NotSupportedException("A parameter's \"Value\" attribute supports scalars or list of scalars only.");
+        var current = parser.Current;
+        throw new NotSupportedException(
+          $"A parameter's \"Value\" attribute supports scalars or arrays only. " +
+          $"Unexpected member '{current?.GetType().Name}' at {current?.Start}.");
       }
     }
 
     parser.MoveNext();
-    return new ParameterValue(resultList);
+    return resultList;
   }
 
   public void WriteYaml(IEmitter emitter, object? value, Type type)