@nfdi4plants/arctrl 1.1.0 → 1.2.0

package/ISA/ISA.Json/ArcTypes/ArcInvestigation.js

@@ -1,57 +1,74 @@
-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 { map as map_1, defaultArg, value as value_9 } from "../../../fable_modules/fable-library.4.5.0/Option.js";
-import { JsonHelper_tryGetComments, JsonHelper_tryGetStringResizeArray, ArcAssay_decoder, JsonHelper_tryGetPersons, JsonHelper_tryGetPublications, JsonHelper_tryGetOntologySourceReferences, JsonHelper_EncoderComments, ArcAssay_encoder, JsonHelper_EncoderPersons, JsonHelper_EncoderPublications, JsonHelper_EncoderOntologySourceReferences } from "./ArcAssay.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_tryGetStringResizeArray, JsonHelper_tryGetPersons, JsonHelper_tryGetPublications, JsonHelper_tryGetOntologySourceReferences, ArcAssay_decoder, JsonHelper_EncoderComments, ArcAssay_encoder, JsonHelper_EncoderPersons, JsonHelper_EncoderPublications, JsonHelper_EncoderOntologySourceReferences } from "./ArcAssay.js";
+import { seq } from "../../../fable_modules/Thoth.Json.Core.0.2.1/Encode.fs.js";
 import { ArcStudy_decoder, ArcStudy_encoder } from "./ArcStudy.js";
-import { fromString, list, string, object as object_1 } from "../../../fable_modules/Thoth.Json.10.1.0/Decode.fs.js";
-import { uncurry2 } from "../../../fable_modules/fable-library.4.5.0/Util.js";
+import { string, object, list } from "../../../fable_modules/Thoth.Json.Core.0.2.1/Decode.fs.js";
 import { ArcInvestigation } from "../../ISA/ArcTypes/ArcTypes.js";
-import { decoder as decoder_2, encoder } from "../Investigation.js";
-import { ConverterOptions__set_IncludeType_Z1FBCCD16, ConverterOptions__set_SetID_Z1FBCCD16, ConverterOptions_$ctor } from "../ConverterOptions.js";
-import { fromJsonString } from "../Decode.js";
-import { printf, toFail } from "../../../fable_modules/fable-library.4.5.0/String.js";
+import { toString } from "../../../fable_modules/Thoth.Json.JavaScript.0.1.0/Encode.fs.js";
+import { decoder as decoder_1, encoder } from "../Investigation.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";
 
 export function ArcInvestigation_encoder(inv) {
-    return object(toList(delay(() => append(singleton(["Identifier", inv.Identifier]), delay(() => append((inv.Title != null) ? singleton(["Title", value_9(inv.Title)]) : empty(), delay(() => append((inv.Description != null) ? singleton(["Description", value_9(inv.Description)]) : empty(), delay(() => append((inv.SubmissionDate != null) ? singleton(["SubmissionDate", value_9(inv.SubmissionDate)]) : empty(), delay(() => append((inv.PublicReleaseDate != null) ? singleton(["PublicReleaseDate", value_9(inv.PublicReleaseDate)]) : empty(), delay(() => append((inv.OntologySourceReferences.length !== 0) ? singleton(["OntologySourceReferences", JsonHelper_EncoderOntologySourceReferences(inv.OntologySourceReferences)]) : empty(), delay(() => append((inv.Publications.length !== 0) ? singleton(["Publications", JsonHelper_EncoderPublications(inv.Publications)]) : empty(), delay(() => append((inv.Contacts.length !== 0) ? singleton(["Contacts", JsonHelper_EncoderPersons(inv.Contacts)]) : empty(), delay(() => append((inv.Assays.length !== 0) ? singleton(["Assays", seq(map(ArcAssay_encoder, inv.Assays))]) : empty(), delay(() => append((inv.Studies.length !== 0) ? singleton(["Studies", seq(map(ArcStudy_encoder, inv.Studies))]) : empty(), delay(() => append((inv.RegisteredStudyIdentifiers.length !== 0) ? singleton(["RegisteredStudyIdentifiers", seq(map((value_5) => value_5, inv.RegisteredStudyIdentifiers))]) : empty(), delay(() => ((inv.Comments.length !== 0) ? singleton(["Comments", JsonHelper_EncoderComments(inv.Comments)]) : empty()))))))))))))))))))))))))));
+    return new Json(5, [toList(delay(() => append(singleton(["Identifier", new Json(0, [inv.Identifier])]), delay(() => append((inv.Title != null) ? singleton(["Title", new Json(0, [value_7(inv.Title)])]) : empty(), delay(() => append((inv.Description != null) ? singleton(["Description", new Json(0, [value_7(inv.Description)])]) : empty(), delay(() => append((inv.SubmissionDate != null) ? singleton(["SubmissionDate", new Json(0, [value_7(inv.SubmissionDate)])]) : empty(), delay(() => append((inv.PublicReleaseDate != null) ? singleton(["PublicReleaseDate", new Json(0, [value_7(inv.PublicReleaseDate)])]) : empty(), delay(() => append((inv.OntologySourceReferences.length !== 0) ? singleton(["OntologySourceReferences", JsonHelper_EncoderOntologySourceReferences(inv.OntologySourceReferences)]) : empty(), delay(() => append((inv.Publications.length !== 0) ? singleton(["Publications", JsonHelper_EncoderPublications(inv.Publications)]) : empty(), delay(() => append((inv.Contacts.length !== 0) ? singleton(["Contacts", JsonHelper_EncoderPersons(inv.Contacts)]) : empty(), delay(() => append((inv.Assays.length !== 0) ? singleton(["Assays", seq(map(ArcAssay_encoder, inv.Assays))]) : empty(), delay(() => append((inv.Studies.length !== 0) ? singleton(["Studies", seq(map(ArcStudy_encoder, inv.Studies))]) : empty(), delay(() => append((inv.RegisteredStudyIdentifiers.length !== 0) ? singleton(["RegisteredStudyIdentifiers", seq(map((value_5) => (new Json(0, [value_5])), inv.RegisteredStudyIdentifiers))]) : empty(), delay(() => ((inv.Comments.length !== 0) ? singleton(["Comments", JsonHelper_EncoderComments(inv.Comments)]) : empty())))))))))))))))))))))))))]);
 }
 
-export const ArcInvestigation_decoder = (path_7) => ((v) => object_1((get$_2) => {
-    let objectArg, objectArg_1;
-    let identifier;
-    const objectArg_2 = get$_2.Required;
-    identifier = objectArg_2.Field("Identifier", string);
-    let title;
-    const objectArg_3 = get$_2.Optional;
-    title = objectArg_3.Field("Title", string);
-    let description;
-    const objectArg_4 = get$_2.Optional;
-    description = objectArg_4.Field("Description", string);
-    let submissionDate;
-    const objectArg_5 = get$_2.Optional;
-    submissionDate = objectArg_5.Field("SubmissionDate", string);
-    let publicReleaseDate;
-    const objectArg_6 = get$_2.Optional;
-    publicReleaseDate = objectArg_6.Field("PublicReleaseDate", string);
-    const ontologySourceReferences = JsonHelper_tryGetOntologySourceReferences(get$_2, "OntologySourceReferences");
-    const publications = JsonHelper_tryGetPublications(get$_2, "Publications");
-    const contacts = JsonHelper_tryGetPersons(get$_2, "Contacts");
-    const assays = defaultArg(map_1((collection) => Array.from(collection), (objectArg = get$_2.Optional, objectArg.Field("Assays", (path, value) => list(uncurry2(ArcAssay_decoder), path, value)))), []);
-    const studies = defaultArg(map_1((collection_1) => Array.from(collection_1), (objectArg_1 = get$_2.Optional, objectArg_1.Field("Studies", (path_1, value_1) => list(uncurry2(ArcStudy_decoder), path_1, value_1)))), []);
-    const registeredStudyIdentifiers = JsonHelper_tryGetStringResizeArray(get$_2, "RegisteredStudyIdentifiers");
-    const comments = JsonHelper_tryGetComments(get$_2, "Comments");
-    return ArcInvestigation.make(identifier, title, description, submissionDate, publicReleaseDate, ontologySourceReferences, publications, contacts, assays, studies, registeredStudyIdentifiers, comments, []);
-}, path_7, v));
+export const ArcInvestigation_decoder = (() => {
+    const DecodeAssays = list(ArcAssay_decoder);
+    const DecodeStudies = list(ArcStudy_decoder);
+    return object((get$_2) => {
+        let objectArg, objectArg_1;
+        let identifier;
+        const objectArg_2 = get$_2.Required;
+        identifier = objectArg_2.Field("Identifier", string);
+        let title;
+        const objectArg_3 = get$_2.Optional;
+        title = objectArg_3.Field("Title", string);
+        let description;
+        const objectArg_4 = get$_2.Optional;
+        description = objectArg_4.Field("Description", string);
+        let submissionDate;
+        const objectArg_5 = get$_2.Optional;
+        submissionDate = objectArg_5.Field("SubmissionDate", string);
+        let publicReleaseDate;
+        const objectArg_6 = get$_2.Optional;
+        publicReleaseDate = objectArg_6.Field("PublicReleaseDate", string);
+        const ontologySourceReferences = JsonHelper_tryGetOntologySourceReferences(get$_2, "OntologySourceReferences");
+        const publications = JsonHelper_tryGetPublications(get$_2, "Publications");
+        const contacts = JsonHelper_tryGetPersons(get$_2, "Contacts");
+        const assays = defaultArg(map_1((collection) => Array.from(collection), (objectArg = get$_2.Optional, objectArg.Field("Assays", DecodeAssays))), []);
+        const studies = defaultArg(map_1((collection_1) => Array.from(collection_1), (objectArg_1 = get$_2.Optional, objectArg_1.Field("Studies", DecodeStudies))), []);
+        const registeredStudyIdentifiers = JsonHelper_tryGetStringResizeArray(get$_2, "RegisteredStudyIdentifiers");
+        const comments = JsonHelper_tryGetComments(get$_2, "Comments");
+        return ArcInvestigation.make(identifier, title, description, submissionDate, publicReleaseDate, ontologySourceReferences, publications, contacts, assays, studies, registeredStudyIdentifiers, comments, []);
+    });
+})();
 
 /**
  * exports in json-ld format
  */
-export function ArcInvestigation_toStringLD(a) {
+export function ArcInvestigation_toJsonldString(a) {
     let returnVal;
     return toString(2, encoder((returnVal = ConverterOptions_$ctor(), ((ConverterOptions__set_SetID_Z1FBCCD16(returnVal, true), ConverterOptions__set_IncludeType_Z1FBCCD16(returnVal, true)), returnVal)), a.ToInvestigation()));
 }
 
+export function ArcInvestigation_toJsonldStringWithContext(a) {
+    let returnVal;
+    return toString(2, encoder((returnVal = ConverterOptions_$ctor(), (((ConverterOptions__set_SetID_Z1FBCCD16(returnVal, true), ConverterOptions__set_IncludeType_Z1FBCCD16(returnVal, true)), ConverterOptions__set_IncludeContext_Z1FBCCD16(returnVal, true)), returnVal)), a.ToInvestigation()));
+}
+
 export function ArcInvestigation_fromJsonString(s) {
-    const i = fromJsonString(uncurry2(decoder_2(ConverterOptions_$ctor())), s);
+    let i;
+    const matchValue = fromString(decoder_1(ConverterOptions_$ctor()), s);
+    if (matchValue.tag === 1) {
+        throw new Error(toText(printf("Error decoding string: %O"))(matchValue.fields[0]));
+    }
+    else {
+        i = matchValue.fields[0];
+    }
     return ArcInvestigation.fromInvestigation(i);
 }
 
@@ -64,22 +81,34 @@ export function ArcInvestigation_toArcJsonString(a) {
 }
 
 export function ArcInvestigation_fromArcJsonString(jsonString) {
-    const matchValue = fromString(uncurry2(ArcInvestigation_decoder), jsonString);
-    if (matchValue.tag === 1) {
-        return toFail(printf("Error. Unable to parse json string to ArcInvestigation: %s"))(matchValue.fields[0]);
+    try {
+        const matchValue = fromString(ArcInvestigation_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 ArcInvestigation: %s"))(arg_1);
     }
 }
 
 export function ARCtrl_ISA_ArcInvestigation__ArcInvestigation_fromArcJsonString_Static_Z721C83C5(jsonString) {
-    const matchValue = fromString(uncurry2(ArcInvestigation_decoder), jsonString);
-    if (matchValue.tag === 1) {
-        return toFail(printf("Error. Unable to parse json string to ArcInvestigation: %s"))(matchValue.fields[0]);
+    try {
+        const matchValue = fromString(ArcInvestigation_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 ArcInvestigation: %s"))(arg_1);
     }
 }
 

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

@@ -1,25 +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 { map as map_1, 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, array, 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 { safeHash, equals, uncurry2 } from "../../../fable_modules/fable-library.4.5.0/Util.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 { 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.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 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);
@@ -43,16 +45,16 @@ 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 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", seq(map((table) => ArcTable_compressedEncoder(stringTable, oaTable, cellTable, table), 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", 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 (path_6) => ((v) => object_1((get$) => {
-        let arg_1, decoder, objectArg;
-        const tables = defaultArg(map_1((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_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);
@@ -75,20 +77,32 @@ export function ArcStudy_compressedDecoder(stringTable, oaTable, cellTable) {
         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_6, v));
+    });
 }
 
 /**
  * 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) {
@@ -100,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);
     }
 }
 
@@ -128,24 +154,31 @@ export function ARCtrl_ISA_ArcStudy__ArcStudy_toArcJsonString_Static_1B3D5E9B(a)
 }
 
 export function ARCtrl_ISA_ArcStudy__ArcStudy_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 = ArcStudy_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 = 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", 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("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];
+        }
     }
-    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);
     }
 }
 
@@ -161,7 +194,7 @@ export function ARCtrl_ISA_ArcStudy__ArcStudy_ToCompressedJsonString_71136F3F(th
         GetHashCode: safeHash,
     });
     const arcStudy = ArcStudy_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))], ["study", arcStudy]]));
+    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) {