Add helper function

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>

Author: gabriel-samfira

lib/netstandard2.0/PowerShellYamlSerializer.dll

@@ -33,6 +33,26 @@ public override bool EnterMapping(IObjectDescriptor key, IObjectDescriptor value
     }
 }
 
+internal static class PSObjectHelper {
+    /// <summary>
+    /// Unwraps a PSObject to its BaseObject if the BaseObject is not a PSCustomObject.
+    /// </summary>
+    /// <param name="obj">The object to potentially unwrap</param>
+    /// <param name="unwrappedType">The type of the unwrapped object</param>
+    /// <returns>The unwrapped object if it was a PSObject wrapping a non-PSCustomObject, otherwise the original object</returns>
+    public static object UnwrapIfNeeded(object obj, out Type unwrappedType) {
+        if (obj is PSObject psObj && psObj.BaseObject != null) {
+            var baseType = psObj.BaseObject.GetType();
+            if (baseType != typeof(System.Management.Automation.PSCustomObject)) {
+                unwrappedType = baseType;
+                return psObj.BaseObject;
+            }
+        }
+        unwrappedType = obj?.GetType();
+        return obj;
+    }
+}
+
 public class BigIntegerTypeConverter : IYamlTypeConverter {
     public bool Accepts(Type type) {
         return typeof(BigInteger).IsAssignableFrom(type);
@@ -84,20 +104,8 @@ public void WriteYaml(IEmitter emitter, object value, Type type, ObjectSerialize
                 continue;
             }
             serializer(entry.Key, entry.Key.GetType());
-            var objType = entry.Value.GetType();
-            var val = entry.Value;
-            if (entry.Value is PSObject nestedObj) {
-                if (nestedObj.BaseObject != null) {
-                    var nestedType = nestedObj.BaseObject.GetType();
-                    if (nestedType != typeof(System.Management.Automation.PSCustomObject)) {
-                        objType = nestedObj.BaseObject.GetType();
-                        val = nestedObj.BaseObject;
-                    }
-                }
-                serializer(val, objType);
-            } else {
-                serializer(entry.Value, entry.Value.GetType());
-            }
+            var unwrapped = PSObjectHelper.UnwrapIfNeeded(entry.Value, out var unwrappedType);
+            serializer(unwrapped, unwrappedType);
         }
         emitter.Emit(new MappingEnd());
     }
@@ -126,7 +134,9 @@ public object ReadYaml(IParser parser, Type type, ObjectDeserializer rootDeseria
 
     public void WriteYaml(IEmitter emitter, object value, Type type, ObjectSerializer serializer) {
         var psObj = (PSObject)value;
-        if (!typeof(IDictionary).IsAssignableFrom(psObj.BaseObject.GetType()) && !typeof(PSCustomObject).IsAssignableFrom(psObj.BaseObject.GetType())) {
+        if (psObj.BaseObject != null &&
+            !typeof(IDictionary).IsAssignableFrom(psObj.BaseObject.GetType()) &&
+            !typeof(PSCustomObject).IsAssignableFrom(psObj.BaseObject.GetType())) {
             serializer(psObj.BaseObject, psObj.BaseObject.GetType());
             return;
         }
@@ -141,19 +151,8 @@ public void WriteYaml(IEmitter emitter, object value, Type type, ObjectSerialize
                 emitter.Emit(new Scalar(AnchorName.Empty, "tag:yaml.org,2002:null", "", ScalarStyle.Plain, true, false));
             } else {
                 serializer(prop.Name, prop.Name.GetType());
-                var objType = prop.Value.GetType();
-                var val = prop.Value;
-                if (prop.Value is PSObject nestedPsObj) {
-                    if (nestedPsObj.BaseObject != null) {
-                        var nestedType = nestedPsObj.BaseObject.GetType();
-                        if (nestedType != typeof(System.Management.Automation.PSCustomObject)) {
-                            objType = nestedPsObj.BaseObject.GetType();
-                            val = nestedPsObj.BaseObject;
-                        }
-                    }
-                }
-                serializer(val, objType);
-
+                var unwrapped = PSObjectHelper.UnwrapIfNeeded(prop.Value, out var unwrappedType);
+                serializer(unwrapped, unwrappedType);
             }
         }
         emitter.Emit(new MappingEnd());