feat: Adding [OutputType([xml])] where appropriate ( Fixes PoshWeb#266 )

Author: StartAutomating

Types/Turtle/get_Marker.ps1

@@ -10,6 +10,7 @@
 .LINK
     https://developer.mozilla.org/en-US/docs/Web/SVG/Reference/Element/marker
 #>
+[OutputType([xml])]
 param()
 
 # The default settings for markers

Types/Turtle/get_Mask.ps1

@@ -34,6 +34,7 @@
 .LINK
     https://developer.mozilla.org/en-US/docs/Web/SVG/Reference/Element/mask
 #>
+[OutputType([xml])]
 param()
 
 $keyPattern = '^mask/'

Types/Turtle/get_PathElement.ps1

@@ -5,8 +5,11 @@
     Gets the Path Element of a Turtle.
 
     This contains the path of the Turtle's motion.
+.EXAMPLE
+    turtle forward 42 rotate 90 forward 42 pathElement
 #>
-
+[OutputType([xml])]
+param()
 # Set our core attributes
 $coreAttributes = [Ordered]@{
     id="$($this.id)-path"
@@ -26,12 +29,20 @@ foreach ($pathAttributeName in $this.PathAttribute.Keys) {
     $coreAttributes[$pathAttributeName] = $($this.PathAttribute[$pathAttributeName])
 }
 
-@(
+# Path attributes can be defined within .SVGAttribute or .Attribute
+foreach ($attributeCollectionName in 'SVGAttribute', 'Attribute') {
+    $attributeCollection = $this.$attributeCollectionName
+    foreach ($attributeName in $attributeCollection.Keys -match '^path/') {
+        $coreAttributes[$attributeName -replace '^path/'] = $attributeCollection[$attributeName]
+    }
+}
+
+[xml]@(
 "<path$(
     foreach ($attributeName in $coreAttributes.Keys) {
         " $attributeName='$($coreAttributes[$attributeName])'"
     }
 )>"
 if ($this.PathAnimation) {$this.PathAnimation}
 "</path>"
-) -as [xml]
+)

Types/Turtle/get_PatternMask.ps1

@@ -37,6 +37,7 @@
 .LINK
     https://developer.mozilla.org/en-US/docs/Web/SVG/Reference/Element/mask
 #>
+[OutputType([xml])]
 param()
 $keyPattern = '^pattern-?mask/'
 $defaultId  = "$($this.Id)-pattern-mask" 
@@ -65,4 +66,4 @@ $segments = @(
 "</mask>"
 )
 # join them and cast to XML.
-[xml]($segments -join '')
+[xml]$segments

Types/Turtle/get_SVG.ps1

@@ -4,8 +4,8 @@
 .DESCRIPTION
     Gets this turtle and any nested turtles as a single Scalable Vector Graphic.
 #>
+[OutputType([xml])]
 param()
-@(
 
 $svgAttributes = [Ordered]@{
     xmlns='http://www.w3.org/2000/svg'
@@ -35,6 +35,7 @@ foreach ($key in $this.SVGAttribute.Keys) {
     $svgAttributes[$key] = $this.SVGAttribute[$key]
 }
 
+$svgElement = @(
 "<svg $(@(foreach ($attributeName in $svgAttributes.Keys) {
     if ($attributeName -match '/') { continue }
     " $attributeName='$($svgAttributes[$attributeName])'"
@@ -75,7 +76,7 @@ foreach ($key in $this.SVGAttribute.Keys) {
     }
 
     # Declare any SVG animations
-    if ($this.SVGAnimation) {$this.SVGAnimation}    
+    if ($this.SVGAnimation) {$this.SVGAnimation}
     if ($this.BackgroundColor) {
         "<rect width='10000%' height='10000%' x='-5000%' y='-5000%' fill='$($this.BackgroundColor)' transform-origin='50% 50%' />"
     }
@@ -113,4 +114,5 @@ foreach ($key in $this.SVGAttribute.Keys) {
         "</a>"
     }
 "</svg>"
-) -join '' -as [xml]
+)
+[xml]$svgElement

Types/Turtle/get_Symbol.ps1

@@ -11,13 +11,14 @@
     Move-Turtle Flower |
         Select-Object -ExpandProperty Symbol
 #>
+[OutputType([xml])]
 param()
 
-@(    
-    "<svg xmlns='http://www.w3.org/2000/svg' width='100%' height='100%' transform-origin='50% 50%'>"
-        "<symbol id='$($this.ID)-symbol' viewBox='$($this.ViewBox)' transform-origin='50% 50%'>"
-            $($this.SVG.OuterXml)
-        "</symbol>"        
-        "<use href='#$($this.ID)-symbol' width='100%' height='100%' transform-origin='50% 50%' />"
-    "</svg>"
-) -join '' -as [xml]
+[xml]@(
+"<svg xmlns='http://www.w3.org/2000/svg' width='100%' height='100%' transform-origin='50% 50%'>"
+    "<symbol id='$($this.ID)-symbol' viewBox='$($this.ViewBox)' transform-origin='50% 50%'>"
+        $($this.SVG.OuterXml)
+    "</symbol>"
+    "<use href='#$($this.ID)-symbol' width='100%' height='100%' transform-origin='50% 50%' />"
+"</svg>"
+)

Types/Turtle/get_TextElement.ps1

@@ -12,7 +12,8 @@
 .EXAMPLE
     turtle text "hello world" textElement
 #>
-
+[OutputType([xml])]
+param()
 
 if (-not $this.Text) { return }