Openpyxl dotnet fix

src/FsSpreadsheet.Js/Cell.fs

@@ -25,13 +25,7 @@ module JsCell =
             dt
         | String    -> 
             fsCell.Value |> Some
-        | anyElse ->
-            //let msg = sprintf "ValueType '%A' is not fully implemented in FsSpreadsheet and is handled as string input." anyElse
-            //#if FABLE_COMPILER_JAVASCRIPT
-            //log msg
-            //#else
-            //printfn "%s" msg
-            //#endif
+        | Empty ->
             fsCell.Value |> box |> Some 
 
     /// <summary>

src/FsSpreadsheet.Net/Cell.fs

@@ -239,6 +239,12 @@ module Cell =
     /// </summary>
     let getCellValue (cell : Cell) = cell.CellValue
 
+    let tryGetInnerText (cell : Cell) = 
+        if cell.HasChildren then
+            Some cell.InnerText
+        else 
+            None
+
     /// <summary>
     /// Maps a Cell to the value string using a shared string table.
     /// </summary>
@@ -253,7 +259,9 @@ module Cell =
                 >> int
                 >> fun i -> sharedStringTable.[i]          
             )
-
+        | Some CellValues.InlineString ->
+            cell
+            |> tryGetInnerText
         | _ ->
             cell
             |> tryGetCellValue

src/FsSpreadsheet.Py/Cell.fs

@@ -42,11 +42,8 @@ module PyCell =
             |> Some
         | String    -> 
             fsCell.Value |> Some
-        | anyElse ->
-            let msg = sprintf "ValueType '%A' is not fully implemented in FsSpreadsheet and is handled as string input." anyElse         
-            printfn "%s" msg
-
-            fsCell.Value |> box |> Some 
+        | Empty -> 
+            fsCell.Value |> box |> Some                       
 
     let toFsCell worksheetName rowIndex columnIndex (pyCell: Cell) =
         //printfn "toFsCell worksheetName: %s, rowIndex: %i, columnIndex: %i, %A" worksheetName rowIndex columnIndex (pyCell.value, pyCell.cellType)

tests/FsSpreadsheet.Js.Tests/DefaultIO.Tests.fs

@@ -19,6 +19,10 @@ let private tests_Read = testList "Read" [
         let! wb = readFromTestFile DefaultTestObject.TestFiles.Libre |> Async.AwaitPromise
         Expect.isDefaultTestObject wb
     }
+    testCaseAsync "Pandas" <| async {
+        let! wb = readFromTestFile DefaultTestObject.TestFiles.Pandas |> Async.AwaitPromise
+        Expect.isDefaultTestObject wb
+    }
     testCaseAsync "FableExceljs" <| async {
         let! wb = readFromTestFile DefaultTestObject.TestFiles.FableExceljs |> Async.AwaitPromise
         Expect.isDefaultTestObject wb

tests/FsSpreadsheet.Net.Tests/DefaultIO.Tests.fs

@@ -22,6 +22,9 @@ let tests_Read = testList "Read" [
     testCase "Libre" <| fun _ ->
         let wb = readFromTestFile DefaultTestObject.TestFiles.Libre
         Expect.isDefaultTestObject wb
+    testCase "Pandas" <| fun _ ->
+        let wb = readFromTestFile DefaultTestObject.TestFiles.Pandas
+        Expect.isDefaultTestObject wb
     testCase "FableExceljs" <| fun _ ->
         let wb = readFromTestFile DefaultTestObject.TestFiles.FableExceljs
         Expect.isDefaultTestObject wb

tests/FsSpreadsheet.Py.Tests/DefaultIO.Tests.fs

@@ -23,6 +23,10 @@ let private tests_Read = testList "Read" [
         let wb = readFromTestFile DefaultTestObject.TestFiles.Libre
         Expect.isDefaultTestObject wb
 
+    testCase "Pandas" <| fun _ ->
+        let wb = readFromTestFile DefaultTestObject.TestFiles.Pandas
+        Expect.isDefaultTestObject wb
+
     testCase "FableExceljs" <| fun _ ->
         let wb = readFromTestFile DefaultTestObject.TestFiles.FableExceljs
         Expect.isDefaultTestObject wb

tests/TestUtils/DefaultTestObjects.fs

@@ -11,6 +11,7 @@ let [<Literal>] testFolder = "TestFiles"
 type TestFiles =
 | Excel
 | Libre
+| Pandas
 | FableExceljs
 | ClosedXML
 | FsSpreadsheetNET
@@ -21,6 +22,7 @@ type TestFiles =
         match this with
         | Excel             -> "TestWorkbook_Excel.xlsx"
         | Libre             -> "TestWorkbook_Libre.xlsx"
+        | Pandas            -> "TestWorkbook_Pandas.xlsx"
         | FableExceljs      -> "TestWorkbook_FableExceljs.xlsx"
         | ClosedXML         -> "TestWorkbook_ClosedXML.xlsx"
         | FsSpreadsheetNET  -> "TestWorkbook_FsSpreadsheet.net.xlsx"

tests/TestUtils/TestUtils.fsproj

@@ -18,6 +18,9 @@
     <EmbeddedResource Include="TestFiles\TestWorkbook_Libre.xlsx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
+    <EmbeddedResource Include="TestFiles\TestWorkbook_Pandas.xlsx">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </EmbeddedResource>
     <EmbeddedResource Include="TestFiles\TestWorkbook_FsSpreadsheet.net.xlsx">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>