Updated readme.md

Merge pull request #576 from ili101/FixDataTablePerformance
Double DataTable performance
2025-12-15 07:43:23 +00:00 · 2019-04-12 16:02:47 -04:00 · 2019-04-08 16:42:28 -04:00 · 2019-04-08 13:34:31 +03:00 · 2019-04-07 22:26:48 +03:00 · 2019-04-07 22:11:31 +03:00
39 changed files with 1470 additions and 2817 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -61,4 +61,6 @@ testCCFMT.ps1
 testHide.ps1
 ImportExcel.zip
 .vscode/launch.json
+.vscode/settings.json

+~$*
--- a/AddDataValidation.ps1
+++ b/AddDataValidation.ps1
@@ -0,0 +1,99 @@
+Function Add-ExcelDataValidationRule {
+    <#
+      .Synopsis
+        Adds data validation to a range of cells
+      .Example
+        >
+        >Add-ExcelDataValidationRule -WorkSheet $PlanSheet -Range 'E2:E1001' -ValidationType Integer -Operator between -Value 0 -Value2 100 `
+             -ShowErrorMessage -ErrorStyle stop -ErrorTitle 'Invalid Data' -ErrorBody 'Percentage must be a whole number between 0 and 100'
+
+        This defines a validation rule on cells E2-E1001; it is an integer rule and requires a number between 0 and 100
+        If a value is input with a fraction, negative number, or positive number > 100 a stop dialog box appears.
+      .Example
+        >
+        >Add-ExcelDataValidationRule -WorkSheet $PlanSheet -Range 'B2:B1001' -ValidationType List  -Formula 'values!$a$2:$a$1000'
+               -ShowErrorMessage -ErrorStyle stop -ErrorTitle 'Invalid Data' -ErrorBody 'You must select an item from the list'
+        This defines a list rule on Cells B2:1001, and the posible values are in a sheet named "values" at cells A2 to A1000
+        Blank cells in this range are ignored. If $ signs are left out of the fomrmula B2 would be checked against A2-A1000
+        B3, against A3-A1001, B4 against A4-A1002 up to B1001 beng checked against A1001-A1999
+       .Example
+       >
+       >Add-ExcelDataValidationRule -WorkSheet $PlanSheet -Range 'I2:N1001' -ValidationType List    -ValueSet @('yes','YES','Yes')
+               -ShowErrorMessage -ErrorStyle stop -ErrorTitle 'Invalid Data' -ErrorBody "Select Yes or leave blank for no"
+        Similar to the previous example but this time provides a value set; Excel comparisons are case sesnsitive, hence 3 versions of Yes.
+    #>
+
+    [CmdletBinding()]
+    Param(
+        #The range of cells to be validate, e.g. "B2:C100"
+        [Parameter(ValueFromPipeline = $true,Position=0)]
+        [Alias("Address")]
+        $Range ,
+        #The worksheet where the cells should be validated
+        [OfficeOpenXml.ExcelWorksheet]$WorkSheet ,
+        #An option corresponding to a choice from the 'Allow' pull down on the settings page in the Excel dialog. Any means "any allowed" i.e. no Validation
+        [ValidateSet('Any','Custom','DateTime','Decimal','Integer','List','TextLength','Time')]
+        $ValidationType,
+        #The operator to apply to Decimal, Integer, TextLength, DateTime and time fields, e.g. equal, between
+        [OfficeOpenXml.DataValidation.ExcelDataValidationOperator]$Operator = [OfficeOpenXml.DataValidation.ExcelDataValidationOperator]::equal ,
+        #For Decimal, Integer, TextLength, DateTime the [first] data value
+        $Value,
+        #When using the between operator, the second data  value
+        $Value2,
+        #The [first] data value as a formula. Use absolute formulas $A$1 if (e.g.) you want all cells to check against the same list
+        $Formula,
+        #When using the between operator, the second data value as a formula
+        $Formula2,
+        #When using the list validation type, a set of values (rather than refering to Sheet!B$2:B$100 )
+        $ValueSet,
+        #Corresponds to the the 'Show Error alert ...' check box on error alert page in the Excel dialog
+        [switch]$ShowErrorMessage,
+        #Stop, Warning, or Infomation, corresponding to to the style setting in the Excel dialog
+        [OfficeOpenXml.DataValidation.ExcelDataValidationWarningStyle]$ErrorStyle,
+        #The title for the message box  corresponding to to the title setting in the Excel dialog
+        [String]$ErrorTitle,
+        #The error message corresponding to to the Error message setting in the Excel dialog
+        [String]$ErrorBody,
+        #Corresponds to the the 'Show Input message ...' check box on input message  page in the Excel dialog
+        [switch]$ShowPromptMessage,
+        #The prompt message corresponding to to the Input message setting in the Excel dialog
+        [String]$PromptBody,
+        #The title for the message box  corresponding to to the title setting in the Excel dialog
+        [String]$PromptTitle,
+        #By default the 'Ignore blank' option will be selected, unless NoBlank is sepcified.
+        [String]$NoBlank
+    )
+    if  ($Range -is [Array])  {
+        $null = $PSBoundParameters.Remove("Range")
+        $Range | Add-ExcelDataValidationRule @PSBoundParameters
+    }
+    else {
+        #We should accept, a worksheet and a name of a range or a cell address; a table; the address of a table; a named range; a row, a column or .Cells[ ]
+        if      (-not $WorkSheet -and $Range.worksheet) {$WorkSheet = $Range.worksheet} 
+        if      ($Range.Address)   {$Range = $Range.Address}
+        
+        if      ($Range -isnot [string] -or -not $WorkSheet) {Write-Warning -Message "You need to provide a worksheet and range of cells." ;return}
+       #else we assume Range is a range.
+
+        $validation = $WorkSheet.DataValidations."Add$ValidationType`Validation"($Range)
+        if     ($validation.AllowsOperator) {$validation.Operator = $Operator}
+        if     ($PSBoundParameters.ContainsKey('value')) {
+                            $validation.Formula.Value          = $Value
+        }
+        elseif ($Formula)     {$validation.Formula.ExcelFormula   = $Formula}
+        elseif ($ValueSet)    {Foreach ($v in $ValueSet) {$validation.Formula.Values.Add($V)}}
+        if     ($PSBoundParameters.ContainsKey('Value2')) {
+            $validation.Formula2.Value         = $Value2
+        }
+        elseif ($Formula2)    {$validation.Formula2.ExcelFormula  = $Formula}
+        $validation.ShowErrorMessage = [bool]$ShowErrorMessage
+        $validation.ShowInputMessage = [bool]$ShowPromptMessage
+        $validation.AllowBlank      = -not $NoBlank
+
+        if ($PromptTitle) {$validation.PromptTitle = $PromptTitle}
+        if ($ErrorTitle)  {$validation.ErrorTitle  = $ErrorTitle}
+        if ($PromptBody)  {$validation.Prompt      = $PromptBody}
+        if ($ErrorBody)   {$validation.Error       = $ErrorBody}
+        if ($ErrorStyle)  {$validation.ErrorStyle  = $ErrorStyle}
+    }
+ }
--- a/ConvertExcelToImageFile.ps1
+++ b/ConvertExcelToImageFile.ps1
@@ -35,15 +35,15 @@
        Write-Progress -Activity "Exporting $range of $workSheetname in $Path" -Status "Opening Workbook and copying data"
        $xlWbk  = $xlApp.Workbooks.Open($Path)
        $xlWbk.Worksheets($workSheetname).Select()
-        $xlWbk.ActiveSheet.Range($range).Select() | Out-Null
-        $xlApp.Selection.Copy()                   | Out-Null
+        $null = $xlWbk.ActiveSheet.Range($range).Select()
+        $null = $xlApp.Selection.Copy()
        Write-Progress -Activity "Exporting $range of $workSheetname in $Path" -Status "Saving copied data"
        # Get-Clipboard came in with PS5. Older versions can use [System.Windows.Clipboard] but it is ugly.
        $image  = Get-Clipboard -Format Image
        $image.Save($destination, $Format)
        Write-Progress -Activity "Exporting $range of $workSheetname in $Path" -Status "Closing Excel"
-        $xlWbk.ActiveSheet.Range("a1").Select()   | Out-Null
-        $xlApp.Selection.Copy()                   | Out-Null
+        $null = $xlWbk.ActiveSheet.Range("a1").Select()
+        $null = $xlApp.Selection.Copy()
        $xlApp.Quit()
        Write-Progress -Activity "Exporting $range of $workSheetname in $Path" -Completed
        if ($show) {Start-Process -FilePath $destination}
--- a/ConvertToExcelXlsx.ps1
+++ b/ConvertToExcelXlsx.ps1
@@ -50,7 +50,7 @@ Function ConvertTo-ExcelXlsx {
        }

        $Excel.Visible = $false
-        $Excel.Workbooks.Open($xlsFile.FullName) | Out-Null
+        $null = $Excel.Workbooks.Open($xlsFile.FullName)
        $Excel.ActiveWorkbook.SaveAs($xlsxPath, $xlFixedFormat)
        $Excel.ActiveWorkbook.Close()
        $Excel.Quit()
--- a/Copy-ExcelWorkSheet.ps1
+++ b/Copy-ExcelWorkSheet.ps1
@@ -29,12 +29,12 @@
    [CmdletBinding()]
    param(
        #An ExcelWorkbook or ExcelPackage object or the path to an XLSx file where the data is found.
-        [Parameter(Mandatory=$true)]
+        [Parameter(Mandatory = $true)]
        $SourceWorkbook,
        #Name or number (starting from 1) of the worksheet in the source workbook (defaults to 1).
        $SourceWorkSheet = 1 ,
        #An ExcelWorkbook or ExcelPackage object or the path to an XLSx file where the data should be copied.
-        [Parameter(Mandatory=$true)]
+        [Parameter(Mandatory = $true)]
        $DestinationWorkbook,
        #Name of the worksheet in the destination workbook; by default the same as the source worksheet's name. If the sheet exists it will be deleted and re-copied.
        $DestinationWorkSheet,
@@ -65,46 +65,47 @@
        }
    }
    else {
-        if     ($SourceWorkbook -is [OfficeOpenXml.ExcelWorkbook]) {$sourcews=$SourceWorkbook.Worksheets[$SourceWorkSheet]}
-        elseif ($SourceWorkbook -is [OfficeOpenXml.ExcelPackage] ) {$sourcews=$SourceWorkbook.Workbook.Worksheets[$SourceWorkSheet]}
+        if ($SourceWorkbook -is [OfficeOpenXml.ExcelWorkbook]) {$sourcews = $SourceWorkbook.Worksheets[$SourceWorkSheet]}
+        elseif ($SourceWorkbook -is [OfficeOpenXml.ExcelPackage] ) {$sourcews = $SourceWorkbook.Workbook.Worksheets[$SourceWorkSheet]}
        else {
-                $SourceWorkbook = (Resolve-Path $SourceWorkbook).ProviderPath
-                try {
-                    Write-Verbose "Opening worksheet '$Worksheetname' in Excel workbook '$SourceWorkbook'."
-                    $Stream    = New-Object -TypeName System.IO.FileStream -ArgumentList $SourceWorkbook, 'Open', 'Read' ,'ReadWrite'
-                    $Package1  = New-Object -TypeName OfficeOpenXml.ExcelPackage -ArgumentList $Stream
-                    $sourceWs = $Package1.Workbook.Worksheets[$SourceWorkSheet]
-                }
-                catch           {Write-Warning -Message "Could not open $SourceWorkbook" ; return}
+            $SourceWorkbook = (Resolve-Path $SourceWorkbook).ProviderPath
+            try {
+                Write-Verbose "Opening worksheet '$Worksheetname' in Excel workbook '$SourceWorkbook'."
+                $Stream = New-Object -TypeName System.IO.FileStream -ArgumentList $SourceWorkbook, 'Open', 'Read' , 'ReadWrite'
+                $Package1 = New-Object -TypeName OfficeOpenXml.ExcelPackage -ArgumentList $Stream
+                $sourceWs = $Package1.Workbook.Worksheets[$SourceWorkSheet]
+            }
+            catch {Write-Warning -Message "Could not open $SourceWorkbook" ; return}
        }
-        if     (-not $sourceWs) {Write-Warning -Message "Could not find worksheet '$Sourceworksheet' in the source workbook." ; return}
+        if (-not $sourceWs) {Write-Warning -Message "Could not find worksheet '$Sourceworksheet' in the source workbook." ; return}
        else {
-                try {
-                    if     ($DestinationWorkbook -is [OfficeOpenXml.ExcelWorkbook]) {
-                            $wb = $DestinationWorkbook
-                    }
-                    elseif ($DestinationWorkbook -is [OfficeOpenXml.ExcelPackage] ) {
-                            $wb = $DestinationWorkbook.workbook
-                            if ($show) {$package2 =$DestinationWorkbook}
-                    }
-                    else   {
-                            $package2 = Open-ExcelPackage -Create  -Path $DestinationWorkbook
-                            $wb = $package2.Workbook
-                    }
-                    if (-not  $DestinationWorkSheet) {$DestinationWorkSheet = $SourceWs.Name}
-                    if ($wb.Worksheets[$DestinationWorkSheet]) {
-                            Write-Verbose "Destination workbook already has a sheet named '$DestinationWorkSheet', deleting it."
-                            $wb.Worksheets.Delete($DestinationWorkSheet)
-                    }
-                    Write-Verbose "Copying $($SourceWorkSheet) from $($SourceWorkbook) to $($DestinationWorkSheet) in $($DestinationWorkbook)"
-                    $null = Add-WorkSheet -ExcelWorkbook $wb -WorkSheetname $DestinationWorkSheet -CopySource  $sourceWs
-                    if ($package1) {Close-ExcelPackage -ExcelPackage $Package1 -NoSave     }
-                    if ($package2) {Close-ExcelPackage -ExcelPackage $Package2 -Show:$show }
-                    if ($show -and $DestinationWorkbook -is  [OfficeOpenXml.ExcelWorkbook]) {
-                                 Write-Warning -Message "-Show only works if the Destination workbook is given as a file path or an ExcelPackage object."
-                    }
+            try {
+                if ($DestinationWorkbook -is [OfficeOpenXml.ExcelWorkbook]) {
+                    $wb = $DestinationWorkbook
                }
-                catch           {Write-Warning -Message "Could not write to sheet '$DestinationWorkSheet' in the destination workbook" ; return}
+                elseif ($DestinationWorkbook -is [OfficeOpenXml.ExcelPackage] ) {
+                    $wb = $DestinationWorkbook.workbook
+                    if ($show) {$package2 = $DestinationWorkbook}
+                }
+                else {
+                    $package2 = Open-ExcelPackage -Create  -Path $DestinationWorkbook
+                    $wb = $package2.Workbook
+                }
+                if (-not  $DestinationWorkSheet) {$DestinationWorkSheet = $SourceWs.Name}
+                if ($wb.Worksheets[$DestinationWorkSheet]) {
+                    Write-Verbose "Destination workbook already has a sheet named '$DestinationWorkSheet', deleting it."
+                    $wb.Worksheets.Delete($DestinationWorkSheet)
+                }
+                Write-Verbose "Copying $($SourceWorkSheet) from $($SourceWorkbook) to $($DestinationWorkSheet) in $($DestinationWorkbook)"
+                $null = Add-WorkSheet -ExcelWorkbook $wb -WorkSheetname $DestinationWorkSheet -CopySource  $sourceWs
+                if ($Stream) {$Stream.Close()                                          }
+                if ($package1) {Close-ExcelPackage -ExcelPackage $Package1 -NoSave     }
+                if ($package2) {Close-ExcelPackage -ExcelPackage $Package2 -Show:$show }
+                if ($show -and $DestinationWorkbook -is [OfficeOpenXml.ExcelWorkbook]) {
+                    Write-Warning -Message "-Show only works if the Destination workbook is given as a file path or an ExcelPackage object."
+                }
+            }
+            catch {Write-Warning -Message "Could not write to sheet '$DestinationWorkSheet' in the destination workbook" ; return}
        }
    }
 }
--- a/Examples/ExcelDataValidation/MutipleValidations.ps1
+++ b/Examples/ExcelDataValidation/MutipleValidations.ps1
@@ -0,0 +1,85 @@
+#region Setup
+<#
+    This examples demos three types of validation:
+        * Creating a list using a PowerShell array
+        * Creating a list data from another Excel Worksheet
+        * Creating a rule for numbers to be between 0 an 10000
+
+    Run the script then try"
+        * Add random data in Column B
+            * Then choose from the drop down list
+        * Add random data in Column C
+            * Then choose from the drop down list
+        * Add .01 in column F
+#>
+
+try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
+
+$path = "$Env:TEMP\DataValidation.xlsx"
+Remove-Item $path -ErrorAction SilentlyContinue
+
+$data = ConvertFrom-Csv -InputObject @"
+ID,Region,Product,Quantity,Price
+12001,North,Nails,37,3.99
+12002,South,Hammer,5,12.10
+12003,East,Saw,12,15.37
+12010,West,Drill,20,8
+12011,North,Crowbar,7,23.48
+"@
+
+# Export the raw data
+$excelPackage = $Data |
+    Export-Excel -WorksheetName "Sales" -Path $path -PassThru
+
+# Creates a sheet with data that will be used in a validation rule
+$excelPackage = @('Chisel', 'Crowbar', 'Drill', 'Hammer', 'Nails', 'Saw', 'Screwdriver', 'Wrench') |
+    Export-excel -ExcelPackage $excelPackage -WorksheetName Values -PassThru
+
+#endregion
+
+#region Creating a list using a PowerShell array
+$ValidationParams = @{
+    WorkSheet        = $excelPackage.sales
+    ShowErrorMessage = $true
+    ErrorStyle       = 'stop'
+    ErrorTitle       = 'Invalid Data'
+}
+
+
+$MoreValidationParams = @{
+    Range          = 'B2:B1001'
+    ValidationType = 'List'
+    ValueSet       = @('North', 'South', 'East', 'West')
+    ErrorBody      = "You must select an item from the list."
+}
+
+Add-ExcelDataValidationRule @ValidationParams @MoreValidationParams
+#endregion
+
+#region Creating a list data from another Excel Worksheet
+$MoreValidationParams = @{
+    Range          = 'C2:C1001'
+    ValidationType = 'List'
+    Formula        = 'values!$a$1:$a$10'
+    ErrorBody      = "You must select an item from the list.`r`nYou can add to the list on the values page" #Bucket
+}
+
+Add-ExcelDataValidationRule @ValidationParams @MoreValidationParams
+#endregion
+
+#region Creating a rule for numbers to be between 0 an 10000
+$MoreValidationParams = @{
+    Range          = 'F2:F1001'
+    ValidationType = 'Integer'
+    Operator       = 'between'
+    Value          = 0
+    Value2         = 10000
+    ErrorBody      = 'Quantity must be a whole number between 0 and 10000'
+}
+
+Add-ExcelDataValidationRule @ValidationParams @MoreValidationParams
+#endregion
+
+#region Close Package
+Close-ExcelPackage -ExcelPackage $excelPackage -Show
+#endregion
--- a/Examples/OutTabulator/demo.txt
+++ b/Examples/OutTabulator/demo.txt
@@ -0,0 +1,23 @@
+# ConvertFrom-Excel
+''
+
+.\test.xlsx
+
+Import-Excel .\test.xlsx | ft
+
+ConvertFrom-Excel -ExcelFile .\test.xlsx -outFile .\targetout.html
+
+# Create a column definition
+$columnOptions = @()
+
+$columnOptions += New-ColumnOption -ColumnName Progress -formatter progress
+ConvertFrom-Excel -ExcelFile .\test.xlsx -outFile .\targetout.html -columnOptions $columnOptions
+
+$columnOptions += New-ColumnOption Activity -formatter lineFormatter
+ConvertFrom-Excel -ExcelFile .\test.xlsx -outFile .\targetout.html -columnOptions $columnOptions
+
+$columnOptions += New-ColumnOption -ColumnName Rating -formatter star
+$columnOptions += New-ColumnOption Driver -formatter tickCross
+ConvertFrom-Excel -ExcelFile .\test.xlsx -outFile .\targetout.html -columnOptions $columnOptions
+
+ConvertFrom-Excel -ExcelFile .\test.xlsx -outFile .\targetout.html -columnOptions $columnOptions -groupBy Gender
--- a/Examples/OutTabulator/start-demo.ps1
+++ b/Examples/OutTabulator/start-demo.ps1
@@ -0,0 +1,216 @@
+## Start-Demo.ps1
+##################################################################################################
+## This is an overhaul of Jeffrey Snover's original Start-Demo script by Joel "Jaykul" Bennett
+##
+## I've switched it to using ReadKey instead of ReadLine (you don't have to hit Enter each time)
+## As a result, I've changed the names and keys for a lot of the operations, so that they make 
+## sense with only a single letter to tell them apart (sorry if you had them memorized).
+##
+## I've also been adding features as I come across needs for them, and you'll contribute your 
+## improvements back to the PowerShell Script repository as well.
+##################################################################################################
+## Revision History (version 3.3)
+## 3.3.3 Fixed:    Script no longer says "unrecognized key" when you hit shift or ctrl, etc.
+##       Fixed:    Blank lines in script were showing as errors (now printed like comments)
+## 3.3.2 Fixed:    Changed the "x" to match the "a" in the help text
+## 3.3.1 Fixed:    Added a missing bracket in the script
+## 3.3 - Added:    Added a "Clear Screen" option
+##     - Added:    Added a "Rewind" function (which I'm not using much)
+## 3.2 - Fixed:    Put back the trap { continue; }
+## 3.1 - Fixed:    No Output when invoking Get-Member (and other cmdlets like it???)
+## 3.0 - Fixed:    Commands which set a variable, like: $files = ls
+##     - Fixed:    Default action doesn't continue
+##     - Changed:  Use ReadKey instead of ReadLine
+##     - Changed:  Modified the option prompts (sorry if you had them memorized)
+##     - Changed:  Various time and duration strings have better formatting
+##     - Enhance:  Colors are settable: prompt, command, comment
+##     - Added:    NoPauseAfterExecute switch removes the extra pause
+##                 If you set this, the next command will be displayed immediately
+##     - Added:    Auto Execute mode (FullAuto switch) runs the rest of the script
+##                 at an automatic speed set by the AutoSpeed parameter (or manually)
+##     - Added:    Automatically append an empty line to the end of the demo script
+##                 so you have a chance to "go back" after the last line of you demo
+##################################################################################################
+##
+param(
+  $file=".\demo.txt", 
+  [int]$command=0, 
+  [System.ConsoleColor]$promptColor="Yellow", 
+  [System.ConsoleColor]$commandColor="White", 
+  [System.ConsoleColor]$commentColor="Green", 
+  [switch]$FullAuto,
+  [int]$AutoSpeed = 3,
+  [switch]$NoPauseAfterExecute
+)
+
+$RawUI = $Host.UI.RawUI
+$hostWidth = $RawUI.BufferSize.Width
+
+# A function for reading in a character 
+function Read-Char() {
+  $_OldColor = $RawUI.ForeGroundColor
+  $RawUI.ForeGroundColor = "Red"
+  $inChar=$RawUI.ReadKey("IncludeKeyUp")
+  # loop until they press a character, so Shift or Ctrl, etc don't terminate us
+  while($inChar.Character -eq 0){
+    $inChar=$RawUI.ReadKey("IncludeKeyUp")
+  }
+  $RawUI.ForeGroundColor = $_OldColor
+  return $inChar.Character
+}
+
+function Rewind($lines, $index, $steps = 1) {
+   $started = $index;
+   $index -= $steps;
+   while(($index -ge 0) -and ($lines[$index].Trim(" `t").StartsWith("#"))){
+      $index--
+   }
+   if( $index -lt 0 ) { $index = $started }
+   return $index
+}
+
+$file = Resolve-Path $file
+while(-not(Test-Path $file)) {
+  $file = Read-Host "Please enter the path of your demo script (Crtl+C to cancel)"
+  $file = Resolve-Path $file
+}
+
+Clear-Host
+
+$_lines = Get-Content $file
+# Append an extra (do nothing) line on the end so we can still go back after the last line.
+$_lines += "Write-Host 'The End'"
+$_starttime = [DateTime]::now
+$FullAuto = $false
+
+Write-Host -nonew -back black -fore $promptColor $(" " * $hostWidth)
+Write-Host -nonew -back black -fore $promptColor @"
+<Demo Started :: $(split-path $file -leaf)>$(' ' * ($hostWidth -(18 + $(split-path $file -leaf).Length)))
+"@
+Write-Host -nonew -back black -fore $promptColor "Press"
+Write-Host -nonew -back black -fore Red " ? "
+Write-Host -nonew -back black -fore $promptColor "for help.$(' ' * ($hostWidth -17))"
+Write-Host -nonew -back black -fore $promptColor $(" " * $hostWidth)
+
+# We use a FOR and an INDEX ($_i) instead of a FOREACH because
+# it is possible to start at a different location and/or jump 
+# around in the order.
+for ($_i = $Command; $_i -lt $_lines.count; $_i++)
+{  
+	# Put the current command in the Window Title along with the demo duration
+	$Dur = [DateTime]::Now - $_StartTime
+   $RawUI.WindowTitle = "$(if($dur.Hours -gt 0){'{0}h '})$(if($dur.Minutes -gt 0){'{1}m '}){2}s   {3}" -f 
+                        $dur.Hours, $dur.Minutes, $dur.Seconds, $($_Lines[$_i])
+
+	# Echo out the commmand to the console with a prompt as though it were real
+	Write-Host -nonew -fore $promptColor "[$_i]$([char]0x2265) "
+	if ($_lines[$_i].Trim(" ").StartsWith("#") -or $_lines[$_i].Trim(" ").Length -le 0) { 
+		Write-Host -fore $commentColor "$($_Lines[$_i])  "
+		continue 
+	} else {
+		Write-Host -nonew -fore $commandColor "$($_Lines[$_i])  "
+	}
+
+	if( $FullAuto ) { Start-Sleep $autoSpeed; $ch = [char]13 } else { $ch = Read-Char }
+	switch($ch)
+	{
+		"?" {
+			Write-Host -Fore $promptColor @"
+
+Running demo: $file
+(n) Next       (p) Previous
+(q) Quit       (s) Suspend 
+(t) Timecheck  (v) View $(split-path $file -leaf)
+(g) Go to line by number
+(f) Find lines by string
+(a) Auto Execute mode
+(c) Clear Screen
+"@
+			$_i-- # back a line, we're gonna step forward when we loop
+		}
+		"n" { # Next (do nothing)
+			Write-Host -Fore $promptColor "<Skipping Line>"
+		}
+		"p" { # Previous
+			Write-Host -Fore $promptColor "<Back one Line>"
+			while ($_lines[--$_i].Trim(" ").StartsWith("#")){}
+			$_i-- # back a line, we're gonna step forward when we loop
+		}
+		"a" { # EXECUTE (Go Faster)
+			$AutoSpeed = [int](Read-Host "Pause (seconds)")
+			$FullAuto = $true;
+			Write-Host -Fore $promptColor "<eXecute Remaining Lines>"
+			$_i-- # Repeat this line, and then just blow through the rest
+		}
+		"q" { # Quit
+			Write-Host -Fore $promptColor "<Quiting demo>"
+			$_i = $_lines.count;
+			break;
+		}
+		"v" { # View Source
+			$lines[0..($_i-1)] | Write-Host -Fore Yellow 
+			$lines[$_i]        | Write-Host -Fore Green
+			$lines[($_i+1)..$lines.Count] | Write-Host -Fore Yellow 
+			$_i-- # back a line, we're gonna step forward when we loop
+		}
+		"t" { # Time Check
+			 $dur = [DateTime]::Now - $_StartTime
+       Write-Host -Fore $promptColor $(
+          "{3} -- $(if($dur.Hours -gt 0){'{0}h '})$(if($dur.Minutes -gt 0){'{1}m '}){2}s" -f 
+          $dur.Hours, $dur.Minutes, $dur.Seconds, ([DateTime]::Now.ToShortTimeString()))
+			 $_i-- # back a line, we're gonna step forward when we loop
+		}
+		"s" { # Suspend (Enter Nested Prompt)
+			Write-Host -Fore $promptColor "<Suspending demo - type 'Exit' to resume>"
+			$Host.EnterNestedPrompt()
+			$_i-- # back a line, we're gonna step forward when we loop
+		}
+		"g" { # GoTo Line Number
+			$i = [int](Read-Host "line number")
+			if($i -le $_lines.Count) {
+				if($i -gt 0) {
+               # extra line back because we're gonna step forward when we loop
+               $_i = Rewind $_lines $_i (($_i-$i)+1)
+				} else {
+					$_i = -1 # Start negative, because we step forward when we loop
+				}
+			}
+		}
+		"f" { # Find by pattern
+			$match = $_lines | Select-String (Read-Host "search string")
+			if($match -eq $null) {
+				Write-Host -Fore Red "Can't find a matching line"
+			} else {
+				$match | % { Write-Host -Fore $promptColor $("[{0,2}] {1}" -f ($_.LineNumber - 1), $_.Line) }
+				if($match.Count -lt 1) {
+					$_i = $match.lineNumber - 2  # back a line, we're gonna step forward when we loop
+				} else {               
+					$_i-- # back a line, we're gonna step forward when we loop
+				}
+			}
+		}
+      "c" { 
+         Clear-Host
+         $_i-- # back a line, we're gonna step forward when we loop
+      }
+		"$([char]13)" { # on enter
+			Write-Host
+			trap [System.Exception] {Write-Error $_; continue;}
+			Invoke-Expression ($_lines[$_i]) | out-default
+			if(-not $NoPauseAfterExecute -and -not $FullAuto) { 
+				$null = $RawUI.ReadKey("NoEcho,IncludeKeyUp")  # Pause after output for no apparent reason... ;)
+			}
+		}
+		default
+		{
+			Write-Host -Fore Green "`nKey not recognized.  Press ? for help, or ENTER to execute the command."
+			$_i-- # back a line, we're gonna step forward when we loop
+		}
+	}
+}
+$dur = [DateTime]::Now - $_StartTime
+Write-Host -Fore $promptColor $(
+   "<Demo Complete -- $(if($dur.Hours -gt 0){'{0}h '})$(if($dur.Minutes -gt 0){'{1}m '}){2}s>" -f 
+   $dur.Hours, $dur.Minutes, $dur.Seconds, [DateTime]::Now.ToLongTimeString())
+Write-Host -Fore $promptColor $([DateTime]::now)
+Write-Host
--- a/Examples/OutTabulator/targetout.html
+++ b/Examples/OutTabulator/targetout.html
@@ -0,0 +1,80 @@
+<!doctype html>
+
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>Out-TabulatorView</title>
+</head>
+<body>
+
+<script type="text/javascript" src="file:///C:\Program Files\WindowsPowerShell\Modules\OutTabulatorView\js\jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="file:///C:\Program Files\WindowsPowerShell\Modules\OutTabulatorView\js\jquery-ui.min.js"></script>
+<script type="text/javascript" src="file:///C:\Program Files\WindowsPowerShell\Modules\OutTabulatorView\js\tabulator.min.js"></script>
+<script type="text/javascript" src="file:///C:\Program Files\WindowsPowerShell\Modules\OutTabulatorView\js\jquery.sparkline.min.js"></script>
+
+<link href="file:///C:\Program Files\WindowsPowerShell\Modules\OutTabulatorView\css\tabulator.min.css" rel="stylesheet">
+
+
+<div id="example-table"></div>
+
+<script type="text/javascript">
+    var lineFormatter = function(cell, formatterParams){
+        setTimeout(function(){ //give cell enough time to be added to the DOM before calling sparkline formatter
+        	cell.getElement().sparkline(cell.getValue(), {width:"100%", type:"line", disableTooltips:true});
+        }, 10);
+    };
+
+  var tabledata = [{"Name":"Alan Francis","Progress":90,"Activity":[4,17,11,7,6,12,14,13,11,10,9,6,11,12,0,5,12,14,18,11],"Gender":"male","Rating":3,"Color":"blue","dob":"07/08/1972","Driver":"true"},{"Name":"Brendon Philips","Progress":100,"Activity":[3,7,9,1,4,8,2,6,4,2,1,3,1,3,3,1,1,3,1,3],"Gender":"male","Rating":1,"Color":"orange","dob":"01/08/1980","Driver":""},{"Name":"Christine Lobowski","Progress":42,"Activity":[1,2,5,4,1,16,4,2,1,3,3,7,9,1,4,8,2,6,4,2],"Gender":"female","Rating":0,"Color":"green","dob":"22/05/1982","Driver":"true"},{"Name":"Ed White","Progress":70,"Activity":[20,17,15,11,16,9,4,17,11,12,0,5,12,14,18,11,12,14,20,12],"Gender":"male","Rating":0,"Color":"yellow","dob":"19/06/1976","Driver":""},{"Name":"Emily Sykes","Progress":42,"Activity":[11,15,19,20,17,16,16,5,3,2,1,2,3,4,5,4,2,5,9,8],"Gender":"female","Rating":1,"Color":"maroon","dob":"11/11/1970","Driver":""},{"Name":"Emma Netwon","Progress":40,"Activity":[3,7,9,1,4,8,3,7,9,1,4,8,2,6,4,2,2,6,4,2],"Gender":"female","Rating":4,"Color":"brown","dob":"07/10/1963","Driver":"true"},{"Name":"Frank Harbours","Progress":38,"Activity":[20,17,15,11,16,9,12,14,20,12,11,7,6,12,14,13,11,10,9,6],"Gender":"male","Rating":4,"Color":"red","dob":"12/05/1966","Driver":1},{"Name":"Gemma Jane","Progress":60,"Activity":[4,17,11,12,0,5,12,14,18,11,11,15,19,20,17,16,16,5,3,2],"Gender":"female","Rating":0,"Color":"red","dob":"22/05/1982","Driver":"true"},{"Name":"Hannah Farnsworth","Progress":30,"Activity":[1,2,5,4,1,16,10,12,14,16,13,9,7,11,10,13,4,2,1,3],"Gender":"female","Rating":1,"Color":"pink","dob":"11/02/1991","Driver":""},{"Name":"James Newman","Progress":73,"Activity":[1,20,5,3,10,13,17,15,9,11,1,2,3,4,5,4,2,5,9,8],"Gender":"male","Rating":5,"Color":"red","dob":"22/03/1998","Driver":""},{"Name":"Jamie Newhart","Progress":23,"Activity":[11,7,6,12,14,13,11,10,9,6,4,17,11,12,0,5,12,14,18,11],"Gender":"male","Rating":3,"Color":"green","dob":"14/05/1985","Driver":"true"},{"Name":"Jenny Green","Progress":56,"Activity":[11,15,19,20,17,15,11,16,9,12,14,20,12,20,17,16,16,5,3,2],"Gender":"female","Rating":4,"Color":"indigo","dob":"12/11/1998","Driver":"true"},{"Name":"John Phillips","Progress":80,"Activity":[11,7,6,12,14,1,20,5,3,10,13,17,15,9,1,13,11,10,9,6],"Gender":"male","Rating":1,"Color":"green","dob":"24/09/1950","Driver":"true"},{"Name":"Margret Marmajuke","Progress":16,"Activity":[1,3,1,3,3,1,1,3,1,3,20,17,15,11,16,9,12,14,20,12],"Gender":"female","Rating":5,"Color":"yellow","dob":"31/01/1999","Driver":""},{"Name":"Martin Barryman","Progress":20,"Activity":[1,2,3,4,5,4,11,7,6,12,14,13,11,10,9,6,2,5,9,8],"Gender":"male","Rating":5,"Color":"violet","dob":"04/04/2001","Driver":""},{"Name":"Mary May","Progress":1,"Activity":[10,12,14,16,13,9,7,11,10,13,1,2,5,4,1,16,4,2,1,3],"Gender":"female","Rating":2,"Color":"blue","dob":"14/05/1982","Driver":"true"},{"Name":"Oli Bob","Progress":12,"Activity":[1,20,5,3,10,13,17,15,9,11,10,12,14,16,13,9,7,11,10,13],"Gender":"male","Rating":1,"Color":"red","dob":"19/02/1984","Driver":1},{"Name":"Paul Branderson","Progress":60,"Activity":[1,3,1,3,3,1,11,15,19,20,17,16,16,5,3,2,1,3,1,3],"Gender":"male","Rating":5,"Color":"orange","dob":"01/01/1982","Driver":""},{"Name":"Victoria Bath","Progress":20,"Activity":[10,12,14,16,13,9,7,1,2,3,4,5,4,2,5,9,8,11,10,13],"Gender":"female","Rating":2,"Color":"purple","dob":"22/03/1986","Driver":null}]
+
+  $("#example-table").tabulator(
+        {
+    "outFile":  ".\\targetout.html",
+    "columns":  [
+                    {
+                        "field":  "Name",
+                        "title":  "Name"
+                    },
+                    {
+                        "field":  "Progress",
+                        "title":  "Progress",
+                        "formatter":  "progress"
+                    },
+                    {
+                        "field":  "Activity",
+                        "title":  "Activity",
+                        "formatter":  lineFormatter
+                    },
+                    {
+                        "field":  "Gender",
+                        "title":  "Gender"
+                    },
+                    {
+                        "field":  "Rating",
+                        "title":  "Rating",
+                        "formatter":  "star"
+                    },
+                    {
+                        "field":  "Color",
+                        "title":  "Color"
+                    },
+                    {
+                        "field":  "dob",
+                        "title":  "dob"
+                    },
+                    {
+                        "field":  "Driver",
+                        "title":  "Driver",
+                        "formatter":  "tickCross"
+                    }
+                ],
+    "groupBy":  "Gender"
+
+});
+
+$("#example-table").tabulator("setData", tabledata);
+
+</script>
+</body>
+</html>
--- a/Examples/OutTabulator/tryConvertFromExcel.ps1
+++ b/Examples/OutTabulator/tryConvertFromExcel.ps1
@@ -0,0 +1,9 @@
+[CmdletBinding()]
+param($outFile = "$PSScriptRoot\targetout.html")
+
+$columnOptions = @()
+
+$columnOptions += New-ColumnOption -ColumnName Progress -formatter progress
+$columnOptions += New-ColumnOption -ColumnName Activity -formatter lineFormatter
+
+ConvertFrom-Excel -ExcelFile $PSScriptRoot\test.xlsx -outFile $PSScriptRoot\targetout.html -columnOptions $columnOptions
--- a/Examples/Stocks/Get-StockInfo.ps1
+++ b/Examples/Stocks/Get-StockInfo.ps1
@@ -1,25 +1,24 @@
-<#
-    Revisit I think yahoo deprecated their service
-#>
-
 function Get-StockInfo {
    param(
-        $stock,
-        [datetime]$startDate,
-        [datetime]$endDate
+        [Parameter(Mandatory)]
+        $symbols,
+        [ValidateSet('open', 'close', 'high', 'low', 'avgTotalVolume')]
+        $dataPlot = "close"
    )

-    Process {
+    $xlfile = "$env:TEMP\stocks.xlsx"
+    rm $xlfile -ErrorAction Ignore

-        if (!$endDate) { $endDate = $startDate}
+    $result = Invoke-RestMethod "https://api.iextrading.com/1.0/stock/market/batch?symbols=$($symbols)&types=quote&last=1"

-        $baseUrl = "http://query.yahooapis.com/v1/public/yql?q="
-        $q = @"
-select * from yahoo.finance.historicaldata where symbol = "$($stock)" and startDate = "$($startDate.ToString('yyyy-MM-dd'))" and endDate = "$($endDate.ToString('yyyy-MM-dd'))"
-"@
-        $suffix = "&env=store://datatables.org/alltableswithkeys&format=json"
-        $r = Invoke-RestMethod ($baseUrl + $q + $suffix)
-        $r.query.results.quote
+    $symbolCount = $symbols.Split(",").count

-    }
-}
+
+    $ecd = New-ExcelChartDefinition -Row 1 -Column 1 -SeriesHeader $dataPlot `
+        -XRange symbol -YRange $dataPlot `
+        -Title "$($dataPlot)`r`n As Of $((Get-Date).ToShortDateString())"
+
+    $(foreach ($name in $result.psobject.Properties.name) {
+            $result.$name.quote
+        }) | Export-Excel $xlfile -AutoNameRange -AutoSize -Show -ExcelChartDefinition $ecd -StartRow 21 -StartColumn 2
+}
--- a/Examples/Stocks/GetMSFT.ps1
+++ b/Examples/Stocks/GetMSFT.ps1
@@ -1,20 +0,0 @@
-<#
-    Revisit I think yahoo deprecated their service
-#>
-
-# try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
-
-# $Symbol = "MSFT"
-
-# . .\Get-StockInfo.ps1
-
-# Remove-Item *.xlsx -ErrorAction Ignore
-
-# $chart = New-ExcelChart -XRange Date -YRange Volume `
-#     -ChartType ColumnStacked `
-#     -Column 9 -Title "$Symbol Volume"
-
-# Get-StockInfo $Symbol 11/2 11/30 |
-#     Export-Excel .\stocks.xlsx -Show `
-#     -AutoSize -AutoNameRange `
-#     -ExcelChartDefinition $chart
--- a/Examples/Stocks/GetStocksAvgTotVol.ps1
+++ b/Examples/Stocks/GetStocksAvgTotVol.ps1
@@ -0,0 +1,3 @@
+. $PSScriptRoot\Get-StockInfo.ps1
+
+Get-StockInfo -symbols "msft,ibm,ge,xom,aapl" -dataPlot avgTotalVolume
--- a/Examples/TestRestAPI/PSExcelPester.psm1
+++ b/Examples/TestRestAPI/PSExcelPester.psm1
@@ -0,0 +1,90 @@
+function ConvertTo-PesterTest {
+    param(
+        [parameter(Mandatory)]
+        $XlFilename,
+        $WorksheetName = 'Sheet1'
+    )
+
+    $testFileName = "{0}.tests.ps1" -f (get-date).ToString("yyyyMMddHHmmss")
+
+    $records = Import-Excel $XlFilename
+
+    $params = @{}
+
+    $blocks = $(foreach ($record in $records) {
+            foreach ($propertyName in $record.psobject.properties.name) {
+                if ($propertyName -notmatch 'ExpectedResult|QueryString') {
+                    $params.$propertyName = $record.$propertyName
+                }
+            }
+
+            if ($record.QueryString) {
+                $params.Uri += "?{0}" -f $record.QueryString
+            }
+
+            @"
+
+    it "Should have the expected result '$($record.ExpectedResult)'" {
+        `$target = '$($params | ConvertTo-Json -compress)' | ConvertFrom-Json
+
+        `$target.psobject.Properties.name | ForEach-Object {`$p=@{}} {`$p.`$_=`$(`$target.`$_)}
+
+        Invoke-RestMethod @p | Should Be '$($record.ExpectedResult)'
+    }
+
+"@
+        })
+
+    @"
+Describe "Tests from $($XlFilename) in $($WorksheetName)" {
+$($blocks)
+}
+"@ | Set-Content -Encoding Ascii $testFileName
+
+    [PSCustomObject]@{
+        TestFileName = (Get-ChildItem $testFileName).FullName
+    }
+}
+
+function Show-PesterResult {
+    param(
+        [Parameter(ValueFromPipelineByPropertyName, Mandatory)]
+        $TestFileName
+    )
+
+    Begin {
+        $xlfilename = ".\test.xlsx"
+        Remove-Item $xlfilename -ErrorAction SilentlyContinue
+
+        $ConditionalText = @()
+        $ConditionalText += New-ConditionalText -Range "Result" -Text failed  -BackgroundColor red   -ConditionalTextColor black
+        $ConditionalText += New-ConditionalText -Range "Result" -Text passed  -BackgroundColor green -ConditionalTextColor black
+        $ConditionalText += New-ConditionalText -Range "Result" -Text pending -BackgroundColor gray  -ConditionalTextColor black
+
+        $xlParams = @{
+            Path              = $xlfilename
+            WorkSheetname     = 'PesterTests'
+            ConditionalText   = $ConditionalText
+            PivotRows         = 'Result', 'Name'
+            PivotData         = @{'Result' = 'Count'}
+            IncludePivotTable = $true
+            AutoSize          = $true
+            AutoNameRange     = $true
+            AutoFilter        = $true
+            Show              = $true
+        }
+    }
+
+    End {
+
+        $(foreach ($result in (Invoke-Pester -Script $TestFileName -PassThru -Show None).TestResult) {
+                [PSCustomObject][Ordered]@{
+                    Description = $result.Describe
+                    Name        = $result.Name
+                    Result      = $result.Result
+                    Messge      = $result.FailureMessage
+                    StackTrace  = $result.StackTrace
+                }
+            }) | Export-Excel @xlParams
+    }
+}
--- a/Examples/TestRestAPI/ShowPesterResults.ps1
+++ b/Examples/TestRestAPI/ShowPesterResults.ps1
@@ -1,40 +1,32 @@
 function Show-PesterResults {
-    $xlfilename=".\test.xlsx"
-    rm $xlfilename -ErrorAction Ignore
+    $xlfilename = ".\test.xlsx"
+    Remove-Item $xlfilename -ErrorAction Ignore

    $ConditionalText = @()
    $ConditionalText += New-ConditionalText -Range "Result" -Text failed  -BackgroundColor red   -ConditionalTextColor black
    $ConditionalText += New-ConditionalText -Range "Result" -Text passed  -BackgroundColor green -ConditionalTextColor black
    $ConditionalText += New-ConditionalText -Range "Result" -Text pending -BackgroundColor gray  -ConditionalTextColor black
-    
+
    $xlParams = @{
-        Path=$xlfilename
-        WorkSheetname = 'PesterTests'
-        ConditionalText=$ConditionalText 
-        PivotRows = 'Description'
-        PivotColumns = 'Result'
-        PivotData = @{'Result'='Count'} 
-        IncludePivotTable  = $true 
-        #IncludePivotChart = $true 
-        #NoLegend = $true 
-        #ShowPercent = $true 
-        #ShowCategory = $true 
-        AutoSize = $true 
-        AutoNameRange = $true
-        AutoFilter = $true
-        Show  = $true
+        Path              = $xlfilename
+        WorkSheetname     = 'PesterTests'
+        ConditionalText   = $ConditionalText
+        PivotRows         = 'Result', 'Name'
+        PivotData         = @{'Result' = 'Count'}
+        IncludePivotTable = $true
+        AutoSize          = $true
+        AutoNameRange     = $true
+        AutoFilter        = $true
+        Show              = $true
    }

-    $(foreach($result in (Invoke-Pester -PassThru -Show None).TestResult) {
-
-        [PSCustomObject]@{
-            Description = $result.Describe
-            Name        = $result.Name
-            #Time       = $result.Time
-            Result      = $result.Result
-            Messge      = $result.FailureMessage
-            StackTrace  = $result.StackTrace
-        }
-
-    }) | Sort Description | Export-Excel @xlParams 
+    $(foreach ($result in (Invoke-Pester -PassThru -Show None).TestResult) {
+            [PSCustomObject]@{
+                Description = $result.Describe
+                Name        = $result.Name
+                Result      = $result.Result
+                Messge      = $result.FailureMessage
+                StackTrace  = $result.StackTrace
+            }
+        }) | Sort-Object Description | Export-Excel @xlParams
 }
--- a/Examples/TestRestAPI/TestAPIReadXls.ps1
+++ b/Examples/TestRestAPI/TestAPIReadXls.ps1
@@ -1,5 +1,3 @@
-try {. $PSScriptRoot\..\..\LoadPSD1.ps1} catch {}
-
 function Test-APIReadXls {
    param(
        [parameter(Mandatory)]
@@ -7,6 +5,8 @@ function Test-APIReadXls {
        $WorksheetName = 'Sheet1'
    )

+    $testFileName = "{0}.tests.ps1" -f (get-date).ToString("yyyyMMddHHmmss")
+
    $records = Import-Excel $XlFilename

    $params = @{}
@@ -35,15 +35,11 @@ function Test-APIReadXls {
 "@
        })

-    $testFileName = "{0}.tests.ps1" -f (get-date).ToString("yyyyMMddHHmmss.fff")
-
    @"
 Describe "Tests from $($XlFilename) in $($WorksheetName)" {
 $($blocks)
 }
 "@ | Set-Content -Encoding Ascii $testFileName

-    #Invoke-Pester -Script (Get-ChildItem $testFileName)
-    Get-ChildItem $testFileName
-}
-
+    (Get-ChildItem $testFileName).FullName
+}
--- a/Examples/TestRestAPI/testlist.xlsx
+++ b/Examples/TestRestAPI/testlist.xlsx
--- a/Export-Excel.ps1
+++ b/Export-Excel.ps1
@@ -17,7 +17,7 @@
        .PARAMETER ClearSheet
            If specified Export-Excel will remove any existing worksheet with the selected name. The Default behaviour is to overwrite cells in this sheet as needed (but leaving non-overwritten ones in place).
        .PARAMETER Append
-            If specified dat,a will be added to the end of an existing sheet, using the same column headings.
+            If specified data will be added to the end of an existing sheet, using the same column headings.
        .PARAMETER TargetData
            Data to insert onto the worksheet - this is usually provided from the pipeline.
        .PARAMETER DisplayPropertySet
@@ -133,6 +133,8 @@
            Enables the Excel filter on the complete header row, so users can easily sort, filter and/or search the data in the selected column.
        .PARAMETER AutoSize
            Sizes the width of the Excel column to the maximum width needed to display all the containing data in that cell.
+        .PARAMETER MaxAutoSizeRows
+            Autosizing can be time consuming, so this sets a maximum number of rows to look at for the Autosize operation. Default is 1000; If 0 is specified ALL rows will be checked
        .PARAMETER Activate
            If there is already content in the workbook, a new sheet will not be active UNLESS Activate is specified; if a PivotTable is included it will be the active sheet
        .PARAMETER Now
@@ -427,7 +429,8 @@
        [Parameter(Mandatory = $true, ParameterSetName = "PackageTable")]
        [OfficeOpenXml.ExcelPackage]$ExcelPackage,
        [Parameter(ValueFromPipeline = $true)]
-        $TargetData,
+        [Alias('TargetData')]
+        $InputObject,
        [Switch]$Calculate,
        [Switch]$Show,
        [String]$WorksheetName = 'Sheet1',
@@ -453,6 +456,7 @@
        [Switch]$ShowCategory,
        [Switch]$ShowPercent,
        [Switch]$AutoSize,
+        $MaxAutoSizeRows = 1000,
        [Switch]$NoClobber,
        [Switch]$FreezeTopRow,
        [Switch]$FreezeFirstColumn,
@@ -479,7 +483,7 @@
        [String]$TableName,
        [Parameter(ParameterSetName = 'Table')]
        [Parameter(ParameterSetName = 'PackageTable')]
-        [OfficeOpenXml.Table.TableStyles]$TableStyle = 'Medium6',
+        [OfficeOpenXml.Table.TableStyles]$TableStyle,
        [Switch]$Barchart,
        [Switch]$PieChart,
        [Switch]$LineChart ,
@@ -517,109 +521,22 @@
        [Switch]$ReZip
    )

-    Begin {
+    begin {
        $numberRegex = [Regex]'\d'
-        function Add-CellValue {
-            <#
-              .SYNOPSIS
-                Save a value in an Excel cell.
-
-              .DESCRIPTION
-                DateTime objects are always converted to a short DateTime format in Excel. When Excel loads the file,
-                it applies the local format for dates. And formulas are always saved as formulas. URIs are set as hyperlinks in the file.
-
-                Numerical values will be converted to numbers as defined in the regional settings of the local
-                system. In case the parameter 'NoNumberConversion' is used, we don't convert to number and leave
-                the value 'as is'. In case of conversion failure, we also leave the value 'as is'.
-            #>
-
-            Param (
-                $TargetCell,
-                $CellValue
-            )
-            #The write-verbose commands have been commented out below - even if verbose is silenced they cause a significiant performance impact and if it's on they will cause a flood of messages.
-            Switch ($CellValue) {
-                { $_ -is [DateTime]} {
-                    # Save a date with one of Excel's built in formats format
-                    $TargetCell.Value = $_
-                    $TargetCell.Style.Numberformat.Format = 'm/d/yy h:mm' # This is not a custom format, but a preset recognized as date and localized.
-                    #Write-Verbose  "Cell '$Row`:$ColumnIndex' header '$Name' add value '$_' as date"
-                    break
-
-                }
-                { $_ -is [TimeSpan]} {
-                    #Save a timespans with a built in format for elapsed hours, minutes and seconds
-                    $TargetCell.Value = $_
-                    $TargetCell.Style.Numberformat.Format = '[h]:mm:ss'
-                    break
-                }
-                { $_ -is [System.ValueType]} {
-                    # Save numerics, setting format if need be.
-                    $TargetCell.Value = $_
-                    if ($setNumformat) {$targetCell.Style.Numberformat.Format = $Numberformat }
-                    #Write-Verbose  "Cell '$Row`:$ColumnIndex' header '$Name' add value '$_' as value"
-                    break
-                }
-                {($_ -is [String]) -and ($_[0] -eq '=')} {
-                    #region Save an Excel formula - we need = to spot the formula but the EPPLUS won't like it if we include it (Excel doesn't care if is there or not)
-                    $TargetCell.Formula = ($_ -replace '^=','')
-                    if ($setNumformat) {$targetCell.Style.Numberformat.Format = $Numberformat }
-                    #Write-Verbose  "Cell '$Row`:$ColumnIndex' header '$Name' add value '$_' as formula"
-                    break
-                }
-                { [System.Uri]::IsWellFormedUriString($_ , [System.UriKind]::Absolute) } {
-                    # Save a hyperlink : internal links can be in the form xl://sheet!E419 (use A1 as goto sheet), or xl://RangeName
-                    if ($_ -is [uri]) {$targetCell.HyperLink = $_ }
-                    elseif ($_ -match "^xl://internal/") {
-                          $referenceAddress = $_ -replace "^xl://internal/" , ""
-                          $display          = $referenceAddress -replace "!A1$"   , ""
-                          $h = New-Object -TypeName OfficeOpenXml.ExcelHyperLink -ArgumentList $referenceAddress , $display
-                          $TargetCell.HyperLink = $h
-                    }
-                    else {$TargetCell.HyperLink = $_ }   #$TargetCell.Value = $_.AbsoluteUri
-                    $TargetCell.Style.Font.Color.SetColor([System.Drawing.Color]::Blue)
-                    $TargetCell.Style.Font.UnderLine = $true
-                    #Write-Verbose  "Cell '$Row`:$ColumnIndex' header '$Name' add value '$($_.AbsoluteUri)' as Hyperlink"
-                    break
-                }
-                {( $NoNumberConversion -and (
-                  ($NoNumberConversion -contains $Name) -or ($NoNumberConversion -eq '*'))) } {
-                    #Save text without it to converting to number
-                    $TargetCell.Value = $_
-                    #Write-Verbose "Cell '$Row`:$ColumnIndex' header '$Name' add value '$($TargetCell.Value)' unconverted"
-                    break
-                }
-                Default {
-                    #Save a value as a number if possible
-                    $number = $null
-                    if ($numberRegex.IsMatch($_) -and [Double]::TryParse($_, [System.Globalization.NumberStyles]::Any, [System.Globalization.NumberFormatInfo]::CurrentInfo, [Ref]$number)) {
-                        # as simpler version using [Double]::TryParse( $_ , [ref]$number)) was found to cause problems reverted back to the longer version
-                        $TargetCell.Value = $number
-                        if ($setNumformat) {$targetCell.Style.Numberformat.Format = $Numberformat }
-                        #Write-Verbose  "Cell '$Row`:$ColumnIndex' header '$Name' add value '$($TargetCell.Value)' as number converted from '$_' with format '$Numberformat'"
-                    }
-                    else {
-                        $TargetCell.Value = $_
-                        #Write-Verbose "Cell '$Row`:$ColumnIndex' header '$Name' add value '$($TargetCell.Value)' as string"
-                    }
-                    break
-                }
-            }
-        }
-
-        try {
+        $isDataTypeValueType = $false
+        if ($NoClobber) {Write-Warning -Message "-NoClobber parameter is no longer used" }
+        #Open the file, get the worksheet, and decide where in the sheet we are writing, and if there is a number format to apply.
+        try   {
            $script:Header = $null
            if ($Append -and $ClearSheet) {throw "You can't use -Append AND -ClearSheet."}
-
-            if ($PSBoundParameters.Keys.Count -eq 0 -Or $Now) {
+            if ($PSBoundParameters.Keys.Count -eq 0 -Or $Now -or (-not $Path -and -not $ExcelPackage) ) {
                $Path = [System.IO.Path]::GetTempFileName() -replace '\.tmp', '.xlsx'
                $Show = $true
                $AutoSize = $true
-                if (!$TableName) {
+                if (-not $TableName) {
                    $AutoFilter = $true
                }
            }
-
            if ($ExcelPackage) {
                $pkg = $ExcelPackage
                $Path = $pkg.File
@@ -627,8 +544,7 @@
            Else { $pkg = Open-ExcelPackage -Path $Path -Create -KillExcel:$KillExcel -Password:$Password}
        }
        catch {throw "Could not open Excel Package $path"}
-        if ($NoClobber) {Write-Warning -Message "-NoClobber parameter is no longer used" }
-        try {
+        try   {
            $params = @{WorksheetName=$WorksheetName}
            foreach ($p in @("ClearSheet", "MoveToStart", "MoveToEnd", "MoveBefore", "MoveAfter", "Activate")) {if ($PSBoundParameters[$p]) {$params[$p] = $PSBoundParameters[$p]}}
            $ws = $pkg | Add-WorkSheet @params
@@ -638,7 +554,7 @@
            }
        }
        catch {throw "Could not get worksheet $worksheetname"}
-        try {
+        try   {
            if ($Append -and $ws.Dimension) {
                #if there is a title or anything else above the header row, append needs to be combined wih a suitable startrow parameter
                $headerRange = $ws.Dimension.Address -replace "\d+$", $StartRow
@@ -702,81 +618,144 @@
                    $setNumformat = $false
            }
            else {  $setNumformat = ($Numberformat -ne $ws.Cells.Style.Numberformat.Format) }
-
-            $firstTimeThru = $true
-            $isDataTypeValueType = $false
-      }
-        catch {
-            if ($AlreadyExists) {
-                #Is this set anywhere ?
-                throw "Failed exporting worksheet '$WorksheetName' to '$Path': The worksheet '$WorksheetName' already exists."
+        }
+        catch {throw "Failed preparing to export to worksheet '$WorksheetName' to '$Path': $_"}
+        #region Special case -inputobject passed a dataTable object
+        <# If inputObject was passed via the pipeline it won't be visible until the process block, we will only see it here if it was passed as a parameter
+          if it was passed it is a data table don't do foreach on it (slow) put the whole table in and set dates on date columns,
+          set things up for the end block, and skip the process block #>
+        if ($InputObject -is  [System.Data.DataTable])  {
+            $null = $ws.Cells[$row,$StartColumn].LoadFromDataTable($InputObject, (-not $noHeader) )
+            foreach ($c in $InputObject.Columns.where({$_.datatype -eq [datetime]})) {
+                Set-ExcelColumn -Worksheet $ws -Column ($c.Ordinal + $StartColumn) -NumberFormat 'Date-Time'
            }
-            else {
-                throw "Failed preparing to export to worksheet '$WorksheetName' to '$Path': $_"
+            foreach ($c in $InputObject.Columns.where({$_.datatype -eq [timespan]})) {
+                Set-ExcelColumn -Worksheet $ws -Column ($c.Ordinal + $StartColumn) -NumberFormat '[h]:mm:ss'
            }
-      }
+            $ColumnIndex         += $InputObject.Columns.Count - 1
+            if ($noHeader) {$row += $InputObject.Rows.Count -1 }
+            else           {$row += $InputObject.Rows.Count    }
+            $null = $PSBoundParameters.Remove('InputObject')
+            $firstTimeThru = $false
+        }
+        #endregion
+        else  {$firstTimeThru = $true}
    }

-    Process {
-        if ($PSBoundParameters.ContainsKey("TargetData")) {
-            try {
+    process { if ($PSBoundParameters.ContainsKey("InputObject")) {
+        try {
+            if ($null -eq $InputObject) {$row += 1}
+            foreach ($TargetData in $InputObject) {
                if ($firstTimeThru) {
                    $firstTimeThru = $false
                    $isDataTypeValueType = ($null -eq $TargetData) -or ($TargetData.GetType().name -match 'string|timespan|datetime|bool|byte|char|decimal|double|float|int|long|sbyte|short|uint|ulong|ushort|URI|ExcelHyperLink')
-                    if ($isDataTypeValueType -and -not $Append) {$row -= 1} #row incremented before adding values, so it is set to the number of rows inserted at the end
-                    if ($null -ne  $TargetData) {Write-Debug "DataTypeName is '$($TargetData.GetType().name)' isDataTypeValueType '$isDataTypeValueType'" }
+                    if ($isDataTypeValueType ) {
+                        $script:Header = @(".")       # dummy value to make sure we go through the "for each name in $header"
+                        if (-not $Append) {$row -= 1} # By default row will be 1, it is incremented before inserting values (so it ends pointing at final row.);  si first data row is 2 - move back up 1 if there is no header .
+                    }
+                    if ($null -ne $TargetData) {Write-Debug "DataTypeName is '$($TargetData.GetType().name)' isDataTypeValueType '$isDataTypeValueType'" }
                }
-                if ($isDataTypeValueType) {
-                    $ColumnIndex = $StartColumn
-                    $Row += 1
-                    try    {Add-CellValue -TargetCell $ws.Cells[$Row, $ColumnIndex] -CellValue $TargetData}
-                    catch  {Write-Warning "Could not insert value at Row $Row. "}
-                }
-                else {
-                    #region Add headers - if we are appending, or we have been through here once already we will have the headers
-                    if (-not $script:Header) {
+                #region Add headers - if we are appending, or we have been through here once already we will have the headers
+                if (-not $script:Header) {
+                    if ($DisplayPropertySet -and $TargetData.psStandardmembers.DefaultDisplayPropertySet.ReferencedPropertyNames) {
+                        $script:Header = $TargetData.psStandardmembers.DefaultDisplayPropertySet.ReferencedPropertyNames.Where( {$_ -notin $ExcludeProperty})
+                    }
+                    else {
+                        if ($NoAliasOrScriptPropeties) {$propType = "Property"} else {$propType = "*"}
+                        $script:Header = $TargetData.PSObject.Properties.where( {$_.MemberType -like $propType}).Name
+                    }
+                    foreach ($exclusion in $ExcludeProperty) {$script:Header = $script:Header -notlike $exclusion}
+                    if ($NoHeader) {
+                        # Don't push the headers to the spreadsheet
+                        $Row -= 1
+                    }
+                    else {
                        $ColumnIndex = $StartColumn
-                        if ($DisplayPropertySet -and $TargetData.psStandardmembers.DefaultDisplayPropertySet.ReferencedPropertyNames) {
-                            $script:Header = $TargetData.psStandardmembers.DefaultDisplayPropertySet.ReferencedPropertyNames.Where( {$_ -notin $ExcludeProperty})
-                        }
-                        else {
-                            if ($NoAliasOrScriptPropeties) {$propType = "Property"} else {$propType = "*"}
-                            $script:Header = $TargetData.PSObject.Properties.where( {$_.MemberType -like $propType}).Name
-                        }
-                        foreach ($exclusion in $ExcludeProperty) {$script:Header = $script:Header -notlike $exclusion}
-                        if ($NoHeader) {
-                            # Don't push the headers to the spreadsheet
-                            $Row -= 1
-                        }
-                        else {
-                            foreach ($Name in $script:Header) {
-                                $ws.Cells[$Row, $ColumnIndex].Value = $Name
-                                Write-Verbose "Cell '$Row`:$ColumnIndex' add header '$Name'"
-                                $ColumnIndex += 1
-                            }
+                        foreach ($Name in $script:Header) {
+                            $ws.Cells[$Row, $ColumnIndex].Value = $Name
+                            Write-Verbose "Cell '$Row`:$ColumnIndex' add header '$Name'"
+                            $ColumnIndex += 1
                        }
                    }
-                    #endregion
-                    #region Add non header values
-                    $Row += 1
-                    $ColumnIndex = $StartColumn
-
-                    foreach ($Name in $script:Header) {
-                        try   {Add-CellValue -TargetCell $ws.Cells[$Row, $ColumnIndex] -CellValue $TargetData.$Name}
-                        catch {Write-Warning -Message "Could not insert the '$Name' property at Row $Row, Column $ColumnIndex"}
-                        $ColumnIndex += 1
-                    }
-                    $ColumnIndex -= 1 # column index will be the last column whether isDataTypeValueType was true or false
-                    #endregion
                }
-            }
-            catch {
-                throw "Failed exporting data to worksheet '$WorksheetName' to '$Path': $_"
+                #endregion
+                #region Add non header values
+                $Row += 1
+                $ColumnIndex = $StartColumn
+                <#
+                 For each item in the header OR for the Data item if this is a simple Type or data table :
+                   If it is a date insert with one of Excel's built in formats - recognized as "Date and time to be localized"
+                   if it is a timespan insert with a built in format for elapsed hours, minutes and seconds
+                   if its  any other numeric insert as is , setting format if need be.
+                   Preserve URI, Insert a data table, convert non string objects to string.
+                   For strings, check for fomula, URI or Number, before inserting as a string  (ignore nulls) #>
+                foreach ($Name in $script:Header) {
+                    if   ($isDataTypeValueType) {$v = $TargetData}
+                    else {$v = $TargetData.$Name}
+                    try   {
+                        if     ($v -is    [DateTime]) {
+                            $ws.Cells[$Row, $ColumnIndex].Value = $v
+                            $ws.Cells[$Row, $ColumnIndex].Style.Numberformat.Format = 'm/d/yy h:mm' # This is not a custom format, but a preset recognized as date and localized.
+                        }
+                        elseif ($v -is    [TimeSpan]) {
+                            $ws.Cells[$Row, $ColumnIndex].Value = $v
+                            $ws.Cells[$Row, $ColumnIndex].Style.Numberformat.Format = '[h]:mm:ss'
+                        }
+                        elseif ($v -is    [System.ValueType]) {
+                            $ws.Cells[$Row, $ColumnIndex].Value = $v
+                            if ($setNumformat) {$ws.Cells[$Row, $ColumnIndex].Style.Numberformat.Format = $Numberformat }
+                        }
+                        elseif ($v -is    [uri] ) {
+                            $ws.Cells[$Row, $ColumnIndex].HyperLink = $v
+                            $ws.Cells[$Row, $ColumnIndex].Style.Font.Color.SetColor([System.Drawing.Color]::Blue)
+                            $ws.Cells[$Row, $ColumnIndex].Style.Font.UnderLine = $true
+                        }
+                        elseif ($v -isnot [String] ) { #Other objects or null.
+                            if ($null -ne $v) { $ws.Cells[$Row, $ColumnIndex].Value = $v.toString()}
+                        }
+                        elseif ($v[0] -eq '=') {
+                            $ws.Cells[$Row, $ColumnIndex].Formula = ($v -replace '^=','')
+                            if ($setNumformat) {$ws.Cells[$Row, $ColumnIndex].Style.Numberformat.Format = $Numberformat }
+                        }
+                        elseif ( [System.Uri]::IsWellFormedUriString($v , [System.UriKind]::Absolute) ) {
+                            if ($v -match "^xl://internal/") {
+                                  $referenceAddress = $v -replace "^xl://internal/" , ""
+                                  $display          = $referenceAddress -replace "!A1$"   , ""
+                                  $h = New-Object -TypeName OfficeOpenXml.ExcelHyperLink -ArgumentList $referenceAddress , $display
+                                  $ws.Cells[$Row, $ColumnIndex].HyperLink = $h
+                            }
+                            else {$ws.Cells[$Row, $ColumnIndex].HyperLink = $v }   #$ws.Cells[$Row, $ColumnIndex].Value = $v.AbsoluteUri
+                            $ws.Cells[$Row, $ColumnIndex].Style.Font.Color.SetColor([System.Drawing.Color]::Blue)
+                            $ws.Cells[$Row, $ColumnIndex].Style.Font.UnderLine = $true
+                        }
+                        else {
+                            $number = $null
+                            if ( $numberRegex.IsMatch($v)     -and  # if it contains digit(s) - this syntax is quicker than -match for many items and cuts out slow checks for non numbers
+                                 $NoNumberConversion -ne '*'  -and  # and NoNumberConversion isn't specified
+                                 $NoNumberConversion -notcontains $Name -and
+                                 [Double]::TryParse($v, [System.Globalization.NumberStyles]::Any, [System.Globalization.NumberFormatInfo]::CurrentInfo, [Ref]$number)
+                               ) {
+                                 $ws.Cells[$Row, $ColumnIndex].Value = $number
+                                 if ($setNumformat) {$ws.Cells[$Row, $ColumnIndex].Style.Numberformat.Format = $Numberformat }
+                            }
+                            else {
+                                $ws.Cells[$Row, $ColumnIndex].Value  = $v
+                            }
+
+                        }
+                    }
+                    catch {Write-Warning -Message "Could not insert the '$Name' property at Row $Row, Column $ColumnIndex"}
+                    $ColumnIndex += 1
+                }
+                $ColumnIndex -= 1 # column index will be the last column whether isDataTypeValueType was true or false
+                #endregion
            }
        }
-    }
+        catch {throw "Failed exporting data to worksheet '$WorksheetName' to '$Path': $_" }

-    End {
+    }}
+
+    end {
        if ($firstTimeThru -and $ws.Dimension) {
              $LastRow        = $ws.Dimension.End.Row
              $LastCol        = $ws.Dimension.End.Column
@@ -810,7 +789,7 @@
                # if we have 5 columns from 3 to 8, headers are numbered 0..4, so that is in the for loop and used for getting the name...
                # but we have to add the start column on when referencing positions
                foreach ($c in 0..($LastCol - $StartColumn)) {
-                    $targetRangeName = $script:Header[$c]  #Let Add-ExcelName fix (and warn about) bad names
+                    $targetRangeName = @($script:Header)[$c]  #Let Add-ExcelName fix (and warn about) bad names
                    Add-ExcelName  -RangeName $targetRangeName -Range $ws.Cells[$targetRow, ($StartColumn + $c ), $LastRow, ($StartColumn + $c )]
                    try {#this test can throw with some names, surpress any error
                        if ([OfficeOpenXml.FormulaParsing.ExcelUtilities.ExcelAddressUtil]::IsValidAddress(($targetRangeName -replace '\W' , '_' ))) {
@@ -926,7 +905,12 @@
        }
        if ($AutoSize) {
            try {
-                $ws.Cells.AutoFitColumns()
+                #Don't fit the all the columns in the sheet; if we are adding cells beside things with hidden columns, that unhides them
+                if ($MaxAutoSizeRows -and $MaxAutoSizeRows -lt $LastRow ) {
+                    $AutosizeRange = [OfficeOpenXml.ExcelAddress]::GetAddress($startRow,$StartColumn,   $MaxAutoSizeRows , $LastCol)
+                    $ws.Cells[$AutosizeRange].AutoFitColumns()
+                }
+                else {$ws.Cells[$dataRange].AutoFitColumns()  }
                Write-Verbose -Message "Auto-sized columns"
            }
            catch {  Write-Warning -Message "Failed autosizing columns of worksheet '$WorksheetName': $_"}
@@ -1070,9 +1054,9 @@
                }
                try {
                    $TempZipPath = Join-Path -Path ([System.IO.Path]::GetTempPath()) -ChildPath ([System.IO.Path]::GetRandomFileName())
-                    [io.compression.zipfile]::ExtractToDirectory($pkg.File, $TempZipPath)  | Out-Null
+                    $null = [io.compression.zipfile]::ExtractToDirectory($pkg.File, $TempZipPath)
                    Remove-Item $pkg.File -Force
-                    [io.compression.zipfile]::CreateFromDirectory($TempZipPath, $pkg.File) | Out-Null
+                    $null = [io.compression.zipfile]::CreateFromDirectory($TempZipPath, $pkg.File)
                }
                catch {throw "Error resizipping $path : $_"}
            }
@@ -1088,7 +1072,7 @@
 function Add-WorkSheet  {
    <#
      .Synopsis
-        Adds a workshet to an existing workbook.
+        Adds a worksheet to an existing workbook.
      .Description
        If the named worksheet already exists, the -Clearsheet parameter decides whether it should be deleted and a new one returned,
        or if not specified the existing sheet will be returned. By default the sheet is created at the end of the work book, the
@@ -1286,7 +1270,7 @@ Function Add-ExcelName {
        }
        else  {
            Write-verbose -Message "Creating Named range '$RangeName' as $($Range.FullAddressAbsolute)."
-            $ws.Names.Add($RangeName, $Range) | Out-Null
+            $null = $ws.Names.Add($RangeName, $Range)
        }
    }
    catch {Write-Warning -Message "Failed adding named range '$RangeName' to worksheet '$($ws.Name)': $_"  }
@@ -1385,9 +1369,9 @@ function Add-ExcelTable {
        if     ($PSBoundParameters.ContainsKey('ShowLastColumn'))    {$tbl.ShowLastColumn    = [bool]$ShowLastColumn}
        if     ($PSBoundParameters.ContainsKey('ShowRowStripes'))    {$tbl.ShowRowStripes    = [bool]$ShowRowStripes}
        if     ($PSBoundParameters.ContainsKey('ShowColumnStripes')) {$tbl.ShowColumnStripes = [bool]$ShowColumnStripes}
-        if     ($PSBoundParameters.ContainsKey('TableStyle'))        {$tbl.TableStyle        = $TableStyle}
+        $tbl.TableStyle = $TableStyle

        if ($PassThru) {return $tbl}
    }
    catch {Write-Warning -Message "Failed adding table '$TableName' to worksheet '$WorksheetName': $_"}
-}
+}
--- a/Get-HtmlTable.ps1
+++ b/Get-HtmlTable.ps1
@@ -1,3 +1,5 @@
+# https://www.leeholmes.com/blog/2015/01/05/extracting-tables-from-powershells-invoke-webrequest/
+# tweaked from the above code
 function Get-HtmlTable {
    param(
        [Parameter(Mandatory=$true)]
@@ -39,4 +41,4 @@ function Get-HtmlTable {

        [PSCustomObject]$result
    }
-}
+}
--- a/ImportExcel-5.4.2-20181217155848.zip
+++ b/ImportExcel-5.4.2-20181217155848.zip
--- a/ImportExcel.Tests.ps1
+++ b/ImportExcel.Tests.ps1
--- a/ImportExcel.psd1
+++ b/ImportExcel.psd1
@@ -4,7 +4,7 @@
    RootModule        = 'ImportExcel.psm1'

    # Version number of this module.
-    ModuleVersion     = '5.4.3'
+    ModuleVersion     = '6.0.0'

    # ID used to uniquely identify this module
    GUID              = '60dd4136-feff-401a-ba27-a84458c57ede'
@@ -61,16 +61,84 @@ Check out the How To Videos https://www.youtube.com/watch?v=U3Ne_yX4tYo&list=PL5
    # NestedModules = @()

    # Functions to export from this module
-    FunctionsToExport = '*'
+    FunctionsToExport = @(
+        'Add-ConditionalFormatting',
+        'Add-ExcelChart',
+        'Add-ExcelDataValidationRule',
+        'Add-ExcelName',
+        'Add-ExcelTable',
+        'Add-PivotTable',
+        'Add-WorkSheet',
+        'BarChart',
+        'Close-ExcelPackage',
+        'ColumnChart',
+        'Compare-WorkSheet',
+        'Convert-XlRangeToImage',
+        'ConvertFrom-ExcelData',
+        'ConvertFrom-ExcelSheet',
+        'ConvertFrom-ExcelToSQLInsert',
+        'ConvertTo-ExcelXlsx',
+        'Copy-ExcelWorkSheet',
+        'DoChart',
+        'Expand-NumberFormat',
+        'Export-Excel',
+        'Export-ExcelSheet',
+        'Export-MultipleExcelSheets',
+        'Get-ExcelColumnName',
+        'Get-ExcelSheetInfo',
+        'Get-ExcelWorkbookInfo',
+        'Get-HtmlTable',
+        'Get-Range',
+        'Get-XYRange',
+        'Import-Excel',
+        'Import-Html',
+        'Import-UPS',
+        'Import-USPS',
+        'Invoke-AllTests',
+        'Invoke-Sum',
+        'Join-Worksheet',
+        'LineChart',
+        'Merge-MultipleSheets',
+        'Merge-Worksheet',
+        'New-ConditionalFormattingIconSet',
+        'New-ConditionalText',
+        'New-ExcelChartDefinition',
+        'New-PivotTableDefinition',
+        'New-Plot',
+        'New-PSItem',
+        'NumberFormatCompletion',
+        'Open-ExcelPackage',
+        'PieChart',
+        'Pivot',
+        'Remove-WorkSheet'
+        'Select-Worksheet',
+        'Send-SQLDataToExcel',
+        'Set-CellStyle',
+        'Set-ExcelColumn',
+        'Set-ExcelRange',
+        'Set-ExcelRow',
+        'Test-Boolean',
+        'Test-Date',
+        'Test-Integer',
+        'Test-Number',
+        'Test-String',
+        'Update-FirstObjectProperties'
+    )

    # Cmdlets to export from this module
-    CmdletsToExport   = '*'
+    #CmdletsToExport   = '*'

    # Variables to export from this module
-    VariablesToExport = '*'
+    #VariablesToExport = '*'

    # Aliases to export from this module
-    AliasesToExport   = '*'
+    AliasesToExport   = @(
+        'New-ExcelChart',
+        'Set-Column',
+        'Set-Format',
+        'Set-Row',
+        'Use-ExcelData'
+    )

    # List of all modules packaged with this module
    # ModuleList = @()
--- a/ImportExcel.psm1
+++ b/ImportExcel.psm1
@@ -1,6 +1,7 @@
 #region import everything we need
 Add-Type -Path "$($PSScriptRoot)\EPPlus.dll"
 . $PSScriptRoot\AddConditionalFormatting.ps1
+. $PSScriptRoot\AddDataValidation.ps1
 . $PSScriptRoot\Charting.ps1
 . $PSScriptRoot\ColorCompletion.ps1
 . $PSScriptRoot\ConvertExcelToImageFile.ps1
@@ -35,6 +36,7 @@ Add-Type -Path "$($PSScriptRoot)\EPPlus.dll"
 . $PSScriptRoot\Set-CellStyle.ps1
 . $PSScriptRoot\Set-Column.ps1
 . $PSScriptRoot\Set-Row.ps1
+. $PSScriptRoot\Set-WorkSheetProtection.ps1
 . $PSScriptRoot\SetFormat.ps1
 . $PSScriptRoot\TrackingUtils.ps1
 . $PSScriptRoot\Update-FirstObjectProperties.ps1
--- a/Install.ps1
+++ b/Install.ps1
@@ -85,7 +85,7 @@ Process {
        }

        if (-not (Test-Path $InstallDirectory)) {
-            New-Item -Path $InstallDirectory -ItemType Directory -EA Stop | Out-Null
+            $null = New-Item -Path $InstallDirectory -ItemType Directory -EA Stop
            Write-Verbose "$ModuleName created module folder '$InstallDirectory'"
        }

--- a/Join-Worksheet.ps1
+++ b/Join-Worksheet.ps1
@@ -198,7 +198,7 @@
    #We accept a bunch of parameters work to pass on to Export-excel ( Autosize, Autofilter, boldtopRow Freeze ); if we have any of those call export-excel otherwise close the package here.
    $params = @{} + $PSBoundParameters
    'Path', 'Clearsheet', 'NoHeader', 'FromLabel', 'LabelBlocks', 'HideSource',
-    'Title', 'TitleFillPattern', 'TitleBackgroundColor', 'TitleBold', 'TitleSize' | ForEach-Object {[void]$params.Remove($_)}
+    'Title', 'TitleFillPattern', 'TitleBackgroundColor', 'TitleBold', 'TitleSize' | ForEach-Object {$null = $params.Remove($_)}
    if ($params.Keys.Count) {
        if ($Title) { $params.StartRow = 2}
        $params.WorkSheetName = $WorkSheetName
--- a/Old_Export-Excel.Tests.ps1
+++ b/Old_Export-Excel.Tests.ps1
@@ -1,94 +0,0 @@
-#Requires -Modules Pester
-
-
-$here = Split-Path -Parent $MyInvocation.MyCommand.Path
-
-
-Import-Module $here -Force
-
-$WarningPreference = 'SilentlyContinue'
-$ProgressPreference = 'SilentlyContinue'
-
-Function Test-isNumeric {
-    Param (
-        [Parameter(ValueFromPipeline)]$x
-    )
-
-    Return $x -is [byte]  -or $x -is [int16]  -or $x -is [int32]  -or $x -is [int64]  `
-       -or $x -is [sbyte] -or $x -is [uint16] -or $x -is [uint32] -or $x -is [uint64] `
-       -or $x -is [float] -or $x -is [double] -or $x -is [decimal]
-}
-
-$fakeData = [PSCustOmobject]@{
-    Property_1_Date      = (Get-Date).ToString('d') # US '10/16/2017' BE '16/10/2107'
-    Property_2_Formula   = '=SUM(G2:H2)'
-    Property_3_String    = 'My String'
-    Property_4_String    = 'a'
-    Property_5_IPAddress = '10.10.25.5'
-    Property_6_Number    = '0'
-    Property_7_Number    = '5'
-    Property_8_Number    = '007'
-    Property_9_Number    = (33).ToString('F2') # US '33.00' BE '33,00'
-    Property_10_Number   = (5/3).ToString('F2') # US '1.67' BE '1,67'
-    Property_11_Number   = (15999998/3).ToString('N2') # US '5,333,332.67' BE '5.333.332,67'
-    Property_12_Number   = '1.555,83'
-    Property_13_PhoneNr  = '+32 44' 
-    Property_14_PhoneNr  = '+32 4 4444 444'
-    Property_15_PhoneNr  =  '+3244444444'
-}
-
-$Path = 'Test.xlsx'
-
-Describe 'Export-Excel' {
-    in $TestDrive {
-        Describe 'Number conversion' {
-            Context 'numerical values expected' {
-                #region Create test file                
-                $fakeData | Export-Excel -Path $Path
-                
-                $Path = $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath($Path)
-                $Excel = New-Object OfficeOpenXml.ExcelPackage $Path
-                $Worksheet = $Excel.Workbook.WorkSheets[1]
-                #endregion
-
-                it 'zero' {
-                    $fakeData.Property_6_Number | Should -BeExactly '0'
-                    $Worksheet.Cells[2, 6].Text | Should -BeExactly $fakeData.Property_6_Number
-                    $Worksheet.Cells[2, 6].Value | Test-isNumeric | Should -Be $true
-                }
-
-                It 'regular number' {
-                    $fakeData.Property_7_Number | Should -BeExactly '5'
-                    $Worksheet.Cells[2, 7].Text | Should -BeExactly $fakeData.Property_7_Number
-                    $Worksheet.Cells[2, 7].Value | Test-isNumeric | Should -Be $true
-                }
-                
-                It 'number starting with zero' {
-                    $fakeData.Property_8_Number | Should -BeExactly '007'
-                    $Worksheet.Cells[2, 8].Text | Should -BeExactly '7'
-                    $Worksheet.Cells[2, 8].Value | Test-isNumeric | Should -Be $true
-                }
-                
-                It 'decimal number' {
-                    # US '33.00' BE '33,00'
-                    $fakeData.Property_9_Number | Should -BeExactly (33).ToString('F2')
-                    $Worksheet.Cells[2, 9].Text | Should -BeExactly '33'
-                    $Worksheet.Cells[2, 9].Value | Test-isNumeric | Should -Be $true
-
-                    # US '1.67' BE '1,67'
-                    $fakeData.Property_10_Number | Should -BeExactly (5/3).ToString('F2')
-                    $Worksheet.Cells[2, 10].Text | Should -BeExactly $fakeData.Property_10_Number
-                    $Worksheet.Cells[2, 10].Value | Test-isNumeric | Should -Be $true
-                }
-
-                It 'thousand seperator and decimal number' {
-                    # US '5,333,332.67' BE '5.333.332,67'
-                    # Excel BE '5333332,67'
-                    $fakeData.Property_11_Number | Should -BeExactly (15999998/3).ToString('N2')
-                    $Worksheet.Cells[2, 11].Text | Should -BeExactly $fakeData.Property_11_Number
-                    $Worksheet.Cells[2, 11].Value | Test-isNumeric | Should -Be $true
-                }
-            }
-        }
-    }
-}
--- a/README.md
+++ b/README.md
@@ -53,11 +53,43 @@ Install-Module ImportExcel -scope CurrentUser
 Install-Module ImportExcel
 ```

+# What's new 6.0.0
+
+Thank you to [James O'Neill](https://github.com/jhoneill) for the optimizations, and refactoring leading to a ***~10x*** speed increase. Thanks to [ili101](https://github.com/ili101) for earlier PRs that provided the ground work for this.
+
+* Performance improvement to `Export-Excel` see [#506](https://github.com/dfinke/ImportExcel/issues/506) and [#555](https://github.com/dfinke/ImportExcel/issues/555). This has meant taking code in Add-CellValue back into process block of `Export-Excel`, as the overhead of calling the function was a lot greater than time executing the code inside it. [Blog post to follow](https://jamesone111.wordpress.com/). Some tests are showing a ***~10x*** speed increase. [#572](https://github.com/dfinke/ImportExcel/issues/572) was about a broken #region tag in this part of the code and that has been cleaned up in the process.
+
+* `Export-Excel` now has an -InputObject parameter (this was previously -TargetData , which is now an alias for InputObject).
+If the `inputobject` is an array, each item will be inserted, so you can run `export-excel -inputobject $x` rather than `$x | Export-Excel`, and if it is a `system.data.datatable` object it will be inserted directly rather than cell-by-cell. `Send-SQLDataToExcel` takes advantage of this new functionality. There are simple tests for these new items
+
+* `Export-Excel` previously assumed `-Now` if there were no other parameters, it will now assume `-Now` if there is no `-Path` or `-ExcelPackage`.
+The .PSD1 file now itemizes the items exported by the module [#557](https://github.com/dfinke/ImportExcel/issues/557)
+
+# What's new 5.4.5
+
+Thank you to [James O'Neill](https://github.com/jhoneill) for the great additions.
+
+- Modified Send-SQLDataToExcel so it creates tables and ranges itself; previously it relied on export-excel to do this which cause problems when adding data to an existing sheet (#555)
+- Added new command Add-ExcelDataValidation which will apply different data-validation rules to ranges of cells
+- Changed the export behavior so that (1) attempts to convert to a number only apply if the the value was a string; (2) Nulls are no longer converted to an empty string (3) there is a specific check for URIs and not just text which is a valid URI. Using UNC names in hyperlinks remains problematic.
+- Changed the behavior of AutoSize in export excel so it only applies to the exported columns. Previously if something was exported next to pre-existing data, AutoSize would resize the whole sheet, potentially undoing things which had been set on the earlier data. If anyone relied on this behavior they will need to explicitly tell the sheet to auto size with $sheet.cells.autofitColumns. (where $sheet points to the sheet, it might be $ExcelPackage.Workbook.Worksheets['Name'])
+- In Compare-Worksheet,the Key for comparing the sheets can now be written as a hash table with an expression - it is used with a Group-Object command so if it is valid in Group-Object it should be accepted; this allows the creation of composite keys when data being compared doesn't have a column which uniquely identifies rows.
+-  In Set-ExcelRange , added a 'Locked' option equivalent to the checkbox on the Protection Tab of the format cells dialog box in Excel.
+- Created a Set-WorksheetProtection function. This gives the same options the protection dialog in Excel but is 0.9 release at the moment.
+
+## New Example
+
+- Added [MutipleValidations.ps1](https://github.com/dfinke/ImportExcel/blob/master/Examples/ExcelDataValidation/MutipleValidations.ps1). Culled from the `tests`.
+
+# What's new 5.4.4
+
+- Fix issue when only a single property is piped into Export-Excel
+- Fix issue in `Copy-ExcelWorksheet`, close the `$Stream`
+
 # What's new 5.4.3

 - Added Remove-Worksheet: Removes one or more worksheets from one or more workbooks

-
 # What's new 5.4.2

 - Added parameters -GroupDateRow and -GroupDatePart & -GroupNumericRow, -GroupNumericMin, -GroupNumericMax and -GroupNumericInterval
@@ -79,7 +111,7 @@ Install-Module ImportExcel

 # What's new 5.3.4

- HotFix for parameter PivotTableSyle should be PivotTableStyle https://github.com/dfinke/ImportExcel/issues/453
+- HotFix for parameter PivotTableStyle should be PivotTableStyle https://github.com/dfinke/ImportExcel/issues/453

 # What's new 5.3.3

@@ -963,4 +995,4 @@ You can also find EPPLus on [Nuget](https://www.nuget.org/packages/EPPlus/).

 * Using `-IncludePivotTable`, if that pivot table name exists, you'll get an error.
 	* Investigating a solution
-	* *Workaround* delete the Excel file first, then do the export
+	* *Workaround* delete the Excel file first, then do the export
--- a/Send-SqlDataToExcel.ps1
+++ b/Send-SqlDataToExcel.ps1
@@ -1,297 +1,173 @@
 Function Send-SQLDataToExcel {
-    <#
-        .SYNOPSIS
-            Inserts a DataTable - returned by SQL query into an ExcelSheet, more efficiently than sending it via Export-Excel
-        .DESCRIPTION
-            This command can accept a data table object or take a SQL statement and run it against a database connection.
-            If running a SQL statement, the accepts either
-            * an object representing a session with a SQL server or ODBC database, or
-            * a connection String to make a session.
-            The command takes most of the parameters of Export-Excel, and after inserting the table into the worksheet it
-            calls Export-Excel to carry out other tasks on the sheet. It is more efficient to do this than to get data-rows
-             and pipe them into Export-Excel, stripped off the database 'housekeeping' properties.
-        .PARAMETER DataTable
-            A System.Data.DataTable object containing the data to be inserted into the spreadsheet without running a query.
-        .PARAMETER Session
-            An active ODBC Connection or SQL connection object representing a session with a database which will be queried to get the data .
-        .PARAMETER Connection
-            A database connection string to be used to create a database session; either
-            * A Data source name written in the form DSN=ODBC_Data_Source_Name, or
-            * A full odbc or SQL Connection string, or
-            * The name of a SQL server.
-        .PARAMETER MSSQLServer
-            Specifies the connection string is for SQL server, not ODBC.
-        .PARAMETER SQL
-            The SQL query to run against the session which was passed in -Session or set up from -Connection.
-        .PARAMETER Database
-           Switches to a specific database on a SQL server.
-        .PARAMETER QueryTimeout
-            Override the default query time of 30 seconds.
-        .PARAMETER Path
-            Path to a new or existing .XLSX file.
-        .PARAMETER WorkSheetName
-            The name of a sheet within the workbook - "Sheet1" by default.
-        .PARAMETER KillExcel
-            Closes Excel - prevents errors writing to the file because Excel has it open.
-        .PARAMETER Title
-            Text of a title to be placed in the top left cell.
-        .PARAMETER TitleBold
-            Sets the title in boldface type.
-        .PARAMETER TitleSize
-            Sets the point size for the title.
-        .PARAMETER TitleBackgroundColor
-            Sets the cell background color for the title cell.
-        .PARAMETER TitleFillPattern
-            Sets the fill pattern for the title cell.
-        .PARAMETER Password
-            Sets password protection on the workbook.
-        .PARAMETER IncludePivotTable
-            Adds a Pivot table using the data in the worksheet.
-        .PARAMETER PivotTableName
-            If a Pivot table is created from command line parameters, specificies the name of the new sheet holding the pivot. If Omitted this will be "WorksheetName-PivotTable"
-        .PARAMETER PivotRows
-            Name(s) columns from the spreadhseet which will provide the Row name(s) in a pivot table created from command line parameters.
-        .PARAMETER PivotColumns
-            Name(s) columns from the spreadhseet which will provide the Column name(s) in a pivot table created from command line parameters.
-        .PARAMETER PivotFilter
-            Name(s) columns from the spreadhseet which will provide the Filter name(s) in a pivot table created from command line parameters.
-        .PARAMETER PivotData
-            In a pivot table created from command line parameters, the fields to use in the table body is given as a Hash table in the form ColumnName = Average|Count|CountNums|Max|Min|Product|None|StdDev|StdDevP|Sum|Var|VarP .
-        .PARAMETER PivotDataToColumn
-            If there are multiple datasets in a PivotTable, by default they are shown seperatate rows under the given row heading; this switch makes them seperate columns.
-        .PARAMETER NoTotalsInPivot
-            In a pivot table created from command line parameters, prevents the addition of totals to rows and columns.
-        .PARAMETER IncludePivotChart
-            Include a chart with the Pivot table - implies -IncludePivotTable.
-        .PARAMETER ChartType
-            The type for Pivot chart (one of Excel's defined chart types)
-        .PARAMETER NoLegend
-            Exclude the legend from the pivot chart.
-        .PARAMETER ShowCategory
-            Add category labels to the pivot chart.
-        .PARAMETER ShowPercent
-            Add Percentage labels to the pivot chart.
-        .PARAMETER PivotTableDefinition
-            Instead of describing a single pivot table with mutliple commandline paramters; you can use a HashTable in the form PivotTableName = Definition;
-            Definition is itself a hashtable with Sheet PivotTows, PivotColumns, PivotData, IncludePivotChart and ChartType values.
-        .PARAMETER ConditionalFormat
-            One or more conditional formatting rules defined with New-ConditionalFormattingIconSet.
-        .PARAMETER ConditionalText
-            Applies a 'Conditional formatting rule' in Excel on all the cells. When specific conditions are met a rule is triggered.
-          .PARAMETER BoldTopRow
-            Makes the top Row boldface.
-        .PARAMETER NoHeader
-            Does not put field names at the top of columns.
-        .PARAMETER RangeName
-            Makes the data in the worksheet a named range.
-        .PARAMETER AutoNameRange
-            Makes each column a named range.
-        .PARAMETER TableName
-            Makes the data in the worksheet a table with a name applies a style to it. Name must not contain spaces.
-        .PARAMETER TableStyle
-            Selects the style for the named table - defaults to 'Medium6'.
-        .PARAMETER BarChart
-            Creates a "quick" bar chart using the first text column as labels and the first numeric column as values
-        .PARAMETER ColumnChart
-            Creates a "quick" column chart using the first text column as labels and the first numeric column as values
-        .PARAMETER LineChart
-            Creates a "quick" line chart using the first text column as labels and the first numeric column as values
-        .PARAMETER PieChart
-            Creates a "quick" pie chart using the first text column as labels and the first numeric column as values
-        .PARAMETER ExcelChartDefinition
-            A hash table containing ChartType, Title, NoLegend, ShowCategory, ShowPercent, Yrange, Xrange and SeriesHeader for one or more [non-pivot] charts.
-        .PARAMETER StartRow
-            Row to start adding data. 1 by default. Row 1 will contain the title if any. Then headers will appear (Unless -No header is specified) then the data appears.
-        .PARAMETER StartColumn
-            Column to start adding data - 1 by default.
-        .PARAMETER FreezeTopRow
-            Freezes headers etc. in the top row.
-        .PARAMETER FreezeFirstColumn
-            Freezes titles etc. in the left column.
-        .PARAMETER FreezeTopRowFirstColumn
-             Freezes top row and left column (equivalent to Freeze pane 2,2 ).
-        .PARAMETER FreezePane
-             Freezes panes at specified coordinates (in the form  RowNumber , ColumnNumber).
-        .PARAMETER AutoFilter
-            Enables the 'Filter' in Excel on the complete header row. So users can easily sort, filter and/or search the data in the select column from within Excel.
-        .PARAMETER AutoSize
-            Sizes the width of the Excel column to the maximum width needed to display all the containing data in that cell.
-        .PARAMETER Show
-            Opens the Excel file immediately after creation. Convenient for viewing the results instantly without having to search for the file first.
-        .PARAMETER CellStyleSB
-            A script block which is run at the end of the process to apply styles to cells (although it can be used for other purposes).
-            The script block is given three paramaters; an object containing the current worksheet, the Total number of Rows and the number of the last column.
-        .PARAMETER ReturnRange
-            If specified, Export-Excel returns the range of added cells in the format "A1:Z100"
-        .PARAMETER PassThru
-            If specified, Export-Excel returns an object representing the Excel package without saving the package first. To save it you need to call the save or Saveas method or send it back to Export-Excel.
-
+        <#
+      .SYNOPSIS
+        Inserts a DataTable - returned by a SQL query - into an ExcelSheet
+      .DESCRIPTION
+        This command takes a SQL statement and run it against a database connection; for the connection it accepts either
+        * an object representing a session with a SQL server or ODBC database, or
+        * a connection string to make a session (if -MSSQLServer is specified it uses the SQL Native client,
+          and -Connection can be a server name instead of a detailed connection string. Without this switch it uses ODBC)
+        The command takes all the parameters of Export-Excel, except for -InputObject (alias TargetData); after
+        fetching the data it calls Export-Excel with the data as the value of InputParameter and whichever of
+        Export-Excel's parameters it was passed; for details of these parameters see the help for Export-Excel.
+      .PARAMETER Session
+        An active ODBC Connection or SQL connection object representing a session with a database which will be queried to get the data .
+      .PARAMETER Connection
+        A database connection string to be used to create a database session; either
+        * A Data source name written in the form DSN=ODBC_Data_Source_Name, or
+        * A full ODBC or SQL Native Client Connection string, or
+        * The name of a SQL server.
+      .PARAMETER MSSQLServer
+        Specifies the connection string is for SQL server, not ODBC.
+      .PARAMETER SQL
+        The SQL query to run against the session which was passed in -Session or set up from -Connection.
+      .PARAMETER Database
+        Switches to a specific database on a SQL server.
+      .PARAMETER QueryTimeout
+        Override the default query time of 30 seconds.
+      .PARAMETER DataTable
+        A System.Data.DataTable object containing the data to be inserted into the spreadsheet without running a query.
+        This remains supported to avoid breaking older scripts, but if you have a DataTable object you can pass the it
+        into Export-Excel using -InputObject.
      .EXAMPLE
        C:\> Send-SQLDataToExcel -MsSQLserver -Connection localhost -SQL  "select name,type,type_desc from [master].[sys].[all_objects]" -Path .\temp.xlsx -WorkSheetname master -AutoSize -FreezeTopRow -AutoFilter -BoldTopRow

        Connects to the local SQL server and selects 3 columns from [Sys].[all_objects] and exports then to a sheet named master with some basic header management
      .EXAMPLE
+        C:\> $dbPath = 'C:\Users\James\Documents\Database1.accdb'
+        C:\> $Connection = "Driver={Microsoft Access Driver (*.mdb, *.accdb)};Dbq=$dbPath;"
        C:\> $SQL="SELECT top 25 Name,Length  From TestData ORDER BY Length DESC"
-        C:\> $Connection = ' Driver={Microsoft Access Driver (*.mdb, *.accdb)};Dbq=C:\Users\James\Documents\Database1.accdb;'

        C:\> Send-SQLDataToExcel -Connection  $connection -SQL $sql -path .\demo1.xlsx -WorkSheetname "Sizes" -AutoSize

-         This declares a SQL statement and creates an  ODBC connection string to read from an Access file and extracts data from it and sends it to a new worksheet
+        This creates an  ODBC connection string to read from an Access file and a SQL Statement to extracts data from it,
+        and sends the resulting data to a new worksheet

      .EXAMPLE
-        C:\> $SQL="SELECT top 25 DriverName, Count(RaceDate) as Races, Count(Win) as Wins, Count(Pole) as Poles, Count(FastestLap) as Fastlaps FROM Results GROUP BY DriverName ORDER BY (count(win)) DESC"
-        C:\> $Connection = 'Driver={Microsoft Excel Driver (*.xls, *.xlsx, *.xlsm, *.xlsb)};Dbq=C:\users\James\Documents\f1Results.xlsx;'
+        C:\> $dbPath = 'C:\users\James\Documents\f1Results.xlsx'
+        C:\> $Connection = "Driver={Microsoft Excel Driver (*.xls, *.xlsx, *.xlsm, *.xlsb)};Dbq=$dbPath;"
+        C:\> $SQL="SELECT top 25 DriverName, Count(RaceDate) as Races, Count(Win) as Wins, Count(Pole) as Poles, Count(FastestLap) as Fastlaps " +
+                   " FROM Results  GROUP BY DriverName ORDER BY (count(win)) DESC"

-        C:\> Send-SQLDataToExcel -Connection  $connection -SQL $sql -path .\demo1.xlsx -WorkSheetname "Winners" -AutoSize -AutoNameRange -ConditionalFormat @{DataBarColor="Blue"; Range="Wins"}
+        C:\> Send-SQLDataToExcel -Connection  $connection -SQL $sql -path .\demo2.xlsx -WorkSheetname "Winners" -AutoSize -AutoNameRange -ConditionalFormat @{DataBarColor="Blue"; Range="Wins"}

-        This declares a SQL statement and creates an  ODBC connection string to read from an Excel file, it then runs the statement and outputs the resulting data to a new spreadsheet.
+        Similar to the previous example this creates a connection string, this time for an Excel file, and runs
+        a SQL statement to get a list of motor-racing results, outputting the resulting data to a new spreadsheet.
        The spreadsheet is formatted and a data bar added to show make the drivers' wins clearer.
        (the F1 results database is available from https://1drv.ms/x/s!AhfYu7-CJv4ehNdZWxJE9LMAX_N5sg )
      .EXAMPLE
-        C:\> $SQL = "SELECT top 25 DriverName, Count(RaceDate) as Races, Count(Win) as Wins, Count(Pole) as Poles, Count(FastestLap) as Fastlaps FROM Results GROUP BY DriverName ORDER BY (count(win)) DESC"
-        C:\> Get-SQL -Session F1 -excel -Connection "C:\Users\mcp\OneDrive\public\f1\f1Results.xlsx" -sql $sql -OutputVariable Table | out-null
+        C:\> $dbPath = 'C:\users\James\Documents\f1Results.xlsx'
+        C:\> $SQL = "SELECT top 25 DriverName, Count(RaceDate) as Races, Count(Win) as Wins, Count(Pole) as Poles, Count(FastestLap) as Fastlaps " +
+                     " FROM Results GROUP BY DriverName ORDER BY (count(win)) DESC"
+        C:\> $null = Get-SQL -Session F1 -excel -Connection $dbPath -sql $sql -OutputVariable Table

        C:\> Send-SQLDataToExcel -DataTable $Table -Path ".\demo3.xlsx" -WorkSheetname Gpwinners -autosize  -TableName winners -TableStyle Light6 -show

-        This uses Get-SQL (at least V1.1 - download from the gallery with Install-Module -Name GetSQL - note the function is Get-SQL the module is GetSQL without the "-" )
-        to simplify making database connections and building /submitting SQL statements.
-        Here it uses the same SQL statement as before; -OutputVariable leaves a System.Data.DataTable object in $table
+        This uses Get-SQL (at least V1.1 - download from the PowerShell gallery with Install-Module -Name GetSQL -
+        note the function is Get-SQL the module is GetSQL without the "-" )
+        Get-SQL simplify making database connections and building /submitting SQL statements.
+        Here Get-SQL uses the same SQL statement as before; -OutputVariable leaves a System.Data.DataTable object in $table
        and Send-SQLDataToExcel puts $table into the worksheet and sets it as an Excel table.
+        The command is equivalent to running
+        C:\>  Export-Excel -inputObject $Table -Path ".\demo3.xlsx" -WorkSheetname Gpwinners -autosize  -TableName winners -TableStyle Light6 -show
+        This is quicker than using
+        C:\> Get-SQL <parameters> | export-excel -ExcludeProperty rowerror,rowstate,table,itemarray,haserrors <parameters>
        (the F1 results database is available from https://1drv.ms/x/s!AhfYu7-CJv4ehNdZWxJE9LMAX_N5sg )
      .EXAMPLE
        C:\> $SQL = "SELECT top 25 DriverName,  Count(Win) as Wins FROM Results GROUP BY DriverName ORDER BY (count(win)) DESC"
-        C:\> Send-SQLDataToExcel -Session $DbSessions["f1"] -SQL $sql -Path  ".\demo3.xlsx" -WorkSheetname Gpwinners -autosize -ColumnChart
+        C:\> Send-SQLDataToExcel -Session $DbSessions["f1"] -SQL $sql -Path  ".\demo3.xlsx" -WorkSheetname Gpwinners  -ClearSheet -autosize -ColumnChart

-        Like the previous example, this uses Get-SQL (download from the gallery with Install-Module -Name GetSQL). It uses the connection which Get-SQL made rather than an ODFBC connection string
+        Like the previous example, this uses Get-SQL (download from the gallery with Install-Module -Name GetSQL).
+        It uses the database session which Get-SQL created, rather than an ODBC connection string.
+        The Session parameter can either be a object (as shown here), or the name used by Get-SQL ("F1" in this case).
        Here the data is presented as a quick chart.
      .EXAMPLE
-        C:\>  Send-SQLDataToExcel -path .\demo3.xlsx -WorkSheetname "LR" -Connection "DSN=LR" -sql "SELECT name AS CollectionName FROM AgLibraryCollection Collection ORDER BY CollectionName"
+        C:\>  Send-SQLDataToExcel -path .\demo4.xlsx -WorkSheetname "LR" -Connection "DSN=LR" -sql "SELECT name AS CollectionName FROM AgLibraryCollection Collection ORDER BY CollectionName"

        This example uses an Existing ODBC datasource name "LR" which maps to an adobe lightroom database and gets a list of collection names into a worksheet
+
+    .Link
+        Export-Excel
    #>
-    [CmdletBinding()]
-    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingPlainTextForPassword","")]
-     param (
-        [Parameter(ParameterSetName="SQLConnection", Mandatory=$true)]
-        [Parameter(ParameterSetName="ODBCConnection",Mandatory=$true)]
+    [CmdletBinding(DefaultParameterSetName="none")]
+    param (
+        [Parameter(ParameterSetName="SQLConnection",   Mandatory=$true)]
+        [Parameter(ParameterSetName="ODBCConnection",  Mandatory=$true)]
        $Connection,
-        [Parameter(ParameterSetName="ExistingSession",Mandatory=$true)]
-        [System.Data.Common.DbConnection]$Session,
-        [Parameter(ParameterSetName="SQLConnection",Mandatory=$true)]
+        [Parameter(ParameterSetName="ExistingSession", Mandatory=$true)]
+        $Session,
+        [Parameter(ParameterSetName="SQLConnection",   Mandatory=$true)]
        [switch]$MsSQLserver,
        [Parameter(ParameterSetName="SQLConnection")]
        [String]$DataBase,
-        [Parameter(ParameterSetName="SQLConnection", Mandatory=$true)]
-        [Parameter(ParameterSetName="ODBCConnection",Mandatory=$true)]
-        [Parameter(ParameterSetName="ExistingSession",Mandatory=$true)]
+        [Parameter(ParameterSetName="SQLConnection",   Mandatory=$true)]
+        [Parameter(ParameterSetName="ODBCConnection",  Mandatory=$true)]
+        [Parameter(ParameterSetName="ExistingSession", Mandatory=$true)]
        [string]$SQL,
        [int]$QueryTimeout,
-        [Parameter(ParameterSetName="Pre-FetchedData",Mandatory=$true)]
-        [System.Data.DataTable]$DataTable,
-        $Path,
-        [String]$WorkSheetname = 'Sheet1',
-        [Switch]$KillExcel,
-        [Switch]$Show,
-        [String]$Title,
-        [OfficeOpenXml.Style.ExcelFillStyle]$TitleFillPattern = 'None',
-        [Switch]$TitleBold,
-        [Int]$TitleSize = 22,
-        $TitleBackgroundColor,
-        [String]$Password,
-        [Hashtable]$PivotTableDefinition,
-        [Switch]$IncludePivotTable,
-        [String[]]$PivotRows,
-        [String[]]$PivotColumns,
-        $PivotData,
-        [String[]]$PivotFilter,
-        [Switch]$PivotDataToColumn,
-        [Switch]$NoTotalsInPivot,
-        [Switch]$IncludePivotChart,
-        [OfficeOpenXml.Drawing.Chart.eChartType]$ChartType = 'Pie',
-        [Switch]$NoLegend,
-        [Switch]$ShowCategory,
-        [Switch]$ShowPercent,
-        [Switch]$AutoSize,
-        [Switch]$FreezeTopRow,
-        [Switch]$FreezeFirstColumn,
-        [Switch]$FreezeTopRowFirstColumn,
-        [Int[]]$FreezePane,
-        [Switch]$AutoFilter,
-        [Switch]$BoldTopRow,
-        [Switch]$NoHeader,
-        [String]$RangeName,
-        [String]$TableName,
-        [OfficeOpenXml.Table.TableStyles]$TableStyle = 'Medium6',
-        [Switch]$Barchart,
-        [Switch]$PieChart,
-        [Switch]$LineChart ,
-        [Switch]$ColumnChart ,
-        [Object[]]$ExcelChartDefinition,
-        [Switch]$AutoNameRange,
-        [Object[]]$ConditionalFormat,
-        [Object[]]$ConditionalText,
-        [ScriptBlock]$CellStyleSB,
-        [Int]$StartRow    = 1,
-        [Int]$StartColumn = 1,
-        [Switch]$ReturnRange,
-        [Switch]$Passthru
+        [Parameter(ParameterSetName="Pre-FetchedData", Mandatory=$true)]
+        [System.Data.DataTable]$DataTable
    )
-
-    if ($KillExcel) {
-            Get-Process excel -ErrorAction Ignore | Stop-Process
-            while (Get-Process excel -ErrorAction Ignore) {Start-Sleep -Milliseconds 250}
-    }
-
-    #We were either given a session object or a connection string (with, optionally a MSSQLServer parameter)
-    # If we got -MSSQLServer, create a SQL connection, if we didn't but we got -Connection create an ODBC connection
-    if     ($MsSQLserver -and $Connection) {
-            if ($Connection -notmatch "=") {$Connection = "server=$Connection;trusted_connection=true;timeout=60"}
-            $Session     = New-Object -TypeName System.Data.SqlClient.SqlConnection  -ArgumentList $Connection
-            if ($Session.State -ne 'Open') {$Session.Open()}
-            if ($DataBase) {$Session.ChangeDatabase($DataBase) }
-    }
-    elseif ($Connection)  {
-            $Session     = New-Object -TypeName System.Data.Odbc.OdbcConnection      -ArgumentList $Connection ; $Session.ConnectionTimeout = 30
-    }
-
-    If ($session) {
-        #A session was either passed in or just created. If it's a SQL one make a SQL DataAdapter, otherwise make an ODBC one
-        if ($Session.GetType().name -match "SqlConnection") {
-            $dataAdapter = New-Object -TypeName System.Data.SqlClient.SqlDataAdapter -ArgumentList (
-                           New-Object -TypeName System.Data.SqlClient.SqlCommand     -ArgumentList $SQL, $Session)
+#Import the parameters from Export-Excel, we will pass InputObject, and we have the common parameters so exclude those,
+#and re-write the [Parmameter] attribute on each one to avoid parameterSetName here competing with the settings in Export excel.
+#The down side of this that impossible parameter combinations won't be filtered out and need to be caught later.
+    DynamicParam {
+        $ParameterAttribute  =                        "System.Management.Automation.ParameterAttribute"
+        $RuntimeDefinedParam =                        "System.Management.Automation.RuntimeDefinedParameter"
+        $paramDictionary     =    New-Object -TypeName System.Management.Automation.RuntimeDefinedParameterDictionary
+        $attributeCollection =    New-Object -TypeName System.Collections.ObjectModel.Collection[System.Attribute]
+        $attributeCollection.Add((New-Object -TypeName $ParameterAttribute -Property @{ ParameterSetName = "__AllParameterSets" ;Mandatory = $false}))
+        foreach ($P in (Get-Command -Name Export-Excel).Parameters.values.where({$_.name -notmatch 'Verbose|Debug|Action$|Variable$|Buffer$|TargetData$|InputObject$'}))  {
+            $paramDictionary.Add($p.Name, (New-Object -TypeName $RuntimeDefinedParam -ArgumentList $p.name, $p.ParameterType, $attributeCollection ) )
        }
-        else {
-            $dataAdapter = New-Object -TypeName System.Data.Odbc.OdbcDataAdapter     -ArgumentList (
-                           New-Object -TypeName System.Data.Odbc.OdbcCommand         -ArgumentList $SQL, $Session )
-        }
-        if ($QueryTimeout) {$dataAdapter.SelectCommand.CommandTimeout = $ServerTimeout}
-
-        #Both adapter types output the same kind of table, create one and fill it from the adapter
-        $DataTable       = New-Object -TypeName System.Data.DataTable
-        $rowCount        = $dataAdapter.fill($dataTable)
-        Write-Verbose -Message "Query returned $rowCount row(s)"
+        return $paramDictionary
    }
-    if ($DataTable.Rows.Count) {
-        #ExportExcel user a -NoHeader parameter so that's what we use here, but needs to be the other way around.
-        $printHeaders    = -not $NoHeader
-        if ($Title)  {$r = $StartRow +1 }
-        else         {$r = $StartRow}
-        #Get our Excel sheet and fill it with the data
-        $excelPackage    = Export-Excel -Path $Path -WorkSheetname $WorkSheetname  -PassThru
-        $excelPackage.Workbook.Worksheets[$WorkSheetname].Cells[$r,$StartColumn].LoadFromDataTable($dataTable, $printHeaders )  | Out-Null
-
-        #Apply date format
-        for ($c=0 ; $c -lt $DataTable.Columns.Count ; $c++) {
-            if ($DataTable.Columns[$c].DataType -eq [datetime]) {
-                Set-ExcelColumn -Worksheet $excelPackage.Workbook.Worksheets[$WorkSheetname] -Column ($c +1) -NumberFormat 'Date-Time'
+    process {
+        #Dynamic params mean we can get passed parameter combination Export-Excel will reject, so throw here, rather than get data and then have Export-Excel error.
+        if ($PSBoundParameters.Path -and $PSBoundParameters.ExcelPackage) {
+            throw 'Parameter error: you cannot specify both a path and an Excel Package.'
+            return
+        }
+        if ($PSBoundParameters.AutoFilter -and ($PSBoundParameters.TableName -or $PSBoundParameters.TableStyle)) {
+            Write-Warning "Tables are automatically auto-filtered, -AutoFilter will be ignored"
+            $null = $PSBoundParameters.Remove('AutoFilter')
+        }
+        #We were either given a session object or a connection string (with, optionally a MSSQLServer parameter)
+        #If we got -MSSQLServer, create a SQL connection, if we didn't but we got -Connection create an ODBC connection
+        if     ($MsSQLserver -and $Connection) {
+                if ($Connection -notmatch '=') {$Connection = "server=$Connection;trusted_connection=true;timeout=60"}
+                $Session     = New-Object -TypeName System.Data.SqlClient.SqlConnection  -ArgumentList $Connection
+                if ($Session.State -ne 'Open') {$Session.Open()}
+                if ($DataBase) {$Session.ChangeDatabase($DataBase) }
+        }
+        elseif ($Connection)  {
+                $Session     = New-Object -TypeName System.Data.Odbc.OdbcConnection      -ArgumentList $Connection ; $Session.ConnectionTimeout = 30
+        }
+        if     ($Session) {
+            #A session was either passed in or just created. If it's a SQL one make a SQL DataAdapter, otherwise make an ODBC one
+            if ($Session -is [String] -and $Global:DbSessions[$Session]) {$Session = $Global:DbSessions[$Session]}
+            if ($Session.GetType().name -match "SqlConnection") {
+                $dataAdapter = New-Object -TypeName System.Data.SqlClient.SqlDataAdapter -ArgumentList (
+                               New-Object -TypeName System.Data.SqlClient.SqlCommand     -ArgumentList $SQL, $Session)
            }
-        }
+            else {
+                $dataAdapter = New-Object -TypeName System.Data.Odbc.OdbcDataAdapter     -ArgumentList (
+                               New-Object -TypeName System.Data.Odbc.OdbcCommand         -ArgumentList $SQL, $Session )
+            }
+            if ($QueryTimeout) {$dataAdapter.SelectCommand.CommandTimeout = $QueryTimeout}

-        #Call export-excel with any parameters which don't relate to the SQL query
-        "Connection", "Database" , "Session", "MsSQLserver", "Destination" , "SQL" , "DataTable", "Path" | ForEach-Object {$null = $PSBoundParameters.Remove($_) }
-        Export-Excel -ExcelPackage $excelPackage   @PSBoundParameters
+            #Both adapter types output the same kind of table, create one and fill it from the adapter
+            $DataTable       = New-Object -TypeName System.Data.DataTable
+            $rowCount        = $dataAdapter.fill($dataTable)
+            Write-Verbose -Message "Query returned $rowCount row(s)"
+        }
+        if     ($DataTable.Rows.Count) {
+            #Call export-excel removing parameters which relate to the SQL query, and keeping the rest.
+            'Connection' , 'Database'  , 'Session' , 'MsSQLserver' , 'SQL'  , 'DataTable'  , 'QueryTimeout'  | ForEach-Object {$null = $PSBoundParameters.Remove($_) }
+            Export-Excel  @PSBoundParameters -InputObject $DataTable
+        }
+        else   {Write-Warning -Message ' No Data to insert.' }
+        #If we were passed a connection and opened a session,  close that session.
+        if     ($Connection)  {$Session.close() }
    }
-    else {Write-Warning -Message "No Data to insert."}
-    #If we were passed a connection and opened a session,  close that session.
-    if ($Connection)  {$Session.close() }
-}
+}
--- a/Set-WorkSheetProtection.ps1
+++ b/Set-WorkSheetProtection.ps1
@@ -0,0 +1,80 @@
+Function Set-WorkSheetProtection {
+    [Cmdletbinding()]
+    <#
+      .Synopsis
+        Sets protection on the worksheet
+      .Description
+
+      .Example
+        Set-WorkSheetProtection -WorkSheet $planSheet -IsProtected -AllowAll -AllowInsertColumns:$false -AllowDeleteColumns:$false -UnLockAddress "A:N"
+        Turns on protection for the worksheet in $planSheet, checks all the allow boxes excel Insert and Delete columns and unlocks columns A-N
+    #>
+    param (
+        #The worksheet where protection is to be applied.
+        [Parameter(Mandatory=$true)]
+        [OfficeOpenXml.ExcelWorksheet]$WorkSheet ,
+        #Value of the "Protect Worksheet and Contents of locked cells" check box. Initially FALSE. use -IsProtected:$false to turn off it it has been switched on
+        [switch]$IsProtected,
+        #If provided sets all the ALLOW options to true or false and then allows them to be changed individually
+        [switch]$AllowAll,
+        #Opposite of the value in the 'Select locked cells' check box. Set to allow when Protect is first enabled
+        [switch]$BlockSelectLockedCells,
+        #Opposite of the value in the 'Select unlocked cells' check box. Set to allow when Protect is first enabled
+        [switch]$BlockSelectUnlockedCells,
+        #Value of the 'Format Cells' check box. Set to block when Protect is first enabled
+        [switch]$AllowFormatCells,
+        #Value of the 'Format Columns' check box. Set to block when Protect is first enabled
+        [switch]$AllowFormatColumns,
+        #Value of the 'Format Rows' check box. Set to block when Protect is first enabled
+        [switch]$AllowFormatRows,
+        #Value of the 'Insert Columns' check box. Set to block when Protect is first enabled
+        [switch]$AllowInsertColumns,
+        #Value of the 'Insert Columns' check box. Set to block when Protect is first enabled
+        [switch]$AllowInsertRows,
+        #Value of the 'Insert Hyperlinks' check box. Set to block when Protect is first enabled
+        [switch]$AllowInsertHyperlinks,
+        #Value of the 'Delete Columns' check box. Set to block when Protect is first enabled
+        [switch]$AllowDeleteColumns,
+        #Value of the 'Delete Rows' check box. Set to block when Protect is first enabled
+        [switch]$AllowDeleteRows,
+        #Value of the 'Sort' check box. Set to block when Protect is first enabled
+        [switch]$AllowSort,
+        #Value of the 'Use AutoFilter' check box. Set to block when Protect is first enabled
+        [switch]$AllowAutoFilter,
+        #Value of the 'Use PivotTable and PivotChart' check box. Set to block when Protect is first enabled
+        [switch]$AllowPivotTables,
+        ##Opposite of the value in the 'Edit objects' check box. Set to allow when Protect is first enabled
+        [switch]$BlockEditObject,
+        ##Opposite of the value in the 'Edit Scenarios' check box. Set to allow when Protect is first enabled
+        [switch]$BlockEditScenarios,
+        #Address range for cells to lock in the form "A:Z" or "1:10" or "A1:Z10"
+        [string]$LockAddress,
+         #Address range for cells to Unlock in the form "A:Z" or "1:10" or "A1:Z10"
+        [string]$UnLockAddress
+    )
+
+    if     ($PSBoundParameters.ContainsKey('isprotected') -and  $IsProtected -eq $false) {$worksheet.Protection.IsProtected  = $false}
+    elseif ($IsProtected) {
+        $worksheet.Protection.IsProtected  = $true
+        foreach ($ParName in @('AllowFormatCells',
+          'AllowFormatColumns', 'AllowFormatRows',
+          'AllowInsertColumns', 'AllowInsertRows', 'AllowInsertHyperlinks',
+          'AllowDeleteColumns', 'AllowDeleteRows',
+          'AllowSort'         , 'AllowAutoFilter', 'AllowPivotTables')) {
+               if ($AllowAll -and -not $PSBoundParameters.ContainsKey($Parname)) {$worksheet.Protection.$ParName = $true}
+               elseif ($PSBoundParameters[$ParName] -eq $true )                      {$worksheet.Protection.$ParName = $true}
+        }
+        if ($BlockSelectLockedCells)   {$worksheet.Protection.AllowSelectLockedCells   = $false }
+        if ($BlockSelectUnlockedCells) {$worksheet.Protection.AllowSelectUnLockedCells = $false }
+        if ($BlockEditObject)          {$worksheet.Protection.AllowEditObject          = $false }
+        if ($BlockEditScenarios)       {$worksheet.Protection.AllowEditScenarios       = $false }
+    }
+    Else {Write-Warning -Message "You haven't said if you want to turn protection off, or on." }
+
+    if ($UnlockAddress) {
+        Set-ExcelRange     -Range $WorkSheet.cells[$UnlockAddress] -Locked:$false
+    }
+    if ($lockAddress) {
+        Set-ExcelRange     -Range $WorkSheet.cells[$UnlockAddress] -Locked
+    }
+}
--- a/SetFormat.ps1
+++ b/SetFormat.ps1
@@ -104,11 +104,13 @@
        #Set cells to a fixed height  (rows or ranges only).
        [float]$Height,
        #Hide a row or column  (not a range); use -Hidden:$false to unhide.
-        [Switch]$Hidden
+        [Switch]$Hidden,
+        #Locks cells. Cells are locked by default use -locked:$false on the whole sheet and then lock specific ones, and enable protection on the sheet.
+        [Switch]$Locked
    )
    process {
        if  ($Range -is [Array])  {
-            [void]$PSBoundParameters.Remove("Range")
+            $null = $PSBoundParameters.Remove("Range")
            $Range | Set-ExcelRange @PSBoundParameters
        }
        else {
@@ -117,8 +119,8 @@
            elseif ($WorkSheet -and ($Range -is [string] -or $Range -is [OfficeOpenXml.ExcelAddress])) {
                $Range = $WorkSheet.Cells[$Range]
            }
-            elseif ($Range -is [string]) {Write-Warning -Message "The range pararameter you have specified also needs a worksheet parameter."}
-
+            elseif ($Range -is [string]) {Write-Warning -Message "The range pararameter you have specified also needs a worksheet parameter." ;return}
+            #else we assume Range is a range.
            if ($ResetFont) {
                $Range.Style.Font.Color.SetColor( ([System.Drawing.Color]::Black))
                $Range.Style.Font.Bold          = $false
@@ -241,6 +243,9 @@
                    $Range -is [OfficeOpenXml.ExcelColumn]  ) {$Range.Hidden = [boolean]$Hidden}
                else {Write-Warning -Message ("Can hide a row or a column but not a {0} object" -f ($Range.GetType().name)) }
            }
+            if ($PSBoundParameters.ContainsKey('Locked')) {
+                $Range.Style.Locked=$Locked
+            }
        }
    }
 }
--- a/tests/Compare-WorkSheet.tests.ps1
+++ b/tests/Compare-WorkSheet.tests.ps1
@@ -51,8 +51,15 @@ Describe "Compare Worksheet" {
    Context "Setting the background to highlight different rows, use of grid view." {
        BeforeAll {
            $useGrid =  ($PSVersionTable.PSVersion.Major -LE 5)
-            $null = Compare-WorkSheet "$env:temp\Server1.xlsx" "$env:temp\Server2.xlsx" -BackgroundColor ([System.Drawing.Color]::LightGreen) -GridView:$useGrid
-            if ($useGrid) {Start-Sleep -sec 5; [System.Windows.Forms.SendKeys]::Sendwait("%{F4}") }
+            if ($useGrid) {
+                $ModulePath = (Get-Command -Name 'Compare-WorkSheet').Module.Path
+                $PowerShellExec = if ($PSEdition -eq 'Core') {'pwsh.exe'} else {'powershell.exe'}
+                $PowerShellPath = Join-Path -Path $PSHOME -ChildPath $PowerShellExec
+                . $PowerShellPath -Command ("Import-Module $ModulePath; " + '$null = Compare-WorkSheet "$env:temp\Server1.xlsx" "$env:temp\Server2.xlsx" -BackgroundColor ([System.Drawing.Color]::LightGreen) -GridView; Start-Sleep -sec 5')
+            }
+            else {
+                $null = Compare-WorkSheet "$env:temp\Server1.xlsx" "$env:temp\Server2.xlsx" -BackgroundColor ([System.Drawing.Color]::LightGreen) -GridView:$useGrid
+            }
            $xl1  = Open-ExcelPackage -Path "$env:temp\Server1.xlsx"
            $xl2  = Open-ExcelPackage -Path "$env:temp\Server2.xlsx"
            $s1Sheet = $xl1.Workbook.Worksheets[1]
--- a/tests/Copy-ExcelWorksheet.Tests.ps1
+++ b/tests/Copy-ExcelWorksheet.Tests.ps1
@@ -2,10 +2,10 @@ $path1 = "$env:TEMP\Test1.xlsx"
 $path2 = "$env:TEMP\Test2.xlsx"
 Remove-item -Path $path1, $path2  -ErrorAction SilentlyContinue

-$ProcRange =  Get-Process | Export-Excel $path1 -DisplayPropertySet -WorkSheetname Processes -ReturnRange
+$ProcRange = Get-Process | Export-Excel $path1 -DisplayPropertySet -WorkSheetname Processes -ReturnRange

-if ((Get-Culture).NumberFormat.CurrencySymbol -eq "<EFBFBD>") {$OtherCurrencySymbol = "$"}
-else                                                   {$OtherCurrencySymbol = "<EFBFBD>"}
+if ((Get-Culture).NumberFormat.CurrencySymbol -eq "£") {$OtherCurrencySymbol = "$"}
+else {$OtherCurrencySymbol = "£"}
 [PSCustOmobject][Ordered]@{
    Date             = Get-Date
    Formula1         = '=SUM(F2:G2)'
@@ -31,7 +31,7 @@ else                                                   {$OtherCurrencySymbol = "
    Link2            = "https://github.com/dfinke/ImportExcel"     # Links are not copied correctly, hopefully this will be fixed at some future date
 } | Export-Excel  -NoNumberConversion IPAddress, StrLeadZero, StrAltPhone2 -WorkSheetname MixedTypes -Path $path2
 Describe "Copy-Worksheet" {
-    Context "Simplest copy"{
+    Context "Simplest copy" {
        BeforeAll {
            Copy-ExcelWorkSheet -SourceWorkbook $path1 -DestinationWorkbook $path2
            $excel = Open-ExcelPackage -Path $path2
@@ -43,12 +43,12 @@ Describe "Copy-Worksheet" {
            $ws.Dimension.Address                                       | should be $ProcRange
        }
    }
-    Context "Mixed types using a package object"{
+    Context "Mixed types using a package object" {
        BeforeAll {
            Copy-ExcelWorkSheet -SourceWorkbook $excel -DestinationWorkbook $excel -DestinationWorkSheet "CopyOfMixedTypes"
            Close-ExcelPackage -ExcelPackage $excel
            $excel = Open-ExcelPackage -Path $path2
-            $ws    = $Excel.Workbook.Worksheets[3]
+            $ws = $Excel.Workbook.Worksheets[3]
        }
        it "Copied a worksheet, giving the expected name, number of rows and number of columns     " {
            $Excel.Workbook.Worksheets.count                            | Should     be 3
@@ -60,29 +60,57 @@ Describe "Copy-Worksheet" {
        it "Copied the expected data into the worksheet                                            " {
            $ws.Cells[2, 1].Value.Gettype().name                        | Should     be  'DateTime'
            $ws.Cells[2, 2].Formula                                     | Should     be  'SUM(F2:G2)'
-            $ws.Cells[2,  5].Value.GetType().name                       | Should     be  'String'
-            $ws.Cells[2,  6].Value.GetType().name                       | Should     be  'String'
+            $ws.Cells[2, 5].Value.GetType().name                       | Should     be  'String'
+            $ws.Cells[2, 6].Value.GetType().name                       | Should     be  'String'
            $ws.Cells[2, 18].Value.GetType().name                       | Should     be  'String'
            ($ws.Cells[2, 11].Value -is [valuetype] )                   | Should     be  $true
            ($ws.Cells[2, 12].Value -is [valuetype] )                   | Should     be  $true
            ($ws.Cells[2, 13].Value -is [valuetype] )                   | Should     be  $true
-             $ws.Cells[2, 11].Value                                     | Should     beLessThan 0
-             $ws.Cells[2, 12].Value                                     | Should     beLessThan 0
-             $ws.Cells[2, 13].Value                                     | Should     beLessThan 0
+            $ws.Cells[2, 11].Value                                     | Should     beLessThan 0
+            $ws.Cells[2, 12].Value                                     | Should     beLessThan 0
+            $ws.Cells[2, 13].Value                                     | Should     beLessThan 0
            if ((Get-Culture).NumberFormat.NumberGroupSeparator -EQ ",") {
                ($ws.Cells[2, 8].Value -is [valuetype] )                | Should     be  $true
-                 $ws.Cells[2, 9].Value.GetType().name                   | Should     be  'String'
+                $ws.Cells[2, 9].Value.GetType().name                   | Should     be  'String'
            }
            elseif ((Get-Culture).NumberFormat.NumberGroupSeparator -EQ ".") {
                ($ws.Cells[2, 9].Value -is [valuetype] )                | Should     be  $true
-                 $ws.Cells[2, 8].Value.GetType().name                   | Should     be  'String'
+                $ws.Cells[2, 8].Value.GetType().name                   | Should     be  'String'
            }
            ($ws.Cells[2, 14].Value -is [valuetype] )                   | Should     be  $true
-             $ws.Cells[2, 15].Value.GetType().name                      | Should     be  'String'
-             $ws.Cells[2, 16].Value.GetType().name                      | Should     be  'String'
-             $ws.Cells[2, 17].Value.GetType().name                      | Should     be  'String'
+            $ws.Cells[2, 15].Value.GetType().name                      | Should     be  'String'
+            $ws.Cells[2, 16].Value.GetType().name                      | Should     be  'String'
+            $ws.Cells[2, 17].Value.GetType().name                      | Should     be  'String'
            ($ws.Cells[2, 19].Value -is [valuetype] )                   | Should     be  $true
            ($ws.Cells[2, 20].Value -is [valuetype] )                   | Should     be  $true
        }
    }
+
+    Context "Copy worksheet should close all files" {
+        BeforeAll {
+            $xlfile = "$env:TEMP\reports.xlsx"
+            $xlfileArchive = "$env:TEMP\reportsArchive.xlsx"
+
+            rm $xlfile -ErrorAction SilentlyContinue
+            rm $xlfileArchive -ErrorAction SilentlyContinue
+
+            $sheets = echo 1.1.2019 1.2.2019 1.3.2019 1.4.2019 1.5.2019
+
+            $sheets | ForEach-Object {
+                "Hello World" | Export-Excel $xlfile -WorksheetName $_
+            }
+        }
+
+        it "Should copy and remove sheets" {
+            $targetSheets = echo 1.1.2019 1.4.2019
+
+            $targetSheets | ForEach-Object {
+                Copy-ExcelWorkSheet -SourceWorkbook $xlfile -DestinationWorkbook $xlfileArchive -SourceWorkSheet $_ -DestinationWorkSheet $_
+            }
+
+            $targetSheets | ForEach-Object { Remove-WorkSheet -FullName $xlfile -WorksheetName $_ }
+
+            (Get-ExcelSheetInfo -Path $xlfile ).Count | Should Be 3
+        }
+    }
 }
--- a/tests/Export-Excel.Tests.ps1
+++ b/tests/Export-Excel.Tests.ps1
@@ -9,7 +9,7 @@ Describe ExportExcel {
        $path = "$env:TEMP\Test.xlsx"
        Remove-item -Path $path -ErrorAction SilentlyContinue
        #Test with a maximum of 100 processes for speed; export all properties, then export smaller subsets.
-        $processes = Get-Process | select-object -first 100 -Property * -excludeProperty  Parent
+        $processes = Get-Process | where {$_.StartTime} | Select-Object -first 100 -Property * -excludeProperty  Parent
        $propertyNames = $Processes[0].psobject.properties.name
        $rowcount = $Processes.Count
        $Processes | Export-Excel $path  #-show
@@ -135,7 +135,7 @@ Describe ExportExcel {
        it "Created the worksheet with the expected name, number of rows and number of columns     " {
            $ws.Name                                                    | Should     be "sheet1"
            $ws.Dimension.Columns                                       | Should     be  1
-            $ws.Dimension.Rows                                          | Should     be  12
+            $ws.Dimension.End.Row                                       | Should     be  12
        }

        it "Set the default style for the sheet as expected                                        " {
@@ -966,8 +966,9 @@ Describe ExportExcel {
            $ws.Tables["FileSize"].Address.Address                      | Should     be "G2:H16" #Insert at row 2, Column 7, 14 rows x 2 columns of data
            $ws.Tables["FileSize"].StyleName                            | Should     be "TableStyleMedium2"
        }
-        it "Created the ExtSize  table in the right place with the right size                      " {
+        it "Created the ExtSize  table in the right place with the right size and style            " {
            $ws.Tables["ExtSize"].Address.Address                      | Should      be "A2:B14" #tile, then 12 rows x 2 columns of data
+            $ws.Tables["ExtSize"].StyleName                            | Should      be "TableStyleMedium6"
        }
        it "Created the ExtCount table in the right place with the right size                      " {
            $ws.Tables["ExtCount"].Address.Address                      | Should     be "D2:E12" #title, then 10 rows x 2 columns of data
--- a/tests/First10Races.tests.ps1
+++ b/tests/First10Races.tests.ps1
@@ -54,7 +54,7 @@ Describe "Creating small named ranges with hyperlinks" {

        $excel = Open-ExcelPackage $path
        $sheet = $excel.Workbook.Worksheets[1]
-        $m = $results | measure -sum -Property count
+        $m = $results | Measure-Object -sum -Property count
        $expectedRows = 1 + $m.count + $m.sum
    }
    Context "Creating hyperlinks" {
--- a/tests/ImportExcelTests/Simple.tests.ps1
+++ b/tests/ImportExcelTests/Simple.tests.ps1
@@ -17,8 +17,8 @@ Describe "Tests" {
        $data[1].p1 | Should be "b"
    }

-    It "Should read fast < 2000 milliseconds" {
-        $timer.TotalMilliseconds | should BeLessThan 2000
+    It "Should read fast < 2100 milliseconds" {
+        $timer.TotalMilliseconds | should BeLessThan 2100
    }

    It "Should read larger xlsx, 4k rows 1 col < 3000 milliseconds" {
--- a/tests/InputItemParameter.tests.ps1
+++ b/tests/InputItemParameter.tests.ps1
@@ -0,0 +1,79 @@
+Describe "Exporting with -Inputobject" {
+    BeforeAll {
+        $path = "$env:TEMP\Results.xlsx"
+        Remove-Item -Path $path -ErrorAction SilentlyContinue
+        #Read race results, and group by race name : export 1 row to get headers, leaving enough rows aboce to put in a link for each race
+        $results = ((Get-Process) + (Get-Process -id $PID)) | Select-Object -last  10 -Property Name, cpu, pm, handles, StartTime
+        $DataTable = [System.Data.DataTable]::new('Test')
+        $null = $DataTable.Columns.Add('Name')
+        $null = $DataTable.Columns.Add('CPU', [double])
+        $null = $DataTable.Columns.Add('PM', [Long])
+        $null = $DataTable.Columns.Add('Handles', [Int])
+        $null = $DataTable.Columns.Add('StartTime', [DateTime])
+        foreach ($r in $results) {
+            $null = $DataTable.Rows.Add($r.name, $r.CPU, $R.PM, $r.Handles, $r.StartTime)
+        }
+        export-excel        -Path $path -InputObject $results   -WorksheetName Sheet1 -RangeName "Whole"
+        export-excel        -Path $path -InputObject $DataTable -WorksheetName Sheet2 -AutoNameRange
+        Send-SQLDataToExcel -path $path -DataTable   $DataTable -WorkSheetname Sheet3  -TableName "Data"
+        $excel = Open-ExcelPackage $path
+        $sheet = $excel.Sheet1
+    }
+    Context "Array of processes" {
+        it "Put the correct rows and columns into the sheet                                        " {
+            $sheet.Dimension.Rows                                       | should     be ($results.Count + 1)
+            $sheet.Dimension.Columns                                    | should     be  5
+            $sheet.cells["A1"].Value                                    | should     be "Name"
+            $sheet.cells["E1"].Value                                    | should     be "StartTime"
+            $sheet.cells["A3"].Value                                    | should     be $results[1].Name
+        }
+        it "Created a range for the whole sheet                                                    " {
+            $sheet.Names[0].Name                                        | should     be "Whole"
+            $sheet.Names[0].Start.Address                               | should     be "A1"
+            $sheet.Names[0].End.row                                     | should     be ($results.Count + 1)
+            $sheet.Names[0].End.Column                                  | should     be 5
+        }
+        it "Formatted date fields with date type                                                   " {
+            $sheet.Cells["E11"].Style.Numberformat.NumFmtID             | should     be 22
+        }
+    }
+    $sheet = $excel.Sheet2
+    Context "Table of processes" {
+        it "Put the correct rows and columns into the sheet                                        " {
+            $sheet.Dimension.Rows                                       | should     be ($results.Count + 1)
+            $sheet.Dimension.Columns                                    | should     be  5
+            $sheet.cells["A1"].Value                                    | should     be "Name"
+            $sheet.cells["E1"].Value                                    | should     be "StartTime"
+            $sheet.cells["A3"].Value                                    | should     be $results[1].Name
+        }
+        it "Created named ranges for each column                                                   " {
+            $sheet.Names.count                                          | should     be 5
+            $sheet.Names[0].Name                                        | should     be "Name"
+            $sheet.Names[1].Start.Address                               | should     be "B2"
+            $sheet.Names[2].End.row                                     | should     be ($results.Count + 1)
+            $sheet.Names[3].End.Column                                  | should     be 4
+            $sheet.Names[4].Start.Column                                | should     be 5
+        }
+        it "Formatted date fields with date type                                                   " {
+            $sheet.Cells["E11"].Style.Numberformat.NumFmtID             | should     be 22
+        }
+    }
+    $sheet = $excel.Sheet3
+    Context "Table of processes via Send-SQLDataToExcel" {
+        it "Put the correct rows and columns into the sheet                                        " {
+            $sheet.Dimension.Rows                                       | should     be ($results.Count + 1)
+            $sheet.Dimension.Columns                                    | should     be  5
+            $sheet.cells["A1"].Value                                    | should     be "Name"
+            $sheet.cells["E1"].Value                                    | should     be "StartTime"
+            $sheet.cells["A3"].Value                                    | should     be $results[1].Name
+        }
+        it "Created a table                                                                        " {
+            $sheet.Tables.count                                         | should     be 1
+            $sheet.Tables[0].Name                                       | should     be "Data"
+            $sheet.Tables[0].Columns[4].name                            | should     be "StartTime"
+        }
+        it "Formatted date fields with date type                                                   " {
+            $sheet.Cells["E11"].Style.Numberformat.NumFmtID             | should     be 22
+        }
+    }
+}
--- a/tests/Set-Row_Set-Column-SetFormat.tests.ps1
+++ b/tests/Set-Row_Set-Column-SetFormat.tests.ps1
@@ -34,7 +34,7 @@ Describe "Number format expansion and setting" {
            $x.ListItemText                                             | Should     be "Percentage"
        }
    }
-    Context "Expand-NumberFormat function"  {
+    Context "Expand-NumberFormat function" {
        It "Expanded named number formats as expected                                              " {
            $r = [regex]::Escape([cultureinfo]::CurrentCulture.NumberFormat.CurrencySymbol)
            Expand-NumberFormat 'Currency'                              | Should  match "^[$r\(\)\[\] RED0#\?\-;,.]+$"
@@ -55,7 +55,7 @@ Describe "Number format expansion and setting" {
            $n = [datetime]::Now.ToOADate()

            $excel = 1..32 | ForEach-Object {$n} | Export-Excel -Path $path -show -WorksheetName s2 -PassThru
-            $ws    = $excel.Workbook.Worksheets[1]
+            $ws = $excel.Workbook.Worksheets[1]
            Set-ExcelRange -WorkSheet $ws -Range "A1"   -numberFormat 'General'
            Set-ExcelRange -WorkSheet $ws -Range "A2"   -numberFormat 'Number'
            Set-ExcelRange -WorkSheet $ws -Range "A3"   -numberFormat 'Percentage'
@@ -91,40 +91,40 @@ Describe "Number format expansion and setting" {
            Close-ExcelPackage -ExcelPackage $excel

            $excel = Open-ExcelPackage -Path $path
-            $ws    = $excel.Workbook.Worksheets[1]
+            $ws = $excel.Workbook.Worksheets[1]
        }

        It "Set formats which translate to the correct format ID                                   " {
-            $ws.Cells[ 1,1].Style.Numberformat.NumFmtID                 | Should     be 0       # Set as General
-            $ws.Cells[20,1].Style.Numberformat.NumFmtID                 | Should     be 1       # Set as 0
-            $ws.Cells[ 2,1].Style.Numberformat.NumFmtID                 | Should     be 2       # Set as "Number"
-            $ws.Cells[21,1].Style.Numberformat.NumFmtID                 | Should     be 2       # Set as 0.00
-            $ws.Cells[22,1].Style.Numberformat.NumFmtID                 | Should     be 3       # Set as #,##0
-            $ws.Cells[23,1].Style.Numberformat.NumFmtID                 | Should     be 4       # Set as #,##0.00
-            $ws.Cells[26,1].Style.Numberformat.NumFmtID                 | Should     be 9       # Set as 0%
-            $ws.Cells[27,1].Style.Numberformat.NumFmtID                 | Should     be 10      # Set as 0.00%
-            $ws.Cells[ 3,1].Style.Numberformat.NumFmtID                 | Should     be 10      # Set as "Percentage"
-            $ws.Cells[28,1].Style.Numberformat.NumFmtID                 | Should     be 11      # Set as 0.00E+00
-            $ws.Cells[ 4,1].Style.Numberformat.NumFmtID                 | Should     be 11      # Set as "Scientific"
-            $ws.Cells[ 5,1].Style.Numberformat.NumFmtID                 | Should     be 12      # Set as "Fraction"
-            $ws.Cells[29,1].Style.Numberformat.NumFmtID                 | Should     be 12      # Set as # ?/?
-            $ws.Cells[30,1].Style.Numberformat.NumFmtID                 | Should     be 13      # Set as # ??/?
-            $ws.Cells[ 6,1].Style.Numberformat.NumFmtID                 | Should     be 14      # Set as "Short date"
-            $ws.Cells[17,1].Style.Numberformat.NumFmtID                 | Should     be 15      # Set as d-mmm-yy
-            $ws.Cells[18,1].Style.Numberformat.NumFmtID                 | Should     be 16      # Set as d-mmm
-            $ws.Cells[19,1].Style.Numberformat.NumFmtID                 | Should     be 17      # Set as mmm-yy
-            $ws.Cells[12,1].Style.Numberformat.NumFmtID                 | Should     be 18      # Set as h:mm AM/PM
-            $ws.Cells[13,1].Style.Numberformat.NumFmtID                 | Should     be 19      # Set as h:mm:ss AM/PM
-            $ws.Cells[ 7,1].Style.Numberformat.NumFmtID                 | Should     be 20      # Set as "Short time"
-            $ws.Cells[ 8,1].Style.Numberformat.NumFmtID                 | Should     be 21      # Set as "Long time"
-            $ws.Cells[ 9,1].Style.Numberformat.NumFmtID                 | Should     be 22      # Set as "Date-time"
-            $ws.Cells[14,1].Style.Numberformat.NumFmtID                 | Should     be 45      # Set as mm:ss
-            $ws.Cells[15,1].Style.Numberformat.NumFmtID                 | Should     be 46      # Set as [h]:mm:ss
-            $ws.Cells[16,1].Style.Numberformat.NumFmtID                 | Should     be 47      # Set as mmss.0
-            $ws.Cells[11,1].Style.Numberformat.NumFmtID                 | Should     be 49      # Set as "Text"
-            $ws.Cells[31,1].Style.Numberformat.NumFmtID                 | Should     be 49      # Set as @
-            $ws.Cells[24,1].Style.Numberformat.Format                   | Should     be '#,'    # Whole thousands
-            $ws.Cells[25,1].Style.Numberformat.Format                   | Should     be '#.0,,' # Millions
+            $ws.Cells[ 1, 1].Style.Numberformat.NumFmtID                 | Should     be 0       # Set as General
+            $ws.Cells[20, 1].Style.Numberformat.NumFmtID                 | Should     be 1       # Set as 0
+            $ws.Cells[ 2, 1].Style.Numberformat.NumFmtID                 | Should     be 2       # Set as "Number"
+            $ws.Cells[21, 1].Style.Numberformat.NumFmtID                 | Should     be 2       # Set as 0.00
+            $ws.Cells[22, 1].Style.Numberformat.NumFmtID                 | Should     be 3       # Set as #,##0
+            $ws.Cells[23, 1].Style.Numberformat.NumFmtID                 | Should     be 4       # Set as #,##0.00
+            $ws.Cells[26, 1].Style.Numberformat.NumFmtID                 | Should     be 9       # Set as 0%
+            $ws.Cells[27, 1].Style.Numberformat.NumFmtID                 | Should     be 10      # Set as 0.00%
+            $ws.Cells[ 3, 1].Style.Numberformat.NumFmtID                 | Should     be 10      # Set as "Percentage"
+            $ws.Cells[28, 1].Style.Numberformat.NumFmtID                 | Should     be 11      # Set as 0.00E+00
+            $ws.Cells[ 4, 1].Style.Numberformat.NumFmtID                 | Should     be 11      # Set as "Scientific"
+            $ws.Cells[ 5, 1].Style.Numberformat.NumFmtID                 | Should     be 12      # Set as "Fraction"
+            $ws.Cells[29, 1].Style.Numberformat.NumFmtID                 | Should     be 12      # Set as # ?/?
+            $ws.Cells[30, 1].Style.Numberformat.NumFmtID                 | Should     be 13      # Set as # ??/?
+            $ws.Cells[ 6, 1].Style.Numberformat.NumFmtID                 | Should     be 14      # Set as "Short date"
+            $ws.Cells[17, 1].Style.Numberformat.NumFmtID                 | Should     be 15      # Set as d-mmm-yy
+            $ws.Cells[18, 1].Style.Numberformat.NumFmtID                 | Should     be 16      # Set as d-mmm
+            $ws.Cells[19, 1].Style.Numberformat.NumFmtID                 | Should     be 17      # Set as mmm-yy
+            $ws.Cells[12, 1].Style.Numberformat.NumFmtID                 | Should     be 18      # Set as h:mm AM/PM
+            $ws.Cells[13, 1].Style.Numberformat.NumFmtID                 | Should     be 19      # Set as h:mm:ss AM/PM
+            $ws.Cells[ 7, 1].Style.Numberformat.NumFmtID                 | Should     be 20      # Set as "Short time"
+            $ws.Cells[ 8, 1].Style.Numberformat.NumFmtID                 | Should     be 21      # Set as "Long time"
+            $ws.Cells[ 9, 1].Style.Numberformat.NumFmtID                 | Should     be 22      # Set as "Date-time"
+            $ws.Cells[14, 1].Style.Numberformat.NumFmtID                 | Should     be 45      # Set as mm:ss
+            $ws.Cells[15, 1].Style.Numberformat.NumFmtID                 | Should     be 46      # Set as [h]:mm:ss
+            $ws.Cells[16, 1].Style.Numberformat.NumFmtID                 | Should     be 47      # Set as mmss.0
+            $ws.Cells[11, 1].Style.Numberformat.NumFmtID                 | Should     be 49      # Set as "Text"
+            $ws.Cells[31, 1].Style.Numberformat.NumFmtID                 | Should     be 49      # Set as @
+            $ws.Cells[24, 1].Style.Numberformat.Format                   | Should     be '#,'    # Whole thousands
+            $ws.Cells[25, 1].Style.Numberformat.Format                   | Should     be '#.0,,' # Millions
        }
    }
 }
@@ -162,7 +162,7 @@ Describe "Set-ExcelColumn, Set-ExcelRow and Set-ExcelRange" {
    Context "Set-ExcelRow and Set-ExcelColumn" {
        it "Set a row and a column to have zero width/height                                       " {
            $r                                                          | Should not beNullorEmpty
-         #  $c                                                          | Should not beNullorEmpty  ## can't see why but this test breaks in appveyor
+            #  $c                                                          | Should not beNullorEmpty  ## can't see why but this test breaks in appveyor
            $ws.Column(1).width                                         | Should be  0
            $ws.Row(5).height                                           | Should be  0
        }
@@ -239,10 +239,10 @@ Describe "Set-ExcelColumn, Set-ExcelRow and Set-ExcelRange" {
            $c = Set-ExcelColumn -PassThru -Worksheet $ws -Heading "NextBirthday" -Value {
                $bmonth = $worksheet.Cells["C$Row"].value.month ; $bDay = $worksheet.Cells["C$Row"].value.day
                $cMonth = [datetime]::Now.Month ; $cday = [datetime]::Now.day ; $cyear = [datetime]::Now.Year
-                if (($cmonth -gt $bmonth) -or (($cMonth -eq $bmonth) -and ($cday -ge $bDay))){
-                       [datetime]::new($cyear+1, $bmonth, $bDay)
+                if (($cmonth -gt $bmonth) -or (($cMonth -eq $bmonth) -and ($cday -ge $bDay))) {
+                    [datetime]::new($cyear + 1, $bmonth, $bDay)
                }
-                else  {[datetime]::new($cyear, $bmonth, $bday)  }
+                else {[datetime]::new($cyear, $bmonth, $bday)  }
            }
            Set-ExcelColumn -Worksheet $ws -Heading "Age" -Value "=INT((NOW()-DateOfBirth)/365)"
            # Test Piping column Numbers into Set excelColumn
@@ -253,7 +253,7 @@ Describe "Set-ExcelColumn, Set-ExcelRow and Set-ExcelRange" {
            Close-ExcelPackage -ExcelPackage $excel -Calculate
            $excel = Open-ExcelPackage $path
            $ws = $excel.Workbook.Worksheets["Sheet1"]
-          }
+        }
        It "Inserted Hyperlinks                                                                    " {
            $ws.Cells["D2"].Hyperlink                                   | Should not beNullorEmpty
            $ws.Cells["D2"].Style.Font.UnderLine                        | Should     be $true
@@ -281,14 +281,14 @@ Describe "Set-ExcelColumn, Set-ExcelRow and Set-ExcelRange" {
    }
 }

-Describe "Conditional Formatting"  {
+Describe "Conditional Formatting" {
    BeforeAll {
-    Remove-Item $path
-    $data = Get-Process | Where-Object company | Select-Object company,name,pm,handles,*mem*
-    $cfmt = New-ConditionalFormattingIconSet -Range "c:c" -ConditionalFormat ThreeIconSet -IconType Arrows
-    $data | Export-Excel -path $Path  -AutoSize -ConditionalFormat $cfmt
-    $excel = Open-ExcelPackage -Path $path
-    $ws = $excel.Workbook.Worksheets[1]
+        Remove-Item $path
+        $data = Get-Process | Where-Object company | Select-Object company, name, pm, handles, *mem*
+        $cfmt = New-ConditionalFormattingIconSet -Range "c:c" -ConditionalFormat ThreeIconSet -IconType Arrows
+        $data | Export-Excel -path $Path  -AutoSize -ConditionalFormat $cfmt
+        $excel = Open-ExcelPackage -Path $path
+        $ws = $excel.Workbook.Worksheets[1]
    }
    Context "Using a pre-prepared 3 Arrows rule" {
        it "Set the right type, IconSet and range                                                  " {
@@ -318,23 +318,61 @@ ID,Product,Quantity,Price,Total
 12012,Pliers,3,14.99,44.97
 "@

-Describe "Table Formatting"  {
+Describe "AutoNameRange data with a single property name" {
+    BeforeEach {
+        $xlfile = "$Env:TEMP\testNamedRange.xlsx"
+        Remove-Item $xlfile -ErrorAction SilentlyContinue
+    }
+
+    it "Should have a single item as a named range" {
+        $excel = ConvertFrom-Csv @"
+Sold
+1
+2
+3
+4
+"@ | Export-Excel $xlfile -PassThru -AutoNameRange
+
+        $ws = $excel.Workbook.Worksheets["Sheet1"]
+
+        $ws.Names.Count | Should Be 1
+        $ws.Names[0].Name | Should Be 'Sold'
+    }
+
+    it "Should have a more than a single item as a named range" {
+        $excel = ConvertFrom-Csv @"
+Sold,ID
+1,a
+2,b
+3,c
+4,d
+"@ | Export-Excel $xlfile -PassThru -AutoNameRange
+
+        $ws = $excel.Workbook.Worksheets["Sheet1"]
+
+        $ws.Names.Count | Should Be 2
+        $ws.Names[0].Name | Should Be 'Sold'
+        $ws.Names[1].Name | Should Be 'ID'
+    }
+}
+
+Describe "Table Formatting" {
    BeforeAll {
        Remove-Item $path
        $excel = $data2 | Export-excel -path $path -WorksheetName Hardware -AutoNameRange -AutoSize -BoldTopRow -FreezeTopRow -PassThru
        $ws = $excel.Workbook.Worksheets[1]
        #test showfilter & TotalSettings
-        $Table = Add-ExcelTable -PassThru -Range $ws.Cells[$($ws.Dimension.address)] -TableStyle Light1 -TableName HardwareTable  -TotalSettings @{"Total"="Sum"} -ShowFirstColumn -ShowFilter:$false
+        $Table = Add-ExcelTable -PassThru -Range $ws.Cells[$($ws.Dimension.address)] -TableStyle Light1 -TableName HardwareTable  -TotalSettings @{"Total" = "Sum"} -ShowFirstColumn -ShowFilter:$false
        #test expnading named number formats
        Set-ExcelColumn -Worksheet $ws -Column 4 -NumberFormat 'Currency'
        Set-ExcelColumn -Worksheet $ws -Column 5 -NumberFormat 'Currency'
-        $PtDef =New-PivotTableDefinition -PivotTableName Totals -PivotRows Product -PivotData @{"Total"="Sum"} -PivotNumberFormat Currency -PivotTotals None -PivotTableStyle Dark2
+        $PtDef = New-PivotTableDefinition -PivotTableName Totals -PivotRows Product -PivotData @{"Total" = "Sum"} -PivotNumberFormat Currency -PivotTotals None -PivotTableStyle Dark2
        Export-excel -ExcelPackage $excel -WorksheetName Hardware -PivotTableDefinition $PtDef
-        $excel= Open-ExcelPackage -Path $path
-        $ws1   = $excel.Workbook.Worksheets["Hardware"]
-        $ws2   = $excel.Workbook.Worksheets["Totals"]
+        $excel = Open-ExcelPackage -Path $path
+        $ws1 = $excel.Workbook.Worksheets["Hardware"]
+        $ws2 = $excel.Workbook.Worksheets["Totals"]
    }
-    Context "Setting and not clearing when Export-Excel touches the file again."{
+    Context "Setting and not clearing when Export-Excel touches the file again." {
        it "Set the Table Options                                                                  " {
            $ws1.Tables[0].Address.Address                              | should     be "A1:E16"
            $ws1.Tables[0].Name                                         | should     be "HardwareTable"
@@ -352,8 +390,4 @@ Describe "Table Formatting"  {
            $ws2.PivotTables[0].StyleName                               | Should     be "PivotStyleDark2"
        }
    }
-}
-
-
-
-
+}
--- a/tests/Validation.tests.ps1
+++ b/tests/Validation.tests.ps1
@@ -0,0 +1,58 @@
+$data = ConvertFrom-Csv -InputObject @"
+ID,Product,Quantity,Price
+12001,Nails,37,3.99
+12002,Hammer,5,12.10
+12003,Saw,12,15.37
+12010,Drill,20,8
+12011,Crowbar,7,23.48
+"@
+
+$path = "$Env:TEMP\DataValidation.xlsx"
+
+Describe "Data validation and protection" {
+    Context "Data Validation rules" {
+        BeforeAll {
+            Remove-Item $path -ErrorAction SilentlyContinue
+            $excelPackage =  $Data | export-excel -WorksheetName "Sales" -path $path -PassThru
+            $excelPackage = @('Chisel','Crowbar','Drill','Hammer','Nails','Saw','Screwdriver','Wrench') |
+                Export-excel -ExcelPackage $excelPackage -WorksheetName Values -PassThru
+
+            $VParams = @{WorkSheet = $excelPackage.sales; ShowErrorMessage=$true; ErrorStyle='stop'; ErrorTitle='Invalid Data' }
+            Add-ExcelDataValidationRule @VParams -Range 'B2:B1001' -ValidationType List    -Formula 'values!$a$1:$a$10'         -ErrorBody "You must select an item from the list.`r`nYou can add to the list on the values page" #Bucket
+            Add-ExcelDataValidationRule @VParams -Range 'E2:E1001' -ValidationType Integer -Operator between -Value 0 -Value2 10000 -ErrorBody 'Quantity must be a whole number between 0 and 10000'
+            Close-ExcelPackage -ExcelPackage $excelPackage
+
+            $excelPackage = Open-ExcelPackage -Path $path
+            $ws           = $excelPackage.Sales
+        }
+        It "Created the expected number of rules                                                   " {
+            $ws.DataValidations.count                                   | Should     be 2
+        }
+        It "Created a List validation rule against a range of Cells                                " {
+            $ws.DataValidations[0].ValidationType.Type.tostring()       | Should     be 'List'
+            $ws.DataValidations[0].Formula.ExcelFormula                 | Should     be 'values!$a$1:$a$10'
+            $ws.DataValidations[0].Formula2                             | Should     benullorempty
+            $ws.DataValidations[0].Operator.tostring()                  | should     be 'any'
+        }
+        It "Created an integer validation rule for values between X and Y                          " {
+            $ws.DataValidations[1].ValidationType.Type.tostring()       | Should     be 'Whole'
+            $ws.DataValidations[1].Formula.Value                        | Should     be 0
+            $ws.DataValidations[1].Formula2.value                       | Should not benullorempty
+            $ws.DataValidations[1].Operator.tostring()                  | should     be 'between'
+        }
+        It "Set Error behaviors for both rules                                                     " {
+            $ws.DataValidations[0].ErrorStyle.tostring()                | Should     be 'stop'
+            $ws.DataValidations[1].ErrorStyle.tostring()                | Should     be 'stop'
+            $ws.DataValidations[0].AllowBlank                           | Should     be $true
+            $ws.DataValidations[1].AllowBlank                           | Should     be $true
+            $ws.DataValidations[0].ShowErrorMessage                     | Should     be $true
+            $ws.DataValidations[1].ShowErrorMessage                     | Should     be $true
+            $ws.DataValidations[0].ErrorTitle                           | Should not benullorempty
+            $ws.DataValidations[1].ErrorTitle                           | Should not benullorempty
+            $ws.DataValidations[0].Error                                | Should not benullorempty
+            $ws.DataValidations[1].Error                                | Should not benullorempty
+        }
+    }
+
+
+}
--- a/compare-worksheet.ps1
+++ b/compare-worksheet.ps1
@@ -191,7 +191,7 @@
        }
    }
    #if font color was specified, set it on changed properties where the same key appears in both sheets.
-    if      ($diff -and $FontColor -and ($propList -contains $Key)  ) {
+    if      ($diff -and $FontColor -and (($propList -contains $Key) -or ($key -is [hashtable]))  ) {
        $updates = $diff.where({$_.SideIndicator -ne "=="})  | Group-object -Property $Key | Where-Object {$_.count -eq 2}
        if ($updates) {
            $XL1 = Open-ExcelPackage -path $Referencefile
Author	SHA1	Message	Date
dfinke	337af82ae2	Updated readme.md	2019-04-12 16:02:47 -04:00
Doug Finke	77ef2ebc40	Merge pull request #576 from ili101/FixDataTablePerformance Double DataTable performance	2019-04-08 16:42:28 -04:00
ili101	92c97b25c3	Replace [void] with $null	2019-04-08 13:34:31 +03:00
ili101	52231254a5	Replace " \| Out-Null" with "$null = " everywhere just in case it degrades performance in other places	2019-04-07 22:26:48 +03:00
ili101	494ac51ae5	Replace " \| Out-Null" with "$null = " doble performance on DataTable	2019-04-07 22:11:31 +03:00
Doug Finke	0febb4a3c2	Merge pull request #575 from ili101/TableStyleFix TableStyle is set to Medium6 but ignored	2019-04-07 14:47:06 -04:00
Doug Finke	62f0faa5c5	Merge pull request #574 from ili101/TestsFix Fix Test accidentally closing focused window	2019-04-07 12:50:56 -04:00
ili101	1055bc41bf	TableStyle is set to Medium6 but ignored	2019-04-07 18:16:35 +03:00
ili101	e100fa7a36	Fix Test accidentally closing focused window if focus not switched to Out-GridView.	2019-04-07 15:02:50 +03:00
dfinke	83bd387f98	Update what's new	2019-04-06 11:30:10 -04:00
dfinke	caf0059ef5	Bumped version, sorted function exports	2019-04-06 11:20:15 -04:00
Doug Finke	965831ba57	Merge pull request #573 from jhoneill/master Perf improvements for Export-Excel	2019-04-06 11:13:47 -04:00
jhoneill	a49cab5efc	Slimmed down send-sqlData - undid previous	2019-04-06 10:49:57 +01:00
jhoneill	17bcea15e8	Fixed a poss parameter set issue;	2019-04-06 00:21:48 +01:00
jhoneill	79fb29740d	Rolled back readme for merge purposes	2019-04-04 18:03:49 +01:00
jhoneill	2984fe2ef5	Merge branch 'master' of https://github.com/jhoneill/ImportExcel	2019-04-04 18:01:31 +01:00
jhoneill	8734dbd26c	Readme update	2019-04-04 18:01:26 +01:00
jhoneill	0211edf008	Readme update	2019-04-04 17:42:33 +01:00
jhoneill	552552b93d	Perf improvments and direct table handling for Export Excel,	2019-04-04 17:08:05 +01:00
jhoneill	2229bfb3ed	Moved Add-CellValue	2019-04-04 09:45:10 +01:00
Doug Finke	25e7962100	Merge pull request #564 from slestak/patch-1 Update Export-Excel.ps1 - Add-Worksheet help typo	2019-03-19 13:02:01 -04:00
Steve Romanow	6071f77218	Update Export-Excel.ps1 fix typo	2019-03-19 11:56:20 -04:00
dfinke	52b9333d7c	added regions	2019-03-03 12:56:35 -05:00
dfinke	d3d8d76a71	fixed psm1. added `.ps1` to `Set-WorkSheetProtection`	2019-03-02 14:03:26 -05:00
dfinke	f5f97fcd56	bumped the read up 100 ms	2019-03-02 13:24:19 -05:00
dfinke	6665c2952d	fix readme	2019-03-02 13:17:22 -05:00
dfinke	31444320cb	Updated	2019-03-02 13:15:16 -05:00
dfinke	d5734ff9b2	Pulled from the tests. Added additional rule	2019-03-02 13:13:53 -05:00
dfinke	4481637c21	spell check	2019-03-02 12:40:45 -05:00
dfinke	6caf247f5b	bump version	2019-03-02 12:38:10 -05:00
Doug Finke	65641955ba	Merge pull request #552 from jhoneill/master Minor fixes and added data-validation support	2019-03-02 12:32:43 -05:00
jhoneill	f2c13949a4	Fixed Send-SQLData behavior with tables/ranges when adding to a sheet	2019-03-01 08:31:43 +00:00
jhoneill	878ca570fb	Updated readme for recent commits	2019-02-28 07:42:22 +00:00
jhoneill	28fd5512bb	Fixed broken tests	2019-02-25 20:53:11 +00:00
jhoneill	7e465e3729	Merge remote-tracking branch 'upstream/master'	2019-02-25 19:33:51 +00:00
jhoneill	22283604f8	Sync with DFinke's master	2019-02-25 18:14:46 +00:00
jhoneill	0c603afc0e	improved handing of Hyperlinks in Export	2019-02-21 19:25:53 +00:00
Doug Finke	a4a989c556	Update Get-HtmlTable.ps1	2019-02-20 19:26:43 -05:00
dfinke	d94db666d7	Added module	2019-02-18 14:06:18 -05:00
dfinke	438be760f7	updated	2019-02-18 13:51:50 -05:00
dfinke	2949ecc173	update	2019-02-17 18:27:41 -05:00
dfinke	639ca738f6	rearrange	2019-02-17 18:27:36 -05:00
dfinke	736dd648f4	Updated git ignore	2019-02-17 15:36:05 -05:00
dfinke	acdbd4a618	added demo	2019-02-13 19:08:01 -05:00
dfinke	ad35d39850	Removed unneed tests	2019-02-13 16:23:37 -05:00
dfinke	e7afe166a4	Updated to point to new rest api for stock info	2019-02-02 16:58:57 -05:00
dfinke	37b076706e	rename file	2019-02-02 16:58:57 -05:00
jhoneill	3303116658	Test for validation rules had un-necessary cleanup step which caused an error	2019-01-21 14:31:04 +00:00
jhoneill	89a8cb0469	Added data validation	2019-01-21 14:20:57 +00:00
Doug Finke	bb9f4c31a6	Delete ImportExcel-5.4.2-20181217155848.zip not needed	2019-01-18 19:49:14 -05:00
Doug Finke	996d1246cf	Merge pull request #523 from stahler/patch-1 Update Export-Excel.ps1	2019-01-11 21:08:24 -05:00
Wes Stahler	0bb08fcb20	Update Export-Excel.ps1	2019-01-11 20:49:08 -05:00
Doug Finke	d004019761	Merge pull request #520 from dfinke/FixCopyExcelWorksheetStreamClose-dcf Fix Copy-ExcelWorkSheet so Remove-WorkSheet works. Resolves #516	2019-01-05 09:57:17 -05:00
dfinke	a54ca228e9	Resolves #516	2019-01-05 09:54:52 -05:00
dfinke	bb6ff474a8	updated readme	2019-01-05 09:53:38 -05:00
dfinke	86b5c13543	Close the $Stream so the xlsx won't be locked	2019-01-05 09:49:48 -05:00
dfinke	c2525b0348	Add tests to show the `IOException: The process cannot access the file`	2019-01-05 09:42:37 -05:00
dfinke	9625e4a8ac	Update ReadME	2018-12-31 18:53:54 -05:00
dfinke	82177da695	Bump release	2018-12-31 18:53:45 -05:00
Doug Finke	b3f7a60be8	Merge pull request #517 from dfinke/FixAutoNameRange-dcf Fix auto name range when a single property is incoming	2018-12-31 18:48:09 -05:00
dfinke	643610c267	Add test for a single property name	2018-12-31 18:45:26 -05:00
dfinke	bd7d70a050	Fix when only one property name is in the incoming data	2018-12-31 18:45:16 -05:00