Resolves JSON tests

cdhunt · Jan 5, 2024 · 70f2f3b · 70f2f3b
1 parent 63cd49f
commit 70f2f3b
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 5 deletions.
diff --git a/src/private/ConvertFrom-PSCustomObject.ps1 b/src/private/ConvertFrom-PSCustomObject.ps1
@@ -0,0 +1,23 @@
+function ConvertFrom-PSCustomObject ($Object) {
+
+    foreach ($item in $Object) {
+
+        $itemType = $item.GetType()
+
+        if ($itemType.Name -eq 'PSCustomObject') {
+            $keys = $item | Get-Member -MemberType NoteProperty
+
+            $hash = @{}
+            foreach ($key in $keys) {
+                $name = $key.Name
+                $value = @(ConvertFrom-PSCustomObject $item.$name)
+                $hash.Add($name, $value)
+            }
+            $hash | Write-Output
+        }
+
+        if ($itemType.IsValueType -or $itemType.Name -eq 'String') {
+            $item | Write-Output
+        }
+    }
+}
diff --git a/src/private/Import-JsonConfigData.ps1 b/src/private/Import-JsonConfigData.ps1
@@ -0,0 +1,27 @@
+function Import-JsonConfigData {
+    [CmdletBinding()]
+    param (
+        [Parameter(Mandatory,
+            Position = 0,
+            ValueFromPipeline,
+            ValueFromPipelineByPropertyName)]
+        [Alias("PSPath")]
+        [ValidateNotNullOrEmpty()]
+        [string]
+        $Path
+    )
+
+    $content = Get-Content -Path $Path -Raw
+
+    switch ($PSVersionTable.PSVersion.Major) {
+        5 {
+            $psObject = $content | ConvertFrom-Json
+            ConvertFrom-PSCustomObject $psObject
+            break
+        }
+        Default {
+            $content | ConvertFrom-Json -AsHashtable
+        }
+    }
+
+}
diff --git a/src/public/Import-ConfigData.ps1 b/src/public/Import-ConfigData.ps1
@@ -57,10 +57,7 @@ function Import-ConfigData {
             '.toml' { Import-TomlConfigData -Path $Path; break }
             '.yaml' { Import-YamlConfigData -Path $Path; break }
             '.yml' { Import-YamlConfigData -Path $Path; break }
-            '.json' {
-                $content = Get-Content -Path $Path -Raw
-                $content | ConvertFrom-Json -AsHashtable; break
-            }
+            '.json' { Import-JsonConfigData -Path $Path; break }
         }
     }
 

diff --git a/test/Import-ConfigData.Tests.ps1 b/test/Import-ConfigData.Tests.ps1
@@ -4,6 +4,30 @@ BeforeAll {
 
 }
 
+Describe 'ConvertFrom-PSCustomObject' {
+    Context 'Object Array' {
+        BeforeAll {
+            . "$PSScriptRoot/../publish/Import-ConfigData/private/ConvertFrom-PSCustomObject.ps1"
+        }
+
+        AfterAll {
+            Remove-Item "function:/ConvertFrom-PSCustomObject"
+        }
+
+        It 'Should return an array of two objects' {
+            $sut = Get-Content -Path "$PSScriptRoot/Test2/TestConfig.json" -Raw | ConvertFrom-Json
+            $result = ConvertFrom-PSCustomObject $sut
+            $result.ObjectArray.Count | Should -Be 2
+        }
+
+        It 'Should return an array of one object' {
+            $sut = Get-Content -Path "$PSScriptRoot/Test3/TestConfig.json" -Raw | ConvertFrom-Json
+            $result = ConvertFrom-PSCustomObject $sut
+            $result.plan.Count | Should -Be 1
+        }
+    }
+}
+
 Describe 'Import-ConfigData' {
     Context 'Simple Object' {
         It 'Should import a <type> file' -ForEach @(

diff --git a/test/test3/TestConfig.psd1 b/test/test3/TestConfig.psd1
@@ -1,5 +1,5 @@
 @{
-    Plan = @(
+    plan = @(
         @{
             label   = "google"
             url     = "https://www.google.com"