New-PipeScript: Trimming whitespace

Author: StartAutomating

New-PipeScript.ps1

@@ -16,6 +16,19 @@ function New-PipeScript {
     # * As an  ```[Object[]]```.
     # * As a ```[ScriptBlock]```
     [Parameter(ValueFromPipelineByPropertyName)]
+    [ValidateScript({
+        if ($_ -isnot [ScriptBlock]) { return $true }
+        $statementCount = 0
+        $statementCount += $_.Ast.DynamicParamBlock.Statements.Count
+        $statementCount += $_.Ast.BeginBlock.Statements.Count
+        $statementCount += $_.Ast.ProcessBlock.Statements.Count
+        $statementCount += $_.Ast.EndBlock.Statements.Count
+        if ($statementCount) {
+            throw "ScriptBlock should have no statements"
+        } else { 
+            return $true
+        }
+    })]
     [ValidateScript({
     $validTypeList = [System.Collections.IDictionary],[System.String],[System.Object[]],[System.Management.Automation.ScriptBlock]
     $thisType = $_.GetType()
@@ -30,18 +43,19 @@ function New-PipeScript {
     }
     return $true
     })]
-        
-    $Parameter,
 
+    $Parameter,
     # The dynamic parameter block.
     [Parameter(ValueFromPipelineByPropertyName)]
     [ValidateScript({
+        if ($_ -isnot [ScriptBlock]) { return $true }
         if ($_.Ast.DynamicParamBlock -or $_.Ast.BeginBlock -or $_.Ast.ProcessBlock) {
             throw "ScriptBlock should not have any named blocks"
         }
         return $true    
     })]
     [ValidateScript({
+        if ($_ -isnot [ScriptBlock]) { return $true }
         if ($_.Ast.ParamBlock.Parameters.Count) {
             throw "ScriptBlock should not have parameters"
         }
@@ -53,12 +67,14 @@ function New-PipeScript {
     # The begin block.
     [Parameter(ValueFromPipelineByPropertyName)]
     [ValidateScript({
+        if ($_ -isnot [ScriptBlock]) { return $true }
         if ($_.Ast.DynamicParamBlock -or $_.Ast.BeginBlock -or $_.Ast.ProcessBlock) {
             throw "ScriptBlock should not have any named blocks"
         }
         return $true    
     })]
     [ValidateScript({
+        if ($_ -isnot [ScriptBlock]) { return $true }
         if ($_.Ast.ParamBlock.Parameters.Count) {
             throw "ScriptBlock should not have parameters"
         }
@@ -70,12 +86,14 @@ function New-PipeScript {
     # The process block.
     [Parameter(ValueFromPipelineByPropertyName)]
     [ValidateScript({
+        if ($_ -isnot [ScriptBlock]) { return $true }
         if ($_.Ast.DynamicParamBlock -or $_.Ast.BeginBlock -or $_.Ast.ProcessBlock) {
             throw "ScriptBlock should not have any named blocks"
         }
         return $true    
     })]
     [ValidateScript({
+        if ($_ -isnot [ScriptBlock]) { return $true }
         if ($_.Ast.ParamBlock.Parameters.Count) {
             throw "ScriptBlock should not have parameters"
         }
@@ -87,12 +105,14 @@ function New-PipeScript {
     # The end block.
     [Parameter(ValueFromPipelineByPropertyName)]
     [ValidateScript({
+        if ($_ -isnot [ScriptBlock]) { return $true }
         if ($_.Ast.DynamicParamBlock -or $_.Ast.BeginBlock -or $_.Ast.ProcessBlock) {
             throw "ScriptBlock should not have any named blocks"
         }
         return $true    
     })]
     [ValidateScript({
+        if ($_ -isnot [ScriptBlock]) { return $true }
         if ($_.Ast.ParamBlock.Parameters.Count) {
             throw "ScriptBlock should not have parameters"
         }
@@ -101,19 +121,19 @@ function New-PipeScript {
     [Alias('EndBlock')]
     [ScriptBlock]
     $End,
-    
     # The script header.
     [Parameter(ValueFromPipelineByPropertyName)]
     [string]
     $Header
     )
     begin {
-        $ParametersToCreate   = [Ordered]@{}
-        $allDynamicParameters = @()
-        $allBeginBlocks       = @()
-        $allEndBlocks         = @()
-        $allProcessBlocks     = @()
-        $allHeaders           = @()      
+        $ParametersToCreate    = [Ordered]@{}
+        $parameterScriptBlocks = @()
+        $allDynamicParameters  = @()
+        $allBeginBlocks        = @()
+        $allEndBlocks          = @()
+        $allProcessBlocks      = @()
+        $allHeaders            = @()
     }
     process {
         if ($parameter) {
@@ -123,7 +143,7 @@ function New-PipeScript {
                 # If it is, walk thur each parameter in the dictionary
                 foreach ($EachParameter in $Parameter.GetEnumerator()) {
                     # Continue past any parameters we already have
-                    if ($ParametersToCreate.Contains($EachParameter.Key)) { 
+                    if ($ParametersToCreate.Contains($EachParameter.Key)) {
                         continue
                     }
                     # If the parameter is a string and the value is not a variable
@@ -148,13 +168,15 @@ function New-PipeScript {
                             # If there was a param block on the script block
                             if ($EachParameter.Value.Ast.ParamBlock) {
                                 # embed the parameter block (except for the param keyword)
-                                $EachParameter.Value.Ast.ParamBlock.Extent.ToString() -replace 
-                                    '^[\s\r\n]param(' -replace ')[\s\r\n]$'
+                                $EachParameter.Value.Ast.ParamBlock.Extent.ToString() -replace
+                                    '^[\s\r\n]{0,}param\(' -replace '\)[\s\r\n]{0,}$'
                             } else {
                                 # Otherwise
-                                $EachParameter.Value.ToString() -replace 
+                                '[Parameter(ValueFromPipelineByPropertyName)]' + (
+                                $EachParameter.Value.ToString() -replace
                                     "\`$$($eachParameter.Key)[\s\r\n]$" -replace # Replace any trailing variables
-                                    'param()[\s\r\n]{0,}$'  # then replace any empty param blocks.
+                                    'param\(\)[\s\r\n]{0,}$'  # then replace any empty param blocks.
+                                )
                             }
                     }
                     elseif ($EachParameter.Value -is [Object[]]) {
@@ -167,6 +189,13 @@ function New-PipeScript {
                     "[Parameter(ValueFromPipelineByPropertyName)]"
                     "`$$Parameter"
                 )
+            } elseif ($parameter -is [scriptblock]) {
+                $parameterScriptBlocks +=
+                    if ($parameter.Ast.ParamBlock) {
+                        # embed the parameter block (except for the param keyword)
+                        $parameter
+                    } else {
+                    }
             } elseif ($Parameter -is [Object[]]) {
                 $currentParam = @()
                 $currentParamName = ''
@@ -211,16 +240,19 @@ function New-PipeScript {
         if ($end) {
             $allEndBlocks += $end
         }
-        
     }
     end {
-        $newParamBlock = 
-            "param(" + [Environment]::newLine + 
+        $newParamBlock =
+            "param(" + [Environment]::newLine +
             $(@(foreach ($toCreate in $ParametersToCreate.GetEnumerator()) {
                 $toCreate.Value -join [Environment]::NewLine
             }) -join (',' + [Environment]::NewLine)) +
             [Environment]::NewLine +
             ')'
+        if ($parameterScriptBlocks) {
+            $parameterScriptBlocks += [ScriptBlock]::new($newParamBlock)
+            $newParamBlock = $parameterScriptBlocks | Join-PipeScript
+        }
         $createdScriptBlock = [scriptblock]::Create("
 $($allHeaders -join [Environment]::Newline)
 $newParamBlock