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

package/fable_modules/Fable.Promise.2.2.2/Promise.fs

@@ -0,0 +1,176 @@
+
+[<RequireQualifiedAccess>]
+module Promise
+
+#nowarn "1182" // Unused values
+
+open System
+open Fable.Core
+open Fable.Core.JsInterop
+
+let inline private (!!) (x:obj): 'T = unbox x
+
+[<Emit("new Promise($0)")>]
+/// The promise function receives two other function parameters: success and fail
+let create (f: ('T->unit)->(Exception->unit)->unit): JS.Promise<'T> = jsNative
+
+[<Emit("new Promise(resolve => setTimeout(resolve, $0))")>]
+let sleep (ms: int): JS.Promise<unit> = jsNative
+
+[<Emit("Promise.resolve($0)")>]
+let lift<'T> (a: 'T): JS.Promise<'T> = jsNative
+
+/// Creates promise (in rejected state) with supplied reason.
+let reject<'T> reason : JS.Promise<'T> = JS.Constructors.Promise.reject<'T> reason
+
+[<Emit("$1.then($0)")>]
+let bind (a: 'T->JS.Promise<'R>) (pr: JS.Promise<'T>): JS.Promise<'R> = jsNative
+
+[<Emit("$1.then($0)")>]
+let map (a: 'T->'R) (pr: JS.Promise<'T>): JS.Promise<'R> = jsNative
+
+[<Emit("$1.then($0)")>]
+let iter (a: 'T->unit) (pr: JS.Promise<'T>): unit = jsNative
+
+[<Emit("$1.then(void 0, $0)")>]
+/// This version of `catch` fakes a function returning just 'T, as opposed to `Promise<'T>`. If you need to return `Promise<'T>`, use `catchBind`.
+let catch (fail: Exception->'T) (pr: JS.Promise<'T>): JS.Promise<'T> = jsNative
+
+[<Emit("$1.then(void 0, $0)")>]
+/// This is a version of `catch` that fakes a function returning Promise<'T> as opposed to just 'T. If you need to return just 'T, use `catch`.
+let catchBind (fail: Exception->JS.Promise<'T>) (pr: JS.Promise<'T>): JS.Promise<'T> = jsNative
+
+[<Emit("$1.then(void 0, $0)")>]
+/// Used to catch errors at the end of a promise chain.
+let catchEnd (fail: Exception->unit) (pr: JS.Promise<'T>): unit = jsNative
+
+[<Emit("$2.then($0,$1)")>]
+/// A combination of `map/bind` and `catch/catchBind`, this function applies the `success` continuation when the input promise resolves successfully, or `fail` continuation when the input promise fails. Both continuations may return either naked value `'R` or another promise `Promise<'R>`. Use the erased-cast operator `!^` to cast values when returning, for example:
+/// ```
+/// somePromise |> Promise.either (fun x -> !^(string x)) (fun err -> ^!(Promise.lift err.Message))
+/// ```
+let either (success: 'T->U2<'R, JS.Promise<'R>>) (fail: 'E->U2<'R, JS.Promise<'R>>) (pr: JS.Promise<'T>): JS.Promise<'R> = jsNative
+
+[<Emit("$2.then($0,$1)")>]
+let eitherEnd (success: 'T->unit) (fail: 'E->unit) (pr: JS.Promise<'T>): unit = jsNative
+
+[<Emit("$0.then()")>]
+let start (pr: JS.Promise<'T>): unit = jsNative
+
+[<Emit("$1.then(void 0, $0)")>]
+let tryStart (fail: Exception->unit) (pr: JS.Promise<'T>): unit = jsNative
+
+[<Emit("Promise.all($0)")>]
+let Parallel (pr: seq<JS.Promise<'T>>): JS.Promise<'T[]> = jsNative
+
+[<Emit("Promise.all($0)")>]
+let all (pr: seq<JS.Promise<'T>>): JS.Promise<'T[]> = jsNative
+
+let result (a: JS.Promise<'A>): JS.Promise<Result<'A, 'E>> =
+    either (U2.Case1 << Ok) (U2.Case1 << Error) a
+
+let mapResult (fn: 'A -> 'B) (a: JS.Promise<Result<'A, 'E>>): JS.Promise<Result<'B, 'E>> =
+    a |> map (Result.map fn)
+
+let bindResult (fn: 'A -> JS.Promise<'B>) (a: JS.Promise<Result<'A, 'E>>): JS.Promise<Result<'B, 'E>> =
+    a |> bind (fun a ->
+        match a with
+        | Ok a ->
+            result (fn a)
+        | Error e ->
+            lift (Error e))
+
+let mapResultError (fn: 'B -> 'C) (a: JS.Promise<Result<'A,'B>>): JS.Promise<Result<'A,'C>> =
+    a |> map (Result.mapError fn)
+
+let tap (fn: 'A -> unit) (a: JS.Promise<'A>): JS.Promise<'A> =
+    a |> map (fun x -> fn x; x)
+
+type PromiseBuilder() =
+    [<Emit("$1.then($2)")>]
+    member x.Bind(p: JS.Promise<'T>, f: 'T->JS.Promise<'R>): JS.Promise<'R> = jsNative
+
+    [<Emit("$1.then(() => $2)")>]
+    member x.Combine(p1: JS.Promise<unit>, p2: JS.Promise<'T>): JS.Promise<'T> = jsNative
+
+    member x.For(seq: seq<'T>, body: 'T->JS.Promise<unit>): JS.Promise<unit> =
+        // (lift (), seq)
+        // ||> Seq.fold (fun p a ->
+        //     bind (fun () -> body a) p)
+        let mutable p = lift ()
+        for a in seq do
+            p <- !!p?``then``(fun () -> body a)
+        p
+
+    [<Emit("$1.then($2)")>]
+    member x.For(p: JS.Promise<'T>, f: 'T->JS.Promise<'R>): JS.Promise<'R> = jsNative
+
+    member x.While(guard, p): JS.Promise<unit> =
+        if guard()
+        then bind (fun () -> x.While(guard, p)) p
+        else lift()
+
+    [<Emit("Promise.resolve($1)")>]
+    member x.Return(a: 'T): JS.Promise<'T> = jsNative
+
+    [<Emit("$1")>]
+    member x.ReturnFrom(p: JS.Promise<'T>): JS.Promise<'T> = jsNative
+
+    [<Emit("Promise.resolve()")>]
+    member x.Zero(): JS.Promise<unit> = jsNative
+
+    member x.TryFinally(p: JS.Promise<'T>, compensation: unit->unit): JS.Promise<'T> =
+        either (fun (x: 'T) -> compensation(); U2.Case1 x) (fun er -> compensation(); raise !!er) p
+
+    [<Emit("$1.catch($2)")>]
+    member x.TryWith(p: JS.Promise<'T>, catchHandler: Exception->JS.Promise<'T>): JS.Promise<'T> = jsNative
+
+    member x.Delay(generator: unit->JS.Promise<'T>): JS.Promise<'T> =
+        !!createObj[
+            "then" ==> fun f1 f2 ->
+                try generator()?``then``(f1,f2)
+                with er ->
+                    if box f2 = null
+                    then !!JS.Constructors.Promise.reject(er)
+                    else
+                        try !!JS.Constructors.Promise.resolve(f2(er))
+                        with er -> !!JS.Constructors.Promise.reject(er)
+            "catch" ==> fun f ->
+                try generator()?catch(f)
+                with er ->
+                    try !!JS.Constructors.Promise.resolve(f(er))
+                    with er -> !!JS.Constructors.Promise.reject(er)
+        ]
+
+    member x.Run(p:JS.Promise<'T>): JS.Promise<'T> =
+        create (fun success fail ->
+            try
+                let p : JS.Promise<'T> = !!JS.Constructors.Promise.resolve(p)
+                p?``then``(success, fail)
+            with
+              er -> fail(er)
+        )
+
+    member x.Using<'T, 'R when 'T :> IDisposable>(resource: 'T, binder: 'T->JS.Promise<'R>): JS.Promise<'R> =
+        x.TryFinally(binder(resource), fun () -> resource.Dispose())
+
+    [<Emit("Promise.all([$1, $2])")>]
+    member x.MergeSources(a: JS.Promise<'T1>, b: JS.Promise<'T2>): JS.Promise<'T1 * 'T2>= jsNative
+    
+    [<Emit("Promise.all([$1, $2, $3])")>]
+    member x.MergeSources3(a: JS.Promise<'T1>, b: JS.Promise<'T2>, c: JS.Promise<'T3>): JS.Promise<'T1 * 'T2 * 'T3>= jsNative
+
+    [<Emit("Promise.all([$1, $2, $3, $4])")>]
+    member x.MergeSources4(a: JS.Promise<'T1>, b: JS.Promise<'T2>, c: JS.Promise<'T3>, d: JS.Promise<'T4>): JS.Promise<'T1 * 'T2 * 'T3 * 'T4>= jsNative
+    
+    [<Emit("Promise.all([$1, $2, $3, $4, $5])")>]
+    member x.MergeSources5(a: JS.Promise<'T1>, b: JS.Promise<'T2>, c: JS.Promise<'T3>, d: JS.Promise<'T4>, e: JS.Promise<'T5>): JS.Promise<'T1 * 'T2 * 'T3 * 'T4 * 'T5>= jsNative
+    
+    [<Emit("Promise.all([$1, $2, $3, $4, $5, $6])")>]
+    member x.MergeSources6(a: JS.Promise<'T1>, b: JS.Promise<'T2>, c: JS.Promise<'T3>, d: JS.Promise<'T4>, e: JS.Promise<'T5>, f: JS.Promise<'T6>): JS.Promise<'T1 * 'T2 * 'T3 * 'T4 * 'T5 * 'T6>= jsNative
+    
+//    member x.BindReturn(y: JS.Promise<'T1>, f) = map f y
+    
+    [<Emit("Promise.all([$1,$2]).then(([a,b]) => $3(a,b))")>]
+    [<CustomOperation("andFor", IsLikeZip=true)>]
+    member x.Merge(a: JS.Promise<'T1>, b: JS.Promise<'T2>, [<ProjectionParameter>] resultSelector : 'T1 -> 'T2 -> 'R): JS.Promise<'R> = jsNative

package/fable_modules/Fable.Promise.2.2.2/Promise.fs.js

@@ -0,0 +1,143 @@
+import { Result_MapError, Result_Map, FSharpResult$2 } from "../fable-library.4.4.1/Choice.js";
+import { class_type } from "../fable-library.4.4.1/Reflection.js";
+import { defaultOf, equals, disposeSafe, getEnumerator } from "../fable-library.4.4.1/Util.js";
+
+/**
+ * Creates promise (in rejected state) with supplied reason.
+ */
+export function reject(reason) {
+    return Promise.reject(reason);
+}
+
+export function result(a) {
+    return a.then(((arg) => (new FSharpResult$2(0, [arg]))),((arg_1) => (new FSharpResult$2(1, [arg_1]))));
+}
+
+export function mapResult(fn, a) {
+    return a.then((result_1) => Result_Map(fn, result_1));
+}
+
+export function bindResult(fn, a) {
+    return a.then((a_1) => {
+        if (a_1.tag === 1) {
+            return Promise.resolve(new FSharpResult$2(1, [a_1.fields[0]]));
+        }
+        else {
+            return result(fn(a_1.fields[0]));
+        }
+    });
+}
+
+export function mapResultError(fn, a) {
+    return a.then((result_1) => Result_MapError(fn, result_1));
+}
+
+export function tap(fn, a) {
+    return a.then((x) => {
+        fn(x);
+        return x;
+    });
+}
+
+export class PromiseBuilder {
+    constructor() {
+    }
+}
+
+export function PromiseBuilder_$reflection() {
+    return class_type("Promise.PromiseBuilder", void 0, PromiseBuilder);
+}
+
+export function PromiseBuilder_$ctor() {
+    return new PromiseBuilder();
+}
+
+export function PromiseBuilder__For_1565554B(x, seq, body) {
+    let p = Promise.resolve(void 0);
+    const enumerator = getEnumerator(seq);
+    try {
+        while (enumerator["System.Collections.IEnumerator.MoveNext"]()) {
+            const a = enumerator["System.Collections.Generic.IEnumerator`1.get_Current"]();
+            p = (p.then(() => body(a)));
+        }
+    }
+    finally {
+        disposeSafe(enumerator);
+    }
+    return p;
+}
+
+export function PromiseBuilder__While_2044D34(x, guard, p) {
+    if (guard()) {
+        return p.then(() => PromiseBuilder__While_2044D34(x, guard, p));
+    }
+    else {
+        return Promise.resolve(void 0);
+    }
+}
+
+export function PromiseBuilder__TryFinally_7D49A2FD(x, p, compensation) {
+    return p.then(((x_1) => {
+        compensation();
+        return x_1;
+    }),((er) => {
+        compensation();
+        throw er;
+    }));
+}
+
+export function PromiseBuilder__Delay_62FBFDE1(x, generator) {
+    return {
+        then: (f1, f2) => {
+            try {
+                return generator().then(f1, f2);
+            }
+            catch (er) {
+                if (equals(f2, defaultOf())) {
+                    return Promise.reject(er);
+                }
+                else {
+                    try {
+                        return Promise.resolve(f2(er));
+                    }
+                    catch (er_1) {
+                        return Promise.reject(er_1);
+                    }
+                }
+            }
+        },
+        catch: (f) => {
+            try {
+                return generator().catch(f);
+            }
+            catch (er_2) {
+                try {
+                    return Promise.resolve(f(er_2));
+                }
+                catch (er_3) {
+                    return Promise.reject(er_3);
+                }
+            }
+        },
+    };
+}
+
+export function PromiseBuilder__Run_212F1D4B(x, p) {
+    return new Promise((success, fail) => {
+        try {
+            const p_1 = Promise.resolve(p);
+            p_1.then(success, fail);
+        }
+        catch (er) {
+            fail(er);
+        }
+    });
+}
+
+export function PromiseBuilder__Using_74F7E79D(x, resource, binder) {
+    return PromiseBuilder__TryFinally_7D49A2FD(x, binder(resource), () => {
+        let copyOfStruct = resource;
+        disposeSafe(copyOfStruct);
+    });
+}
+

package/fable_modules/Fable.Promise.2.2.2/PromiseImpl.fs

@@ -0,0 +1,4 @@
+[<AutoOpen>]
+module PromiseImpl
+
+let promise = Promise.PromiseBuilder()

package/fable_modules/Fable.Promise.2.2.2/PromiseImpl.fs.js

@@ -0,0 +1,4 @@
+import { PromiseBuilder_$ctor } from "./Promise.fs.js";
+
+export const promise = PromiseBuilder_$ctor();
+

package/fable_modules/Fable.SimpleHttp.3.5.0/Http.fs.js

@@ -1,12 +1,12 @@
-import { fromContinuations } from "../fable-library.4.1.4/Async.js";
+import { fromContinuations } from "../fable-library.4.4.1/Async.js";
 import { HttpResponse, ResponseContent, HttpRequest, BodyContent, HttpMethod, Header } from "./Types.fs.js";
-import { tail, head, isEmpty, ofArray as ofArray_1, singleton, append, empty } from "../fable-library.4.1.4/List.js";
-import { ofArray, empty as empty_1 } from "../fable-library.4.1.4/Map.js";
-import { disposeSafe, getEnumerator, comparePrimitives } from "../fable-library.4.1.4/Util.js";
-import { join, split, isNullOrEmpty } from "../fable-library.4.1.4/String.js";
-import { choose } from "../fable-library.4.1.4/Array.js";
-import { some } from "../fable-library.4.1.4/Option.js";
-import { singleton as singleton_1 } from "../fable-library.4.1.4/AsyncBuilder.js";
+import { tail, head, isEmpty, ofArray as ofArray_1, singleton, append, empty } from "../fable-library.4.4.1/List.js";
+import { ofArray, empty as empty_1 } from "../fable-library.4.4.1/Map.js";
+import { disposeSafe, getEnumerator, comparePrimitives } from "../fable-library.4.4.1/Util.js";
+import { join, split, isNullOrEmpty } from "../fable-library.4.4.1/String.js";
+import { choose } from "../fable-library.4.4.1/Array.js";
+import { some } from "../fable-library.4.4.1/Option.js";
+import { singleton as singleton_1 } from "../fable-library.4.4.1/AsyncBuilder.js";
 
 /**
  * Download a Blob

package/fable_modules/Fable.SimpleHttp.3.5.0/Types.fs.js

@@ -1,5 +1,5 @@
-import { Record, Union } from "../fable-library.4.1.4/Types.js";
-import { obj_type, record_type, int32_type, option_type, bool_type, list_type, class_type, string_type, union_type } from "../fable-library.4.1.4/Reflection.js";
+import { Record, Union } from "../fable-library.4.4.1/Types.js";
+import { obj_type, record_type, int32_type, option_type, bool_type, list_type, class_type, string_type, union_type } from "../fable-library.4.4.1/Reflection.js";
 
 export class HttpMethod extends Union {
     constructor(tag, fields) {

package/fable_modules/{FsSpreadsheet.4.1.0 → FsSpreadsheet.5.0.1}/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
+
+