@nfdi4plants/arctrl 1.0.7 → 1.2.0

package/ISA/ISA.Json/ArcTypes/ArcStudy.js

@@ -1,20 +1,27 @@
-import { toString, seq, object } from "../../../fable_modules/Thoth.Json.10.1.0/Encode.fs.js";
-import { map, empty, singleton, append, delay, toList } from "../../../fable_modules/fable-library.4.5.0/Seq.js";
-import { defaultArg, value as value_7 } from "../../../fable_modules/fable-library.4.5.0/Option.js";
+import { map, empty, singleton, append, delay, toList } from "../../../fable_modules/fable-library-js.4.13.0/Seq.js";
+import { Json } from "../../../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.js";
+import { map as map_1, defaultArg, value as value_7 } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
 import { JsonHelper_tryGetComments, JsonHelper_tryGetFactors, JsonHelper_tryGetStringResizeArray, JsonHelper_tryGetTables, JsonHelper_tryGetOAs, JsonHelper_tryGetPersons, JsonHelper_tryGetPublications, JsonHelper_EncoderComments, JsonHelper_EncoderFactors, JsonHelper_EncoderTables, JsonHelper_EncoderOAs, JsonHelper_EncoderPersons, JsonHelper_EncoderPublications } from "./ArcAssay.js";
-import { fromString, string, object as object_1 } from "../../../fable_modules/Thoth.Json.10.1.0/Decode.fs.js";
+import { seq } from "../../../fable_modules/Thoth.Json.Core.0.2.1/Encode.fs.js";
+import { array, string, object } from "../../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
 import { ArcStudy } from "../../ISA/ArcTypes/ArcTypes.js";
+import { ArcTable_compressedDecoder, ArcTable_compressedEncoder } from "./ArcTable.js";
+import { toString } from "../../../fable_modules/Thoth.Json.JavaScript.0.1.0/Encode.fs.js";
 import { Study_decoder, Study_encoder } from "../Study.js";
-import { ConverterOptions__set_IncludeType_Z1FBCCD16, ConverterOptions__set_SetID_Z1FBCCD16, ConverterOptions_$ctor } from "../ConverterOptions.js";
-import { fromJsonString } from "../Decode.js";
-import { uncurry2 } from "../../../fable_modules/fable-library.4.5.0/Util.js";
-import { printf, toFail } from "../../../fable_modules/fable-library.4.5.0/String.js";
+import { ConverterOptions__set_IncludeContext_Z1FBCCD16, ConverterOptions__set_IncludeType_Z1FBCCD16, ConverterOptions__set_SetID_Z1FBCCD16, ConverterOptions_$ctor } from "../ConverterOptions.js";
+import { fromString } from "../../../fable_modules/Thoth.Json.JavaScript.0.1.0/Decode.fs.js";
+import { toFail, printf, toText } from "../../../fable_modules/fable-library-js.4.13.0/String.js";
+import { StringTable_arrayFromMap, StringTable_encoder, StringTable_decoder } from "../StringTable.js";
+import { OATable_arrayFromMap, OATable_encoder, OATable_decoder } from "./OATable.js";
+import { CellTable_arrayFromMap, CellTable_encoder, CellTable_decoder } from "./CellTable.js";
+import { Dictionary } from "../../../fable_modules/fable-library-js.4.13.0/MutableMap.js";
+import { safeHash, equals } from "../../../fable_modules/fable-library-js.4.13.0/Util.js";
 
 export function ArcStudy_encoder(study) {
-    return object(toList(delay(() => append(singleton(["Identifier", study.Identifier]), delay(() => append((study.Title != null) ? singleton(["Title", value_7(study.Title)]) : empty(), delay(() => append((study.Description != null) ? singleton(["Description", value_7(study.Description)]) : empty(), delay(() => append((study.SubmissionDate != null) ? singleton(["SubmissionDate", value_7(study.SubmissionDate)]) : empty(), delay(() => append((study.PublicReleaseDate != null) ? singleton(["PublicReleaseDate", value_7(study.PublicReleaseDate)]) : empty(), delay(() => append((study.Publications.length !== 0) ? singleton(["Publications", JsonHelper_EncoderPublications(study.Publications)]) : empty(), delay(() => append((study.Contacts.length !== 0) ? singleton(["Contacts", JsonHelper_EncoderPersons(study.Contacts)]) : empty(), delay(() => append((study.StudyDesignDescriptors.length !== 0) ? singleton(["StudyDesignDescriptors", JsonHelper_EncoderOAs(study.StudyDesignDescriptors)]) : empty(), delay(() => append((study.TableCount !== 0) ? singleton(["Tables", JsonHelper_EncoderTables(study.Tables)]) : empty(), delay(() => append((study.RegisteredAssayIdentifiers.length !== 0) ? singleton(["RegisteredAssayIdentifiers", seq(map((value_5) => value_5, study.RegisteredAssayIdentifiers))]) : empty(), delay(() => append((study.Factors.length !== 0) ? singleton(["Factors", JsonHelper_EncoderFactors(study.Factors)]) : empty(), delay(() => ((study.Comments.length !== 0) ? singleton(["Comments", JsonHelper_EncoderComments(study.Comments)]) : empty()))))))))))))))))))))))))));
+    return new Json(5, [toList(delay(() => append(singleton(["Identifier", new Json(0, [study.Identifier])]), delay(() => append((study.Title != null) ? singleton(["Title", new Json(0, [value_7(study.Title)])]) : empty(), delay(() => append((study.Description != null) ? singleton(["Description", new Json(0, [value_7(study.Description)])]) : empty(), delay(() => append((study.SubmissionDate != null) ? singleton(["SubmissionDate", new Json(0, [value_7(study.SubmissionDate)])]) : empty(), delay(() => append((study.PublicReleaseDate != null) ? singleton(["PublicReleaseDate", new Json(0, [value_7(study.PublicReleaseDate)])]) : empty(), delay(() => append((study.Publications.length !== 0) ? singleton(["Publications", JsonHelper_EncoderPublications(study.Publications)]) : empty(), delay(() => append((study.Contacts.length !== 0) ? singleton(["Contacts", JsonHelper_EncoderPersons(study.Contacts)]) : empty(), delay(() => append((study.StudyDesignDescriptors.length !== 0) ? singleton(["StudyDesignDescriptors", JsonHelper_EncoderOAs(study.StudyDesignDescriptors)]) : empty(), delay(() => append((study.TableCount !== 0) ? singleton(["Tables", JsonHelper_EncoderTables(study.Tables)]) : empty(), delay(() => append((study.RegisteredAssayIdentifiers.length !== 0) ? singleton(["RegisteredAssayIdentifiers", seq(map((value_5) => (new Json(0, [value_5])), study.RegisteredAssayIdentifiers))]) : empty(), delay(() => append((study.Factors.length !== 0) ? singleton(["Factors", JsonHelper_EncoderFactors(study.Factors)]) : empty(), delay(() => ((study.Comments.length !== 0) ? singleton(["Comments", JsonHelper_EncoderComments(study.Comments)]) : empty())))))))))))))))))))))))))]);
 }
 
-export const ArcStudy_decoder = (path_5) => ((v) => object_1((get$) => {
+export const ArcStudy_decoder = object((get$) => {
     let identifier;
     const objectArg = get$.Required;
     identifier = objectArg.Field("Identifier", string);
@@ -38,19 +45,64 @@ export const ArcStudy_decoder = (path_5) => ((v) => object_1((get$) => {
     const factors = JsonHelper_tryGetFactors(get$, "Factors");
     const comments = JsonHelper_tryGetComments(get$, "Comments");
     return ArcStudy.make(identifier, title, description, submissionDate, publicReleaseDate, publications, contacts, studyDesignDescriptors, tables, registeredAssayIdentifiers, factors, comments);
-}, path_5, v));
+});
+
+export function ArcStudy_compressedEncoder(stringTable, oaTable, cellTable, study) {
+    return new Json(5, [toList(delay(() => append(singleton(["Identifier", new Json(0, [study.Identifier])]), delay(() => append((study.Title != null) ? singleton(["Title", new Json(0, [value_7(study.Title)])]) : empty(), delay(() => append((study.Description != null) ? singleton(["Description", new Json(0, [value_7(study.Description)])]) : empty(), delay(() => append((study.SubmissionDate != null) ? singleton(["SubmissionDate", new Json(0, [value_7(study.SubmissionDate)])]) : empty(), delay(() => append((study.PublicReleaseDate != null) ? singleton(["PublicReleaseDate", new Json(0, [value_7(study.PublicReleaseDate)])]) : empty(), delay(() => append((study.Publications.length !== 0) ? singleton(["Publications", JsonHelper_EncoderPublications(study.Publications)]) : empty(), delay(() => append((study.Contacts.length !== 0) ? singleton(["Contacts", JsonHelper_EncoderPersons(study.Contacts)]) : empty(), delay(() => append((study.StudyDesignDescriptors.length !== 0) ? singleton(["StudyDesignDescriptors", JsonHelper_EncoderOAs(study.StudyDesignDescriptors)]) : empty(), delay(() => append((study.TableCount !== 0) ? singleton(["Tables", seq(map((table) => ArcTable_compressedEncoder(stringTable, oaTable, cellTable, table), study.Tables))]) : empty(), delay(() => append((study.RegisteredAssayIdentifiers.length !== 0) ? singleton(["RegisteredAssayIdentifiers", seq(map((value_5) => (new Json(0, [value_5])), study.RegisteredAssayIdentifiers))]) : empty(), delay(() => append((study.Factors.length !== 0) ? singleton(["Factors", JsonHelper_EncoderFactors(study.Factors)]) : empty(), delay(() => ((study.Comments.length !== 0) ? singleton(["Comments", JsonHelper_EncoderComments(study.Comments)]) : empty())))))))))))))))))))))))))]);
+}
+
+export function ArcStudy_compressedDecoder(stringTable, oaTable, cellTable) {
+    return object((get$) => {
+        let arg_1, objectArg;
+        const tables = defaultArg(map_1((collection) => Array.from(collection), (arg_1 = array(ArcTable_compressedDecoder(stringTable, oaTable, cellTable)), (objectArg = get$.Optional, objectArg.Field("Tables", arg_1)))), []);
+        let identifier;
+        const objectArg_1 = get$.Required;
+        identifier = objectArg_1.Field("Identifier", string);
+        let title;
+        const objectArg_2 = get$.Optional;
+        title = objectArg_2.Field("Title", string);
+        let description;
+        const objectArg_3 = get$.Optional;
+        description = objectArg_3.Field("Description", string);
+        let submissionDate;
+        const objectArg_4 = get$.Optional;
+        submissionDate = objectArg_4.Field("SubmissionDate", string);
+        let publicReleaseDate;
+        const objectArg_5 = get$.Optional;
+        publicReleaseDate = objectArg_5.Field("PublicReleaseDate", string);
+        const publications = JsonHelper_tryGetPublications(get$, "Publications");
+        const contacts = JsonHelper_tryGetPersons(get$, "Contacts");
+        const studyDesignDescriptors = JsonHelper_tryGetOAs(get$, "StudyDesignDescriptors");
+        const registeredAssayIdentifiers = JsonHelper_tryGetStringResizeArray(get$, "RegisteredAssayIdentifiers");
+        const factors = JsonHelper_tryGetFactors(get$, "Factors");
+        const comments = JsonHelper_tryGetComments(get$, "Comments");
+        return ArcStudy.make(identifier, title, description, submissionDate, publicReleaseDate, publications, contacts, studyDesignDescriptors, tables, registeredAssayIdentifiers, factors, comments);
+    });
+}
 
 /**
  * exports in json-ld format
  */
-export function ArcStudy_toStringLD(a, assays) {
+export function ArcStudy_toJsonldString(a, assays) {
     let returnVal;
     return toString(2, Study_encoder((returnVal = ConverterOptions_$ctor(), ((ConverterOptions__set_SetID_Z1FBCCD16(returnVal, true), ConverterOptions__set_IncludeType_Z1FBCCD16(returnVal, true)), returnVal)), a.ToStudy(assays)));
 }
 
+export function ArcStudy_toJsonldStringWithContext(a, assays) {
+    let returnVal;
+    return toString(2, Study_encoder((returnVal = ConverterOptions_$ctor(), (((ConverterOptions__set_SetID_Z1FBCCD16(returnVal, true), ConverterOptions__set_IncludeType_Z1FBCCD16(returnVal, true)), ConverterOptions__set_IncludeContext_Z1FBCCD16(returnVal, true)), returnVal)), a.ToStudy(assays)));
+}
+
 export function ArcStudy_fromJsonString(s) {
-    const s_1 = fromJsonString(uncurry2(Study_decoder(ConverterOptions_$ctor())), s);
-    return ArcStudy.fromStudy(s_1);
+    let s_2;
+    const matchValue = fromString(Study_decoder(ConverterOptions_$ctor()), s);
+    if (matchValue.tag === 1) {
+        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
+    }
+    else {
+        s_2 = matchValue.fields[0];
+    }
+    return ArcStudy.fromStudy(s_2);
 }
 
 export function ArcStudy_toJsonString(a, assays) {
@@ -62,22 +114,34 @@ export function ArcStudy_toArcJsonString(a) {
 }
 
 export function ArcStudy_fromArcJsonString(jsonString) {
-    const matchValue = fromString(uncurry2(ArcStudy_decoder), jsonString);
-    if (matchValue.tag === 1) {
-        return toFail(printf("Error. Unable to parse json string to ArcStudy: %s"))(matchValue.fields[0]);
+    try {
+        const matchValue = fromString(ArcStudy_decoder, jsonString);
+        if (matchValue.tag === 1) {
+            throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
+        }
+        else {
+            return matchValue.fields[0];
+        }
     }
-    else {
-        return matchValue.fields[0];
+    catch (e_1) {
+        const arg_1 = e_1.message;
+        return toFail(printf("Error. Unable to parse json string to ArcStudy: %s"))(arg_1);
     }
 }
 
 export function ARCtrl_ISA_ArcStudy__ArcStudy_fromArcJsonString_Static_Z721C83C5(jsonString) {
-    const matchValue = fromString(uncurry2(ArcStudy_decoder), jsonString);
-    if (matchValue.tag === 1) {
-        return toFail(printf("Error. Unable to parse json string to ArcStudy: %s"))(matchValue.fields[0]);
+    try {
+        const matchValue = fromString(ArcStudy_decoder, jsonString);
+        if (matchValue.tag === 1) {
+            throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
+        }
+        else {
+            return matchValue.fields[0];
+        }
     }
-    else {
-        return matchValue.fields[0];
+    catch (e_1) {
+        const arg_1 = e_1.message;
+        return toFail(printf("Error. Unable to parse json string to ArcStudy: %s"))(arg_1);
     }
 }
 
@@ -89,3 +153,51 @@ export function ARCtrl_ISA_ArcStudy__ArcStudy_toArcJsonString_Static_1B3D5E9B(a)
     return ARCtrl_ISA_ArcStudy__ArcStudy_ToArcJsonString_71136F3F(a);
 }
 
+export function ARCtrl_ISA_ArcStudy__ArcStudy_fromCompressedJsonString_Static_Z721C83C5(jsonString) {
+    const decoder = object((get$) => {
+        let arg_5, objectArg_2;
+        let stringTable;
+        const objectArg = get$.Required;
+        stringTable = objectArg.Field("stringTable", StringTable_decoder);
+        let oaTable;
+        const arg_3 = OATable_decoder(stringTable);
+        const objectArg_1 = get$.Required;
+        oaTable = objectArg_1.Field("oaTable", arg_3);
+        const arg_7 = ArcStudy_compressedDecoder(stringTable, oaTable, (arg_5 = CellTable_decoder(stringTable, oaTable), (objectArg_2 = get$.Required, objectArg_2.Field("cellTable", arg_5))));
+        const objectArg_3 = get$.Required;
+        return objectArg_3.Field("study", arg_7);
+    });
+    try {
+        const matchValue = fromString(decoder, jsonString);
+        if (matchValue.tag === 1) {
+            throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
+        }
+        else {
+            return matchValue.fields[0];
+        }
+    }
+    catch (e_1) {
+        const arg_9 = e_1.message;
+        return toFail(printf("Error. Unable to parse json string to ArcAssay: %s"))(arg_9);
+    }
+}
+
+export function ARCtrl_ISA_ArcStudy__ArcStudy_ToCompressedJsonString_71136F3F(this$, spaces) {
+    const spaces_1 = defaultArg(spaces, 0) | 0;
+    const stringTable = new Map([]);
+    const oaTable = new Dictionary([], {
+        Equals: equals,
+        GetHashCode: safeHash,
+    });
+    const cellTable = new Dictionary([], {
+        Equals: equals,
+        GetHashCode: safeHash,
+    });
+    const arcStudy = ArcStudy_compressedEncoder(stringTable, oaTable, cellTable, this$);
+    return toString(spaces_1, new Json(5, [[["cellTable", CellTable_encoder(stringTable, oaTable, CellTable_arrayFromMap(cellTable))], ["oaTable", OATable_encoder(stringTable, OATable_arrayFromMap(oaTable))], ["stringTable", StringTable_encoder(StringTable_arrayFromMap(stringTable))], ["study", arcStudy]]]));
+}
+
+export function ARCtrl_ISA_ArcStudy__ArcStudy_toCompressedJsonString_Static_1B3D5E9B(s) {
+    return ARCtrl_ISA_ArcStudy__ArcStudy_ToCompressedJsonString_71136F3F(s);
+}
+

package/ISA/ISA.Json/ArcTypes/ArcTable.js

@@ -1,46 +1,167 @@
-import { toString, tuple2, map as map_1, list, object } from "../../../fable_modules/Thoth.Json.10.1.0/Encode.fs.js";
-import { collect, empty, map, singleton, append, delay, toList } from "../../../fable_modules/fable-library.4.5.0/Seq.js";
+import { toArray, collect, empty, map, singleton, append, delay, toList } from "../../../fable_modules/fable-library-js.4.13.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.4.5.0/Map.js";
-import { arrayHash, equalArrays, uncurry2, compareArrays } from "../../../fable_modules/fable-library.4.5.0/Util.js";
-import { fromString, string, int, tuple2 as tuple2_1, map$0027, list as list_1, object as object_1 } from "../../../fable_modules/Thoth.Json.10.1.0/Decode.fs.js";
-import { defaultArg } from "../../../fable_modules/fable-library.4.5.0/Option.js";
-import { empty as empty_1 } from "../../../fable_modules/fable-library.4.5.0/List.js";
-import { Dictionary } from "../../../fable_modules/fable-library.4.5.0/MutableMap.js";
+import { empty as empty_2, ofSeq } from "../../../fable_modules/fable-library-js.4.13.0/Map.js";
+import { safeHash, int32ToString, equals, arrayHash, equalArrays, compareArrays } from "../../../fable_modules/fable-library-js.4.13.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 { defaultArg } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
+import { empty as empty_1 } from "../../../fable_modules/fable-library-js.4.13.0/List.js";
+import { Dictionary } from "../../../fable_modules/fable-library-js.4.13.0/MutableMap.js";
 import { ArcTable } from "../../ISA/ArcTypes/ArcTable.js";
-import { printf, toFail } from "../../../fable_modules/fable-library.4.5.0/String.js";
+import { CellTable_arrayFromMap, CellTable_encoder, CellTable_decoder, CellTable_decodeCell, CellTable_encodeCell } from "./CellTable.js";
+import { addToDict, getItemFromDict } from "../../../fable_modules/fable-library-js.4.13.0/MapUtil.js";
+import { rangeDouble } from "../../../fable_modules/fable-library-js.4.13.0/Range.js";
+import { FSharpResult$2 } from "../../../fable_modules/fable-library-js.4.13.0/Result.js";
+import { fill, setItem, fold, iterateIndexed } from "../../../fable_modules/fable-library-js.4.13.0/Array.js";
+import { StringTable_arrayFromMap, StringTable_encoder, StringTable_decoder, StringTable_decodeString, StringTable_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.13.0/String.js";
+import { toString } from "../../../fable_modules/Thoth.Json.JavaScript.0.1.0/Encode.fs.js";
+import { OATable_arrayFromMap, OATable_encoder, OATable_decoder } from "./OATable.js";
 
 export function ArcTable_encoder(table) {
-    return object(toList(delay(() => append(singleton(["name", 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) => value, (value_2) => value_2, tupledArg[0], tupledArg[1]), CompositeCell_encoder, ofSeq(toList(delay(() => collect((matchValue) => {
+    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()))))))));
+    }))]) : empty())))))))]);
 }
 
-export const ArcTable_decoder = (path_2) => ((v) => object_1((get$) => {
-    let objectArg, arg_5, objectArg_1, objectArg_2;
+export const ArcTable_decoder = object((get$) => {
+    let arg_1, objectArg, arg_3, objectArg_1, objectArg_2;
     let decodedHeader;
-    const collection = defaultArg((objectArg = get$.Optional, objectArg.Field("header", (path, value) => list_1(uncurry2(CompositeHeader_decoder), path, value))), empty_1());
+    const collection = defaultArg((arg_1 = list_1(CompositeHeader_decoder), (objectArg = get$.Optional, objectArg.Field("header", arg_1))), empty_1());
     decodedHeader = Array.from(collection);
-    const decodedValues = new Dictionary(defaultArg((arg_5 = map$0027(uncurry2(tuple2_1(uncurry2(int), uncurry2(int))), uncurry2((arg_2) => {
-        const clo = CompositeCell_decoder(arg_2);
-        return clo;
-    })), (objectArg_1 = get$.Optional, objectArg_1.Field("values", uncurry2(arg_5)))), empty_2({
+    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({
         Compare: compareArrays,
     })), {
         Equals: equalArrays,
         GetHashCode: arrayHash,
     });
     return ArcTable.create((objectArg_2 = get$.Required, objectArg_2.Field("name", string)), decodedHeader, decodedValues);
-}, path_2, v));
+});
+
+export function ArcTable_compressedColumnEncoder(columnIndex, rowCount, cellTable, table) {
+    if (table.Headers[columnIndex].IsIOType ? true : (rowCount < 100)) {
+        return new Json(6, [toArray(delay(() => map((r) => CellTable_encodeCell(cellTable, getItemFromDict(table.Values, [columnIndex, r])), rangeDouble(0, 1, rowCount - 1))))]);
+    }
+    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 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", CellTable_encodeCell(cellTable, current)]]])), 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", CellTable_encodeCell(cellTable, current)]]]));
+        }))))]);
+    }
+}
+
+export function ArcTable_compressedColumnDecoder(cellTable, table, columnIndex) {
+    return {
+        Decode(helper, column) {
+            const matchValue = array_1(CellTable_decodeCell(cellTable)).Decode(helper, column);
+            if (matchValue.tag === 1) {
+                const rangeDecoder = object((get$) => {
+                    let from;
+                    const objectArg = get$.Required;
+                    from = objectArg.Field("f", int);
+                    let to_;
+                    const objectArg_1 = get$.Required;
+                    to_ = objectArg_1.Field("t", int);
+                    let value;
+                    const arg_5 = CellTable_decodeCell(cellTable);
+                    const objectArg_2 = get$.Required;
+                    value = objectArg_2.Field("v", arg_5);
+                    for (let i = from; i <= to_; i++) {
+                        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]));
+            }
+            else {
+                iterateIndexed((r, cell) => {
+                    addToDict(table.Values, [columnIndex, r], cell);
+                }, matchValue.fields[0]);
+                return new FSharpResult$2(0, [void 0]);
+            }
+        },
+    };
+}
+
+export function ArcTable_arrayi(decoderi) {
+    return {
+        Decode(helpers, value) {
+            if (helpers.isArray(value)) {
+                let i = -1;
+                const tokens = helpers.asArray(value);
+                return fold((acc, value_1) => {
+                    let tupledArg;
+                    i = ((i + 1) | 0);
+                    if (acc.tag === 0) {
+                        const acc_1 = acc.fields[0];
+                        const matchValue = decoderi(i).Decode(helpers, value_1);
+                        if (matchValue.tag === 0) {
+                            setItem(acc_1, i, matchValue.fields[0]);
+                            return new FSharpResult$2(0, [acc_1]);
+                        }
+                        else {
+                            return new FSharpResult$2(1, [(tupledArg = matchValue.fields[0], Helpers_prependPath((".[" + int32ToString(i)) + "]", tupledArg[0], tupledArg[1]))]);
+                        }
+                    }
+                    else {
+                        return acc;
+                    }
+                }, new FSharpResult$2(0, [fill(new Array(tokens.length), 0, tokens.length, null)]), tokens);
+            }
+            else {
+                return new FSharpResult$2(1, [["", new ErrorReason$1(0, ["an array", value])]]);
+            }
+        },
+    };
+}
+
+export function ArcTable_compressedEncoder(stringTable, oaTable, cellTable, table) {
+    return new Json(5, [toList(delay(() => append(singleton(["n", StringTable_encodeString(stringTable, table.Name)]), delay(() => append((table.Headers.length !== 0) ? singleton(["h", list(toList(delay(() => map(CompositeHeader_encoder, 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_compressedColumnEncoder(c, rowCount, cellTable, table), rangeDouble(0, 1, table.ColumnCount - 1))))])]);
+        }
+        else {
+            return empty();
+        }
+    }))))))]);
+}
+
+export function ArcTable_compressedDecoder(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());
+        decodedHeader = Array.from(collection);
+        const table = ArcTable.create((arg_3 = StringTable_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_compressedColumnDecoder(cellTable, table, columnIndex)), (objectArg_2 = get$.Optional, objectArg_2.Field("c", arg_5)));
+        return table;
+    });
+}
 
 export function ARCtrl_ISA_ArcTable__ArcTable_fromJsonString_Static_Z721C83C5(jsonString) {
-    const matchValue = fromString(uncurry2(ArcTable_decoder), jsonString);
+    const matchValue = fromString(ArcTable_decoder, jsonString);
     if (matchValue.tag === 1) {
-        return toFail(printf("Error. Unable to parse json string to ArcTable: %s"))(matchValue.fields[0]);
+        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
     }
     else {
         return matchValue.fields[0];
@@ -55,3 +176,44 @@ export function ARCtrl_ISA_ArcTable__ArcTable_toJsonString_Static_1B2566EA(a) {
     return ARCtrl_ISA_ArcTable__ArcTable_ToJsonString_71136F3F(a);
 }
 
+export function ARCtrl_ISA_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", StringTable_decoder);
+        let oaTable;
+        const arg_3 = OATable_decoder(stringTable);
+        const objectArg_1 = get$.Required;
+        oaTable = objectArg_1.Field("oaTable", arg_3);
+        const arg_7 = ArcTable_compressedDecoder(stringTable, oaTable, (arg_5 = CellTable_decoder(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_ISA_ArcTable__ArcTable_ToCompressedJsonString_71136F3F(this$, spaces) {
+    const spaces_1 = defaultArg(spaces, 0) | 0;
+    const stringTable = new Map([]);
+    const oaTable = new Dictionary([], {
+        Equals: equals,
+        GetHashCode: safeHash,
+    });
+    const cellTable = new Dictionary([], {
+        Equals: equals,
+        GetHashCode: safeHash,
+    });
+    const arcTable = ArcTable_compressedEncoder(stringTable, oaTable, cellTable, this$);
+    return toString(spaces_1, new Json(5, [[["cellTable", CellTable_encoder(stringTable, oaTable, CellTable_arrayFromMap(cellTable))], ["oaTable", OATable_encoder(stringTable, OATable_arrayFromMap(oaTable))], ["stringTable", StringTable_encoder(StringTable_arrayFromMap(stringTable))], ["table", arcTable]]]));
+}
+
+export function ARCtrl_ISA_ArcTable__ArcTable_toCompressedJsonString_Static_1B2566EA(a) {
+    return ARCtrl_ISA_ArcTable__ArcTable_ToCompressedJsonString_71136F3F(a);
+}
+

package/ISA/ISA.Json/ArcTypes/CellTable.js

@@ -0,0 +1,40 @@
+import { sortBy, map, toArray } from "../../../fable_modules/fable-library-js.4.13.0/Seq.js";
+import { comparePrimitives } from "../../../fable_modules/fable-library-js.4.13.0/Util.js";
+import { item, map as map_1 } from "../../../fable_modules/fable-library-js.4.13.0/Array.js";
+import { CompositeCell_compressedDecoder, CompositeCell_compressedEncoder } 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 { Dict_tryFind } from "../../ISA/Helper.js";
+import { addToDict } from "../../../fable_modules/fable-library-js.4.13.0/MapUtil.js";
+
+export function CellTable_arrayFromMap(otm) {
+    return toArray(map((kv_1) => kv_1[0], sortBy((kv) => kv[1], otm, {
+        Compare: comparePrimitives,
+    })));
+}
+
+export function CellTable_encoder(stringTable, oaTable, ot) {
+    return new Json(6, [map_1((cc) => CompositeCell_compressedEncoder(stringTable, oaTable, cc), ot)]);
+}
+
+export function CellTable_decoder(stringTable, oaTable) {
+    return array_1(CompositeCell_compressedDecoder(stringTable, oaTable));
+}
+
+export function CellTable_encodeCell(otm, cc) {
+    const matchValue = Dict_tryFind(cc, otm);
+    if (matchValue == null) {
+        const i_1 = otm.size | 0;
+        addToDict(otm, cc, i_1);
+        return new Json(7, [i_1 >>> 0]);
+    }
+    else {
+        const i = matchValue | 0;
+        return new Json(7, [i >>> 0]);
+    }
+}
+
+export function CellTable_decodeCell(ot) {
+    return object((get$) => item(get$.Required.Raw(int), ot));
+}
+

package/ISA/ISA.Json/ArcTypes/CompositeCell.js

@@ -1,40 +1,51 @@
 import { OntologyAnnotation_decoder, OntologyAnnotation_encoder } from "../Ontology.js";
 import { ConverterOptions_$ctor } from "../ConverterOptions.js";
-import { ofArray, singleton } from "../../../fable_modules/fable-library.4.5.0/List.js";
-import { toString, list, object } from "../../../fable_modules/Thoth.Json.10.1.0/Encode.fs.js";
-import { fromString, index, string, object as object_1 } from "../../../fable_modules/Thoth.Json.10.1.0/Decode.fs.js";
+import { ofArray, singleton } from "../../../fable_modules/fable-library-js.4.13.0/List.js";
+import { Json } from "../../../fable_modules/Thoth.Json.Core.0.2.1/Types.fs.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 { CompositeCell } from "../../ISA/ArcTypes/CompositeCell.js";
-import { uncurry2 } from "../../../fable_modules/fable-library.4.5.0/Util.js";
-import { printf, toFail } from "../../../fable_modules/fable-library.4.5.0/String.js";
-import { defaultArg } from "../../../fable_modules/fable-library.4.5.0/Option.js";
+import { toText, printf, toFail } from "../../../fable_modules/fable-library-js.4.13.0/String.js";
+import { OATable_decodeOA, OATable_encodeOA } from "./OATable.js";
+import { StringTable_decodeString, StringTable_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 { defaultArg } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
 
 export function CompositeCell_encoder(cc) {
     const oaToJsonString = (oa) => OntologyAnnotation_encoder(ConverterOptions_$ctor(), oa);
-    const patternInput = (cc.tag === 0) ? ["Term", singleton(oaToJsonString(cc.fields[0]))] : ((cc.tag === 2) ? ["Unitized", ofArray([cc.fields[0], oaToJsonString(cc.fields[1])])] : ["FreeText", singleton(cc.fields[0])]);
-    return object([["celltype", patternInput[0]], ["values", list(patternInput[1])]]);
+    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])])] : ["FreeText", singleton(new Json(0, [cc.fields[0]]))]);
+    return new Json(5, [[["celltype", new Json(0, [patternInput[0]])], ["values", list(patternInput[1])]]]);
 }
 
-export const CompositeCell_decoder = (path_7) => ((v_1) => object_1((get$) => {
-    let objectArg_1, arg_5, decoder_1, objectArg_2, objectArg_3, arg_9, decoder_3, objectArg_4;
+export const CompositeCell_decoder = object((get$) => {
+    let arg_3, objectArg_1, arg_5, objectArg_2, arg_7, objectArg_3, arg_9, objectArg_4;
     let matchValue;
     const objectArg = get$.Required;
     matchValue = objectArg.Field("celltype", string);
-    switch (matchValue) {
-        case "FreeText":
-            return new CompositeCell(1, [(objectArg_1 = get$.Required, objectArg_1.Field("values", (path_2, value_2) => index(0, string, path_2, value_2)))]);
-        case "Term":
-            return new CompositeCell(0, [(arg_5 = ((decoder_1 = OntologyAnnotation_decoder(ConverterOptions_$ctor()), (path_3) => ((value_3) => index(0, uncurry2(decoder_1), path_3, value_3)))), (objectArg_2 = get$.Required, objectArg_2.Field("values", uncurry2(arg_5))))]);
-        case "Unitized":
-            return new CompositeCell(2, [(objectArg_3 = get$.Required, objectArg_3.Field("values", (path_4, value_4) => index(0, string, path_4, value_4))), (arg_9 = ((decoder_3 = OntologyAnnotation_decoder(ConverterOptions_$ctor()), (path_6) => ((value_6) => index(1, uncurry2(decoder_3), path_6, value_6)))), (objectArg_4 = get$.Required, objectArg_4.Field("values", uncurry2(arg_9))))]);
-        default:
-            return toFail(printf("Error reading CompositeCell from json string: %A"))(matchValue);
-    }
-}, path_7, v_1));
+    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(ConverterOptions_$ctor())), (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(ConverterOptions_$ctor())), (objectArg_4 = get$.Required, objectArg_4.Field("values", arg_9)))])) : toFail(printf("Error reading CompositeCell from json string: %A"))(matchValue)));
+});
+
+export function CompositeCell_compressedEncoder(stringTable, oaTable, cc) {
+    const patternInput = (cc.tag === 0) ? ["Term", singleton(OATable_encodeOA(oaTable, cc.fields[0]))] : ((cc.tag === 2) ? ["Unitized", ofArray([StringTable_encodeString(stringTable, cc.fields[0]), OATable_encodeOA(oaTable, cc.fields[1])])] : ["FreeText", singleton(StringTable_encodeString(stringTable, cc.fields[0]))]);
+    return new Json(5, [[["t", StringTable_encodeString(stringTable, patternInput[0])], ["v", list(patternInput[1])]]]);
+}
+
+export function CompositeCell_compressedDecoder(stringTable, oaTable) {
+    return object((get$) => {
+        let arg_3, objectArg_1, arg_5, objectArg_2, arg_7, objectArg_3, arg_9, objectArg_4;
+        let matchValue;
+        const arg_1 = StringTable_decodeString(stringTable);
+        const objectArg = get$.Required;
+        matchValue = objectArg.Field("t", arg_1);
+        return (matchValue === "FreeText") ? (new CompositeCell(1, [(arg_3 = index(0, StringTable_decodeString(stringTable)), (objectArg_1 = get$.Required, objectArg_1.Field("v", arg_3)))])) : ((matchValue === "Term") ? (new CompositeCell(0, [(arg_5 = index(0, OATable_decodeOA(oaTable)), (objectArg_2 = get$.Required, objectArg_2.Field("v", arg_5)))])) : ((matchValue === "Unitized") ? (new CompositeCell(2, [(arg_7 = index(0, StringTable_decodeString(stringTable)), (objectArg_3 = get$.Required, objectArg_3.Field("v", arg_7))), (arg_9 = index(1, OATable_decodeOA(oaTable)), (objectArg_4 = get$.Required, objectArg_4.Field("v", arg_9)))])) : toFail(printf("Error reading CompositeCell from json string: %A"))(matchValue)));
+    });
+}
 
 export function ARCtrl_ISA_CompositeCell__CompositeCell_fromJsonString_Static_Z721C83C5(jsonString) {
-    const matchValue = fromString(uncurry2(CompositeCell_decoder), jsonString);
+    const matchValue = fromString(CompositeCell_decoder, jsonString);
     if (matchValue.tag === 1) {
-        return toFail(printf("Error. Unable to parse json string to CompositeCell: %s"))(matchValue.fields[0]);
+        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
     }
     else {
         return matchValue.fields[0];