@nfdi4plants/arctrl 1.0.0-alpha9 → 1.0.0-beta.1

package/fable_modules/{FsSpreadsheet.4.1.0 → FsSpreadsheet.5.0.0}/Cells/FsCell.fs

@@ -4,6 +4,15 @@ open System
 
 open Fable.Core
 
+//type Hyperlink = {
+//    Text: string
+//    Hyperlink: string
+//} with
+//    static member create(text, hyperlink) = {
+//        Text = text
+//        Hyperlink = hyperlink
+//    }
+
 /// <summary>
 /// Possible DataTypes used in a FsCell.
 /// </summary>
@@ -12,6 +21,7 @@ type DataType =
     | Boolean
     | Number
     | Date
+    //| Hyperlink
     | Empty
 
     /// <summary>
@@ -20,34 +30,40 @@ type DataType =
     static member inline InferCellValue (value : 'T) = 
         let value = box value
         match value with
-        | :? char as c -> DataType.String,c.ToString()
-        | :? bool as true -> DataType.Boolean, "True"
-        | :? bool as false -> DataType.Boolean, "False"
-        | :? byte as i -> DataType.Number,i.ToString()
-        | :? sbyte as i -> DataType.Number,i.ToString()
-        | :? int as i -> DataType.Number,i.ToString()
-        | :? int16 as i -> DataType.Number,i.ToString()
-        | :? int64 as i -> DataType.Number,i.ToString()
-        | :? uint as i -> DataType.Number,i.ToString()
-        | :? uint16 as i -> DataType.Number,i.ToString()
-        | :? uint64 as i -> DataType.Number,i.ToString()
-        | :? single as i -> DataType.Number,i.ToString()
-        | :? float as i -> DataType.Number,i.ToString()
-        | :? decimal as i -> DataType.Number,i.ToString()
-        | :? System.DateTime as d -> DataType.Date,d.ToString()
-        | :? string as s -> DataType.String,s.ToString()
-        | _ ->  DataType.String,value.ToString()
+        //| :? Hyperlink as hpl -> DataType.Hyperlink, value
+        | :? char as c -> DataType.String, value
+        | :? bool as true -> DataType.Boolean, true
+        | :? bool as false -> DataType.Boolean, false
+        | :? byte as i -> DataType.Number, value
+        | :? sbyte as i -> DataType.Number, value
+        | :? int as i -> DataType.Number, value
+        | :? int16 as i -> DataType.Number, value
+        | :? int64 as i -> DataType.Number, value
+        | :? uint as i -> DataType.Number, value
+        | :? uint16 as i -> DataType.Number,value
+        | :? uint64 as i -> DataType.Number,value
+        | :? single as i -> DataType.Number,value
+        | :? float as i -> DataType.Number,value
+        | :? decimal as i -> DataType.Number,value
+        | :? System.DateTime as d -> DataType.Date,value
+        | :? string as s -> DataType.String,value
+        | _ ->  DataType.String,value
 
 // Type based on the type XLCell used in ClosedXml
 /// <summary>
 /// Creates an FsCell of `DataType` dataType, with value of type `string`, and `FsAddress` address.
 /// </summary>
 
+module FsCellAux =
+
+    let boolConverter (bool:bool) =
+        match bool with | true -> "1" | false -> "0"
+
 [<AttachMembers>]
-type FsCell (value : IConvertible, ?dataType : DataType, ?address : FsAddress) =
+type FsCell (value : obj, ?dataType : DataType, ?address : FsAddress) =
     
     // TODO: Maybe save as IConvertible
-    let mutable _cellValue = string value
+    let mutable _cellValue : obj = value
     let mutable _dataType = dataType |> Option.defaultValue DataType.String
     let mutable _comment  = ""
     let mutable _hyperlink = ""
@@ -58,9 +74,9 @@ type FsCell (value : IConvertible, ?dataType : DataType, ?address : FsAddress) =
     let mutable _rowIndex : int = address |> Option.map (fun a -> a.RowNumber) |> Option.defaultValue 0
     let mutable _columnIndex : int = address |> Option.map (fun a -> a.ColumnNumber) |> Option.defaultValue 0
 
-
+    new(value: IConvertible, ?dataType : DataType, ?address : FsAddress) = FsCell(box value, ?dataType = dataType, ?address = address)
     /// Creates an empty FsCell, set at row 0, column 0 (1-based).
-    static member empty () = FsCell ("", DataType.Empty, FsAddress(0,0))
+    static member inline empty () = FsCell ("", DataType.Empty, FsAddress(0,0))
 
     ///// Creates an FsCell of `DataType` `Number`, with the given value, set at row 1, column 1 (1-based).
     //new (value : int) = FsCell (string value, DataType.Number, FsAddress(0,0))
@@ -158,8 +174,8 @@ type FsCell (value : IConvertible, ?dataType : DataType, ?address : FsAddress) =
     /// <summary>
     /// Creates an FsCell with the given DataType, rowNumber, colNumber, and value.
     /// </summary>
-    static member createWithDataType (dataType : DataType) (rowNumber : int) (colNumber : int) value =
-        FsCell(value, dataType, FsAddress(rowNumber, colNumber))
+    static member createWithDataType (dataType : DataType) (rowNumber : int) (colNumber : int) (value: obj) =
+            FsCell(value, dataType, FsAddress(rowNumber, colNumber))
 
     //how 2:
     //return (format.ToUpper()) switch
@@ -222,8 +238,17 @@ type FsCell (value : IConvertible, ?dataType : DataType, ?address : FsAddress) =
     /// <summary>
     /// Gets the value as string
     /// </summary>
-    member self.ValueAsString() =
-        self.Value
+    member self.ValueAsString() : string =
+        let v = self.Value
+        match self.DataType with
+        | DataType.String | DataType.Date | DataType.Boolean | DataType.Empty ->
+            v.ToString()
+        | Number ->
+            // Example: 4.123: 
+            // - (4.123)ToString() will parse floats in germany to "4,123" which is not allowed by Excel.
+            // - string(4.123) will parse floats in germany to "4.123" which is allowed by Excel.
+            // TODO: Maybe swap to (90.213).ToString(new Globalization.CultureInfo("en-US") ) // val it: string = "90.213"
+            string v 
 
     /// <summary>
     /// Gets the value as string
@@ -235,7 +260,10 @@ type FsCell (value : IConvertible, ?dataType : DataType, ?address : FsAddress) =
     /// Gets the value as bool
     /// </summary>
     member self.ValueAsBool() =
-        bool.Parse (self.Value)
+        match (string self.Value).ToLower() with
+        | "1" | "true" | "true()" -> true
+        | "0" | "false" | "false()" -> false
+        | anyElse -> raise (System.FormatException($"String '{anyElse}' was not recognized as a valid Boolean"))
 
     /// <summary>
     /// Gets the value as bool
@@ -247,7 +275,7 @@ type FsCell (value : IConvertible, ?dataType : DataType, ?address : FsAddress) =
     /// Gets the value as float
     /// </summary>
     member self.ValueAsFloat() =
-        Double.Parse (self.Value)
+        Double.Parse (string self.Value)
 
     /// <summary>
     /// Gets the value as float
@@ -259,7 +287,7 @@ type FsCell (value : IConvertible, ?dataType : DataType, ?address : FsAddress) =
     /// Gets the value as int
     /// </summary>
     member self.ValueAsInt() =
-        Int32.Parse (self.Value)
+        Int32.Parse (string self.Value)
 
     /// <summary>
     /// Gets the value as int
@@ -271,7 +299,7 @@ type FsCell (value : IConvertible, ?dataType : DataType, ?address : FsAddress) =
     /// Gets the value as uint
     /// </summary>
     member self.ValueAsUInt() =
-        UInt32.Parse (self.Value)
+        UInt32.Parse (string self.Value)
 
     /// <summary>
     /// Gets the value as uint
@@ -283,7 +311,7 @@ type FsCell (value : IConvertible, ?dataType : DataType, ?address : FsAddress) =
     /// Gets the value as long
     /// </summary>
     member self.ValueAsLong() =
-        Int64.Parse (self.Value)
+        Int64.Parse (string self.Value)
 
     /// <summary>
     /// Gets the value as long
@@ -295,7 +323,7 @@ type FsCell (value : IConvertible, ?dataType : DataType, ?address : FsAddress) =
     /// Gets the value as ulong
     /// </summary>
     member self.ValueAsULong() =
-        UInt64.Parse (self.Value)
+        UInt64.Parse (string self.Value)
 
     /// <summary>
     /// Gets the value as ulong
@@ -307,7 +335,7 @@ type FsCell (value : IConvertible, ?dataType : DataType, ?address : FsAddress) =
     /// Gets the value as double
     /// </summary>
     member self.ValueAsDouble() =
-        Double.Parse (self.Value)
+        Double.Parse (string self.Value)
 
     /// <summary>
     /// Gets the value as double
@@ -319,7 +347,7 @@ type FsCell (value : IConvertible, ?dataType : DataType, ?address : FsAddress) =
     /// Gets the value as decimal
     /// </summary>
     member self.ValueAsDecimal() =
-        Decimal.Parse (self.Value)
+        Decimal.Parse (string self.Value)
 
     /// <summary>
     /// Gets the value as decimal
@@ -331,7 +359,7 @@ type FsCell (value : IConvertible, ?dataType : DataType, ?address : FsAddress) =
     /// Gets the value as DateTime
     /// </summary>
     member self.ValueAsDateTime() =
-        DateTime.Parse (self.Value)
+        DateTime.Parse (string self.Value)
 
     /// <summary>
     /// Gets the value as DateTime
@@ -343,7 +371,7 @@ type FsCell (value : IConvertible, ?dataType : DataType, ?address : FsAddress) =
     /// Gets the value as Guid
     /// </summary>
     member self.ValueAsGuid() =
-        Guid.Parse (self.Value)
+        Guid.Parse (string self.Value)
 
     /// <summary>
     /// Gets the value as Guid
@@ -355,7 +383,7 @@ type FsCell (value : IConvertible, ?dataType : DataType, ?address : FsAddress) =
     /// Gets the value as char
     /// </summary>
     member self.ValueAsChar() =
-        Char.Parse (self.Value)
+        Char.Parse (string self.Value)
 
     /// <summary>
     /// Gets the value as char
@@ -385,3 +413,24 @@ type FsCell (value : IConvertible, ?dataType : DataType, ?address : FsAddress) =
     static member setValueAs<'T> value (cell : FsCell)= 
         cell.SetValueAs<'T>(value)
         cell
+
+    member this.StructurallyEquals (other: FsCell) =
+        let r = 
+            [|
+                this.Value = other.Value
+                this.DataType = other.DataType
+                [|
+                    this.Address.Address = other.Address.Address
+                    this.Address.ColumnNumber = other.Address.ColumnNumber
+                    this.Address.RowNumber = other.Address.RowNumber
+                    this.Address.FixedColumn = other.Address.FixedColumn
+                    this.Address.FixedRow = other.Address.FixedRow
+                |]
+                |> Seq.forall (fun x -> x=true)
+                this.ColumnNumber = other.ColumnNumber
+                this.RowNumber = other.RowNumber
+            |]
+            |> Seq.forall (fun x -> x=true)
+        r
+
+

package/fable_modules/FsSpreadsheet.5.0.0/Cells/FsCell.fs.js

@@ -0,0 +1,272 @@
+import { toString, Union } from "../../fable-library.4.1.4/Types.js";
+import { class_type, union_type } from "../../fable-library.4.1.4/Reflection.js";
+import { map, defaultArg, unwrap } from "../../fable-library.4.1.4/Option.js";
+import { FsAddress__get_FixedRow, FsAddress__get_FixedColumn, FsAddress__get_Address, FsAddress__Copy, CellReference_indexToColAdress, FsAddress__get_ColumnNumber, FsAddress__get_RowNumber, FsAddress_$ctor_Z37302880 } from "../FsAddress.fs.js";
+import { parse as parse_3 } from "../../fable-library.4.1.4/Decimal.js";
+import Decimal from "../../fable-library.4.1.4/Decimal.js";
+import { parse } from "../../fable-library.4.1.4/Double.js";
+import { parse as parse_1 } from "../../fable-library.4.1.4/Int32.js";
+import { toUInt64, toInt64 } from "../../fable-library.4.1.4/BigInt.js";
+import { parse as parse_2 } from "../../fable-library.4.1.4/Long.js";
+import { parse as parse_4 } from "../../fable-library.4.1.4/Date.js";
+import { parse as parse_5 } from "../../fable-library.4.1.4/Guid.js";
+import { parse as parse_6 } from "../../fable-library.4.1.4/Char.js";
+import { forAll } from "../../fable-library.4.1.4/Seq.js";
+import { equals } from "../../fable-library.4.1.4/Util.js";
+
+export class DataType extends Union {
+    constructor(tag, fields) {
+        super();
+        this.tag = tag;
+        this.fields = fields;
+    }
+    cases() {
+        return ["String", "Boolean", "Number", "Date", "Empty"];
+    }
+}
+
+export function DataType_$reflection() {
+    return union_type("FsSpreadsheet.DataType", [], DataType, () => [[], [], [], [], []]);
+}
+
+export function FsCellAux_boolConverter(bool) {
+    if (bool) {
+        return "1";
+    }
+    else {
+        return "0";
+    }
+}
+
+export class FsCell {
+    constructor(value, dataType, address) {
+        this._cellValue = value;
+        this._dataType = defaultArg(dataType, new DataType(0, []));
+        this._comment = "";
+        this._hyperlink = "";
+        this._richText = "";
+        this._formulaA1 = "";
+        this._formulaR1C1 = "";
+        this._rowIndex = (defaultArg(map(FsAddress__get_RowNumber, address), 0) | 0);
+        this._columnIndex = (defaultArg(map(FsAddress__get_ColumnNumber, address), 0) | 0);
+    }
+    static ".ctor"(value, dataType, address) {
+        return new FsCell(value, unwrap(dataType), unwrap(address));
+    }
+    get Value() {
+        const self = this;
+        return self._cellValue;
+    }
+    set Value(value) {
+        const self = this;
+        self._cellValue = value;
+    }
+    get DataType() {
+        const self = this;
+        return self._dataType;
+    }
+    set DataType(dataType) {
+        const self = this;
+        self._dataType = dataType;
+    }
+    get ColumnNumber() {
+        const self = this;
+        return self._columnIndex | 0;
+    }
+    set ColumnNumber(colI) {
+        const self = this;
+        self._columnIndex = (colI | 0);
+    }
+    get RowNumber() {
+        const self = this;
+        return self._rowIndex | 0;
+    }
+    set RowNumber(rowI) {
+        const self = this;
+        self._rowIndex = (rowI | 0);
+    }
+    get Address() {
+        const self = this;
+        return FsAddress_$ctor_Z37302880(self._rowIndex, self._columnIndex);
+    }
+    set Address(address) {
+        const self = this;
+        self._rowIndex = (FsAddress__get_RowNumber(address) | 0);
+        self._columnIndex = (FsAddress__get_ColumnNumber(address) | 0);
+    }
+    static create(rowNumber, colNumber, value) {
+        let patternInput;
+        const value_1_1 = value;
+        patternInput = ((typeof value_1_1 === "string") ? [new DataType(0, []), value_1_1] : ((typeof value_1_1 === "boolean") ? (value_1_1 ? [new DataType(1, []), true] : [new DataType(1, []), false]) : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "bigint") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "bigint") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((value_1_1 instanceof Decimal) ? [new DataType(2, []), value_1_1] : ((value_1_1 instanceof Date) ? [new DataType(3, []), value_1_1] : ((typeof value_1_1 === "string") ? [new DataType(0, []), value_1_1] : [new DataType(0, []), value_1_1])))))))))))))));
+        return new FsCell(patternInput[1], patternInput[0], FsAddress_$ctor_Z37302880(rowNumber, colNumber));
+    }
+    static createEmpty() {
+        return new FsCell("", new DataType(4, []), FsAddress_$ctor_Z37302880(0, 0));
+    }
+    static createWithAdress(adress, value) {
+        let patternInput;
+        const value_1_1 = value;
+        patternInput = ((typeof value_1_1 === "string") ? [new DataType(0, []), value_1_1] : ((typeof value_1_1 === "boolean") ? (value_1_1 ? [new DataType(1, []), true] : [new DataType(1, []), false]) : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "bigint") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "bigint") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((value_1_1 instanceof Decimal) ? [new DataType(2, []), value_1_1] : ((value_1_1 instanceof Date) ? [new DataType(3, []), value_1_1] : ((typeof value_1_1 === "string") ? [new DataType(0, []), value_1_1] : [new DataType(0, []), value_1_1])))))))))))))));
+        return new FsCell(patternInput[1], patternInput[0], adress);
+    }
+    static createEmptyWithAdress(adress) {
+        return new FsCell("", new DataType(4, []), adress);
+    }
+    static createWithDataType(dataType, rowNumber, colNumber, value) {
+        return new FsCell(value, dataType, FsAddress_$ctor_Z37302880(rowNumber, colNumber));
+    }
+    toString() {
+        const self = this;
+        return `${CellReference_indexToColAdress(self.ColumnNumber >>> 0)}${self.RowNumber} : ${self.Value} | ${self.DataType}`;
+    }
+    CopyFrom(otherCell) {
+        const self = this;
+        self.DataType = otherCell.DataType;
+        self.Value = otherCell.Value;
+    }
+    CopyTo(target) {
+        const self = this;
+        target.DataType = self.DataType;
+        target.Value = self.Value;
+    }
+    static copyFromTo(sourceCell, targetCell) {
+        targetCell.DataType = sourceCell.DataType;
+        targetCell.Value = sourceCell.Value;
+        return targetCell;
+    }
+    Copy() {
+        const self = this;
+        return new FsCell(self.Value, self.DataType, FsAddress__Copy(self.Address));
+    }
+    static copy(cell) {
+        return cell.Copy();
+    }
+    ValueAsString() {
+        const self = this;
+        const v = self.Value;
+        const matchValue = self.DataType;
+        switch (matchValue.tag) {
+            case 2:
+                return toString(v);
+            default:
+                return toString(v);
+        }
+    }
+    static getValueAsString(cell) {
+        return cell.ValueAsString();
+    }
+    ValueAsBool() {
+        const self = this;
+        const matchValue = toString(self.Value).toLocaleLowerCase();
+        switch (matchValue) {
+            case "1":
+            case "true":
+            case "true()":
+                return true;
+            case "0":
+            case "false":
+            case "false()":
+                return false;
+            default:
+                throw new Error(`String '${matchValue}' was not recognized as a valid Boolean`);
+        }
+    }
+    static getValueAsBool(cell) {
+        return cell.ValueAsBool();
+    }
+    ValueAsFloat() {
+        const self = this;
+        return parse(toString(self.Value));
+    }
+    static getValueAsFloat(cell) {
+        return cell.ValueAsFloat();
+    }
+    ValueAsInt() {
+        const self = this;
+        return parse_1(toString(self.Value), 511, false, 32) | 0;
+    }
+    static getValueAsInt(cell) {
+        return cell.ValueAsInt();
+    }
+    ValueAsUInt() {
+        const self = this;
+        return parse_1(toString(self.Value), 511, true, 32);
+    }
+    static getValueAsUInt(cell) {
+        return cell.ValueAsUInt();
+    }
+    ValueAsLong() {
+        const self = this;
+        return toInt64(parse_2(toString(self.Value), 511, false, 64));
+    }
+    static getValueAsLong(cell) {
+        return cell.ValueAsLong();
+    }
+    ValueAsULong() {
+        const self = this;
+        return toUInt64(parse_2(toString(self.Value), 511, true, 64));
+    }
+    static getValueAsULong(cell) {
+        return cell.ValueAsULong();
+    }
+    ValueAsDouble() {
+        const self = this;
+        return parse(toString(self.Value));
+    }
+    static getValueAsDouble(cell) {
+        return cell.ValueAsDouble();
+    }
+    ValueAsDecimal() {
+        const self = this;
+        return parse_3(toString(self.Value));
+    }
+    static getValueAsDecimal(cell) {
+        return cell.ValueAsDecimal();
+    }
+    ValueAsDateTime() {
+        const self = this;
+        return parse_4(toString(self.Value));
+    }
+    static getValueAsDateTime(cell) {
+        return cell.ValueAsDateTime();
+    }
+    ValueAsGuid() {
+        const self = this;
+        return parse_5(toString(self.Value));
+    }
+    static getValueAsGuid(cell) {
+        return cell.ValueAsGuid();
+    }
+    ValueAsChar() {
+        const self = this;
+        return parse_6(toString(self.Value));
+    }
+    static getValueAsChar(cell) {
+        return cell.ValueAsChar();
+    }
+    SetValueAs(value) {
+        const self = this;
+        let patternInput;
+        const value_1_1 = value;
+        patternInput = ((typeof value_1_1 === "string") ? [new DataType(0, []), value_1_1] : ((typeof value_1_1 === "boolean") ? (value_1_1 ? [new DataType(1, []), true] : [new DataType(1, []), false]) : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "bigint") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "bigint") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((typeof value_1_1 === "number") ? [new DataType(2, []), value_1_1] : ((value_1_1 instanceof Decimal) ? [new DataType(2, []), value_1_1] : ((value_1_1 instanceof Date) ? [new DataType(3, []), value_1_1] : ((typeof value_1_1 === "string") ? [new DataType(0, []), value_1_1] : [new DataType(0, []), value_1_1])))))))))))))));
+        self._dataType = patternInput[0];
+        self._cellValue = patternInput[1];
+    }
+    static setValueAs(value, cell) {
+        cell.SetValueAs(value);
+        return cell;
+    }
+    StructurallyEquals(other) {
+        const this$ = this;
+        return forAll((x_1) => (x_1 === true), [equals(this$.Value, other.Value), equals(this$.DataType, other.DataType), forAll((x) => (x === true), [FsAddress__get_Address(this$.Address) === FsAddress__get_Address(other.Address), FsAddress__get_ColumnNumber(this$.Address) === FsAddress__get_ColumnNumber(other.Address), FsAddress__get_RowNumber(this$.Address) === FsAddress__get_RowNumber(other.Address), FsAddress__get_FixedColumn(this$.Address) === FsAddress__get_FixedColumn(other.Address), FsAddress__get_FixedRow(this$.Address) === FsAddress__get_FixedRow(other.Address)]), this$.ColumnNumber === other.ColumnNumber, this$.RowNumber === other.RowNumber]);
+    }
+}
+
+export function FsCell_$reflection() {
+    return class_type("FsSpreadsheet.FsCell", void 0, FsCell);
+}
+
+export function FsCell_$ctor_2BEF9BB0(value, dataType, address) {
+    return new FsCell(value, dataType, address);
+}
+

package/fable_modules/{FsSpreadsheet.4.1.0 → FsSpreadsheet.5.0.0}/DSL/CellBuilder.fs

@@ -14,6 +14,7 @@ type ReduceOperation =
             values 
             |> List.map (snd >> string)
             |> List.reduce (fun a b -> $"{a}{separator}{b}")
+            |> box
 
 type CellBuilder() =
 

package/fable_modules/{FsSpreadsheet.4.1.0 → FsSpreadsheet.5.0.0}/DSL/CellBuilder.fs.js

@@ -1,4 +1,4 @@
-import { Union } from "../../fable-library.4.1.4/Types.js";
+import { toString, Union } from "../../fable-library.4.1.4/Types.js";
 import { class_type, union_type, char_type } from "../../fable-library.4.1.4/Reflection.js";
 import { DataType } from "../Cells/FsCell.fs.js";
 import { head, tail, isEmpty, append, empty, map, reduce } from "../../fable-library.4.1.4/List.js";
@@ -21,8 +21,8 @@ export function ReduceOperation_$reflection() {
     return union_type("FsSpreadsheet.DSL.ReduceOperation", [], ReduceOperation, () => [[["Item", char_type]]]);
 }
 
-export function ReduceOperation__Reduce_Z26A4E3C2(this$, values) {
-    return [new DataType(0, []), reduce((a, b) => (`${a}${this$.fields[0]}${b}`), map((arg) => arg[1], values))];
+export function ReduceOperation__Reduce_70D1A69E(this$, values) {
+    return [new DataType(0, []), reduce((a, b) => (`${a}${this$.fields[0]}${b}`), map((arg) => toString(arg[1]), values))];
 }
 
 export class CellBuilder {
@@ -55,7 +55,7 @@ export function CellBuilder__Yield_36B9E420(this$, ro) {
     return new SheetEntity$1(1, [empty()]);
 }
 
-export function CellBuilder__Combine_4F8B6A0(this$, wx1, wx2) {
+export function CellBuilder__Combine_F07E260(this$, wx1, wx2) {
     let matchResult, l1, l2, messages1, messages2, messages2_1, messages1_1, f1, messages1_2, messages2_2, f2, messages1_3, messages2_3, messages1_4, messages2_4;
     switch (wx1.tag) {
         case 2: {
@@ -130,39 +130,39 @@ export function CellBuilder__Combine_4F8B6A0(this$, wx1, wx2) {
     }
 }
 
-export function CellBuilder__Combine_2C6C5E1E(this$, wx1, wx2) {
+export function CellBuilder__Combine_4BCE267E(this$, wx1, wx2) {
     return RequiredSource$1_$ctor_2B595(wx2);
 }
 
-export function CellBuilder__Combine_Z40A4EDE2(this$, wx1, wx2) {
+export function CellBuilder__Combine_Z2CF9C142(this$, wx1, wx2) {
     return RequiredSource$1_$ctor_2B595(wx1);
 }
 
-export function CellBuilder__Combine_3F9D1279(this$, wx1, wx2) {
+export function CellBuilder__Combine_583F6A19(this$, wx1, wx2) {
     return OptionalSource$1_$ctor_2B595(wx2);
 }
 
-export function CellBuilder__Combine_7AD05659(this$, wx1, wx2) {
+export function CellBuilder__Combine_168D7AF9(this$, wx1, wx2) {
     return OptionalSource$1_$ctor_2B595(wx1);
 }
 
-export function CellBuilder__Combine_Z674DE191(this$, wx1, wx2) {
-    return RequiredSource$1_$ctor_2B595(CellBuilder__Combine_4F8B6A0(this$, RequiredSource$1__get_Source(wx1), wx2));
+export function CellBuilder__Combine_32507AAF(this$, wx1, wx2) {
+    return RequiredSource$1_$ctor_2B595(CellBuilder__Combine_F07E260(this$, RequiredSource$1__get_Source(wx1), wx2));
 }
 
-export function CellBuilder__Combine_1F389C8F(this$, wx1, wx2) {
-    return RequiredSource$1_$ctor_2B595(CellBuilder__Combine_4F8B6A0(this$, wx1, RequiredSource$1__get_Source(wx2)));
+export function CellBuilder__Combine_Z3ABF6771(this$, wx1, wx2) {
+    return RequiredSource$1_$ctor_2B595(CellBuilder__Combine_F07E260(this$, wx1, RequiredSource$1__get_Source(wx2)));
 }
 
-export function CellBuilder__Combine_512E85C8(this$, wx1, wx2) {
-    return OptionalSource$1_$ctor_2B595(CellBuilder__Combine_4F8B6A0(this$, OptionalSource$1__get_Source(wx1), wx2));
+export function CellBuilder__Combine_Z2BFC83F8(this$, wx1, wx2) {
+    return OptionalSource$1_$ctor_2B595(CellBuilder__Combine_F07E260(this$, OptionalSource$1__get_Source(wx1), wx2));
 }
 
-export function CellBuilder__Combine_6390E688(this$, wx1, wx2) {
-    return OptionalSource$1_$ctor_2B595(CellBuilder__Combine_4F8B6A0(this$, wx1, OptionalSource$1__get_Source(wx2)));
+export function CellBuilder__Combine_245D6C8(this$, wx1, wx2) {
+    return OptionalSource$1_$ctor_2B595(CellBuilder__Combine_F07E260(this$, wx1, OptionalSource$1__get_Source(wx2)));
 }
 
-export function CellBuilder__AsCellElement_825BA8D(this$, children) {
+export function CellBuilder__AsCellElement_6F87C2ED(this$, children) {
     let matchResult, messages, v, messages_1, vals, messages_2, messages_3;
     switch (children.tag) {
         case 2: {
@@ -198,7 +198,7 @@ export function CellBuilder__AsCellElement_825BA8D(this$, children) {
         case 0:
             return new SheetEntity$1(0, [[v, void 0], messages]);
         case 1:
-            return new SheetEntity$1(0, [[ReduceOperation__Reduce_Z26A4E3C2(this$.reducer, vals), void 0], messages_1]);
+            return new SheetEntity$1(0, [[ReduceOperation__Reduce_70D1A69E(this$.reducer, vals), void 0], messages_1]);
         case 2:
             return new SheetEntity$1(2, [messages_2]);
         default:

package/fable_modules/{FsSpreadsheet.4.1.0 → FsSpreadsheet.5.0.0}/DSL/Transform.fs

@@ -72,7 +72,7 @@ module Transform =
                 match col with
                 | [] -> failwith "Empty column"
                 | header :: fields ->
-                    let field = table.Field(snd header, cellCollection)
+                    let field = table.Field(snd >> string <| header, cellCollection)
                     fields
                     |> List.iteri (fun i (dataType,value) ->
                         let cell = field.Column.Cell(i + 2,cellCollection)

package/fable_modules/{FsSpreadsheet.4.1.0 → FsSpreadsheet.5.0.0}/DSL/Transform.fs.js

@@ -1,5 +1,6 @@
 import { choose, transpose, map, iterateIndexed, iterate, ofArrayWithTail, empty, reverse, singleton, tail as tail_25, cons, head, isEmpty } from "../../fable-library.4.1.4/List.js";
 import { RowIndex__get_Index, ColumnIndex__get_Index, TableElement__get_IsColumn, SheetElement } from "./Types.fs.js";
+import { toString } from "../../fable-library.4.1.4/Types.js";
 import { FsRangeColumn__Cell_Z4232C216 } from "../Ranges/FsRangeColumn.fs.js";
 import { FsTableField__get_Column } from "../Tables/FsTableField.fs.js";
 import { add, FSharpSet__Contains, ofSeq } from "../../fable-library.4.1.4/Set.js";
@@ -166,7 +167,7 @@ export function splitRowsAndColumns(els) {
 export function FsSpreadsheet_DSL_Workbook__Workbook_parseTable_Static(cellCollection, table, els) {
     iterate((col_2) => {
         if (!isEmpty(col_2)) {
-            const field = table.Field(head(col_2)[1], cellCollection);
+            const field = table.Field(toString(head(col_2)[1]), cellCollection);
             iterateIndexed((i, tupledArg) => {
                 const cell_4 = FsRangeColumn__Cell_Z4232C216(FsTableField__get_Column(field), i + 2, cellCollection);
                 cell_4.DataType = tupledArg[0];

package/fable_modules/{FsSpreadsheet.4.1.0 → FsSpreadsheet.5.0.0}/DSL/Types.fs

@@ -95,7 +95,7 @@ module SheetEntityExtensions =
                 failwith $"SheetEntity of type {typeof<'T>.Name} does not contain Value: \n\t{appendedMessages}"
                 #endif
 
-type Value = DataType * string
+type Value = DataType * obj
 
 type CellElement = Value * int option