@nfdi4plants/arctrl 2.0.1 → 2.1.0-alpha.2

package/Json/Table/ArcTable.js

@@ -1,42 +1,58 @@
-import { toArray, collect, empty, map, singleton, append, delay, toList } from "../../fable_modules/fable-library-js.4.16.0/Seq.js";
-import { ErrorReason$1, Json } from "../../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.js";
-import { tuple2, map as map_1, list } from "../../fable_modules/Thoth.Json.Core.0.2.1/Encode.fs.js";
-import { CompositeHeader_decoder, CompositeHeader_encoder } from "./CompositeHeader.js";
-import { CompositeCell_decoder, CompositeCell_encoder } from "./CompositeCell.js";
-import { empty as empty_2, ofSeq } from "../../fable_modules/fable-library-js.4.16.0/Map.js";
-import { safeHash, int32ToString, equals, arrayHash, equalArrays, compareArrays } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
-import { Helpers_prependPath, array as array_1, string, int, tuple2 as tuple2_1, map$0027, list as list_1, object } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
-import { unwrap, defaultArg } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
-import { empty as empty_1 } from "../../fable_modules/fable-library-js.4.16.0/List.js";
-import { Dictionary } from "../../fable_modules/fable-library-js.4.16.0/MutableMap.js";
+import { toArray, collect, empty, map, singleton, append, delay, toList } from "../../fable_modules/fable-library-js.4.22.0/Seq.js";
+import { tuple2, map as map_1, list } from "../../fable_modules/Thoth.Json.Core.0.4.0/Encode.fs.js";
+import { decoder as decoder_1, encoder as encoder_1 } from "./CompositeHeader.js";
+import { decoder as decoder_2, encoder as encoder_2 } from "./CompositeCell.js";
+import { empty as empty_2, ofSeq } from "../../fable_modules/fable-library-js.4.22.0/Map.js";
+import { int32ToString, equals, arrayHash, equalArrays, compareArrays } from "../../fable_modules/fable-library-js.4.22.0/Util.js";
+import { Helpers_prependPath, array as array_2, string, int, tuple2 as tuple2_1, map$0027, list as list_1, object } from "../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
+import { defaultArg } from "../../fable_modules/fable-library-js.4.22.0/Option.js";
+import { empty as empty_1 } from "../../fable_modules/fable-library-js.4.22.0/List.js";
+import { Dictionary } from "../../fable_modules/fable-library-js.4.22.0/MutableMap.js";
 import { ArcTable } from "../../Core/Table/ArcTable.js";
-import { arrayFromMap, encoder, decoder as decoder_4, decodeCell, encodeCell } from "./CellTable.js";
-import { addToDict, getItemFromDict } from "../../fable_modules/fable-library-js.4.16.0/MapUtil.js";
-import { rangeDouble } from "../../fable_modules/fable-library-js.4.16.0/Range.js";
-import { FSharpResult$2 } from "../../fable_modules/fable-library-js.4.16.0/Result.js";
-import { fill, setItem, fold, iterateIndexed } from "../../fable_modules/fable-library-js.4.16.0/Array.js";
-import { arrayFromMap as arrayFromMap_2, encoder as encoder_2, decoder as decoder_2, decodeString, encodeString } from "../StringTable.js";
-import { fromString } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Decode.fs.js";
-import { printf, toText } from "../../fable_modules/fable-library-js.4.16.0/String.js";
-import { toString } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Encode.fs.js";
-import { defaultSpaces } from "../Encode.js";
-import { arrayFromMap as arrayFromMap_1, encoder as encoder_1, decoder as decoder_3 } from "./OATable.js";
+import { decodeCell, encodeCell } from "./CellTable.js";
+import { addToDict, getItemFromDict } from "../../fable_modules/fable-library-js.4.22.0/MapUtil.js";
+import { rangeDouble } from "../../fable_modules/fable-library-js.4.22.0/Range.js";
+import { fill, setItem, fold, iterateIndexed, map as map_2 } from "../../fable_modules/fable-library-js.4.22.0/Array.js";
+import { FSharpResult$2 } from "../../fable_modules/fable-library-js.4.22.0/Result.js";
+import { ErrorReason$1 } from "../../fable_modules/Thoth.Json.Core.0.4.0/Types.fs.js";
+import { decodeString, encodeString } from "../StringTable.js";
 
-export function ArcTable_encoder(table) {
-    return new Json(5, [toList(delay(() => append(singleton(["name", new Json(0, [table.Name])]), delay(() => append((table.Headers.length !== 0) ? singleton(["header", list(toList(delay(() => map(CompositeHeader_encoder, table.Headers))))]) : empty(), delay(() => ((table.Values.size !== 0) ? singleton(["values", map_1((tupledArg) => tuple2((value) => (new Json(7, [value >>> 0])), (value_2) => (new Json(7, [value_2 >>> 0])), tupledArg[0], tupledArg[1]), CompositeCell_encoder, ofSeq(toList(delay(() => collect((matchValue) => {
-        const activePatternResult = matchValue;
-        return singleton([activePatternResult[0], activePatternResult[1]]);
-    }, table.Values))), {
-        Compare: compareArrays,
-    }))]) : empty())))))))]);
+export function encoder(table) {
+    const values = toList(delay(() => {
+        let value_4;
+        return append(singleton(["name", (value_4 = table.Name, {
+            Encode(helpers_2) {
+                return helpers_2.encodeString(value_4);
+            },
+        })]), delay(() => append((table.Headers.length !== 0) ? singleton(["header", list(toList(delay(() => map(encoder_1, table.Headers))))]) : empty(), delay(() => ((table.Values.size !== 0) ? singleton(["values", map_1((tupledArg) => tuple2((value) => ({
+            Encode(helpers) {
+                return helpers.encodeSignedIntegralNumber(value);
+            },
+        }), (value_2) => ({
+            Encode(helpers_1) {
+                return helpers_1.encodeSignedIntegralNumber(value_2);
+            },
+        }), tupledArg[0], tupledArg[1]), encoder_2, ofSeq(toList(delay(() => collect((matchValue) => {
+            const activePatternResult = matchValue;
+            return singleton([activePatternResult[0], activePatternResult[1]]);
+        }, table.Values))), {
+            Compare: compareArrays,
+        }))]) : empty())))));
+    }));
+    return {
+        Encode(helpers_3) {
+            const arg = map((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_3)], values);
+            return helpers_3.encodeObject(arg);
+        },
+    };
 }
 
-export const ArcTable_decoder = object((get$) => {
+export const decoder = object((get$) => {
     let arg_1, objectArg, arg_3, objectArg_1, objectArg_2;
     let decodedHeader;
-    const collection = defaultArg((arg_1 = list_1(CompositeHeader_decoder), (objectArg = get$.Optional, objectArg.Field("header", arg_1))), empty_1());
+    const collection = defaultArg((arg_1 = list_1(decoder_1), (objectArg = get$.Optional, objectArg.Field("header", arg_1))), empty_1());
     decodedHeader = Array.from(collection);
-    const decodedValues = new Dictionary(defaultArg((arg_3 = map$0027(tuple2_1(int, int), CompositeCell_decoder), (objectArg_1 = get$.Optional, objectArg_1.Field("values", arg_3))), empty_2({
+    const decodedValues = new Dictionary(defaultArg((arg_3 = map$0027(tuple2_1(int, int), decoder_2), (objectArg_1 = get$.Optional, objectArg_1.Field("values", arg_3))), empty_2({
         Compare: compareArrays,
     })), {
         Equals: equalArrays,
@@ -45,32 +61,70 @@ export const ArcTable_decoder = object((get$) => {
     return ArcTable.create((objectArg_2 = get$.Required, objectArg_2.Field("name", string)), decodedHeader, decodedValues);
 });
 
-export function ArcTable_encoderCompressedColumn(columnIndex, rowCount, cellTable, table) {
+export function encoderCompressedColumn(columnIndex, rowCount, cellTable, table) {
     if (table.Headers[columnIndex].IsIOType ? true : (rowCount < 100)) {
-        return new Json(6, [toArray(delay(() => map((r) => encodeCell(cellTable, getItemFromDict(table.Values, [columnIndex, r])), rangeDouble(0, 1, rowCount - 1))))]);
+        const values = toArray(delay(() => map((r) => encodeCell(cellTable, getItemFromDict(table.Values, [columnIndex, r])), rangeDouble(0, 1, rowCount - 1))));
+        return {
+            Encode(helpers) {
+                const arg = map_2((v) => v.Encode(helpers), values);
+                return helpers.encodeArray(arg);
+            },
+        };
     }
     else {
         let current = getItemFromDict(table.Values, [columnIndex, 0]);
         let from = 0;
-        return new Json(6, [toArray(delay(() => append(collect((i) => {
-            let value, value_1;
+        const values_3 = toArray(delay(() => append(collect((i) => {
+            let values_1, value, value_1;
             const next = getItemFromDict(table.Values, [columnIndex, i]);
-            return !equals(next, current) ? append(singleton(new Json(5, [[["f", (value = (from | 0), new Json(7, [value >>> 0]))], ["t", (value_1 = ((i - 1) | 0), new Json(7, [value_1 >>> 0]))], ["v", encodeCell(cellTable, current)]]])), delay(() => {
+            return !equals(next, current) ? append(singleton((values_1 = [["f", (value = (from | 0), {
+                Encode(helpers_1) {
+                    return helpers_1.encodeSignedIntegralNumber(value);
+                },
+            })], ["t", (value_1 = ((i - 1) | 0), {
+                Encode(helpers_2) {
+                    return helpers_2.encodeSignedIntegralNumber(value_1);
+                },
+            })], ["v", encodeCell(cellTable, current)]], {
+                Encode(helpers_3) {
+                    const arg_1 = map((tupledArg) => [tupledArg[0], tupledArg[1].Encode(helpers_3)], values_1);
+                    return helpers_3.encodeObject(arg_1);
+                },
+            })), delay(() => {
                 current = next;
                 from = (i | 0);
                 return empty();
             })) : empty();
         }, rangeDouble(1, 1, rowCount - 1)), delay(() => {
-            let value_2, value_3;
-            return singleton(new Json(5, [[["f", (value_2 = (from | 0), new Json(7, [value_2 >>> 0]))], ["t", (value_3 = ((rowCount - 1) | 0), new Json(7, [value_3 >>> 0]))], ["v", encodeCell(cellTable, current)]]]));
-        }))))]);
+            let values_2, value_2, value_3;
+            return singleton((values_2 = [["f", (value_2 = (from | 0), {
+                Encode(helpers_4) {
+                    return helpers_4.encodeSignedIntegralNumber(value_2);
+                },
+            })], ["t", (value_3 = ((rowCount - 1) | 0), {
+                Encode(helpers_5) {
+                    return helpers_5.encodeSignedIntegralNumber(value_3);
+                },
+            })], ["v", encodeCell(cellTable, current)]], {
+                Encode(helpers_6) {
+                    const arg_2 = map((tupledArg_1) => [tupledArg_1[0], tupledArg_1[1].Encode(helpers_6)], values_2);
+                    return helpers_6.encodeObject(arg_2);
+                },
+            }));
+        }))));
+        return {
+            Encode(helpers_7) {
+                const arg_3 = map_2((v_3) => v_3.Encode(helpers_7), values_3);
+                return helpers_7.encodeArray(arg_3);
+            },
+        };
     }
 }
 
-export function ArcTable_decoderCompressedColumn(cellTable, table, columnIndex) {
+export function decoderCompressedColumn(cellTable, table, columnIndex) {
     return {
         Decode(helper, column) {
-            const matchValue = array_1(decodeCell(cellTable)).Decode(helper, column);
+            const matchValue = array_2(decodeCell(cellTable)).Decode(helper, column);
             if (matchValue.tag === 1) {
                 const rangeDecoder = object((get$) => {
                     let from;
@@ -87,20 +141,20 @@ export function ArcTable_decoderCompressedColumn(cellTable, table, columnIndex)
                         addToDict(table.Values, [columnIndex, i], value);
                     }
                 });
-                const matchValue_1 = array_1(rangeDecoder).Decode(helper, column);
-                return (matchValue_1.tag === 1) ? (new FSharpResult$2(1, [matchValue_1.fields[0]])) : (new FSharpResult$2(0, [void 0]));
+                const matchValue_1 = array_2(rangeDecoder).Decode(helper, column);
+                return (matchValue_1.tag === 1) ? (new FSharpResult$2(1, [matchValue_1.fields[0]])) : (new FSharpResult$2(0, [undefined]));
             }
             else {
                 iterateIndexed((r, cell) => {
                     addToDict(table.Values, [columnIndex, r], cell);
                 }, matchValue.fields[0]);
-                return new FSharpResult$2(0, [void 0]);
+                return new FSharpResult$2(0, [undefined]);
             }
         },
     };
 }
 
-export function ArcTable_arrayi(decoderi) {
+export function arrayi(decoderi) {
     return {
         Decode(helpers, value) {
             if (helpers.isArray(value)) {
@@ -132,92 +186,42 @@ export function ArcTable_arrayi(decoderi) {
     };
 }
 
-export function ArcTable_encoderCompressed(stringTable, oaTable, cellTable, table) {
-    return new Json(5, [toList(delay(() => append(singleton(["n", encodeString(stringTable, table.Name)]), delay(() => append((table.Headers.length !== 0) ? singleton(["h", list(toList(delay(() => map(CompositeHeader_encoder, table.Headers))))]) : empty(), delay(() => {
+export function encoderCompressed(stringTable, oaTable, cellTable, table) {
+    const values_1 = toList(delay(() => append(singleton(["n", encodeString(stringTable, table.Name)]), delay(() => append((table.Headers.length !== 0) ? singleton(["h", list(toList(delay(() => map(encoder_1, table.Headers))))]) : empty(), delay(() => {
         if (table.Values.size !== 0) {
             const rowCount = table.RowCount | 0;
-            return singleton(["c", new Json(6, [toArray(delay(() => map((c) => ArcTable_encoderCompressedColumn(c, rowCount, cellTable, table), rangeDouble(0, 1, table.ColumnCount - 1))))])]);
+            const columns = toArray(delay(() => map((c) => encoderCompressedColumn(c, rowCount, cellTable, table), rangeDouble(0, 1, table.ColumnCount - 1))));
+            return singleton(["c", {
+                Encode(helpers) {
+                    const arg = map_2((v) => v.Encode(helpers), columns);
+                    return helpers.encodeArray(arg);
+                },
+            }]);
         }
         else {
             return empty();
         }
-    }))))))]);
+    }))))));
+    return {
+        Encode(helpers_1) {
+            const arg_1 = map((tupledArg) => [tupledArg[0], tupledArg[1].Encode(helpers_1)], values_1);
+            return helpers_1.encodeObject(arg_1);
+        },
+    };
 }
 
-export function ArcTable_decoderCompressed(stringTable, oaTable, cellTable) {
+export function decoderCompressed(stringTable, oaTable, cellTable) {
     return object((get$) => {
         let arg_1, objectArg, arg_3, objectArg_1, arg_5, objectArg_2;
         let decodedHeader;
-        const collection = defaultArg((arg_1 = list_1(CompositeHeader_decoder), (objectArg = get$.Optional, objectArg.Field("h", arg_1))), empty_1());
+        const collection = defaultArg((arg_1 = list_1(decoder_1), (objectArg = get$.Optional, objectArg.Field("h", arg_1))), empty_1());
         decodedHeader = Array.from(collection);
         const table = ArcTable.create((arg_3 = decodeString(stringTable), (objectArg_1 = get$.Required, objectArg_1.Field("n", arg_3))), decodedHeader, new Dictionary([], {
             Equals: equalArrays,
             GetHashCode: arrayHash,
         }));
-        (arg_5 = ArcTable_arrayi((columnIndex) => ArcTable_decoderCompressedColumn(cellTable, table, columnIndex)), (objectArg_2 = get$.Optional, objectArg_2.Field("c", arg_5)));
+        (arg_5 = arrayi((columnIndex) => decoderCompressedColumn(cellTable, table, columnIndex)), (objectArg_2 = get$.Optional, objectArg_2.Field("c", arg_5)));
         return table;
     });
 }
 
-export function ARCtrl_ArcTable__ArcTable_fromJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(ArcTable_decoder, s);
-    if (matchValue.tag === 1) {
-        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
-    }
-    else {
-        return matchValue.fields[0];
-    }
-}
-
-export function ARCtrl_ArcTable__ArcTable_toJsonString_Static_71136F3F(spaces) {
-    return (obj) => {
-        const value = ArcTable_encoder(obj);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_ArcTable__ArcTable_ToJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_ArcTable__ArcTable_toJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
-
-export function ARCtrl_ArcTable__ArcTable_fromCompressedJsonString_Static_Z721C83C5(jsonString) {
-    const matchValue = fromString(object((get$) => {
-        let arg_5, objectArg_2;
-        let stringTable;
-        const objectArg = get$.Required;
-        stringTable = objectArg.Field("stringTable", decoder_2);
-        let oaTable;
-        const arg_3 = decoder_3(stringTable);
-        const objectArg_1 = get$.Required;
-        oaTable = objectArg_1.Field("oaTable", arg_3);
-        const arg_7 = ArcTable_decoderCompressed(stringTable, oaTable, (arg_5 = decoder_4(stringTable, oaTable), (objectArg_2 = get$.Required, objectArg_2.Field("cellTable", arg_5))));
-        const objectArg_3 = get$.Required;
-        return objectArg_3.Field("table", arg_7);
-    }), jsonString);
-    if (matchValue.tag === 1) {
-        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
-    }
-    else {
-        return matchValue.fields[0];
-    }
-}
-
-export function ARCtrl_ArcTable__ArcTable_ToCompressedJsonString_71136F3F(this$, spaces) {
-    const spaces_1 = defaultSpaces(spaces) | 0;
-    const stringTable = new Map([]);
-    const oaTable = new Dictionary([], {
-        Equals: equals,
-        GetHashCode: safeHash,
-    });
-    const cellTable = new Dictionary([], {
-        Equals: equals,
-        GetHashCode: safeHash,
-    });
-    const arcTable = ArcTable_encoderCompressed(stringTable, oaTable, cellTable, this$);
-    return toString(spaces_1, new Json(5, [[["cellTable", encoder(stringTable, oaTable, arrayFromMap(cellTable))], ["oaTable", encoder_1(stringTable, arrayFromMap_1(oaTable))], ["stringTable", encoder_2(arrayFromMap_2(stringTable))], ["table", arcTable]]]));
-}
-
-export function ARCtrl_ArcTable__ArcTable_toCompressedJsonString_Static_71136F3F(spaces) {
-    return (obj) => ARCtrl_ArcTable__ArcTable_ToCompressedJsonString_71136F3F(obj, unwrap(spaces));
-}
-

package/Json/Table/CellTable.js

@@ -1,11 +1,10 @@
-import { sortBy, map, toArray } from "../../fable_modules/fable-library-js.4.16.0/Seq.js";
-import { comparePrimitives } from "../../fable_modules/fable-library-js.4.16.0/Util.js";
-import { item, map as map_1 } from "../../fable_modules/fable-library-js.4.16.0/Array.js";
-import { CompositeCell_decoderCompressed, CompositeCell_encoderCompressed } from "./CompositeCell.js";
-import { Json } from "../../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.js";
-import { int, object, array as array_1 } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
+import { sortBy, map, toArray } from "../../fable_modules/fable-library-js.4.22.0/Seq.js";
+import { comparePrimitives } from "../../fable_modules/fable-library-js.4.22.0/Util.js";
+import { item, map as map_1 } from "../../fable_modules/fable-library-js.4.22.0/Array.js";
+import { decoderCompressed, encoderCompressed } from "./CompositeCell.js";
+import { int, object, array as array_2 } from "../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
 import { Dictionary_tryFind } from "../../Core/Helper/Collections.js";
-import { addToDict } from "../../fable_modules/fable-library-js.4.16.0/MapUtil.js";
+import { addToDict } from "../../fable_modules/fable-library-js.4.22.0/MapUtil.js";
 
 export function arrayFromMap(otm) {
     return toArray(map((kv_1) => kv_1[0], sortBy((kv) => kv[1], otm, {
@@ -14,11 +13,17 @@ export function arrayFromMap(otm) {
 }
 
 export function encoder(stringTable, oaTable, ot) {
-    return new Json(6, [map_1((cc) => CompositeCell_encoderCompressed(stringTable, oaTable, cc), ot)]);
+    const values = map_1((cc) => encoderCompressed(stringTable, oaTable, cc), ot);
+    return {
+        Encode(helpers) {
+            const arg = map_1((v) => v.Encode(helpers), values);
+            return helpers.encodeArray(arg);
+        },
+    };
 }
 
 export function decoder(stringTable, oaTable) {
-    return array_1(CompositeCell_decoderCompressed(stringTable, oaTable));
+    return array_2(decoderCompressed(stringTable, oaTable));
 }
 
 export function encodeCell(otm, cc) {
@@ -26,11 +31,19 @@ export function encodeCell(otm, cc) {
     if (matchValue == null) {
         const i_1 = otm.size | 0;
         addToDict(otm, cc, i_1);
-        return new Json(7, [i_1 >>> 0]);
+        return {
+            Encode(helpers_1) {
+                return helpers_1.encodeSignedIntegralNumber(i_1);
+            },
+        };
     }
     else {
         const i = matchValue | 0;
-        return new Json(7, [i >>> 0]);
+        return {
+            Encode(helpers) {
+                return helpers.encodeSignedIntegralNumber(i);
+            },
+        };
     }
 }
 

package/Json/Table/CompositeCell.js

@@ -1,66 +1,65 @@
 import { OntologyAnnotation_decoder, OntologyAnnotation_encoder } from "../OntologyAnnotation.js";
-import { ofArray, singleton } from "../../fable_modules/fable-library-js.4.16.0/List.js";
-import { Json } from "../../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.js";
-import { Data_compressedDecoder, Data_compressedEncoder, Data_decoder, Data_encoder } from "../Data.js";
-import { list } from "../../fable_modules/Thoth.Json.Core.0.2.1/Encode.fs.js";
-import { index, string, object } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
+import { ofArray, singleton } from "../../fable_modules/fable-library-js.4.22.0/List.js";
+import { compressedDecoder, compressedEncoder, decoder as decoder_5, encoder as encoder_1 } from "../Data.js";
+import { list } from "../../fable_modules/Thoth.Json.Core.0.4.0/Encode.fs.js";
+import { map } from "../../fable_modules/fable-library-js.4.22.0/Seq.js";
+import { index, string, object } from "../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
 import { CompositeCell } from "../../Core/Table/CompositeCell.js";
-import { toText, printf, toFail } from "../../fable_modules/fable-library-js.4.16.0/String.js";
+import { printf, toFail } from "../../fable_modules/fable-library-js.4.22.0/String.js";
 import { decodeOA, encodeOA } from "./OATable.js";
 import { decodeString, encodeString } from "../StringTable.js";
-import { fromString } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Decode.fs.js";
-import { toString } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Encode.fs.js";
-import { defaultSpaces } from "../Encode.js";
-import { unwrap } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
 
-export function CompositeCell_encoder(cc) {
+export function encoder(cc) {
     const oaToJsonString = OntologyAnnotation_encoder;
-    const patternInput = (cc.tag === 0) ? ["Term", singleton(oaToJsonString(cc.fields[0]))] : ((cc.tag === 2) ? ["Unitized", ofArray([new Json(0, [cc.fields[0]]), oaToJsonString(cc.fields[1])])] : ((cc.tag === 3) ? ["Data", singleton(Data_encoder(cc.fields[0]))] : ["FreeText", singleton(new Json(0, [cc.fields[0]]))]));
-    return new Json(5, [[["celltype", new Json(0, [patternInput[0]])], ["values", list(patternInput[1])]]]);
+    const patternInput = (cc.tag === 0) ? ["Term", singleton(oaToJsonString(cc.fields[0]))] : ((cc.tag === 2) ? ["Unitized", ofArray([{
+        Encode(helpers_1) {
+            return helpers_1.encodeString(cc.fields[0]);
+        },
+    }, oaToJsonString(cc.fields[1])])] : ((cc.tag === 3) ? ["Data", singleton(encoder_1(cc.fields[0]))] : ["FreeText", singleton({
+        Encode(helpers) {
+            return helpers.encodeString(cc.fields[0]);
+        },
+    })]));
+    const values_1 = [["celltype", {
+        Encode(helpers_2) {
+            return helpers_2.encodeString(patternInput[0]);
+        },
+    }], ["values", list(patternInput[1])]];
+    return {
+        Encode(helpers_3) {
+            const arg = map((tupledArg) => [tupledArg[0], tupledArg[1].Encode(helpers_3)], values_1);
+            return helpers_3.encodeObject(arg);
+        },
+    };
 }
 
-export const CompositeCell_decoder = object((get$) => {
+export const decoder = object((get$) => {
     let arg_3, objectArg_1, arg_5, objectArg_2, arg_7, objectArg_3, arg_9, objectArg_4, arg_11, objectArg_5;
     let matchValue;
     const objectArg = get$.Required;
     matchValue = objectArg.Field("celltype", string);
-    return (matchValue === "FreeText") ? (new CompositeCell(1, [(arg_3 = index(0, string), (objectArg_1 = get$.Required, objectArg_1.Field("values", arg_3)))])) : ((matchValue === "Term") ? (new CompositeCell(0, [(arg_5 = index(0, OntologyAnnotation_decoder), (objectArg_2 = get$.Required, objectArg_2.Field("values", arg_5)))])) : ((matchValue === "Unitized") ? (new CompositeCell(2, [(arg_7 = index(0, string), (objectArg_3 = get$.Required, objectArg_3.Field("values", arg_7))), (arg_9 = index(1, OntologyAnnotation_decoder), (objectArg_4 = get$.Required, objectArg_4.Field("values", arg_9)))])) : ((matchValue === "Data") ? (new CompositeCell(3, [(arg_11 = index(0, Data_decoder), (objectArg_5 = get$.Required, objectArg_5.Field("values", arg_11)))])) : toFail(printf("Error reading CompositeCell from json string: %A"))(matchValue))));
+    return (matchValue === "FreeText") ? (new CompositeCell(1, [(arg_3 = index(0, string), (objectArg_1 = get$.Required, objectArg_1.Field("values", arg_3)))])) : ((matchValue === "Term") ? (new CompositeCell(0, [(arg_5 = index(0, OntologyAnnotation_decoder), (objectArg_2 = get$.Required, objectArg_2.Field("values", arg_5)))])) : ((matchValue === "Unitized") ? (new CompositeCell(2, [(arg_7 = index(0, string), (objectArg_3 = get$.Required, objectArg_3.Field("values", arg_7))), (arg_9 = index(1, OntologyAnnotation_decoder), (objectArg_4 = get$.Required, objectArg_4.Field("values", arg_9)))])) : ((matchValue === "Data") ? (new CompositeCell(3, [(arg_11 = index(0, decoder_5), (objectArg_5 = get$.Required, objectArg_5.Field("values", arg_11)))])) : toFail(printf("Error reading CompositeCell from json string: %A"))(matchValue))));
 });
 
-export function CompositeCell_encoderCompressed(stringTable, oaTable, cc) {
-    const patternInput = (cc.tag === 0) ? ["Term", singleton(encodeOA(oaTable, cc.fields[0]))] : ((cc.tag === 2) ? ["Unitized", ofArray([encodeString(stringTable, cc.fields[0]), encodeOA(oaTable, cc.fields[1])])] : ((cc.tag === 3) ? ["Data", singleton(Data_compressedEncoder(stringTable, cc.fields[0]))] : ["FreeText", singleton(encodeString(stringTable, cc.fields[0]))]));
-    return new Json(5, [[["t", encodeString(stringTable, patternInput[0])], ["v", list(patternInput[1])]]]);
+export function encoderCompressed(stringTable, oaTable, cc) {
+    const patternInput = (cc.tag === 0) ? ["Term", singleton(encodeOA(oaTable, cc.fields[0]))] : ((cc.tag === 2) ? ["Unitized", ofArray([encodeString(stringTable, cc.fields[0]), encodeOA(oaTable, cc.fields[1])])] : ((cc.tag === 3) ? ["Data", singleton(compressedEncoder(stringTable, cc.fields[0]))] : ["FreeText", singleton(encodeString(stringTable, cc.fields[0]))]));
+    const values_1 = [["t", encodeString(stringTable, patternInput[0])], ["v", list(patternInput[1])]];
+    return {
+        Encode(helpers) {
+            const arg = map((tupledArg) => [tupledArg[0], tupledArg[1].Encode(helpers)], values_1);
+            return helpers.encodeObject(arg);
+        },
+    };
 }
 
-export function CompositeCell_decoderCompressed(stringTable, oaTable) {
+export function decoderCompressed(stringTable, oaTable) {
     return object((get$) => {
         let arg_3, objectArg_1, arg_5, objectArg_2, arg_7, objectArg_3, arg_9, objectArg_4, arg_11, objectArg_5;
         let matchValue;
         const arg_1 = decodeString(stringTable);
         const objectArg = get$.Required;
         matchValue = objectArg.Field("t", arg_1);
-        return (matchValue === "FreeText") ? (new CompositeCell(1, [(arg_3 = index(0, decodeString(stringTable)), (objectArg_1 = get$.Required, objectArg_1.Field("v", arg_3)))])) : ((matchValue === "Term") ? (new CompositeCell(0, [(arg_5 = index(0, decodeOA(oaTable)), (objectArg_2 = get$.Required, objectArg_2.Field("v", arg_5)))])) : ((matchValue === "Unitized") ? (new CompositeCell(2, [(arg_7 = index(0, decodeString(stringTable)), (objectArg_3 = get$.Required, objectArg_3.Field("v", arg_7))), (arg_9 = index(1, decodeOA(oaTable)), (objectArg_4 = get$.Required, objectArg_4.Field("v", arg_9)))])) : ((matchValue === "Data") ? (new CompositeCell(3, [(arg_11 = index(0, Data_compressedDecoder(stringTable)), (objectArg_5 = get$.Required, objectArg_5.Field("v", arg_11)))])) : toFail(printf("Error reading CompositeCell from json string: %A"))(matchValue))));
+        return (matchValue === "FreeText") ? (new CompositeCell(1, [(arg_3 = index(0, decodeString(stringTable)), (objectArg_1 = get$.Required, objectArg_1.Field("v", arg_3)))])) : ((matchValue === "Term") ? (new CompositeCell(0, [(arg_5 = index(0, decodeOA(oaTable)), (objectArg_2 = get$.Required, objectArg_2.Field("v", arg_5)))])) : ((matchValue === "Unitized") ? (new CompositeCell(2, [(arg_7 = index(0, decodeString(stringTable)), (objectArg_3 = get$.Required, objectArg_3.Field("v", arg_7))), (arg_9 = index(1, decodeOA(oaTable)), (objectArg_4 = get$.Required, objectArg_4.Field("v", arg_9)))])) : ((matchValue === "Data") ? (new CompositeCell(3, [(arg_11 = index(0, compressedDecoder(stringTable)), (objectArg_5 = get$.Required, objectArg_5.Field("v", arg_11)))])) : toFail(printf("Error reading CompositeCell from json string: %A"))(matchValue))));
     });
 }
 
-export function ARCtrl_CompositeCell__CompositeCell_fromJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(CompositeCell_decoder, s);
-    if (matchValue.tag === 1) {
-        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
-    }
-    else {
-        return matchValue.fields[0];
-    }
-}
-
-export function ARCtrl_CompositeCell__CompositeCell_toJsonString_Static_71136F3F(spaces) {
-    return (obj) => {
-        const value = CompositeCell_encoder(obj);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_CompositeCell__CompositeCell_ToJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_CompositeCell__CompositeCell_toJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
-

package/Json/Table/CompositeHeader.js

@@ -1,23 +1,32 @@
 import { OntologyAnnotation_decoder, OntologyAnnotation_encoder } from "../OntologyAnnotation.js";
-import { Json } from "../../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.js";
-import { empty, singleton } from "../../fable_modules/fable-library-js.4.16.0/List.js";
-import { IOType_decoder, IOType_encoder } from "./IOType.js";
-import { list } from "../../fable_modules/Thoth.Json.Core.0.2.1/Encode.fs.js";
-import { index, string, object } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
+import { empty, singleton } from "../../fable_modules/fable-library-js.4.22.0/List.js";
+import { decoder as decoder_1, encoder as encoder_1 } from "./IOType.js";
+import { list } from "../../fable_modules/Thoth.Json.Core.0.4.0/Encode.fs.js";
+import { map } from "../../fable_modules/fable-library-js.4.22.0/Seq.js";
+import { index, string, object } from "../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
 import { CompositeHeader } from "../../Core/Table/CompositeHeader.js";
-import { fromString } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Decode.fs.js";
-import { printf, toText } from "../../fable_modules/fable-library-js.4.16.0/String.js";
-import { toString } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Encode.fs.js";
-import { defaultSpaces } from "../Encode.js";
-import { unwrap } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
 
-export function CompositeHeader_encoder(ch) {
+export function encoder(ch) {
     const oaToJsonString = OntologyAnnotation_encoder;
-    const patternInput = (ch.tag === 14) ? ["Comment", singleton(new Json(0, [ch.fields[0]]))] : ((ch.tag === 3) ? ["Parameter", singleton(oaToJsonString(ch.fields[0]))] : ((ch.tag === 2) ? ["Factor", singleton(oaToJsonString(ch.fields[0]))] : ((ch.tag === 1) ? ["Characteristic", singleton(oaToJsonString(ch.fields[0]))] : ((ch.tag === 0) ? ["Component", singleton(oaToJsonString(ch.fields[0]))] : ((ch.tag === 4) ? ["ProtocolType", empty()] : ((ch.tag === 8) ? ["ProtocolREF", empty()] : ((ch.tag === 5) ? ["ProtocolDescription", empty()] : ((ch.tag === 6) ? ["ProtocolUri", empty()] : ((ch.tag === 7) ? ["ProtocolVersion", empty()] : ((ch.tag === 9) ? ["Performer", empty()] : ((ch.tag === 10) ? ["Date", empty()] : ((ch.tag === 11) ? ["Input", singleton(IOType_encoder(ch.fields[0]))] : ((ch.tag === 12) ? ["Output", singleton(IOType_encoder(ch.fields[0]))] : [ch.fields[0], empty()])))))))))))));
-    return new Json(5, [[["headertype", new Json(0, [patternInput[0]])], ["values", list(patternInput[1])]]]);
+    const patternInput = (ch.tag === 14) ? ["Comment", singleton({
+        Encode(helpers) {
+            return helpers.encodeString(ch.fields[0]);
+        },
+    })] : ((ch.tag === 3) ? ["Parameter", singleton(oaToJsonString(ch.fields[0]))] : ((ch.tag === 2) ? ["Factor", singleton(oaToJsonString(ch.fields[0]))] : ((ch.tag === 1) ? ["Characteristic", singleton(oaToJsonString(ch.fields[0]))] : ((ch.tag === 0) ? ["Component", singleton(oaToJsonString(ch.fields[0]))] : ((ch.tag === 4) ? ["ProtocolType", empty()] : ((ch.tag === 8) ? ["ProtocolREF", empty()] : ((ch.tag === 5) ? ["ProtocolDescription", empty()] : ((ch.tag === 6) ? ["ProtocolUri", empty()] : ((ch.tag === 7) ? ["ProtocolVersion", empty()] : ((ch.tag === 9) ? ["Performer", empty()] : ((ch.tag === 10) ? ["Date", empty()] : ((ch.tag === 11) ? ["Input", singleton(encoder_1(ch.fields[0]))] : ((ch.tag === 12) ? ["Output", singleton(encoder_1(ch.fields[0]))] : [ch.fields[0], empty()])))))))))))));
+    const values_1 = [["headertype", {
+        Encode(helpers_1) {
+            return helpers_1.encodeString(patternInput[0]);
+        },
+    }], ["values", list(patternInput[1])]];
+    return {
+        Encode(helpers_2) {
+            const arg = map((tupledArg) => [tupledArg[0], tupledArg[1].Encode(helpers_2)], values_1);
+            return helpers_2.encodeObject(arg);
+        },
+    };
 }
 
-export const CompositeHeader_decoder = object((get$) => {
+export const decoder = object((get$) => {
     let arg_7, objectArg_3;
     let headerType;
     const objectArg = get$.Required;
@@ -28,31 +37,10 @@ export const CompositeHeader_decoder = object((get$) => {
         return objectArg_1.Field("values", arg_3);
     };
     const io = () => {
-        const arg_5 = index(0, IOType_decoder);
+        const arg_5 = index(0, decoder_1);
         const objectArg_2 = get$.Required;
         return objectArg_2.Field("values", arg_5);
     };
     return (headerType === "Characteristic") ? (new CompositeHeader(1, [oa()])) : ((headerType === "Parameter") ? (new CompositeHeader(3, [oa()])) : ((headerType === "Component") ? (new CompositeHeader(0, [oa()])) : ((headerType === "Factor") ? (new CompositeHeader(2, [oa()])) : ((headerType === "Input") ? (new CompositeHeader(11, [io()])) : ((headerType === "Output") ? (new CompositeHeader(12, [io()])) : ((headerType === "ProtocolType") ? (new CompositeHeader(4, [])) : ((headerType === "ProtocolREF") ? (new CompositeHeader(8, [])) : ((headerType === "ProtocolDescription") ? (new CompositeHeader(5, [])) : ((headerType === "ProtocolUri") ? (new CompositeHeader(6, [])) : ((headerType === "ProtocolVersion") ? (new CompositeHeader(7, [])) : ((headerType === "Performer") ? (new CompositeHeader(9, [])) : ((headerType === "Date") ? (new CompositeHeader(10, [])) : ((headerType === "Comment") ? (new CompositeHeader(14, [(arg_7 = index(0, string), (objectArg_3 = get$.Required, objectArg_3.Field("values", arg_7)))])) : (new CompositeHeader(13, [headerType])))))))))))))));
 });
 
-export function ARCtrl_CompositeHeader__CompositeHeader_fromJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(CompositeHeader_decoder, s);
-    if (matchValue.tag === 1) {
-        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
-    }
-    else {
-        return matchValue.fields[0];
-    }
-}
-
-export function ARCtrl_CompositeHeader__CompositeHeader_toJsonString_Static_71136F3F(spaces) {
-    return (obj) => {
-        const value = CompositeHeader_encoder(obj);
-        return toString(defaultSpaces(spaces), value);
-    };
-}
-
-export function ARCtrl_CompositeHeader__CompositeHeader_ToJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_CompositeHeader__CompositeHeader_toJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
-

package/Json/Table/IOType.js

@@ -1,37 +1,15 @@
-import { toString } from "../../fable_modules/fable-library-js.4.16.0/Types.js";
-import { Json } from "../../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.js";
-import { string, succeed, andThen } from "../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
+import { toString } from "../../fable_modules/fable-library-js.4.22.0/Types.js";
+import { string, succeed, andThen } from "../../fable_modules/Thoth.Json.Core.0.4.0/Decode.fs.js";
 import { IOType } from "../../Core/Table/CompositeHeader.js";
-import { fromString } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Decode.fs.js";
-import { printf, toText } from "../../fable_modules/fable-library-js.4.16.0/String.js";
-import { toString as toString_1 } from "../../fable_modules/Thoth.Json.JavaScript.0.1.0/Encode.fs.js";
-import { defaultSpaces } from "../Encode.js";
-import { unwrap } from "../../fable_modules/fable-library-js.4.16.0/Option.js";
 
-export function IOType_encoder(io) {
-    return new Json(0, [toString(io)]);
-}
-
-export const IOType_decoder = andThen((s) => succeed(IOType.ofString(s)), string);
-
-export function ARCtrl_IOType__IOType_fromJsonString_Static_Z721C83C5(s) {
-    const matchValue = fromString(IOType_decoder, s);
-    if (matchValue.tag === 1) {
-        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
-    }
-    else {
-        return matchValue.fields[0];
-    }
-}
-
-export function ARCtrl_IOType__IOType_toJsonString_Static_71136F3F(spaces) {
-    return (obj) => {
-        const value = IOType_encoder(obj);
-        return toString_1(defaultSpaces(spaces), value);
+export function encoder(io) {
+    const value = toString(io);
+    return {
+        Encode(helpers) {
+            return helpers.encodeString(value);
+        },
     };
 }
 
-export function ARCtrl_IOType__IOType_ToJsonString_71136F3F(this$, spaces) {
-    return ARCtrl_IOType__IOType_toJsonString_Static_71136F3F(unwrap(spaces))(this$);
-}
+export const decoder = andThen((s) => succeed(IOType.ofString(s)), string);