Merge pull request #22 from StartAutomating/PropertySetSupport

Property set support

Author: StartAutomating

EZOut.psd1

@@ -1,6 +1,6 @@
 @{
     ModuleToProcess = 'EZOut.psm1'
-    ModuleVersion = '1.8.4'
+    ModuleVersion = '1.8.5'
     GUID = 'cef786f0-8a0b-4a5d-a2c6-b433095354cd'
     Author = 'James Brundage'
     CompanyName = 'Start-Automating'

EZOut.tests.ps1

@@ -1101,4 +1101,48 @@ describe 'Import-FormatView' {
             Pop-Location
         }
     }
+}
+
+describe 'Import-TypeView' {
+    it 'Can create type files out of directories' {
+        $tmp =
+            if ($env:PIPELINE_WORKSPACE) { $env:PIPELINE_WORKSPACE } 
+            elseif ($env:TEMP) { "$env:TEMP" } 
+            else { "/$tmp" }
+        $tmpDir = New-Item -ItemType Directory -Path (Join-Path $tmp "$(Get-Random)") 
+        $testTypeDir = New-Item -ItemType Directory -Path (Join-Path $tmpDir.FullName "TestType$($tmpDir.Name)")
+        Push-Location $testTypeDir.FullName
+        Set-Content get_Foo.txt Foo
+        Set-Content Alias.psd1 '@{Foo2="Foo"}'
+        Set-Content DefaultDisplay.txt RandomNumber
+        Set-Content get_RandomNumber.ps1 {Get-Random}
+        Set-Content set_RandomNumber.ps1 {$args}
+        Set-Content .HiddenProperty.txt Value
+        Set-Content XmlProperty.xml '<Message language="en-us">hello</Message>'
+        Set-Content DefaultDisplay.txt RandomNumber
+        'Foo', 'RandomNumber' -join [Environment]::NewLine | 
+            Set-Content Example.PropertySet.txt
+        
+        $typesXml = 
+            [xml](Import-TypeView -FilePath $tmpDir.FullName | Out-TypeData)
+        
+        $typesXml | Add-TypeData
+        $o = [PSCustomObject]@{PSTypeName=$testTypeDir.Name;N=1}
+        $o.RandomNumber | Should -BeGreaterThan 1
+        $o.HiddenProperty | Should -Be Value
+        Pop-Location
+        Remove-Item -Recurse -Force $tmpDir
+        Clear-TypeData
+    }
+    context 'Fault Tolerance' {
+        it 'Will error if the file does not exist' {
+            Get-Module EZOut |
+                Split-Path |
+                Join-Path -ChildPath Formatting |
+                Push-Location
+
+            { Import-TypeView .\ThisFileDoesNotExist.types.xml -ErrorAction Stop } | should -Throw
+            Pop-Location
+        }
+    }
 }

Import-TypeView.ps1

@@ -108,6 +108,7 @@
             $eventNames = @()
             $scriptPropertyGet = [Ordered]@{}
             $scriptPropertySet = [Ordered]@{}
+            $propertySets = [Ordered]@{}
             $aliasProperty = [Ordered]@{}
             $noteProperty = [Ordered]@{}
             $hideProperty = [Collections.Generic.List[string]]::new()
@@ -158,7 +159,7 @@
                         $scriptPropertySet[$propertyName] = $scriptBlock
                     }
                 }
-                elseif ($isScript -and         # If this is a script and it's an event 
+                elseif ($isScript -and         # If this is a script and it's an event
                     ($itemName -match '^@' -or # (prefaced with @ -or ending with .event.ps1)
                      $itemName -match '\.event\.ps1$'
                     )
@@ -200,6 +201,11 @@
                                 $WriteTypeViewSplat.DefaultDisplay =
                                     $fileText -split '(?>\r\n|\n)' -ne ''
                             }
+
+                            elseif ($itemName -like '*.propertySet') { # If it's a property set file (.propertyset.txt)
+                                $propertySets[$itemName -replace '\.propertySet$'] = # Create a property set with the file name.
+                                    $fileText -split '(?>\r\n|\n)' -ne '' # Each line will be treated as a name of a property.
+                            }
                             elseif ($itemName -match '^@') {
                                 $eventNames += $itemName.Substring(1)
                             }
@@ -330,6 +336,9 @@ $stream.Dispose()
             if ($aliasProperty.Count) {
                 $WriteTypeViewSplat.AliasProperty = $aliasProperty
             }
+            if ($propertySets.Count) {
+                $WriteTypeViewSplat.PropertySet = $propertySets
+            }
             if ($scriptPropertyGet.Count -or $scriptPropertySet.Count) {
                 $scriptProperties = [Ordered]@{}
                 foreach ($k in $scriptPropertyGet.Keys) {