@nfdi4plants/arctrl 2.0.0-alpha.3 → 2.0.0-alpha.4

package/Xlsx.js

@@ -1,18 +1,38 @@
-import { toFsWorkbook, fromFsWorkbook } from "./Spreadsheet/ArcAssay.js";
+import { toFsWorkbook, fromFsWorkbook } from "./Spreadsheet/DataMap.js";
 import { class_type } from "./fable_modules/fable-library-js.4.16.0/Reflection.js";
+import { toFsWorkbook as toFsWorkbook_1, fromFsWorkbook as fromFsWorkbook_1 } from "./Spreadsheet/ArcAssay.js";
 import { ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_353D0DB7, ARCtrl_ArcStudy__ArcStudy_fromFsWorkbook_Static_32154C9D } from "./Spreadsheet/ArcStudy.js";
 import { map, unwrap } from "./fable_modules/fable-library-js.4.16.0/Option.js";
 import { ofSeq } from "./fable_modules/fable-library-js.4.16.0/List.js";
-import { toLightFsWorkbook, toFsWorkbook as toFsWorkbook_1, fromFsWorkbook as fromFsWorkbook_1 } from "./Spreadsheet/ArcInvestigation.js";
+import { toLightFsWorkbook, toFsWorkbook as toFsWorkbook_2, fromFsWorkbook as fromFsWorkbook_2 } from "./Spreadsheet/ArcInvestigation.js";
 
-export class XlsxHelper_AssayXlsx {
+export class XlsxHelper_DatamapXlsx {
     constructor() {
     }
     fromFsWorkbook(fswb) {
         return fromFsWorkbook(fswb);
     }
+    toFsWorkbook(datamap) {
+        return toFsWorkbook(datamap);
+    }
+}
+
+export function XlsxHelper_DatamapXlsx_$reflection() {
+    return class_type("ARCtrl.XlsxHelper.DatamapXlsx", void 0, XlsxHelper_DatamapXlsx);
+}
+
+export function XlsxHelper_DatamapXlsx_$ctor() {
+    return new XlsxHelper_DatamapXlsx();
+}
+
+export class XlsxHelper_AssayXlsx {
+    constructor() {
+    }
+    fromFsWorkbook(fswb) {
+        return fromFsWorkbook_1(fswb);
+    }
     toFsWorkbook(assay) {
-        return toFsWorkbook(assay);
+        return toFsWorkbook_1(assay);
     }
 }
 
@@ -47,10 +67,10 @@ export class XlsxHelper_InvestigationXlsx {
     constructor() {
     }
     fromFsWorkbook(fswb) {
-        return fromFsWorkbook_1(fswb);
+        return fromFsWorkbook_2(fswb);
     }
     toFsWorkbook(investigation) {
-        return toFsWorkbook_1(investigation);
+        return toFsWorkbook_2(investigation);
     }
     toLightFsWorkbook(investigation) {
         return toLightFsWorkbook(investigation);
@@ -68,6 +88,9 @@ export function XlsxHelper_InvestigationXlsx_$ctor() {
 export class XlsxController {
     constructor() {
     }
+    static get Datamap() {
+        return new XlsxHelper_DatamapXlsx();
+    }
     static get Assay() {
         return new XlsxHelper_AssayXlsx();
     }

package/fable_modules/{FsSpreadsheet.5.1.3 → FsSpreadsheet.6.1.2}/FsSpreadsheet.fableproj

@@ -33,6 +33,12 @@
     <Compile Include="DSL\SheetBuilder.fs" />
     <Compile Include="DSL\WorkbookBuilder.fs" />
     <Compile Include="DSL\DSL.fs" />
+    <Compile Include="Json\Value.fs" />
+    <Compile Include="Json\Cell.fs" />
+    <Compile Include="Json\Row.fs" />
+    <Compile Include="Json\Table.fs" />
+    <Compile Include="Json\Worksheet.fs" />
+    <Compile Include="Json\Workbook.fs" />
     <None Include="..\..\docs\img\logo.png" Pack="true" PackagePath="\" />
   </ItemGroup>
 
@@ -48,11 +54,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-	<Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
+    <PackageReference Include="Thoth.Json.Core" Version="0.2.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fable.Core" Version="4.0.0" />
+    <Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
   </ItemGroup>
-
+  
 </Project>

package/fable_modules/{FsSpreadsheet.5.1.3 → FsSpreadsheet.6.1.2}/FsWorksheet.fs

@@ -150,6 +150,7 @@ type FsWorksheet (name, ?fsRows, ?fsTables, ?fsCellsCollection) =
     /// <summary>
     /// Returns the FsRow at the given FsRangeAddress. If it does not exist, it is created and appended first.
     /// </summary>
+    /// <param name="rangeAddress">The range address of the FsRow.</param>
     /// <param name="SkipSearch">If true, the FsRow is created and appended without checking if it already exists.</param>
     member self.RowWithRange(rangeAddress : FsRangeAddress, ?SkipSearch) = 
         let skipSearch = defaultArg SkipSearch false

package/fable_modules/FsSpreadsheet.6.1.2/Json/Cell.fs

@@ -0,0 +1,23 @@
+module FsSpreadsheet.Json.Cell
+
+open FsSpreadsheet
+open Thoth.Json.Core
+
+[<Literal>]
+let column = "column"
+
+[<Literal>]
+let value = "value"
+
+let encode (cell:FsCell) =
+    Encode.object [
+        column, Encode.int cell.ColumnNumber
+        value, Value.encode cell.Value
+    ]
+
+let decode rowNumber : Decoder<FsCell> =
+    Decode.object (fun builder ->
+        let v,dt = builder.Required.Field value (Value.decode)
+        let c = builder.Required.Field column Decode.int
+        new FsCell(v,dt,FsAddress(rowNumber,c))
+    )

package/fable_modules/FsSpreadsheet.6.1.2/Json/Cell.fs.js

@@ -0,0 +1,21 @@
+import { Json } from "../../Thoth.Json.Core.0.2.1/Types.fs.js";
+import { decode as decode_1, encode as encode_1 } from "./Value.fs.js";
+import { int, object } from "../../Thoth.Json.Core.0.2.1/Decode.fs.js";
+import { FsCell } from "../Cells/FsCell.fs.js";
+import { FsAddress_$ctor_Z37302880 } from "../FsAddress.fs.js";
+
+export function encode(cell) {
+    let value_1;
+    return new Json(5, [[["column", (value_1 = (cell.ColumnNumber | 0), new Json(7, [value_1 >>> 0]))], ["value", encode_1(cell.Value)]]]);
+}
+
+export function decode(rowNumber) {
+    return object((builder) => {
+        let objectArg_1;
+        let patternInput;
+        const objectArg = builder.Required;
+        patternInput = objectArg.Field("value", decode_1);
+        return new FsCell(patternInput[0], patternInput[1], FsAddress_$ctor_Z37302880(rowNumber, (objectArg_1 = builder.Required, objectArg_1.Field("column", int))));
+    });
+}
+

package/fable_modules/FsSpreadsheet.6.1.2/Json/Row.fs

@@ -0,0 +1,23 @@
+module FsSpreadsheet.Json.Row
+
+open FsSpreadsheet
+open Thoth.Json.Core
+
+[<Literal>]
+let cells = "cells"
+
+[<Literal>]
+let number = "number"
+
+let encode (row:FsRow) =
+    Encode.object [
+        number, Encode.int row.Index
+        cells, Encode.seq (row.Cells |> Seq.map Cell.encode)
+    ]
+
+let decode : Decoder<int*FsCell seq> =
+    Decode.object (fun builder ->
+        let n = builder.Required.Field number Decode.int
+        let cs = builder.Required.Field cells (Decode.seq (Cell.decode n))
+        n,cs
+    )

package/fable_modules/FsSpreadsheet.6.1.2/Json/Row.fs.js

@@ -0,0 +1,19 @@
+import { Json } from "../../Thoth.Json.Core.0.2.1/Types.fs.js";
+import { seq } from "../../Thoth.Json.Core.0.2.1/Encode.fs.js";
+import { map } from "../../fable-library-js.4.16.0/Seq.js";
+import { decode as decode_1, encode as encode_1 } from "./Cell.fs.js";
+import { seq as seq_1, int, object } from "../../Thoth.Json.Core.0.2.1/Decode.fs.js";
+
+export function encode(row) {
+    let value;
+    return new Json(5, [[["number", (value = (row.Index | 0), new Json(7, [value >>> 0]))], ["cells", seq(map(encode_1, row.Cells))]]]);
+}
+
+export const decode = object((builder) => {
+    let arg_3, objectArg_1;
+    let n;
+    const objectArg = builder.Required;
+    n = objectArg.Field("number", int);
+    return [n, (arg_3 = seq_1(decode_1(n)), (objectArg_1 = builder.Required, objectArg_1.Field("cells", arg_3)))];
+});
+

package/fable_modules/FsSpreadsheet.6.1.2/Json/Table.fs

@@ -0,0 +1,24 @@
+module FsSpreadsheet.Json.Table
+
+open FsSpreadsheet
+open Thoth.Json.Core
+
+
+[<Literal>]
+let name = "name"
+
+[<Literal>]
+let range = "range"
+
+let encode (sheet:FsTable) =
+    Encode.object [
+        name, Encode.string sheet.Name
+        range, Encode.string sheet.RangeAddress.Range
+    ]
+
+let decode : Decoder<FsTable> =
+    Decode.object (fun builder ->
+        let n = builder.Required.Field name Decode.string
+        let r = builder.Required.Field range Decode.string
+        FsTable(n, FsRangeAddress(r))
+    )

package/fable_modules/FsSpreadsheet.6.1.2/Json/Table.fs.js

@@ -0,0 +1,15 @@
+import { Json } from "../../Thoth.Json.Core.0.2.1/Types.fs.js";
+import { FsRangeAddress_$ctor_Z721C83C5, FsRangeAddress__get_Range } from "../Ranges/FsRangeAddress.fs.js";
+import { FsRangeBase__get_RangeAddress } from "../Ranges/FsRangeBase.fs.js";
+import { string, object } from "../../Thoth.Json.Core.0.2.1/Decode.fs.js";
+import { FsTable } from "../Tables/FsTable.fs.js";
+
+export function encode(sheet) {
+    return new Json(5, [[["name", new Json(0, [sheet.Name])], ["range", new Json(0, [FsRangeAddress__get_Range(FsRangeBase__get_RangeAddress(sheet))])]]]);
+}
+
+export const decode = object((builder) => {
+    let objectArg, objectArg_1;
+    return new FsTable((objectArg = builder.Required, objectArg.Field("name", string)), FsRangeAddress_$ctor_Z721C83C5((objectArg_1 = builder.Required, objectArg_1.Field("range", string))));
+});
+

package/fable_modules/FsSpreadsheet.6.1.2/Json/Value.fs

@@ -0,0 +1,70 @@
+module FsSpreadsheet.Json.Value
+
+open Thoth.Json.Core
+open FsSpreadsheet
+
+#if FABLE_COMPILER_PYTHON
+module PyTime = 
+
+    open Fable.Core
+    open Fable.Core.PyInterop
+
+    // Currently in Fable, a created datetime object will contain a timezone. This is not allowed in python xlsx, so we need to remove it.
+    // Unfortunately, the timezone object in python is read-only, so we need to create a new datetime object without timezone.
+    // For this, we use the fromtimestamp method of the datetime module and convert the timestamp to a new datetime object without timezone.
+
+    type DateTimeStatic =
+        [<Emit("$0.fromtimestamp(timestamp=$1)")>]
+        abstract member fromTimeStamp: timestamp:float -> System.DateTime
+
+    [<Import("datetime", "datetime")>]
+    let DateTime : DateTimeStatic = nativeOnly
+
+    let toUniversalTimePy (dt:System.DateTime) = 
+        
+        dt.ToUniversalTime()?timestamp()
+        |> DateTime.fromTimeStamp
+#endif
+
+
+
+
+
+module Decode =
+
+    let datetime: Decoder<System.DateTime> =
+        #if FABLE_COMPILER_PYTHON
+        Decode.datetimeLocal |> Decode.map PyTime.toUniversalTimePy
+        #else
+        { new Decoder<System.DateTime> with
+            member _.Decode(helpers, value) =
+                if helpers.isString value then
+                    match System.DateTime.TryParse(helpers.asString value) with
+                    | true, datetime -> datetime |> Ok
+                    | _ -> ("", BadPrimitive("a datetime", value)) |> Error
+                else
+                    ("", BadPrimitive("a datetime", value)) |> Error
+        }
+        #endif
+
+let encode (value : obj) =
+    match value with
+    | :? string as s -> Encode.string s
+    | :? float as f -> Encode.float f
+    | :? int as i -> Encode.int i
+    | :? bool as b -> Encode.bool b
+    | :? System.DateTime as d -> 
+        d.ToString("O", System.Globalization.CultureInfo.InvariantCulture).Split('+').[0]
+        |> Encode.string
+    | _ -> Encode.nil
+
+
+
+let decode =    
+    Decode.oneOf [
+        Decode.bool |> Decode.map (fun b -> b :> obj, DataType.Boolean)
+        Decode.int |> Decode.map (fun i -> i :> obj, DataType.Number)
+        Decode.float |> Decode.map (fun f -> f :> obj, DataType.Number)
+        Decode.datetime |> Decode.map (fun d -> d :> obj, DataType.Date)
+        Decode.string |> Decode.map (fun s -> s :> obj, DataType.String)
+    ]

package/fable_modules/FsSpreadsheet.6.1.2/Json/Value.fs.js

@@ -0,0 +1,48 @@
+import { toString, tryParse, minValue } from "../../fable-library-js.4.16.0/Date.js";
+import { FSharpRef } from "../../fable-library-js.4.16.0/Types.js";
+import { FSharpResult$2 } from "../../fable-library-js.4.16.0/Result.js";
+import { Json, ErrorReason$1 } from "../../Thoth.Json.Core.0.2.1/Types.fs.js";
+import { item } from "../../fable-library-js.4.16.0/Array.js";
+import { string, float, int, bool, map, oneOf } from "../../Thoth.Json.Core.0.2.1/Decode.fs.js";
+import { DataType } from "../Cells/FsCell.fs.js";
+import { ofArray } from "../../fable-library-js.4.16.0/List.js";
+
+export const Decode_datetime = {
+    Decode(helpers, value) {
+        if (helpers.isString(value)) {
+            let matchValue;
+            let outArg = minValue();
+            matchValue = [tryParse(helpers.asString(value), new FSharpRef(() => outArg, (v) => {
+                outArg = v;
+            })), outArg];
+            return matchValue[0] ? (new FSharpResult$2(0, [matchValue[1]])) : (new FSharpResult$2(1, [["", new ErrorReason$1(0, ["a datetime", value])]]));
+        }
+        else {
+            return new FSharpResult$2(1, [["", new ErrorReason$1(0, ["a datetime", value])]]);
+        }
+    },
+};
+
+export function encode(value) {
+    if (typeof value === "string") {
+        return new Json(0, [value]);
+    }
+    else if (typeof value === "number") {
+        return new Json(2, [value]);
+    }
+    else if (typeof value === "number") {
+        return new Json(7, [value >>> 0]);
+    }
+    else if (typeof value === "boolean") {
+        return new Json(4, [value]);
+    }
+    else if (value instanceof Date) {
+        return new Json(0, [item(0, toString(value, "O", {}).split("+"))]);
+    }
+    else {
+        return new Json(3, []);
+    }
+}
+
+export const decode = oneOf(ofArray([map((b) => [b, new DataType(1, [])], bool), map((i) => [i, new DataType(2, [])], int), map((f) => [f, new DataType(2, [])], float), map((d_3) => [d_3, new DataType(3, [])], Decode_datetime), map((s) => [s, new DataType(0, [])], string)]));
+

package/fable_modules/FsSpreadsheet.6.1.2/Json/Workbook.fs

@@ -0,0 +1,20 @@
+module FsSpreadsheet.Json.Workbook
+
+open FsSpreadsheet
+open Thoth.Json.Core
+
+[<Literal>]
+let sheets = "sheets"
+
+let encode (wb:FsWorkbook) =
+    Encode.object [
+        sheets, Encode.seq (wb.GetWorksheets() |> Seq.map Worksheet.encode)
+    ]
+
+let decode : Decoder<FsWorkbook> =
+    Decode.object (fun builder ->
+        let wb = new FsWorkbook()
+        let ws = builder.Required.Field sheets (Decode.seq Worksheet.decode)
+        wb.AddWorksheets(ws)
+        wb
+    )

package/fable_modules/FsSpreadsheet.6.1.2/Json/Workbook.fs.js

@@ -0,0 +1,21 @@
+import { seq } from "../../Thoth.Json.Core.0.2.1/Encode.fs.js";
+import { map } from "../../fable-library-js.4.16.0/Seq.js";
+import { decode as decode_1, encode as encode_1 } from "./Worksheet.fs.js";
+import { Json } from "../../Thoth.Json.Core.0.2.1/Types.fs.js";
+import { seq as seq_1, object } from "../../Thoth.Json.Core.0.2.1/Decode.fs.js";
+import { FsWorkbook } from "../FsWorkbook.fs.js";
+
+export function encode(wb) {
+    return new Json(5, [[["sheets", seq(map(encode_1, wb.GetWorksheets()))]]]);
+}
+
+export const decode = object((builder) => {
+    const wb = new FsWorkbook();
+    let ws;
+    const arg_1 = seq_1(decode_1);
+    const objectArg = builder.Required;
+    ws = objectArg.Field("sheets", arg_1);
+    wb.AddWorksheets(ws);
+    return wb;
+});
+

package/fable_modules/FsSpreadsheet.6.1.2/Json/Worksheet.fs

@@ -0,0 +1,49 @@
+module FsSpreadsheet.Json.Worksheet
+
+open FsSpreadsheet
+open Thoth.Json.Core
+
+[<Literal>]
+let name = "name"
+
+[<Literal>]
+let rows = "rows"
+
+[<Literal>]
+let tables = "tables"
+
+let encode (sheet:FsWorksheet) =
+    sheet.RescanRows()
+    Encode.object [
+        name, Encode.string sheet.Name
+        if Seq.isEmpty sheet.Tables |> not then        
+            tables, Encode.seq (sheet.Tables |> Seq.map Table.encode)
+        rows, Encode.seq (sheet.Rows |> Seq.map Row.encode)
+
+    ]
+
+let decode : Decoder<FsWorksheet> =
+    Decode.object (fun builder ->
+        let n = builder.Required.Field name Decode.string
+        let ts = builder.Optional.Field tables (Decode.seq Table.decode)
+        let rs = builder.Required.Field rows (Decode.seq Row.decode)
+        let sheet = new FsWorksheet(n)
+        rs
+        |> Seq.iter (fun (rowI,cells) -> 
+            let r = sheet.Row(rowI)
+            cells 
+            |> Seq.iter (fun cell ->
+                let c = r[cell.ColumnNumber]
+                c.Value <- cell.Value
+                c.DataType <- cell.DataType
+            )
+        )
+        match ts with
+        | Some ts -> 
+            ts
+            |> Seq.iter (fun t -> 
+                sheet.AddTable(t) |> ignore
+            )
+        | None -> ()
+        sheet
+    )

package/fable_modules/FsSpreadsheet.6.1.2/Json/Worksheet.fs.js

@@ -0,0 +1,44 @@
+import { iterate, empty, map, isEmpty, singleton, append, delay, toList } from "../../fable-library-js.4.16.0/Seq.js";
+import { Json } from "../../Thoth.Json.Core.0.2.1/Types.fs.js";
+import { seq } from "../../Thoth.Json.Core.0.2.1/Encode.fs.js";
+import { decode as decode_1, encode as encode_1 } from "./Table.fs.js";
+import { decode as decode_2, encode as encode_2 } from "./Row.fs.js";
+import { seq as seq_1, string, object } from "../../Thoth.Json.Core.0.2.1/Decode.fs.js";
+import { FsWorksheet } from "../FsWorksheet.fs.js";
+
+export function encode(sheet) {
+    sheet.RescanRows();
+    return new Json(5, [toList(delay(() => append(singleton(["name", new Json(0, [sheet.Name])]), delay(() => append(!isEmpty(sheet.Tables) ? singleton(["tables", seq(map(encode_1, sheet.Tables))]) : empty(), delay(() => singleton(["rows", seq(map(encode_2, sheet.Rows))])))))))]);
+}
+
+export const decode = object((builder) => {
+    let n;
+    const objectArg = builder.Required;
+    n = objectArg.Field("name", string);
+    let ts;
+    const arg_3 = seq_1(decode_1);
+    const objectArg_1 = builder.Optional;
+    ts = objectArg_1.Field("tables", arg_3);
+    let rs;
+    const arg_5 = seq_1(decode_2);
+    const objectArg_2 = builder.Required;
+    rs = objectArg_2.Field("rows", arg_5);
+    const sheet = new FsWorksheet(n);
+    iterate((tupledArg) => {
+        const r = sheet.Row(tupledArg[0]);
+        iterate((cell) => {
+            const c = r.Item(cell.ColumnNumber);
+            c.Value = cell.Value;
+            c.DataType = cell.DataType;
+        }, tupledArg[1]);
+    }, rs);
+    if (ts == null) {
+    }
+    else {
+        iterate((t) => {
+            sheet.AddTable(t);
+        }, ts);
+    }
+    return sheet;
+});
+

package/fable_modules/{FsSpreadsheet.5.1.3 → FsSpreadsheet.6.1.2}/obj/Release/netstandard2.0/FsSpreadsheet.AssemblyInfo.fs

@@ -10,10 +10,10 @@ open System.Reflection
 [<assembly: System.Reflection.AssemblyCompanyAttribute("Heinrich Lukas Weil, Oliver Maus, Kevin Schneider, Kevin Frey, Timo Mühlhaus")>]
 [<assembly: System.Reflection.AssemblyConfigurationAttribute("Release")>]
 [<assembly: System.Reflection.AssemblyDescriptionAttribute("Fable compliant Spreadsheet creation and manipulation in FSharp")>]
-[<assembly: System.Reflection.AssemblyFileVersionAttribute("5.1.3.0")>]
-[<assembly: System.Reflection.AssemblyInformationalVersionAttribute("5.1.3")>]
+[<assembly: System.Reflection.AssemblyFileVersionAttribute("6.1.2.0")>]
+[<assembly: System.Reflection.AssemblyInformationalVersionAttribute("6.1.2")>]
 [<assembly: System.Reflection.AssemblyProductAttribute("FsSpreadsheet")>]
 [<assembly: System.Reflection.AssemblyTitleAttribute("FsSpreadsheet")>]
-[<assembly: System.Reflection.AssemblyVersionAttribute("5.1.3.0")>]
+[<assembly: System.Reflection.AssemblyVersionAttribute("6.1.2.0")>]
 [<assembly: System.Reflection.AssemblyMetadataAttribute("RepositoryUrl", "https://github.com/CSBiology/FsSpreadsheet")>]
 do()