@nfdi4plants/arctrl 2.0.0-beta.1 → 2.0.0-beta.2

package/ARC.js

@@ -22,7 +22,7 @@ import { ARCtrl_ArcStudy__ArcStudy_toFsWorkbook_Static_353D0DB7 } from "./Spread
 import { DataMap__get_StaticHash, DataMap__set_StaticHash_Z524259A4 } from "./Core/Table/DataMap.js";
 import { toFsWorkbook as toFsWorkbook_1 } from "./Spreadsheet/DataMap.js";
 import { toFsWorkbook as toFsWorkbook_2 } from "./Spreadsheet/ArcAssay.js";
-import { Dictionary_tryGet } from "./fable_modules/FsSpreadsheet.6.1.2/Cells/FsCellsCollection.fs.js";
+import { Dictionary_tryGet } from "./fable_modules/FsSpreadsheet.6.2.0/Cells/FsCellsCollection.fs.js";
 import { Clone_createCloneContract_5000466F, Init_createAddRemoteContract_Z721C83C5, gitignoreContract, gitattributesContract, Init_createInitContract_6DFDD678 } from "./Contract/Git.js";
 import { FSharpSet__Contains, ofSeq, unionMany } from "./fable_modules/fable-library-js.4.16.0/Set.js";
 import { ofSeq as ofSeq_1 } from "./fable_modules/fable-library-js.4.16.0/Map.js";

package/Spreadsheet/AnnotationTable/ArcTable.js

@@ -3,13 +3,13 @@ import { item, map as map_1 } from "../../fable_modules/fable-library-js.4.16.0/
 import { singleton as singleton_1, collect, map as map_2, delay, toArray as toArray_1, tryFind } from "../../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { toStringCellColumns, fixDeprecatedIOHeader, fromStringCellColumns } from "./CompositeColumn.js";
 import { printf, toFail } from "../../fable_modules/fable-library-js.4.16.0/String.js";
-import { Dictionary_tryGet, FsCellsCollection__TryGetCell_Z37302880 } from "../../fable_modules/FsSpreadsheet.6.1.2/Cells/FsCellsCollection.fs.js";
+import { Dictionary_tryGet, FsCellsCollection__TryGetCell_Z37302880 } from "../../fable_modules/FsSpreadsheet.6.2.0/Cells/FsCellsCollection.fs.js";
 import { rangeDouble } from "../../fable_modules/fable-library-js.4.16.0/Range.js";
-import { FsAddress_$ctor_Z37302880, FsAddress__get_ColumnNumber, FsAddress__get_RowNumber } from "../../fable_modules/FsSpreadsheet.6.1.2/FsAddress.fs.js";
-import { FsRangeAddress_$ctor_7E77A4A0, FsRangeAddress__get_LastAddress } from "../../fable_modules/FsSpreadsheet.6.1.2/Ranges/FsRangeAddress.fs.js";
-import { FsRangeBase__Cell_Z3407A44B, FsRangeBase__get_RangeAddress } from "../../fable_modules/FsSpreadsheet.6.1.2/Ranges/FsRangeBase.fs.js";
+import { FsAddress_$ctor_Z37302880, FsAddress__get_ColumnNumber, FsAddress__get_RowNumber } from "../../fable_modules/FsSpreadsheet.6.2.0/FsAddress.fs.js";
+import { FsRangeAddress_$ctor_7E77A4A0, FsRangeAddress__get_LastAddress } from "../../fable_modules/FsSpreadsheet.6.2.0/Ranges/FsRangeAddress.fs.js";
+import { FsRangeBase__Cell_Z3407A44B, FsRangeBase__get_RangeAddress } from "../../fable_modules/FsSpreadsheet.6.2.0/Ranges/FsRangeBase.fs.js";
 import { ArcTable } from "../../Core/Table/ArcTable.js";
-import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.6.1.2/FsWorksheet.fs.js";
+import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.6.2.0/FsWorksheet.fs.js";
 import { comparePrimitives } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
 import { addToDict } from "../../fable_modules/fable-library-js.4.16.0/MapUtil.js";
 

package/Spreadsheet/AnnotationTable/CompositeColumn.js

@@ -7,7 +7,7 @@ import { rangeDouble } from "../../fable_modules/fable-library-js.4.16.0/Range.j
 import { CompositeColumn } from "../../Core/Table/CompositeColumn.js";
 import { toStringCells as toStringCells_1 } from "./CompositeCell.js";
 import { map as map_2, singleton as singleton_1, ofArray } from "../../fable_modules/fable-library-js.4.16.0/List.js";
-import { FsCell } from "../../fable_modules/FsSpreadsheet.6.1.2/Cells/FsCell.fs.js";
+import { FsCell } from "../../fable_modules/FsSpreadsheet.6.2.0/Cells/FsCell.fs.js";
 
 /**
  * Checks if the column header is a deprecated IO Header. If so, fixes it.

package/Spreadsheet/ArcAssay.js

@@ -1,4 +1,4 @@
-import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorksheet.fs.js";
+import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorksheet.fs.js";
 import { iterate, isEmpty as isEmpty_1, choose, tryHead, head, exists, map, singleton, append, delay, iterateIndexed } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { SparseRowModule_tryGetValueAt, SparseRowModule_fromFsRow, SparseRowModule_fromValues, SparseRowModule_writeToSheet } from "./Metadata/SparseTable.js";
 import { fromRows as fromRows_1, toRows as toRows_1 } from "./Metadata/Assays.js";
@@ -10,7 +10,7 @@ import { ArcAssay } from "../Core/ArcTypes.js";
 import { createMissingIdentifier } from "../Core/Helper/Identifier.js";
 import { defaultArg } from "../fable_modules/fable-library-js.4.16.0/Option.js";
 import { toFsWorksheet, tryFromFsWorksheet } from "./AnnotationTable/ArcTable.js";
-import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorkbook.fs.js";
+import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorkbook.fs.js";
 
 export function toMetadataSheet(assay) {
     let assay_1;

package/Spreadsheet/ArcInvestigation.js

@@ -17,8 +17,8 @@ import { toRows as toRows_4, fromRows as fromRows_4 } from "./Metadata/Study.js"
 import { iterateIndexed, map as map_1, toList, collect, singleton, append as append_1, delay } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { tryFind, ofList } from "../fable_modules/fable-library-js.4.16.0/Map.js";
 import { printf, toFail } from "../fable_modules/fable-library-js.4.16.0/String.js";
-import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorksheet.fs.js";
-import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorkbook.fs.js";
+import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorksheet.fs.js";
+import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorkbook.fs.js";
 
 export class InvestigationInfo extends Record {
     constructor(Identifier, Title, Description, SubmissionDate, PublicReleaseDate, Comments) {

package/Spreadsheet/ArcStudy.js

@@ -1,4 +1,4 @@
-import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorksheet.fs.js";
+import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorksheet.fs.js";
 import { map, append, iterateIndexed } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { SparseRowModule_fromFsRow, SparseRowModule_fromValues, SparseRowModule_writeToSheet } from "./Metadata/SparseTable.js";
 import { fromRows as fromRows_1, toRows } from "./Metadata/Study.js";
@@ -10,7 +10,7 @@ import { createMissingIdentifier } from "../Core/Helper/Identifier.js";
 import { empty } from "../fable_modules/fable-library-js.4.16.0/List.js";
 import { ResizeArray_iter, ResizeArray_isEmpty, ResizeArray_choose } from "../Core/Helper/Collections.js";
 import { toFsWorksheet, tryFromFsWorksheet } from "./AnnotationTable/ArcTable.js";
-import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorkbook.fs.js";
+import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorkbook.fs.js";
 
 export function ArcStudy_toMetadataSheet(study, assays) {
     let source_1;

package/Spreadsheet/DataMap.js

@@ -1,7 +1,7 @@
 import { printf, toFail } from "../fable_modules/fable-library-js.4.16.0/String.js";
 import { tryPick } from "../fable_modules/fable-library-js.4.16.0/Seq.js";
 import { toFsWorksheet, tryFromFsWorksheet } from "./DataMapTable/DataMapTable.js";
-import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorkbook.fs.js";
+import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorkbook.fs.js";
 
 /**
  * Reads an assay from a spreadsheet

package/Spreadsheet/DataMapTable/DataMapColumn.js

@@ -4,7 +4,7 @@ import { tryFind, singleton as singleton_1, append, delay, map as map_1, collect
 import { distinct } from "../../fable_modules/fable-library-js.4.16.0/Seq2.js";
 import { bind, defaultArg } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
 import { stringHash } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
-import { FsCell } from "../../fable_modules/FsSpreadsheet.6.1.2/Cells/FsCell.fs.js";
+import { FsCell } from "../../fable_modules/FsSpreadsheet.6.2.0/Cells/FsCell.fs.js";
 import { DataContext__get_GeneratedBy, DataContext__get_Description, DataContext__get_ObjectType, DataContext__get_Unit, DataContext__get_Explication } from "../../Core/DataContext.js";
 
 export function setFromFsColumns(dc, columns) {

package/Spreadsheet/DataMapTable/DataMapHeader.js

@@ -7,7 +7,7 @@ import { Comment$ } from "../../Core/Comment.js";
 import { ActivePatterns_$007CComment$007C_$007C } from "../../Core/Helper/Regex.js";
 import { printf, toFail, join } from "../../fable_modules/fable-library-js.4.16.0/String.js";
 import { map as map_2, append, delay, toList } from "../../fable_modules/fable-library-js.4.16.0/Seq.js";
-import { FsCell } from "../../fable_modules/FsSpreadsheet.6.1.2/Cells/FsCell.fs.js";
+import { FsCell } from "../../fable_modules/FsSpreadsheet.6.2.0/Cells/FsCell.fs.js";
 
 export function ActivePattern_ontologyAnnotationFromFsCells(tsrCol, tanCol, cells) {
     const cellValues = map((c) => c.ValueAsString(), cells);

package/Spreadsheet/DataMapTable/DataMapTable.js

@@ -6,12 +6,12 @@ import { rangeDouble } from "../../fable_modules/fable-library-js.4.16.0/Range.j
 import { toFsColumns, setFromFsColumns } from "./DataMapColumn.js";
 import { printf, toFail } from "../../fable_modules/fable-library-js.4.16.0/String.js";
 import { DataMap__get_DataContexts, DataMap_$ctor_4E3220A7 } from "../../Core/Table/DataMap.js";
-import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.6.1.2/FsWorksheet.fs.js";
-import { FsRangeAddress_$ctor_7E77A4A0 } from "../../fable_modules/FsSpreadsheet.6.1.2/Ranges/FsRangeAddress.fs.js";
-import { FsAddress_$ctor_Z37302880 } from "../../fable_modules/FsSpreadsheet.6.1.2/FsAddress.fs.js";
-import { Dictionary_tryGet } from "../../fable_modules/FsSpreadsheet.6.1.2/Cells/FsCellsCollection.fs.js";
+import { FsWorksheet } from "../../fable_modules/FsSpreadsheet.6.2.0/FsWorksheet.fs.js";
+import { FsRangeAddress_$ctor_7E77A4A0 } from "../../fable_modules/FsSpreadsheet.6.2.0/Ranges/FsRangeAddress.fs.js";
+import { FsAddress_$ctor_Z37302880 } from "../../fable_modules/FsSpreadsheet.6.2.0/FsAddress.fs.js";
+import { Dictionary_tryGet } from "../../fable_modules/FsSpreadsheet.6.2.0/Cells/FsCellsCollection.fs.js";
 import { addToDict } from "../../fable_modules/fable-library-js.4.16.0/MapUtil.js";
-import { FsRangeBase__Cell_Z3407A44B } from "../../fable_modules/FsSpreadsheet.6.1.2/Ranges/FsRangeBase.fs.js";
+import { FsRangeBase__Cell_Z3407A44B } from "../../fable_modules/FsSpreadsheet.6.2.0/Ranges/FsRangeBase.fs.js";
 
 export const helperColumnStrings = ofArray(["Term Source REF", "Term Accession Number", "Data Format", "Data Selector Format"]);
 

package/Spreadsheet/Metadata/SparseTable.js

@@ -2,14 +2,14 @@ import { append as append_1, delay, tryItem, length as length_1, isEmpty, iterat
 import { defaultArg, map as map_1 } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
 import { tryFind, ofSeq } from "../../fable_modules/fable-library-js.4.16.0/Map.js";
 import { arrayHash, equalArrays, equals, comparePrimitives } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
-import { RowBuilder_get_Empty, RowBuilder__Combine_19F30600, RowBuilder_$ctor } from "../../fable_modules/FsSpreadsheet.6.1.2/DSL/RowBuilder.fs.js";
-import { CellBuilder_$ctor, CellBuilder__AsCellElement_6F87C2ED } from "../../fable_modules/FsSpreadsheet.6.1.2/DSL/CellBuilder.fs.js";
-import { Messages_format, SheetEntity$1_some_2B595 } from "../../fable_modules/FsSpreadsheet.6.1.2/DSL/Types.fs.js";
-import { DataType } from "../../fable_modules/FsSpreadsheet.6.1.2/Cells/FsCell.fs.js";
+import { RowBuilder_get_Empty, RowBuilder__Combine_19F30600, RowBuilder_$ctor } from "../../fable_modules/FsSpreadsheet.6.2.0/DSL/RowBuilder.fs.js";
+import { CellBuilder_$ctor, CellBuilder__AsCellElement_6F87C2ED } from "../../fable_modules/FsSpreadsheet.6.2.0/DSL/CellBuilder.fs.js";
+import { Messages_format, SheetEntity$1_some_2B595 } from "../../fable_modules/FsSpreadsheet.6.2.0/DSL/Types.fs.js";
+import { DataType } from "../../fable_modules/FsSpreadsheet.6.2.0/Cells/FsCell.fs.js";
 import { map as map_2, initialize as initialize_1, exists, find, cons, append, empty, singleton } from "../../fable_modules/fable-library-js.4.16.0/List.js";
-import { ColumnIndex, RowElement } from "../../fable_modules/FsSpreadsheet.6.1.2/DSL/Types.fs.js";
-import { FsRangeAddress_$ctor_7E77A4A0 } from "../../fable_modules/FsSpreadsheet.6.1.2/Ranges/FsRangeAddress.fs.js";
-import { FsAddress_$ctor_Z37302880 } from "../../fable_modules/FsSpreadsheet.6.1.2/FsAddress.fs.js";
+import { ColumnIndex, RowElement } from "../../fable_modules/FsSpreadsheet.6.2.0/DSL/Types.fs.js";
+import { FsRangeAddress_$ctor_7E77A4A0 } from "../../fable_modules/FsSpreadsheet.6.2.0/Ranges/FsRangeAddress.fs.js";
+import { FsAddress_$ctor_Z37302880 } from "../../fable_modules/FsSpreadsheet.6.2.0/FsAddress.fs.js";
 import { Record } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
 import { record_type, list_type, class_type, tuple_type, int32_type, string_type } from "../../fable_modules/fable-library-js.4.16.0/Reflection.js";
 import { Seq_trySkip, Dictionary_tryGetValue } from "../CollectionAux.js";

package/Spreadsheet/Template.js

@@ -15,10 +15,10 @@ import { toArray } from "../fable_modules/fable-library-js.4.16.0/Option.js";
 import { toRows as toRows_1, fromRows as fromRows_1 } from "./Metadata/Contacts.js";
 import { parse } from "../fable_modules/fable-library-js.4.16.0/Guid.js";
 import { Template, Organisation } from "../Core/Template.js";
-import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorksheet.fs.js";
+import { FsWorksheet } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorksheet.fs.js";
 import { toFsWorksheet, tryFromFsWorksheet } from "./AnnotationTable/ArcTable.js";
 import { now } from "../fable_modules/fable-library-js.4.16.0/Date.js";
-import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.1.2/FsWorkbook.fs.js";
+import { FsWorkbook } from "../fable_modules/FsSpreadsheet.6.2.0/FsWorkbook.fs.js";
 
 export class TemplateReadError extends FSharpException {
     constructor(Data0) {

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

@@ -36,6 +36,7 @@
     <Compile Include="Json\Value.fs" />
     <Compile Include="Json\Cell.fs" />
     <Compile Include="Json\Row.fs" />
+    <Compile Include="Json\Column.fs" />
     <Compile Include="Json\Table.fs" />
     <Compile Include="Json\Worksheet.fs" />
     <Compile Include="Json\Workbook.fs" />

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

@@ -81,6 +81,10 @@ type FsWorksheet (name, ?fsRows, ?fsTables, ?fsCellsCollection) =
                 FsColumn(newRange,self.CellCollection)
             )
 
+    member this.MaxRowIndex = this.CellCollection.MaxRowNumber
+
+    member this.MaxColumnIndex = this.CellCollection.MaxColumnNumber
+
     // -------
     // METHODS
     // -------

package/fable_modules/{FsSpreadsheet.6.1.2 → FsSpreadsheet.6.2.0}/FsWorksheet.fs.js

@@ -1,4 +1,4 @@
-import { FsCellsCollection__RemoveValueAt_Z37302880, FsCellsCollection__TryRemoveValueAt_Z37302880, FsCellsCollection__RemoveCellAt_Z37302880, FsCellsCollection__Add_2E78CE33, FsCellsCollection__Add_Z21F271A4, FsCellsCollection__Add_Z334DF64D, FsCellsCollection__TryGetCell_Z37302880, FsCellsCollection__Copy, FsCellsCollection__GetCells, FsCellsCollection_$ctor } from "./Cells/FsCellsCollection.fs.js";
+import { FsCellsCollection__RemoveValueAt_Z37302880, FsCellsCollection__TryRemoveValueAt_Z37302880, FsCellsCollection__RemoveCellAt_Z37302880, FsCellsCollection__Add_2E78CE33, FsCellsCollection__Add_Z21F271A4, FsCellsCollection__Add_Z334DF64D, FsCellsCollection__TryGetCell_Z37302880, FsCellsCollection__Copy, FsCellsCollection__get_MaxColumnNumber, FsCellsCollection__get_MaxRowNumber, FsCellsCollection__GetCells, FsCellsCollection_$ctor } from "./Cells/FsCellsCollection.fs.js";
 import { empty, maxBy, filter, exists, find, tryFind, iterate, last, head, sortBy, map } from "../fable-library-js.4.16.0/Seq.js";
 import { FsColumn } from "./FsColumn.fs.js";
 import { clear, safeHash, equals, disposeSafe, getEnumerator, numberHash, comparePrimitives } from "../fable-library-js.4.16.0/Util.js";
@@ -60,6 +60,14 @@ export class FsWorksheet {
             GetHashCode: numberHash,
         }));
     }
+    get MaxRowIndex() {
+        const this$ = this;
+        return FsCellsCollection__get_MaxRowNumber(this$.CellCollection) | 0;
+    }
+    get MaxColumnIndex() {
+        const this$ = this;
+        return FsCellsCollection__get_MaxColumnNumber(this$.CellCollection) | 0;
+    }
     Copy() {
         let n, n_1;
         const self = this;

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

@@ -0,0 +1,45 @@
+module FsSpreadsheet.Json.Cell
+
+open FsSpreadsheet
+open Thoth.Json.Core
+
+[<Literal>]
+let column = "column"
+
+[<Literal>]
+let row = "row"
+
+[<Literal>]
+let value = "value"
+
+let encodeNoNumber (cell:FsCell) =
+    Encode.object [
+        value, Value.encode cell.Value
+    ]
+
+let encodeRows (cell:FsCell) =
+    Encode.object [
+        column, Encode.int cell.ColumnNumber
+        value, Value.encode cell.Value
+    ]
+
+let decodeRows rowNumber : Decoder<FsCell> =
+    Decode.object (fun builder ->
+        let v,dt = builder.Optional.Field value (Value.decode) |> Option.defaultValue ("", DataType.Empty)
+        let c = builder.Optional.Field column Decode.int |> Option.defaultValue 0
+        new FsCell(v,dt,FsAddress(Option.defaultValue 0 rowNumber,c))
+    )
+
+
+let encodeCols (cell:FsCell) =
+    Encode.object [
+        row, Encode.int cell.RowNumber
+        value, Value.encode cell.Value
+    ]
+
+let decodeCols colNumber : Decoder<FsCell> =
+    Decode.object (fun builder ->
+        let v,dt = builder.Optional.Field value (Value.decode) |> Option.defaultValue ("", DataType.Empty)
+        let r = builder.Optional.Field row Decode.int |> Option.defaultValue 0
+        new FsCell(v,dt,FsAddress(r,Option.defaultValue 0 colNumber))
+    )

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

@@ -0,0 +1,38 @@
+import { decode, encode } from "./Value.fs.js";
+import { Json } from "../../Thoth.Json.Core.0.2.1/Types.fs.js";
+import { int, object } from "../../Thoth.Json.Core.0.2.1/Decode.fs.js";
+import { defaultArg } from "../../fable-library-js.4.16.0/Option.js";
+import { FsCell, DataType } from "../Cells/FsCell.fs.js";
+import { FsAddress_$ctor_Z37302880 } from "../FsAddress.fs.js";
+
+export function encodeNoNumber(cell) {
+    return new Json(5, [[["value", encode(cell.Value)]]]);
+}
+
+export function encodeRows(cell) {
+    let value_1;
+    return new Json(5, [[["column", (value_1 = (cell.ColumnNumber | 0), new Json(7, [value_1 >>> 0]))], ["value", encode(cell.Value)]]]);
+}
+
+export function decodeRows(rowNumber) {
+    return object((builder) => {
+        let objectArg, objectArg_1;
+        const patternInput = defaultArg((objectArg = builder.Optional, objectArg.Field("value", decode)), ["", new DataType(4, [])]);
+        const c = defaultArg((objectArg_1 = builder.Optional, objectArg_1.Field("column", int)), 0) | 0;
+        return new FsCell(patternInput[0], patternInput[1], FsAddress_$ctor_Z37302880(defaultArg(rowNumber, 0), c));
+    });
+}
+
+export function encodeCols(cell) {
+    let value_1;
+    return new Json(5, [[["row", (value_1 = (cell.RowNumber | 0), new Json(7, [value_1 >>> 0]))], ["value", encode(cell.Value)]]]);
+}
+
+export function decodeCols(colNumber) {
+    return object((builder) => {
+        let objectArg, objectArg_1;
+        const patternInput = defaultArg((objectArg = builder.Optional, objectArg.Field("value", decode)), ["", new DataType(4, [])]);
+        return new FsCell(patternInput[0], patternInput[1], FsAddress_$ctor_Z37302880(defaultArg((objectArg_1 = builder.Optional, objectArg_1.Field("row", int)), 0), defaultArg(colNumber, 0)));
+    });
+}
+

package/fable_modules/FsSpreadsheet.6.2.0/Json/Column.fs

@@ -0,0 +1,28 @@
+module FsSpreadsheet.Json.Column
+
+open FsSpreadsheet
+open Thoth.Json.Core
+
+[<Literal>]
+let cells = "cells"
+
+[<Literal>]
+let number = "number"
+
+let encode (col:FsColumn) =
+    Encode.object [
+        number, Encode.int col.Index
+        cells, Encode.seq (col.Cells |> Seq.map Cell.encodeCols)
+    ]
+
+let encodeNoNumbers (col: FsCell seq) =
+    Encode.object [
+        cells, Encode.seq (col |> Seq.map Cell.encodeNoNumber)
+    ]
+
+let decode : Decoder<int option*FsCell seq> =
+    Decode.object (fun builder ->
+        let n = builder.Optional.Field number Decode.int
+        let cs = builder.Optional.Field cells (Decode.seq (Cell.decodeCols n)) |> Option.defaultValue Seq.empty
+        n,cs
+    )

package/fable_modules/FsSpreadsheet.6.2.0/Json/Column.fs.js

@@ -0,0 +1,24 @@
+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 { empty, map } from "../../fable-library-js.4.16.0/Seq.js";
+import { decodeCols, encodeNoNumber, encodeCols } from "./Cell.fs.js";
+import { seq as seq_1, int, object } from "../../Thoth.Json.Core.0.2.1/Decode.fs.js";
+import { defaultArg } from "../../fable-library-js.4.16.0/Option.js";
+
+export function encode(col) {
+    let value;
+    return new Json(5, [[["number", (value = (col.Index | 0), new Json(7, [value >>> 0]))], ["cells", seq(map(encodeCols, col.Cells))]]]);
+}
+
+export function encodeNoNumbers(col) {
+    return new Json(5, [[["cells", seq(map(encodeNoNumber, col))]]]);
+}
+
+export const decode = object((builder) => {
+    let arg_3, objectArg_1;
+    let n;
+    const objectArg = builder.Optional;
+    n = objectArg.Field("number", int);
+    return [n, defaultArg((arg_3 = seq_1(decodeCols(n)), (objectArg_1 = builder.Optional, objectArg_1.Field("cells", arg_3))), empty())];
+});
+

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

@@ -0,0 +1,28 @@
+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.encodeRows)
+    ]
+
+let encodeNoNumbers (row: FsCell seq) =
+    Encode.object [
+        cells, Encode.seq (row |> Seq.map Cell.encodeNoNumber)
+    ]
+
+let decode : Decoder<int option*FsCell seq> =
+    Decode.object (fun builder ->
+        let n = builder.Optional.Field number Decode.int
+        let cs = builder.Optional.Field cells (Decode.seq (Cell.decodeRows n)) |> Option.defaultValue Seq.empty
+        n,cs
+    )

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

@@ -0,0 +1,24 @@
+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 { empty, map } from "../../fable-library-js.4.16.0/Seq.js";
+import { decodeRows, encodeNoNumber, encodeRows } from "./Cell.fs.js";
+import { seq as seq_1, int, object } from "../../Thoth.Json.Core.0.2.1/Decode.fs.js";
+import { defaultArg } from "../../fable-library-js.4.16.0/Option.js";
+
+export function encode(row) {
+    let value;
+    return new Json(5, [[["number", (value = (row.Index | 0), new Json(7, [value >>> 0]))], ["cells", seq(map(encodeRows, row.Cells))]]]);
+}
+
+export function encodeNoNumbers(row) {
+    return new Json(5, [[["cells", seq(map(encodeNoNumber, row))]]]);
+}
+
+export const decode = object((builder) => {
+    let arg_3, objectArg_1;
+    let n;
+    const objectArg = builder.Optional;
+    n = objectArg.Field("number", int);
+    return [n, defaultArg((arg_3 = seq_1(decodeRows(n)), (objectArg_1 = builder.Optional, objectArg_1.Field("cells", arg_3))), empty())];
+});
+

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

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

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

@@ -0,0 +1,35 @@
+import { seq } from "../../Thoth.Json.Core.0.2.1/Encode.fs.js";
+import { map } from "../../fable-library-js.4.16.0/Seq.js";
+import { decodeColumns as decodeColumns_1, encodeColumns as encodeColumns_1, decodeRows as decodeRows_1, encodeRows as encodeRows_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 encodeRows(noNumbering, wb) {
+    return new Json(5, [[["sheets", seq(map((sheet) => encodeRows_1(noNumbering, sheet), wb.GetWorksheets()))]]]);
+}
+
+export const decodeRows = object((builder) => {
+    const wb = new FsWorkbook();
+    let ws;
+    const arg_1 = seq_1(decodeRows_1);
+    const objectArg = builder.Required;
+    ws = objectArg.Field("sheets", arg_1);
+    wb.AddWorksheets(ws);
+    return wb;
+});
+
+export function encodeColumns(noNumbering, wb) {
+    return new Json(5, [[["sheets", seq(map((sheet) => encodeColumns_1(noNumbering, sheet), wb.GetWorksheets()))]]]);
+}
+
+export const decodeColumns = object((builder) => {
+    const wb = new FsWorkbook();
+    let ws;
+    const arg_1 = seq_1(decodeColumns_1);
+    const objectArg = builder.Required;
+    ws = objectArg.Field("sheets", arg_1);
+    wb.AddWorksheets(ws);
+    return wb;
+});
+

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

@@ -0,0 +1,148 @@
+module FsSpreadsheet.Json.Worksheet
+
+open FsSpreadsheet
+open Thoth.Json.Core
+
+[<Literal>]
+let name = "name"
+
+[<Literal>]
+let rows = "rows"
+
+[<Literal>]
+let columns = "columns"
+
+[<Literal>]
+let tables = "tables"
+
+let encodeRows noNumbering (sheet:FsWorksheet) =
+    
+    sheet.RescanRows()
+    let jRows = 
+        if noNumbering then
+            [
+                for r = 1 to sheet.MaxRowIndex do
+                    [
+                        for c = 1 to sheet.MaxColumnIndex do
+                            match sheet.CellCollection.TryGetCell(r,c) with
+                            | Some cell -> cell
+                            | None -> new FsCell("")
+
+                    ]
+                    |> Row.encodeNoNumbers
+            ]
+            |> Encode.seq
+        else 
+            Encode.seq (sheet.Rows |> Seq.map Row.encode)
+
+    Encode.object [
+        name, Encode.string sheet.Name
+        if Seq.isEmpty sheet.Tables |> not then        
+            tables, Encode.seq (sheet.Tables |> Seq.map Table.encode)
+        rows, jRows
+
+    ]
+
+let decodeRows : Decoder<FsWorksheet> =
+    Decode.object (fun builder ->
+        let mutable rowIndex = 0
+        
+        let n = builder.Required.Field name Decode.string
+        let ts = builder.Optional.Field tables (Decode.seq Table.decode)
+        let rs = builder.Optional.Field rows (Decode.seq Row.decode) |> Option.defaultValue Seq.empty
+        let sheet = new FsWorksheet(n)
+        rs
+        |> Seq.iter (fun (rowI,cells) -> 
+            let mutable colIndex = 0
+            let rowI = 
+                match rowI with
+                | Some i -> i
+                | None -> rowIndex + 1
+            rowIndex <- rowI
+            let r = sheet.Row(rowI)
+            cells 
+            |> Seq.iter (fun cell ->
+                let colI = 
+                    match cell.ColumnNumber with
+                    | 0 -> colIndex + 1
+                    | i -> i
+                colIndex <- colI
+                let c = r[colI]
+                c.Value <- cell.Value
+                c.DataType <- cell.DataType
+            )
+        )
+        match ts with
+        | Some ts -> 
+            ts
+            |> Seq.iter (fun t -> 
+                sheet.AddTable(t) |> ignore
+            )
+        | None -> ()
+        sheet
+    )
+
+let encodeColumns noNumbering (sheet:FsWorksheet) =
+    sheet.RescanRows()
+
+    let jColumns = 
+        if noNumbering then
+            [
+                for c = 1 to sheet.MaxColumnIndex do
+                    [
+                        for r = 1 to sheet.MaxRowIndex do
+                            match sheet.CellCollection.TryGetCell(r,c) with
+                            | Some cell -> cell
+                            | None -> new FsCell("")
+
+                    ]
+                    |> Column.encodeNoNumbers
+            ]
+            |> Encode.seq
+        else 
+            Encode.seq (sheet.Columns |> Seq.map Column.encode)
+
+    Encode.object [
+        name, Encode.string sheet.Name
+        if Seq.isEmpty sheet.Tables |> not then        
+            tables, Encode.seq (sheet.Tables |> Seq.map Table.encode)
+        columns, jColumns
+    ]
+
+let decodeColumns : Decoder<FsWorksheet> =
+    Decode.object (fun builder ->
+        let mutable colIndex = 0
+        let n = builder.Required.Field name Decode.string
+        let ts = builder.Optional.Field tables (Decode.seq Table.decode)
+        let cs = builder.Required.Field columns (Decode.seq Column.decode)
+        let sheet = new FsWorksheet(n)
+        cs
+        |> Seq.iter (fun (colI,cells) -> 
+            let mutable rowIndex = 0
+            let colI = 
+                match colI with
+                | Some i -> i
+                | None -> colIndex + 1
+            colIndex <- colI
+            let col = sheet.Column(colI)
+            cells 
+            |> Seq.iter (fun cell ->    
+                let rowI = 
+                    match cell.RowNumber with
+                    | 0 -> rowIndex + 1
+                    | i -> i
+                rowIndex <- rowI
+                let c = col[rowIndex]
+                c.Value <- cell.Value
+                c.DataType <- cell.DataType
+            )
+        )
+        match ts with
+        | Some ts -> 
+            ts
+            |> Seq.iter (fun t -> 
+                sheet.AddTable(t) |> ignore
+            )
+        | None -> ()
+        sheet
+    )