Skip to content

Commit 1f8cb63

Browse files
Bug-61 : ConvertFromArray was not working after we removed "invalid array" test
1 parent 82698a6 commit 1f8cb63

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

schema/schema.psm1

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,7 @@ class schemaArray {
233233
return (ConvertFrom-SchemaArray -Array $this)[0]
234234
}
235235
[object]ToObject([int]$Depth) {
236+
write-verbose $this |out-String
236237
return (ConvertFrom-SchemaArray -Array $this -depth $Depth)[0]
237238
}
238239
}
@@ -931,13 +932,13 @@ function ConvertTo-Element {
931932
Write-Verbose $oprop
932933
if ($oprop -eq '$ref') {
933934
if ($Object.items.($oprop).contains('definitions')) {
934-
$Result = Get-SchemaDefinition -Reference $Object.items.($oprop)
935+
$Result.items += Get-SchemaDefinition -Reference $Object.items.($oprop)
935936
}
936937
elseif ($Object.items.($oprop).contains('http')) {
937-
$Result = Get-SchemaReference -Reference $Object.items.($oprop)
938+
$Result.items += Get-SchemaReference -Reference $Object.items.($oprop)
938939
}
939940
else {
940-
$Result = Get-SchemaDefinition -Reference $Object.items.($oprop)
941+
$Result.items += Get-SchemaDefinition -Reference $Object.items.($oprop)
941942
}
942943
} else {
943944
$Result.items += ($Object.items.$oprop.GetEnumerator() | ForEach-Object { ((New-SchemaProperty -Name $oprop -Value (ConvertTo-SchemaElement -object $_) -Array $oprop)) })
@@ -1047,10 +1048,11 @@ function ConvertFrom-Array {
10471048
Write-Verbose "ConvertFrom-Array: Calculated: $($Depth)"
10481049
foreach ($item in $Array.items) {
10491050
Write-Verbose "ConvertFrom-Array: Found: $($item |Out-string)"
1050-
foreach ($key in $item.psobject.Properties.name) {
1051-
Write-Verbose "ConvertFrom-Array: Found: $($key)"
1052-
$retVal += (ConvertFrom-SchemaObject -Object $item.$key -depth $Depth)
1053-
}
1051+
# foreach ($key in $item.psobject.Properties.name) {
1052+
# Write-Verbose "ConvertFrom-Array: Found: $($key)"
1053+
# $retVal += (ConvertFrom-SchemaObject -Object $item.$key -depth $Depth)
1054+
$retVal += (ConvertFrom-SchemaObject -Object $item -depth $Depth)
1055+
# }
10541056
}
10551057
}
10561058
return $retVal

0 commit comments

Comments
 (0)