Merge pull request #208 from StartAutomating/EZ-Updates

EZOut 2.0.4

Author: StartAutomating

.github/workflows/TestReleaseAndPublish.yml

@@ -585,8 +585,11 @@ jobs:
       - name: Initialize Splatter
         uses: StartAutomating/Splatter@main
         id: Splatter
-      - name: BuildPipeScript
+      - name: PipeScript
         uses: StartAutomating/PipeScript@main
+        id: PipeScript
+        with: 
+          serial: true
       - name: Run EZOut  (on master)
         if: ${{github.ref_name == 'master'}}
         uses: StartAutomating/EZOut@master

Build/GitHub/Jobs/BuildEZOut.psd1

@@ -21,7 +21,14 @@
             uses = 'StartAutomating/Splatter@main'
             id = 'Splatter'
         },
-        'RunPipeScript',
+        @{
+            name = 'PipeScript'
+            uses = 'StartAutomating/PipeScript@main'
+            id = 'PipeScript'
+            with = @{
+                serial = $true
+            }
+        },
         @{
             name = 'Run EZOut  (on master)'
             if   = '${{github.ref_name == ''master''}}'

CHANGELOG.md

@@ -1,3 +1,10 @@
+## EZOut 2.0.4:
+
+* Write-FormatViewExpression/Write-FormatCustomView now support -Frame, -LeftIndent, -RightIndent, -FirstLineHanging, -FirstLineIndent ( Fixes #164 )
+* Push-FormatData/Push-TypeData now create unique files per-process (Fixes #205 )  
+
+Thanks @NinMonkey !
+
 ## EZOut 2.0.3:
 
 * Mounting EZOut as a drive (#200)

Commands/Format.PS1XML/Out-FormatData.ps1

@@ -1,4 +1,5 @@
 function Out-FormatData {
+
     <#
     .Synopsis
         Takes a series of format views and format actions and outputs a format data XML
@@ -44,13 +45,15 @@ function Out-FormatData {
     # If it is a dictionary, the keys must a be a `[string]` or `[regex]` defining a pattern, and the value will be the path.
     [ValidateScript({
     $validTypeList = [System.String],[System.Collections.IDictionary]
+    
     $thisType = $_.GetType()
     $IsTypeOk =
         $(@( foreach ($validType in $validTypeList) {
             if ($_ -as $validType) {
                 $true;break
             }
         }))
+    
     if (-not $isTypeOk) {
         throw "Unexpected type '$(@($thisType)[0])'.  Must be 'string','System.Collections.IDictionary'."
     }
@@ -74,6 +77,7 @@ $Aspect = {
         $selectionSets = ""
 
         function findUsedParts {
+        
                             param(
                                 [Parameter(Mandatory,ValueFromPipelineByPropertyName)]
                                 [Alias('InnerText','ScriptBlock','ScriptContents')]
@@ -197,6 +201,7 @@ $Aspect = {
 
         }
         filter ReplaceParts {
+        
                             if ($DebugPreference -ne 'silentlyContinue') {
                                 $in = $_
                                 if ($in.InnerText) { return $in.InnerText}
@@ -414,6 +419,7 @@ $Aspect = {
         if ($OutputPath) {
             $alreadyExportedTypeNames = @{}
             $allTypeNames = @()
+
             if ($outputPath -is [string]) {
                 $createdOutputFile = New-Item -ItemType File -Path $OutputPath -Force
                 if (-not $createdOutputFile) { return }
@@ -482,6 +488,7 @@ $Aspect = {
         }
 
     }
+
 }
 
 

Commands/Format.PS1XML/Push-FormatData.ps1

@@ -23,9 +23,35 @@
     [Alias('ScriptBlock')]
     [ScriptBlock[]]$Action,
 
-    # The indentation depth of the custom control
-    [Parameter(ValueFromPipelineByPropertyName=$true)]
-    [int]$Indent,
+    # If set, will put the expression within a <Frame> element.
+    [Parameter(ValueFromPipelineByPropertyName)]
+    [switch]
+    $Frame,
+
+    # If provided, will indent by a number of characters.  This implies -Frame.
+    [Parameter(ValueFromPipelineByPropertyName)]
+    [Alias('Indent')]
+    [ValidateRange(0,1mb)]
+    [int]
+    $LeftIndent,
+
+    # If provided, will indent the right by a number of characters.  This implies -Frame.
+    [Parameter(ValueFromPipelineByPropertyName)]
+    [ValidateRange(0,1mb)]
+    [int]
+    $RightIndent,
+
+    # Specifies how many characters the first line of data is shifted to the left.  This implies -Frame.
+    [Parameter(ValueFromPipelineByPropertyName)]
+    [ValidateRange(0,1mb)]
+    [int]
+    $FirstLineHanging,
+
+    # Specifies how many characters the first line of data is shifted to the right.  This implies -Frame.
+    [Parameter(ValueFromPipelineByPropertyName)]
+    [ValidateRange(0,1mb)]
+    [int]
+    $FirstLineIndent,
 
     # If set, the content will be created as a control.  Controls can be reused by other formatters.
     [Switch]$AsControl,
@@ -86,12 +112,29 @@ $header = @"
     <CustomEntry>
         $entrySelectedBy
         <CustomItem>
-            $(if ($Indent) { "<Frame><LeftIndent>$Indent</LeftIndent><CustomItem>" } )
+            $(
+                if ($Frame -or $FirstLineHanging -or $LeftIndent -or $RightIndent -or $FirstLineIndent) {
+                    "
+                <Frame>
+                    $(
+                        if ($LeftIndent) { "<LeftIndent>$LeftIndent</LeftIndent>" }
+                        if ($RightIndent) { "<RightIndent>$RightIndent</RightIndent>" }
+                        if ($FirstLineHanging) { "<FirstLineHanging>$FirstLineHanging</FirstLineHanging>" }
+                        if ($FirstLineIndent) { "<FirstLineIndent>$FirstLineIndent</FirstLineIndent>" }
+                    )
+                    <CustomItem>
+                "
+                }
+            )            
 
 "@
 
 $footer = @"
-$(if ($indent) {"</CustomItem></Frame>"})
+$(    
+    if ($Frame -or $FirstLineHanging -or $LeftIndent -or $RightIndent -or $FirstLineIndent) {
+        "</CustomItem></Frame>"
+    }    
+)
         </CustomItem>
     </CustomEntry>
 "@
@@ -139,7 +182,7 @@ $([Security.SecurityElement]::Escape($VisibilityCondition[$c]))
                     </ExpressionBinding>"
                 }
             }
-
+                
         $entries += ( $header + $middle + $footer)
     }
 

Commands/Format.PS1XML/Write-FormatCustomView.ps1

@@ -20,29 +20,28 @@
     .Example
         # This will render the property 'Status' of the current object,
         # if the current object's 'Complete' property is $false.
-        Write-FormatViewExpression -Property Status -If { -not $_.Complete }
-
+        Write-FormatViewExpression -Property Status -If { -not $_.Complete }    
     #>
     [CmdletBinding(DefaultParameterSetName='ScriptBlock')]
     [OutputType([string])]
     [Alias('Show-CustomAction')]
     param(
     # The name of the control.  If this is provided, it will be used to display the property or script block.
-    [Parameter(ValueFromPipelineByPropertyName=$true)]
+    [Parameter(ValueFromPipelineByPropertyName)]
     [Alias('ActionName','Name')]
     [String]
     $ControlName,
 
     # If a property name is provided, then the custom action will show the contents
     # of the property
-    [Parameter(Mandatory=$true,ParameterSetName='Property',Position=0,ValueFromPipelineByPropertyName=$true)]
+    [Parameter(Mandatory=$true,ParameterSetName='Property',Position=0,ValueFromPipelineByPropertyName)]
     [Alias('PropertyName')]
     [String]
     $Property,
 
     # If a script block is provided, then the custom action shown in formatting
     # will be the result of the script block.
-    [Parameter(Mandatory=$true,ParameterSetName='ScriptBlock',Position=0,ValueFromPipelineByPropertyName=$true)]
+    [Parameter(Mandatory=$true,ParameterSetName='ScriptBlock',Position=0,ValueFromPipelineByPropertyName)]
     [ScriptBlock]
     $ScriptBlock,
 
@@ -53,7 +52,7 @@
     $If,
 
     # If provided, will output the provided text.  All other parameters are ignored.
-    [Parameter(Mandatory,ParameterSetName='Text',ValueFromPipelineByPropertyName=$true)]
+    [Parameter(Mandatory,ParameterSetName='Text',ValueFromPipelineByPropertyName)]
     [string]
     $Text,
 
@@ -73,10 +72,40 @@
     $ResourceID,
 
     # If provided, will output a <NewLine /> element.  All other parameters are ignored.
-    [Parameter(Mandatory=$true,ParameterSetName='NewLine',ValueFromPipelineByPropertyName=$true)]
+    [Parameter(Mandatory=$true,ParameterSetName='NewLine',ValueFromPipelineByPropertyName)]
     [switch]
     $Newline,
 
+    # If set, will put the expression within a <Frame> element.
+    [Parameter(ValueFromPipelineByPropertyName)]
+    [switch]
+    $Frame,
+
+    # If provided, will indent by a number of characters.  This implies -Frame.
+    [Parameter(ValueFromPipelineByPropertyName)]
+    [Alias('Indent')]
+    [ValidateRange(0,1mb)]
+    [int]
+    $LeftIndent,
+
+    # If provided, will indent the right by a number of characters.  This implies -Frame.
+    [Parameter(ValueFromPipelineByPropertyName)]
+    [ValidateRange(0,1mb)]
+    [int]
+    $RightIndent,
+
+    # Specifies how many characters the first line of data is shifted to the left.  This implies -Frame.
+    [Parameter(ValueFromPipelineByPropertyName)]
+    [ValidateRange(0,1mb)]
+    [int]
+    $FirstLineHanging,
+
+    # Specifies how many characters the first line of data is shifted to the right.  This implies -Frame.
+    [Parameter(ValueFromPipelineByPropertyName)]
+    [ValidateRange(0,1mb)]
+    [int]
+    $FirstLineIndent,
+
     # The name of one or more $psStyle properties to apply.
     # If $psStyle is present, this will use put these properties prior to an expression.
     # A $psStyle.Reset will be outputted after the expression.
@@ -157,7 +186,8 @@
     # With script blocks, the variables $N and $Number will be set to indicate the current iteration.
     [ValidateRange(1,10kb)]
     [uint32]
-    $Count = 1)
+    $Count = 1
+    )
 
     process {
         # If this is calling itself recursively in ScriptBlock
@@ -270,6 +300,21 @@ $if")
 </ExpressionBinding>
 "@
 
+if ($Frame -or $FirstLineHanging -or $LeftIndent -or $RightIndent -or $FirstLineIndent) {
+    $formatExpression = "
+<Frame>
+    $(
+        if ($LeftIndent) { "<LeftIndent>$LeftIndent</LeftIndent>" }
+        if ($RightIndent) { "<RightIndent>$RightIndent</RightIndent>" }
+        if ($FirstLineHanging) { "<FirstLineHanging>$FirstLineHanging</FirstLineHanging>" }
+        if ($FirstLineIndent) { "<FirstLineIndent>$FirstLineIndent</FirstLineIndent>" }
+    )
+    <CustomItem>
+        $FormatExpression
+    </CustomItem>
+</Frame>
+"
+}
                 $xml = [xml]$formatExpression
                 if (-not $xml) { return }
                 $xOut=[IO.StringWriter]::new()

Commands/Format.PS1XML/Write-FormatViewExpression.ps1

@@ -35,6 +35,8 @@ function Format-JSON {
         }
     $IncludeParameter = @()
     $ExcludeParameter = @()
+
+
     $DynamicParameters = [Management.Automation.RuntimeDefinedParameterDictionary]::new()            
     :nextInputParameter foreach ($paramName in ([Management.Automation.CommandMetaData]$baseCommand).Parameters.Keys) {
         if ($ExcludeParameter) {
@@ -57,6 +59,7 @@ function Format-JSON {
         ))
     }
     $DynamicParameters
+
     }
         begin {
         $accumulateInput = [Collections.Queue]::new()
@@ -75,12 +78,15 @@ function Format-JSON {
 
     }
     end {
+
         $joiner = "," + $(
             if (-not $PSBoundParameters["Compress"]) {
                 [System.Environment]::NewLine
             }            
         )
+
         $null = $PSBoundParameters.Remove('AsList')
+
         if ($accumulateInput.Count) {
             if (-not $PSBoundParameters["Depth"]) {
                 $PSBoundParameters["Depth"] = 100
@@ -94,6 +100,7 @@ function Format-JSON {
 
             $rawJSON.Enqueue((& $baseCommand @PSBoundParameters))
         }
+
         if ($rawJSON.Count -gt 1 -or $AsList) {
             "[$($rawJSON.ToArray() -join $joiner)]"
         } elseif ($rawJSON.Count -eq 1) {