Slight cleanup

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

Author: gabriel-samfira

lib/netstandard2.0/PowerShellYamlSerializer.dll

@@ -357,9 +357,7 @@ function ConvertFrom-Yaml {
         $d = ''
     }
     process {
-        if ($Yaml -is [string]) {
-            $d += $Yaml + "`n"
-        }
+        $d += $Yaml + "`n"
     }
 
     end {
@@ -435,8 +433,7 @@ function ConvertTo-Yaml {
 
         [Parameter(ParameterSetName = 'NoOptions')]
         [switch]$JsonCompatible,
-        [switch]$UseFlowStyle,
-        
+
         [switch]$KeepArray,
 
         [switch]$Force
@@ -450,7 +447,7 @@ function ConvertTo-Yaml {
         }
     }
     end {
-        if ($d -eq $null -or $d.Count -eq 0) {
+        if ($null -eq $d -or $d.Count -eq 0) {
             return
         }
         if ($d.Count -eq 1 -and !($KeepArray)) {
@@ -465,11 +462,8 @@ function ConvertTo-Yaml {
             if ((Test-Path $OutFile) -and !$Force) {
                 throw 'Target file already exists. Use -Force to overwrite.'
             }
-            $wrt = New-Object 'System.IO.StreamWriter' $OutFile
-        } else {
-            $wrt = New-Object 'System.IO.StringWriter'
         }
-    
+
         if ($PSCmdlet.ParameterSetName -eq 'NoOptions') {
             $Options = 0
             if ($JsonCompatible) {
@@ -478,18 +472,25 @@ function ConvertTo-Yaml {
             }
         }
 
+        if ($OutFile) {
+            $wrt = New-Object 'System.IO.StreamWriter' $OutFile
+        } else {
+            $wrt = New-Object 'System.IO.StringWriter'
+        }
+
         try {
             $serializer = Get-Serializer $Options
             $serializer.Serialize($wrt, $norm)
-        } catch {
-            $_
+
+            if ($OutFile) {
+                return
+            } else {
+                return $wrt.ToString()
+            }
         } finally {
-            $wrt.Close()
-        }
-        if ($OutFile) {
-            return
-        } else {
-            return $wrt.ToString()
+            if ($null -ne $wrt) {
+                $wrt.Dispose()
+            }
         }
     }
 }

powershell-yaml.psm1

@@ -76,7 +76,7 @@ public void WriteYaml(IEmitter emitter, object value, Type type, ObjectSerialize
         emitter.Emit(new MappingStart(AnchorName.Empty, TagName.Empty, true, mappingStyle));
         foreach (DictionaryEntry entry in hObj) {
             if(entry.Value == null) {
-                if (this.omitNullValues == true) {
+                if (this.omitNullValues) {
                     continue;
                 }
                 serializer(entry.Key, entry.Key.GetType());
@@ -87,10 +87,12 @@ public void WriteYaml(IEmitter emitter, object value, Type type, ObjectSerialize
             var objType = entry.Value.GetType();
             var val = entry.Value;
             if (entry.Value is PSObject nestedObj) {
-                var nestedType = nestedObj.BaseObject.GetType();
-                if (nestedType != typeof(System.Management.Automation.PSCustomObject)) {
-                    objType = nestedObj.BaseObject.GetType();
-                    val = nestedObj.BaseObject;
+                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 {
@@ -132,7 +134,7 @@ public void WriteYaml(IEmitter emitter, object value, Type type, ObjectSerialize
         emitter.Emit(new MappingStart(AnchorName.Empty, TagName.Empty, true, mappingStyle));
         foreach (var prop in psObj.Properties) {
             if (prop.Value == null) {
-                if (this.omitNullValues == true) {
+                if (this.omitNullValues) {
                     continue;
                 }
                 serializer(prop.Name, prop.Name.GetType());
@@ -142,10 +144,12 @@ public void WriteYaml(IEmitter emitter, object value, Type type, ObjectSerialize
                 var objType = prop.Value.GetType();
                 var val = prop.Value;
                 if (prop.Value is PSObject nestedPsObj) {
-                    var nestedType = nestedPsObj.BaseObject.GetType();
-                    if (nestedType != typeof(System.Management.Automation.PSCustomObject)) {
-                        objType = nestedPsObj.BaseObject.GetType();
-                        val = nestedPsObj.BaseObject;
+                    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);
@@ -197,7 +201,7 @@ public override void Emit(MappingStartEventInfo eventInfo, IEmitter emitter) {
 
     public override void Emit(SequenceStartEventInfo eventInfo, IEmitter emitter){
         eventInfo.Style = SequenceStyle.Flow;
-        nextEmitter.Emit(eventInfo, emitter);
+        base.Emit(eventInfo, emitter);
     }
 }
 
@@ -206,19 +210,19 @@ public FlowStyleSequenceEmitter(IEventEmitter next): base(next) {}
 
     public override void Emit(SequenceStartEventInfo eventInfo, IEmitter emitter){
         eventInfo.Style = SequenceStyle.Flow;
-        nextEmitter.Emit(eventInfo, emitter);
+        base.Emit(eventInfo, emitter);
     }
 }
 
-class BuilderUtils {
+public class BuilderUtils {
     public static SerializerBuilder BuildSerializer(
         SerializerBuilder builder,
         bool omitNullValues = false,
         bool useFlowStyle = false,
         bool useSequenceFlowStyle = false,
         bool jsonCompatible = false) {
 
-        if (jsonCompatible == true) {
+        if (jsonCompatible) {
             useFlowStyle = true;
             useSequenceFlowStyle = true;
         }
@@ -228,14 +232,14 @@ public static SerializerBuilder BuildSerializer(
             .WithTypeConverter(new BigIntegerTypeConverter())
             .WithTypeConverter(new IDictionaryTypeConverter(omitNullValues, useFlowStyle))
             .WithTypeConverter(new PSObjectTypeConverter(omitNullValues, useFlowStyle));
-        if (omitNullValues == true) {
+        if (omitNullValues) {
             builder = builder
                 .WithEmissionPhaseObjectGraphVisitor(args => new NullValueGraphVisitor(args.InnerVisitor));
         }
-        if (useFlowStyle == true) {
+        if (useFlowStyle) {
             builder = builder.WithEventEmitter(next => new FlowStyleAllEmitter(next));
         }
-        if (useSequenceFlowStyle == true) {
+        if (useSequenceFlowStyle) {
             builder = builder.WithEventEmitter(next => new FlowStyleSequenceEmitter(next));
         }