🐛 Several fixes

- account for the difference between `[IO.Path]::Combine()` and `Join-Path`
- fix core safe char encoding behavior
- fix test fields

Author: brianary

Convert-Xml.ps1

@@ -77,7 +77,7 @@ Process
 	}
 	else
 	{
-		$absOutFile = Join-Path "$PWD" $OutFile
+		$absOutFile = if((Split-Path $OutFile -IsAbsolute)) {$OutFile} else {Join-Path "$PWD" $OutFile}
 		if((Test-Path $absOutFile) -and
 			!$PSCmdlet.ShouldContinue("$(Get-Item $absOutFile |Select-Object FullName,LastWriteTime,Length)","Overwrite File?"))
 		{Write-Warning "Skipping transform from $absPath to $OutFile"; return}

ConvertFrom-EscapedXml.ps1

@@ -20,9 +20,9 @@ ConvertFrom-EscapedXml.ps1 '<a href="http://example.org">link&lt
 #Requires -Version 2
 [CmdletBinding()][OutputType([string])] Param(
 # The escaped XML text.
-[Parameter(Mandatory=$true,Position=0,ValueFromPipeline=$true)][string]$EscapedXml,
+[Parameter(Mandatory=$true,Position=0,ValueFromPipeline=$true)][string] $EscapedXml,
 # Outputs the XML without indentation.
-[Alias('NoIndent')][switch]$Compress
+[Alias('NoIndent')][switch] $Compress
 )
 Process
 {

ConvertTo-SafeEntities.ps1

@@ -37,6 +37,27 @@ ETA: ½ hour
 An HTML or XML string that may include emoji or other Unicode characters outside
 the 7-bit ASCII range.
 #>
-[Parameter(Position=0,Mandatory=$true,ValueFromPipeline=$true)][string] $InputObject
+[Parameter(Position=0,Mandatory=$true,ValueFromPipeline=$true)][string] $InputObject,
+# Indicates that markdown characters should also be escaped.
+[switch] $IncludeMarkupChars
 )
-Process {return [Text.Encodings.Web.HtmlEncoder]::Default.Encode($InputObject)}
+Process
+{
+	if($IncludeMarkupChars) {return [Text.Encodings.Web.HtmlEncoder]::Default.Encode($InputObject)}
+	else
+	{
+		[char[]] $chars =
+		for ($i = 0; $i -lt $InputObject.Length; $i++)
+		{
+			[int] $c = [char]$InputObject[$i]
+			Write-Verbose "$i : $c"
+			if([char]::IsSurrogatePair($InputObject,$i))
+			{ ('&#x{0:X};' -f [char]::ConvertToUtf32($InputObject,$i++)).GetEnumerator() }
+			elseif(0x7F -lt $c)
+			{ ('&#x{0:X};' -f $c).GetEnumerator() }
+			else
+			{ [char]$c }
+		}
+		return New-Object String $chars,0,$chars.Length
+	}
+}

test/ConvertFrom-EscapedXml.Tests.ps1

@@ -13,7 +13,7 @@ Describe 'ConvertFrom-EscapedXml' -Tag ConvertFrom-EscapedXml -Skip:$skip {
 		if($scriptsdir -notin ($env:Path -split $sep)) {$env:Path += "$sep$scriptsdir"}
 	}
 	Context 'Parse escaped XML into XML and serialize it' -Tag ConvertFromEscapedXml,Convert,ConvertFrom,EscapedXml,Xml {
-		It "Should convert '<Input>' into '<Output>'" -TestCases @(
+		It "Should convert '<Value>' into '<Result>'" -TestCases @(
 			@{ Value = '&lt;x /&gt;'; Result = '<x />' }
 			@{ Value = '&lt;a href=&quot;http://example.org&quot;&gt;link&lt;/a&gt;'
 				Result = '<a href="http://example.org">link</a>' }