Merge pull request #29 from StartAutomating/PSSVG-Updates

Pssvg updates

Author: StartAutomating

Assets/PSSVG.svg

@@ -6,7 +6,7 @@
 .SYNOPSIS
     Generates PSSVG
 .DESCRIPTION
-    Generates PSSVG, a module for creating 2d images with PowerShell.
+    Generates PSSVG, a module for creating svg images with PowerShell.
 
     PSSVG allows you to create Scalable Vector Graphics using PowerShell commands.
 
@@ -72,13 +72,17 @@ if (-not $svgElements) {
 
 $findSvgElement = [Regex]::new("\{\{SVGElement\(['`"](?<e>[^'`"]+)")
 $findSvgAttr = [Regex]::new("\{\{SVGAttr\(['`"](?<a>[^'`"]+)")
+$replaceMDNContent = "\{\{\s{0,}(?>$(@('Glossary', 'cssxref', 'domxref', 'HTTPMethod', 'htmlelement','svgelement', 'svgattr','htmlattrxref','cssxref')  -join '|')[^\)]{0,})\(" + 
+        '["''](?<s>[^"'']+)["'']\)\s{0,}\}\}'
+
 
 function ConvertSVGMetadataToParameterAttribute {
     param([Parameter(ValueFromPipeline,Position=0)][string]$EdiValue)
     $hadNumbers = $false
     $hadUri     = $false
     $hadColor   = $false
     $hadUnknown = $false
+    $tabCompletionRedundant = $false
     if ($ediValue -notmatch '\|') {
         if ($ediValue -match '\<(?<t>[^\>])>') {
             if ($matches.t -as [type]) {
@@ -87,7 +91,8 @@ function ConvertSVGMetadataToParameterAttribute {
         }
         return
     }
-    $validSet = @(foreach ($validValue in $ediValue -split '\|' -replace '^\s{0,}' -replace '\s{0,}$') {
+    $setDescriptors = @($ediValue -split '\|' -replace '^\s{0,}' -replace '\s{0,}$')
+    $validSet = @(foreach ($validValue in $setDescriptors) {
         if ($validValue -as [int] -or $validValue -match 'number') {
             $hadNumbers = $true
         } 
@@ -105,7 +110,7 @@ function ConvertSVGMetadataToParameterAttribute {
         }
         else {
             $validValue
-        }                                
+        }        
     }) -join "','"
     if ($hadNumbers) {
         "[ValidatePattern('(?>$($validSet -split "','" -join '|')|\d+)')]"
@@ -117,8 +122,26 @@ function ConvertSVGMetadataToParameterAttribute {
         "[ValidateScript({`$_ -in '$validSet' -or `$_ -match '\#[0-9a-f]{3}' -or `$_ -match '\#[0-9a-f]{6}' -or `$_ -notmatch '\W'})]"
     }
     elseif ($validSet -and -not $hadUnknown) {
+        $tabCompletionRedundant = $true
         "[ValidateSet('$validSet')]"
-    }     
+    }
+    
+    if ($setDescriptors -and -not $tabCompletionRedundant) {
+        $null = $null
+'[ArgumentCompleter({
+    param ( $commandName,$parameterName,$wordToComplete,$commandAst,$fakeBoundParameters )    
+' + "
+    `$validSet = '$($setDescriptors -replace $replaceMDNContent, '<${s}>' -replace "'", "''" -join "','")'
+" + @'   
+    if ($wordToComplete) {        
+        $toComplete = $wordToComplete -replace "^'" -replace "'$"
+        return @($validSet -like "$toComplete*" -replace '^', "'" -replace '$',"'")
+    } else {
+        return @($validSet -replace '^', "'" -replace '$',"'")
+    }
+})]
+'@
+    }
 }
 
 function ImportSvgAttribute {
@@ -141,9 +164,7 @@ function ImportSvgAttribute {
     if (-not $elementMarkdown) {
         Write-Verbose "Did not get content for $elementOrSetName"
         return
-    }
-    $replaceMDNContent = "\{\{\s{0,}(?>$(@('Glossary', 'domxref', 'HTTPMethod', 'htmlelement','svgelement', 'svgattr','htmlattrxref','cssxref')  -join '|')[^\)]{0,})\(" + 
-        '["''](?<s>[^"'']+)["'']\)\s{0,}\}\}'
+    }    
 
     $start, $end = 0, 0
     $globalAttrStart, $globalAttrEnd = 0, 0 
@@ -425,9 +446,7 @@ function InitializeSvgAttributeData {
 
         }
 
-        $headingList       = $savedMarkdown[$attrUri] | ?<Markdown_Heading> -Split -IncludeMatch
-        $replaceMDNContent = "\{\{\s{0,}(?>$(@('Glossary', 'domxref', 'HTTPMethod', 'htmlelement','svgelement', 'svgattr','htmlattrxref')  -join '|'))\(" + 
-        '["''](?<s>[^"'']+)["'']\)\s{0,}\}\}'    
+        $headingList       = $savedMarkdown[$attrUri] | ?<Markdown_Heading> -Split -IncludeMatch        
 
         $attrMetadata[$attrKv.key] = [PSCustomObject]@{
             Name = $attrKv.Key
@@ -492,7 +511,7 @@ foreach ($elementKV in $svgElementData.GetEnumerator()) {
     $newPipeScriptSplat = @{
         Synopsis    = "Creates SVG $($elementKV.Key) elements"
         Description = $elementKV.Value.Description.Trim()
-        Link = $docsLink, $mdnLink
+        Link = $docsLink, $mdnLink, 'Write-SVG'
     }
     $relevantExampleFiles = Get-ChildItem -Filter *.ps1 -Path $examplesRoot |
         Select-String "\<svg.$($elementKv.Key)\>" | 
@@ -521,8 +540,7 @@ foreach ($elementKV in $svgElementData.GetEnumerator()) {
         $parameters.Content = @(
             "# The Contents of the $($elementKv.Key) element"
             if ($content.Description -eq 'characterDataElementsInAnyOrder') {
-                "[Reflection.AssemblyMetaData('SVG.IsCData', `$$true)]"
-                "[string]"
+                "[Reflection.AssemblyMetaData('SVG.IsCData', `$$true)]"                
             }
             "[Parameter(Position=0,ValueFromPipelineByPropertyName)]"
             "[Alias('InputObject','Text', 'InnerText', 'Contents')]"

Build.PSSVG.ps1 Build_PSSVG.ps1Build.PSSVG.ps1 renamed to Build_PSSVG.ps1

@@ -1,3 +1,12 @@
+### 0.2.1
+* Improved Command Help
+  * Adding More Examples (Fixes #21)
+  * Adding Example/README.md (Fixes #26)
+* Write-SVG: Allowing 2 value ViewBox (Fixes #28)
+* All SVG.* commands allow elements (Fixes #25 )
+* All SVG.* commands now have argument completers (Fixes #24)
+---
+
 ### 0.2
 * All SVG. commands now support -Data attributes (Fixes #12)
 * Improved Command Help

CHANGELOG.md

@@ -1,16 +1,8 @@
 #requires -Module PSSVG
 
-$original = @"
-<svg viewBox="0 0 10 10" xmlns="http://www.w3.org/2000/svg">
-  <rect width="10" height="10">
-    <animate attributeName="rx" values="0;5;0" dur="10s" repeatCount="indefinite" />
-  </rect>
-</svg>
-"@
-
 =<svg> -ViewBox 0,0,10,10 (
     =<svg.rect> -Width 10 -Height 10 (
         =<svg.animate> -AttributeName rx -Values "0;5;0" -Dur "10s" -RepeatCount indefinite
-    )    
+    ) -Fill '#4488ff'
 ) -OutputPath (Join-Path $psScriptRoot Animate.svg)
 

CNAME

@@ -0,0 +1,8 @@
+#requires -Module PSSVG
+
+=<svg> -Content @(
+    =<svg.circle> -cx 50 -cy 50 -r 50 -Fill red @(
+        =<svg.animate> -AttributeName fill -dur 10s -Values 'red;orange;yellow;green;blue;indigo;violet;red' -RepeatCount indefinite -begin 1s
+        =<svg.animate> -AttributeName stroke -dur 10s -Values 'orange;yellow;green;blue;indigo;violet;red;orange' -RepeatCount indefinite -begin 1s
+    ) -Stroke orange    
+)  -ViewBox 0,0,100,100 -OutputPath (Join-Path $psScriptRoot AnimateColor.svg)

Examples/Animate.PSSVG.ps1

@@ -0,0 +1,14 @@
+#requires -Module PSSVG
+
+$path = "M20,50 C20,-50 180,150 180,50 C180-50 20,150 20,50 z"
+=<svg> -viewBox "0 0 200 100" @(
+    =<svg.path> -d $path -Fill none -Stroke lightgrey
+    =<svg.circle> -r 5 -Fill red (
+        =<svg.animateMotion> -Dur 10s -RepeatCount 'indefinite' -Path $path
+    )
+    =<svg.rect> -Width 2 -Height 2 -X -1 -Y -1 -Fill blue @(
+        =<svg.animateMotion> -Dur 10s -RepeatCount 'indefinite' -Path $path
+        =<svg.animateTransform> -AttributeName transform -From "0 0 0"  -To "360 0 0" -dur "5s" -RepeatCount indefinite -AttributeType xml -type rotate
+    )
+) -OutputPath (Join-Path $psScriptRoot AnimateMotion.svg)
+