Merge pull request #96 from StartAutomating/PSSVG-Expansion

PSSVG 0.2.8

Author: StartAutomating

.github/workflows/TestAndPublish.yml

@@ -383,32 +383,34 @@ jobs:
           
           if ($releaseExists) {
               "::warning::Release '$($releaseExists.Name )' Already Exists" | Out-Host
-              return
+              $releasedIt = $releaseExists
+          } else {
+              $releasedIt = Invoke-RestMethod -Uri $releasesURL -Method Post -Body (
+                  [Ordered]@{
+                      owner = '${{github.owner}}'
+                      repo  = '${{github.repository}}'
+                      tag_name = $targetVersion
+                      name = $ExecutionContext.InvokeCommand.ExpandString($ReleaseNameFormat)
+                      body = 
+                          if ($env:RELEASENOTES) {
+                              $env:RELEASENOTES
+                          } elseif ($imported.PrivateData.PSData.ReleaseNotes) {
+                              $imported.PrivateData.PSData.ReleaseNotes
+                          } else {
+                              "$($imported.Name) $targetVersion"
+                          }
+                      draft = if ($env:RELEASEISDRAFT) { [bool]::Parse($env:RELEASEISDRAFT) } else { $false }
+                      prerelease = if ($env:PRERELEASE) { [bool]::Parse($env:PRERELEASE) } else { $false }
+                  } | ConvertTo-Json
+              ) -Headers @{
+                  "Accept" = "application/vnd.github.v3+json"
+                  "Content-type" = "application/json"
+                  "Authorization" = 'Bearer ${{ secrets.GITHUB_TOKEN }}'
+              }
           }
           
           
-          $releasedIt = Invoke-RestMethod -Uri $releasesURL -Method Post -Body (
-              [Ordered]@{
-                  owner = '${{github.owner}}'
-                  repo  = '${{github.repository}}'
-                  tag_name = $targetVersion
-                  name = $ExecutionContext.InvokeCommand.ExpandString($ReleaseNameFormat)
-                  body = 
-                      if ($env:RELEASENOTES) {
-                          $env:RELEASENOTES
-                      } elseif ($imported.PrivateData.PSData.ReleaseNotes) {
-                          $imported.PrivateData.PSData.ReleaseNotes
-                      } else {
-                          "$($imported.Name) $targetVersion"
-                      }
-                  draft = if ($env:RELEASEISDRAFT) { [bool]::Parse($env:RELEASEISDRAFT) } else { $false }
-                  prerelease = if ($env:PRERELEASE) { [bool]::Parse($env:PRERELEASE) } else { $false }
-              } | ConvertTo-Json
-          ) -Headers @{
-              "Accept" = "application/vnd.github.v3+json"
-              "Content-type" = "application/json"
-              "Authorization" = 'Bearer ${{ secrets.GITHUB_TOKEN }}'
-          }
+          
           
           
           if (-not $releasedIt) {
@@ -443,10 +445,9 @@ jobs:
                       $fileBytes = [IO.File]::ReadAllBytes($file.FullName)
                       $releasedFiles[$file.Name] =
                           Invoke-RestMethod -Uri "${releaseUploadUrl}?name=$($file.Name)" -Headers @{
-                              "Accept"        = "application/vnd.github+json"
-                              "ContentType"   = "application/octet-stream"
+                              "Accept"        = "application/vnd.github+json"                    
                               "Authorization" = 'Bearer ${{ secrets.GITHUB_TOKEN }}'
-                          } -Body $fileBytes
+                          } -Body $fileBytes -ContentType Application/octet-stream
                       $releasedFiles[$file.Name]
                   }
               }
@@ -586,3 +587,4 @@ jobs:
         uses: StartAutomating/HelpOut@master
 env: 
   NoCoverage: true
+  GIT_TOKEN: ${{secrets.GITHUB_TOKEN}}

Assets/PSSVG.svg

@@ -1,3 +1,27 @@
+### 0.2.8:
+
+* General Improvements:
+  * General Event support on every command with -On (Fixes #91)
+  * Reduced Warnings in GitHub Action (Fixes #94)
+* New Commands:
+  * SVG.ANSI (Fixes #82)
+  * SVG.StyleSheet (Fixes #83)
+  * SVG.GoogleFont (Fixes #84)
+  * Demystifying Path syntax
+    * SVG.ArcPath (Fixes #80)
+    * SVG.CurvePath (Fixes #81)
+    * SVG.LinePath (Fixes #90)
+* Pipeline improvements:
+  * Allowing -Content to be provided from the pipeline 
+  * Removing 'Attributes' parameter alias (Fixes #85)
+* Command Improvements
+  * SVG.Sprial can -ScaleX/-ScaleY (Fixes #77)
+* Example Updates
+  * New Examples
+  * Examples avoid tag-style syntax (Fixes #95)
+
+---
+
 ### 0.2.7:
 * Adding SVG.Star (Fixes #68)
 * Fixing OutputPath issue (Fixes #67)

CHANGELOG.md

@@ -29,10 +29,16 @@
     [PSObject]
     $Content,
 
+    # A dictionary or object containing event handlers.
+    # Each key or property name will be the name of the event
+    # Each value will be the handler.
+    [Parameter(ValueFromPipelineByPropertyName)]
+    $On,
+
     # An output path.
     [Parameter(ValueFromPipelineByPropertyName)]
     [string]
-    $OutputPath
+    $OutputPath   
     )
 
     begin {
@@ -55,7 +61,7 @@
                     "$($prop.Name):$($kv.Value)"
                 }) -join ';'
             }
-        }
+        }        
 
         $elementText = "<$elementName "
         :nextParameter foreach ($kv in $Attribute.GetEnumerator()) {
@@ -89,6 +95,28 @@
             }
         }
 
+        if ($On) {
+            $eventNames = @(
+                if ($on -is [Collections.IDictionary]) {
+                    $on.Keys    
+                } else {
+                    $on.psobject.properties.name
+                }
+            )
+            foreach ($eventName in $eventNames) {
+                $svgEventName = $eventName -replace '^On' -replace '^[_-]'
+                $eventValue   = if ($on -is [Collections.IDictionary]) {
+                    $on[$eventName]
+                } else {
+                    $on.$eventName
+                }
+                $elementText +=
+                    "on" + $svgEventName.ToLower() + "=`"" + $(
+                        [Web.HttpUtility]::HtmlAttributeEncode($eventValue)
+                    ) + '" '
+            }
+        }
+
         if ($elementName -eq 'svg') {
             $elementText += 'xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg"'
         }
@@ -103,10 +131,7 @@
                 if ($attr.Key -eq 'SVG.IsCData' -and $attr.Value -eq 'true') {
                     $isCData = $true
                 }
-            }
-            if ($ElementName -eq 'text') {
-                $null = $null
-            }
+            }            
 
             $elementText += ">"            
             $elementText +=
@@ -115,7 +140,7 @@
                         ($pieceOfContent -as [xml.xmlelement]) -and 
                         ($pieceOfContent -notmatch '^\s{0,}\<')
                     ) {
-                        [Security.SecurityElement]::Escape("$content")
+                        [Security.SecurityElement]::Escape("$pieceOfContent")
                     }
                     elseif ($pieceOfContent.Outerxml) {
                         $pieceOfContent.Outerxml
@@ -141,16 +166,23 @@
                 $elementText
             }
 
-        if ($OutputPath) {
+        $myParams = @{} + $PSBoundParameters
+        if ($myParams['OutputPath']) {
             $unresolvedOutput = $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath($OutputPath)
             if ($unresolvedOutput -and $svgOutput.ParentNode.Save) {
                 $svgOutput.ParentNode.PreserveWhitespace = $true
+                $memoryStream = [io.memorystream]::new()
+                $streamWriter = [io.streamWriter]::new($memoryStream)
                 $writerSettings = [Xml.XmlWriterSettings]::new()
                 $writerSettings.Encoding = [Text.Encoding]::UTF8
                 $writerSettings.Indent = $true                
-                $writer = [Xml.XmlWriter]::Create("$unresolvedOutput", $writerSettings)
-                $svgOutput.ParentNode.Save($writer)
+                $writer = [Xml.XmlWriter]::Create($streamWriter, $writerSettings)                
+                $svgOutput.ParentNode.Save($writer)                
+                [Text.Encoding]::UTF8.GetString($memoryStream.ToArray()) | 
+                    Set-Content -Path $OutputPath -Encoding UTF8
                 $writer.Dispose()
+                $streamWriter.Dispose()
+                $memoryStream.Dispose()
                 Get-Item $OutputPath
             } elseif ($unresolvedOutput -and $svgOutput) {
                 $svgOutput | Set-Content -Path $OutputPath