From f6c66e21a757cddbb4dd6eea09d5bd0625cb1fbf Mon Sep 17 00:00:00 2001
From: jhoneill <jhoneill@waitrose.com>
Date: Sat, 23 Nov 2019 16:12:29 +0000
Subject: [PATCH] Sync to Doug's 6.5.3 release

---
 ExportedCommands/Import-Excel.ps1           | 106 +++++++++++---------
 ImportExcel.psd1                            |   2 +-
 README.md                                   |  13 +++
 __tests__/ImportExcelTests/Simple.tests.ps1 |  21 ++++
 __tests__/ImportExcelTests/TestData1.xlsx   | Bin 0 -> 8626 bytes
 __tests__/ImportExcelTests/TestData2.xlsx   | Bin 0 -> 8624 bytes
 6 files changed, 91 insertions(+), 51 deletions(-)
 create mode 100644 __tests__/ImportExcelTests/TestData1.xlsx
 create mode 100644 __tests__/ImportExcelTests/TestData2.xlsx

diff --git a/ExportedCommands/Import-Excel.ps1 b/ExportedCommands/Import-Excel.ps1
index 7f5c5a9..94ec48f 100644
--- a/ExportedCommands/Import-Excel.ps1
+++ b/ExportedCommands/Import-Excel.ps1
@@ -1,14 +1,13 @@
 function Import-Excel {
-
-    [CmdLetBinding()]
-    [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingPlainTextForPassword", "")]
-    [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSPossibleIncorrectUsageOfAssignmentOperator', '', Justification = 'Intentional')]
-    Param (
+  [CmdLetBinding()]
+  [Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingPlainTextForPassword", "")]
+  [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSPossibleIncorrectUsageOfAssignmentOperator', '', Justification = 'Intentional')]
+  param (
         [Alias('FullName')]
         [Parameter(ParameterSetName = "PathA", Mandatory, ValueFromPipelineByPropertyName, ValueFromPipeline, Position = 0 )]
         [Parameter(ParameterSetName = "PathB", Mandatory, ValueFromPipelineByPropertyName, ValueFromPipeline, Position = 0 )]
         [Parameter(ParameterSetName = "PathC", Mandatory, ValueFromPipelineByPropertyName, ValueFromPipeline, Position = 0 )]
-        [String]$Path,
+        [String[]]$Path,
         [Parameter(ParameterSetName = "PackageA", Mandatory)]
         [Parameter(ParameterSetName = "PackageB", Mandatory)]
         [Parameter(ParameterSetName = "PackageC", Mandatory)]
@@ -37,55 +36,61 @@
         [ValidateNotNullOrEmpty()]
         [String]$Password
     )
-    begin {
-        $sw = [System.Diagnostics.Stopwatch]::StartNew()
+  end {
+    $sw = [System.Diagnostics.Stopwatch]::StartNew()
+    if ($input) {
+        $Paths = $input
+    }
+    elseif ($Path) {
+        $Paths = $Path
+    }
+    else {
+        $Paths = ''
+    }
+    Function Get-PropertyNames {
+        <#
+        .SYNOPSIS
+            Create objects containing the column number and the column name for each of the different header types.
+        #>
+        [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseSingularNouns', '', Justification = "Name would be incorrect, and command is not exported")]
+        Param (
+            [Parameter(Mandatory)]
+            [Int[]]$Columns,
+            [Parameter(Mandatory)]
+            [Int]$StartRow
+        )
 
-        Function Get-PropertyNames {
-            <#
-            .SYNOPSIS
-                Create objects containing the column number and the column name for each of the different header types.
-            #>
-            [Diagnostics.CodeAnalysis.SuppressMessageAttribute('PSUseSingularNouns', '', Justification = "Name would be incorrect, and command is not exported")]
-            Param (
-                [Parameter(Mandatory)]
-                [Int[]]$Columns,
-                [Parameter(Mandatory)]
-                [Int]$StartRow
-            )
-
-            Try {
-                if ($HeaderName) {
-                    $i = 0
-                    foreach ($H in $HeaderName) {
-                        $H | Select-Object @{N = 'Column'; E = { $Columns[$i] } }, @{N = 'Value'; E = { $H } }
-                        $i++
-                    }
-                }
-                elseif ($NoHeader) {
-                    $i = 0
-                    foreach ($C in $Columns) {
-                        $i++
-                        $C | Select-Object @{N = 'Column'; E = { $_ } }, @{N = 'Value'; E = { 'P' + $i } }
-                    }
-                }
-
-                else {
-                    if ($StartRow -lt 1) {
-                        throw 'The top row can never be less than 1 when we need to retrieve headers from the worksheet.' ; return
-                    }
-
-                    foreach ($C in $Columns) {
-                        $Worksheet.Cells[$StartRow, $C] | Where-Object { $_.Value } | Select-Object @{N = 'Column'; E = { $C } }, Value
-                    }
+        Try {
+            if ($HeaderName) {
+                $i = 0
+                foreach ($H in $HeaderName) {
+                    $H | Select-Object @{N = 'Column'; E = { $Columns[$i] } }, @{N = 'Value'; E = { $H } }
+                    $i++
                 }
             }
-            Catch {
-                throw "Failed creating property names: $_" ; return
+            elseif ($NoHeader) {
+                $i = 0
+                foreach ($C in $Columns) {
+                    $i++
+                    $C | Select-Object @{N = 'Column'; E = { $_ } }, @{N = 'Value'; E = { 'P' + $i } }
+                }
+            }
+
+            else {
+                if ($StartRow -lt 1) {
+                    throw 'The top row can never be less than 1 when we need to retrieve headers from the worksheet.' ; return
+                }
+
+                foreach ($C in $Columns) {
+                    $Worksheet.Cells[$StartRow, $C] | Where-Object { $_.Value } | Select-Object @{N = 'Column'; E = { $C } }, Value
+                }
             }
         }
+        Catch {
+            throw "Failed creating property names: $_" ; return
+        }
     }
-
-    process {
+    foreach ($Path in $Paths) {
         if ($path) {
             $extension = [System.IO.Path]::GetExtension($Path)
             if ($extension -notmatch '.xlsx$|.xlsm$') {
@@ -193,4 +198,5 @@
             if ($Path) { $stream.close(); $ExcelPackage.Dispose() }
         }
     }
-}
+  }
+}
\ No newline at end of file
diff --git a/ImportExcel.psd1 b/ImportExcel.psd1
index c602500..6288b3d 100644
--- a/ImportExcel.psd1
+++ b/ImportExcel.psd1
@@ -4,7 +4,7 @@
     RootModule        = 'ImportExcel.psm1'
 
     # Version number of this module.
-    ModuleVersion     = '6.5.2'
+    ModuleVersion     = '6.5.3'
 
     # ID used to uniquely identify this module
     GUID              = '60dd4136-feff-401a-ba27-a84458c57ede'
diff --git a/README.md b/README.md
index e5f7f52..dba7450 100644
--- a/README.md
+++ b/README.md
@@ -60,6 +60,19 @@ Plus, wiring the [PowerShell ScriptAnalyzer Excel report](https://github.com/dfi
 
 ![](./images/ScriptAnalyzerReport.png)
 
+# What's new 6.5.3
+
+Thanks again to the community for making this module even better.
+
+- [Fix import excel headers](https://github.com/dfinke/ImportExcel/pull/713)
+- Numerous improvements for DataTables and exporting it to Excel [James O'Neill](https://twitter.com/jamesoneill)
+	- Names, styles, proper appending
+- Handles marking the empty row on an empty table as dummy row
+- Re-work code based on linting recommendations
+- Update existing tests and add more
+- Support PipelineVariable thanks to [Luc Dekens](https://twitter.com/LucD22) for reporting and [Ili](https://twitter.com/ili_z) for the PR
+- Fix quoting in ConvertFromExcelToSQLInsert [beckerben](https://github.com/beckerben)
+
 # What's new 6.5.2
 
 Thank you [uSlackr](https://github.com/uSlackr)ill
diff --git a/__tests__/ImportExcelTests/Simple.tests.ps1 b/__tests__/ImportExcelTests/Simple.tests.ps1
index 12049ec..a8a48fe 100644
--- a/__tests__/ImportExcelTests/Simple.tests.ps1
+++ b/__tests__/ImportExcelTests/Simple.tests.ps1
@@ -42,4 +42,25 @@ Describe "Tests" {
             $data[0].p1 | Should be "a"
             $data[1].p1 | Should be "b"
     }
+
+    It "Should take Paths from parameter".PadRight(90) {
+        $data = Import-Excel -Path (Get-ChildItem -Path $PSScriptRoot -Filter "TestData?.xlsx").FullName
+        $data.count | Should be 4
+        $data[0].cola | Should be 1
+        $data[2].cola | Should be 5
+    }
+
+    It "Should take Paths from pipeline".PadRight(90) {
+        $data = (Get-ChildItem -Path $PSScriptRoot -Filter "TestData?.xlsx").FullName | Import-Excel
+        $data.count | Should be 4
+        $data[0].cola | Should be 1
+        $data[2].cola | Should be 5
+    }
+
+    It "Should support PipelineVariable".PadRight(90) {
+        $data = Import-Excel $PSScriptRoot\Simple.xlsx -PipelineVariable 'Pv' | ForEach-Object { $Pv.p1 }
+        $data.count | Should be 2
+        $data[0] | Should be "a"
+        $data[1] | Should be "b"
+    }
 }
\ No newline at end of file
diff --git a/__tests__/ImportExcelTests/TestData1.xlsx b/__tests__/ImportExcelTests/TestData1.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..7f554adb7cb810a4ef8ea8fc1d14f74bb68a30a8
GIT binary patch
literal 8626
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

literal 0
HcmV?d00001

diff --git a/__tests__/ImportExcelTests/TestData2.xlsx b/__tests__/ImportExcelTests/TestData2.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..fd7996700553b2b6158ada76a4b7bf7aa8a9d57c
GIT binary patch
literal 8624
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

literal 0
HcmV?d00001