Merge pull request #46 from StartAutomating/PSSVG-Filtering-And-Fun

PSSVG 0.2.2

Author: StartAutomating

.github/workflows/TestAndPublish.yml

@@ -423,15 +423,15 @@ jobs:
           $ModulePath,
           
           [string[]]
-          $Exclude = @('*.png', '*.mp4', '*.jpg','*.jpeg', '*.gif')
+          $Exclude = @('*.png', '*.mp4', '*.jpg','*.jpeg', '*.gif', 'docs[/\]*')
           )
           
           $gitHubEvent = if ($env:GITHUB_EVENT_PATH) {
               [IO.File]::ReadAllText($env:GITHUB_EVENT_PATH) | ConvertFrom-Json
           } else { $null }
           
           if (-not $Exclude) {
-              $Exclude = @('*.png', '*.mp4', '*.jpg','*.jpeg', '*.gif')
+              $Exclude = @('*.png', '*.mp4', '*.jpg','*.jpeg', '*.gif','docs[/\]*')
           }
           
           
@@ -516,39 +516,19 @@ jobs:
               }
           }
           } @Parameters
-  UsePiecemeal: 
-    runs-on: ubuntu-latest
-    if: ${{ success() }}
-    steps: 
-      - name: Check out repository
-        uses: actions/checkout@v2
-      - name: UsePiecemeal
-        uses: StartAutomating/Piecemeal@main
-  BuildPipeScript: 
+  MakePSSVG: 
     runs-on: ubuntu-latest
     if: ${{ success() }}
     steps: 
       - name: Check out repository
         uses: actions/checkout@v2
+      - name: Use PSSVG Action
+        uses: StartAutomating/PSSVG@main
+        id: PSSVG
       - name: BuildPipeScript
         uses: StartAutomating/PipeScript@main
-  RunEZOut: 
-    runs-on: ubuntu-latest
-    if: ${{ success() }}
-    steps: 
-      - name: Check out repository
-        uses: actions/checkout@v2
       - name: UseEZOut
         uses: StartAutomating/EZOut@master
-      - name: Push Changes
-        shell: pwsh
-        run: git push; exit 0
-  HelpOut: 
-    runs-on: ubuntu-latest
-    if: ${{ success() }}
-    steps: 
-      - name: Check out repository
-        uses: actions/checkout@v2
       - name: UseHelpOut
         uses: StartAutomating/HelpOut@master
 env: 

Assets/PSSVG.svg

@@ -121,13 +121,12 @@ function ConvertSVGMetadataToParameterAttribute {
     elseif ($hadColor) {
         "[ValidateScript({`$_ -in '$validSet' -or `$_ -match '\#[0-9a-f]{3}' -or `$_ -match '\#[0-9a-f]{6}' -or `$_ -notmatch '\W'})]"
     }
-    elseif ($validSet -and -not $hadUnknown) {
+    elseif ($validSet -and -not $hadUnknown -and -not ($validSet -match '\p{P}')) {
         $tabCompletionRedundant = $true
         "[ValidateSet('$validSet')]"
     }
 
-    if ($setDescriptors -and -not $tabCompletionRedundant) {
-        $null = $null
+    if ($setDescriptors -and -not $tabCompletionRedundant) {        
 '[ArgumentCompleter({
     param ( $commandName,$parameterName,$wordToComplete,$commandAst,$fakeBoundParameters )    
 ' + "
@@ -240,8 +239,15 @@ function ImportSvgAttribute {
         foreach ($attrInGroup in $groupedAttributes.Group) {
             if ($attrMetadata[$attrInGroup]) {
                 if (-not $allAttributeData[$attrInGroup]) {
-                    $allAttributeData += @{
-                        $attrInGroup = $attrMetadata[$attrInGroup].Properties
+                    $allAttributeData += @{                        
+                        $attrInGroup =                         
+                            if ($attrMetadata[$attrInGroup].properties -isnot [Object[]]) {
+                                $attrMetadata[$attrInGroup].Properties
+                            } else {
+                                foreach ($ht in $attrMetadata[$attrInGroup].properties) { 
+                                    if ($ht.AppliesTo -contains $elementOrSetName) { $ht;break }
+                                }
+                            }
                     }
                 }
                 if (-not $allAttributeHelp[$attrInGroup]) {
@@ -306,7 +312,14 @@ function ImportSvgElementAttribute {
                     }                    
                 }
                 if ($attrMetadata[$attributeName]) {
-                    $attributeData[$attributeName] = $attrMetadata[$attributeName].Properties
+                    $attributeData[$attributeName] = 
+                        if ($attrMetadata[$attributeName].properties -isnot [Object[]]) {
+                            $attrMetadata[$attributeName].Properties
+                        } else {
+                            foreach ($ht in $attrMetadata[$attributeName].properties) { 
+                                if ($ht.AppliesTo -contains $elementOrSetName) { $ht;break }
+                            }
+                        }                    
                 }
             }
             elseif ($attributeName -and $elementAttributeLine -match $attributeHelpLine) {            
@@ -368,9 +381,6 @@ function InitializeSvgAttributeData {
             }
         }
     }
-    $null = $null
-    
-    
 
     $attrsFound = [Ordered]@{}
     foreach ($match in $findSvgAttr.Matches($savedMarkdown[$attributeListUri])) {
@@ -398,18 +408,32 @@ function InitializeSvgAttributeData {
                     Write-Warning "$SVGAttributeUri : $_"                
                 }).Content
             ))
-        } elseif ($markdownNotFound[$attrUri]) {
-            $null = $null
         }
 
         if (-not $savedMarkdown[$attrUri]) {
             continue
         }
 
         $attributeTables   = @($savedMarkdown[$attrUri] | ?<HTML_StartOrEndTag> -Tag table)
-        $attributeProperties = [Ordered]@{}
+        $allAttributeProperties = @() 
         for ($ati = 0; $ati -lt $attributeTables.Count; $ati++) {
+            $appliesToElements = @()
+            if ($attributeTables.Count -gt 2) {
+                $previousHeading = $savedMarkdown[$attrUri] | ?<Markdown_Heading> -RightToLeft -Count 1 -StartAt $attributeTables[$ati].Index
+                $previousHeadingEnd = $previousHeading.Index + $previousHeading.Length
+                $appliesToElements = @($findSvgElement.Matches(
+                    $previousHeading.Value
+                ))
+                if ($appliesToElements) {
+                    $appliesToElements = @(foreach ($appliesTo in $appliesToElements) {
+                        $appliesTo.Groups['e'].Value
+                    })
+                }                
+            }
+            
+            $attributeProperties = [Ordered]@{}
             if ($attributeTables[$ati] -match 'properties') {
+                
                 $attrTable = 
                     $savedMarkdown[$attrUri].Substring(
                         $attributeTables[$ati].Index,  $attributeTables[$ati + 1].Index + $attributeTables[$ati + 1].Length - $attributeTables[$ati].Index
@@ -441,7 +465,10 @@ function InitializeSvgAttributeData {
                 if ($attributeProperties['Default value'] -eq 'None') {
                     $attributeProperties.Remove('Default Value')
                 }
-                break
+                if ($appliesToElements) {
+                    $attributeProperties['AppliesTo'] = $appliesToElements
+                }
+                $allAttributeProperties += $attributeProperties                
             }
 
         }
@@ -463,7 +490,13 @@ function InitializeSvgAttributeData {
                     }
                 }
             )
-            Properties = $attributeProperties
+            Properties = $(
+                if ($allAttributeProperties.Count -eq 1) {
+                    $allAttributeProperties[0]
+                } else {
+                    $allAttributeProperties
+                }
+            )
         }
     }    
 }
@@ -502,6 +535,20 @@ foreach ($svgElement in $svgElements.elements.psobject.properties) {
 
 $examplesRoot = Join-Path $PSScriptRoot Examples
 
+$knownParameterAliases = @{
+    'Dur' = 'Duration'
+}
+
+$destFolder  = Join-Path $PSScriptRoot "Commands"
+$destFolder  = Join-Path $destFolder "Standard"
+
+if (-not (Test-Path $destFolder)) {
+    $createdFolder = New-Item $destFolder -Type Directory -Force
+    if (-not $createdFolder) {
+        Write-Error "Could not create $destFolder"
+        return
+    }
+}
 
 foreach ($elementKV in $svgElementData.GetEnumerator()) {
     $docsLink = "https://pssvg.start-automating.com/SVG.$($elementKV.Key)"
@@ -549,11 +596,19 @@ foreach ($elementKV in $svgElementData.GetEnumerator()) {
     }
 
     $parameters['Data'] = @(
-        "# A dictionary containing data.  This data will be embedded in data- attributes."
-        "[Collections.IDictionary]"
+        "# A dictionary containing data.  This data will be embedded in data- attributes."        
         "[Parameter(ValueFromPipelineByPropertyName)]"
+        "[Collections.IDictionary]"
         '$Data'
     )
+
+    $parameters['Attribute'] = @(
+        "# A dictionary of attributes.  This can set any attribute not exposed in other parameters."        
+        "[Parameter(ValueFromPipelineByPropertyName)]"
+        "[Alias('Attributes')]"
+        "[Collections.IDictionary]"
+        '$Attribute = [Ordered]@{}'
+    )
 
     foreach ($attrName in $elementKV.Value.AttributeNames) {
         $paramName = [regex]::Replace($attrName, '\W(?<w>\w+)', {
@@ -595,12 +650,18 @@ foreach ($elementKV in $svgElementData.GetEnumerator()) {
 
             if ($elementData) {
                 foreach ($dataKv in $elementData.GetEnumerator()) {
+                    if ($dataKv.Key -eq 'AppliesTo') { continue }
                     "[Reflection.AssemblyMetaData('SVG.$($dataKv.Key)', '$($dataKv.Value.ToString().Replace("'", "''"))')]"
                     if ($dataKv.Key -eq 'Value' -and $dataKv.Value) {
                         $dataKv.Value | ConvertSVGMetadataToParameterAttribute
                     }
                 }
-            }            
+            }
+            
+            if ($knownParameterAliases[$paramName]) {
+                "[Alias('$($knownParameterAliases[$paramName] -replace "'", "''" -join "','")')]"
+            }
+            
             "`$$paramName"
         )
     }
@@ -637,9 +698,17 @@ $OutputPath
         }
         if (-not $elementName) { return }
 
+        if (-not $attribute[$paramCopy.Keys]) {
+            $attribute += $paramCopy
+        } else {
+            foreach ($pc in $paramCopy.GetEnumerator()) {
+                $attribute[$pc.Key] = $pc.Value
+            }
+        }
+
         $writeSvgSplat = @{
             ElementName = $elementName
-            Attribute   = $paramCopy                
+            Attribute   = $attribute
         }
 
         if ($content) {
@@ -656,15 +725,18 @@ $OutputPath
         Write-SVG @writeSvgSplat
     }
 
-    if (-not $parameters) { continue }
-    $destination = Join-Path $PSScriptRoot "$($newPipeScriptSplat.functionName).ps1"
+    if (-not $parameters) { continue }    
+    $destination = Join-Path $destFolder "$($newPipeScriptSplat.functionName).ps1"
+
+
+
     $newScript = New-PipeScript @newPipeScriptSplat 
-    if (-not $newScript) {
-        $null = $null
+    if ($newScript) {
+        $newScript | 
+            Set-Content -Path $destination
+        Get-Item -Path $destination    
     }
-    $newScript| 
-        Set-Content -Path $destination
-    Get-Item -Path $destination
+    
 }
 
 Write-Progress "Getting Element Data" "$elementName " -Id $id -Completed