@nfdi4plants/arctrl 1.1.0 → 1.2.0

package/ISA/ISA/JsonTypes/Publication.js

@@ -1,11 +1,11 @@
-import { filter, map, tryFind, exists, singleton, append } from "../../../fable_modules/fable-library.4.5.0/List.js";
-import { equals } from "../../../fable_modules/fable-library.4.5.0/Util.js";
-import { record_type, array_type, option_type, string_type, getRecordFields, makeRecord } from "../../../fable_modules/fable-library.4.5.0/Reflection.js";
-import { map as map_2, map2 } from "../../../fable_modules/fable-library.4.5.0/Array.js";
+import { filter, map, tryFind, exists, singleton, append } from "../../../fable_modules/fable-library-js.4.13.0/List.js";
+import { equals } from "../../../fable_modules/fable-library-js.4.13.0/Util.js";
+import { record_type, array_type, option_type, string_type, getRecordFields, makeRecord } from "../../../fable_modules/fable-library-js.4.13.0/Reflection.js";
+import { map as map_2, map2 } from "../../../fable_modules/fable-library-js.4.13.0/Array.js";
 import { Update_updateOnlyByExistingAppend, Update_updateOnlyByExisting, Update_updateAppend } from "../Helper.js";
-import { map as map_1 } from "../../../fable_modules/fable-library.4.5.0/Option.js";
+import { map as map_1 } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
 import { Option_mapDefault } from "../Helper.js";
-import { Record } from "../../../fable_modules/fable-library.4.5.0/Types.js";
+import { Record } from "../../../fable_modules/fable-library-js.4.13.0/Types.js";
 import { OntologyAnnotation_$reflection } from "./OntologyAnnotation.js";
 import { Comment$_$reflection } from "./Comment.js";
 

package/ISA/ISA/JsonTypes/Sample.js

@@ -1,8 +1,8 @@
-import { Record, toString } from "../../../fable_modules/fable-library.4.5.0/Types.js";
-import { append, choose, empty, length } from "../../../fable_modules/fable-library.4.5.0/List.js";
-import { defaultArg } from "../../../fable_modules/fable-library.4.5.0/Option.js";
-import { printf, toText } from "../../../fable_modules/fable-library.4.5.0/String.js";
-import { record_type, list_type, option_type, string_type } from "../../../fable_modules/fable-library.4.5.0/Reflection.js";
+import { Record, toString } from "../../../fable_modules/fable-library-js.4.13.0/Types.js";
+import { append, choose, empty, length } from "../../../fable_modules/fable-library-js.4.13.0/List.js";
+import { defaultArg } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
+import { printf, toText } from "../../../fable_modules/fable-library-js.4.13.0/String.js";
+import { record_type, list_type, option_type, string_type } from "../../../fable_modules/fable-library-js.4.13.0/Reflection.js";
 import { MaterialAttributeValue_$reflection } from "./MaterialAttributeValue.js";
 import { FactorValue_$reflection } from "./FactorValue.js";
 import { Source_$reflection } from "./Source.js";

package/ISA/ISA/JsonTypes/Source.js

@@ -1,8 +1,8 @@
-import { Record, toString } from "../../../fable_modules/fable-library.4.5.0/Types.js";
-import { choose, empty, length } from "../../../fable_modules/fable-library.4.5.0/List.js";
-import { defaultArg } from "../../../fable_modules/fable-library.4.5.0/Option.js";
-import { printf, toText } from "../../../fable_modules/fable-library.4.5.0/String.js";
-import { record_type, list_type, option_type, string_type } from "../../../fable_modules/fable-library.4.5.0/Reflection.js";
+import { Record, toString } from "../../../fable_modules/fable-library-js.4.13.0/Types.js";
+import { choose, empty, length } from "../../../fable_modules/fable-library-js.4.13.0/List.js";
+import { defaultArg } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
+import { printf, toText } from "../../../fable_modules/fable-library-js.4.13.0/String.js";
+import { record_type, list_type, option_type, string_type } from "../../../fable_modules/fable-library-js.4.13.0/Reflection.js";
 import { MaterialAttributeValue_$reflection } from "./MaterialAttributeValue.js";
 
 export class Source extends Record {

package/ISA/ISA/JsonTypes/Study.js

@@ -1,5 +1,5 @@
-import { Record } from "../../../fable_modules/fable-library.4.5.0/Types.js";
-import { getRecordFields, makeRecord, record_type, list_type, option_type, string_type } from "../../../fable_modules/fable-library.4.5.0/Reflection.js";
+import { Record } from "../../../fable_modules/fable-library-js.4.13.0/Types.js";
+import { getRecordFields, makeRecord, record_type, list_type, option_type, string_type } from "../../../fable_modules/fable-library-js.4.13.0/Reflection.js";
 import { Publication_$reflection } from "./Publication.js";
 import { Person_$reflection } from "./Person.js";
 import { OntologyAnnotation_$reflection } from "./OntologyAnnotation.js";
@@ -10,19 +10,19 @@ import { Assay_update_722A269D, Assay_updateProtocols, Assay_getMaterials_722A26
 import { Factor_$reflection } from "./Factor.js";
 import { MaterialAttribute_$reflection } from "./MaterialAttribute.js";
 import { Comment$_$reflection } from "./Comment.js";
-import { collect, empty, filter, map, singleton, append, exists } from "../../../fable_modules/fable-library.4.5.0/List.js";
-import { stringHash, safeHash, structuralHash, equals } from "../../../fable_modules/fable-library.4.5.0/Util.js";
-import { map2 as map2_2 } from "../../../fable_modules/fable-library.4.5.0/Array.js";
+import { collect, empty, filter, map, singleton, append, exists } from "../../../fable_modules/fable-library-js.4.13.0/List.js";
+import { stringHash, safeHash, structuralHash, equals } from "../../../fable_modules/fable-library-js.4.13.0/Util.js";
+import { map2 as map2_2 } from "../../../fable_modules/fable-library-js.4.13.0/Array.js";
 import { Dict_tryFind, Dict_ofSeqWithMerge, Update_updateOnlyByExistingAppend, Update_updateOnlyByExisting, Update_updateAppend } from "../Helper.js";
-import { map as map_1, defaultArg } from "../../../fable_modules/fable-library.4.5.0/Option.js";
+import { map as map_1, defaultArg } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
 import { Option_fromValueWithDefault, Update_UpdateOptions, Option_mapDefault } from "../Helper.js";
 import { updateProtocols, getMaterials, getSamples, getSources, getUnits, getFactors, getCharacteristics, getProtocols } from "./ProcessSequence.js";
-import { List_distinct } from "../../../fable_modules/fable-library.4.5.0/Seq2.js";
+import { List_distinct } from "../../../fable_modules/fable-library-js.4.13.0/Seq2.js";
 import { Source_$reflection } from "./Source.js";
 import { Sample_$reflection } from "./Sample.js";
 import { AssayMaterials_getMaterials_35E61745 } from "./AssayMaterials.js";
 import { Material_$reflection } from "./Material.js";
-import { toFail } from "../../../fable_modules/fable-library.4.5.0/String.js";
+import { toFail } from "../../../fable_modules/fable-library-js.4.13.0/String.js";
 
 export class Study extends Record {
     constructor(ID, FileName, Identifier, Title, Description, SubmissionDate, PublicReleaseDate, Publications, Contacts, StudyDesignDescriptors, Protocols, Materials, ProcessSequence, Assays, Factors, CharacteristicCategories, UnitCategories, Comments) {

package/ISA/ISA/JsonTypes/StudyMaterials.js

@@ -1,10 +1,10 @@
-import { Record } from "../../../fable_modules/fable-library.4.5.0/Types.js";
+import { Record } from "../../../fable_modules/fable-library-js.4.13.0/Types.js";
 import { Source_$reflection } from "./Source.js";
-import { record_type, option_type, list_type } from "../../../fable_modules/fable-library.4.5.0/Reflection.js";
+import { record_type, option_type, list_type } from "../../../fable_modules/fable-library-js.4.13.0/Reflection.js";
 import { Sample_$reflection } from "./Sample.js";
 import { Material_$reflection } from "./Material.js";
-import { defaultArg } from "../../../fable_modules/fable-library.4.5.0/Option.js";
-import { empty } from "../../../fable_modules/fable-library.4.5.0/List.js";
+import { defaultArg } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
+import { empty } from "../../../fable_modules/fable-library-js.4.13.0/List.js";
 
 export class StudyMaterials extends Record {
     constructor(Sources, Samples, OtherMaterials) {

package/ISA/ISA/JsonTypes/Value.js

@@ -1,11 +1,11 @@
-import { parse } from "../../../fable_modules/fable-library.4.5.0/Double.js";
-import { parse as parse_1 } from "../../../fable_modules/fable-library.4.5.0/Int32.js";
+import { tryParse } from "../../../fable_modules/fable-library-js.4.13.0/Int32.js";
+import { Union, toString, FSharpRef } from "../../../fable_modules/fable-library-js.4.13.0/Types.js";
+import { tryParse as tryParse_1 } from "../../../fable_modules/fable-library-js.4.13.0/Double.js";
 import { OntologyAnnotation_$reflection, OntologyAnnotation } from "./OntologyAnnotation.js";
-import { defaultArg } from "../../../fable_modules/fable-library.4.5.0/Option.js";
-import { int32ToString } from "../../../fable_modules/fable-library.4.5.0/Util.js";
-import { Union, toString } from "../../../fable_modules/fable-library.4.5.0/Types.js";
-import { printf, toText } from "../../../fable_modules/fable-library.4.5.0/String.js";
-import { union_type, string_type, float64_type, int32_type } from "../../../fable_modules/fable-library.4.5.0/Reflection.js";
+import { defaultArg } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
+import { int32ToString } from "../../../fable_modules/fable-library-js.4.13.0/Util.js";
+import { printf, toText } from "../../../fable_modules/fable-library-js.4.13.0/String.js";
+import { union_type, string_type, float64_type, int32_type } from "../../../fable_modules/fable-library-js.4.13.0/Reflection.js";
 
 export class Value extends Union {
     constructor(tag, fields) {
@@ -17,33 +17,26 @@ export class Value extends Union {
         return ["Ontology", "Int", "Float", "Name"];
     }
     static fromString(value) {
-        try {
-            return new Value(1, [parse_1(value, 511, false, 32)]);
+        let matchValue;
+        let outArg = 0;
+        matchValue = [tryParse(value, 511, false, 32, new FSharpRef(() => outArg, (v) => {
+            outArg = (v | 0);
+        })), outArg];
+        if (matchValue[0]) {
+            return new Value(1, [matchValue[1]]);
         }
-        catch (matchValue) {
-            try {
-                return new Value(2, [parse(value)]);
-            }
-            catch (matchValue_1) {
-                return new Value(3, [value]);
-            }
+        else {
+            let matchValue_1;
+            let outArg_1 = 0;
+            matchValue_1 = [tryParse_1(value, new FSharpRef(() => outArg_1, (v_1) => {
+                outArg_1 = v_1;
+            })), outArg_1];
+            return matchValue_1[0] ? (new Value(2, [matchValue_1[1]])) : (new Value(3, [value]));
         }
     }
     static fromOptions(value, termSource, termAccesssion) {
         let value_1;
-        return (value == null) ? ((termSource == null) ? ((termAccesssion == null) ? void 0 : (new Value(0, [OntologyAnnotation.fromString(defaultArg(value, ""), termSource, termAccesssion)]))) : (new Value(0, [OntologyAnnotation.fromString(defaultArg(value, ""), termSource, termAccesssion)]))) : ((termSource == null) ? ((termAccesssion == null) ? ((value_1 = value, (() => {
-            try {
-                return new Value(1, [parse_1(value_1, 511, false, 32)]);
-            }
-            catch (matchValue_1) {
-                try {
-                    return new Value(2, [parse(value_1)]);
-                }
-                catch (matchValue_2) {
-                    return new Value(3, [value_1]);
-                }
-            }
-        })())) : (new Value(0, [OntologyAnnotation.fromString(defaultArg(value, ""), termSource, termAccesssion)]))) : (new Value(0, [OntologyAnnotation.fromString(defaultArg(value, ""), termSource, termAccesssion)])));
+        return (value == null) ? ((termSource == null) ? ((termAccesssion == null) ? void 0 : (new Value(0, [OntologyAnnotation.fromString(defaultArg(value, ""), termSource, termAccesssion)]))) : (new Value(0, [OntologyAnnotation.fromString(defaultArg(value, ""), termSource, termAccesssion)]))) : ((termSource == null) ? ((termAccesssion == null) ? ((value_1 = value, Value.fromString(value_1))) : (new Value(0, [OntologyAnnotation.fromString(defaultArg(value, ""), termSource, termAccesssion)]))) : (new Value(0, [OntologyAnnotation.fromString(defaultArg(value, ""), termSource, termAccesssion)])));
     }
     static toOptions(value) {
         switch (value.tag) {

package/ISA/ISA/Regex.js

@@ -1,6 +1,6 @@
-import { create, match } from "../../fable_modules/fable-library.4.5.0/RegExp.js";
-import { parse } from "../../fable_modules/fable-library.4.5.0/Int32.js";
-import { map } from "../../fable_modules/fable-library.4.5.0/Option.js";
+import { create, match } from "../../fable_modules/fable-library-js.4.13.0/RegExp.js";
+import { parse } from "../../fable_modules/fable-library-js.4.13.0/Int32.js";
+import { map } from "../../fable_modules/fable-library-js.4.13.0/Option.js";
 
 export function Pattern_handleGroupPatterns(pattern) {
     return pattern;

package/ISA/ISA.Json/ArcTypes/ArcAssay.js

@@ -1,92 +1,79 @@
 import { OntologySourceReference_encoder, OntologyAnnotation_encoder, OntologySourceReference_decoder, OntologyAnnotation_decoder } from "../Ontology.js";
-import { ConverterOptions__set_IncludeType_Z1FBCCD16, ConverterOptions__set_SetID_Z1FBCCD16, ConverterOptions_$ctor } from "../ConverterOptions.js";
-import { fromString, array, object as object_1, string, list as list_1 } from "../../../fable_modules/Thoth.Json.10.1.0/Decode.fs.js";
-import { safeHash, equals, uncurry2 } from "../../../fable_modules/fable-library.4.5.0/Util.js";
+import { ConverterOptions__set_IncludeContext_Z1FBCCD16, ConverterOptions__set_IncludeType_Z1FBCCD16, ConverterOptions__set_SetID_Z1FBCCD16, ConverterOptions_$ctor } from "../ConverterOptions.js";
+import { array, object, string, list as list_1 } from "../../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
 import { ArcTable_compressedDecoder, ArcTable_compressedEncoder, ArcTable_encoder, ArcTable_decoder } from "./ArcTable.js";
-import { encoder, decoder as decoder_1 } from "../Person.js";
-import { encoder as encoder_1, decoder as decoder_2 } from "../Comment.js";
+import { encoder, decoder as decoder_2 } from "../Person.js";
+import { encoder as encoder_1, decoder as decoder_3 } from "../Comment.js";
 import { Factor_encoder, Factor_decoder } from "../Factor.js";
-import { encoder as encoder_2, decoder as decoder_3 } from "../Publication.js";
-import { value as value_3, map, defaultArg } from "../../../fable_modules/fable-library.4.5.0/Option.js";
-import { toArray } from "../../../fable_modules/fable-library.4.5.0/List.js";
-import { toString, object, seq } from "../../../fable_modules/Thoth.Json.10.1.0/Encode.fs.js";
-import { empty, singleton, append, delay, toList, map as map_1 } from "../../../fable_modules/fable-library.4.5.0/Seq.js";
+import { encoder as encoder_2, decoder as decoder_4 } from "../Publication.js";
+import { value as value_2, map, defaultArg } from "../../../fable_modules/fable-library-js.4.13.0/Option.js";
+import { toArray } from "../../../fable_modules/fable-library-js.4.13.0/List.js";
+import { seq } from "../../../fable_modules/Thoth.Json.Core.0.2.1/Encode.fs.js";
+import { empty, singleton, append, delay, toList, map as map_1 } 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 { ArcAssay } from "../../ISA/ArcTypes/ArcTypes.js";
 import { OATable_arrayFromMap, OATable_encoder, OATable_decoder, OATable_decodeOA, OATable_encodeOA } from "./OATable.js";
+import { toString } from "../../../fable_modules/Thoth.Json.JavaScript.0.1.0/Encode.fs.js";
 import { Assay_decoder, Assay_encoder } from "../Assay.js";
-import { fromJsonString } from "../Decode.js";
-import { printf, toFail } from "../../../fable_modules/fable-library.4.5.0/String.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 { CellTable_arrayFromMap, CellTable_encoder, CellTable_decoder } from "./CellTable.js";
-import { Dictionary } from "../../../fable_modules/fable-library.4.5.0/MutableMap.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 const JsonHelper_DecodeOa = OntologyAnnotation_decoder(ConverterOptions_$ctor());
 
-export const JsonHelper_DecodeTables = (path) => ((value) => list_1(uncurry2(ArcTable_decoder), path, value));
+export const JsonHelper_DecodeTables = list_1(ArcTable_decoder);
 
-export const JsonHelper_DecodePersons = (() => {
-    const decoder = decoder_1(ConverterOptions_$ctor());
-    return (path) => ((value) => list_1(uncurry2(decoder), path, value));
-})();
+export const JsonHelper_DecodePersons = list_1(decoder_2(ConverterOptions_$ctor()));
 
-export const JsonHelper_DecodeComments = (() => {
-    const decoder = decoder_2(ConverterOptions_$ctor());
-    return (path) => ((value) => list_1(uncurry2(decoder), path, value));
-})();
+export const JsonHelper_DecodeComments = list_1(decoder_3(ConverterOptions_$ctor()));
 
-export const JsonHelper_DecodeFactors = (() => {
-    const decoder = Factor_decoder(ConverterOptions_$ctor());
-    return (path) => ((value) => list_1(uncurry2(decoder), path, value));
-})();
+export const JsonHelper_DecodeFactors = list_1(Factor_decoder(ConverterOptions_$ctor()));
 
-export const JsonHelper_DecodePublications = (() => {
-    const decoder = decoder_3(ConverterOptions_$ctor());
-    return (path) => ((value) => list_1(uncurry2(decoder), path, value));
-})();
+export const JsonHelper_DecodePublications = list_1(decoder_4(ConverterOptions_$ctor()));
 
-export const JsonHelper_DecodeOntologySourceReferences = (() => {
-    const decoder = OntologySourceReference_decoder(ConverterOptions_$ctor());
-    return (path) => ((value) => list_1(uncurry2(decoder), path, value));
-})();
+export const JsonHelper_DecodeOntologySourceReferences = list_1(OntologySourceReference_decoder(ConverterOptions_$ctor()));
 
 export function JsonHelper_tryGetTables(get$, fieldName) {
     let objectArg;
-    return defaultArg(map((collection) => Array.from(collection), (objectArg = get$.Optional, objectArg.Field(fieldName, uncurry2(JsonHelper_DecodeTables)))), []);
+    return defaultArg(map((collection) => Array.from(collection), (objectArg = get$.Optional, objectArg.Field(fieldName, JsonHelper_DecodeTables))), []);
 }
 
 export function JsonHelper_tryGetPersons(get$, fieldName) {
     let objectArg;
-    return defaultArg(map(toArray, (objectArg = get$.Optional, objectArg.Field(fieldName, uncurry2(JsonHelper_DecodePersons)))), new Array(0));
+    return defaultArg(map(toArray, (objectArg = get$.Optional, objectArg.Field(fieldName, JsonHelper_DecodePersons))), new Array(0));
 }
 
 export function JsonHelper_tryGetComments(get$, fieldName) {
     let objectArg;
-    return defaultArg(map(toArray, (objectArg = get$.Optional, objectArg.Field(fieldName, uncurry2(JsonHelper_DecodeComments)))), new Array(0));
+    return defaultArg(map(toArray, (objectArg = get$.Optional, objectArg.Field(fieldName, JsonHelper_DecodeComments))), new Array(0));
 }
 
 export function JsonHelper_tryGetPublications(get$, fieldName) {
     let objectArg;
-    return defaultArg(map(toArray, (objectArg = get$.Optional, objectArg.Field(fieldName, uncurry2(JsonHelper_DecodePublications)))), new Array(0));
+    return defaultArg(map(toArray, (objectArg = get$.Optional, objectArg.Field(fieldName, JsonHelper_DecodePublications))), new Array(0));
 }
 
 export function JsonHelper_tryGetOAs(get$, fieldName) {
-    let objectArg;
-    return defaultArg(map(toArray, (objectArg = get$.Optional, objectArg.Field(fieldName, (path, value) => list_1(uncurry2(JsonHelper_DecodeOa), path, value)))), new Array(0));
+    let arg_1, objectArg;
+    return defaultArg(map(toArray, (arg_1 = list_1(JsonHelper_DecodeOa), (objectArg = get$.Optional, objectArg.Field(fieldName, arg_1)))), new Array(0));
 }
 
 export function JsonHelper_tryGetFactors(get$, fieldName) {
     let objectArg;
-    return defaultArg(map(toArray, (objectArg = get$.Optional, objectArg.Field(fieldName, uncurry2(JsonHelper_DecodeFactors)))), new Array(0));
+    return defaultArg(map(toArray, (objectArg = get$.Optional, objectArg.Field(fieldName, JsonHelper_DecodeFactors))), new Array(0));
 }
 
 export function JsonHelper_tryGetStringResizeArray(get$, fieldName) {
-    let objectArg;
-    return defaultArg(map((collection) => Array.from(collection), (objectArg = get$.Optional, objectArg.Field(fieldName, (path_1, value_1) => list_1(string, path_1, value_1)))), []);
+    let arg_1, objectArg;
+    return defaultArg(map((collection) => Array.from(collection), (arg_1 = list_1(string), (objectArg = get$.Optional, objectArg.Field(fieldName, arg_1)))), []);
 }
 
 export function JsonHelper_tryGetOntologySourceReferences(get$, fieldName) {
     let objectArg;
-    return defaultArg(map(toArray, (objectArg = get$.Optional, objectArg.Field(fieldName, uncurry2(JsonHelper_DecodeOntologySourceReferences)))), new Array(0));
+    return defaultArg(map(toArray, (objectArg = get$.Optional, objectArg.Field(fieldName, JsonHelper_DecodeOntologySourceReferences))), new Array(0));
 }
 
 export function JsonHelper_EncoderOA(t) {
@@ -142,69 +129,84 @@ export function JsonHelper_EncoderOntologySourceReferences(t) {
 }
 
 export function ArcAssay_encoder(assay) {
-    return object(toList(delay(() => append(singleton(["Identifier", assay.Identifier]), delay(() => append((assay.MeasurementType != null) ? singleton(["MeasurementType", JsonHelper_EncoderOA(value_3(assay.MeasurementType))]) : empty(), delay(() => append((assay.TechnologyType != null) ? singleton(["TechnologyType", JsonHelper_EncoderOA(value_3(assay.TechnologyType))]) : empty(), delay(() => append((assay.TechnologyPlatform != null) ? singleton(["TechnologyPlatform", JsonHelper_EncoderOA(value_3(assay.TechnologyPlatform))]) : empty(), delay(() => append((assay.Tables.length !== 0) ? singleton(["Tables", JsonHelper_EncoderTables(assay.Tables)]) : empty(), delay(() => append((assay.Performers.length !== 0) ? singleton(["Performers", JsonHelper_EncoderPersons(assay.Performers)]) : empty(), delay(() => ((assay.Comments.length !== 0) ? singleton(["Comments", JsonHelper_EncoderComments(assay.Comments)]) : empty()))))))))))))))));
+    return new Json(5, [toList(delay(() => append(singleton(["Identifier", new Json(0, [assay.Identifier])]), delay(() => append((assay.MeasurementType != null) ? singleton(["MeasurementType", JsonHelper_EncoderOA(value_2(assay.MeasurementType))]) : empty(), delay(() => append((assay.TechnologyType != null) ? singleton(["TechnologyType", JsonHelper_EncoderOA(value_2(assay.TechnologyType))]) : empty(), delay(() => append((assay.TechnologyPlatform != null) ? singleton(["TechnologyPlatform", JsonHelper_EncoderOA(value_2(assay.TechnologyPlatform))]) : empty(), delay(() => append((assay.Tables.length !== 0) ? singleton(["Tables", JsonHelper_EncoderTables(assay.Tables)]) : empty(), delay(() => append((assay.Performers.length !== 0) ? singleton(["Performers", JsonHelper_EncoderPersons(assay.Performers)]) : empty(), delay(() => ((assay.Comments.length !== 0) ? singleton(["Comments", JsonHelper_EncoderComments(assay.Comments)]) : empty())))))))))))))))]);
 }
 
-export const ArcAssay_decoder = (path_1) => ((v) => object_1((get$) => {
+export const ArcAssay_decoder = object((get$) => {
     let identifier;
     const objectArg = get$.Required;
     identifier = objectArg.Field("Identifier", string);
     let measurementType;
     const objectArg_1 = get$.Optional;
-    measurementType = objectArg_1.Field("MeasurementType", uncurry2(JsonHelper_DecodeOa));
+    measurementType = objectArg_1.Field("MeasurementType", JsonHelper_DecodeOa);
     let technologyType;
     const objectArg_2 = get$.Optional;
-    technologyType = objectArg_2.Field("TechnologyType", uncurry2(JsonHelper_DecodeOa));
+    technologyType = objectArg_2.Field("TechnologyType", JsonHelper_DecodeOa);
     let technologyPlatform;
     const objectArg_3 = get$.Optional;
-    technologyPlatform = objectArg_3.Field("TechnologyPlatform", uncurry2(JsonHelper_DecodeOa));
+    technologyPlatform = objectArg_3.Field("TechnologyPlatform", JsonHelper_DecodeOa);
     const tables = JsonHelper_tryGetTables(get$, "Tables");
     const performers = JsonHelper_tryGetPersons(get$, "Performers");
     const comments = JsonHelper_tryGetComments(get$, "Comments");
     return ArcAssay.make(identifier, measurementType, technologyType, technologyPlatform, tables, performers, comments);
-}, path_1, v));
+});
 
 export function ArcAssay_compressedEncoder(stringTable, oaTable, cellTable, assay) {
-    return object(toList(delay(() => append(singleton(["Identifier", assay.Identifier]), delay(() => append((assay.MeasurementType != null) ? singleton(["MeasurementType", OATable_encodeOA(oaTable, value_3(assay.MeasurementType))]) : empty(), delay(() => append((assay.TechnologyType != null) ? singleton(["TechnologyType", OATable_encodeOA(oaTable, value_3(assay.TechnologyType))]) : empty(), delay(() => append((assay.TechnologyPlatform != null) ? singleton(["TechnologyPlatform", OATable_encodeOA(oaTable, value_3(assay.TechnologyPlatform))]) : empty(), delay(() => append((assay.Tables.length !== 0) ? singleton(["Tables", seq(map_1((table) => ArcTable_compressedEncoder(stringTable, oaTable, cellTable, table), assay.Tables))]) : empty(), delay(() => append((assay.Performers.length !== 0) ? singleton(["Performers", JsonHelper_EncoderPersons(assay.Performers)]) : empty(), delay(() => ((assay.Comments.length !== 0) ? singleton(["Comments", JsonHelper_EncoderComments(assay.Comments)]) : empty()))))))))))))))));
+    return new Json(5, [toList(delay(() => append(singleton(["Identifier", new Json(0, [assay.Identifier])]), delay(() => append((assay.MeasurementType != null) ? singleton(["MeasurementType", OATable_encodeOA(oaTable, value_2(assay.MeasurementType))]) : empty(), delay(() => append((assay.TechnologyType != null) ? singleton(["TechnologyType", OATable_encodeOA(oaTable, value_2(assay.TechnologyType))]) : empty(), delay(() => append((assay.TechnologyPlatform != null) ? singleton(["TechnologyPlatform", OATable_encodeOA(oaTable, value_2(assay.TechnologyPlatform))]) : empty(), delay(() => append((assay.Tables.length !== 0) ? singleton(["Tables", seq(map_1((table) => ArcTable_compressedEncoder(stringTable, oaTable, cellTable, table), assay.Tables))]) : empty(), delay(() => append((assay.Performers.length !== 0) ? singleton(["Performers", JsonHelper_EncoderPersons(assay.Performers)]) : empty(), delay(() => ((assay.Comments.length !== 0) ? singleton(["Comments", JsonHelper_EncoderComments(assay.Comments)]) : empty())))))))))))))))]);
 }
 
 export function ArcAssay_compressedDecoder(stringTable, oaTable, cellTable) {
-    return (path_2) => ((v) => object_1((get$) => {
-        let arg_1, decoder, objectArg;
-        const tables = defaultArg(map((collection) => Array.from(collection), (arg_1 = ((decoder = ArcTable_compressedDecoder(stringTable, oaTable, cellTable), (path) => ((value) => array(uncurry2(decoder), path, value)))), (objectArg = get$.Optional, objectArg.Field("Tables", uncurry2(arg_1))))), []);
+    return object((get$) => {
+        let arg_1, objectArg;
+        const tables = defaultArg(map((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 measurementType;
+        const arg_5 = OATable_decodeOA(oaTable);
         const objectArg_2 = get$.Optional;
-        measurementType = objectArg_2.Field("MeasurementType", (s, o) => OATable_decodeOA(oaTable, s, o));
+        measurementType = objectArg_2.Field("MeasurementType", arg_5);
         let technologyType;
+        const arg_7 = OATable_decodeOA(oaTable);
         const objectArg_3 = get$.Optional;
-        technologyType = objectArg_3.Field("TechnologyType", (s_1, o_1) => OATable_decodeOA(oaTable, s_1, o_1));
+        technologyType = objectArg_3.Field("TechnologyType", arg_7);
         let technologyPlatform;
+        const arg_9 = OATable_decodeOA(oaTable);
         const objectArg_4 = get$.Optional;
-        technologyPlatform = objectArg_4.Field("TechnologyPlatform", (s_2, o_2) => OATable_decodeOA(oaTable, s_2, o_2));
+        technologyPlatform = objectArg_4.Field("TechnologyPlatform", arg_9);
         const performers = JsonHelper_tryGetPersons(get$, "Performers");
         const comments = JsonHelper_tryGetComments(get$, "Comments");
         return ArcAssay.make(identifier, measurementType, technologyType, technologyPlatform, tables, performers, comments);
-    }, path_2, v));
+    });
 }
 
 /**
  * exports in json-ld format
  */
-export function ArcAssay_toStringLD(a) {
+export function ArcAssay_toJsonldString(a) {
     let returnVal;
-    return toString(2, Assay_encoder((returnVal = ConverterOptions_$ctor(), ((ConverterOptions__set_SetID_Z1FBCCD16(returnVal, true), ConverterOptions__set_IncludeType_Z1FBCCD16(returnVal, true)), returnVal)), a.ToAssay()));
+    return toString(2, Assay_encoder((returnVal = ConverterOptions_$ctor(), ((ConverterOptions__set_SetID_Z1FBCCD16(returnVal, true), ConverterOptions__set_IncludeType_Z1FBCCD16(returnVal, true)), returnVal)), void 0, a.ToAssay()));
+}
+
+export function ArcAssay_toJsonldStringWithContext(a) {
+    let returnVal;
+    return toString(2, Assay_encoder((returnVal = ConverterOptions_$ctor(), (((ConverterOptions__set_SetID_Z1FBCCD16(returnVal, true), ConverterOptions__set_IncludeType_Z1FBCCD16(returnVal, true)), ConverterOptions__set_IncludeContext_Z1FBCCD16(returnVal, true)), returnVal)), void 0, a.ToAssay()));
 }
 
 export function ArcAssay_fromJsonString(s) {
-    const a = fromJsonString(uncurry2(Assay_decoder(ConverterOptions_$ctor())), s);
-    return ArcAssay.fromAssay(a);
+    let a_1;
+    const matchValue = fromString(Assay_decoder(ConverterOptions_$ctor()), s);
+    if (matchValue.tag === 1) {
+        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
+    }
+    else {
+        a_1 = matchValue.fields[0];
+    }
+    return ArcAssay.fromAssay(a_1);
 }
 
 export function ArcAssay_toJsonString(a) {
-    return toString(2, Assay_encoder(ConverterOptions_$ctor(), a.ToAssay()));
+    return toString(2, Assay_encoder(ConverterOptions_$ctor(), void 0, a.ToAssay()));
 }
 
 export function ArcAssay_toArcJsonString(a) {
@@ -212,22 +214,34 @@ export function ArcAssay_toArcJsonString(a) {
 }
 
 export function ArcAssay_fromArcJsonString(jsonString) {
-    const matchValue = fromString(uncurry2(ArcAssay_decoder), jsonString);
-    if (matchValue.tag === 1) {
-        return toFail(printf("Error. Unable to parse json string to ArcAssay: %s"))(matchValue.fields[0]);
+    try {
+        const matchValue = fromString(ArcAssay_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 ArcAssay: %s"))(arg_1);
     }
 }
 
 export function ARCtrl_ISA_ArcAssay__ArcAssay_fromArcJsonString_Static_Z721C83C5(jsonString) {
-    const matchValue = fromString(uncurry2(ArcAssay_decoder), jsonString);
-    if (matchValue.tag === 1) {
-        return toFail(printf("Error. Unable to parse json string to ArcAssay: %s"))(matchValue.fields[0]);
+    try {
+        const matchValue = fromString(ArcAssay_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 ArcAssay: %s"))(arg_1);
     }
 }
 
@@ -240,24 +254,31 @@ export function ARCtrl_ISA_ArcAssay__ArcAssay_toArcJsonString_Static_1C75D08D(a)
 }
 
 export function ARCtrl_ISA_ArcAssay__ArcAssay_fromCompressedJsonString_Static_Z721C83C5(jsonString) {
-    const matchValue = fromString((path, v) => object_1((get$) => {
+    const decoder = object((get$) => {
         let arg_5, objectArg_2;
         let stringTable;
         const objectArg = get$.Required;
-        stringTable = objectArg.Field("stringTable", uncurry2(StringTable_decoder));
+        stringTable = objectArg.Field("stringTable", StringTable_decoder);
         let oaTable;
         const arg_3 = OATable_decoder(stringTable);
         const objectArg_1 = get$.Required;
-        oaTable = objectArg_1.Field("oaTable", uncurry2(arg_3));
-        const arg_7 = ArcAssay_compressedDecoder(stringTable, oaTable, (arg_5 = CellTable_decoder(stringTable, oaTable), (objectArg_2 = get$.Required, objectArg_2.Field("cellTable", uncurry2(arg_5)))));
+        oaTable = objectArg_1.Field("oaTable", arg_3);
+        const arg_7 = ArcAssay_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("assay", uncurry2(arg_7));
-    }, path, v), jsonString);
-    if (matchValue.tag === 1) {
-        return toFail(printf("Error. Unable to parse json string to ArcAssay: %s"))(matchValue.fields[0]);
+        return objectArg_3.Field("assay", 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];
+        }
     }
-    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);
     }
 }
 
@@ -273,7 +294,7 @@ export function ARCtrl_ISA_ArcAssay__ArcAssay_ToCompressedJsonString_71136F3F(th
         GetHashCode: safeHash,
     });
     const arcAssay = ArcAssay_compressedEncoder(stringTable, oaTable, cellTable, this$);
-    return toString(spaces_1, object([["cellTable", CellTable_encoder(stringTable, oaTable, CellTable_arrayFromMap(cellTable))], ["oaTable", OATable_encoder(stringTable, OATable_arrayFromMap(oaTable))], ["stringTable", StringTable_encoder(StringTable_arrayFromMap(stringTable))], ["assay", arcAssay]]));
+    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))], ["assay", arcAssay]]]));
 }
 
 export function ARCtrl_ISA_ArcAssay__ArcAssay_toCompressedJsonString_Static_1C75D08D(a) {