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

package/ISA/ISA.Spreadsheet/ArcStudy.js

@@ -1,4 +1,4 @@
-import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.4.1.0/FsWorksheet.fs.js";
+import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.5.0.0/FsWorksheet.fs.js";
 import { iterate, isEmpty, choose, map, append, iterateIndexed } from "../../fable_modules/fable-library.4.1.4/Seq.js";
 import { SparseRowModule_fromFsRow, SparseRowModule_fromValues, SparseRowModule_writeToSheet } from "./Metadata/SparseTable.js";
 import { fromRows as fromRows_1, toRows } from "./Metadata/Study.js";
@@ -9,8 +9,8 @@ import { createMissingIdentifier } from "../ISA/Identifier.js";
 import { empty } from "../../fable_modules/fable-library.4.1.4/List.js";
 import { printf, toConsole } from "../../fable_modules/fable-library.4.1.4/String.js";
 import { toFsWorksheet, tryFromFsWorksheet } from "./AnnotationTable/ArcTable.js";
-import { ArcTables__get_Tables, ArcTables_$ctor_Z18C2F36D, ArcTables_updateReferenceTablesBySheets_Z2EE88E97 } from "../ISA/ArcTypes/ArcTables.js";
-import { FsWorkbook } from "../../fable_modules/FsSpreadsheet.4.1.0/FsWorkbook.fs.js";
+import { ArcTables } from "../ISA/ArcTypes/ArcTables.js";
+import { FsWorkbook } from "../../fable_modules/FsSpreadsheet.5.0.0/FsWorkbook.fs.js";
 
 export function ArcStudy_toMetadataSheet(study, assays) {
     let source_1;
@@ -48,8 +48,8 @@ export function ARCtrl_ISA_ArcStudy__ArcStudy_fromFsWorkbook_Static_32154C9D(doc
     const studyMetadata = patternInput[0];
     const sheets = choose(tryFromFsWorksheet, doc.GetWorksheets());
     if (!isEmpty(sheets)) {
-        const updatedTables = ArcTables_updateReferenceTablesBySheets_Z2EE88E97(ArcTables_$ctor_Z18C2F36D(studyMetadata.Tables), ArcTables_$ctor_Z18C2F36D(Array.from(sheets)), true);
-        studyMetadata.Tables = ArcTables__get_Tables(updatedTables);
+        const updatedTables = ArcTables.updateReferenceTablesBySheets(new ArcTables(studyMetadata.Tables), new ArcTables(Array.from(sheets)), true);
+        studyMetadata.Tables = updatedTables.Tables;
     }
     return [studyMetadata, patternInput[1]];
 }

package/ISA/ISA.Spreadsheet/Metadata/SparseTable.js

@@ -2,12 +2,12 @@ import { append as append_1, delay, tryItem, length as length_1, isEmpty, iterat
 import { defaultArg, map as map_1 } from "../../../fable_modules/fable-library.4.1.4/Option.js";
 import { tryFind, ofSeq } from "../../../fable_modules/fable-library.4.1.4/Map.js";
 import { arrayHash, equalArrays, equals, comparePrimitives } from "../../../fable_modules/fable-library.4.1.4/Util.js";
-import { RowBuilder_get_Empty, RowBuilder__Combine_19F30600, RowBuilder_$ctor } from "../../../fable_modules/FsSpreadsheet.4.1.0/DSL/RowBuilder.fs.js";
-import { CellBuilder_$ctor, CellBuilder__AsCellElement_825BA8D } from "../../../fable_modules/FsSpreadsheet.4.1.0/DSL/CellBuilder.fs.js";
-import { Messages_format, SheetEntity$1_some_2B595 } from "../../../fable_modules/FsSpreadsheet.4.1.0/DSL/Types.fs.js";
-import { DataType } from "../../../fable_modules/FsSpreadsheet.4.1.0/Cells/FsCell.fs.js";
+import { RowBuilder_get_Empty, RowBuilder__Combine_19F30600, RowBuilder_$ctor } from "../../../fable_modules/FsSpreadsheet.5.0.0/DSL/RowBuilder.fs.js";
+import { CellBuilder_$ctor, CellBuilder__AsCellElement_6F87C2ED } from "../../../fable_modules/FsSpreadsheet.5.0.0/DSL/CellBuilder.fs.js";
+import { Messages_format, SheetEntity$1_some_2B595 } from "../../../fable_modules/FsSpreadsheet.5.0.0/DSL/Types.fs.js";
+import { DataType } from "../../../fable_modules/FsSpreadsheet.5.0.0/Cells/FsCell.fs.js";
 import { map as map_2, toArray, initialize as initialize_1, exists, find, cons, append, empty, singleton } from "../../../fable_modules/fable-library.4.1.4/List.js";
-import { ColumnIndex, RowElement } from "../../../fable_modules/FsSpreadsheet.4.1.0/DSL/Types.fs.js";
+import { ColumnIndex, RowElement } from "../../../fable_modules/FsSpreadsheet.5.0.0/DSL/Types.fs.js";
 import { Record } from "../../../fable_modules/fable-library.4.1.4/Types.js";
 import { record_type, list_type, class_type, tuple_type, int32_type, string_type } from "../../../fable_modules/fable-library.4.1.4/Reflection.js";
 import { Seq_trySkip, Dictionary_tryGetValue } from "../CollectionAux.js";
@@ -40,11 +40,11 @@ export function SparseRowModule_getAllValues(i) {
 
 export function SparseRowModule_fromFsRow(r) {
     return choose((c) => {
-        if (c.Value === "") {
+        if (equals(c.Value, "")) {
             return void 0;
         }
         else {
-            return [c.ColumnNumber - 1, c.Value];
+            return [c.ColumnNumber - 1, c.ValueAsString()];
         }
     }, r.Cells);
 }
@@ -67,7 +67,7 @@ export function SparseRowModule_toDSLRow(vs) {
         const v = _arg;
         if (v == null) {
             let c_1;
-            const this$_5 = CellBuilder__AsCellElement_825BA8D(CellBuilder_$ctor(), SheetEntity$1_some_2B595(singleton([new DataType(0, []), ""])));
+            const this$_5 = CellBuilder__AsCellElement_6F87C2ED(CellBuilder_$ctor(), SheetEntity$1_some_2B595(singleton([new DataType(0, []), ""])));
             let matchResult, errs_1, f_1, ms_2_1;
             switch (this$_5.tag) {
                 case 1: {
@@ -137,7 +137,7 @@ export function SparseRowModule_toDSLRow(vs) {
         else {
             const v_1 = v;
             let c;
-            const this$_2 = CellBuilder__AsCellElement_825BA8D(CellBuilder_$ctor(), SheetEntity$1_some_2B595(singleton([new DataType(0, []), v_1])));
+            const this$_2 = CellBuilder__AsCellElement_6F87C2ED(CellBuilder_$ctor(), SheetEntity$1_some_2B595(singleton([new DataType(0, []), v_1])));
             let matchResult_2, errs, f, ms_2;
             switch (this$_2.tag) {
                 case 1: {

package/README.md

@@ -1,6 +1,9 @@
 # ARCtrl
 Top level ARC DataModel and API function descriptions.
 
+![Nuget](https://img.shields.io/nuget/dt/ARCtrl?label=nuget&link=https%3A%2F%2Fwww.nuget.org%2Fpackages%2FARCtrl)
+![npm](https://img.shields.io/npm/dt/%40nfdi4plants%2Farctrl?label=npm&link=https%3A%2F%2Fwww.npmjs.com%2Fpackage%2F%40nfdi4plants%2Farctrl)
+
 - [ARCtrl](#arctrl)
   - [Jargon/Nomenclature](#jargonnomenclature)
   - [API Design](#api-design)

package/Templates/Template.Json.js

@@ -9,8 +9,9 @@ import { toString as toString_1, datetime, list as list_1, guid, object } from "
 import { ofArray, map } from "../fable_modules/fable-library.4.1.4/List.js";
 import { Process_decoder, Process_encoder } from "../ISA/ISA.Json/Process.js";
 import { map as map_1, delay, toList } from "../fable_modules/fable-library.4.1.4/Seq.js";
-import { ArcTables_fromProcesses_134EBDED, ArcTables__get_Item_Z524259A4 } from "../ISA/ISA/ArcTypes/ArcTables.js";
+import { ArcTables } from "../ISA/ISA/ArcTypes/ArcTables.js";
 import { printf, toFail } from "../fable_modules/fable-library.4.1.4/String.js";
+import { FSharpMap__get_Values } from "../fable_modules/fable-library.4.1.4/Map.js";
 import { defaultArg } from "../fable_modules/fable-library.4.1.4/Option.js";
 
 export const Organisation_encode = toString;
@@ -36,7 +37,10 @@ export const Template_decode = (() => {
     const oaDecoder = OntologyAnnotation_decoder(ConverterOptions_$ctor());
     return (path_10) => ((v) => object_1((get$) => {
         let objectArg, arg_3, d, decoder, objectArg_1, objectArg_2, objectArg_3, objectArg_4, objectArg_5, objectArg_6, objectArg_7, objectArg_8, objectArg_9;
-        return Template.create((objectArg = get$.Required, objectArg.Field("id", guid_1)), (arg_3 = ((d = ((decoder = Process_decoder(ConverterOptions_$ctor()), (path_1) => ((value_1) => list_2(uncurry2(decoder), path_1, value_1)))), (path_2) => ((value_2) => map_2((ps) => ArcTables__get_Item_Z524259A4(ArcTables_fromProcesses_134EBDED(ps), 0), uncurry2(d), path_2, value_2)))), (objectArg_1 = get$.Required, objectArg_1.Field("table", uncurry2(arg_3)))), (objectArg_2 = get$.Required, objectArg_2.Field("name", string)), (objectArg_3 = get$.Required, objectArg_3.Field("description", string)), (objectArg_4 = get$.Required, objectArg_4.Field("organisation", uncurry2(Organisation_decode))), (objectArg_5 = get$.Required, objectArg_5.Field("version", string)), (objectArg_6 = get$.Required, objectArg_6.Field("authors", (path_6, value_6) => array_1(uncurry2(personDecoder), path_6, value_6))), (objectArg_7 = get$.Required, objectArg_7.Field("endpoint_repositories", (path_7, value_7) => array_1(uncurry2(oaDecoder), path_7, value_7))), (objectArg_8 = get$.Required, objectArg_8.Field("tags", (path_8, value_8) => array_1(uncurry2(oaDecoder), path_8, value_8))), (objectArg_9 = get$.Required, objectArg_9.Field("last_updated", datetimeUtc)));
+        return Template.create((objectArg = get$.Required, objectArg.Field("id", guid_1)), (arg_3 = ((d = ((decoder = Process_decoder(ConverterOptions_$ctor()), (path_1) => ((value_1) => list_2(uncurry2(decoder), path_1, value_1)))), (path_2) => ((value_2) => map_2((ps) => {
+            const arctbls = ArcTables.fromProcesses(ps);
+            return arctbls.Tables[0];
+        }, uncurry2(d), path_2, value_2)))), (objectArg_1 = get$.Required, objectArg_1.Field("table", uncurry2(arg_3)))), (objectArg_2 = get$.Required, objectArg_2.Field("name", string)), (objectArg_3 = get$.Required, objectArg_3.Field("description", string)), (objectArg_4 = get$.Required, objectArg_4.Field("organisation", uncurry2(Organisation_decode))), (objectArg_5 = get$.Required, objectArg_5.Field("version", string)), (objectArg_6 = get$.Required, objectArg_6.Field("authors", (path_6, value_6) => array_1(uncurry2(personDecoder), path_6, value_6))), (objectArg_7 = get$.Required, objectArg_7.Field("endpoint_repositories", (path_7, value_7) => array_1(uncurry2(oaDecoder), path_7, value_7))), (objectArg_8 = get$.Required, objectArg_8.Field("tags", (path_8, value_8) => array_1(uncurry2(oaDecoder), path_8, value_8))), (objectArg_9 = get$.Required, objectArg_9.Field("last_updated", datetimeUtc)));
     }, path_10, v));
 })();
 
@@ -69,7 +73,7 @@ export function Templates_fromJsonString(jsonString) {
         return toFail(printf("Error. Given json string cannot be parsed to Templates map: %A"))(matchValue.fields[0]);
     }
     else {
-        return matchValue.fields[0];
+        return Array.from(FSharpMap__get_Values(matchValue.fields[0]));
     }
 }
 

package/Templates/Template.Spreadsheet.js

@@ -1,7 +1,7 @@
+import { toString, Record, FSharpException } from "../fable_modules/fable-library.4.1.4/Types.js";
+import { record_type, list_type, string_type, class_type } from "../fable_modules/fable-library.4.1.4/Reflection.js";
 import { toArray as toArray_1, append as append_1, reverse, map, empty, ofArray } from "../fable_modules/fable-library.4.1.4/List.js";
 import { toRows, fromRows, toSparseTable, fromSparseTable } from "../ISA/ISA.Spreadsheet/Metadata/OntologyAnnotation.js";
-import { toString, Record } from "../fable_modules/fable-library.4.1.4/Types.js";
-import { record_type, list_type, string_type } from "../fable_modules/fable-library.4.1.4/Reflection.js";
 import { Comment$_$reflection } from "../ISA/ISA/JsonTypes/Comment.js";
 import { Comment_fromString } from "../ISA/ISA.Spreadsheet/Metadata/Comment.js";
 import { SparseRowModule_fromFsRow, SparseRowModule_writeToSheet, SparseRowModule_fromValues, SparseRowModule_tryGetValueAt, SparseTable_ToRows_6A3D4534, SparseTable_FromRows_Z5579EC29, SparseTable, SparseTable_Create_Z2192E64B, SparseTable__TryGetValueDefault_5BAE6133 } from "../ISA/ISA.Spreadsheet/Metadata/SparseTable.js";
@@ -15,11 +15,21 @@ import { toArray } from "../fable_modules/fable-library.4.1.4/Option.js";
 import { toRows as toRows_1, fromRows as fromRows_1 } from "../ISA/ISA.Spreadsheet/Metadata/Contacts.js";
 import { parse } from "../fable_modules/fable-library.4.1.4/Guid.js";
 import { Template, Organisation } from "./Template.js";
-import { FsWorksheet } from "../fable_modules/FsSpreadsheet.4.1.0/FsWorksheet.fs.js";
-import { printf, toFail } from "../fable_modules/fable-library.4.1.4/String.js";
+import { FsWorksheet } from "../fable_modules/FsSpreadsheet.5.0.0/FsWorksheet.fs.js";
 import { toFsWorksheet, tryFromFsWorksheet } from "../ISA/ISA.Spreadsheet/AnnotationTable/ArcTable.js";
 import { now } from "../fable_modules/fable-library.4.1.4/Date.js";
-import { FsWorkbook } from "../fable_modules/FsSpreadsheet.4.1.0/FsWorkbook.fs.js";
+import { FsWorkbook } from "../fable_modules/FsSpreadsheet.5.0.0/FsWorkbook.fs.js";
+
+export class TemplateReadError extends FSharpException {
+    constructor(Data0) {
+        super();
+        this.Data0 = Data0;
+    }
+}
+
+export function TemplateReadError_$reflection() {
+    return class_type("ARCtrl.Template.Spreadsheet.TemplateReadError", void 0, TemplateReadError, class_type("System.Exception"));
+}
 
 export const Metadata_ER_labels = ofArray(["ER", "ER Term Accession Number", "ER Term Source REF"]);
 
@@ -275,7 +285,7 @@ export function Template_fromMetadataSheet(sheet) {
  * Reads an assay from a spreadsheet
  */
 export function Template_fromFsWorkbook(doc) {
-    let matchValue_2, matchValue_4, ws_3, matchValue_5, arg_1, ws_2, matchValue_3, arg;
+    let matchValue_2, matchValue_4, ws_3, matchValue_5, ws_2, matchValue_3;
     let patternInput;
     const matchValue = doc.TryGetWorksheetByName("isa_template");
     if (matchValue == null) {
@@ -301,7 +311,13 @@ export function Template_fromFsWorkbook(doc) {
         else {
             return void 0;
         }
-    }, sheets), (matchValue_4 == null) ? toFail(printf("No worksheet with name %s found"))(templateInfo.Table) : ((ws_3 = matchValue_4, (matchValue_5 = tryFromFsWorksheet(ws_3), (matchValue_5 == null) ? ((arg_1 = ws_3.Name, toFail(printf("Ws with name %s could not be converted to a table"))(arg_1))) : matchValue_5))))) : ((ws_2 = matchValue_2, (matchValue_3 = tryFromFsWorksheet(ws_2), (matchValue_3 == null) ? ((arg = ws_2.Name, toFail(printf("Ws with name %s could not be converted to a table"))(arg))) : matchValue_3)))), now());
+    }, sheets), (matchValue_4 == null) ? (() => {
+        throw new TemplateReadError(`No worksheet or table with name \`${templateInfo.Table}\` found`);
+    })() : ((ws_3 = matchValue_4, (matchValue_5 = tryFromFsWorksheet(ws_3), (matchValue_5 == null) ? (() => {
+        throw new TemplateReadError(`Ws with name \`${ws_3.Name}\` could not be converted to a table`);
+    })() : matchValue_5))))) : ((ws_2 = matchValue_2, (matchValue_3 = tryFromFsWorksheet(ws_2), (matchValue_3 == null) ? (() => {
+        throw new TemplateReadError(`Ws with name \`${ws_2.Name}\` could not be converted to a table`);
+    })() : matchValue_3)))), now());
 }
 
 export function Template_toFsWorkbook(template) {

package/Templates/Template.Web.js

@@ -17,7 +17,7 @@ export class JsWeb {
     constructor() {
     }
     static getTemplates(url) {
-        return startAsPromise(singleton.Delay(() => singleton.Bind(getTemplates(url), (_arg) => singleton.Return(new Map(_arg)))));
+        return startAsPromise(singleton.Delay(() => singleton.Bind(getTemplates(url), (_arg) => singleton.Return(_arg))));
     }
 }
 

package/Templates/Templates.js

@@ -0,0 +1,82 @@
+import { defaultArg } from "../fable_modules/fable-library.4.1.4/Option.js";
+import { append, addRangeInPlace, collect, contains as contains_1 } from "../fable_modules/fable-library.4.1.4/Array.js";
+import { uncurry2, safeHash, equals } from "../fable_modules/fable-library.4.1.4/Util.js";
+import { Array_distinct } from "../fable_modules/fable-library.4.1.4/Seq2.js";
+import { class_type } from "../fable_modules/fable-library.4.1.4/Reflection.js";
+
+export function TemplatesAux_getComparer(matchAll) {
+    if (defaultArg(matchAll, false)) {
+        return (e) => ((e_1) => (e && e_1));
+    }
+    else {
+        return (e_2) => ((e_3) => (e_2 || e_3));
+    }
+}
+
+export function TemplatesAux_filterOnTags(tagGetter, queryTags, comparer, templates) {
+    return templates.filter((t) => {
+        const templateTags = tagGetter(t);
+        let isValid = void 0;
+        for (let idx = 0; idx <= (queryTags.length - 1); idx++) {
+            const contains = contains_1(queryTags[idx], templateTags, {
+                Equals: equals,
+                GetHashCode: safeHash,
+            });
+            const isValid_1 = isValid;
+            if (isValid_1 != null) {
+                const maybe = isValid_1;
+                isValid = comparer(maybe, contains);
+            }
+            else {
+                isValid = contains;
+            }
+        }
+        return defaultArg(isValid, false);
+    });
+}
+
+export class Templates {
+    constructor() {
+    }
+    static getDistinctTags(templates) {
+        return Array_distinct(collect((t) => t.Tags, templates), {
+            Equals: equals,
+            GetHashCode: safeHash,
+        });
+    }
+    static getDistinctEndpointRepositories(templates) {
+        return Array_distinct(collect((t) => t.EndpointRepositories, templates), {
+            Equals: equals,
+            GetHashCode: safeHash,
+        });
+    }
+    static getDistinctOntologyAnnotations(templates) {
+        const oas = [];
+        for (let idx = 0; idx <= (templates.length - 1); idx++) {
+            const t = templates[idx];
+            addRangeInPlace(t.Tags, oas);
+            addRangeInPlace(t.EndpointRepositories, oas);
+        }
+        return Array_distinct(Array.from(oas), {
+            Equals: equals,
+            GetHashCode: safeHash,
+        });
+    }
+    static filterByTags(queryTags, matchAll) {
+        return (templates) => TemplatesAux_filterOnTags((t) => t.Tags, queryTags, uncurry2(TemplatesAux_getComparer(matchAll)), templates);
+    }
+    static filterByEndpointRepositories(queryTags, matchAll) {
+        return (templates) => TemplatesAux_filterOnTags((t) => t.EndpointRepositories, queryTags, uncurry2(TemplatesAux_getComparer(matchAll)), templates);
+    }
+    static filterByOntologyAnnotation(queryTags, matchAll) {
+        return (templates) => TemplatesAux_filterOnTags((t) => append(t.Tags, t.EndpointRepositories), queryTags, uncurry2(TemplatesAux_getComparer(matchAll)), templates);
+    }
+    static filterByDataPLANT(templates) {
+        return templates.filter((t) => t.Organisation.IsOfficial());
+    }
+}
+
+export function Templates_$reflection() {
+    return class_type("ARCtrl.Template.Templates", void 0, Templates);
+}
+

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
+
+